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

package/dist.commonjs/evm/index.js

@@ -11,142 +11,134 @@ const connectionsStorage_1 = require("../connectionsStorage");
  * @extends {ccc.SignerEvm}
  */
 class EvmSigner extends core_1.ccc.SignerEvm {
-  /**
-   * 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");
+    /**
+     * 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;
     }
-    return this.connection;
-  }
-  /**
-   * Creates an instance of EvmSigner.
-   * @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.
-   */
-  constructor(
-    client,
-    name,
-    icon,
-    appUri = "https://app.joy.id",
-    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,
-      requestNetwork: `ethereum`,
-      name: this.name,
-      logo: this.icon,
-    };
-  }
-  /**
-   * Gets the EVM account address.
-   * @returns {Promise<string>} A promise that resolves to the EVM account address.
-   */
-  async getEvmAccount() {
-    return this.assertConnection().address;
-  }
-  /**
-   * 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: res.ethAddress,
-      publicKey: core_1.ccc.hexFrom(res.pubkey),
-      keyType: res.keyType,
-    };
-    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;
+    /**
+     * Creates an instance of EvmSigner.
+     * @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: `ethereum`,
+            name: this.name,
+            logo: this.icon,
+        };
+    }
+    /**
+     * Gets the EVM account address.
+     * @returns {Promise<string>} A promise that resolves to the EVM account address.
+     */
+    async getEvmAccount() {
+        return this.assertConnection().address;
+    }
+    /**
+     * 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: res.ethAddress,
+            publicKey: core_1.ccc.hexFrom(res.pubkey),
+            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;
+    }
+    /**
+     * Signs a raw message with the EVM account.
+     * @param {string | ccc.BytesLike} message - The message to sign.
+     * @returns {Promise<ccc.Hex>} A promise that resolves to the signed message.
+     */
+    async signMessageRaw(message) {
+        const { address } = this.assertConnection();
+        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
+        const config = this.getConfig();
+        const { signature } = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
+            ...config,
+            challenge,
+            isData: typeof message !== "string",
+            address,
+        }, "popup", "/sign-message"), { ...config, type: common_1.DappRequestType.SignMessage });
+        return core_1.ccc.hexFrom(signature);
+    }
+    /**
+     * Saves the current connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    async saveConnection() {
+        return this.connectionsRepo.set({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        }, this.connection);
+    }
+    /**
+     * Restores the previous connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    async restoreConnection() {
+        this.connection = await this.connectionsRepo.get({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        });
     }
-    await this.restoreConnection();
-    return this.connection !== undefined;
-  }
-  /**
-   * Signs a raw message with the EVM account.
-   * @param {string | ccc.BytesLike} message - The message to sign.
-   * @returns {Promise<ccc.Hex>} A promise that resolves to the signed message.
-   */
-  async signMessageRaw(message) {
-    const { address } = this.assertConnection();
-    const challenge =
-      typeof message === "string"
-        ? message
-        : core_1.ccc.hexFrom(message).slice(2);
-    const config = this.getConfig();
-    const { signature } = await (0, common_2.createPopup)(
-      (0, common_1.buildJoyIDURL)(
-        {
-          ...config,
-          challenge,
-          isData: typeof message !== "string",
-          address,
-        },
-        "popup",
-        "/sign-message",
-      ),
-      { ...config, type: common_1.DappRequestType.SignMessage },
-    );
-    return core_1.ccc.hexFrom(signature);
-  }
-  /**
-   * Saves the current connection.
-   * @private
-   * @returns {Promise<void>}
-   */
-  async saveConnection() {
-    return this.connectionsRepo.set(
-      {
-        uri: this.getConfig().joyidAppURL,
-        addressType: "ethereum",
-      },
-      this.connection,
-    );
-  }
-  /**
-   * Restores the previous connection.
-   * @private
-   * @returns {Promise<void>}
-   */
-  async restoreConnection() {
-    this.connection = await this.connectionsRepo.get({
-      uri: this.getConfig().joyidAppURL,
-      addressType: "ethereum",
-    });
-  }
 }
 exports.EvmSigner = EvmSigner;

