@onekeyfe/hd-transport-web-device 1.2.0-alpha.8 → 1.2.0-alpha.9

package/__tests__/electron-ble-transport.test.ts

@@ -1,4 +1,5 @@
 import transport, { PROTOCOL_V2_CHANNEL_BLE_UART, bytesToHex } from '@onekeyfe/hd-transport';
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import ElectronBleTransport from '../src/electron-ble-transport';
 
@@ -245,6 +246,95 @@ describe('ElectronBleTransport protocol detection', () => {
       );
       expect(nobleBle.write).toHaveBeenCalledTimes(1);
       expect(transport.getProtocolType(device.id)).toBe('V2');
+      await expect(transport.call(device.id, 'Ping', { message: 'after-probe' })).resolves.toEqual({
+        type: 'Success',
+        message: { message: 'ok' },
+      });
+      const sentSeqs = nobleBle.write.mock.calls.map(([, hex]) =>
+        Number.parseInt(hex.slice(12, 14), 16)
+      );
+      expect(sentSeqs).toEqual([1, 2]);
+    } finally {
+      await transport.release(device.id);
+    }
+  });
+
+  test('rejects the active Protocol V2 reader when pairing is rejected', async () => {
+    const device = { id: 'pairing-rejected-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
+    let pairingRejected = false;
+    const probeResponse = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      { message: 'ok' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+
+    nobleBle.onNotification.mockImplementation(handler => {
+      notificationHandler = handler;
+      return jest.fn();
+    });
+    nobleBle.write.mockImplementation(() => {
+      setTimeout(
+        () =>
+          notificationHandler?.(
+            device.id,
+            pairingRejected ? 'PAIRING_REJECTED' : bytesToHex(probeResponse)
+          ),
+        0
+      );
+      return Promise.resolve();
+    });
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id });
+      pairingRejected = true;
+
+      await expect(
+        transport.call(device.id, 'Ping', { message: 'pairing' }, { timeoutMs: 50 })
+      ).rejects.toMatchObject({ errorCode: HardwareErrorCode.BleDeviceBondedCanceled });
+    } finally {
+      await transport.release(device.id);
+    }
+  });
+
+  test('rebuilds the active link when Core acquires the same device again', async () => {
+    const device = { id: 'repeated-acquire-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
+    const response = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      { message: 'ok' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+    );
+
+    nobleBle.onNotification.mockImplementation(handler => {
+      notificationHandler = handler;
+      return jest.fn();
+    });
+    nobleBle.write.mockImplementation(() => {
+      setTimeout(() => notificationHandler?.(device.id, bytesToHex(response)), 0);
+      return Promise.resolve();
+    });
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id });
+      await transport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      await expect(
+        transport.call(device.id, 'Ping', { message: 'after-reacquire' })
+      ).resolves.toEqual({
+        type: 'Success',
+        message: { message: 'ok' },
+      });
+
+      const sentSeqs = nobleBle.write.mock.calls.map(([, hex]) =>
+        Number.parseInt(hex.slice(12, 14), 16)
+      );
+      expect(sentSeqs).toEqual([1, 2]);
     } finally {
       await transport.release(device.id);
     }

package/dist/electron-ble-transport.d.ts

