@onekeyfe/hd-transport-react-native 0.1.35 → 0.1.36

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 (4) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.js +12 -2
  3. package/package.json +4 -4
  4. package/src/index.ts +13 -2
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAmBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAyET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA4KpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmFpE,IAAI;IAIJ,MAAM;CAOP"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAmBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAyET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAuLpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmFpE,IAAI;IAIJ,MAAM;CAOP"}
package/dist/index.js CHANGED
@@ -306,8 +306,8 @@ class ReactNativeBleTransport {
306
306
  if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
307
307
  e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
308
308
  connectOptions = {};
309
- device = yield blePlxManager.connectToDevice(uuid);
310
309
  this.Log.debug('first try to reconnect without params');
310
+ device = yield blePlxManager.connectToDevice(uuid);
311
311
  }
312
312
  else {
313
313
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = e.reason) !== null && _a !== void 0 ? _a : e);
@@ -327,8 +327,18 @@ class ReactNativeBleTransport {
327
327
  if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
328
328
  e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
329
329
  connectOptions = {};
330
- yield device.connect();
331
330
  this.Log.debug('second try to reconnect without params');
331
+ try {
332
+ yield device.connect();
333
+ }
334
+ catch (e) {
335
+ this.Log.debug('last try to reconnect error: ', e);
336
+ if (e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
337
+ this.Log.debug('last try to reconnect');
338
+ yield device.cancelConnection();
339
+ yield device.connect();
340
+ }
341
+ }
332
342
  }
333
343
  else {
334
344
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_b = e.reason) !== null && _b !== void 0 ? _b : e);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-transport-react-native",
3
- "version": "0.1.35",
3
+ "version": "0.1.36",
4
4
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
5
5
  "license": "MIT",
6
6
  "main": "dist/index.js",
@@ -20,10 +20,10 @@
20
20
  "lint:fix": "eslint . --fix"
21
21
  },
22
22
  "dependencies": {
23
- "@onekeyfe/hd-shared": "^0.1.35",
24
- "@onekeyfe/hd-transport": "^0.1.35",
23
+ "@onekeyfe/hd-shared": "^0.1.36",
24
+ "@onekeyfe/hd-transport": "^0.1.36",
25
25
  "react-native-ble-manager": "^8.1.0",
26
26
  "react-native-ble-plx": "^2.0.3"
27
27
  },
28
- "gitHead": "8ad01282e959a37412b4f5de6bfe0ca248cf27e3"
28
+ "gitHead": "46ed925a322c0717c74c6bb2e0bb5e7f5df21fcf"
29
29
  }
package/src/index.ts CHANGED
@@ -212,8 +212,8 @@ export default class ReactNativeBleTransport {
212
212
  e.errorCode === BleErrorCode.OperationCancelled
213
213
  ) {
214
214
  connectOptions = {};
215
- device = await blePlxManager.connectToDevice(uuid);
216
215
  this.Log.debug('first try to reconnect without params');
216
+ device = await blePlxManager.connectToDevice(uuid);
217
217
  } else {
218
218
  throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
219
219
  }
@@ -236,8 +236,19 @@ export default class ReactNativeBleTransport {
236
236
  e.errorCode === BleErrorCode.OperationCancelled
237
237
  ) {
238
238
  connectOptions = {};
239
- await device.connect();
240
239
  this.Log.debug('second try to reconnect without params');
240
+ try {
241
+ await device.connect();
242
+ } catch (e) {
243
+ this.Log.debug('last try to reconnect error: ', e);
244
+ // last try to reconnect device if this issue exists
245
+ // https://github.com/dotintent/react-native-ble-plx/issues/426
246
+ if (e.errorCode === BleErrorCode.OperationCancelled) {
247
+ this.Log.debug('last try to reconnect');
248
+ await device.cancelConnection();
249
+ await device.connect();
250
+ }
251
+ }
241
252
  } else {
242
253
  throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
243
254
  }