@onekeyfe/hd-core 1.1.2-alpha.3 → 1.1.3-alpha.0

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 (8) hide show
  1. package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map +1 -1
  2. package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map +1 -1
  3. package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts.map +1 -1
  4. package/dist/index.js +5 -1
  5. package/package.json +4 -4
  6. package/src/api/allnetwork/AllNetworkGetAddress.ts +1 -0
  7. package/src/api/allnetwork/AllNetworkGetAddressBase.ts +4 -2
  8. package/src/api/allnetwork/AllNetworkGetAddressByLoop.ts +1 -0
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":"AAGA,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AASlE,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,wBAAwB;IAClE,oBAAoB;CA6D3B"}
1
+ {"version":3,"file":"AllNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddress.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AASlE,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,wBAAwB;IAClE,oBAAoB;CA8D3B"}
package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAY9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AA8LF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;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,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAoBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IA+EH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAEvD,GAAG;CAmBV"}
1
+ {"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAY9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AA8LF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;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,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAoBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAgFH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAEvD,GAAG;CAoBV"}
package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AllNetworkGetAddressByLoop.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressByLoop.ts"],"names":[],"mappings":"AAaA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAGlE,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,wBAAwB;IACxE,oBAAoB;YAwBZ,4BAA4B;IA2E1C,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,gBAAgB;CAazB"}
1
+ {"version":3,"file":"AllNetworkGetAddressByLoop.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressByLoop.ts"],"names":[],"mappings":"AAaA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAGlE,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,wBAAwB;IACxE,oBAAoB;YAwBZ,4BAA4B;IA4E1C,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,gBAAgB;CAazB"}
package/dist/index.js CHANGED
@@ -30138,6 +30138,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
30138
30138
  method.context = this.context;
30139
30139
  const onSignalAbort = () => {
30140
30140
  var _a;
30141
+ console.log('=====>>>>> onSignalAbort');
30141
30142
  (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30142
30143
  };
30143
30144
  const _onDeviceButtonHandler = (...[device, request]) => {
@@ -30185,9 +30186,10 @@ class AllNetworkGetAddressBase extends BaseMethod {
30185
30186
  if (features.passphrase_protection) {
30186
30187
  yield this.device.checkPassphraseStateSafety();
30187
30188
  }
30189
+ this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
30188
30190
  }
30189
30191
  this.abortController = new AbortController();
30190
- return Promise.resolve(this.getAllNetworkAddress()).catch(e => {
30192
+ return this.getAllNetworkAddress().catch(e => {
30191
30193
  if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.RepeatUnlocking) {
30192
30194
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RepeatUnlocking, e.message);
30193
30195
  }
@@ -30285,6 +30287,7 @@ class AllNetworkGetAddress extends AllNetworkGetAddressBase {
30285
30287
  for (let i = 0; i < bundle.length; i++) {
30286
30288
  responses.push(resultMap[i]);
30287
30289
  }
30290
+ this.abortController = null;
30288
30291
  return Promise.resolve(responses);
30289
30292
  });
30290
30293
  }
@@ -30369,6 +30372,7 @@ class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
30369
30372
  }
30370
30373
  finally {
30371
30374
  (_c = this.context) === null || _c === void 0 ? void 0 : _c.cancelCallbackTasks(this.payload.connectId);
30375
+ this.abortController = null;
30372
30376
  }
30373
30377
  });
30374
30378
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.1.2-alpha.3",
3
+ "version": "1.1.3-alpha.0",
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.1.2-alpha.3",
29
- "@onekeyfe/hd-transport": "^1.1.2-alpha.3",
28
+ "@onekeyfe/hd-shared": "^1.1.3-alpha.0",
29
+ "@onekeyfe/hd-transport": "^1.1.3-alpha.0",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
46
46
  "@types/web-bluetooth": "^0.0.21",
47
47
  "ripple-keypairs": "^1.1.4"
48
48
  },
49
- "gitHead": "c8cf96e2fbd1ce2ffe22b88ec48aaa272a8d3f6c"
49
+ "gitHead": "9ab5f65116d2ad199ee7ee745fc818a1e8452309"
50
50
  }
package/src/api/allnetwork/AllNetworkGetAddress.ts CHANGED
@@ -77,6 +77,7 @@ export default class AllNetworkGetAddress extends AllNetworkGetAddressBase {
77
77
  responses.push(resultMap[i]);
78
78
  }
79
79
 
80
+ this.abortController = null;
80
81
  return Promise.resolve(responses);
81
82
  }
82
83
  }
package/src/api/allnetwork/AllNetworkGetAddressBase.ts CHANGED
@@ -19,7 +19,7 @@ import type {
19
19
  import { PROTO } from '../../constants';
20
20
 
21
21
  import { findMethod } from '../utils';
22
- import { DEVICE, IFRAME } from '../../events';
22
+ import { createUiMessage, DEVICE, IFRAME } from '../../events';
23
23
  import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
24
24
  import { Device, DeviceEvents } from '../../device/Device';
25
25
  import { UI_REQUEST } from '../../constants/ui-request';
@@ -330,6 +330,7 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
330
330
  method.context = this.context;
331
331
 
332
332
  const onSignalAbort = () => {
333
+ console.log('=====>>>>> onSignalAbort');
333
334
  this.abortController?.abort(HardwareErrorCodeMessage[HardwareErrorCode.RepeatUnlocking]);
334
335
  };
335
336
 
@@ -396,11 +397,12 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
396
397
  // check passphrase state
397
398
  await this.device.checkPassphraseStateSafety();
398
399
  }
400
+ this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
399
401
  }
400
402
 
401
403
  this.abortController = new AbortController();
402
404
 
403
- return Promise.resolve(this.getAllNetworkAddress()).catch(e => {
405
+ return this.getAllNetworkAddress().catch(e => {
404
406
  if (e instanceof HardwareError && e.errorCode === HardwareErrorCode.RepeatUnlocking) {
405
407
  throw ERRORS.TypedError(HardwareErrorCode.RepeatUnlocking, e.message);
406
408
  }
package/src/api/allnetwork/AllNetworkGetAddressByLoop.ts CHANGED
@@ -111,6 +111,7 @@ export default class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase
111
111
  });
112
112
  } finally {
113
113
  this.context?.cancelCallbackTasks(this.payload.connectId);
114
+ this.abortController = null;
114
115
  }
115
116
  }
116
117