@onekeyfe/hd-core 0.1.31 → 0.1.34
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.
- package/dist/device/Device.d.ts.map +1 -1
- package/dist/index.js +34 -2
- package/package.json +4 -4
- package/src/device/Device.ts +33 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUlD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,WAAW,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEtF,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAIrC,aAAK,UAAU,GAAG;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AASF,MAAM,WAAW,YAAY;IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,GAAG,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC;IAChG,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACtD,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/F,GAAG,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAChG,IAAI,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAChF;AAED,qBAAa,MAAO,SAAQ,YAAY;IAItC,kBAAkB,EAAE,gBAAgB,CAAC;IAOrC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAKvB,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAQ;IAMhD,QAAQ,EAAE,cAAc,CAAC;IAKzB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAa;IAK3C,mBAAmB,UAAS;IAE5B,UAAU,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAEnC,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,uBAAuB,EAAE,uBAAuB,CAAM;IAEtD,QAAQ,SAAK;IAEb,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,gBAAgB,UAAS;IAKzB,WAAW,UAAS;gBAER,UAAU,EAAE,gBAAgB;IAKxC,MAAM,CAAC,cAAc,CAAC,kBAAkB,EAAE,gBAAgB;IAM1D,eAAe,IAAI,WAAW,GAAG,IAAI;IAiCrC,OAAO;IA+BD,OAAO;IA+BP,OAAO;IA2Bb,WAAW;IAIX,gBAAgB;IAIV,UAAU;
|
|
1
|
+
{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -10740,7 +10740,15 @@ class Device extends events.exports {
|
|
|
10740
10740
|
this._updateFeatures(message);
|
|
10741
10741
|
if (message.passphrase_protection) {
|
|
10742
10742
|
if (this.listenerCount(DEVICE.PIN) > 0) {
|
|
10743
|
-
|
|
10743
|
+
Log$3.debug('try to close passpharse');
|
|
10744
|
+
try {
|
|
10745
|
+
yield this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
|
|
10746
|
+
}
|
|
10747
|
+
catch (e) {
|
|
10748
|
+
yield this.release();
|
|
10749
|
+
this.runPromise = null;
|
|
10750
|
+
throw e;
|
|
10751
|
+
}
|
|
10744
10752
|
}
|
|
10745
10753
|
}
|
|
10746
10754
|
});
|
|
@@ -10794,6 +10802,7 @@ class Device extends events.exports {
|
|
|
10794
10802
|
});
|
|
10795
10803
|
}
|
|
10796
10804
|
_runInner(fn, options) {
|
|
10805
|
+
var _a;
|
|
10797
10806
|
return __awaiter(this, void 0, void 0, function* () {
|
|
10798
10807
|
if (!this.isUsedHere() || this.commands.disposed) {
|
|
10799
10808
|
const env = DataManager.getSettings('env');
|
|
@@ -10812,12 +10821,35 @@ class Device extends events.exports {
|
|
|
10812
10821
|
return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Initialize failed: ${error.message}, code: ${error.code}`));
|
|
10813
10822
|
}
|
|
10814
10823
|
}
|
|
10824
|
+
else if (env === 'react-native') {
|
|
10825
|
+
if ((_a = this.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) {
|
|
10826
|
+
if (this.listenerCount(DEVICE.PIN) > 0) {
|
|
10827
|
+
Log$3.debug('try to close passpharse for mobile');
|
|
10828
|
+
try {
|
|
10829
|
+
yield this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
|
|
10830
|
+
}
|
|
10831
|
+
catch (e) {
|
|
10832
|
+
this.runPromise = null;
|
|
10833
|
+
return Promise.reject(e);
|
|
10834
|
+
}
|
|
10835
|
+
}
|
|
10836
|
+
}
|
|
10837
|
+
}
|
|
10815
10838
|
}
|
|
10816
10839
|
if (options.keepSession) {
|
|
10817
10840
|
this.keepSession = true;
|
|
10818
10841
|
}
|
|
10819
10842
|
if (fn) {
|
|
10820
|
-
|
|
10843
|
+
try {
|
|
10844
|
+
yield fn();
|
|
10845
|
+
}
|
|
10846
|
+
catch (e) {
|
|
10847
|
+
if (this.runPromise) {
|
|
10848
|
+
this.runPromise.reject(e);
|
|
10849
|
+
}
|
|
10850
|
+
this.runPromise = null;
|
|
10851
|
+
return;
|
|
10852
|
+
}
|
|
10821
10853
|
}
|
|
10822
10854
|
if ((!this.keepSession && typeof options.keepSession !== 'boolean') ||
|
|
10823
10855
|
options.keepSession === false) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.34",
|
|
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": "^0.1.
|
|
29
|
-
"@onekeyfe/hd-transport": "^0.1.
|
|
28
|
+
"@onekeyfe/hd-shared": "^0.1.34",
|
|
29
|
+
"@onekeyfe/hd-transport": "^0.1.34",
|
|
30
30
|
"axios": "^0.27.2",
|
|
31
31
|
"bignumber.js": "^9.0.2",
|
|
32
32
|
"js-sha256": "^0.9.0",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"@types/parse-uri": "^1.0.0",
|
|
38
38
|
"@types/semver": "^7.3.9"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "6da875e815d27f3573e4c7578c57c245a24bba8c"
|
|
41
41
|
}
|
package/src/device/Device.ts
CHANGED
|
@@ -257,7 +257,14 @@ export class Device extends EventEmitter {
|
|
|
257
257
|
this._updateFeatures(message);
|
|
258
258
|
if (message.passphrase_protection) {
|
|
259
259
|
if (this.listenerCount(DEVICE.PIN) > 0) {
|
|
260
|
-
|
|
260
|
+
Log.debug('try to close passpharse');
|
|
261
|
+
try {
|
|
262
|
+
await this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
|
|
263
|
+
} catch (e) {
|
|
264
|
+
await this.release();
|
|
265
|
+
this.runPromise = null;
|
|
266
|
+
throw e;
|
|
267
|
+
}
|
|
261
268
|
}
|
|
262
269
|
}
|
|
263
270
|
}
|
|
@@ -343,6 +350,21 @@ export class Device extends EventEmitter {
|
|
|
343
350
|
)
|
|
344
351
|
);
|
|
345
352
|
}
|
|
353
|
+
} else if (env === 'react-native') {
|
|
354
|
+
/**
|
|
355
|
+
* The timing of the mobile initialization is different, so it needs to be closed here
|
|
356
|
+
*/
|
|
357
|
+
if (this.features?.passphrase_protection) {
|
|
358
|
+
if (this.listenerCount(DEVICE.PIN) > 0) {
|
|
359
|
+
Log.debug('try to close passpharse for mobile');
|
|
360
|
+
try {
|
|
361
|
+
await this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
|
|
362
|
+
} catch (e) {
|
|
363
|
+
this.runPromise = null;
|
|
364
|
+
return Promise.reject(e);
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
}
|
|
346
368
|
}
|
|
347
369
|
}
|
|
348
370
|
|
|
@@ -351,7 +373,16 @@ export class Device extends EventEmitter {
|
|
|
351
373
|
}
|
|
352
374
|
|
|
353
375
|
if (fn) {
|
|
354
|
-
|
|
376
|
+
try {
|
|
377
|
+
await fn();
|
|
378
|
+
} catch (e) {
|
|
379
|
+
if (this.runPromise) {
|
|
380
|
+
this.runPromise.reject(e);
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
this.runPromise = null;
|
|
384
|
+
return;
|
|
385
|
+
}
|
|
355
386
|
}
|
|
356
387
|
|
|
357
388
|
if (
|