@@ -28,8 +28,7 @@ export default class ElectronBleTransport {
     private v2Assemblers;
     private v2FrameQueues;
     private v2FramePromises;
-    private activeProtocolV2Call;
-    private nextProtocolV2CallToken;
+    private protocolV2Links;
     private notificationCleanups;
     private disconnectCleanups;
     private notificationTokens;
@@ -69,12 +68,13 @@ export default class ElectronBleTransport {
     private resolveProtocolV2Frame;
     private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
-    private isActiveProtocolV2Call;
+    private rejectProtocolV2Frames;
     private readProtocolV2Frame;
     private handleProtocolV1Notification;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
     private callProtocolV1;
     private callProtocolV2;
+    private createProtocolV2Adapter;
     private processProtocolV1Notification;
     getProtocolType(path: string): ProtocolType | undefined;
 }

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAmBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAevC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAqCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,oBAAoB,CAAgD;IAE5E,OAAO,CAAC,uBAAuB,CAAK;IAEpC,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAK7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAuF9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAexB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA+C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAoCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,SAAS;IASvB,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,4BAA4B;IA2BpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAIhB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA+BlB,cAAc;YAuEd,cAAc;IAmF5B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAmBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACnG,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAevC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAqCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAQ7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IA0F9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAgBxB,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA+C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAqCjC,eAAe;YAgBf,eAAe;YAuBf,iBAAiB;YAsBjB,SAAS;IASvB,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA+BlB,cAAc;YAuEd,cAAc;IA6B5B,OAAO,CAAC,uBAAuB;IA0C/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/dist/index.d.ts

@@ -93,8 +93,7 @@ declare class ElectronBleTransport {
     private v2Assemblers;
     private v2FrameQueues;
     private v2FramePromises;
-    private activeProtocolV2Call;
-    private nextProtocolV2CallToken;
+    private protocolV2Links;
     private notificationCleanups;
     private disconnectCleanups;
     private notificationTokens;
@@ -134,12 +133,13 @@ declare class ElectronBleTransport {
     private resolveProtocolV2Frame;
     private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
-    private isActiveProtocolV2Call;
+    private rejectProtocolV2Frames;
     private readProtocolV2Frame;
     private handleProtocolV1Notification;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;
     private callProtocolV1;
     private callProtocolV2;
+    private createProtocolV2Adapter;
     private processProtocolV1Notification;
     getProtocolType(path: string): ProtocolType | undefined;
 }

package/dist/index.js

@@ -781,8 +781,27 @@ class ElectronBleTransport {
         this.v2Assemblers = new Map();
         this.v2FrameQueues = new Map();
         this.v2FramePromises = new Map();
-        this.activeProtocolV2Call = null;
-        this.nextProtocolV2CallToken = 1;
+        this.protocolV2Links = new transport.ProtocolV2LinkManager({
+            getSchemas: () => {
+                if (!this._messages || !this._messagesV2) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
+                }
+                return {
+                    protocolV1: this._messages,
+                    protocolV2: this._messagesV2,
+                };
+            },
+            classifyError: () => 'link-fatal',
+            onLinkInvalidated: (uuid, reason) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.rejectProtocolV2Frames(uuid, new Error(reason));
+                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
+                if (reason.startsWith('Protocol V2 link-fatal error:')) {
+                    yield this.release(uuid);
+                }
+            }),
+        });
         this.notificationCleanups = new Map();
         this.disconnectCleanups = new Map();
         this.notificationTokens = new Map();
