@onekeyfe/hd-transport-web-device 1.2.0-alpha.11 → 1.2.0-alpha.13

package/__tests__/webusb-protocol-v2-timeout.test.ts

@@ -0,0 +1,40 @@
+import transport, { ProtocolV2FrameAssembler } from '@onekeyfe/hd-transport';
+
+import WebUsbTransport from '../src/webusb';
+
+const schema = {
+  nested: {
+    Ping: { fields: { message: { type: 'string', id: 1 } } },
+    Success: { fields: { message: { type: 'string', id: 1 } } },
+    MessageType: {
+      values: {
+        MessageType_Ping: 60206,
+        MessageType_Success: 60207,
+      },
+    },
+  },
+};
+
+describe('WebUsbTransport Protocol V2 timeout recovery', () => {
+  test('invalidates and resets the cached connection before another call can start', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'pro2-webusb';
+    webusb.messages = transport.parseConfigure(schema);
+    webusb.messagesV2 = transport.parseConfigure(schema);
+    webusb.protocolV2Assemblers.set(path, new ProtocolV2FrameAssembler());
+    webusb.transferOutOnce = jest.fn().mockResolvedValue(undefined);
+    webusb.receiveProtocolV2Frame = jest.fn(() => new Promise(() => undefined));
+    webusb.resetConnectionAfterProbe = jest.fn().mockImplementation(async () => {
+      webusb.protocolV2Sessions.delete(path);
+      webusb.protocolV2ReadTimeouts.delete(path);
+      webusb.protocolV2Assemblers.get(path)?.reset();
+    });
+
+    await expect(
+      webusb.callProtocolV2(path, 'Ping', { message: 'timeout' }, { timeoutMs: 10 })
+    ).rejects.toThrow('timeout');
+
+    expect(webusb.resetConnectionAfterProbe).toHaveBeenCalledWith(path);
+    expect(webusb.protocolV2Sessions.has(path)).toBe(false);
+  });
+});

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,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"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAoBA,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;AAIvC,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;IAO7B,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;YA2BlB,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.js

@@ -41,6 +41,14 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
+const HIGH_VOLUME_CALLS = new Set(['FileWrite', 'FilesystemFileWrite', 'EmmcFileWrite']);
+function shouldSuppressHighVolumeCallLog(name) {
+    return HIGH_VOLUME_CALLS.has(name);
+}
+function createTransportCallLog(name, protocol) {
+    return { name, protocol };
+}
+
 const { parseConfigure: parseConfigure$1, check: check$1, ProtocolV1: ProtocolV1$1 } = transport__default["default"];
 const CONFIGURATION_ID = 1;
 const INTERFACE_ID = 0;
@@ -52,19 +60,6 @@ const HEADER_LENGTH = transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
 const PROTOCOL_PROBE_TIMEOUT = 1000;
