@onekeyfe/hd-core 1.0.13 → 1.0.14

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/allnetwork/AllNetworkGetAddress.d.ts.map +1 -1
  2. package/dist/core/index.d.ts.map +1 -1
  3. package/dist/device/Device.d.ts.map +1 -1
  4. package/dist/index.d.ts +3 -2
  5. package/dist/index.js +40 -25
  6. package/dist/types/api/allNetworkGetAddress.d.ts +3 -2
  7. package/dist/types/api/allNetworkGetAddress.d.ts.map +1 -1
  8. package/package.json +4 -4
  9. package/src/api/allnetwork/AllNetworkGetAddress.ts +29 -33
  10. package/src/core/index.ts +8 -18
  11. package/src/device/Device.ts +15 -0
  12. package/src/types/api/allNetworkGetAddress.ts +4 -3
package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AllNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddress.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAsN9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAC1D;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;KAClC,GAAG;QACF,UAAU,EAAE,MAAM,OAAO,CAAC;QAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;YAAE,aAAa,EAAE,uBAAuB,CAAA;SAAE,CAAC;QAC3F,eAAe,EACX;YACE,UAAU,EAAE,MAAM,OAAO,CAAC;YAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/C,EAAE,GACH,SAAS,CAAC;KACf;IAyBK,UAAU,CAAC,UAAU,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,oBAAoB;IAkDnF,GAAG;CAqDV"}
1
+ {"version":3,"file":"AllNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAqN9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAC1D;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;KAClC,GAAG;QACF,UAAU,EAAE,MAAM,OAAO,CAAC;QAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;YAAE,aAAa,EAAE,uBAAuB,CAAA;SAAE,CAAC;QAC3F,eAAe,EACX;YACE,UAAU,EAAE,MAAM,OAAO,CAAC;YAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/C,EAAE,GACH,SAAS,CAAC;KACf;IAyBK,UAAU,CAAC,UAAU,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,oBAAoB;IAiDnF,GAAG;CAqDV"}
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;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AAyBnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA0CxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgRjD,CAAC;AAmNF,eAAO,MAAM,MAAM,eAAgB,MAAM,SAkBxC,CAAC;AAsJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IAkDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AA6BnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA0CxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAkQjD,CAAC;AAmNF,eAAO,MAAM,MAAM,eAAgB,MAAM,SAkBxC,CAAC;AAsJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IAkDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC"}
package/dist/device/Device.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -703,8 +703,9 @@ type AllNetworkAddress = CommonResponseParams & {
703
703
  payload?: AllNetworkAddressPayload | {
704
704
  error: string;
705
705
  code: number;
706
- connectId: string;
707
- deviceId: string;
706
+ connectId?: string;
707
+ deviceId?: string;
708
+ params: any;
708
709
  };
709
710
  };
710
711
  type AllNetworkGetAddressParams = {
package/dist/index.js CHANGED
@@ -25949,6 +25949,18 @@ class Device extends events.exports {
25949
25949
  if (this.runPromise) {
25950
25950
  this.runPromise.reject(e);
25951
25951
  }
25952
+ if (e instanceof hdShared.HardwareError &&
25953
+ (e.errorCode === hdShared.HardwareErrorCode.DeviceInitializeFailed ||
25954
+ e.errorCode === hdShared.HardwareErrorCode.DeviceInterruptedFromOutside ||
25955
+ e.errorCode === hdShared.HardwareErrorCode.DeviceInterruptedFromUser ||
25956
+ e.errorCode === hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError ||
25957
+ e.errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError ||
25958
+ e.errorCode === hdShared.HardwareErrorCode.PinInvalid ||
25959
+ e.errorCode === hdShared.HardwareErrorCode.PinCancelled ||
25960
+ e.errorCode === hdShared.HardwareErrorCode.UnexpectPassphrase)) {
25961
+ yield this.release();
25962
+ Log$7.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
25963
+ }
25952
25964
  this.runPromise = null;
25953
25965
  return;
25954
25966
  }
@@ -28225,7 +28237,7 @@ class AllNetworkGetAddress extends BaseMethod {
28225
28237
  };
28226
28238
  }
