clean up and improve perf

src/libs/ndk/instance.ts

@@ -1,20 +1,18 @@
 import NDK from '@nostr-dev-kit/ndk';
+import NDKCacheAdapterDexie from '@nostr-dev-kit/ndk-cache-dexie';
 import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
 import { message } from '@tauri-apps/api/dialog';
 import { fetch } from '@tauri-apps/api/http';
 import { NostrFetcher } from 'nostr-fetch';
 import { useEffect, useMemo, useState } from 'react';
 
-import TauriAdapter from '@libs/ndk/cache';
 import { useStorage } from '@libs/storage/provider';
 
 export const NDKInstance = () => {
-  const { db } = useStorage();
-
   const [ndk, setNDK] = useState<NDK | undefined>(undefined);
   const [relayUrls, setRelayUrls] = useState<string[]>([]);
 
-  const cacheAdapter = useMemo(() => new TauriAdapter(), []);
+  const { db } = useStorage();
   const fetcher = useMemo(
     () => (ndk ? NostrFetcher.withCustomPool(ndkAdapter(ndk)) : null),
     [ndk]
@@ -57,9 +55,10 @@ export const NDKInstance = () => {
 
   async function initNDK() {
     const explicitRelayUrls = await getExplicitRelays();
+    const dexieAdapter = new NDKCacheAdapterDexie({ dbName: 'lume_ndkcache' });
     const instance = new NDK({
       explicitRelayUrls,
-      cacheAdapter,
+      cacheAdapter: dexieAdapter,
     });
 
     try {
@@ -77,10 +76,6 @@ export const NDKInstance = () => {
 
   useEffect(() => {
     if (!ndk) initNDK();
-
-    return () => {
-      cacheAdapter.saveCache();
-    };
   }, []);
 
   return {

src/libs/storage/instance.ts

@@ -1,4 +1,4 @@
-import { NDKEvent, NDKUserProfile } from '@nostr-dev-kit/ndk';
+import { NDKEvent } from '@nostr-dev-kit/ndk';
 import { BaseDirectory, removeFile } from '@tauri-apps/api/fs';
 import { Platform } from '@tauri-apps/api/os';
 import Database from 'tauri-plugin-sql-api';
@@ -6,7 +6,6 @@ import { Stronghold } from 'tauri-plugin-stronghold-api';
 
 import { FULL_RELAYS } from '@stores/constants';
 
-import { toRawEvent } from '@utils/rawEvent';
 import { Account, DBEvent, Relays, Widget } from '@utils/types';
 
 export class LumeStorage {
@@ -124,6 +123,7 @@ export class LumeStorage {
 
   public async updateLastLogin() {
     const now = Math.floor(Date.now() / 1000);
+    this.account.last_login_at = now;
     return await this.db.execute(
       'UPDATE accounts SET last_login_at = $1 WHERE id = $2;',
       [now, this.account.id]
@@ -298,38 +298,6 @@ export class LumeStorage {
     return results.length < 1;
   }
 
-  public async createMetadata(event: NDKEvent) {
-    const rawEvent = toRawEvent(event);
-
-    return await this.db.execute(
-      'INSERT OR IGNORE INTO metadata (id, event, author, kind, created_at) VALUES ($1, $2, $3, $4, $5);',
-      [
-        rawEvent.id,
-        JSON.stringify(rawEvent),
-        rawEvent.pubkey,
-        rawEvent.kind,
-        rawEvent.created_at,
-      ]
-    );
-  }
-
-  public async createProfile(pubkey: string, profile: NDKUserProfile) {
-    return await this.db.execute(
-      'INSERT OR REPLACE INTO metadata (id, event, author, kind, created_at) VALUES ($1, $2, $3, $4, $5);',
-      [pubkey, JSON.stringify(profile), pubkey, 0, Math.round(Date.now() / 1000)]
-    );
-  }
-
-  public async getMetadataByPubkey(pubkey: string) {
-    const results: DBEvent[] = await this.db.select(
-      'SELECT * FROM metadata WHERE author = $1 AND kind = "0" LIMIT 1;',
-      [pubkey]
-    );
-
-    if (results.length < 1) return null;
-    return JSON.parse(results[0].event as string) as NDKEvent;
-  }
-
   public async getExplicitRelayUrls() {
     if (!this.account) return FULL_RELAYS;