package/dist.commonjs/index.d.ts

@@ -1,2 +1,2 @@
 export * as JoyId from "./barrel";
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/index.js

@@ -1,48 +1,27 @@
 "use strict";
-var __createBinding =
-  (this && this.__createBinding) ||
-  (Object.create
-    ? function (o, m, k, k2) {
-        if (k2 === undefined) k2 = k;
-        var desc = Object.getOwnPropertyDescriptor(m, k);
-        if (
-          !desc ||
-          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
-        ) {
-          desc = {
-            enumerable: true,
-            get: function () {
-              return m[k];
-            },
-          };
-        }
-        Object.defineProperty(o, k2, desc);
-      }
-    : function (o, m, k, k2) {
-        if (k2 === undefined) k2 = k;
-        o[k2] = m[k];
-      });
-var __setModuleDefault =
-  (this && this.__setModuleDefault) ||
-  (Object.create
-    ? function (o, v) {
-        Object.defineProperty(o, "default", { enumerable: true, value: v });
-      }
-    : function (o, v) {
-        o["default"] = v;
-      });
-var __importStar =
-  (this && this.__importStar) ||
-  function (mod) {
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null)
-      for (var k in mod)
-        if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
-          __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
-  };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoyId = void 0;
 exports.JoyId = __importStar(require("./barrel"));

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

@@ -6,52 +6,58 @@ import { ConnectionsRepo } from "../connectionsStorage";
  * @extends {ccc.SignerNostr}
  */
 export declare class NostrSigner extends ccc.SignerNostr {
-  private readonly name;
-  private readonly icon;
-  private readonly appUri;
-  private readonly connectionsRepo;
-  private 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.
-   */
-  private assertConnection;
-  /**
-   * 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.
-   */
-  constructor(
-    client: ccc.Client,
-    name: string,
-    icon: string,
-    appUri?: string,
-    connectionsRepo?: ConnectionsRepo,
-  );
-  static isValidClient(client: ccc.Client): boolean;
-  replaceClient(client: ccc.Client): Promise<boolean>;
-  /**
-   * Gets the configuration for JoyID.
-   * @private
-   * @returns {object} The configuration object.
-   */
-  private getConfig;
-  /**
-   * Connects to the provider by requesting authentication.
-   * @returns {Promise<void>} A promise that resolves when the connection is established.
-   */
-  connect(): Promise<void>;
-  /**
-   * Checks if the signer is connected.
-   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-   */
-  isConnected(): Promise<boolean>;
-  getNostrPublicKey(): Promise<ccc.Hex>;
-  signNostrEvent(event: ccc.NostrEvent): Promise<Required<ccc.NostrEvent>>;
+    private readonly name;
+    private readonly icon;
+    private readonly _appUri?;
+    private readonly connectionsRepo;
+    private 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.
+     */
+    private assertConnection;
+    /**
+     * 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: ccc.Client, name: string, icon: string, _appUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
+    replaceClient(client: ccc.Client): Promise<boolean>;
+    /**
+     * Gets the configuration for JoyID.
+     * @private
+     * @returns {object} The configuration object.
+     */
+    private getConfig;
+    /**
+     * Connects to the provider by requesting authentication.
+     * @returns {Promise<void>} A promise that resolves when the connection is established.
+     */
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    /**
+     * Checks if the signer is connected.
+     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+     */
+    isConnected(): Promise<boolean>;
+    getNostrPublicKey(): Promise<ccc.Hex>;
+    signNostrEvent(event: ccc.NostrEvent): Promise<Required<ccc.NostrEvent>>;
+    /**
+     * Saves the current connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    private saveConnection;
+    /**
+     * Restores the previous connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    private restoreConnection;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/nostr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;IA2B5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAuB,EAC7B,eAAe,GAAE,eAAmD;IAKvF,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO;IAI3C,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAUjB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAY/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;CAWrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;IA2B5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAajB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAexB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAYpC;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}