@onekeyfe/hd-transport-usb 1.2.0-alpha.3 → 1.2.0-alpha.4

package/dist/index.d.ts

@@ -41,6 +41,7 @@ declare class NodeUsbTransport {
     private getOpenDevice;
     private getErrorMessage;
     private isRetryableError;
+    private isUsbTransferTimeout;
     private getDeviceInterface;
     private reconnectForRetry;
     private sendAllChunksWithRetry;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AA0LhC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,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;IAEpE,IAAI,SAAsB;IAE1B,OAAO,SAAM;IAEb,UAAU,UAAS;IAEnB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,aAAa,CAA6B;IAGlD,OAAO,CAAC,WAAW,CAAiC;IAGpD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,cAAc,CAA0C;IAGhE,OAAO,CAAC,SAAS,CAAS;IAM1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAMxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAOzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAOnC,MAAM;IAIN,IAAI;IAQE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;IAiBjB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA8BxC,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAsB7C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAMhD,eAAe;IA6BvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAwClB,cAAc;IA0B5B,MAAM;IAWN,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,iBAAiB;YAmDX,sBAAsB;YAyCtB,mBAAmB;YAsCnB,UAAU;YA0EV,eAAe;IAiB7B,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;YA4Cd,yBAAyB;YAezB,uBAAuB;YA0CvB,eAAe;YAcf,eAAe;YAcf,oBAAoB;YA+BpB,sBAAsB;YAuCtB,cAAc;YAgDd,WAAW;IA6CzB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,SAWN,MAAM,wBAAwB,CAAC;AAGhC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAgKhC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,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;IAEpE,IAAI,SAAsB;IAE1B,OAAO,SAAM;IAEb,UAAU,UAAS;IAEnB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,aAAa,CAA6B;IAGlD,OAAO,CAAC,WAAW,CAAiC;IAGpD,OAAO,CAAC,cAAc,CAAwC;IAG9D,OAAO,CAAC,oBAAoB,CAAoD;IAGhF,OAAO,CAAC,kBAAkB,CAA6C;IAGvE,OAAO,CAAC,sBAAsB,CAA8C;IAG5E,OAAO,CAAC,cAAc,CAA0C;IAGhE,OAAO,CAAC,SAAS,CAAS;IAM1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAMxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAOzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAOnC,MAAM;IAIN,IAAI;IAQE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;IAiBjB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA8BxC,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAsB7C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAMhD,eAAe;IA6BvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YAwClB,cAAc;IA0B5B,MAAM;IAWN,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,kBAAkB;IAmB1B,OAAO,CAAC,iBAAiB;YAmDX,sBAAsB;YAyCtB,mBAAmB;YA2CnB,UAAU;YA+DV,eAAe;IAiB7B,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;YA4Cd,yBAAyB;YAezB,uBAAuB;YA0CvB,eAAe;YAcf,eAAe;YAcf,oBAAoB;YA+BpB,sBAAsB;YAwCtB,cAAc;YAgDd,WAAW;IA6CzB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/dist/index.js

@@ -71,7 +71,7 @@ const TRANSFER_TIMEOUT_MS = 30000;
 const SERIAL_READ_TIMEOUT_MS = 5000;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
-const PROTOCOL_PROBE_TIMEOUT = 1000;
+const PROTOCOL_PROBE_TIMEOUT = 5000;
 function getBusId(dev) {
     return `usb:${dev.busNumber}:${dev.deviceAddress}`;
 }
@@ -152,26 +152,6 @@ function transferOutOnce(ep, data) {
         });
     });
 }
