wip: refactor

src/utils/hooks/useEvent.tsx

@@ -1,25 +1,29 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { useQuery } from '@tanstack/react-query';
 
 import { useNDK } from '@libs/ndk/provider';
 
 import { parser } from '@utils/parser';
-import { LumeEvent } from '@utils/types';
 
 export function useEvent(id: string, embed?: string) {
   const { ndk } = useNDK();
-  const { status, data, error, isFetching } = useQuery(
-    ['note', id],
+  const { status, data, error } = useQuery(
+    ['event', id],
     async () => {
       if (embed) {
-        const event: LumeEvent = JSON.parse(embed);
-        if (event.kind === 1) embed['content'] = parser(event);
-        return embed as unknown as LumeEvent;
-      } else {
-        const event = (await ndk.fetchEvent(id)) as LumeEvent;
-        if (!event) throw new Error('event not found');
-        if (event.kind === 1) event['content'] = parser(event) as unknown as string;
-        return event as LumeEvent;
+        const event: NDKEvent = JSON.parse(embed);
+        // @ts-expect-error, #TODO: convert NDKEvent to ExNDKEvent
+        if (event.kind === 1) event.content = parser(event);
+
+        return event as unknown as NDKEvent;
       }
+
+      const event = (await ndk.fetchEvent(id)) as NDKEvent;
+      if (!event) throw new Error('event not found');
+      // @ts-expect-error, #TODO: convert NDKEvent to ExNDKEvent
+      if (event.kind === 1) event.content = parser(event);
+
+      return event as NDKEvent;
     },
     {
       staleTime: Infinity,
@@ -29,5 +33,5 @@ export function useEvent(id: string, embed?: string) {
     }
   );
 
-  return { status, data, error, isFetching };
+  return { status, data, error };
 }

src/utils/hooks/useNostr.tsx

@@ -6,7 +6,9 @@ import {
   NDKSubscription,
   NDKUser,
 } from '@nostr-dev-kit/ndk';
+import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
 import { LRUCache } from 'lru-cache';
+import { NostrFetcher } from 'nostr-fetch';
 import { nip19 } from 'nostr-tools';
 import { useMemo } from 'react';
 
@@ -16,17 +18,9 @@ import { useStorage } from '@libs/storage/provider';
 import { useStronghold } from '@stores/stronghold';
 
 import { nHoursAgo } from '@utils/date';
-import { LumeEvent } from '@utils/types';
-
-interface NotesResponse {
-  status: string;
-  data: LumeEvent[];
-  nextCursor?: number;
-  message?: string;
-}
 
 export function useNostr() {
-  const { ndk } = useNDK();
+  const { ndk, relayUrls } = useNDK();
   const { db } = useStorage();
 
   const privkey = useStronghold((state) => state.privkey);
@@ -81,30 +75,65 @@ export function useNostr() {
       await db.updateAccount('follows', [...follows]);
       await db.updateAccount('network', [...new Set([...follows, ...network])]);
 
-      return { status: 'ok' };
+      // clear lru caches
+      lruNetwork.clear();
+
+      return { status: 'ok', message: 'User data fetched' };
     } catch (e) {
       return { status: 'failed', message: e };
     }
   };
 
-  const fetchNotes = async (since: number): Promise<NotesResponse> => {
+  const prefetchEvents = async () => {
     try {
       if (!ndk) return { status: 'failed', data: [], message: 'NDK instance not found' };
 
-      console.log('fetch all events since: ', since);
-      const events = await ndk.fetchEvents({
-        kinds: [1],
-        authors: db.account.network ?? db.account.follows,
-        since: nHoursAgo(since),
-      });
+      // setup nostr-fetch
+      const fetcher = NostrFetcher.withCustomPool(ndkAdapter(ndk));
+      const dbEventsEmpty = await db.isEventsEmpty();
 
-      const sorted = [...events].sort(
-        (a, b) => b.created_at - a.created_at
-      ) as unknown as LumeEvent[];
+      let since: number;
+      if (dbEventsEmpty) {
+        since = nHoursAgo(24);
+      } else {
+        since = db.account.last_login_at ?? nHoursAgo(24);
+      }
 
-      return { status: 'ok', data: sorted, nextCursor: since * 2 };
+      console.log("prefetching events with user's network: ", db.account.network.length);
+      console.log('prefetching events since: ', since);
+
+      const events = fetcher.allEventsIterator(
+        relayUrls,
+        {
+          kinds: [1, 6],
+          authors: db.account.network,
+        },
+        { since: since }
+      );
+
+      // save all events to database
+      for await (const event of events) {
+        let root: string;
+        let reply: string;
+        if (event.tags?.[0]?.[0] === 'e' && !event.tags?.[0]?.[3]) {
+          root = event.tags[0][1];
+        } else {
+          root = event.tags.find((el) => el[3] === 'root')?.[1];
+          reply = event.tags.find((el) => el[3] === 'reply')?.[1];
+        }
+        db.createEvent(
+          event.id,
+          JSON.stringify(event),
+          event.pubkey,
+          root,
+          reply,
+          event.created_at
+        );
+      }
+
+      return { status: 'ok', data: [], message: 'prefetch completed' };
     } catch (e) {
-      console.error('failed get notes, error: ', e);
+      console.error('prefetch events failed, error: ', e);
       return { status: 'failed', data: [], message: e };
     }
   };
@@ -150,5 +179,5 @@ export function useNostr() {
     return res;
   };
 
-  return { sub, fetchUserData, fetchNotes, publish, createZap };
+  return { sub, fetchUserData, prefetchEvents, publish, createZap };
 }

src/utils/parser.tsx

@@ -1,10 +1,11 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import getUrls from 'get-urls';
 import { Event, parseReferences } from 'nostr-tools';
 import ReactPlayer from 'react-player';
 
-import { LumeEvent, RichContent } from '@utils/types';
+import { RichContent } from '@utils/types';
 
-export function parser(event: LumeEvent) {
+export function parser(event: NDKEvent) {
   if (event.kind !== 1) return;
 
   const references = parseReferences(event as unknown as Event);

src/utils/transform.tsx

@@ -1,5 +1,4 @@
 import { NDKTag } from '@nostr-dev-kit/ndk';
-import { destr } from 'destr';
 
 // convert array to NIP-02 tag list
 export function arrayToNIP02(arr: string[]) {
@@ -12,8 +11,7 @@ export function arrayToNIP02(arr: string[]) {
 }
 
 // get repost id from event tags
-export function getRepostID(arr: NDKTag[]) {
-  const tags = destr(arr) as string[];
+export function getRepostID(tags: NDKTag[]) {
   let quoteID = null;
 
   if (tags.length > 0) {

src/utils/types.d.ts

@@ -8,8 +8,15 @@ export interface RichContent {
   links: string[];
 }
 
-export interface LumeEvent extends NDKEvent {
-  richContent: RichContent;
+export interface DBEvent {
+  id: string;
+  account_id: number;
+  event: string | NDKEvent;
+  author: string;
+  root_id: string;
+  reply_id: string;
+  created_at: number;
+  richContent?: RichContent;
 }
 
 export interface Account extends NDKUserProfile {
@@ -20,6 +27,7 @@ export interface Account extends NDKUserProfile {
   network: null | string[];
   is_active: number;
   privkey?: string; // deprecated
+  last_login_at: number;
 }
 
 export interface Profile extends NDKUserProfile {