@@ -818,15 +837,14 @@ class ElectronBleTransport {
         throw error;
     }
     cleanupDeviceState(deviceId) {
-        var _a;
+        this.protocolV2Links
+            .invalidateLink(deviceId, 'Electron BLE device state cleaned')
+            .catch(error => { var _a; return (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] link cleanup failed:', error); });
         this.connectedDevices.delete(deviceId);
         this.deviceProtocol.delete(deviceId);
         this.v1Buffers.delete(deviceId);
         this.v2Assemblers.delete(deviceId);
         this.resetProtocolV2Frames(deviceId);
-        if (((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) === deviceId) {
-            this.activeProtocolV2Call = null;
-        }
         this.notificationTokens.delete(deviceId);
         const notifyCleanup = this.notificationCleanups.get(deviceId);
         if (notifyCleanup) {
@@ -855,6 +873,9 @@ class ElectronBleTransport {
     configureProtocolV2(signedData) {
         var _a;
         this._messagesV2 = parseConfigure(signedData);
+        this.protocolV2Links
+            .invalidateAllLinks('Protocol V2 schema reconfigured')
+            .catch(error => { var _a; return (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] schema link cleanup failed:', error); });
         (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Protocol V2 schema configured');
     }
     listen() {
@@ -893,12 +914,14 @@ class ElectronBleTransport {
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
+            if (this.connectedDevices.has(uuid)) {
+                yield this.release(uuid);
+            }
             if (forceCleanRunPromise && this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
                 this.rejectAllProtocolV2Frames(error);
                 this.runPromise = null;
-                this.activeProtocolV2Call = null;
             }
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
@@ -966,6 +989,7 @@ class ElectronBleTransport {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                yield this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
                 if (this.connectedDevices.has(id)) {
                     if ((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) {
                         yield window.desktopApi.nobleBle.unsubscribe(id);
@@ -1039,14 +1063,12 @@ class ElectronBleTransport {
         });
     }
     resetProbeStateAfterProtocolProbe(uuid, protocol) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.protocolV2Links.invalidateLink(uuid, `Reset notify state after Protocol ${protocol} probe`);
             this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
             (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
             this.resetProtocolV2Frames(uuid);
-            if (((_b = this.activeProtocolV2Call) === null || _b === void 0 ? void 0 : _b.uuid) === uuid) {
-                this.activeProtocolV2Call = null;
-            }
             if (this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
@@ -1059,16 +1081,16 @@ class ElectronBleTransport {
             }
             this.notificationTokens.delete(uuid);
             try {
-                yield ((_d = (_c = window.desktopApi) === null || _c === void 0 ? void 0 : _c.nobleBle) === null || _d === void 0 ? void 0 : _d.unsubscribe(uuid));
+                yield ((_c = (_b = window.desktopApi) === null || _b === void 0 ? void 0 : _b.nobleBle) === null || _c === void 0 ? void 0 : _c.unsubscribe(uuid));
             }
             catch (error) {
-                (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[Electron BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
+                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[Electron BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
             }
             try {
-                yield ((_g = (_f = window.desktopApi) === null || _f === void 0 ? void 0 : _f.nobleBle) === null || _g === void 0 ? void 0 : _g.subscribe(uuid));
+                yield ((_f = (_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) === null || _f === void 0 ? void 0 : _f.subscribe(uuid));
             }
             catch (error) {
-                (_h = this.Log) === null || _h === void 0 ? void 0 : _h.debug(`[Electron BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
+                (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug(`[Electron BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
                 throw error;
             }
             const cleanup = this.createNotificationSubscription(uuid);
@@ -1151,10 +1173,12 @@ class ElectronBleTransport {
         var _a, _b;
         if (hexData === 'PAIRING_REJECTED') {
             (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Pairing rejection detected for device:', deviceId);
-            if (this.runPromise) {
-                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled);
+            const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled);
+            if (this.deviceProtocol.get(deviceId) === 'V2') {
+                this.rejectProtocolV2Frames(deviceId, error);
+            }
+            else if (this.runPromise) {
                 this.runPromise.reject(error);
-                this.rejectAllProtocolV2Frames(error);
             }
             return;
         }
@@ -1170,13 +1194,8 @@ class ElectronBleTransport {
         this.handleProtocolV1Notification(deviceId, hexData);
     }
     handleProtocolV2Notification(deviceId, hexData) {
-        var _a, _b, _c;
+        var _a;
         try {
-            if (!this.runPromise || ((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) !== deviceId) {
-                (_b = this.v2Assemblers.get(deviceId)) === null || _b === void 0 ? void 0 : _b.reset();
-                this.resetProtocolV2Frames(deviceId);
-                return;
-            }
             const bytes = transport.hexToBytes(hexData);
             if (bytes.length === 0)
                 return;
@@ -1188,12 +1207,9 @@ class ElectronBleTransport {
             }
         }
         catch (error) {
-            (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Electron BLE] Protocol V2 notification error:', error);
-            if (this.runPromise) {
-                const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
-                this.runPromise.reject(notifyError);
-                this.rejectAllProtocolV2Frames(notifyError);
-            }
+            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Electron BLE] Protocol V2 notification error:', error);
+            const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+            this.rejectProtocolV2Frames(deviceId, notifyError);
         }
     }
     getProtocolV2FrameQueue(uuid) {
@@ -1224,9 +1240,13 @@ class ElectronBleTransport {
         this.v2FrameQueues.delete(uuid);
         this.v2FramePromises.delete(uuid);
     }
-    isActiveProtocolV2Call(uuid, token) {
-        var _a;
-        return ((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) === uuid && this.activeProtocolV2Call.token === token;
+    rejectProtocolV2Frames(uuid, error) {
+        this.v2FrameQueues.delete(uuid);
+        const framePromise = this.v2FramePromises.get(uuid);
+        if (framePromise) {
+            this.v2FramePromises.delete(uuid);
+            framePromise.reject(error);
+        }
     }
     readProtocolV2Frame(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1349,76 +1369,60 @@ class ElectronBleTransport {
         });
     }
     callProtocolV2(uuid, name, data, options) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
-            if (this.runPromise) {
-                if (!forceRun) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
-                }
-                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
-                this.runPromise.reject(error);
-                this.rejectAllProtocolV2Frames(error);
-                this.runPromise = null;
-                this.activeProtocolV2Call = null;
-            }
-            const runPromise = hdShared.createDeferred();
-            runPromise.promise.catch(() => undefined);
-            this.runPromise = runPromise;
-            const callToken = this.nextProtocolV2CallToken++;
-            this.activeProtocolV2Call = { uuid, token: callToken };
-            (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            this.resetProtocolV2Frames(uuid);
-            let completed = false;
-            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_b = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _b !== void 0 ? _b : BLE_RESPONSE_TIMEOUT_MS });
+            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : BLE_RESPONSE_TIMEOUT_MS });
             try {
-                const session = new transport.ProtocolV2Session({
-                    schemas: {
-                        protocolV1: this._messages,
-                        protocolV2: this._messagesV2,
-                    },
-                    router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
-                    writeFrame: (frame) => this.writeWithChunking(uuid, transport.bytesToHex(frame)),
-                    readFrame: () => __awaiter(this, void 0, void 0, function* () {
-                        const rxFrame = yield this.readProtocolV2Frame(uuid);
-                        if (!(rxFrame instanceof Uint8Array)) {
-                            throw new Error('Response is not Uint8Array');
-                        }
-                        return rxFrame;
-                    }),
-                    logger: this.Log,
-                    logPrefix: 'ProtocolV2 BLE',
-                    createTimeoutError: (_messageName, timeout) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE response timeout after ${timeout}ms for ${name}`),
-                });
-                const result = yield session.call(name, data, callOptions);
-                completed = true;
-                return result;
+                return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, callOptions);
             }
             catch (e) {
-                if (this.isActiveProtocolV2Call(uuid, callToken)) {
-                    (_c = this.v2Assemblers.get(uuid)) === null || _c === void 0 ? void 0 : _c.reset();
-                    this.resetProtocolV2Frames(uuid);
-                }
-                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.error('[Electron BLE] Protocol V2 call error:', e);
+                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Electron BLE] Protocol V2 call error:', e);
                 throw e;
             }
-            finally {
-                if (this.isActiveProtocolV2Call(uuid, callToken)) {
-                    if (!completed) {
-                        (_e = this.v2Assemblers.get(uuid)) === null || _e === void 0 ? void 0 : _e.reset();
-                    }
-                    this.resetProtocolV2Frames(uuid);
-                    this.activeProtocolV2Call = null;
-                }
-                if (this.runPromise === runPromise) {
-                    this.runPromise = null;
-                }
-            }
         });
     }
+    createProtocolV2Adapter(uuid) {
+        var _a;
+        const generation = (_a = this.notificationTokens.get(uuid)) !== null && _a !== void 0 ? _a : 0;
+        const assertCurrentGeneration = () => {
+            if (this.notificationTokens.get(uuid) !== generation) {
+                throw new Error(`Protocol V2 notification generation changed for ${uuid}`);
+            }
+        };
+        return {
+            router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
+            generation,
+            prepareCall: () => {
+                var _a;
+                assertCurrentGeneration();
+                (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.resetProtocolV2Frames(uuid);
+            },
+            writeFrame: (frame) => {
+                assertCurrentGeneration();
+                return this.writeWithChunking(uuid, transport.bytesToHex(frame));
+            },
+            readFrame: () => __awaiter(this, void 0, void 0, function* () {
+                assertCurrentGeneration();
+                const rxFrame = yield this.readProtocolV2Frame(uuid);
+                if (!(rxFrame instanceof Uint8Array)) {
+                    throw new Error('Response is not Uint8Array');
+                }
+                return rxFrame;
+            }),
+            reset: (reason) => {
+                var _a;
+                (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.rejectProtocolV2Frames(uuid, new Error(reason));
+            },
+            logger: this.Log,
+            logPrefix: 'ProtocolV2 BLE',
+            createTimeoutError: (messageName, timeout) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE response timeout after ${timeout}ms for ${messageName}`),
+        };
+    }
     processProtocolV1Notification(deviceId, hexData) {
         try {
             if (typeof hexData !== 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.8",
+  "version": "1.2.0-alpha.9",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,13 +20,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.8",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.8"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.9",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.9"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.8",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.9",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "d2b1323e5ad9c373e72d4d092f35c9f274c1fd74"
+  "gitHead": "f90ef9921b742f68cce9f4e7a0425e45e8ae7ec9"
 }

package/src/electron-ble-transport.ts

@@ -3,7 +3,7 @@ import transport, {
   PROTOCOL_V1_MESSAGE_HEADER_SIZE,
   PROTOCOL_V2_CHANNEL_BLE_UART,
   ProtocolV2FrameAssembler,
-  ProtocolV2Session,
+  ProtocolV2LinkManager,
   bytesToHex,
   hexToBytes,
   probeProtocolV2 as probeProtocolV2Helper,
@@ -111,9 +111,26 @@ export default class ElectronBleTransport {
 
   private v2FramePromises: Map<string, Deferred<Uint8Array>> = new Map();
 
-  private activeProtocolV2Call: { uuid: string; token: number } | null = null;
-
-  private nextProtocolV2CallToken = 1;
+  private protocolV2Links = new ProtocolV2LinkManager<string>({
+    getSchemas: () => {
+      if (!this._messages || !this._messagesV2) {
+        throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+      }
+      return {
+        protocolV1: this._messages,
+        protocolV2: this._messagesV2,
+      };
+    },
+    classifyError: () => 'link-fatal',
+    onLinkInvalidated: async (uuid, reason) => {
+      this.v2Assemblers.get(uuid)?.reset();
+      this.rejectProtocolV2Frames(uuid, new Error(reason));
+      this.Log?.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
+      if (reason.startsWith('Protocol V2 link-fatal error:')) {
+        await this.release(uuid);
+      }
+    },
+  });
 
   private notificationCleanups: Map<string, () => void> = new Map();
 
@@ -155,6 +172,9 @@ export default class ElectronBleTransport {
   }
 
   private cleanupDeviceState(deviceId: string): void {
+    this.protocolV2Links
+      .invalidateLink(deviceId, 'Electron BLE device state cleaned')
+      .catch(error => this.Log?.debug('[Electron BLE] link cleanup failed:', error));
     this.connectedDevices.delete(deviceId);
     this.deviceProtocol.delete(deviceId);
     // Keep deviceProtocolHints — it's inferred from device name (e.g. "Pro 2" → V2)
@@ -162,9 +182,6 @@ export default class ElectronBleTransport {
     this.v1Buffers.delete(deviceId);
     this.v2Assemblers.delete(deviceId);
     this.resetProtocolV2Frames(deviceId);
-    if (this.activeProtocolV2Call?.uuid === deviceId) {
-      this.activeProtocolV2Call = null;
-    }
     this.notificationTokens.delete(deviceId);
 
     const notifyCleanup = this.notificationCleanups.get(deviceId);
@@ -201,6 +218,9 @@ export default class ElectronBleTransport {
 
   configureProtocolV2(signedData: any) {
     this._messagesV2 = parseConfigure(signedData);
+    this.protocolV2Links
+      .invalidateAllLinks('Protocol V2 schema reconfigured')
+      .catch(error => this.Log?.debug('[Electron BLE] schema link cleanup failed:', error));
     this.Log?.debug('[Electron BLE] Protocol V2 schema configured');
   }
 
@@ -236,12 +256,15 @@ export default class ElectronBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.BleRequiredUUID);
     }
 
+    if (this.connectedDevices.has(uuid)) {
+      await this.release(uuid);
+    }
+
     if (forceCleanRunPromise && this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
       this.rejectAllProtocolV2Frames(error);
       this.runPromise = null;
-      this.activeProtocolV2Call = null;
     }
 
     try {
@@ -318,6 +341,7 @@ export default class ElectronBleTransport {
 
   async release(id: string) {
     try {
+      await this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
       if (this.connectedDevices.has(id)) {
         if (window.desktopApi?.nobleBle) {
           await window.desktopApi.nobleBle.unsubscribe(id);
@@ -415,12 +439,13 @@ export default class ElectronBleTransport {
   }
 
   private async resetProbeStateAfterProtocolProbe(uuid: string, protocol: ProtocolType) {
+    await this.protocolV2Links.invalidateLink(
+      uuid,
+      `Reset notify state after Protocol ${protocol} probe`
+    );
     this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
     this.v2Assemblers.get(uuid)?.reset();
     this.resetProtocolV2Frames(uuid);
-    if (this.activeProtocolV2Call?.uuid === uuid) {
-      this.activeProtocolV2Call = null;
-    }
     if (this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
@@ -523,10 +548,11 @@ export default class ElectronBleTransport {
   private handleNotification(deviceId: string, hexData: string): void {
     if (hexData === 'PAIRING_REJECTED') {
       this.Log?.debug('[Electron BLE] Pairing rejection detected for device:', deviceId);
-      if (this.runPromise) {
-        const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled);
+      const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled);
+      if (this.deviceProtocol.get(deviceId) === 'V2') {
+        this.rejectProtocolV2Frames(deviceId, error);
+      } else if (this.runPromise) {
         this.runPromise.reject(error);
-        this.rejectAllProtocolV2Frames(error);
       }
       return;
     }
@@ -545,12 +571,6 @@ export default class ElectronBleTransport {
 
   private handleProtocolV2Notification(deviceId: string, hexData: string): void {
     try {
-      if (!this.runPromise || this.activeProtocolV2Call?.uuid !== deviceId) {
-        this.v2Assemblers.get(deviceId)?.reset();
-        this.resetProtocolV2Frames(deviceId);
-        return;
-      }
-
       const bytes = hexToBytes(hexData);
       if (bytes.length === 0) return;
 
@@ -562,11 +582,8 @@ export default class ElectronBleTransport {
       }
     } catch (error) {
       this.Log?.error('[Electron BLE] Protocol V2 notification error:', error);
-      if (this.runPromise) {
-        const notifyError = ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
-        this.runPromise.reject(notifyError);
-        this.rejectAllProtocolV2Frames(notifyError);
-      }
+      const notifyError = ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
+      this.rejectProtocolV2Frames(deviceId, notifyError);
     }
   }
 
@@ -602,8 +619,13 @@ export default class ElectronBleTransport {
     this.v2FramePromises.delete(uuid);
   }
 
-  private isActiveProtocolV2Call(uuid: string, token: number) {
-    return this.activeProtocolV2Call?.uuid === uuid && this.activeProtocolV2Call.token === token;
+  private rejectProtocolV2Frames(uuid: string, error: Error) {
+    this.v2FrameQueues.delete(uuid);
+    const framePromise = this.v2FramePromises.get(uuid);
+    if (framePromise) {
+      this.v2FramePromises.delete(uuid);
+      framePromise.reject(error);
+    }
   }
 
   private async readProtocolV2Frame(uuid: string) {
@@ -755,79 +777,67 @@ export default class ElectronBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
-    if (this.runPromise) {
-      if (!forceRun) {
-        throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
-      }
-      const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
-      this.runPromise.reject(error);
-      this.rejectAllProtocolV2Frames(error);
-      this.runPromise = null;
-      this.activeProtocolV2Call = null;
-    }
-
-    const runPromise = createDeferred<Uint8Array | string>();
-    runPromise.promise.catch(() => undefined);
-    this.runPromise = runPromise;
-    const callToken = this.nextProtocolV2CallToken++;
-    this.activeProtocolV2Call = { uuid, token: callToken };
-    this.v2Assemblers.get(uuid)?.reset();
-    this.resetProtocolV2Frames(uuid);
-    let completed = false;
     const callOptions = {
       ...options,
       timeoutMs: options?.timeoutMs ?? BLE_RESPONSE_TIMEOUT_MS,
     };
 
     try {
-      const session = new ProtocolV2Session({
-        schemas: {
-          protocolV1: this._messages,
-          protocolV2: this._messagesV2,
-        },
-        router: PROTOCOL_V2_CHANNEL_BLE_UART,
-        writeFrame: (frame: Uint8Array) => this.writeWithChunking(uuid, bytesToHex(frame)),
-        readFrame: async () => {
-          const rxFrame = await this.readProtocolV2Frame(uuid);
-          if (!(rxFrame instanceof Uint8Array)) {
-            throw new Error('Response is not Uint8Array');
-          }
-          return rxFrame;
-        },
-        logger: this.Log,
-        logPrefix: 'ProtocolV2 BLE',
-        createTimeoutError: (_messageName: string, timeout: number) =>
-          ERRORS.TypedError(
-            HardwareErrorCode.BleTimeoutError,
-            `BLE response timeout after ${timeout}ms for ${name}`
-          ),
-      });
-
-      const result = await session.call(name, data, callOptions);
-      completed = true;
-      return result;
+      return await this.protocolV2Links.call(
+        uuid,
+        () => this.createProtocolV2Adapter(uuid),
+        name,
+        data,
+        callOptions
+      );
     } catch (e) {
-      if (this.isActiveProtocolV2Call(uuid, callToken)) {
-        this.v2Assemblers.get(uuid)?.reset();
-        this.resetProtocolV2Frames(uuid);
-      }
       this.Log?.error('[Electron BLE] Protocol V2 call error:', e);
       throw e;
-    } finally {
-      if (this.isActiveProtocolV2Call(uuid, callToken)) {
-        if (!completed) {
-          this.v2Assemblers.get(uuid)?.reset();
-        }
-        this.resetProtocolV2Frames(uuid);
-        this.activeProtocolV2Call = null;
-      }
-      if (this.runPromise === runPromise) {
-        this.runPromise = null;
-      }
     }
   }
 
+  private createProtocolV2Adapter(uuid: string) {
+    const generation = this.notificationTokens.get(uuid) ?? 0;
+    const assertCurrentGeneration = () => {
+      if (this.notificationTokens.get(uuid) !== generation) {
+        throw new Error(`Protocol V2 notification generation changed for ${uuid}`);
+      }
+    };
+
+    return {
+      router: PROTOCOL_V2_CHANNEL_BLE_UART,
+      generation,
+      prepareCall: () => {
+        assertCurrentGeneration();
+        this.v2Assemblers.get(uuid)?.reset();
+        this.resetProtocolV2Frames(uuid);
+      },
+      writeFrame: (frame: Uint8Array) => {
+        assertCurrentGeneration();
+        return this.writeWithChunking(uuid, bytesToHex(frame));
+      },
+      readFrame: async () => {
+        assertCurrentGeneration();
+        const rxFrame = await this.readProtocolV2Frame(uuid);
+        if (!(rxFrame instanceof Uint8Array)) {
+          throw new Error('Response is not Uint8Array');
+        }
+        return rxFrame;
+      },
+      reset: (reason: string) => {
+        this.v2Assemblers.get(uuid)?.reset();
+        this.rejectProtocolV2Frames(uuid, new Error(reason));
+      },
+      logger: this.Log,
+      logPrefix: 'ProtocolV2 BLE',
+      createTimeoutError: (messageName: string, timeout: number) =>
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          `BLE response timeout after ${timeout}ms for ${messageName}`
+        ),
+    };
+  }
+
   private processProtocolV1Notification(deviceId: string, hexData: string): PacketProcessResult {
     try {
       if (typeof hexData !== 'string') {