-function resetUsbDevice(dev) {
-    return new Promise(resolve => {
-        const reset = dev.reset;
-        if (typeof reset !== 'function') {
-            resolve();
-            return;
-        }
-        reset.call(dev, () => resolve());
-    });
-}
-function clearEndpointHalt(ep) {
-    return new Promise(resolve => {
-        const clearHalt = ep.clearHalt;
-        if (typeof clearHalt !== 'function') {
-            resolve();
-            return;
-        }
-        clearHalt.call(ep, () => resolve());
-    });
-}
 function skipReportByte(packet) {
     if (packet[0] === REPORT_ID) {
         return packet.subarray(1);
@@ -397,6 +377,10 @@ class NodeUsbTransport {
             message.includes('timeout') ||
             message.includes('interrupt'));
     }
+    isUsbTransferTimeout(error) {
+        const message = this.getErrorMessage(error).toLowerCase();
+        return message.includes('timeout') || message.includes('timed_out');
+    }
     getDeviceInterface(dev) {
         var _a;
         const { interfaces } = dev;
@@ -472,7 +456,7 @@ class NodeUsbTransport {
             throw lastError;
         });
     }
-    transferInWithRetry(path, openDev, length) {
+    transferInWithRetry(path, openDev, length, options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let lastError;
@@ -486,6 +470,10 @@ class NodeUsbTransport {
                 }
                 catch (error) {
                     lastError = error;
+                    if ((options === null || options === void 0 ? void 0 : options.waitIndefinitelyOnTimeout) && this.isUsbTransferTimeout(error)) {
+                        attempt -= 1;
+                        continue;
+                    }
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryableError(error);
                     if (!shouldRetry) {
                         throw error;
@@ -518,13 +506,6 @@ class NodeUsbTransport {
             try {
                 dev.open();
                 dev.timeout = TRANSFER_TIMEOUT_MS;
-                yield resetUsbDevice(dev);
-                try {
-                    dev.open();
-                }
-                catch (_d) {
-                }
-                dev.timeout = TRANSFER_TIMEOUT_MS;
                 const iface = this.getDeviceInterface(dev);
                 if (process.platform === 'linux') {
                     try {
@@ -532,7 +513,7 @@ class NodeUsbTransport {
                             iface.detachKernelDriver();
                         }
                     }
-                    catch (_e) {
+                    catch (_d) {
                     }
                 }
                 iface.claim();
@@ -543,8 +524,6 @@ class NodeUsbTransport {
                 }
                 epIn.timeout = TRANSFER_TIMEOUT_MS;
                 epOut.timeout = TRANSFER_TIMEOUT_MS;
-                yield clearEndpointHalt(epIn);
-                yield clearEndpointHalt(epOut);
                 yield this.drainStaleInput(epIn);
                 this.openDevices.set(path, { device: dev, iface, epIn, epOut });
             }
@@ -552,7 +531,7 @@ class NodeUsbTransport {
                 try {
                     dev.close();
                 }
-                catch (_f) {
+                catch (_e) {
                 }
                 throw err;
             }
@@ -745,7 +724,7 @@ class NodeUsbTransport {
             let frame = assembler.push(new Uint8Array(0));
             const deadline = timeoutMs ? Date.now() + timeoutMs : undefined;
             while (!frame) {
-                const transferIn = this.transferInWithRetry(path, this.getOpenDevice(path), transport.PROTOCOL_V2_FRAME_MAX_BYTES);
+                const transferIn = this.transferInWithRetry(path, this.getOpenDevice(path), transport.PROTOCOL_V2_FRAME_MAX_BYTES, { waitIndefinitelyOnTimeout: !deadline });
                 const packet = deadline
                     ? yield this.withProtocolReadTimeout(path, transferIn, Math.max(deadline - Date.now(), 1), 'V2')
                     : yield transferIn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-usb",
-  "version": "1.2.0-alpha.3",
+  "version": "1.2.0-alpha.4",
   "description": "OneKey hardware wallet direct USB transport plugin (libusb)",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.3",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.3",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.4",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.4",
     "bytebuffer": "^5.0.1",
     "usb": "^2.14.0"
   },
-  "gitHead": "54a4a40baee7e376b9a810dade60007d2c9b00c9"
+  "gitHead": "6f83d130f022a75003385bc4b2386cd0b2b539b5"
 }

package/src/index.ts

@@ -44,7 +44,7 @@ const SERIAL_READ_TIMEOUT_MS = 5000;
 /** Packet I/O retry configuration (matches WebUsbTransport) */
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
-const PROTOCOL_PROBE_TIMEOUT = 1000;
+const PROTOCOL_PROBE_TIMEOUT = 5000;
 
 /**
  * Opened device state — holds the USB device, claimed interface, and endpoints.
@@ -154,32 +154,6 @@ function transferOutOnce(ep: usb.OutEndpoint, data: Buffer): Promise<void> {
   });
 }
 
-function resetUsbDevice(dev: usb.Device): Promise<void> {
-  return new Promise(resolve => {
-    const reset = (dev as usb.Device & { reset?: (callback: (err?: Error) => void) => void }).reset;
-    if (typeof reset !== 'function') {
-      resolve();
-      return;
-    }
-    reset.call(dev, () => resolve());
-  });
-}
-
-function clearEndpointHalt(ep: usb.InEndpoint | usb.OutEndpoint): Promise<void> {
-  return new Promise(resolve => {
-    const clearHalt = (
-      ep as (usb.InEndpoint | usb.OutEndpoint) & {
-        clearHalt?: (callback: (err?: Error) => void) => void;
-      }
-    ).clearHalt;
-    if (typeof clearHalt !== 'function') {
-      resolve();
-      return;
-    }
-    clearHalt.call(ep, () => resolve());
-  });
-}
-
 /**
  * Skip the 0x3F protocol marker byte from a USB packet.
  */
@@ -515,6 +489,11 @@ export default class NodeUsbTransport {
     );
   }
 
+  private isUsbTransferTimeout(error: unknown): boolean {
+    const message = this.getErrorMessage(error).toLowerCase();
+    return message.includes('timeout') || message.includes('timed_out');
+  }
+
   private getDeviceInterface(dev: usb.Device): usb.Interface {
     const { interfaces } = dev;
     if (!interfaces?.length) {
@@ -629,7 +608,8 @@ export default class NodeUsbTransport {
   private async transferInWithRetry(
     path: string,
     openDev: OpenDevice,
-    length: number
+    length: number,
+    options?: { waitIndefinitelyOnTimeout?: boolean }
   ): Promise<Buffer> {
     let lastError: unknown;
     let currentDev = openDev;
@@ -641,6 +621,10 @@ export default class NodeUsbTransport {
         return await transferInOnce(currentDev.epIn, length);
       } catch (error) {
         lastError = error;
+        if (options?.waitIndefinitelyOnTimeout && this.isUsbTransferTimeout(error)) {
+          attempt -= 1;
+          continue;
+        }
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryableError(error);
         if (!shouldRetry) {
           throw error;
@@ -680,15 +664,6 @@ export default class NodeUsbTransport {
       dev.open();
       dev.timeout = TRANSFER_TIMEOUT_MS;
 
-      await resetUsbDevice(dev);
-
-      try {
-        dev.open();
-      } catch {
-        // libusb keeps some devices open across reset; continue with the current handle.
-      }
-      dev.timeout = TRANSFER_TIMEOUT_MS;
-
       const iface = this.getDeviceInterface(dev);
 
       // On Linux, detach kernel driver if active
@@ -723,8 +698,6 @@ export default class NodeUsbTransport {
       epIn.timeout = TRANSFER_TIMEOUT_MS;
       epOut.timeout = TRANSFER_TIMEOUT_MS;
 
-      await clearEndpointHalt(epIn);
-      await clearEndpointHalt(epOut);
       await this.drainStaleInput(epIn);
 
       this.openDevices.set(path, { device: dev, iface, epIn, epOut });
@@ -943,7 +916,8 @@ export default class NodeUsbTransport {
       const transferIn = this.transferInWithRetry(
         path,
         this.getOpenDevice(path),
-        PROTOCOL_V2_FRAME_MAX_BYTES
+        PROTOCOL_V2_FRAME_MAX_BYTES,
+        { waitIndefinitelyOnTimeout: !deadline }
       );
       const packet = deadline
         ? await this.withProtocolReadTimeout(