@ckb-ccc/joy-id 0.0.5-alpha.6 → 0.0.5-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/common/index.d.ts.map +1 -1
  2. package/dist/common/index.js +5 -11
  3. package/dist/signerFactory/index.d.ts.map +1 -1
  4. package/dist/signerFactory/index.js +8 -0
  5. package/dist.commonjs/common/index.d.ts.map +1 -1
  6. package/dist.commonjs/common/index.js +5 -11
  7. package/dist.commonjs/signerFactory/index.d.ts.map +1 -1
  8. package/dist.commonjs/signerFactory/index.js +8 -0
  9. package/package.json +3 -3
  10. package/src/common/index.ts +5 -11
  11. package/src/signerFactory/index.ts +14 -0
package/dist/common/index.d.ts.map CHANGED
@@ -1 +1 @@
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,CAgE7B"}
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/common/index.js CHANGED
@@ -13,20 +13,14 @@ export async function createPopup(url, config) {
13
13
  }
14
14
  let popupEventListener;
15
15
  let timeoutId;
16
- let isClosed = false;
17
16
  // Check each second if the popup is closed triggering a PopupCancelledError
18
17
  const popupTimer = setInterval(() => {
19
- if (!config.popup?.closed) {
20
- return;
21
- }
22
- clearTimeout(timeoutId);
23
- if (!isClosed) {
24
- isClosed = true;
25
- return;
18
+ if (config.popup?.closed) {
19
+ clearInterval(popupTimer);
20
+ clearTimeout(timeoutId);
21
+ window.removeEventListener("message", popupEventListener, false);
22
+ reject(new PopupCancelledError(config.popup));
26
23
  }
27
- clearInterval(popupTimer);
28
- window.removeEventListener("message", popupEventListener, false);
29
- reject(new PopupCancelledError(config.popup));
30
24
  }, 1000);
31
25
  timeoutId = setTimeout(() => {
32
26
  clearInterval(popupTimer);
package/dist/signerFactory/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMpC,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,UAAU,EAAE,CAoClB"}
package/dist/signerFactory/index.js CHANGED
@@ -1,7 +1,15 @@
1
+ import { ccc } from "@ckb-ccc/core";
2
+ import { isStandaloneBrowser } from "@joyid/common";
1
3
  import { BitcoinSigner } from "../btc";
2
4
  import { CkbSigner } from "../ckb";
3
5
  import { EvmSigner } from "../evm";
4
6
  export function getJoyIdSigners(client, name, icon) {
7
+ if (isStandaloneBrowser() || ccc.isWebview(window.navigator.userAgent)) {
8
+ return [ccc.SignerType.CKB, ccc.SignerType.EVM, ccc.SignerType.BTC].map((type) => ({
9
+ name: type,
10
+ signer: new ccc.SignerAlwaysError(client, type, "JoyID can only be used with standard browsers"),
11
+ }));
12
+ }
5
13
  return [
6
14
  {
7
15
  name: "CKB",
package/dist.commonjs/common/index.d.ts.map CHANGED
@@ -1 +1 @@
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,CAgE7B"}
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 CHANGED
@@ -16,20 +16,14 @@ async function createPopup(url, config) {
16
16
  }
17
17
  let popupEventListener;
18
18
  let timeoutId;
19
- let isClosed = false;
20
19
  // Check each second if the popup is closed triggering a PopupCancelledError
21
20
  const popupTimer = setInterval(() => {
22
- if (!config.popup?.closed) {
23
- return;
24
- }
25
- clearTimeout(timeoutId);
26
- if (!isClosed) {
27
- isClosed = true;
28
- return;
21
+ if (config.popup?.closed) {
22
+ clearInterval(popupTimer);
23
+ clearTimeout(timeoutId);
24
+ window.removeEventListener("message", popupEventListener, false);
25
+ reject(new common_1.PopupCancelledError(config.popup));
29
26
  }
30
- clearInterval(popupTimer);
31
- window.removeEventListener("message", popupEventListener, false);
32
- reject(new common_1.PopupCancelledError(config.popup));
33
27
  }, 1000);
34
28
  timeoutId = setTimeout(() => {
35
29
  clearInterval(popupTimer);
package/dist.commonjs/signerFactory/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMpC,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,UAAU,EAAE,CAoClB"}
package/dist.commonjs/signerFactory/index.js CHANGED
@@ -1,10 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getJoyIdSigners = void 0;
4
+ const core_1 = require("@ckb-ccc/core");
5
+ const common_1 = require("@joyid/common");
4
6
  const btc_1 = require("../btc");
5
7
  const ckb_1 = require("../ckb");
6
8
  const evm_1 = require("../evm");
7
9
  function getJoyIdSigners(client, name, icon) {
10
+ if ((0, common_1.isStandaloneBrowser)() || core_1.ccc.isWebview(window.navigator.userAgent)) {
11
+ return [core_1.ccc.SignerType.CKB, core_1.ccc.SignerType.EVM, core_1.ccc.SignerType.BTC].map((type) => ({
12
+ name: type,
13
+ signer: new core_1.ccc.SignerAlwaysError(client, type, "JoyID can only be used with standard browsers"),
14
+ }));
15
+ }
8
16
  return [
9
17
  {
10
18
  name: "CKB",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ckb-ccc/joy-id",
3
- "version": "0.0.5-alpha.6",
3
+ "version": "0.0.5-alpha.8",
4
4
  "description": "Connector's support for JoyID",
5
5
  "author": "Hanssen0 <hanssen0@hanssen0.com>",
6
6
  "license": "MIT",
@@ -38,9 +38,9 @@
38
38
  "access": "public"
39
39
  },
40
40
  "dependencies": {
41
- "@ckb-ccc/core": "0.0.5-alpha.2",
41
+ "@ckb-ccc/core": "0.0.5-alpha.8",
42
42
  "@joyid/ckb": "^0.0.11",
43
43
  "@joyid/common": "^0.0.3"
44
44
  },
45
- "gitHead": "416611ae73cca21e94cb7bf7b8f916859e92a05b"
45
+ "gitHead": "f12b8758d8581bfae0c9a00abbb5f7d2c6d03147"
46
46
  }
package/src/common/index.ts CHANGED
@@ -56,20 +56,14 @@ export async function createPopup<T extends DappRequestType>(
56
56
  }
57
57
  let popupEventListener: (e: MessageEvent) => void;
58
58
  let timeoutId: undefined | ReturnType<typeof setTimeout>;
59
- let isClosed = false;
60
59
  // Check each second if the popup is closed triggering a PopupCancelledError
61
60
  const popupTimer = setInterval(() => {
62
- if (!config.popup?.closed) {
63
- return;
64
- }
65
- clearTimeout(timeoutId);
66
- if (!isClosed) {
67
- isClosed = true;
68
- return;
61
+ if (config.popup?.closed) {
62
+ clearInterval(popupTimer);
63
+ clearTimeout(timeoutId);
64
+ window.removeEventListener("message", popupEventListener, false);
65
+ reject(new PopupCancelledError(config.popup));
69
66
  }
70
- clearInterval(popupTimer);
71
- window.removeEventListener("message", popupEventListener, false);
72
- reject(new PopupCancelledError(config.popup));
73
67
  }, 1000);
74
68
 
75
69
  timeoutId = setTimeout(
package/src/signerFactory/index.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { ccc } from "@ckb-ccc/core";
2
+ import { isStandaloneBrowser } from "@joyid/common";
2
3
  import { BitcoinSigner } from "../btc";
3
4
  import { CkbSigner } from "../ckb";
4
5
  import { EvmSigner } from "../evm";
@@ -8,6 +9,19 @@ export function getJoyIdSigners(
8
9
  name: string,
9
10
  icon: string,
10
11
  ): ccc.SignerInfo[] {
12
+ if (isStandaloneBrowser() || ccc.isWebview(window.navigator.userAgent)) {
13
+ return [ccc.SignerType.CKB, ccc.SignerType.EVM, ccc.SignerType.BTC].map(
14
+ (type) => ({
15
+ name: type,
16
+ signer: new ccc.SignerAlwaysError(
17
+ client,
18
+ type,
19
+ "JoyID can only be used with standard browsers",
20
+ ),
21
+ }),
22
+ );
23
+ }
24
+
11
25
  return [
12
26
  {
13
27
  name: "CKB",