28227
28239
  callMethod(methodName, params, baseParams) {
28228
- var _a, _b, _c;
28240
+ var _a;
28229
28241
  return __awaiter(this, void 0, void 0, function* () {
28230
28242
  const method = findMethod({
28231
28243
  event: IFRAME.CALL,
@@ -28234,12 +28246,12 @@ class AllNetworkGetAddress extends BaseMethod {
28234
28246
  });
28235
28247
  method.connector = this.connector;
28236
28248
  method.postMessage = this.postMessage;
28237
- method.init();
28238
- (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
28239
28249
  let result;
28240
28250
  try {
28251
+ method.init();
28252
+ (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
28241
28253
  const response = yield method.run();
28242
- result = Object.assign(Object.assign({}, baseParams), { success: true, payload: Object.assign(Object.assign({}, response), { error: (_b = response.payload) === null || _b === void 0 ? void 0 : _b.error, errorCode: (_c = response.payload) === null || _c === void 0 ? void 0 : _c.errorCode }) });
28254
+ result = Object.assign(Object.assign({}, baseParams), { success: true, payload: response });
28243
28255
  }
28244
28256
  catch (e) {
28245
28257
  const error = handleSkippableHardwareError(e, this.device, method);
@@ -28247,8 +28259,9 @@ class AllNetworkGetAddress extends BaseMethod {
28247
28259
  result = Object.assign(Object.assign({}, baseParams), { success: false, payload: {
28248
28260
  error: error.message,
28249
28261
  code: error.errorCode,
28250
- connectId: this.payload.connectId,
28251
- deviceId: this.payload.deviceId,
28262
+ params: error.params,
28263
+ connectId: method.connectId,
28264
+ deviceId: method.deviceId,
28252
28265
  } });
28253
28266
  }
28254
28267
  else {
@@ -28259,7 +28272,7 @@ class AllNetworkGetAddress extends BaseMethod {
28259
28272
  });
28260
28273
  }
28261
28274
  run() {
28262
- var _a, _b, _c, _d, _e;
28275
+ var _a, _b, _c;
28263
28276
  return __awaiter(this, void 0, void 0, function* () {
28264
28277
  const responses = [];
28265
28278
  for (let i = 0; i < this.payload.bundle.length; i++) {
@@ -28282,7 +28295,7 @@ class AllNetworkGetAddress extends BaseMethod {
28282
28295
  const result = Object.assign(Object.assign({}, response), { payload: Object.assign(Object.assign({}, response.payload), dependOnPayloads) });
28283
28296
  responses.push(result);
28284
28297
  if (((_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.length) > 1) {
28285
- const progress = Math.round(((i + 1) / ((_e = (_d = this.payload) === null || _d === void 0 ? void 0 : _d.bundle) === null || _e === void 0 ? void 0 : _e.length)) * 100);
28298
+ const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
28286
28299
  this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
28287
28300
  }
28288
28301
  this.postPreviousAddressMessage(result);
@@ -28292,31 +28305,33 @@ class AllNetworkGetAddress extends BaseMethod {
28292
28305
  }
28293
28306
  }
28294
28307
  function handleSkippableHardwareError(e, device, method) {
28295
- let error = undefined;
28296
- if (e.message.includes('Failure_UnexpectedMessage')) {
28308
+ var _a, _b, _c, _d, _e;
28309
+ let error;
28310
+ if (e instanceof hdShared.HardwareError && e.errorCode !== hdShared.HardwareErrorCode.RuntimeError) {
28311
+ const { errorCode } = e;
28312
+ if (errorCode === hdShared.HardwareErrorCode.CallMethodInvalidParameter) {
28313
+ error = e;
28314
+ }
28315
+ else if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
28316
+ error = e;
28317
+ }
28318
+ }
28319
+ else if ((_a = e.message) === null || _a === void 0 ? void 0 : _a.includes('Failure_UnexpectedMessage')) {
28297
28320
  const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
28298
28321
  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
28299
28322
  if (versionRange &&
28300
28323
  semver__default["default"].valid(versionRange.min) &&
28301
28324
  semver__default["default"].lt(currentVersion, versionRange.min)) {
28302
- error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, { current: currentVersion, require: versionRange.min });
28325
+ error = hdShared.ERRORS.createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min);
28303
28326
  }
28304
28327
  else {
28305
28328
  error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse, e.message);
28306
28329
  }
28307
28330
  }
28308
- else if (e.message.includes('Forbidden key path')) {
28331
+ else if (((_c = (_b = e.message) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === null || _c === void 0 ? void 0 : _c.includes('forbidden key path')) ||
28332
+ ((_e = (_d = e.message) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === null || _e === void 0 ? void 0 : _e.includes('invalid path'))) {
28309
28333
  error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, e.message);
28310
28334
  }
28311
- else if (e.message.includes('DeviceCheckPassphraseStateError')) {
28312
- error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError, e.message);
28313
- }
28314
- else if (e instanceof hdShared.HardwareError) {
28315
- const errorCode = e.errorCode;
28316
- if (errorCode === hdShared.HardwareErrorCode.CallMethodInvalidParameter) {
28317
- error = e;
28318
- }
28319
- }
28320
28335
  return error;
28321
28336
  }
28322
28337
 
@@ -35578,20 +35593,20 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
35578
35593
  const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
35579
35594
  if ((newVersionStatus === 'required' || bleVersionStatus === 'required') &&
35580
35595
  method.skipForceUpdateCheck === false) {
35581
- throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NewFirmwareForceUpdate, 'Device firmware version is too low, please update to the latest version', { connectId: method.connectId, deviceId: method.deviceId });
35596
+ throw hdShared.createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId);
35582
35597
  }
35583
35598
  if (versionRange) {
35584
35599
  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
35585
35600
  if (semver__default["default"].valid(versionRange.min) && semver__default["default"].lt(currentVersion, versionRange.min)) {
35586
35601
  if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
35587
- throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NewFirmwareUnRelease);
35602
+ throw hdShared.createNewFirmwareUnReleaseHardwareError(currentVersion, versionRange.min);
35588
35603
  }
35589
- return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, { current: currentVersion, require: versionRange.min }));
35604
+ return Promise.reject(hdShared.createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min));
35590
35605
  }
35591
35606
  if (versionRange.max &&
35592
35607
  semver__default["default"].valid(versionRange.max) &&
35593
35608
  semver__default["default"].gte(currentVersion, versionRange.max)) {
35594
- return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodDeprecated, `Device firmware version is too high, this method has been deprecated in ${versionRange.max}`, { current: currentVersion, deprecated: versionRange.max }));
35609
+ return Promise.reject(hdShared.createDeprecatedHardwareError(currentVersion, versionRange.max));
35595
35610
  }
35596
35611
  }
