@onekeyfe/hd-transport-react-native 1.1.21 → 1.1.22-alpha.2

package/dist/index.d.ts

@@ -32,11 +32,12 @@ declare class ReactNativeBleTransport {
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
     }>;
-    _monitorCharacteristic(characteristic: Characteristic): () => void;
+    _monitorCharacteristic(characteristic: Characteristic, uuid: string): () => void;
     release(uuid: string): Promise<boolean>;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
     stop(): void;
+    disconnect(session: string): Promise<void>;
     cancel(): void;
 }
 

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAIL,UAAU,IAAI,aAAa,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAGhB,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AAehC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAYjE,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;AA0C1D,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,IAAI,SAA6B;IAEjC,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;IAWjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2HpE,IAAI;IAIJ,MAAM;CAOP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAIL,UAAU,IAAI,aAAa,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAGhB,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AAehC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAYjE,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;AA0C1D,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,IAAI,SAA6B;IAEjC,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;IAWjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAqNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM;IAkF7D,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2HpE,IAAI;IAIE,UAAU,CAAC,OAAO,EAAE,MAAM;IA6DhC,MAAM;CAOP"}

package/dist/index.js

@@ -497,7 +497,7 @@ class ReactNativeBleTransport {
             }
             yield this.release(uuid);
             const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-            transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
+            transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic, uuid);
             transportCache[uuid] = transport;
             (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-connect', {
                 name: device.name,
@@ -528,7 +528,7 @@ class ReactNativeBleTransport {
             return { uuid };
         });
     }
-    _monitorCharacteristic(characteristic) {
+    _monitorCharacteristic(characteristic, uuid) {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
@@ -580,7 +580,7 @@ class ReactNativeBleTransport {
                 this.Log.debug('monitor data error: ', error);
                 (_j = this.runPromise) === null || _j === void 0 ? void 0 : _j.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError));
             }
-        });
+        }, uuid);
         return () => {
             this.Log.debug('remove characteristic monitor: ', characteristic.uuid);
             subscription.remove();
@@ -714,6 +714,58 @@ class ReactNativeBleTransport {
     stop() {
         this.stopped = true;
     }
+    disconnect(session) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.Log.debug('transport-react-native transport resetSession: ', session);
+            const transport = transportCache[session];
+            if (transport === null || transport === void 0 ? void 0 : transport.nofitySubscription) {
+                try {
+                    transport.nofitySubscription();
+                    transport.nofitySubscription = undefined;
+                }
+                catch (e) {
+                    this.Log.error('resetSession: remove notify subscription error: ', e);
+                }
+            }
+            if (session) {
+                try {
+                    yield ((_a = this.blePlxManager) === null || _a === void 0 ? void 0 : _a.cancelTransaction(session));
+                }
+                catch (e) {
+                    this.Log.debug('resetSession: cancel transaction error (ignored): ', (e === null || e === void 0 ? void 0 : e.message) || e);
+                }
+            }
+            if (transport === null || transport === void 0 ? void 0 : transport.device) {
+                try {
+                    yield transport.device.cancelConnection();
+                }
+                catch (e) {
+                    this.Log.debug('resetSession: device.cancelConnection error (ignored): ', (e === null || e === void 0 ? void 0 : e.message) || e);
+                }
+            }
+            try {
+                yield ((_b = this.blePlxManager) === null || _b === void 0 ? void 0 : _b.cancelDeviceConnection(session));
+            }
+            catch (e) {
+                this.Log.debug('resetSession: manager.cancelDeviceConnection error (ignored): ', (e === null || e === void 0 ? void 0 : e.message) || e);
+            }
+            if (transportCache[session]) {
+                delete transportCache[session];
+            }
+            try {
+                (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit('device-disconnect', {
+                    name: (_d = transport === null || transport === void 0 ? void 0 : transport.device) === null || _d === void 0 ? void 0 : _d.name,
+                    id: session,
+                    connectId: session,
+                });
+            }
+            catch (e) {
+                this.Log.error('resetSession: emit disconnect event error: ', e);
+            }
+            yield new Promise(resolve => setTimeout(() => resolve(), 100));
+        });
+    }
     cancel() {
         this.Log.debug('transport-react-native transport cancel');
         if (this.runPromise) ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.1.21",
+  "version": "1.1.22-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.1.21",
-    "@onekeyfe/hd-transport": "1.1.21",
+    "@onekeyfe/hd-shared": "1.1.22-alpha.2",
+    "@onekeyfe/hd-transport": "1.1.22-alpha.2",
     "@onekeyfe/react-native-ble-utils": "^0.1.4",
     "react-native-ble-plx": "3.5.0"
   },
