npm - @onekeyfe/hd-transport-web-device - Versions diffs - 1.1.27-alpha.31 → 1.1.27-alpha.32 - Mend

@onekeyfe/hd-transport-web-device 1.1.27-alpha.31 → 1.1.27-alpha.32

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 (9) hide show

package/dist/electron-auto-ble-transport.d.ts +12 -3
package/dist/electron-auto-ble-transport.d.ts.map +1 -1
package/dist/index.d.ts +13 -3
package/dist/index.js +190 -68
package/dist/webusb.d.ts +1 -0
package/dist/webusb.d.ts.map +1 -1
package/package.json +5 -5
package/src/electron-auto-ble-transport.ts +158 -54
package/src/webusb.ts +39 -9

package/dist/electron-auto-ble-transport.d.ts CHANGED Viewed

@@ -23,12 +23,17 @@ export default class ElectronAutoBleTransport {
     emitter?: EventEmitter;
     private connectedDevices;
     private deviceProtocol;
+    private deviceProtocolHints;
     private v1Buffers;
     private v2Assemblers;
-    private v2FrameQueue;
-    private v2FramePromise;
+    private v2FrameQueues;
+    private v2FramePromises;
+    private activeProtocolV2Call;
+    private nextProtocolV2CallToken;
     private notificationCleanups;
     private disconnectCleanups;
+    private notificationTokens;
+    private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -50,15 +55,19 @@ export default class ElectronAutoBleTransport {
     release(id: string): Promise<void>;
     private createProtocolMismatchError;
     private detectProtocol;
+    private createNotificationSubscription;
+    private resetProbeStateAfterProtocolProbe;
     private probeProtocolV1;
     private probeProtocolV2;
     private writeWithChunking;
     private writeWithRetry;
     private handleNotification;
     private handleProtocolV2Notification;
+    private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;
-    private rejectProtocolV2Frame;
+    private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
+    private isActiveProtocolV2Call;
     private readProtocolV2Frame;
     private handleProtocolV1Notification;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;

package/dist/electron-auto-ble-transport.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"electron-auto-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-auto-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;AAWvC,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;~~AAyCF~~,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA8B;IAElC,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,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,~~YAAY~~,~~CAAoB~~;~~IAExC~~,OAAO,CAAC,~~cAAc~~,~~CAAqC~~;~~IAE3D~~,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;~~IAmB1B~~,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;~~IAiBxC~~,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;~~IAqF9B~~,OAAO,CAAC,EAAE,EAAE,MAAM;IAexB,OAAO,CAAC,2BAA2B;YAOrB,cAAc;~~YAqCd~~,eAAe;YAef,eAAe;YAmBf,iBAAiB;YAsBjB,cAAc;IA4B5B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,4BAA4B;IA6BpC,OAAO,CAAC,sBAAsB;~~IAS9B~~,OAAO,CAAC,~~qBAAqB~~;~~IAQ7B~~,OAAO,CAAC,qBAAqB;~~YAKf~~,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;YAyBlB,cAAc;YAuEd,cAAc;~~IA2E5B~~,OAAO,CAAC,6BAA6B;IAgDrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;CAG5C"}
1	+ {"version":3,"file":"electron-auto-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-auto-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;AAWvC,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;AAsCF,MAAM,CAAC,OAAO,OAAO,wBAAwB;IAC3C,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,IAAI,SAA8B;IAElC,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;IAyB1B,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;YAOrB,cAAc;IAgD5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAoCjC,eAAe;YAef,eAAe;YAmBf,iBAAiB;YAsBjB,cAAc;IA4B5B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,4BAA4B;IA6BpC,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;YAyBlB,cAAc;YAuEd,cAAc;IAmF5B,OAAO,CAAC,6BAA6B;IAgDrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;CAG5C"}

package/dist/index.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ declare class WebUsbTransport {
     messages: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
     messagesV2: ReturnType<typeof _onekeyfe_hd_transport__default.parseConfigure> | undefined;
     private deviceProtocol;
+    private deviceProtocolHints;
     private protocolV2Assemblers;
     private deviceEndpoints;
     name: string;
@@ -118,12 +119,17 @@ declare class ElectronAutoBleTransport {
     emitter?: EventEmitter;
     private connectedDevices;
     private deviceProtocol;
+    private deviceProtocolHints;
     private v1Buffers;
     private v2Assemblers;
-    private v2FrameQueue;
-    private v2FramePromise;
+    private v2FrameQueues;
+    private v2FramePromises;
+    private activeProtocolV2Call;
+    private nextProtocolV2CallToken;
     private notificationCleanups;
     private disconnectCleanups;
+    private notificationTokens;
+    private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -145,15 +151,19 @@ declare class ElectronAutoBleTransport {
     release(id: string): Promise<void>;
     private createProtocolMismatchError;
     private detectProtocol;
+    private createNotificationSubscription;
+    private resetProbeStateAfterProtocolProbe;
     private probeProtocolV1;
     private probeProtocolV2;
     private writeWithChunking;
     private writeWithRetry;
     private handleNotification;
     private handleProtocolV2Notification;
+    private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;
-    private rejectProtocolV2Frame;
+    private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
+    private isActiveProtocolV2Call;
     private readProtocolV2Frame;
     private handleProtocolV1Notification;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<_onekeyfe_hd_transport.MessageFromOneKey>;

package/dist/index.js CHANGED Viewed

@@ -61,9 +61,13 @@ function shouldBlockWebUsbCallDataLog(name) {
     const normalized = name.replace(/[_\s-]/g, '');
     return transport.LogBlockCommand.has(name) || WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
 }
+function inferProtocolHintFromDeviceName$1(name) {
+    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
+}
 class WebUsbTransport {
     constructor() {
         this.deviceProtocol = new Map();
+        this.deviceProtocolHints = new Map();
         this.protocolV2Assemblers = new Map();
         this.deviceEndpoints = new Map();
         this.name = 'WebUsbTransport';
@@ -122,11 +126,18 @@ class WebUsbTransport {
                 const hasSerialNumber = typeof dev.serialNumber === 'string' && dev.serialNumber.length > 0;
                 return isOneKey && hasSerialNumber;
             });
-            this.deviceList = onekeyDevices.map(device => ({
-                path: device.serialNumber,
-                device,
-                commType: 'webusb',
-            }));
+            this.deviceList = onekeyDevices.map(device => {
+                const path = device.serialNumber;
+                const protocolHint = inferProtocolHintFromDeviceName$1(device.productName);
+                if (protocolHint) {
+                    this.deviceProtocolHints.set(path, protocolHint);
+                }
+                return {
+                    path,
+                    device,
+                    commType: 'webusb',
+                };
+            });
             for (const dev of onekeyDevices) {
                 this.Log.debug(`[WebUSB] Device: name="${dev.productName}" serial="${dev.serialNumber}" ` +
                     `VID=0x${dev.vendorId.toString(16)} PID=0x${dev.productId.toString(16)}`);
@@ -135,13 +146,20 @@ class WebUsbTransport {
         });
     }
     acquire(input) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (!input.path)
                 return;
             try {
                 yield this.connect((_a = input.path) !== null && _a !== void 0 ? _a : '', true);
-                yield this.detectProtocol(input.path, input.expectedProtocol);
+                const deviceName = (_b = this.deviceList.find(device => device.path === input.path)) === null || _b === void 0 ? void 0 : _b.device.productName;
+                const protocolHint = input.expectedProtocol
+                    ? undefined
+                    : (_c = this.deviceProtocolHints.get(input.path)) !== null && _c !== void 0 ? _c : inferProtocolHintFromDeviceName$1(deviceName);
+                if (protocolHint) {
+                    this.deviceProtocolHints.set(input.path, protocolHint);
+                }
+                yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
                 return yield Promise.resolve(input.path);
             }
             catch (e) {
@@ -153,7 +171,7 @@ class WebUsbTransport {
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
-    detectProtocol(path, expectedProtocol) {
+    detectProtocol(path, expectedProtocol, protocolHint) {
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(path)) {
@@ -171,6 +189,11 @@ class WebUsbTransport {
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
+            if (protocolHint === 'V2' && (yield this.probeProtocolV2(path))) {
+                this.deviceProtocol.set(path, 'V2');
+                this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (hint)`);
+                return 'V2';
+            }
             if (this.deviceProtocol.get(path) === 'V2' && (yield this.probeProtocolV2(path))) {
                 this.deviceProtocol.set(path, 'V2');
                 this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (cached)`);
@@ -641,6 +664,7 @@ class WebUsbTransport {
             yield device.releaseInterface(ifaceNum);
             yield device.close();
             this.deviceProtocol.delete(path);
+            this.deviceProtocolHints.delete(path);
             (_b = this.protocolV2Assemblers.get(path)) === null || _b === void 0 ? void 0 : _b.reset();
             this.protocolV2Assemblers.delete(path);
             this.deviceEndpoints.delete(path);
@@ -951,13 +975,10 @@ function shouldSuppressHighVolumeCallLog(name) {
     return FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
 }
 const { parseConfigure, ProtocolV1, check } = transport__default["default"];
-function inferProtocolTypeFromDeviceName(name) {
+function inferProtocolHintFromDeviceName(name) {
     return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
 }
-const toBleDescriptor = (device, protocolType) => {
-    const resolvedProtocolType = protocolType !== null && protocolType !== void 0 ? protocolType : inferProtocolTypeFromDeviceName(device.name);
-    return Object.assign({ id: device.id, name: device.name, path: device.id, debug: false, commType: 'electron-ble' }, (resolvedProtocolType ? { protocolType: resolvedProtocolType } : {}));
-};
+const toBleDescriptor = (device, protocolType) => (Object.assign({ id: device.id, name: device.name, path: device.id, debug: false, commType: 'electron-ble' }, (protocolType ? { protocolType } : {})));
 const BLE_PACKET_SIZE = 192;
 const BLE_WRITE_DELAY_MS = 5;
 const BLE_WRITE_MAX_RETRIES = 3;
@@ -971,12 +992,17 @@ class ElectronAutoBleTransport {
         this.runPromise = null;
         this.connectedDevices = new Set();
         this.deviceProtocol = new Map();
+        this.deviceProtocolHints = new Map();
         this.v1Buffers = new Map();
         this.v2Assemblers = new Map();
-        this.v2FrameQueue = [];
-        this.v2FramePromise = null;
+        this.v2FrameQueues = new Map();
+        this.v2FramePromises = new Map();
+        this.activeProtocolV2Call = null;
+        this.nextProtocolV2CallToken = 1;
         this.notificationCleanups = new Map();
         this.disconnectCleanups = new Map();
+        this.notificationTokens = new Map();
+        this.nextNotificationToken = 1;
     }
     handleBluetoothError(error) {
         if (error && typeof error === 'object') {
@@ -1008,10 +1034,17 @@ class ElectronAutoBleTransport {
         throw error;
     }
     cleanupDeviceState(deviceId) {
+        var _a;
         this.connectedDevices.delete(deviceId);
         this.deviceProtocol.delete(deviceId);
+        this.deviceProtocolHints.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) {
             notifyCleanup();
@@ -1057,6 +1090,10 @@ class ElectronAutoBleTransport {
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Auto BLE] enumerate found ${devices.length} device(s):`);
                 for (const dev of devices) {
                     (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Auto BLE]   id="${dev.id}" name="${dev.name}"`);
+                    const protocolHint = inferProtocolHintFromDeviceName(dev.name);
+                    if (protocolHint) {
+                        this.deviceProtocolHints.set(dev.id, protocolHint);
+                    }
                 }
                 return devices.map(device => toBleDescriptor(device));
             }
@@ -1067,7 +1104,7 @@ class ElectronAutoBleTransport {
         });
     }
     acquire(input) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
             if (!uuid) {
@@ -1076,7 +1113,9 @@ class ElectronAutoBleTransport {
             if (forceCleanRunPromise && this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
-                this.rejectProtocolV2Frame(error);
+                this.rejectAllProtocolV2Frames(error);
+                this.runPromise = null;
+                this.activeProtocolV2Call = null;
             }
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
@@ -1086,6 +1125,12 @@ class ElectronAutoBleTransport {
                 if (!device) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
                 }
+                const protocolHint = expectedProtocol
+                    ? undefined
+                    : (_b = this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(device.name);
+                if (protocolHint) {
+                    this.deviceProtocolHints.set(uuid, protocolHint);
+                }
                 try {
                     yield window.desktopApi.nobleBle.connect(uuid);
                     this.connectedDevices.add(uuid);
@@ -1096,11 +1141,7 @@ class ElectronAutoBleTransport {
                 this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
                 this.v2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler());
                 yield window.desktopApi.nobleBle.subscribe(uuid);
-                const cleanup = window.desktopApi.nobleBle.onNotification((deviceId, data) => {
-                    if (deviceId === uuid) {
-                        this.handleNotification(uuid, data);
-                    }
-                });
+                const cleanup = this.createNotificationSubscription(uuid);
                 this.notificationCleanups.set(uuid, cleanup);
                 const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected((disconnectedDevice) => {
                     var _a;
@@ -1114,8 +1155,8 @@ class ElectronAutoBleTransport {
                     }
                 });
                 this.disconnectCleanups.set(uuid, disconnectCleanup);
-                const protocolType = yield this.detectProtocol(uuid, expectedProtocol);
-                (_b = this.emitter) === null || _b === void 0 ? void 0 : _b.emit('device-connect', {
+                const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
+                (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit('device-connect', {
                     name: device.name,
                     id: device.id,
                     connectId: device.id,
@@ -1123,15 +1164,15 @@ class ElectronAutoBleTransport {
                 return Object.assign(Object.assign({}, toBleDescriptor({ id: device.id, name: device.name }, protocolType)), { uuid });
             }
             catch (error) {
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Auto BLE] acquire failed:', error);
+                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.error('[Auto BLE] acquire failed:', error);
                 try {
-                    if (((_d = window.desktopApi) === null || _d === void 0 ? void 0 : _d.nobleBle) && this.connectedDevices.has(uuid)) {
+                    if (((_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) && this.connectedDevices.has(uuid)) {
                         yield window.desktopApi.nobleBle.unsubscribe(uuid);
                         yield window.desktopApi.nobleBle.disconnect(uuid);
                     }
                 }
                 catch (cleanupError) {
-                    (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug('[Auto BLE] acquire cleanup failed:', cleanupError);
+                    (_f = this.Log) === null || _f === void 0 ? void 0 : _f.debug('[Auto BLE] acquire cleanup failed:', cleanupError);
                 }
                 this.cleanupDeviceState(uuid);
                 throw error;
@@ -1159,8 +1200,8 @@ class ElectronAutoBleTransport {
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
-    detectProtocol(uuid, expectedProtocol) {
-        var _a, _b, _c, _d;
+    detectProtocol(uuid, expectedProtocol, protocolHint) {
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
@@ -1178,20 +1219,80 @@ class ElectronAutoBleTransport {
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
+            if (protocolHint === 'V2' && (yield this.probeProtocolV2(uuid))) {
+                this.deviceProtocol.set(uuid, 'V2');
+                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> V2 (hint)`);
+                return 'V2';
+            }
             if (this.deviceProtocol.get(uuid) === 'V2' && (yield this.probeProtocolV2(uuid))) {
                 this.deviceProtocol.set(uuid, 'V2');
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> V2 (cached)`);
+                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> V2 (cached)`);
                 return 'V2';
             }
             let protocol = 'V1';
-            if (!(yield this.probeProtocolV1(uuid)) && (yield this.probeProtocolV2(uuid))) {
-                protocol = 'V2';
+            const protocolV1Detected = yield this.probeProtocolV1(uuid);
+            if (!protocolV1Detected) {
+                yield this.resetProbeStateAfterProtocolProbe(uuid, 'V1');
+                if (yield this.probeProtocolV2(uuid)) {
+                    protocol = 'V2';
+                }
             }
             this.deviceProtocol.set(uuid, protocol);
-            (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
+            (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
             return protocol;
         });
     }
+    createNotificationSubscription(uuid) {
+        var _a;
+        if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
+            throw new Error('Noble BLE API not available');
+        }
+        const notificationToken = this.nextNotificationToken;
+        this.nextNotificationToken += 1;
+        this.notificationTokens.set(uuid, notificationToken);
+        return window.desktopApi.nobleBle.onNotification((deviceId, data) => {
+            if (deviceId === uuid && this.notificationTokens.get(uuid) === notificationToken) {
+                this.handleNotification(uuid, data);
+            }
+        });
+    }
+    resetProbeStateAfterProtocolProbe(uuid, protocol) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        return __awaiter(this, void 0, void 0, function* () {
+            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);
+                this.runPromise = null;
+            }
+            const notifyCleanup = this.notificationCleanups.get(uuid);
+            if (notifyCleanup) {
+                notifyCleanup();
+                this.notificationCleanups.delete(uuid);
+            }
+            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));
+            }
+            catch (error) {
+                (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug(`[Auto 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));
+            }
+            catch (error) {
+                (_h = this.Log) === null || _h === void 0 ? void 0 : _h.debug(`[Auto BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
+                throw error;
+            }
+            const cleanup = this.createNotificationSubscription(uuid);
+            this.notificationCleanups.set(uuid, cleanup);
+        });
+    }
     probeProtocolV1(uuid) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -1225,7 +1326,7 @@ class ElectronAutoBleTransport {
                 onProbeFailed: () => {
                     var _a;
                     (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-                    this.resetProtocolV2Frames();
+                    this.resetProtocolV2Frames(uuid);
                 },
             });
         });
@@ -1280,7 +1381,7 @@ class ElectronAutoBleTransport {
             if (this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled);
                 this.runPromise.reject(error);
-                this.rejectProtocolV2Frame(error);
+                this.rejectAllProtocolV2Frames(error);
             }
             return;
         }
@@ -1292,11 +1393,11 @@ class ElectronAutoBleTransport {
         this.handleProtocolV1Notification(deviceId, hexData);
     }
     handleProtocolV2Notification(deviceId, hexData) {
-        var _a, _b;
+        var _a, _b, _c;
         try {
-            if (!this.runPromise) {
-                (_a = this.v2Assemblers.get(deviceId)) === null || _a === void 0 ? void 0 : _a.reset();
-                this.resetProtocolV2Frames();
+            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);
@@ -1307,52 +1408,65 @@ class ElectronAutoBleTransport {
                 return;
             let frameData = assembler.push(bytes);
             while (frameData) {
-                this.resolveProtocolV2Frame(frameData);
+                this.resolveProtocolV2Frame(deviceId, frameData);
                 frameData = assembler.push(new Uint8Array(0));
             }
         }
         catch (error) {
-            (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Auto BLE] Protocol V2 notification error:', error);
+            (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Auto BLE] Protocol V2 notification error:', error);
             if (this.runPromise) {
                 const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                 this.runPromise.reject(notifyError);
-                this.rejectProtocolV2Frame(notifyError);
+                this.rejectAllProtocolV2Frames(notifyError);
             }
         }
     }
-    resolveProtocolV2Frame(frame) {
-        if (this.v2FramePromise) {
-            this.v2FramePromise.resolve(frame);
-            this.v2FramePromise = null;
+    getProtocolV2FrameQueue(uuid) {
+        let queue = this.v2FrameQueues.get(uuid);
+        if (!queue) {
+            queue = [];
+            this.v2FrameQueues.set(uuid, queue);
+        }
+        return queue;
+    }
+    resolveProtocolV2Frame(uuid, frame) {
+        const framePromise = this.v2FramePromises.get(uuid);
+        if (framePromise) {
+            framePromise.resolve(frame);
+            this.v2FramePromises.delete(uuid);
             return;
         }
-        this.v2FrameQueue.push(frame);
+        this.getProtocolV2FrameQueue(uuid).push(frame);
     }
-    rejectProtocolV2Frame(error) {
-        this.v2FrameQueue = [];
-        if (this.v2FramePromise) {
-            this.v2FramePromise.reject(error);
-            this.v2FramePromise = null;
+    rejectAllProtocolV2Frames(error) {
+        this.v2FrameQueues.clear();
+        for (const framePromise of this.v2FramePromises.values()) {
+            framePromise.reject(error);
         }
+        this.v2FramePromises.clear();
     }
-    resetProtocolV2Frames() {
-        this.v2FrameQueue = [];
-        this.v2FramePromise = null;
+    resetProtocolV2Frames(uuid) {
+        this.v2FrameQueues.delete(uuid);
+        this.v2FramePromises.delete(uuid);
     }
-    readProtocolV2Frame() {
+    isActiveProtocolV2Call(uuid, token) {
+        var _a;
+        return ((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) === uuid && this.activeProtocolV2Call.token === token;
+    }
+    readProtocolV2Frame(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
-            const queuedFrame = this.v2FrameQueue.shift();
+            const queuedFrame = this.getProtocolV2FrameQueue(uuid).shift();
             if (queuedFrame) {
                 return queuedFrame;
             }
             const framePromise = hdShared.createDeferred();
-            this.v2FramePromise = framePromise;
+            this.v2FramePromises.set(uuid, framePromise);
             try {
                 return yield framePromise.promise;
             }
             finally {
-                if (this.v2FramePromise === framePromise) {
-                    this.v2FramePromise = null;
+                if (this.v2FramePromises.get(uuid) === framePromise) {
+                    this.v2FramePromises.delete(uuid);
                 }
             }
         });
@@ -1469,14 +1583,17 @@ class ElectronAutoBleTransport {
                 }
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
-                this.rejectProtocolV2Frame(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();
+            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 });
             try {
@@ -1488,7 +1605,7 @@ class ElectronAutoBleTransport {
                     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();
+                        const rxFrame = yield this.readProtocolV2Frame(uuid);
                         if (!(rxFrame instanceof Uint8Array)) {
                             throw new Error('Response is not Uint8Array');
                         }
@@ -1503,16 +1620,21 @@ class ElectronAutoBleTransport {
                 return result;
             }
             catch (e) {
-                (_c = this.v2Assemblers.get(uuid)) === null || _c === void 0 ? void 0 : _c.reset();
-                this.resetProtocolV2Frames();
+                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('[Auto BLE] Protocol V2 call error:', e);
                 throw e;
             }
             finally {
-                if (!completed) {
-                    (_e = this.v2Assemblers.get(uuid)) === null || _e === void 0 ? void 0 : _e.reset();
+                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;
                 }
-                this.resetProtocolV2Frames();
                 if (this.runPromise === runPromise) {
                     this.runPromise = null;
                 }

package/dist/webusb.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export default class WebUsbTransport {
     messages: ReturnType<typeof transport.parseConfigure> | undefined;
     messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
     private deviceProtocol;
+    private deviceProtocolHints;
     private protocolV2Assemblers;
     private deviceEndpoints;
     name: string;

package/dist/webusb.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;~~AA6BhC~~,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGpE,OAAO,CAAC,cAAc,CAAwC;~~IAG9D~~,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,eAAe,CAA2C;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAU7B,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;~~IAgCnB~~,OAAO,CAAC,KAAK,EAAE,YAAY;~~IAiBjC~~,OAAO,CAAC,2BAA2B;YAOrB,cAAc;~~IAwCtB~~,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAgC5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YAoCpB,mBAAmB;YA2CnB,yBAAyB;YAuBzB,uBAAuB;YA4CvB,eAAe;YAcf,eAAe;IAiBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA4BlB,cAAc;YAkCd,cAAc;YAmCd,sBAAsB;IA4C9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;~~IAgB1B~~,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;CAG5C"}
1	+ {"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAiChC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGpE,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,eAAe,CAA2C;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;IAK3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAU7B,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;IAwCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IAyBjC,OAAO,CAAC,2BAA2B;YAOrB,cAAc;IA+CtB,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAgC5C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YAoCpB,mBAAmB;YA2CnB,yBAAyB;YAuBzB,uBAAuB;YA4CvB,eAAe;YAcf,eAAe;IAiBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA4BlB,cAAc;YAkCd,cAAc;YAmCd,sBAAsB;IA4C9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAiB1B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY;CAG5C"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.1.27-alpha.31",
+  "version": "1.1.27-alpha.32",
   "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.1.27-alpha.31",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.31"
+    "@onekeyfe/hd-shared": "1.1.27-alpha.32",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.32"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.1.27-alpha.31",
+    "@onekeyfe/hd-transport-electron": "1.1.27-alpha.32",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "73a8ecbc0e5e47038966b2f9a5ab30dc2f947d8f"
+  "gitHead": "04f92052a18dcf17e4a347f3003b4c4bbf062681"
 }

package/src/electron-auto-ble-transport.ts CHANGED Viewed

@@ -49,25 +49,22 @@ interface PacketProcessResult {
   error?: string;
 }
-function inferProtocolTypeFromDeviceName(name?: string | null): ProtocolType | undefined {
+function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
   return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
 }
 const toBleDescriptor = (
   device: { id: string; name: string | null },
   protocolType?: ProtocolType
-): OneKeyDeviceInfo => {
-  const resolvedProtocolType = protocolType ?? inferProtocolTypeFromDeviceName(device.name);
-  return {
+): OneKeyDeviceInfo =>
+  ({
     id: device.id,
     name: device.name,
     path: device.id,
     debug: false,
     commType: 'electron-ble',
-    ...(resolvedProtocolType ? { protocolType: resolvedProtocolType } : {}),
-  } as OneKeyDeviceInfo;
-};
+    ...(protocolType ? { protocolType } : {}),
+  } as OneKeyDeviceInfo);
 const BLE_PACKET_SIZE = 192;
 const BLE_WRITE_DELAY_MS = 5;
@@ -101,18 +98,28 @@ export default class ElectronAutoBleTransport {
   private deviceProtocol: Map<string, ProtocolType> = new Map();
+  private deviceProtocolHints: Map<string, ProtocolType> = new Map();
   private v1Buffers: Map<string, { buffer: number[]; bufferLength: number }> = new Map();
   private v2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
-  private v2FrameQueue: Uint8Array[] = [];
+  private v2FrameQueues: Map<string, Uint8Array[]> = new Map();
+  private v2FramePromises: Map<string, Deferred<Uint8Array>> = new Map();
-  private v2FramePromise: Deferred<Uint8Array> | null = null;
+  private activeProtocolV2Call: { uuid: string; token: number } | null = null;
+  private nextProtocolV2CallToken = 1;
   private notificationCleanups: Map<string, () => void> = new Map();
   private disconnectCleanups: Map<string, () => void> = new Map();
+  private notificationTokens: Map<string, number> = new Map();
+  private nextNotificationToken = 1;
   private handleBluetoothError(error: any): never {
     if (error && typeof error === 'object') {
       if ('code' in error) {
@@ -147,8 +154,14 @@ export default class ElectronAutoBleTransport {
   private cleanupDeviceState(deviceId: string): void {
     this.connectedDevices.delete(deviceId);
     this.deviceProtocol.delete(deviceId);
+    this.deviceProtocolHints.delete(deviceId);
     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);
     if (notifyCleanup) {
@@ -200,6 +213,10 @@ export default class ElectronAutoBleTransport {
       this.Log?.debug(`[Auto BLE] enumerate found ${devices.length} device(s):`);
       for (const dev of devices) {
         this.Log?.debug(`[Auto BLE]   id="${dev.id}" name="${dev.name}"`);
+        const protocolHint = inferProtocolHintFromDeviceName(dev.name);
+        if (protocolHint) {
+          this.deviceProtocolHints.set(dev.id, protocolHint);
+        }
       }
       return devices.map(device => toBleDescriptor(device));
     } catch (error) {
@@ -218,7 +235,9 @@ export default class ElectronAutoBleTransport {
     if (forceCleanRunPromise && this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
-      this.rejectProtocolV2Frame(error);
+      this.rejectAllProtocolV2Frames(error);
+      this.runPromise = null;
+      this.activeProtocolV2Call = null;
     }
     try {
@@ -230,6 +249,12 @@ export default class ElectronAutoBleTransport {
       if (!device) {
         throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
       }
+      const protocolHint = expectedProtocol
+        ? undefined
+        : this.deviceProtocolHints.get(uuid) ?? inferProtocolHintFromDeviceName(device.name);
+      if (protocolHint) {
+        this.deviceProtocolHints.set(uuid, protocolHint);
+      }
       try {
         await window.desktopApi.nobleBle.connect(uuid);
@@ -243,13 +268,7 @@ export default class ElectronAutoBleTransport {
       await window.desktopApi.nobleBle.subscribe(uuid);
-      const cleanup = window.desktopApi.nobleBle.onNotification(
-        (deviceId: string, data: string) => {
-          if (deviceId === uuid) {
-            this.handleNotification(uuid, data);
-          }
-        }
-      );
+      const cleanup = this.createNotificationSubscription(uuid);
       this.notificationCleanups.set(uuid, cleanup);
       const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected(
@@ -266,7 +285,7 @@ export default class ElectronAutoBleTransport {
       );
       this.disconnectCleanups.set(uuid, disconnectCleanup);
-      const protocolType = await this.detectProtocol(uuid, expectedProtocol);
+      const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
       this.emitter?.emit('device-connect', {
         name: device.name,
@@ -317,7 +336,8 @@ export default class ElectronAutoBleTransport {
   private async detectProtocol(
     uuid: string,
-    expectedProtocol?: ProtocolType
+    expectedProtocol?: ProtocolType,
+    protocolHint?: ProtocolType
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
@@ -337,6 +357,12 @@ export default class ElectronAutoBleTransport {
       throw this.createProtocolMismatchError(expectedProtocol);
     }
+    if (protocolHint === 'V2' && (await this.probeProtocolV2(uuid))) {
+      this.deviceProtocol.set(uuid, 'V2');
+      this.Log?.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> V2 (hint)`);
+      return 'V2';
+    }
     if (this.deviceProtocol.get(uuid) === 'V2' && (await this.probeProtocolV2(uuid))) {
       this.deviceProtocol.set(uuid, 'V2');
       this.Log?.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> V2 (cached)`);
@@ -344,14 +370,70 @@ export default class ElectronAutoBleTransport {
     }
     let protocol: ProtocolType = 'V1';
-    if (!(await this.probeProtocolV1(uuid)) && (await this.probeProtocolV2(uuid))) {
-      protocol = 'V2';
+    const protocolV1Detected = await this.probeProtocolV1(uuid);
+    if (!protocolV1Detected) {
+      await this.resetProbeStateAfterProtocolProbe(uuid, 'V1');
+      if (await this.probeProtocolV2(uuid)) {
+        protocol = 'V2';
+      }
     }
     this.deviceProtocol.set(uuid, protocol);
     this.Log?.debug(`[Auto BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
     return protocol;
   }
+  private createNotificationSubscription(uuid: string) {
+    if (!window.desktopApi?.nobleBle) {
+      throw new Error('Noble BLE API not available');
+    }
+    const notificationToken = this.nextNotificationToken;
+    this.nextNotificationToken += 1;
+    this.notificationTokens.set(uuid, notificationToken);
+    return window.desktopApi.nobleBle.onNotification((deviceId: string, data: string) => {
+      if (deviceId === uuid && this.notificationTokens.get(uuid) === notificationToken) {
+        this.handleNotification(uuid, data);
+      }
+    });
+  }
+  private async resetProbeStateAfterProtocolProbe(uuid: string, protocol: ProtocolType) {
+    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);
+      this.runPromise = null;
+    }
+    const notifyCleanup = this.notificationCleanups.get(uuid);
+    if (notifyCleanup) {
+      notifyCleanup();
+      this.notificationCleanups.delete(uuid);
+    }
+    this.notificationTokens.delete(uuid);
+    try {
+      await window.desktopApi?.nobleBle?.unsubscribe(uuid);
+    } catch (error) {
+      this.Log?.debug(`[Auto BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
+    }
+    try {
+      await window.desktopApi?.nobleBle?.subscribe(uuid);
+    } catch (error) {
+      this.Log?.debug(`[Auto BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
+      throw error;
+    }
+    const cleanup = this.createNotificationSubscription(uuid);
+    this.notificationCleanups.set(uuid, cleanup);
+  }
   private async probeProtocolV1(uuid: string) {
     if (!this._messages) {
       return false;
@@ -381,7 +463,7 @@ export default class ElectronAutoBleTransport {
       logPrefix: 'ProtocolV2 BLE',
       onProbeFailed: () => {
         this.v2Assemblers.get(uuid)?.reset();
-        this.resetProtocolV2Frames();
+        this.resetProtocolV2Frames(uuid);
       },
     });
   }
@@ -442,7 +524,7 @@ export default class ElectronAutoBleTransport {
       if (this.runPromise) {
         const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled);
         this.runPromise.reject(error);
-        this.rejectProtocolV2Frame(error);
+        this.rejectAllProtocolV2Frames(error);
       }
       return;
     }
@@ -457,9 +539,9 @@ export default class ElectronAutoBleTransport {
   private handleProtocolV2Notification(deviceId: string, hexData: string): void {
     try {
-      if (!this.runPromise) {
+      if (!this.runPromise || this.activeProtocolV2Call?.uuid !== deviceId) {
         this.v2Assemblers.get(deviceId)?.reset();
-        this.resetProtocolV2Frames();
+        this.resetProtocolV2Frames(deviceId);
         return;
       }
@@ -471,7 +553,7 @@ export default class ElectronAutoBleTransport {
       let frameData = assembler.push(bytes);
       while (frameData) {
-        this.resolveProtocolV2Frame(frameData);
+        this.resolveProtocolV2Frame(deviceId, frameData);
         frameData = assembler.push(new Uint8Array(0));
       }
     } catch (error) {
@@ -479,46 +561,60 @@ export default class ElectronAutoBleTransport {
       if (this.runPromise) {
         const notifyError = ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
         this.runPromise.reject(notifyError);
-        this.rejectProtocolV2Frame(notifyError);
+        this.rejectAllProtocolV2Frames(notifyError);
       }
     }
   }
-  private resolveProtocolV2Frame(frame: Uint8Array) {
-    if (this.v2FramePromise) {
-      this.v2FramePromise.resolve(frame);
-      this.v2FramePromise = null;
+  private getProtocolV2FrameQueue(uuid: string) {
+    let queue = this.v2FrameQueues.get(uuid);
+    if (!queue) {
+      queue = [];
+      this.v2FrameQueues.set(uuid, queue);
+    }
+    return queue;
+  }
+  private resolveProtocolV2Frame(uuid: string, frame: Uint8Array) {
+    const framePromise = this.v2FramePromises.get(uuid);
+    if (framePromise) {
+      framePromise.resolve(frame);
+      this.v2FramePromises.delete(uuid);
       return;
     }
-    this.v2FrameQueue.push(frame);
+    this.getProtocolV2FrameQueue(uuid).push(frame);
   }
-  private rejectProtocolV2Frame(error: Error) {
-    this.v2FrameQueue = [];
-    if (this.v2FramePromise) {
-      this.v2FramePromise.reject(error);
-      this.v2FramePromise = null;
+  private rejectAllProtocolV2Frames(error: Error) {
+    this.v2FrameQueues.clear();
+    for (const framePromise of this.v2FramePromises.values()) {
+      framePromise.reject(error);
     }
+    this.v2FramePromises.clear();
+  }
+  private resetProtocolV2Frames(uuid: string) {
+    this.v2FrameQueues.delete(uuid);
+    this.v2FramePromises.delete(uuid);
   }
-  private resetProtocolV2Frames() {
-    this.v2FrameQueue = [];
-    this.v2FramePromise = null;
+  private isActiveProtocolV2Call(uuid: string, token: number) {
+    return this.activeProtocolV2Call?.uuid === uuid && this.activeProtocolV2Call.token === token;
   }
-  private async readProtocolV2Frame() {
-    const queuedFrame = this.v2FrameQueue.shift();
+  private async readProtocolV2Frame(uuid: string) {
+    const queuedFrame = this.getProtocolV2FrameQueue(uuid).shift();
     if (queuedFrame) {
       return queuedFrame;
     }
     const framePromise = createDeferred<Uint8Array>();
-    this.v2FramePromise = framePromise;
+    this.v2FramePromises.set(uuid, framePromise);
     try {
       return await framePromise.promise;
     } finally {
-      if (this.v2FramePromise === framePromise) {
-        this.v2FramePromise = null;
+      if (this.v2FramePromises.get(uuid) === framePromise) {
+        this.v2FramePromises.delete(uuid);
       }
     }
   }
@@ -656,15 +752,18 @@ export default class ElectronAutoBleTransport {
       }
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
-      this.rejectProtocolV2Frame(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();
+    this.resetProtocolV2Frames(uuid);
     let completed = false;
     const callOptions = {
       ...options,
@@ -680,7 +779,7 @@ export default class ElectronAutoBleTransport {
         router: PROTOCOL_V2_CHANNEL_BLE_UART,
         writeFrame: (frame: Uint8Array) => this.writeWithChunking(uuid, bytesToHex(frame)),
         readFrame: async () => {
-          const rxFrame = await this.readProtocolV2Frame();
+          const rxFrame = await this.readProtocolV2Frame(uuid);
           if (!(rxFrame instanceof Uint8Array)) {
             throw new Error('Response is not Uint8Array');
           }
@@ -699,15 +798,20 @@ export default class ElectronAutoBleTransport {
       completed = true;
       return result;
     } catch (e) {
-      this.v2Assemblers.get(uuid)?.reset();
-      this.resetProtocolV2Frames();
+      if (this.isActiveProtocolV2Call(uuid, callToken)) {
+        this.v2Assemblers.get(uuid)?.reset();
+        this.resetProtocolV2Frames(uuid);
+      }
       this.Log?.error('[Auto BLE] Protocol V2 call error:', e);
       throw e;
     } finally {
-      if (!completed) {
-        this.v2Assemblers.get(uuid)?.reset();
+      if (this.isActiveProtocolV2Call(uuid, callToken)) {
+        if (!completed) {
+          this.v2Assemblers.get(uuid)?.reset();
+        }
+        this.resetProtocolV2Frames(uuid);
+        this.activeProtocolV2Call = null;
       }
-      this.resetProtocolV2Frames();
       if (this.runPromise === runPromise) {
         this.runPromise = null;
       }

package/src/webusb.ts CHANGED Viewed

@@ -45,6 +45,10 @@ function shouldBlockWebUsbCallDataLog(name: string) {
   return LogBlockCommand.has(name) || WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
 }
+function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
+  return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
+}
 /**
  * Device information with path and WebUSB device instance
  */
@@ -74,6 +78,8 @@ export default class WebUsbTransport {
   /** Per-path protocol type detected by active wire-level probe. */
   private deviceProtocol: Map<string, ProtocolType> = new Map();
+  private deviceProtocolHints: Map<string, ProtocolType> = new Map();
   /** 按设备缓存 Protocol V2 frame assembler，保留同一次读取里多出来的后续 frame。 */
   private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
@@ -179,11 +185,19 @@ export default class WebUsbTransport {
       return isOneKey && hasSerialNumber;
     });
-    this.deviceList = onekeyDevices.map(device => ({
-      path: device.serialNumber as string,
-      device,
-      commType: 'webusb',
-    }));
+    this.deviceList = onekeyDevices.map(device => {
+      const path = device.serialNumber as string;
+      const protocolHint = inferProtocolHintFromDeviceName(device.productName);
+      if (protocolHint) {
+        this.deviceProtocolHints.set(path, protocolHint);
+      }
+      return {
+        path,
+        device,
+        commType: 'webusb',
+      };
+    });
     // Debug: log all discovered devices. Protocol is detected after acquire via wire probe.
     for (const dev of onekeyDevices) {
@@ -203,7 +217,15 @@ export default class WebUsbTransport {
     if (!input.path) return;
     try {
       await this.connect(input.path ?? '', true);
-      await this.detectProtocol(input.path, input.expectedProtocol);
+      const deviceName = this.deviceList.find(device => device.path === input.path)?.device
+        .productName;
+      const protocolHint = input.expectedProtocol
+        ? undefined
+        : this.deviceProtocolHints.get(input.path) ?? inferProtocolHintFromDeviceName(deviceName);
+      if (protocolHint) {
+        this.deviceProtocolHints.set(input.path, protocolHint);
+      }
+      await this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
       return await Promise.resolve(input.path);
     } catch (e) {
       this.Log.debug('acquire error: ', e instanceof Error ? `${e.name}: ${e.message}` : String(e));
@@ -225,7 +247,8 @@ export default class WebUsbTransport {
   private async detectProtocol(
     path: string,
-    expectedProtocol?: ProtocolType
+    expectedProtocol?: ProtocolType,
+    protocolHint?: ProtocolType
   ): Promise<ProtocolType> {
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(path)) {
@@ -245,6 +268,12 @@ export default class WebUsbTransport {
       throw this.createProtocolMismatchError(expectedProtocol);
     }
+    if (protocolHint === 'V2' && (await this.probeProtocolV2(path))) {
+      this.deviceProtocol.set(path, 'V2');
+      this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (hint)`);
+      return 'V2';
+    }
     if (this.deviceProtocol.get(path) === 'V2' && (await this.probeProtocolV2(path))) {
       this.deviceProtocol.set(path, 'V2');
       this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (cached)`);
@@ -689,8 +718,8 @@ export default class WebUsbTransport {
   /**
    * Send/receive a single call over Protocol V2 (0x5A framing).
    *
-   * Encoding:  protobuf message → 2-byte LE msgType + pb bytes → Protocol V2 frame
-   * Decoding:  Protocol V2 frame → msgType + pb bytes → protobuf message
+   * Encoding:  protobuf message → 2-byte LE messageTypeId + pb bytes → Protocol V2 frame
+   * Decoding:  Protocol V2 frame → messageTypeId + pb bytes → protobuf message
    */
   private async callProtocolV2(
     path: string,
@@ -826,6 +855,7 @@ export default class WebUsbTransport {
     await device.releaseInterface(ifaceNum);
     await device.close();
     this.deviceProtocol.delete(path);
+    this.deviceProtocolHints.delete(path);
     this.protocolV2Assemblers.get(path)?.reset();
     this.protocolV2Assemblers.delete(path);
     this.deviceEndpoints.delete(path);