@ckb-ccc/joy-id 0.0.5-alpha.0 → 0.0.5-alpha.2

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;IAa5C,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAdlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,OAAO,CAAC,gBAAgB;gBAStB,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,WAAW,GAAE,MAAM,GAAG,QAAQ,GAAG,MAAe,EAChD,GAAG,SAAuB,EAC1B,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAIzD,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAKhC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAKnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BxB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAY/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAgBpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/btc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,aAAc,SAAQ,GAAG,CAAC,SAAS;IAa5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAhBlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,OAAO,CAAC,gBAAgB;gBAStB,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,GAAE,MAAM,GAAG,QAAQ,GAAG,MAAe,EAChD,MAAM,SAAuB,EAC7B,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAW/D,OAAO,CAAC,SAAS;IAUX,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAKhC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAKnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BxB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAY/B,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAsBvE"}

package/dist.commonjs/btc/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitcoinSigner = void 0;
 const core_1 = require("@ckb-ccc/core");
 const common_1 = require("@joyid/common");
+const common_2 = require("../common");
 const connectionsStorage_1 = require("../connectionsStorage");
 class BitcoinSigner extends core_1.ccc.SignerBtc {
     assertConnection() {
@@ -11,14 +12,25 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
         }
         return this.connection;
     }
-    constructor(client, addressType = "auto", uri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+    constructor(client, name, icon, addressType = "auto", appUri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
         super(client);
+        this.name = name;
+        this.icon = icon;
         this.addressType = addressType;
-        this.uri = uri;
+        this.appUri = appUri;
         this.connectionsRepo = connectionsRepo;
     }
     async replaceClient(client) {
-        return new BitcoinSigner(client, this.addressType, this.uri);
+        return new BitcoinSigner(client, this.name, this.icon, this.addressType, this.appUri, this.connectionsRepo);
+    }
+    getConfig() {
+        return {
+            redirectURL: location.href,
+            joyidAppURL: this.appUri,
+            requestNetwork: `btc-${this.addressType}`,
+            name: this.name,
+            logo: this.icon,
+        };
     }
     async getBtcAccount() {
         const { address } = this.assertConnection();
@@ -29,10 +41,10 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
         return publicKey;
     }
     async connect() {
-        const res = await (0, common_1.authWithPopup)({
-            joyidAppURL: this.uri,
-            redirectURL: location.href,
-            requestNetwork: `btc-${this.addressType}`,
+        const config = this.getConfig();
+        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)(config, "popup", "/auth"), {
+            ...config,
+            type: common_1.DappRequestType.Auth,
         });
         const { address, pubkey } = (() => {
             if (this.addressType === "auto") {
@@ -46,8 +58,8 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
             keyType: res.keyType,
         };
         await Promise.all([
-            this.connectionsRepo.set({ uri: this.uri, addressType: `btc-${res.btcAddressType}` }, this.connection),
-            this.connectionsRepo.set({ uri: this.uri, addressType: "btc-auto" }, this.connection),
+            this.connectionsRepo.set({ uri: this.appUri, addressType: `btc-${res.btcAddressType}` }, this.connection),
+            this.connectionsRepo.set({ uri: this.appUri, addressType: "btc-auto" }, this.connection),
         ]);
     }
     async isConnected() {
@@ -55,22 +67,21 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
             return true;
         }
         this.connection = await this.connectionsRepo.get({
-            uri: this.uri,
+            uri: this.appUri,
             addressType: `btc-${this.addressType}`,
         });
         return this.connection !== undefined;
     }
-    async signMessage(message) {
+    async signMessageRaw(message) {
         const { address } = this.assertConnection();
         const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
-        const { signature } = await (0, common_1.signMessageWithPopup)({
-            joyidAppURL: this.uri,
-            requestNetwork: `btc-${this.addressType}`,
+        const config = this.getConfig();
+        const { signature } = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
+            ...config,
             challenge,
             address,
             signMessageType: "ecdsa",
-            redirectURL: location.href,
-        });
+        }, "popup", "/sign-message"), { ...config, type: common_1.DappRequestType.SignMessage });
         return signature;
     }
 }

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

