@ckb-ccc/joy-id 0.0.9-alpha.2 → 0.0.10-alpha.4

package/dist.commonjs/nostr/index.js

@@ -11,121 +11,134 @@ const connectionsStorage_1 = require("../connectionsStorage");
  * @extends {ccc.SignerNostr}
  */
 class NostrSigner extends core_1.ccc.SignerNostr {
-    /**
-     * Ensures that the signer is connected and returns the connection.
-     * @private
-     * @throws Will throw an error if not connected.
-     * @returns {Connection} The current connection.
-     */
-    assertConnection() {
-        if (!this.isConnected() || !this.connection) {
-            throw new Error("Not connected");
-        }
-        return this.connection;
+  /**
+   * Ensures that the signer is connected and returns the connection.
+   * @private
+   * @throws Will throw an error if not connected.
+   * @returns {Connection} The current connection.
+   */
+  assertConnection() {
+    if (!this.isConnected() || !this.connection) {
+      throw new Error("Not connected");
     }
-    /**
-     * Creates an instance of NostrSigner.
-     * @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, name, icon, _appUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
-        super(client);
-        this.name = name;
-        this.icon = icon;
-        this._appUri = _appUri;
-        this.connectionsRepo = connectionsRepo;
-    }
-    async replaceClient(client) {
-        if (!(await super.replaceClient(client))) {
-            return false;
-        }
-        this.connection = undefined;
-        return true;
-    }
-    /**
-     * Gets the configuration for JoyID.
-     * @private
-     * @returns {object} The configuration object.
-     */
-    getConfig() {
-        return {
-            redirectURL: location.href,
-            joyidAppURL: this._appUri ?? this.client.addressPrefix === "ckb"
-                ? "https://app.joy.id"
-                : "https://testnet.joyid.dev",
-            requestNetwork: "nostr",
-            name: this.name,
-            logo: this.icon,
-        };
-    }
-    /**
-     * Connects to the provider by requesting authentication.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    async connect() {
-        const config = this.getConfig();
-        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)(config, "popup", "/auth"), {
-            ...config,
-            type: common_1.DappRequestType.Auth,
-        });
-        this.connection = {
-            address: "",
-            publicKey: core_1.ccc.hexFrom(res.nostrPubkey),
-            keyType: res.keyType,
-        };
-        await this.saveConnection();
-    }
-    async disconnect() {
-        await super.disconnect();
-        this.connection = undefined;
-        await this.saveConnection();
-    }
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    async isConnected() {
-        if (this.connection) {
-            return true;
-        }
-        await this.restoreConnection();
-        return this.connection !== undefined;
-    }
-    async getNostrPublicKey() {
-        return this.assertConnection().publicKey;
-    }
-    async signNostrEvent(event) {
-        const config = this.getConfig();
-        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({ ...config, event }, "popup", "/sign-nostr-event"), {
-            ...config,
-            type: common_1.DappRequestType.SignNostrEvent,
-        });
-        return res.event;
-    }
-    /**
-     * Saves the current connection.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async saveConnection() {
-        return this.connectionsRepo.set({
-            uri: this.getConfig().joyidAppURL,
-            addressType: "nostr",
-        }, this.connection);
-    }
-    /**
-     * Restores the previous connection.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async restoreConnection() {
-        this.connection = await this.connectionsRepo.get({
-            uri: this.getConfig().joyidAppURL,
-            addressType: "nostr",
-        });
+    return this.connection;
+  }
+  /**
+   * Creates an instance of NostrSigner.
+   * @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,
+    name,
+    icon,
+    _appUri,
+    connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage(),
+  ) {
+    super(client);
+    this.name = name;
+    this.icon = icon;
+    this._appUri = _appUri;
+    this.connectionsRepo = connectionsRepo;
+  }
+  /**
+   * Gets the configuration for JoyID.
+   * @private
+   * @returns {object} The configuration object.
+   */
+  getConfig() {
+    return {
+      redirectURL: location.href,
+      joyidAppURL:
+        this._appUri ?? this.client.addressPrefix === "ckb"
+          ? "https://app.joy.id"
+          : "https://testnet.joyid.dev",
+      requestNetwork: "nostr",
+      name: this.name,
+      logo: this.icon,
+    };
+  }
+  /**
+   * Connects to the provider by requesting authentication.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  async connect() {
+    const config = this.getConfig();
+    const res = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(config, "popup", "/auth"),
+      {
+        ...config,
+        type: common_1.DappRequestType.Auth,
+      },
+    );
+    this.connection = {
+      address: "",
+      publicKey: core_1.ccc.hexFrom(res.nostrPubkey),
+      keyType: res.keyType,
+    };
+    await this.saveConnection();
+  }
+  async disconnect() {
+    await super.disconnect();
+    this.connection = undefined;
+    await this.saveConnection();
+  }
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  async isConnected() {
+    if (this.connection) {
+      return true;
     }
+    await this.restoreConnection();
+    return this.connection !== undefined;
+  }
+  async getNostrPublicKey() {
+    return this.assertConnection().publicKey;
+  }
+  async signNostrEvent(event) {
+    const config = this.getConfig();
+    const res = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(
+        { ...config, event },
+        "popup",
+        "/sign-nostr-event",
+      ),
+      {
+        ...config,
+        type: common_1.DappRequestType.SignNostrEvent,
+      },
+    );
+    return res.event;
+  }
+  /**
+   * Saves the current connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  async saveConnection() {
+    return this.connectionsRepo.set(
+      {
+        uri: this.getConfig().joyidAppURL,
+        addressType: "nostr",
+      },
+      this.connection,
+    );
+  }
+  /**
+   * Restores the previous connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  async restoreConnection() {
+    this.connection = await this.connectionsRepo.get({
+      uri: this.getConfig().joyidAppURL,
+      addressType: "nostr",
+    });
+  }
 }
 exports.NostrSigner = NostrSigner;

package/dist.commonjs/signerFactory/index.d.ts

@@ -8,5 +8,10 @@ import { ccc } from "@ckb-ccc/core";
  * @param {string} icon - The icon URL of the signer.
  * @returns {ccc.SignerInfo[]} An array of signer information objects.
  */
-export declare function getJoyIdSigners(client: ccc.Client, name: string, icon: string, preferredNetworks: ccc.NetworkPreference[]): ccc.SignerInfo[];
-//# sourceMappingURL=index.d.ts.map
+export declare function getJoyIdSigners(
+  client: ccc.Client,
+  name: string,
+  icon: string,
+  preferredNetworks: ccc.NetworkPreference[],
+): ccc.SignerInfo[];
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/signerFactory/index.js

@@ -17,37 +17,60 @@ const nostr_1 = require("../nostr");
  * @returns {ccc.SignerInfo[]} An array of signer information objects.
  */
 function getJoyIdSigners(client, name, icon, preferredNetworks) {
-    if ((0, common_1.isStandaloneBrowser)() || core_1.ccc.isWebview(window.navigator.userAgent)) {
-        return [core_1.ccc.SignerType.CKB, core_1.ccc.SignerType.EVM, core_1.ccc.SignerType.BTC].map((type) => ({
-            name: type,
-            signer: new core_1.ccc.SignerAlwaysError(client, type, "JoyID can only be used with standard browsers"),
-        }));
-    }
+  if (
+    (0, common_1.isStandaloneBrowser)() ||
+    core_1.ccc.isWebview(window.navigator.userAgent)
+  ) {
     return [
-        {
-            name: "CKB",
-            signer: new ckb_1.CkbSigner(client, name, icon),
-        },
-        {
-            name: "BTC",
-            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks),
-        },
-        {
-            name: "Nostr",
-            signer: new nostr_1.NostrSigner(client, name, icon),
-        },
-        {
-            name: "EVM",
-            signer: new evm_1.EvmSigner(client, name, icon),
-        },
-        {
-            name: "BTC (P2WPKH)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks, "p2wpkh"),
-        },
-        {
-            name: "BTC (P2TR)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks, "p2tr"),
-        },
-    ];
+      core_1.ccc.SignerType.CKB,
+      core_1.ccc.SignerType.EVM,
+      core_1.ccc.SignerType.BTC,
+    ].map((type) => ({
+      name: type,
+      signer: new core_1.ccc.SignerAlwaysError(
+        client,
+        type,
+        "JoyID can only be used with standard browsers",
+      ),
+    }));
+  }
+  return [
+    {
+      name: "CKB",
+      signer: new ckb_1.CkbSigner(client, name, icon),
+    },
+    {
+      name: "BTC",
+      signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks),
+    },
+    {
+      name: "Nostr",
+      signer: new nostr_1.NostrSigner(client, name, icon),
+    },
+    {
+      name: "EVM",
+      signer: new evm_1.EvmSigner(client, name, icon),
+    },
+    {
+      name: "BTC (P2WPKH)",
+      signer: new btc_1.BitcoinSigner(
+        client,
+        name,
+        icon,
+        preferredNetworks,
+        "p2wpkh",
+      ),
+    },
+    {
+      name: "BTC (P2TR)",
+      signer: new btc_1.BitcoinSigner(
+        client,
+        name,
+        icon,
+        preferredNetworks,
+        "p2tr",
+      ),
+    },
+  ];
 }
 exports.getJoyIdSigners = getJoyIdSigners;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/joy-id",