-const WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN = /(?:^|[^a-z])(?:raw)?(?:filesystem|emmc)?filewrite$/i;
-function shouldSuppressWebUsbCallLog(name) {
-    const normalized = name.replace(/[_\s-]/g, '');
-    return WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
-}
-function isLogBlockCommand$1(name) {
-    var _a, _b;
-    return (_b = (_a = transport.LogBlockCommand === null || transport.LogBlockCommand === void 0 ? void 0 : transport.LogBlockCommand.has) === null || _a === void 0 ? void 0 : _a.call(transport.LogBlockCommand, name)) !== null && _b !== void 0 ? _b : false;
-}
-function shouldBlockWebUsbCallDataLog(name) {
-    const normalized = name.replace(/[_\s-]/g, '');
-    return isLogBlockCommand$1(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;
 }
@@ -100,11 +95,9 @@ class WebUsbTransport {
         this.messages = messages;
     }
     configureProtocolV2(signedData) {
-        var _a;
         this.messagesV2 = parseConfigure$1(signedData);
         this.protocolV2Sessions.clear();
         this.protocolV2ReadTimeouts.clear();
-        (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] Protocol V2 schema configured');
     }
     promptDeviceAccess() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -145,7 +138,10 @@ class WebUsbTransport {
             if (!this.usb)
                 return [];
             const devices = yield this.usb.getDevices();
-            const onekeyDevices = devices.filter(dev => hdShared.ONEKEY_WEBUSB_FILTER.some(desc => dev.vendorId === desc.vendorId && dev.productId === desc.productId));
+            const onekeyDevices = devices.filter(dev => {
+                const isOneKey = hdShared.ONEKEY_WEBUSB_FILTER.some((desc) => dev.vendorId === desc.vendorId && dev.productId === desc.productId);
+                return isOneKey && !hdShared.isKnownTrezorWebUsbDevice(dev);
+            });
             this.deviceList = onekeyDevices.map(device => {
                 const path = this.getDevicePath(device);
                 const protocolHint = inferProtocolHintFromDeviceName$1(device.productName);
@@ -158,10 +154,6 @@ class WebUsbTransport {
                     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)}`);
-            }
             return this.deviceList;
         });
     }
@@ -200,14 +192,12 @@ class WebUsbTransport {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(path)) {
                     this.deviceProtocol.set(path, 'V1');
-                    this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V1 (expected)`);
                     return 'V1';
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V2') {
                 this.deviceProtocol.set(path, 'V2');
-                this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
                 return 'V2';
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(path) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
@@ -215,7 +205,6 @@ class WebUsbTransport {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(path) : yield this.probeProtocolV2(path);
                 if (detected) {
                     this.deviceProtocol.set(path, protocol);
-                    this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> ${protocol}`);
                     return protocol;
                 }
             }
@@ -287,7 +276,6 @@ class WebUsbTransport {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let device = yield this.findDevice(path);
-            this.Log.debug('[WebUsbTransport] connecting to device:', device.productName, 'PID:', device.productId);
             if (!device.opened) {
                 yield device.open();
             }
@@ -524,7 +512,7 @@ class WebUsbTransport {
             yield this.connect(path, false);
         });
     }
-    withProtocolReadTimeout(path, promise, timeoutMs, protocol, onTimeout) {
+    withProtocolReadTimeout(_path, promise, timeoutMs, protocol, onTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
             let timer;
             let timedOut = false;
@@ -539,11 +527,11 @@ class WebUsbTransport {
                 return yield Promise.race([
                     guardedPromise,
                     new Promise((_, reject) => {
-                        timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                        timer = setTimeout(() => {
                             timedOut = true;
                             onTimeout === null || onTimeout === void 0 ? void 0 : onTimeout();
                             reject(new Error(`Protocol ${protocol} read timeout after ${timeoutMs}ms`));
-                        }), timeoutMs);
+                        }, timeoutMs);
                     }),
                 ]);
             }
@@ -562,8 +550,7 @@ class WebUsbTransport {
                 yield this.callProtocolV1(path, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT });
                 return true;
             }
-            catch (error) {
-                this.Log.debug('[WebUsbTransport] Protocol V1 Initialize probe failed:', error);
+            catch (_error) {
                 return false;
             }
         });
@@ -595,12 +582,8 @@ class WebUsbTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${path}`);
             }
-            if (shouldSuppressWebUsbCallLog(name)) ;
-            else if (shouldBlockWebUsbCallDataLog(name)) {
-                this.Log.debug('call-', ' name: ', name, ' protocol: ', protocol);
-            }
-            else {
-                this.Log.debug('call-', ' name: ', name, ' data: ', data, ' protocol: ', protocol);
+            if (!shouldSuppressHighVolumeCallLog(name)) {
+                this.Log.debug('transport call', createTransportCallLog(name, protocol));
             }
             if (protocol === 'V2') {
                 return this.callProtocolV2(path, name, data, options);
@@ -660,6 +643,18 @@ class WebUsbTransport {
             try {
                 return yield session.call(name, data, options);
             }
+            catch (error) {
+                const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+                if (message.includes('protocol v2 read timeout') || message.includes('response timeout')) {
+                    try {
+                        yield this.resetConnectionAfterProbe(path);
+                    }
+                    catch (resetError) {
+                        this.Log.debug('[WebUsbTransport] Protocol V2 timeout reset failed:', resetError);
+                    }
+                }
+                throw error;
+            }
             finally {
                 this.protocolV2ReadTimeouts.delete(path);
             }
@@ -742,6 +737,8 @@ class WebUsbTransport {
             this.deviceProtocolHints.delete(path);
             (_b = this.protocolV2Assemblers.get(path)) === null || _b === void 0 ? void 0 : _b.reset();
             this.protocolV2Assemblers.delete(path);
+            this.protocolV2Sessions.delete(path);
+            this.protocolV2ReadTimeouts.delete(path);
             this.deviceEndpoints.delete(path);
         });
     }
@@ -750,15 +747,6 @@ class WebUsbTransport {
     }
 }
 
-const FILE_WRITE_LOG_BLOCK_PATTERN = /(?:^|[^a-z])(?:raw)?(?:filesystem|emmc)?filewrite$/i;
-function shouldSuppressHighVolumeCallLog(name) {
-    const normalized = name.replace(/[_\s-]/g, '');
-    return FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
-}
-function isLogBlockCommand(name) {
-    var _a, _b;
-    return (_b = (_a = transport.LogBlockCommand === null || transport.LogBlockCommand === void 0 ? void 0 : transport.LogBlockCommand.has) === null || _a === void 0 ? void 0 : _a.call(transport.LogBlockCommand, name)) !== null && _b !== void 0 ? _b : false;
-}
 const { parseConfigure, ProtocolV1, check } = transport__default["default"];
 function inferProtocolHintFromDeviceName(name) {
     return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
@@ -871,12 +859,10 @@ class ElectronBleTransport {
         this.configured = true;
     }
     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() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1281,7 +1267,7 @@ class ElectronBleTransport {
         }
     }
     call(uuid, name, data, options) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
@@ -1293,12 +1279,8 @@ class ElectronBleTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            if (shouldSuppressHighVolumeCallLog(name)) ;
-            else if (isLogBlockCommand(name)) {
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] call', 'name:', name, 'protocol:', protocol);
-            }
-            else {
-                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] call', 'name:', name, 'data:', data, 'protocol:', protocol);
+            if (!shouldSuppressHighVolumeCallLog(name)) {
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('transport call', createTransportCallLog(name, protocol));
             }
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);

