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

package/dist/index.d.ts

@@ -27,11 +27,10 @@ declare class ReactNativeBleTransport {
     listen(): void;
     getPlxManager(): Promise<BleManager>;
     enumerate(): Promise<Device[]>;
-    refreshCache(deviceId: string): Promise<void>;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
     }>;
-    _monitorCharacteristic(characteristic: Characteristic, deviceId: string): () => void;
+    _monitorCharacteristic(characteristic: Characteristic): () => 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,YAAY,CAAC,QAAQ,EAAE,MAAM;IAY7B,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA6MpC,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"}
+{"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"}

package/dist/index.js

@@ -287,18 +287,6 @@ class ReactNativeBleTransport {
             }));
         });
     }
-    refreshCache(deviceId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const blePlxManager = yield this.getPlxManager();
-                yield blePlxManager.refreshGatt(deviceId);
-                yield new Promise(resolve => setTimeout(resolve, 500));
-            }
-            catch (error) {
-                console.log('refreshCache error: ', error);
-            }
-        });
-    }
     acquire(input) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
@@ -386,7 +374,6 @@ class ReactNativeBleTransport {
                     }
                 }
             }
-            this.refreshCache(uuid);
             if (reactNative.Platform.OS === 'android') {
                 const bondedDevices = yield getBondedDevices();
                 const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === (device === null || device === void 0 ? void 0 : device.id));
@@ -449,7 +436,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, device.id);
+            transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
             transportCache[uuid] = transport;
             (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit('device-connect', {
                 name: device.name,
@@ -470,7 +457,7 @@ class ReactNativeBleTransport {
             return { uuid };
         });
     }
-    _monitorCharacteristic(characteristic, deviceId) {
+    _monitorCharacteristic(characteristic) {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
@@ -485,7 +472,6 @@ class ReactNativeBleTransport {
                     if ((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('Encryption is insufficient')) {
                         ERROR = hdShared.HardwareErrorCode.BleDeviceBondError;
                     }
-                    this.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.7-alpha.3",
+  "version": "1.0.7",
   "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.7-alpha.3",
-    "@onekeyfe/hd-transport": "^1.0.7-alpha.3",
-    "@onekeyfe/react-native-ble-plx": "https://github.com/OneKeyHQ/react-native-ble-plx.git#feat/refreshGatt",
+    "@onekeyfe/hd-shared": "^1.0.7",
+    "@onekeyfe/hd-transport": "^1.0.7",
+    "@onekeyfe/react-native-ble-plx": "3.0.0",
     "react-native-ble-manager": "^8.1.0"
   },
-  "gitHead": "2450f88fb75e9aeb6c5ebfc6a4ffb488bf5a60eb"
+  "gitHead": "8b08f905e7426fac23b5cf9ec55eb336278f0e3b"
 }

package/src/index.ts

@@ -183,18 +183,6 @@ export default class ReactNativeBleTransport {
     });
   }
 
-  async refreshCache(deviceId: string) {
-    try {
-      const blePlxManager = await this.getPlxManager();
-      // @ts-expect-error
-      await blePlxManager.refreshGatt(deviceId);
-      // eslint-disable-next-line no-promise-executor-return
-      await new Promise(resolve => setTimeout(resolve, 500));
-    } catch (error) {
-      console.log('refreshCache error: ', error);
-    }
-  }
-
   async acquire(input: BleAcquireInput) {
     const { uuid, forceCleanRunPromise } = input;
 
@@ -298,8 +286,6 @@ export default class ReactNativeBleTransport {
       }
     }
 
-    this.refreshCache(uuid);
-
     // check device is bonded
     if (Platform.OS === 'android') {
       const bondedDevices = await getBondedDevices();
@@ -374,10 +360,7 @@ export default class ReactNativeBleTransport {
     }
 
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-    transport.nofitySubscription = this._monitorCharacteristic(
-      transport.notifyCharacteristic,
-      device.id
-    );
+    transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
     transportCache[uuid] = transport;
 
     this.emitter?.emit('device-connect', {
@@ -400,7 +383,7 @@ export default class ReactNativeBleTransport {
     return { uuid };
   }
 
-  _monitorCharacteristic(characteristic: Characteristic, deviceId: string) {
+  _monitorCharacteristic(characteristic: Characteristic) {
     let bufferLength = 0;
     let buffer: any[] = [];
     const subscription = characteristic.monitor((error, c) => {
@@ -422,7 +405,6 @@ export default class ReactNativeBleTransport {
           if (error.reason?.includes('Encryption is insufficient')) {
             ERROR = HardwareErrorCode.BleDeviceBondError;
           }
-          this.refreshCache(deviceId);
           this.runPromise.reject(ERRORS.TypedError(ERROR, error.reason ?? error.message));
           this.Log.debug(': monitor notify error, and has unreleased Promise');
         }