@onekeyfe/hd-core 0.3.7 → 0.3.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 (12) hide show
  1. package/dist/api/CheckBridgeRelease.d.ts.map +1 -1
  2. package/dist/api/CheckBridgeStatus.d.ts.map +1 -1
  3. package/dist/core/index.d.ts.map +1 -1
  4. package/dist/data/config.d.ts.map +1 -1
  5. package/dist/data-manager/TransportManager.d.ts.map +1 -1
  6. package/dist/index.js +18 -2
  7. package/package.json +4 -4
  8. package/src/api/CheckBridgeRelease.ts +3 -0
  9. package/src/api/CheckBridgeStatus.ts +3 -0
  10. package/src/core/index.ts +5 -3
  11. package/src/data/config.ts +1 -1
  12. package/src/data-manager/TransportManager.ts +3 -0
package/dist/api/CheckBridgeRelease.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CheckBridgeRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckBridgeRelease.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAME,GAAG;;;;;CAuDV"}
1
+ {"version":3,"file":"CheckBridgeRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckBridgeRelease.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAS1C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,IAAI;IAME,GAAG;;;;;CA0DV"}
package/dist/api/CheckBridgeStatus.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CheckBridgeStatus.d.ts","sourceRoot":"","sources":["../../src/api/CheckBridgeStatus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU;IACvD,IAAI;IAME,GAAG;CAmBV"}
1
+ {"version":3,"file":"CheckBridgeStatus.d.ts","sourceRoot":"","sources":["../../src/api/CheckBridgeStatus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU;IACvD,IAAI;IAME,GAAG;CAsBV"}
package/dist/core/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgRjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AAoJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgRjD,CAAC;AAuMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AAoJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
package/dist/data/config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/data/config.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,WAAoB,CAAC;AAC/C,eAAO,MAAM,cAAc,QAAgD,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/data/config.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,aAAa,WAAoB,CAAC;AAC/C,eAAO,MAAM,cAAc,QAAmD,CAAC"}
package/dist/data-manager/TransportManager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAenD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,IAAI;WAME,SAAS;WAyBT,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,GAAG,IAAI;IAkB1D,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG;IAY7C,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;CAG1B"}
1
+ {"version":3,"file":"TransportManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/TransportManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAenD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC;IAE5B,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAEnD,MAAM,CAAC,eAAe,UAAS;IAE/B,MAAM,CAAC,IAAI;WAME,SAAS;WA4BT,WAAW,CAAC,QAAQ,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,GAAG,IAAI;IAkB1D,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,GAAG;IAY7C,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,kBAAkB;IAIzB,MAAM,CAAC,kBAAkB;CAG1B"}
package/dist/index.js CHANGED
@@ -11317,7 +11317,7 @@ function patchFeatures(response) {
11317
11317
 
11318
11318
  const pkg = require('../package.json');
11319
11319
  const getSDKVersion = () => pkg.version;
11320
- const DEFAULT_DOMAIN = `https://jssdk.onekey.so/${getSDKVersion()}/`;
11320
+ const DEFAULT_DOMAIN = `https://jssdk.onekeycn.com/${getSDKVersion()}/`;
11321
11321
 
11322
11322
  const DEFAULT_PRIORITY = 2;
11323
11323
  const initialSettings = {
@@ -12401,6 +12401,7 @@ class TransportManager {
12401
12401
  this.currentMessages = this.defaultMessages;
12402
12402
  }
12403
12403
  static configure() {
12404
+ var _a;
12404
12405
  return __awaiter(this, void 0, void 0, function* () {
12405
12406
  try {
12406
12407
  const env = DataManager.getSettings('env');
@@ -12423,6 +12424,9 @@ class TransportManager {
12423
12424
  }
12424
12425
  catch (error) {
12425
12426
  Log$7.debug('Initializing transports error: ', error);
12427
+ if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
12428
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeForbiddenError);
12429
+ }
12426
12430
  if (error.code === 'ECONNABORTED') {
12427
12431
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeTimeoutError);
12428
12432
  }
@@ -13388,6 +13392,10 @@ class CheckBridgeStatus extends BaseMethod {
13388
13392
  })
13389
13393
  .then(() => resolve(true))
13390
13394
  .catch(e => {
13395
+ var _a;
13396
+ if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
13397
+ reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeForbiddenError));
13398
+ }
13391
13399
  if (e.code === 'ECONNABORTED') {
13392
13400
  reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeTimeoutError));
13393
13401
  }
@@ -13410,6 +13418,7 @@ class CheckBridgeRelease extends BaseMethod {
13410
13418
  this.skipForceUpdateCheck = true;
13411
13419
  }
13412
13420
  run() {
13421
+ var _a;
13413
13422
  return __awaiter(this, void 0, void 0, function* () {
13414
13423
  if (!this.device.features) {
13415
13424
  return null;
@@ -13453,6 +13462,9 @@ class CheckBridgeRelease extends BaseMethod {
13453
13462
  };
13454
13463
  }
13455
13464
  catch (e) {
13465
+ if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 403) {
13466
+ return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeForbiddenError));
13467
+ }
13456
13468
  if (e.code === 'ECONNABORTED') {
13457
13469
  return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeTimeoutError));
13458
13470
  }