35597
35612
  }
package/dist/types/api/allNetworkGetAddress.d.ts CHANGED
@@ -48,8 +48,9 @@ export type AllNetworkAddress = CommonResponseParams & {
48
48
  payload?: AllNetworkAddressPayload | {
49
49
  error: string;
50
50
  code: number;
51
- connectId: string;
52
- deviceId: string;
51
+ connectId?: string;
52
+ deviceId?: string;
53
+ params: any;
53
54
  };
54
55
  };
55
56
  export type AllNetworkGetAddressParams = {
package/dist/types/api/allNetworkGetAddress.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EACJ,wBAAwB,GACxB;QACE,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IAIb,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EACJ,wBAAwB,GACxB;QACE,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,GAAG,CAAC;KACb,CAAC;CACP,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.0.13",
3
+ "version": "1.0.14",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "^1.0.13",
29
- "@onekeyfe/hd-transport": "^1.0.13",
28
+ "@onekeyfe/hd-shared": "^1.0.14",
29
+ "@onekeyfe/hd-transport": "^1.0.14",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
44
44
  "@types/semver": "^7.3.9",
45
45
  "ripple-keypairs": "^1.1.4"
46
46
  },
47
- "gitHead": "619f985df358c4e5b2a0afccc3ceec1a7b32a4c2"
47
+ "gitHead": "50078eb11577444de519f9dae9e8a37f3041b167"
48
48
  }
package/src/api/allnetwork/AllNetworkGetAddress.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import semver from 'semver';
2
- import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
2
+ import { ERRORS, HardwareError, HardwareErrorCode, serializeError } from '@onekeyfe/hd-shared';
3
3
 
4
4
  import { get } from 'lodash';
5
- import { UI_REQUEST } from '../../constants/ui-request';
6
5
  import { serializedPath } from '../helpers/pathUtils';
7
6
  import { BaseMethod } from '../BaseMethod';
8
7
  import { validateParams } from '../helpers/paramsValidator';
@@ -19,8 +18,7 @@ import { createUiMessage, IFRAME } from '../../events';
19
18
  import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
20
19
  import { Device } from '../../device/Device';
21
20
  import { PROTO } from '../../constants';
22
-
23
- import { HardwareError } from '@onekeyfe/hd-shared';
21
+ import { UI_REQUEST } from '../../constants/ui-request';
24
22
 
25
23
  const Mainnet = 'mainnet';
26
24
 
@@ -307,23 +305,21 @@ export default class AllNetworkGetAddress extends BaseMethod<
307
305
 
308
306
  method.connector = this.connector;
309
307
  method.postMessage = this.postMessage;
