@onekeyfe/hd-core 0.1.34 → 0.1.37

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAoBxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA2LjD,CAAC;AAwKF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA+FF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA+BxC,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;AASlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAoBxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA2LjD,CAAC;AAyKF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA+FF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA+BxC,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 +1 @@
1
- {"version":3,"file":"DeviceConnector.d.ts","sourceRoot":"","sources":["../../src/device/DeviceConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAIzF,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAMhE,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAS,EAAE,SAAS,CAAC;IAErB,eAAe,SAAK;IAEpB,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAQ;IAE1C,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,SAAS,UAAS;;IAQZ,SAAS;IAWT,MAAM;IAiCZ,IAAI;IAIE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAgB7C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAS/C,oBAAoB;CAGrB"}
1
+ {"version":3,"file":"DeviceConnector.d.ts","sourceRoot":"","sources":["../../src/device/DeviceConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAIzF,OAAO,EAAc,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAMhE,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAS,EAAE,SAAS,CAAC;IAErB,eAAe,SAAK;IAEpB,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAQ;IAE1C,QAAQ,EAAE,gBAAgB,EAAE,CAAM;IAElC,SAAS,UAAS;;IAQZ,SAAS;IAWT,MAAM;IAiCZ,IAAI;IAIE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAiB7C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAS/C,oBAAoB;CAGrB"}
package/dist/index.js CHANGED
@@ -10178,7 +10178,7 @@ class DevicePool extends events.exports {
10178
10178
  static _sendDisconnectMessage() {
10179
10179
  for (let i = this.disconnectPool.length - 1; i >= 0; i--) {
10180
10180
  const descriptor = this.connectedPool[i];
10181
- const device = this.getDeviceByPath(descriptor.path);
10181
+ const device = (descriptor === null || descriptor === void 0 ? void 0 : descriptor.path) ? this.getDeviceByPath(descriptor.path) : null;
10182
10182
  if (device) {
10183
10183
  this.emitter.emit(DEVICE.DISCONNECT, device);
10184
10184
  }
@@ -13858,6 +13858,7 @@ class DeviceConnector {
13858
13858
  return res;
13859
13859
  }
13860
13860
  catch (error) {
13861
+ Log$1.debug('acquire error: ', error.message);
13861
13862
  safeThrowError(error);
13862
13863
  }
13863
13864
  });
@@ -14136,6 +14137,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
14136
14137
  hdShared.HardwareErrorCode.BleDeviceNotBonded,
14137
14138
  hdShared.HardwareErrorCode.BleCharacteristicNotifyError,
14138
14139
  hdShared.HardwareErrorCode.BleWriteCharacteristicError,
14140
+ hdShared.HardwareErrorCode.BleAlreadyConnected,
14139
14141
  ].includes(error.errorCode)) {
14140
14142
  reject(error);
14141
14143
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "0.1.34",
3
+ "version": "0.1.37",
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.34",
29
- "@onekeyfe/hd-transport": "^0.1.34",
28
+ "@onekeyfe/hd-shared": "^0.1.37",
29
+ "@onekeyfe/hd-transport": "^0.1.37",
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": "6da875e815d27f3573e4c7578c57c245a24bba8c"
40
+ "gitHead": "c7aaa0d4af5ade4c9e07229f142ed85ee14db096"
41
41
  }
package/src/core/index.ts CHANGED
@@ -378,6 +378,7 @@ const ensureConnected = async (method: BaseMethod, pollingId: number) => {
378
378
  HardwareErrorCode.BleDeviceNotBonded,
379
379
  HardwareErrorCode.BleCharacteristicNotifyError,
380
380
  HardwareErrorCode.BleWriteCharacteristicError,
381
+ HardwareErrorCode.BleAlreadyConnected,
381
382
  ].includes(error.errorCode)
382
383
  ) {
383
384
  reject(error);
@@ -85,6 +85,7 @@ export default class DeviceConnector {
85
85
  }
86
86
  return res;
87
87
  } catch (error) {
88
+ Log.debug('acquire error: ', error.message);
88
89
  safeThrowError(error);
89
90
  }
90
91
  }
@@ -165,7 +165,7 @@ export class DevicePool extends EventEmitter {
165
165
  static _sendDisconnectMessage() {
166
166
  for (let i = this.disconnectPool.length - 1; i >= 0; i--) {
167
167
  const descriptor = this.connectedPool[i];
168
- const device = this.getDeviceByPath(descriptor.path);
168
+ const device = descriptor?.path ? this.getDeviceByPath(descriptor.path) : null;
169
169
  if (device) {
170
170
  this.emitter.emit(DEVICE.DISCONNECT, device);
171
171
  }