-  "gitHead": "2c691aee96693b102a0edeca7e7768448090b4d1"
+  "gitHead": "a619ea24331a5c59b2d9b4b251c95a56a420739a"
 }

package/src/index.ts

@@ -405,7 +405,10 @@ export default class ReactNativeBleTransport {
     await this.release(uuid);
 
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-    transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
+    transport.nofitySubscription = this._monitorCharacteristic(
+      transport.notifyCharacteristic,
+      uuid
+    );
     transportCache[uuid] = transport;
 
     this.emitter?.emit('device-connect', {
@@ -436,7 +439,7 @@ export default class ReactNativeBleTransport {
     return { uuid };
   }
 
-  _monitorCharacteristic(characteristic: Characteristic) {
+  _monitorCharacteristic(characteristic: Characteristic, uuid: string) {
     let bufferLength = 0;
     let buffer: any[] = [];
     const subscription = characteristic.monitor((error, c) => {
@@ -510,7 +513,7 @@ export default class ReactNativeBleTransport {
         this.Log.debug('monitor data error: ', error);
         this.runPromise?.reject(ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError));
       }
-    });
+    }, uuid);
 
     return () => {
       this.Log.debug('remove characteristic monitor: ', characteristic.uuid);
@@ -664,6 +667,67 @@ export default class ReactNativeBleTransport {
     this.stopped = true;
   }
 
+  async disconnect(session: string) {
+    this.Log.debug('transport-react-native transport resetSession: ', session);
+    const transport = transportCache[session] as BleTransport;
+
+    // cancel the notify subscription
+    if (transport?.nofitySubscription) {
+      try {
+        transport.nofitySubscription();
+        transport.nofitySubscription = undefined;
+      } catch (e) {
+        this.Log.error('resetSession: remove notify subscription error: ', e);
+      }
+    }
+
+    // cancel the ble transaction
+    if (session) {
+      try {
+        await this.blePlxManager?.cancelTransaction(session);
+      } catch (e) {
+        this.Log.debug('resetSession: cancel transaction error (ignored): ', e?.message || e);
+      }
+    }
+
+    // disconnect the device via the device object
+    if (transport?.device) {
+      try {
+        await transport.device.cancelConnection();
+      } catch (e) {
+        this.Log.debug('resetSession: device.cancelConnection error (ignored): ', e?.message || e);
+      }
+    }
+
+    // disconnect the device via the ble manager
+    try {
+      await this.blePlxManager?.cancelDeviceConnection(session);
+    } catch (e) {
+      this.Log.debug(
+        'resetSession: manager.cancelDeviceConnection error (ignored): ',
+        e?.message || e
+      );
+    }
+
+    // clear the transport cache
+    if (transportCache[session]) {
+      delete transportCache[session];
+    }
+
+    // emit the disconnect event
+    try {
+      this.emitter?.emit('device-disconnect', {
+        name: transport?.device?.name,
+        id: session,
+        connectId: session,
+      });
+    } catch (e) {
+      this.Log.error('resetSession: emit disconnect event error: ', e);
+    }
+    // eslint-disable-next-line no-promise-executor-return
+    await new Promise<void>(resolve => setTimeout(() => resolve(), 100));
+  }
+
   cancel() {
     this.Log.debug('transport-react-native transport cancel');
     if (this.runPromise) {