@@ -1,24 +1,30 @@
 import { ccc } from "@ckb-ccc/core";
 import { ConnectionsRepo } from "../connectionsStorage";
 export declare class CkbSigner extends ccc.Signer {
-    private readonly _uri?;
+    private readonly name;
+    private readonly icon;
+    private readonly _appUri?;
     private readonly _aggregatorUri?;
     private readonly connectionsRepo;
+    get type(): ccc.SignerType;
+    get signType(): ccc.SignerSignType;
     private connection?;
     private assertConnection;
-    constructor(client: ccc.Client, _uri?: string | undefined, _aggregatorUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
+    constructor(client: ccc.Client, name: string, icon: string, _appUri?: string | undefined, _aggregatorUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
     replaceClient(client: ccc.Client): Promise<CkbSigner>;
-    private getUri;
+    private getConfig;
     private getAggregatorUri;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     isConnected(): Promise<boolean>;
     getInternalAddress(): Promise<string>;
+    getIdentity(): Promise<string>;
     getAddressObj(): Promise<ccc.Address>;
     getAddressObjs(): Promise<ccc.Address[]>;
     prepareTransaction(txLike: ccc.TransactionLike): Promise<ccc.Transaction>;
     private prepareTransactionForSubKey;
     signOnlyTransaction(txLike: ccc.TransactionLike): Promise<ccc.Transaction>;
+    signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
     private saveConnection;
     private restoreConnection;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ckb/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAUpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,SAAU,SAAQ,GAAG,CAAC,MAAM;IAarC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAdlC,OAAO,CAAC,UAAU,CAAC,CAAa;YAElB,gBAAgB;gBAS5B,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,CAAC,oBAAQ,EACb,cAAc,CAAC,oBAAQ,EACvB,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;YAI7C,MAAM;YAUN,gBAAgB;IAUxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAexB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAOrC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAIxC,kBAAkB,CACtB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAgBb,2BAA2B;IAuCnC,mBAAmB,CACvB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YA6Bb,cAAc;YAUd,iBAAiB;CAMhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ckb/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,SAAU,SAAQ,GAAG,CAAC,MAAM;IAqBrC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAxBlC,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAEzB;IAED,IAAI,QAAQ,IAAI,GAAG,CAAC,cAAc,CAEjC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;YAElB,gBAAgB;gBAS5B,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,cAAc,CAAC,oBAAQ,EACvB,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW3D,OAAO,CAAC,SAAS;IAYjB,OAAO,CAAC,gBAAgB;IAUlB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAQ9B,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAOrC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAIxC,kBAAkB,CACtB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAgBb,2BAA2B;IAuCnC,mBAAmB,CACvB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IAyBrB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BxD,cAAc;YAUd,iBAAiB;CAMhC"}

package/dist.commonjs/ckb/index.js

@@ -4,44 +4,55 @@ exports.CkbSigner = void 0;
 const core_1 = require("@ckb-ccc/core");
 const ckb_1 = require("@joyid/ckb");
 const common_1 = require("@joyid/common");
+const common_2 = require("../common");
 const connectionsStorage_1 = require("../connectionsStorage");
 class CkbSigner extends core_1.ccc.Signer {
+    get type() {
+        return core_1.ccc.SignerType.CKB;
+    }
+    get signType() {
+        return core_1.ccc.SignerSignType.JoyId;
+    }
     async assertConnection() {
         if (!(await this.isConnected()) || !this.connection) {
             throw new Error("Not connected");
         }
         return this.connection;
     }
-    constructor(client, _uri, _aggregatorUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+    constructor(client, name, icon, _appUri, _aggregatorUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
         super(client);
-        this._uri = _uri;
+        this.name = name;
+        this.icon = icon;
+        this._appUri = _appUri;
         this._aggregatorUri = _aggregatorUri;
         this.connectionsRepo = connectionsRepo;
     }
     async replaceClient(client) {
-        return new CkbSigner(client, this._uri);
+        return new CkbSigner(client, this.name, this.icon, this._appUri, this._aggregatorUri, this.connectionsRepo);
     }
-    async getUri() {
-        if (this._uri) {
-            return this._uri;
-        }
-        return (await this.client.getAddressPrefix()) === "ckb"
-            ? "https://app.joy.id"
-            : "https://testnet.joyid.dev";
+    getConfig() {
+        return {
+            redirectURL: location.href,
+            joyidAppURL: this._appUri ?? this.client.addressPrefix === "ckb"
+                ? "https://app.joy.id"
+                : "https://testnet.joyid.dev",
+            name: this.name,
+            logo: this.icon,
+        };
     }
-    async getAggregatorUri() {
+    getAggregatorUri() {
         if (this._aggregatorUri) {
             return this._aggregatorUri;
         }
-        return (await this.client.getAddressPrefix()) === "ckb"
+        return this.client.addressPrefix === "ckb"
             ? "https://cota.nervina.dev/mainnet-aggregator"
             : "https://cota.nervina.dev/aggregator";
     }
     async connect() {
-        const uri = await this.getUri();
-        const res = await (0, common_1.authWithPopup)({
-            joyidAppURL: uri,
-            redirectURL: location.href,
+        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.address,
@@ -64,6 +75,13 @@ class CkbSigner extends core_1.ccc.Signer {
     async getInternalAddress() {
         return (await this.assertConnection()).address;
     }
+    async getIdentity() {
+        const connection = await this.assertConnection();
+        return JSON.stringify({
+            keyType: connection.keyType,
+            publicKey: connection.publicKey.slice(2),
+        });
+    }
     async getAddressObj() {
         return await core_1.ccc.Address.fromString(await this.getInternalAddress(), this.client);
     }
@@ -110,35 +128,45 @@ class CkbSigner extends core_1.ccc.Signer {
         tx.cellDeps.unshift(...cotaDeps);
     }
     async signOnlyTransaction(txLike) {
-        const popup = (0, common_1.openPopup)("");
-        if (!popup) {
-            return (0, common_1.createBlockDialog)(async () => this.signOnlyTransaction(txLike));
-        }
         const tx = core_1.ccc.Transaction.from(txLike);
         const { script } = await this.getAddressObj();
-        popup.location.href = (0, common_1.buildJoyIDURL)({
-            joyidAppURL: await this.getUri(),
+        const config = this.getConfig();
+        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
+            ...config,
             tx: JSON.parse(tx.stringify()),
             signerAddress: (await this.assertConnection()).address,
-            redirectURL: location.href,
             witnessIndex: await tx.findInputIndexByLock(script, this.client),
-        }, "popup", "/sign-ckb-raw-tx");
-        const res = await (0, common_1.runPopup)({
-            timeoutInSeconds: 3600,
-            popup,
+        }, "popup", "/sign-ckb-raw-tx"), {
+            ...config,
             type: common_1.DappRequestType.SignCkbRawTx,
         });
         return core_1.ccc.Transaction.from(res.tx);
     }
+    async signMessageRaw(message) {
+        const { address } = await this.assertConnection();
+        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
+        const config = this.getConfig();
+        const res = 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 JSON.stringify({
+            signature: res.signature,
+            alg: res.alg,
+            message: res.message,
+        });
+    }
     async saveConnection() {
         return this.connectionsRepo.set({
-            uri: await this.getUri(),
+            uri: this.getConfig().joyidAppURL,
             addressType: "ckb",
         }, this.connection);
     }
     async restoreConnection() {
         this.connection = await this.connectionsRepo.get({
-            uri: await this.getUri(),
+            uri: this.getConfig().joyidAppURL,
             addressType: "ckb",
         });
     }

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

@@ -0,0 +1,24 @@
+import { AuthResponseData, DappRequestType, EvmWeb2LoginResponse, PopupConfigOptions, SignCkbTxResponseData, SignCotaNFTResponseData, SignEvmTxResponseData, SignMessageResponseData, SignNostrEventData } from "@joyid/common";
+export interface PopupReturnType {
+    [DappRequestType.Auth]: AuthResponseData;
+    [DappRequestType.SignMessage]: SignMessageResponseData;
+    [DappRequestType.SignEvm]: SignEvmTxResponseData;
+    [DappRequestType.SignPsbt]: SignEvmTxResponseData;
+    [DappRequestType.BatchSignPsbt]: {
+        psbts: string[];
+    };
+    [DappRequestType.SignCkbTx]: SignCkbTxResponseData;
+    [DappRequestType.SignCotaNFT]: SignCotaNFTResponseData;
+    [DappRequestType.SignCkbRawTx]: SignCkbTxResponseData;
+    [DappRequestType.SignNostrEvent]: SignNostrEventData;
+    [DappRequestType.EncryptNostrMessage]: any;
+    [DappRequestType.DecryptNostrMessage]: any;
+    [DappRequestType.AuthMiniApp]: any;
+    [DappRequestType.SignMiniAppEvm]: any;
+    [DappRequestType.SignMiniAppMessage]: any;
+    [DappRequestType.EvmWeb2Login]: EvmWeb2LoginResponse;
+}
+export declare function createPopup<T extends DappRequestType>(url: string, config: PopupConfigOptions<T> & {
+    joyidAppURL: string;
+}): Promise<PopupReturnType[T]>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EAEpB,kBAAkB,EAGlB,qBAAqB,EACrB,uBAAuB,EACvB,qBAAqB,EACrB,uBAAuB,EACvB,kBAAkB,EAInB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,eAAe;IAC9B,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACzC,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACvD,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,qBAAqB,CAAC;IACjD,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IAClD,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE;QAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC;IACF,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,qBAAqB,CAAC;IACnD,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACvD,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACtD,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACrD,CAAC,eAAe,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC3C,CAAC,eAAe,CAAC,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC3C,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC;IACnC,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC;IACtC,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,GAAG,CAAC;IAC1C,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACtD;AAED,wBAAsB,WAAW,CAAC,CAAC,SAAS,eAAe,EACzD,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GACtD,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CA0D7B"}

package/dist.commonjs/common/index.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPopup = void 0;
+const common_1 = require("@joyid/common");
+async function createPopup(url, config) {
+    if (config.popup == null) {
+        config.popup = (0, common_1.openPopup)("");
+        if (config.popup == null) {
+            return (0, common_1.createBlockDialog)(async () => createPopup(url, config));
+        }
+    }
+    config.popup.location.href = url;
+    return new Promise((resolve, reject) => {
+        if ((0, common_1.isStandaloneBrowser)()) {
+            reject(new common_1.PopupNotSupportedError(config.popup));
+        }
+        let popupEventListener;
+        let timeoutId;
+        // Check each second if the popup is closed triggering a PopupCancelledError
+        const popupTimer = setInterval(() => {
+            if (config.popup?.closed) {
+                clearInterval(popupTimer);
+                clearTimeout(timeoutId);
+                window.removeEventListener("message", popupEventListener, false);
+                reject(new common_1.PopupCancelledError(config.popup));
+            }
+        }, 1000);
+        timeoutId = setTimeout(() => {
+            clearInterval(popupTimer);
+            reject(new common_1.PopupTimeoutError(config.popup));
+            window.removeEventListener("message", popupEventListener, false);
+        }, (config.timeoutInSeconds ?? 3000) * 1000);
+        popupEventListener = (e) => {
+            const { joyidAppURL } = config;
+            const appURL = new URL(joyidAppURL);
+            if (e.origin !== appURL.origin) {
+                return;
+            }
+            if (!e.data || e.data?.type !== config.type) {
+                return;
+            }
+            clearTimeout(timeoutId);
+            clearInterval(popupTimer);
+            window.removeEventListener("message", popupEventListener, false);
+            config.popup.close();
+            if (e.data.error) {
+                reject(new Error(e.data.error));
+            }
+            resolve(e.data.data);
+        };
+        window.addEventListener("message", popupEventListener);
+    });
+}
+exports.createPopup = createPopup;

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

@@ -0,0 +1,20 @@
+import { ccc } from "@ckb-ccc/core";
+import { ConnectionsRepo } from "../connectionsStorage";
+export declare class EvmSigner extends ccc.SignerEvm {
+    private readonly name;
+    private readonly icon;
+    private readonly appUri;
+    private readonly connectionsRepo;
+    private connection?;
+    private assertConnection;
+    constructor(client: ccc.Client, name: string, icon: string, appUri?: string, connectionsRepo?: ConnectionsRepo);
+    replaceClient(client: ccc.Client): Promise<EvmSigner>;
+    private getConfig;
+    getEvmAccount(): Promise<string>;
+    connect(): Promise<void>;
+    isConnected(): Promise<boolean>;
+    signMessageRaw(message: string | ccc.BytesLike): Promise<ccc.Hex>;
+    private saveConnection;
+    private restoreConnection;
+}
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/evm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,SAAU,SAAQ,GAAG,CAAC,SAAS;IAaxC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAflC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC,OAAO,CAAC,gBAAgB;gBAStB,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAuB,EAC7B,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAU3D,OAAO,CAAC,SAAS;IAUX,aAAa;IAIb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;YAuBzD,cAAc;YAUd,iBAAiB;CAMhC"}

package/dist.commonjs/evm/index.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvmSigner = void 0;
+const core_1 = require("@ckb-ccc/core");
+const common_1 = require("@joyid/common");
+const common_2 = require("../common");
+const connectionsStorage_1 = require("../connectionsStorage");
+class EvmSigner extends core_1.ccc.SignerEvm {
+    assertConnection() {
+        if (!this.isConnected() || !this.connection) {
+            throw new Error("Not connected");
+        }
+        return this.connection;
+    }
+    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;
+    }
+    async replaceClient(client) {
+        return new EvmSigner(client, this.name, this.icon, this.appUri, this.connectionsRepo);
+    }
+    getConfig() {
+        return {
+            redirectURL: location.href,
+            joyidAppURL: this.appUri,
+            requestNetwork: `ethereum`,
+            name: this.name,
+            logo: this.icon,
+        };
+    }
+    async getEvmAccount() {
+        return this.assertConnection().address;
+    }
+    async connect() {
+        const config = await 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 isConnected() {
+        if (this.connection) {
+            return true;
+        }
+        await this.restoreConnection();
+        return this.connection !== undefined;
+    }
+    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);
+    }
+    async saveConnection() {
+        return this.connectionsRepo.set({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        }, this.connection);
+    }
+    async restoreConnection() {
+        this.connection = await this.connectionsRepo.get({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        });
+    }
+}
+exports.EvmSigner = EvmSigner;

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

@@ -1,3 +1,3 @@
 import { ccc } from "@ckb-ccc/core";
-export declare function getJoyIdSigners(client: ccc.Client): ccc.SignerInfo[];
+export declare function getJoyIdSigners(client: ccc.Client, name: string, icon: string): ccc.SignerInfo[];
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,wBAAgB,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,CAuBpE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAKpC,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,UAAU,EAAE,CAuBlB"}

package/dist.commonjs/signerFactory/index.js

@@ -1,30 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJoyIdSigners = void 0;
-const core_1 = require("@ckb-ccc/core");
 const btc_1 = require("../btc");
 const ckb_1 = require("../ckb");
-function getJoyIdSigners(client) {
+const evm_1 = require("../evm");
+function getJoyIdSigners(client, name, icon) {
     return [
         {
-            type: core_1.ccc.SignerType.CKB,
             name: "CKB",
-            signer: new ckb_1.CkbSigner(client),
+            signer: new ckb_1.CkbSigner(client, name, icon),
         },
         {
-            type: core_1.ccc.SignerType.BTC,
             name: "BTC",
-            signer: new btc_1.BitcoinSigner(client),
+            signer: new btc_1.BitcoinSigner(client, name, icon),
+        },
+        {
+            name: "EVM",
+            signer: new evm_1.EvmSigner(client, name, icon),
         },
         {
-            type: core_1.ccc.SignerType.BTC,
             name: "BTC (P2WPKH)",
-            signer: new btc_1.BitcoinSigner(client, "p2wpkh"),
+            signer: new btc_1.BitcoinSigner(client, name, icon, "p2wpkh"),
         },
         {
-            type: core_1.ccc.SignerType.BTC,
             name: "BTC (P2TR)",
-            signer: new btc_1.BitcoinSigner(client, "p2tr"),
+            signer: new btc_1.BitcoinSigner(client, name, icon, "p2tr"),
         },
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/joy-id",
-  "version": "0.0.5-alpha.0",
+  "version": "0.0.5-alpha.2",
   "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.5-alpha.0",
+    "@ckb-ccc/core": "0.0.5-alpha.2",
     "@joyid/ckb": "^0.0.11",
     "@joyid/common": "^0.0.3"
   },
-  "gitHead": "8a927f901a8f2fe7dfe2f6bf78a44689d6503949"
+  "gitHead": "abbcbe8e25dc561e0a134d3906f40bb49b8a035f"
 }

package/src/advancedBarrel.ts

@@ -1 +1,2 @@
+export * from "./common";
 export * from "./connectionsStorage";

package/src/barrel.ts

@@ -1,3 +1,4 @@
 export * from "./btc";
 export * from "./ckb";
+export * from "./evm";
 export * from "./signerFactory";