wip: refactor

src/libs/ndk/cache.ts

@@ -1,14 +1,13 @@
 import { NDKCacheAdapter } from '@nostr-dev-kit/ndk';
 import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk';
-
-import { LumeStorage } from '@libs/storage/instance';
+import { Store } from '@tauri-apps/plugin-store';
 
 export default class TauriAdapter implements NDKCacheAdapter {
-  public store: LumeStorage;
+  public store: Store;
   readonly locking: boolean;
 
-  constructor(db: LumeStorage) {
-    this.store = db;
+  constructor() {
+    this.store = new Store('.ndk_cache.dat');
     this.locking = true;
   }
 
@@ -21,34 +20,15 @@ export default class TauriAdapter implements NDKCacheAdapter {
       for (const author of filter.authors) {
         for (const kind of filter.kinds) {
           const key = `${author}:${kind}`;
-          promises.concat(this.store.getALlEventByKey(key));
+          promises.push(this.store.get(key));
         }
       }
 
       const results = await Promise.all(promises);
 
       for (const result of results) {
-        if (result && result.event) {
-          console.log('cache hit: ', result.event);
-          const ndkEvent = new NDKEvent(
-            subscription.ndk,
-            JSON.parse(result.event as string)
-          );
-          subscription.eventReceived(ndkEvent, undefined, true);
-        }
-      }
-    }
-
-    if (filter.ids) {
-      for (const id of filter.ids) {
-        const cacheEvent = await this.store.getEventByID(id);
-
-        if (cacheEvent) {
-          console.log('cache hit: ', id);
-          const ndkEvent = new NDKEvent(
-            subscription.ndk,
-            JSON.parse(cacheEvent.event as string)
-          );
+        if (result) {
+          const ndkEvent = new NDKEvent(subscription.ndk, JSON.parse(result as string));
           subscription.eventReceived(ndkEvent, undefined, true);
         }
       }
@@ -60,9 +40,13 @@ export default class TauriAdapter implements NDKCacheAdapter {
     const key = `${nostrEvent.pubkey}:${nostrEvent.kind}`;
 
     return new Promise((resolve) => {
-      Promise.all([
-        this.store.createEvent(key, event.id, event.kind, JSON.stringify(nostrEvent)),
-      ]).then(() => resolve());
+      Promise.all([this.store.set(key, JSON.stringify(nostrEvent))]).then(() =>
+        resolve()
+      );
     });
   }
+
+  public async saveCache(): Promise<void> {
+    return await this.store.save();
+  }
 }

src/libs/ndk/instance.ts

@@ -1,6 +1,6 @@
 // inspire by: https://github.com/nostr-dev-kit/ndk-react/
 import NDK from '@nostr-dev-kit/ndk';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import TauriAdapter from '@libs/ndk/cache';
 import { useStorage } from '@libs/storage/provider';
@@ -13,6 +13,8 @@ export const NDKInstance = () => {
   const [ndk, setNDK] = useState<NDK | undefined>(undefined);
   const [relayUrls, setRelayUrls] = useState<string[]>([]);
 
+  const cacheAdapter = useMemo(() => new TauriAdapter(), [ndk]);
+
   // TODO: fully support NIP-11
   async function verifyRelays(relays: string[]) {
     const verifiedRelays: string[] = [];
@@ -64,7 +66,6 @@ export const NDKInstance = () => {
       explicitRelayUrls = await verifyRelays(FULL_RELAYS);
     }
 
-    const cacheAdapter = new TauriAdapter(db);
     console.log('ndk cache adapter: ', cacheAdapter);
     const instance = new NDK({ explicitRelayUrls, cacheAdapter });
 
@@ -80,6 +81,10 @@ export const NDKInstance = () => {
 
   useEffect(() => {
     if (!ndk) initNDK();
+
+    return () => {
+      cacheAdapter.saveCache();
+    };
   }, []);
 
   return {