add nostr-fetch

src/libs/ndk/instance.ts

@@ -1,15 +1,18 @@
 // source: https://github.com/nostr-dev-kit/ndk-react/
 import NDK from '@nostr-dev-kit/ndk';
+import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
+import { NostrFetcher, normalizeRelayUrls } from 'nostr-fetch';
 import { useEffect, useState } from 'react';
 
 import { getSetting } from '@libs/storage';
 
 const setting = await getSetting('relays');
-const relays = JSON.parse(setting);
+const relays = normalizeRelayUrls(JSON.parse(setting));
 
 export const NDKInstance = () => {
   const [ndk, setNDK] = useState<NDK | undefined>(undefined);
   const [relayUrls, setRelayUrls] = useState<string[]>(relays);
+  const [fetcher, setFetcher] = useState<NostrFetcher>(undefined);
 
   useEffect(() => {
     loadNdk(relays);
@@ -26,11 +29,13 @@ export const NDKInstance = () => {
 
     setNDK(ndkInstance);
     setRelayUrls(explicitRelayUrls);
+    setFetcher(NostrFetcher.withCustomPool(ndkAdapter(ndkInstance)));
   }
 
   return {
     ndk,
     relayUrls,
+    fetcher,
     loadNdk,
   };
 };

src/libs/ndk/provider.tsx

@@ -1,5 +1,6 @@
 // source: https://github.com/nostr-dev-kit/ndk-react/
 import NDK from '@nostr-dev-kit/ndk';
+import { NostrFetcher } from 'nostr-fetch';
 import { PropsWithChildren, createContext, useContext } from 'react';
 
 import { NDKInstance } from '@libs/ndk/instance';
@@ -7,17 +8,19 @@ import { NDKInstance } from '@libs/ndk/instance';
 interface NDKContext {
   ndk: NDK;
   relayUrls: string[];
+  fetcher: NostrFetcher;
   loadNdk: (_: string[]) => void;
 }
 
 const NDKContext = createContext<NDKContext>({
   ndk: new NDK({}),
   relayUrls: [],
+  fetcher: undefined,
   loadNdk: undefined,
 });
 
 const NDKProvider = ({ children }: PropsWithChildren<object>) => {
-  const { ndk, relayUrls, loadNdk } = NDKInstance();
+  const { ndk, relayUrls, fetcher, loadNdk } = NDKInstance();
 
   if (ndk)
     return (
@@ -25,6 +28,7 @@ const NDKProvider = ({ children }: PropsWithChildren<object>) => {
         value={{
           ndk,
           relayUrls,
+          fetcher,
           loadNdk,
         }}
       >

src/libs/ndk/utils.tsx

@@ -1,23 +0,0 @@
-import NDK, { NDKEvent, NDKFilter } from '@nostr-dev-kit/ndk';
-
-export async function prefetchEvents(
-  ndk: NDK,
-  filter: NDKFilter
-): Promise<Set<NDKEvent>> {
-  return new Promise((resolve) => {
-    const events: Map<string, NDKEvent> = new Map();
-
-    const relaySetSubscription = ndk.subscribe(filter, {
-      closeOnEose: true,
-    });
-
-    relaySetSubscription.on('event', (event: NDKEvent) => {
-      event.ndk = ndk;
-      events.set(event.tagId(), event);
-    });
-
-    relaySetSubscription.on('eose', () => {
-      setTimeout(() => resolve(new Set(events.values())), 3000);
-    });
-  });
-}