package/dist/transportLog.d.ts

@@ -0,0 +1,7 @@
+import type { ProtocolType } from '@onekeyfe/hd-transport';
+export declare function shouldSuppressHighVolumeCallLog(name: string): boolean;
+export declare function createTransportCallLog(name: string, protocol: ProtocolType): {
+    name: string;
+    protocol: ProtocolType;
+};
+//# sourceMappingURL=transportLog.d.ts.map

package/dist/transportLog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transportLog.d.ts","sourceRoot":"","sources":["../src/transportLog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,WAE3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY;;;EAE1E"}

package/dist/webusb.d.ts.map

@@ -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;AAqChC,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,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,eAAe,CAA2C;IAOlE,OAAO,CAAC,eAAe,CAA6C;IAEpE,OAAO,CAAC,iBAAiB,CAAK;IAE9B,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;IAY7B,kBAAkB;IAmBlB,SAAS;IASf,OAAO,CAAC,aAAa;IAmBf,mBAAmB;IAsCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA0BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IA6CtB,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;YA0CpC,eAAe;YAmBf,iBAAiB;IAezB,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;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,yBAAyB;YAyBzB,uBAAuB;YAoCvB,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;YAkClB,cAAc;YAkCd,cAAc;YA4Cd,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,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAUN,MAAM,wBAAwB,CAAC;AAYhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAqBhC,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,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,eAAe,CAA2C;IAOlE,OAAO,CAAC,eAAe,CAA6C;IAEpE,OAAO,CAAC,iBAAiB,CAAK;IAE9B,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;IAW7B,kBAAkB;IAmBlB,SAAS;IASf,OAAO,CAAC,aAAa;IAmBf,mBAAmB;IAgCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA0BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IA0CtB,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;YAmCpC,eAAe;YAmBf,iBAAiB;IAezB,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;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,yBAAyB;YAyBzB,uBAAuB;YAmCvB,eAAe;YAaf,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;YA8BlB,cAAc;YAkCd,cAAc;YAuDd,sBAAsB;IA4C9B,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAmB1B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.11",
+  "version": "1.2.0-alpha.13",
   "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.11",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.11"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.13",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.13"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.11",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.13",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "05d3421ec00e07e99f6665e6436a612503e32dfc"