@@ -20192,7 +20204,11 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
20192
20204
  }
20193
20205
  catch (error) {
20194
20206
  Log.debug('device list error: ', error);
20195
- if ([hdShared.HardwareErrorCode.BridgeNotInstalled, hdShared.HardwareErrorCode.BridgeTimeoutError].includes(error.errorCode)) {
20207
+ if ([
20208
+ hdShared.HardwareErrorCode.BridgeNotInstalled,
20209
+ hdShared.HardwareErrorCode.BridgeTimeoutError,
20210
+ hdShared.HardwareErrorCode.BridgeForbiddenError,
20211
+ ].includes(error.errorCode)) {
20196
20212
  _deviceList = undefined;
20197
20213
  reject(error);
20198
20214
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "0.3.7",
3
+ "version": "0.3.8",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
24
24
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
25
25
  },
26
26
  "dependencies": {
27
- "@onekeyfe/hd-shared": "^0.3.7",
28
- "@onekeyfe/hd-transport": "^0.3.7",
27
+ "@onekeyfe/hd-shared": "^0.3.8",
28
+ "@onekeyfe/hd-transport": "^0.3.8",
29
29
  "axios": "^0.27.2",
30
30
  "bignumber.js": "^9.0.2",
31
31
  "bytebuffer": "^5.0.1",
@@ -43,5 +43,5 @@
43
43
  "@types/semver": "^7.3.9",
44
44
  "ripple-keypairs": "^1.1.4"
45
45
  },
46
- "gitHead": "af7c99cfa5084d02dc931227e4a963b080767e4f"
46
+ "gitHead": "ceb0ccd989c481d1343771cc38159ede866629a0"
47
47
  }
package/src/api/CheckBridgeRelease.ts CHANGED
@@ -66,6 +66,9 @@ export default class CheckBridgeRelease extends BaseMethod {
66
66
  releaseVersion: BridgeVersion,
67
67
  };
68
68
  } catch (e) {
69
+ if (e.response?.status === 403) {
70
+ return Promise.reject(ERRORS.TypedError(HardwareErrorCode.BridgeForbiddenError));
71
+ }
69
72
  if (e.code === 'ECONNABORTED') {
70
73
  return Promise.reject(ERRORS.TypedError(HardwareErrorCode.BridgeTimeoutError));
71
74
  }
package/src/api/CheckBridgeStatus.ts CHANGED
@@ -20,6 +20,9 @@ export default class CheckBridgeStatus extends BaseMethod {
20
20
  })
21
21
  .then(() => resolve(true))
22
22
  .catch(e => {
23
+ if (e.response?.status === 403) {
24
+ reject(ERRORS.TypedError(HardwareErrorCode.BridgeForbiddenError));
25
+ }
23
26
  if (e.code === 'ECONNABORTED') {
24
27
  reject(ERRORS.TypedError(HardwareErrorCode.BridgeTimeoutError));
25
28
  } else {
package/src/core/index.ts CHANGED
@@ -462,9 +462,11 @@ const ensureConnected = async (method: BaseMethod, pollingId: number) => {
462
462
  } catch (error) {
463
463
  Log.debug('device list error: ', error);
464
464
  if (
465
- [HardwareErrorCode.BridgeNotInstalled, HardwareErrorCode.BridgeTimeoutError].includes(
466
- error.errorCode
467
- )
465
+ [
466
+ HardwareErrorCode.BridgeNotInstalled,
467
+ HardwareErrorCode.BridgeTimeoutError,
468
+ HardwareErrorCode.BridgeForbiddenError,
469
+ ].includes(error.errorCode)
468
470
  ) {
469
471
  _deviceList = undefined;
470
472
  reject(error);
package/src/data/config.ts CHANGED
@@ -2,4 +2,4 @@
2
2
  const pkg = require('../package.json');
3
3
 
4
4
  export const getSDKVersion = () => pkg.version;
5
- export const DEFAULT_DOMAIN = `https://jssdk.onekey.so/${getSDKVersion()}/`;
5
+ export const DEFAULT_DOMAIN = `https://jssdk.onekeycn.com/${getSDKVersion()}/`;
package/src/data-manager/TransportManager.ts CHANGED
@@ -47,6 +47,9 @@ export default class TransportManager {
47
47
  Log.debug('Configuring transports done');
48
48
  } catch (error) {
49
49
  Log.debug('Initializing transports error: ', error);
50
+ if (error.response?.status === 403) {
51
+ throw ERRORS.TypedError(HardwareErrorCode.BridgeForbiddenError);
52
+ }
50
53
  if (error.code === 'ECONNABORTED') {
51
54
  throw ERRORS.TypedError(HardwareErrorCode.BridgeTimeoutError);
52
55
  }