polish nsecbunker

src/app/auth/import.tsx

@@ -1,5 +1,6 @@
 import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { readText } from '@tauri-apps/plugin-clipboard-manager';
+import { open } from '@tauri-apps/plugin-shell';
 import { motion } from 'framer-motion';
 import { nip19 } from 'nostr-tools';
 import { useState } from 'react';
@@ -49,6 +50,9 @@ export function ImportAccountScreen() {
       await db.createSetting('nsecbunker', '1');
       await db.secureSave(`${pubkey}-nsecbunker`, localSigner.privateKey);
 
+      // open nsecbunker web app in default browser
+      await open('https://app.nsecbunker.com/keys');
+
       const bunker = new NDK({
         explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
       });
@@ -168,6 +172,13 @@ export function ImportAccountScreen() {
                     >
                       Continue with nsecBunker
                     </button>
+                    <div>
+                      <p className="mb-0.5 text-sm font-semibold">Note:</p>
+                      <p className="text-sm text-neutral-600 dark:text-neutral-400">
+                        If you&apos;re using nsecbunker token, keep in mind it only can
+                        redeem one-time, you need to login again in the next launch
+                      </p>
+                    </div>
                   </div>
                 ) : null}
               </div>

src/libs/ndk/instance.ts

@@ -10,6 +10,7 @@ import { ask } from '@tauri-apps/plugin-dialog';
 import { relaunch } from '@tauri-apps/plugin-process';
 import { NostrFetcher, normalizeRelayUrlSet } from 'nostr-fetch';
 import { useEffect, useState } from 'react';
+import { toast } from 'sonner';
 
 import NDKCacheAdapterTauri from '@libs/ndk/cache';
 import { useStorage } from '@libs/storage/provider';
@@ -27,50 +28,69 @@ export const NDKInstance = () => {
   async function getSigner(nsecbunker?: boolean) {
     if (!db.account) return;
 
-    // NIP-46 Signer
+    try {
-    if (nsecbunker) {
+      // NIP-46 Signer
-      const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
+      if (nsecbunker) {
-      if (!localSignerPrivkey) return null;
+        const localSignerPrivkey = await db.secureLoad(`${db.account.pubkey}-nsecbunker`);
+        if (!localSignerPrivkey) return null;
 
-      const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
+        const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
-      const bunker = new NDK({
+        const bunker = new NDK({
-        explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
+          explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
-      });
+        });
-      bunker.connect();
+        bunker.connect();
 
-      const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
+        const remoteSigner = new NDKNip46Signer(bunker, db.account.id, localSigner);
-      await remoteSigner.blockUntilReady();
+        await remoteSigner.blockUntilReady();
 
-      return remoteSigner;
+        return remoteSigner;
+      }
+
+      // Privkey Signer
+      const userPrivkey = await db.secureLoad(db.account.pubkey);
+      if (!userPrivkey) return null;
+      return new NDKPrivateKeySigner(userPrivkey);
+    } catch (e) {
+      console.log(e);
+      if (e === 'Token already redeemed') {
+        toast.info(
+          'nsecbunker token already redeemed. You need to re-login with another token.'
+        );
+
+        await db.secureRemove(`${db.account.pubkey}-nsecbunker`);
+        await db.accountLogout();
+      }
+
+      return null;
     }
-
-    // Privkey Signer
-    const userPrivkey = await db.secureLoad(db.account.pubkey);
-    if (!userPrivkey) return null;
-    return new NDKPrivateKeySigner(userPrivkey);
   }
 
   async function initNDK() {
+    const outboxSetting = await db.getSettingValue('outbox');
+    const bunkerSetting = await db.getSettingValue('nsecbunker');
+
+    const bunker = !!parseInt(bunkerSetting);
+    const outbox = !!parseInt(outboxSetting);
+
+    const explicitRelayUrls = normalizeRelayUrlSet([
+      'wss://relay.damus.io',
+      'wss://relay.nostr.band',
+      'wss://nos.lol',
+      'wss://nostr.mutinywallet.com',
+    ]);
+
+    // #TODO: user should config outbox relays
+    const outboxRelayUrls = normalizeRelayUrlSet(['wss://purplepag.es']);
+
+    // #TODO: user should config blacklist relays
+    const blacklistRelayUrls = normalizeRelayUrlSet(['wss://brb.io']);
+
     try {
-      const outboxSetting = await db.getSettingValue('outbox');
-      const bunkerSetting = await db.getSettingValue('nsecbunker');
-      const explicitRelayUrls = normalizeRelayUrlSet([
-        'wss://relay.damus.io',
-        'wss://relay.nostr.band',
-        'wss://nos.lol',
-        'wss://nostr.mutinywallet.com',
-      ]);
-
-      const bunker = !!parseInt(bunkerSetting);
-      const outbox = !!parseInt(outboxSetting);
-
-      // #TODO: user can config outbox relays
-      const outboxRelayUrls = normalizeRelayUrlSet(['wss://purplepag.es/']);
-
       const tauriAdapter = new NDKCacheAdapterTauri(db);
       const instance = new NDK({
         explicitRelayUrls,
         outboxRelayUrls,
+        blacklistRelayUrls,
         enableOutboxModel: outbox,
         autoConnectUserRelays: true,
         autoFetchUserMutelist: true,
@@ -91,9 +111,9 @@ export const NDKInstance = () => {
       if (db.account) {
         const user = instance.getUser({ pubkey: db.account.pubkey });
         instance.activeUser = user;
-        db.account.contacts = [...(await user.follows(undefined, outbox))].map(
+
-          (user) => user.pubkey
+        const contacts = await user.follows(undefined /* outbox */);
-        );
+        db.account.contacts = [...contacts].map((user) => user.pubkey);
 
         // prefetch newsfeed
         await queryClient.prefetchInfiniteQuery({

src/libs/storage/instance.ts

@@ -416,7 +416,14 @@ export class LumeStorage {
     return await this.db.execute(`DELETE FROM relays WHERE relay = "${relay}";`);
   }
 
-  public async createSetting(key: string, value: string) {
+  public async createSetting(key: string, value: string | undefined) {
+    if (value) {
+      return await this.db.execute(
+        'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+        [key, value]
+      );
+    }
+
     const currentSetting = await this.checkSettingValue(key);
 
     if (!currentSetting)
@@ -470,9 +477,7 @@ export class LumeStorage {
     await this.db.execute("UPDATE accounts SET is_active = '0' WHERE id = $1;", [
       this.account.id,
     ]);
-
     this.account = null;
-    return true;
   }
 
   public async close() {

src/shared/accounts/logout.tsx

@@ -19,7 +19,7 @@ export function Logout() {
 
       // remove private key
       await db.secureRemove(db.account.pubkey);
-      await db.secureRemove(db.account.pubkey + '-nsecbunker');
+      await db.secureRemove(`${db.account.pubkey}-nsecbunker`);
 
       // logout
       await db.accountLogout();