@ckb-ccc/joy-id 0.0.8-alpha.3 → 0.0.9-alpha.0

package/src/nostr/index.ts

@@ -31,31 +31,28 @@ export class NostrSigner extends ccc.SignerNostr {
 
   /**
    * Creates an instance of NostrSigner.
-   * @param {ccc.Client} client - The client instance.
-   * @param {string} name - The name of the signer.
-   * @param {string} icon - The icon URL of the signer.
-   * @param {string} [appUri="https://app.joy.id"] - The application URI.
-   * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+   * @param client - The client instance.
+   * @param name - The name of the signer.
+   * @param icon - The icon URL of the signer.
+   * @param appUri - The application URI.
+   * @param connectionsRepo - The connections repository.
    */
   constructor(
     client: ccc.Client,
     private readonly name: string,
     private readonly icon: string,
-    private readonly appUri = "https://app.joy.id",
+    private readonly _appUri?: string,
     private readonly connectionsRepo: ConnectionsRepo = new ConnectionsRepoLocalStorage(),
   ) {
     super(client);
   }
 
-  static isValidClient(client: ccc.Client): boolean {
-    return client.addressPrefix === "ckt";
-  }
-
   async replaceClient(client: ccc.Client): Promise<boolean> {
-    if (!NostrSigner.isValidClient(client)) {
+    if (!(await super.replaceClient(client))) {
       return false;
     }
-    return super.replaceClient(client);
+    this.connection = undefined;
+    return true;
   }
 
   /**
@@ -66,7 +63,10 @@ export class NostrSigner extends ccc.SignerNostr {
   private getConfig() {
     return {
       redirectURL: location.href,
-      joyidAppURL: this.appUri,
+      joyidAppURL:
+        this._appUri ?? this.client.addressPrefix === "ckb"
+          ? "https://app.joy.id"
+          : "https://testnet.joyid.dev",
       requestNetwork: "nostr",
       name: this.name,
       logo: this.icon,
@@ -89,10 +89,14 @@ export class NostrSigner extends ccc.SignerNostr {
       publicKey: ccc.hexFrom(res.nostrPubkey),
       keyType: res.keyType,
     };
-    await this.connectionsRepo.set(
-      { uri: this.appUri, addressType: "nostr" },
-      this.connection,
-    );
+    await this.saveConnection();
+  }
+
+  async disconnect(): Promise<void> {
+    await super.disconnect();
+
+    this.connection = undefined;
+    await this.saveConnection();
   }
 
   /**
@@ -104,10 +108,7 @@ export class NostrSigner extends ccc.SignerNostr {
       return true;
     }
 
-    this.connection = await this.connectionsRepo.get({
-      uri: this.appUri,
-      addressType: "nostr",
-    });
+    await this.restoreConnection();
     return this.connection !== undefined;
   }
 
@@ -128,4 +129,31 @@ export class NostrSigner extends ccc.SignerNostr {
     );
     return res.event;
   }
+
+  /**
+   * Saves the current connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  private async saveConnection(): Promise<void> {
+    return this.connectionsRepo.set(
+      {
+        uri: this.getConfig().joyidAppURL,
+        addressType: "nostr",
+      },
+      this.connection,
+    );
+  }
+
+  /**
+   * Restores the previous connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  private async restoreConnection(): Promise<void> {
+    this.connection = await this.connectionsRepo.get({
+      uri: this.getConfig().joyidAppURL,
+      addressType: "nostr",
+    });
+  }
 }

package/src/signerFactory/index.ts

@@ -18,6 +18,7 @@ export function getJoyIdSigners(
   client: ccc.Client,
   name: string,
   icon: string,
+  preferredNetworks: ccc.NetworkPreference[],
 ): ccc.SignerInfo[] {
   if (isStandaloneBrowser() || ccc.isWebview(window.navigator.userAgent)) {
     return [ccc.SignerType.CKB, ccc.SignerType.EVM, ccc.SignerType.BTC].map(
@@ -39,7 +40,7 @@ export function getJoyIdSigners(
     },
     {
       name: "BTC",
-      signer: new BitcoinSigner(client, name, icon),
+      signer: new BitcoinSigner(client, name, icon, preferredNetworks),
     },
     {
       name: "Nostr",
@@ -51,11 +52,17 @@ export function getJoyIdSigners(
     },
     {
       name: "BTC (P2WPKH)",
-      signer: new BitcoinSigner(client, name, icon, "p2wpkh"),
+      signer: new BitcoinSigner(
+        client,
+        name,
+        icon,
+        preferredNetworks,
+        "p2wpkh",
+      ),
     },
     {
       name: "BTC (P2TR)",
-      signer: new BitcoinSigner(client, name, icon, "p2tr"),
+      signer: new BitcoinSigner(client, name, icon, preferredNetworks, "p2tr"),
     },
   ];
 }