refactor: 💨

src/components/RelayList/index.tsx

@@ -1,91 +0,0 @@
-import { usePrimaryPage } from '@/PageManager'
-import relayInfoService from '@/services/relay-info.service'
-import { TRelayInfo } from '@/types'
-import { useEffect, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import RelaySimpleInfo, { RelaySimpleInfoSkeleton } from '../RelaySimpleInfo'
-import SearchInput from '../SearchInput'
-
-export default function RelayList() {
-  const { t } = useTranslation()
-  const { navigate } = usePrimaryPage()
-  const [loading, setLoading] = useState(true)
-  const [relays, setRelays] = useState<TRelayInfo[]>([])
-  const [showCount, setShowCount] = useState(20)
-  const [input, setInput] = useState('')
-  const [debouncedInput, setDebouncedInput] = useState(input)
-  const bottomRef = useRef<HTMLDivElement>(null)
-
-  useEffect(() => {
-    const search = async () => {
-      const relayInfos = await relayInfoService.search(debouncedInput)
-      setShowCount(20)
-      setRelays(relayInfos)
-      setLoading(false)
-    }
-    search()
-  }, [debouncedInput])
-
-  useEffect(() => {
-    const handler = setTimeout(() => {
-      setDebouncedInput(input)
-    }, 1000)
-
-    return () => {
-      clearTimeout(handler)
-    }
-  }, [input])
-
-  useEffect(() => {
-    const options = {
-      root: null,
-      rootMargin: '10px',
-      threshold: 1
-    }
-
-    const observerInstance = new IntersectionObserver((entries) => {
-      if (entries[0].isIntersecting && showCount < relays.length) {
-        setShowCount((prev) => prev + 20)
-      }
-    }, options)
-
-    const currentBottomRef = bottomRef.current
-    if (currentBottomRef) {
-      observerInstance.observe(currentBottomRef)
-    }
-
-    return () => {
-      if (observerInstance && currentBottomRef) {
-        observerInstance.unobserve(currentBottomRef)
-      }
-    }
-  }, [showCount, relays])
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setInput(e.target.value)
-  }
-
-  return (
-    <div>
-      <div className="px-4 py-2">
-        <SearchInput placeholder={t('Search relays')} value={input} onChange={handleInputChange} />
-      </div>
-      {relays.slice(0, showCount).map((relay) => (
-        <RelaySimpleInfo
-          key={relay.url}
-          relayInfo={relay}
-          className="clickable p-4 border-b"
-          onClick={(e) => {
-            e.stopPropagation()
-            navigate('relay', { url: relay.url })
-          }}
-        />
-      ))}
-      {showCount < relays.length && <div ref={bottomRef} />}
-      {loading && <RelaySimpleInfoSkeleton className="p-4" />}
-      {!loading && relays.length === 0 && (
-        <div className="text-center text-muted-foreground text-sm">{t('no relays found')}</div>
-      )}
-    </div>
-  )
-}

src/services/relay-info.service.ts

@@ -2,7 +2,6 @@ import { simplifyUrl } from '@/lib/url'
 import indexDb from '@/services/indexed-db.service'
 import { TAwesomeRelayCollection, TRelayInfo } from '@/types'
 import DataLoader from 'dataloader'