+  "gitHead": "a907a7ec140123107f6188b37550a7143f1e0d91"
 }

package/src/electron-ble-transport.ts

@@ -1,5 +1,4 @@
 import transport, {
-  LogBlockCommand,
   PROTOCOL_V1_MESSAGE_HEADER_SIZE,
   PROTOCOL_V2_CHANNEL_BLE_UART,
   ProtocolV2FrameAssembler,
@@ -17,22 +16,13 @@ import {
   wait,
 } from '@onekeyfe/hd-shared';
 
+import { createTransportCallLog, shouldSuppressHighVolumeCallLog } from './transportLog';
+
 import type { Deferred } from '@onekeyfe/hd-shared';
 import type { DesktopAPI } from '@onekeyfe/hd-transport-electron';
 import type { OneKeyDeviceInfo, ProtocolType, TransportCallOptions } from '@onekeyfe/hd-transport';
 import type EventEmitter from 'events';
 
-const FILE_WRITE_LOG_BLOCK_PATTERN = /(?:^|[^a-z])(?:raw)?(?:filesystem|emmc)?filewrite$/i;
-
-function shouldSuppressHighVolumeCallLog(name: string) {
-  const normalized = name.replace(/[_\s-]/g, '');
-  return FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
-}
-
-function isLogBlockCommand(name: string) {
-  return (LogBlockCommand as Set<string> | undefined)?.has?.(name) ?? false;
-}
-
 const { parseConfigure, ProtocolV1, check } = transport;
 
 declare global {
@@ -221,7 +211,6 @@ export default class ElectronBleTransport {
     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');
   }
 
   async listen() {
@@ -682,12 +671,8 @@ export default class ElectronBleTransport {
         `Device protocol has not been detected for ${uuid}`
       );
     }
-    if (shouldSuppressHighVolumeCallLog(name)) {
-      // 高频文件写入不要逐包发 debug 事件，否则调试日志会反向拖慢传输。
-    } else if (isLogBlockCommand(name)) {
-      this.Log?.debug('[Electron BLE] call', 'name:', name, 'protocol:', protocol);
-    } else {
-      this.Log?.debug('[Electron BLE] call', 'name:', name, 'data:', data, 'protocol:', protocol);
+    if (!shouldSuppressHighVolumeCallLog(name)) {
+      this.Log?.debug('transport call', createTransportCallLog(name, protocol));
     }
 
     if (protocol === 'V2') {

package/src/transportLog.ts

@@ -0,0 +1,11 @@
+import type { ProtocolType } from '@onekeyfe/hd-transport';
+
+const HIGH_VOLUME_CALLS = new Set(['FileWrite', 'FilesystemFileWrite', 'EmmcFileWrite']);
+
+export function shouldSuppressHighVolumeCallLog(name: string) {
+  return HIGH_VOLUME_CALLS.has(name);
+}
+
+export function createTransportCallLog(name: string, protocol: ProtocolType) {
+  return { name, protocol };
+}

package/src/webusb.ts

@@ -1,6 +1,5 @@
 /* eslint-disable no-undef */
 import transport, {
-  LogBlockCommand,
   PROTOCOL_V1_CHUNK_PAYLOAD_SIZE,
   PROTOCOL_V1_MESSAGE_HEADER_SIZE,
   PROTOCOL_V1_REPORT_ID,
@@ -11,9 +10,17 @@ import transport, {
   ProtocolV2Session,
   probeProtocolV2 as probeProtocolV2Helper,
 } from '@onekeyfe/hd-transport';
-import { ERRORS, HardwareErrorCode, ONEKEY_WEBUSB_FILTER, wait } from '@onekeyfe/hd-shared';
+import {
+  ERRORS,
+  HardwareErrorCode,
+  ONEKEY_WEBUSB_FILTER,
+  isKnownTrezorWebUsbDevice,
+  wait,
+} from '@onekeyfe/hd-shared';
 import ByteBuffer from 'bytebuffer';
 
+import { createTransportCallLog, shouldSuppressHighVolumeCallLog } from './transportLog';
+
 import type {
   AcquireInput,
   OneKeyDeviceInfoBase,
@@ -33,22 +40,6 @@ const HEADER_LENGTH = PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
 const PROTOCOL_PROBE_TIMEOUT = 1000;
-const WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN = /(?:^|[^a-z])(?:raw)?(?:filesystem|emmc)?filewrite$/i;
-
-function shouldSuppressWebUsbCallLog(name: string) {
-  const normalized = name.replace(/[_\s-]/g, '');
-  return WEBUSB_FILE_WRITE_LOG_BLOCK_PATTERN.test(normalized);
-}
-
-function isLogBlockCommand(name: string) {
-  return (LogBlockCommand as Set<string> | undefined)?.has?.(name) ?? false;
-}
-
-function shouldBlockWebUsbCallDataLog(name: string) {
-  const normalized = name.replace(/[_\s-]/g, '');
-  return isLogBlockCommand(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;
 }
@@ -159,7 +150,6 @@ export default class WebUsbTransport {
     this.messagesV2 = parseConfigure(signedData);
     this.protocolV2Sessions.clear();
     this.protocolV2ReadTimeouts.clear();
-    this.Log?.debug('[WebUsbTransport] Protocol V2 schema configured');
   }
 
   /**
@@ -218,11 +208,13 @@ export default class WebUsbTransport {
     if (!this.usb) return [];
 
     const devices = await this.usb.getDevices();
-    const onekeyDevices = devices.filter(dev =>
-      ONEKEY_WEBUSB_FILTER.some(
-        desc => dev.vendorId === desc.vendorId && dev.productId === desc.productId
-      )
-    );
+    const onekeyDevices = devices.filter(dev => {
+      const isOneKey = ONEKEY_WEBUSB_FILTER.some(
+        (desc: { vendorId: number; productId: number }) =>
+          dev.vendorId === desc.vendorId && dev.productId === desc.productId
+      );
+      return isOneKey && !isKnownTrezorWebUsbDevice(dev);
+    });
 
     this.deviceList = onekeyDevices.map(device => {
       const path = this.getDevicePath(device);
@@ -238,14 +230,6 @@ export default class WebUsbTransport {
       };
     });
 
-    // Debug: log all discovered devices. Protocol is detected after acquire via wire probe.
-    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)}`
-      );
-    }
-
     return this.deviceList;
   }
 
@@ -300,7 +284,6 @@ export default class WebUsbTransport {
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(path)) {
         this.deviceProtocol.set(path, 'V1');
-        this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V1 (expected)`);
         return 'V1';
       }
       throw this.createProtocolMismatchError(expectedProtocol);
@@ -310,7 +293,6 @@ export default class WebUsbTransport {
       // 免探测路径：调用方显式承诺该设备是 V2（例如固件升级重启后的重连场景，
       // 上层已经探测过协议并通过 expectedProtocol 传回），这里不再重复探测。
       this.deviceProtocol.set(path, 'V2');
-      this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> V2 (expected)`);
       return 'V2';
     }
 
@@ -325,7 +307,6 @@ export default class WebUsbTransport {
         protocol === 'V1' ? await this.probeProtocolV1(path) : await this.probeProtocolV2(path);
       if (detected) {
         this.deviceProtocol.set(path, protocol);
-        this.Log.debug(`[WebUsbTransport] detectProtocol: path=${path} -> ${protocol}`);
         return protocol;
       }
     }
@@ -414,13 +395,6 @@ export default class WebUsbTransport {
    */
   async connectToDevice(path: string, first: boolean) {
     let device: USBDevice = await this.findDevice(path);
-    this.Log.debug(
-      '[WebUsbTransport] connecting to device:',
-      device.productName,
-      'PID:',
-      device.productId
-    );
-
     if (!device.opened) {
       await device.open();
     }
@@ -676,13 +650,12 @@ export default class WebUsbTransport {
   }
 
   private async withProtocolReadTimeout<T>(
-    path: string,
+    _path: string,
     promise: Promise<T>,
     timeoutMs: number,
     protocol: ProtocolType,
     onTimeout?: () => void
   ): Promise<T> {
-    void path;
     let timer: ReturnType<typeof setTimeout> | undefined;
     let timedOut = false;
     const waitForeverAfterTimeout = () => new Promise<never>(() => {});
@@ -699,7 +672,7 @@ export default class WebUsbTransport {
       return await Promise.race([
         guardedPromise,
         new Promise<never>((_, reject) => {
-          timer = setTimeout(async () => {
+          timer = setTimeout(() => {
             timedOut = true;
             onTimeout?.();
             reject(new Error(`Protocol ${protocol} read timeout after ${timeoutMs}ms`));
@@ -719,8 +692,7 @@ export default class WebUsbTransport {
     try {
       await this.callProtocolV1(path, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT });
       return true;
-    } catch (error) {
-      this.Log.debug('[WebUsbTransport] Protocol V1 Initialize probe failed:', error);
+    } catch (_error) {
       return false;
     }
   }
@@ -765,12 +737,8 @@ export default class WebUsbTransport {
       );
     }
 
-    if (shouldSuppressWebUsbCallLog(name)) {
-      // 高频文件写入不要逐包发 debug 事件，否则浏览器侧会被日志处理拖慢。
-    } else if (shouldBlockWebUsbCallDataLog(name)) {
-      this.Log.debug('call-', ' name: ', name, ' protocol: ', protocol);
-    } else {
-      this.Log.debug('call-', ' name: ', name, ' data: ', data, ' protocol: ', protocol);
+    if (!shouldSuppressHighVolumeCallLog(name)) {
+      this.Log.debug('transport call', createTransportCallLog(name, protocol));
     }
 
     if (protocol === 'V2') {
@@ -853,6 +821,17 @@ export default class WebUsbTransport {
     this.protocolV2Assemblers.get(path)?.reset();
     try {
       return await session.call(name, data, options);
+    } catch (error) {
+      const message =
+        error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+      if (message.includes('protocol v2 read timeout') || message.includes('response timeout')) {
+        try {
+          await this.resetConnectionAfterProbe(path);
+        } catch (resetError) {
+          this.Log.debug('[WebUsbTransport] Protocol V2 timeout reset failed:', resetError);
+        }
+      }
+      throw error;
     } finally {
       this.protocolV2ReadTimeouts.delete(path);
     }
@@ -960,6 +939,8 @@ export default class WebUsbTransport {
     this.deviceProtocolHints.delete(path);
     this.protocolV2Assemblers.get(path)?.reset();
     this.protocolV2Assemblers.delete(path);
+    this.protocolV2Sessions.delete(path);
+    this.protocolV2ReadTimeouts.delete(path);
     this.deviceEndpoints.delete(path);
   }