310
- method.init();
311
- method.setDevice?.(this.device);
312
308
 
313
309
  let result: AllNetworkAddress;
314
310
  try {
311
+ method.init();
312
+ method.setDevice?.(this.device);
313
+
315
314
  const response = await method.run();
316
315
  result = {
317
316
  ...baseParams,
318
317
  success: true,
319
- payload: {
320
- ...response,
321
- error: response.payload?.error,
322
- errorCode: response.payload?.errorCode,
323
- },
318
+ payload: response,
324
319
  };
325
320
  } catch (e: any) {
326
321
  const error = handleSkippableHardwareError(e, this.device, method);
322
+
327
323
  if (error) {
328
324
  result = {
329
325
  ...baseParams,
@@ -331,8 +327,9 @@ export default class AllNetworkGetAddress extends BaseMethod<
331
327
  payload: {
332
328
  error: error.message,
333
329
  code: error.errorCode,
334
- connectId: this.payload.connectId,
335
- deviceId: this.payload.deviceId,
330
+ params: error.params,
331
+ connectId: method.connectId,
332
+ deviceId: method.deviceId,
336
333
  },
337
334
  };
338
335
  } else {
@@ -358,7 +355,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
358
355
  const response = await this.callMethod(
359
356
  dependOnMethod.methodName,
360
357
  dependOnMethod.params,
361
- param,
358
+ param
362
359
  );
363
360
  dependOnMethodResults.push(response);
364
361
  }
@@ -378,7 +375,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
378
375
 
379
376
  const dependOnPayloads = dependOnMethodResults.reduce(
380
377
  (acc, cur) => Object.assign(acc, get(cur, 'payload', {})),
381
- {},
378
+ {}
382
379
  );
383
380
 
384
381
  const result: AllNetworkAddress = {
@@ -388,7 +385,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
388
385
  };
389
386
  responses.push(result);
390
387
  if (this.payload?.bundle?.length > 1) {
391
- const progress = Math.round(((i + 1) / this.payload?.bundle?.length) * 100);
388
+ const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
392
389
  this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
393
390
  }
394
391
  this.postPreviousAddressMessage(result);
@@ -401,14 +398,21 @@ export default class AllNetworkGetAddress extends BaseMethod<
401
398
  function handleSkippableHardwareError(
402
399
  e: any,
403
400
  device: Device,
404
- method: BaseMethod,
401
+ method: BaseMethod
405
402
  ): HardwareError | undefined {
406
- let error: HardwareError | undefined = undefined;
403
+ let error: HardwareError | undefined;
407
404
 
408
- if (e.message.includes('Failure_UnexpectedMessage')) {
405
+ if (e instanceof HardwareError && e.errorCode !== HardwareErrorCode.RuntimeError) {
406
+ const { errorCode } = e;
407
+ if (errorCode === HardwareErrorCode.CallMethodInvalidParameter) {
408
+ error = e;
409
+ } else if (errorCode === HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
410
+ error = e;
411
+ }
412
+ } else if (e.message?.includes('Failure_UnexpectedMessage')) {
409
413
  const versionRange = getMethodVersionRange(
410
414
  device.features,
411
- type => method.getVersionRange()[type],
415
+ type => method.getVersionRange()[type]
412
416
  );
413
417
  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
414
418
 
@@ -417,23 +421,15 @@ function handleSkippableHardwareError(
417
421
  semver.valid(versionRange.min) &&
418
422
  semver.lt(currentVersion, versionRange.min)
419
423
  ) {
420
- error = ERRORS.TypedError(
421
- HardwareErrorCode.CallMethodNeedUpgradeFirmware,
422
- `Device firmware version is too low, please update to ${versionRange.min}`,
423
- { current: currentVersion, require: versionRange.min },
424
- );
424
+ error = ERRORS.createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min);
425
425
  } else {
426
426
  error = ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse, e.message);
427
427
  }
428
- } else if (e.message.includes('Forbidden key path')) {
428
+ } else if (
429
+ e.message?.toLowerCase()?.includes('forbidden key path') ||
430
+ e.message?.toLowerCase()?.includes('invalid path')
431
+ ) {
429
432
  error = ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, e.message);
430
- } else if (e.message.includes('DeviceCheckPassphraseStateError')) {
431
- error = ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError, e.message);
432
- } else if (e instanceof HardwareError) {
433
- const errorCode = e.errorCode;
434
- if (errorCode === HardwareErrorCode.CallMethodInvalidParameter) {
435
- error = e;
436
- }
437
433
  }