-import FlexSearch from 'flexsearch'
 
 class RelayInfoService {
   static instance: RelayInfoService
@@ -14,19 +13,7 @@ class RelayInfoService {
     return RelayInfoService.instance
   }
 
-  private initPromise: Promise<void> | null = null
   private awesomeRelayCollections: Promise<TAwesomeRelayCollection[]> | null = null
-  private relayInfoMap = new Map<string, TRelayInfo>()
-  private relayInfoIndex = new FlexSearch.Index({
-    tokenize: 'forward',
-    encode: (str) =>
-      str
-        // eslint-disable-next-line no-control-regex
-        .replace(/[^\x00-\x7F]/g, (match) => ` ${match} `)
-        .trim()
-        .toLocaleLowerCase()
-        .split(/\s+/)
-  })
   private fetchDataloader = new DataLoader<string, TRelayInfo | undefined>(
     async (urls) => {
       const results = await Promise.allSettled(urls.map((url) => this._getRelayInfo(url)))
@@ -34,25 +21,6 @@ class RelayInfoService {
     },
     { maxBatchSize: 1 }
   )
-  private relayUrlsForRandom: string[] = []
-
-  async search(query: string) {
-    if (this.initPromise) {
-      await this.initPromise
-    }
-
-    if (!query) {
-      const arr = Array.from(this.relayInfoMap.values())
-      for (let i = arr.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1))
-        ;[arr[i], arr[j]] = [arr[j], arr[i]]
-      }
-      return arr
-    }
-
-    const result = await this.relayInfoIndex.searchAsync(query)
-    return result.map((url) => this.relayInfoMap.get(url as string)).filter(Boolean) as TRelayInfo[]
-  }
 
   async getRelayInfos(urls: string[]) {
     if (urls.length === 0) {
@@ -66,28 +34,6 @@ class RelayInfoService {
     return this.fetchDataloader.load(url)
   }
 
-  async getRandomRelayInfos(count: number) {
-    if (this.initPromise) {
-      await this.initPromise
-    }
-
-    const relayInfos: TRelayInfo[] = []
-    while (relayInfos.length < count) {
-      const randomIndex = Math.floor(Math.random() * this.relayUrlsForRandom.length)
-      const url = this.relayUrlsForRandom[randomIndex]
-      this.relayUrlsForRandom.splice(randomIndex, 1)
-      if (this.relayUrlsForRandom.length === 0) {
-        this.relayUrlsForRandom = Array.from(this.relayInfoMap.keys())
-      }
-
-      const relayInfo = this.relayInfoMap.get(url)
-      if (relayInfo) {
-        relayInfos.push(relayInfo)
-      }
-    }
-    return relayInfos
-  }
-
   async getAwesomeRelayCollections() {
     if (this.awesomeRelayCollections) return this.awesomeRelayCollections
 
@@ -111,23 +57,35 @@ class RelayInfoService {
   }
 
   private async _getRelayInfo(url: string) {
-    const exist = this.relayInfoMap.get(url)
+    const fetchRelayInfo = async (background: boolean) => {
-    if (exist) {
-      return exist
-    }
-
-    const storedRelayInfo = await indexDb.getRelayInfo(url)
-    if (storedRelayInfo) {
-      return await this.addRelayInfo(storedRelayInfo)
-    }
-
       const nip11 = await this.fetchRelayNip11(url)
       const relayInfo = {
         ...(nip11 ?? {}),
         url,
         shortUrl: simplifyUrl(url)
       }
-    return await this.addRelayInfo(relayInfo)
+
+      if (!Array.isArray(relayInfo.supported_nips)) {
+        relayInfo.supported_nips = []
+      }
+
+      await indexDb.putRelayInfo(relayInfo)
+
+      if (background) {
+        this.fetchDataloader.clear(url)
+        this.fetchDataloader.prime(url, relayInfo)
+      }
+
+      return relayInfo
+    }
+
+    const storedRelayInfo = await indexDb.getRelayInfo(url)
+    if (storedRelayInfo) {
+      fetchRelayInfo(true) // Update in background
+      return storedRelayInfo
+    }
+
+    return fetchRelayInfo(false)
   }
 
   private async fetchRelayNip11(url: string) {
@@ -141,27 +99,6 @@ class RelayInfoService {
       return undefined
     }
   }
-
-  private async addRelayInfo(relayInfo: TRelayInfo) {
-    if (!Array.isArray(relayInfo.supported_nips)) {
-      relayInfo.supported_nips = []
-    }
-
-    this.relayInfoMap.set(relayInfo.url, relayInfo)
-    await Promise.allSettled([
-      this.relayInfoIndex.addAsync(
-        relayInfo.url,
-        [
-          relayInfo.shortUrl,
-          ...relayInfo.shortUrl.split('.'),
-          relayInfo.name ?? '',
-          relayInfo.description ?? ''
-        ].join(' ')
-      ),
-      indexDb.putRelayInfo(relayInfo)
-    ])
-    return relayInfo
-  }
 }
 
 const instance = RelayInfoService.getInstance()