@onekeyfe/hd-transport-react-native 1.0.6 → 1.0.7-alpha.2

package/dist/index.d.ts

@@ -30,7 +30,7 @@ declare class ReactNativeBleTransport {
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
     }>;
-    _monitorCharacteristic(characteristic: Characteristic): () => void;
+    _monitorCharacteristic(characteristic: Characteristic, deviceId: string): () => void;
     release(uuid: string): Promise<boolean>;
     call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey | undefined>;
     stop(): void;

package/dist/index.d.ts.map

@@ -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,gCAAgC,CAAC;AAExC,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,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;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAwMpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkE/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+FpE,IAAI;IAIJ,MAAM;CAOP"}
+{"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,gCAAgC,CAAC;AAExC,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAkBvC,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;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA2MpC,sBAAsB,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM;IAmEjE,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+FpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -61,6 +61,17 @@ const getBondedDevices = () => __awaiter(void 0, void 0, void 0, function* () {
         return Object.assign({ id, name }, advertising);
     });
 });
+const refreshCache = (peripheralId) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield BleManager__default["default"].connect(peripheralId);
+        yield BleManager__default["default"].refreshCache(peripheralId);
+        yield BleManager__default["default"].disconnect(peripheralId, true);
+        console.log('refreshCache success');
+    }
+    catch (error) {
+        console.log('refreshCache error: ', error);
+    }
+});
 
 const timer = process.env.NODE_ENV === 'development'
     ? {
@@ -436,7 +447,7 @@ class ReactNativeBleTransport {
                 throw hdShared.ERRORS.TypedError('BLECharacteristicNotNotifiable: notify characteristic not notifiable');
             }
             const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-            transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
+            transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic, device.id);
             transportCache[uuid] = transport;
             (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit('device-connect', {
                 name: device.name,
@@ -457,7 +468,7 @@ class ReactNativeBleTransport {
             return { uuid };
         });
     }
-    _monitorCharacteristic(characteristic) {
+    _monitorCharacteristic(characteristic, deviceId) {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
@@ -472,6 +483,7 @@ class ReactNativeBleTransport {
                     if ((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('Encryption is insufficient')) {
                         ERROR = hdShared.HardwareErrorCode.BleDeviceBondError;
                     }
+                    refreshCache(deviceId);
                     this.runPromise.reject(hdShared.ERRORS.TypedError(ERROR, (_c = error.reason) !== null && _c !== void 0 ? _c : error.message));
                     this.Log.debug(': monitor notify error, and has unreleased Promise');
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.0.6",
+  "version": "1.0.7-alpha.2",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,10 +19,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.6",
-    "@onekeyfe/hd-transport": "^1.0.6",
+    "@onekeyfe/hd-shared": "^1.0.7-alpha.2",
+    "@onekeyfe/hd-transport": "^1.0.7-alpha.2",
     "@onekeyfe/react-native-ble-plx": "3.0.0",
     "react-native-ble-manager": "^8.1.0"
   },
-  "gitHead": "5999a1ec9413c92cf0f3b65955f1ca9b1004edea"
+  "gitHead": "220798f8e3b49640651e919c92403aa6d2b9b813"
 }

package/src/index.ts

@@ -11,7 +11,12 @@ import ByteBuffer from 'bytebuffer';
 import transport, { COMMON_HEADER_SIZE, LogBlockCommand } from '@onekeyfe/hd-transport';
 import { createDeferred, Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import type EventEmitter from 'events';
-import { initializeBleManager, getConnectedDeviceIds, getBondedDevices } from './BleManager';
+import {
+  initializeBleManager,
+  getConnectedDeviceIds,
+  getBondedDevices,
+  refreshCache,
+} from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
   isOnekeyDevice,
@@ -360,7 +365,10 @@ export default class ReactNativeBleTransport {
     }
 
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-    transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
+    transport.nofitySubscription = this._monitorCharacteristic(
+      transport.notifyCharacteristic,
+      device.id
+    );
     transportCache[uuid] = transport;
 
     this.emitter?.emit('device-connect', {
@@ -383,7 +391,7 @@ export default class ReactNativeBleTransport {
     return { uuid };
   }
 
-  _monitorCharacteristic(characteristic: Characteristic) {
+  _monitorCharacteristic(characteristic: Characteristic, deviceId: string) {
     let bufferLength = 0;
     let buffer: any[] = [];
     const subscription = characteristic.monitor((error, c) => {
@@ -405,6 +413,7 @@ export default class ReactNativeBleTransport {
           if (error.reason?.includes('Encryption is insufficient')) {
             ERROR = HardwareErrorCode.BleDeviceBondError;
           }
+          refreshCache(deviceId);
           this.runPromise.reject(ERRORS.TypedError(ERROR, error.reason ?? error.message));
           this.Log.debug(': monitor notify error, and has unreleased Promise');
         }