wip: use new storage layer

src/libs/ndk/cache.ts

@@ -1,13 +1,14 @@
 import { NDKCacheAdapter } from '@nostr-dev-kit/ndk';
 import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk';
-import { Store } from '@tauri-apps/plugin-store';
+
+import { LumeStorage } from '@libs/storage/instance';
 
 export default class TauriAdapter implements NDKCacheAdapter {
-  public store: Store;
+  public store: LumeStorage;
   readonly locking: boolean;
 
-  constructor() {
-    this.store = new Store('.ndkcache.dat');
+  constructor(db: LumeStorage) {
+    this.store = db;
     this.locking = true;
   }
 
@@ -20,7 +21,7 @@ export default class TauriAdapter implements NDKCacheAdapter {
       for (const author of filter.authors) {
         for (const kind of filter.kinds) {
           const key = `${author}:${kind}`;
-          promises.push(this.store.get(key));
+          promises.push(this.store.getEventByKey(key));
         }
       }
 
@@ -28,25 +29,26 @@ export default class TauriAdapter implements NDKCacheAdapter {
 
       for (const result of results) {
         if (result) {
-          const event = await this.store.get(result as string);
-
-          if (event) {
-            console.log('cache hit: ', result);
-            const ndkEvent = new NDKEvent(subscription.ndk, JSON.parse(event as string));
-            subscription.eventReceived(ndkEvent, undefined, true);
-          }
+          console.log('cache hit: ', result);
+          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 key = id;
-        const event = await this.store.get(key);
+        const cacheEvent = await this.store.getEventByID(id);
 
-        if (event) {
+        if (cacheEvent) {
           console.log('cache hit: ', id);
-          const ndkEvent = new NDKEvent(subscription.ndk, JSON.parse(event as string));
+          const ndkEvent = new NDKEvent(
+            subscription.ndk,
+            JSON.parse(cacheEvent.event as string)
+          );
           subscription.eventReceived(ndkEvent, undefined, true);
         }
       }
@@ -59,13 +61,8 @@ export default class TauriAdapter implements NDKCacheAdapter {
 
     return new Promise((resolve) => {
       Promise.all([
-        this.store.set(event.id, JSON.stringify(nostrEvent)),
-        this.store.set(key, event.id),
+        this.store.createEvent(key, event.id, event.kind, JSON.stringify(nostrEvent)),
       ]).then(() => resolve());
     });
   }
-
-  public save() {
-    return this.store.save();
-  }
 }

src/libs/ndk/instance.ts

@@ -1,19 +1,20 @@
 // inspire by: https://github.com/nostr-dev-kit/ndk-react/
 import NDK from '@nostr-dev-kit/ndk';
 import { fetch } from '@tauri-apps/plugin-http';
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import TauriAdapter from '@libs/ndk/cache';
 import { getExplicitRelayUrls } from '@libs/storage';
+import { useStorage } from '@libs/storage/provider';
 
 import { FULL_RELAYS } from '@stores/constants';
 
 export const NDKInstance = () => {
+  const { db } = useStorage();
+
   const [ndk, setNDK] = useState<NDK | undefined>(undefined);
   const [relayUrls, setRelayUrls] = useState<string[]>([]);
 
-  const cacheAdapter = useMemo(() => new TauriAdapter(), []);
-
   // TODO: fully support NIP-11
   async function verifyRelays(relays: string[]) {
     const verifiedRelays: string[] = [];
@@ -57,6 +58,8 @@ 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 });
 
     try {
@@ -71,10 +74,6 @@ export const NDKInstance = () => {
 
   useEffect(() => {
     if (!ndk) initNDK();
-
-    return () => {
-      cacheAdapter.save();
-    };
   }, []);
 
   return {