438
434
 
439
435
  return error;
package/src/core/index.ts CHANGED
@@ -3,6 +3,10 @@ import EventEmitter from 'events';
3
3
  import { Features, LowlevelTransportSharedPlugin, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
4
4
  import {
5
5
  createDeferred,
6
+ createDeprecatedHardwareError,
7
+ createNeedUpgradeFirmwareHardwareError,
8
+ createNewFirmwareForceUpdateHardwareError,
9
+ createNewFirmwareUnReleaseHardwareError,
6
10
  Deferred,
7
11
  ERRORS,
8
12
  HardwareError,
@@ -175,26 +179,18 @@ export const callAPI = async (message: CoreMessage) => {
175
179
  (newVersionStatus === 'required' || bleVersionStatus === 'required') &&
176
180
  method.skipForceUpdateCheck === false
177
181
  ) {
178
- throw ERRORS.TypedError(
179
- HardwareErrorCode.NewFirmwareForceUpdate,
180
- 'Device firmware version is too low, please update to the latest version',
181
- { connectId: method.connectId, deviceId: method.deviceId }
182
- );
182
+ throw createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId);
183
183
  }
184
184
 
185
185
  if (versionRange) {
186
186
  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
187
187
  if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
188
188
  if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
189
- throw ERRORS.TypedError(HardwareErrorCode.NewFirmwareUnRelease);
189
+ throw createNewFirmwareUnReleaseHardwareError(currentVersion, versionRange.min);
190
190
  }
191
191
 
192
192
  return Promise.reject(
193
- ERRORS.TypedError(
194
- HardwareErrorCode.CallMethodNeedUpgradeFirmware,
195
- `Device firmware version is too low, please update to ${versionRange.min}`,
196
- { current: currentVersion, require: versionRange.min }
197
- )
193
+ createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min)
198
194
  );
199
195
  }
200
196
  if (
@@ -202,13 +198,7 @@ export const callAPI = async (message: CoreMessage) => {
202
198
  semver.valid(versionRange.max) &&
203
199
  semver.gte(currentVersion, versionRange.max)
204
200
  ) {
205
- return Promise.reject(
206
- ERRORS.TypedError(
207
- HardwareErrorCode.CallMethodDeprecated,
208
- `Device firmware version is too high, this method has been deprecated in ${versionRange.max}`,
209
- { current: currentVersion, deprecated: versionRange.max }
210
- )
211
- );
201
+ return Promise.reject(createDeprecatedHardwareError(currentVersion, versionRange.max));
212
202
  }
213
203
  }
214
204
  }
package/src/device/Device.ts CHANGED
@@ -492,6 +492,21 @@ export class Device extends EventEmitter {
492
492
  this.runPromise.reject(e);
493
493
  }
494
494
 
495
+ if (
496
+ e instanceof HardwareError &&
497
+ (e.errorCode === HardwareErrorCode.DeviceInitializeFailed ||
498
+ e.errorCode === HardwareErrorCode.DeviceInterruptedFromOutside ||
499
+ e.errorCode === HardwareErrorCode.DeviceInterruptedFromUser ||
500
+ e.errorCode === HardwareErrorCode.DeviceCheckPassphraseStateError ||
501
+ e.errorCode === HardwareErrorCode.ResponseUnexpectTypeError ||
502
+ e.errorCode === HardwareErrorCode.PinInvalid ||
503
+ e.errorCode === HardwareErrorCode.PinCancelled ||
504
+ e.errorCode === HardwareErrorCode.UnexpectPassphrase)
505
+ ) {
506
+ await this.release();
507
+ Log.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
508
+ }
509
+
495
510
  this.runPromise = null;
496
511
  return;
497
512
  }
package/src/types/api/allNetworkGetAddress.ts CHANGED
@@ -95,8 +95,9 @@ export type AllNetworkAddress = CommonResponseParams & {
95
95
  | {
96
96
  error: string;
97
97
  code: number;
98
- connectId: string;
99
- deviceId: string;
98
+ connectId?: string;
99
+ deviceId?: string;
100
+ params: any;
100
101
  };
101
102
  };
102
103
 
@@ -107,5 +108,5 @@ export type AllNetworkGetAddressParams = {
107
108
  export declare function allNetworkGetAddress(
108
109
  connectId: string,
109
110
  deviceId: string,
110
- params: CommonParams & AllNetworkGetAddressParams,
111
+ params: CommonParams & AllNetworkGetAddressParams
111
112
  ): Response<AllNetworkAddress[]>;