-  "version": "0.0.9-alpha.2",
+  "version": "0.0.10-alpha.4",
   "description": "Connector's support for JoyID",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.9-alpha.1",
+    "@ckb-ccc/core": "0.0.10-alpha.4",
     "@joyid/ckb": "^1.0.0",
     "@joyid/common": "^0.2.0"
   },
-  "gitHead": "82537aa73662759387f4b127220a02ce48717270"
+  "gitHead": "61228337bbf4bdc0bc082e3c9530f843c2182106"
 }

package/src/btc/index.ts

@@ -62,14 +62,6 @@ export class BitcoinSigner extends ccc.SignerBtc {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<boolean> {
-    if (!(await super.replaceClient(client))) {
-      return false;
-    }
-    this.connection = undefined;
-    return true;
-  }
-
   /**
    * Gets the configuration for JoyID.
    * @private

package/src/ckb/index.ts

@@ -66,14 +66,6 @@ export class CkbSigner extends ccc.Signer {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<boolean> {
-    if (!(await super.replaceClient(client))) {
-      return false;
-    }
-    this.connection = undefined;
-    return true;
-  }
-
   /**
    * Gets the configuration for JoyID.
    * @private

package/src/evm/index.ts

@@ -47,14 +47,6 @@ export class EvmSigner extends ccc.SignerEvm {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<boolean> {
-    if (!(await super.replaceClient(client))) {
-      return false;
-    }
-    this.connection = undefined;
-    return true;
-  }
-
   /**
    * Gets the configuration for JoyID.
    * @private
@@ -75,10 +67,10 @@ export class EvmSigner extends ccc.SignerEvm {
 
   /**
    * Gets the EVM account address.
-   * @returns {Promise<string>} A promise that resolves to the EVM account address.
+   * @returns A promise that resolves to the EVM account address.
    */
-  async getEvmAccount(): Promise<string> {
-    return this.assertConnection().address;
+  async getEvmAccount(): Promise<ccc.Hex> {
+    return this.assertConnection().address as ccc.Hex;
   }
 
   /**

package/src/nostr/index.ts

@@ -47,14 +47,6 @@ export class NostrSigner extends ccc.SignerNostr {
     super(client);
   }
 
-  async replaceClient(client: ccc.Client): Promise<boolean> {
-    if (!(await super.replaceClient(client))) {
-      return false;
-    }
-    this.connection = undefined;
-    return true;
-  }
-
   /**
    * Gets the configuration for JoyID.
    * @private