@onekeyfe/hd-transport-web-device 1.2.3-alpha.4 → 1.2.3-alpha.5

package/__tests__/webusb-protocol-cache.test.ts

@@ -64,6 +64,54 @@ describe('WebUsbTransport protocol probe cache', () => {
     }
   );
 
+  test('reports claimInterface failures as WebUSB device access errors', async () => {
+    const webusb = new WebUsbTransport();
+    const path = 'connected-usb-device';
+    const claimError = Object.assign(new Error('Unable to claim interface'), {
+      name: 'NetworkError',
+    });
+    const device = {
+      opened: true,
+      configuration: { configurationValue: 1 },
+      configurations: [],
+      claimInterface: jest.fn().mockRejectedValue(claimError),
+    };
+    jest.spyOn(webusb, 'findDevice').mockResolvedValue(device as unknown as USBDevice);
+    jest.spyOn(webusb, 'getConnectedDevices').mockResolvedValue([]);
+    const state = webusb as unknown as { deviceProtocol: Map<string, 'V1' | 'V2'> };
+    state.deviceProtocol.set(path, 'V1');
+
+    await expect(webusb.connectToDevice(path, false)).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
+      params: {
+        operation: 'claimInterface',
+        nativeErrorName: 'NetworkError',
+        nativeErrorMessage: 'Unable to claim interface',
+      },
+    });
+  });
+
+  test('reports transferIn failures as WebUSB device access errors', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'connected-usb-device';
+    const transferError = Object.assign(new Error('Transfer endpoint is unavailable'), {
+      name: 'NetworkError',
+    });
+    webusb.findDevice = jest.fn().mockResolvedValue({
+      opened: true,
+      transferIn: jest.fn().mockRejectedValue(transferError),
+    });
+
+    await expect(webusb.transferInWithRetry(path, 64)).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.WebUsbDeviceAccessError,
+      params: {
+        operation: 'transferIn',
+        nativeErrorName: 'NetworkError',
+        nativeErrorMessage: 'Transfer endpoint is unavailable',
+      },
+    });
+  });
+
   test('acquire skips the wire probe when the protocol is already cached', async () => {
     const webusb = buildAcquirableTransport();
     const path = 'pro-webusb';

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

@@ -238,9 +238,15 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     webusb.resetConnectionAfterProbe = jest.fn();
     await webusb.rotateProtocolV2UsbGeneration(path, 'test connection');
 
-    await expect(webusb.callProtocolV2(path, 'Ping', { message: 'read-error' })).rejects.toThrow(
-      'NetworkError'
-    );
+    await expect(
+      webusb.callProtocolV2(path, 'Ping', { message: 'read-error' })
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BridgeDeviceDisconnected,
+      params: {
+        operation: 'transferIn',
+        nativeErrorMessage: 'NetworkError: transferIn device disconnected',
+      },
+    });
 
     expect(webusb.readProtocolV2UsbPacket).toHaveBeenCalledTimes(1);
     expect(webusb.resetProtocolV2UsbNativeLink).toHaveBeenCalledWith(

package/dist/index.d.ts

@@ -118,7 +118,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     /**
      * Connect to device with retry mechanism
      */
-    connect(path: string, first: boolean): Promise<void>;
+    connect(path: string, first: boolean): Promise<undefined>;
     /**
      * Discover vendor-class (0xFF) interface and its IN/OUT endpoint numbers from USB descriptors.
      * Falls back to legacy hardcoded values if no vendor interface is found.
@@ -128,7 +128,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
      * Connect to specific device.
      * Discovers interface/endpoint numbers from USB descriptors on first connection.
      */
-    connectToDevice(path: string, first: boolean): Promise<void>;
+    connectToDevice(path: string, first: boolean): Promise<undefined>;
     private closeOpenDevice;
     private clearEndpointHalt;
     /**
@@ -141,6 +141,10 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     private assertAcquired;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
+    private getErrorName;
+    private isWebUsbIoHardwareError;
+    private isDeviceStillEnumerated;
+    private throwWebUsbIoError;
     private isRetryablePacketIoError;
     private reconnectForPacketIoRetry;
     private getTransferInData;

package/dist/index.js

@@ -395,7 +395,12 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             const endpoints = this.discoverEndpoints(device);
             this.deviceEndpoints.set(path, endpoints);
-            yield device.claimInterface(endpoints.interfaceNumber);
+            try {
+                yield device.claimInterface(endpoints.interfaceNumber);
+            }
+            catch (error) {
+                return this.throwWebUsbIoError(path, 'claimInterface', error);
+            }
             yield this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
             yield this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
         });
@@ -459,6 +464,59 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         }
         return String(error);
     }
+    getErrorName(error) {
+        if (typeof error === 'object' && error && 'name' in error) {
+            const { name } = error;
+            return typeof name === 'string' ? name : String(name !== null && name !== void 0 ? name : '');
+        }
+        return '';
+    }
+    isWebUsbIoHardwareError(error) {
+        return (error instanceof hdShared.HardwareError &&
+            (error.errorCode === hdShared.HardwareErrorCode.BridgeDeviceDisconnected ||
+                error.errorCode === hdShared.HardwareErrorCode.WebUsbDeviceAccessError));
+    }
+    isDeviceStillEnumerated(path) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.usb)
+                return undefined;
+            try {
+                const devices = yield this.usb.getDevices();
+                return devices.some(device => hdShared.resolveOneKeyUsbDevicePath(device) === path);
+            }
+            catch (error) {
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] failed to verify WebUSB device presence:', error);
+                return undefined;
+            }
+        });
+    }
+    throwWebUsbIoError(path, operation, error) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isWebUsbIoHardwareError(error))
+                throw error;
+            if (error instanceof transport.ProtocolV2LinkError && error.code !== 'io')
+                throw error;
+            const nativeError = error instanceof transport.ProtocolV2LinkError ? (_a = error.cause) !== null && _a !== void 0 ? _a : error : error;
+            if (this.isWebUsbIoHardwareError(nativeError))
+                throw nativeError;
+            const nativeErrorName = this.getErrorName(nativeError);
+            const nativeErrorMessage = this.getErrorMessage(nativeError);
+            const disconnectedByMessage = /(?:device )?disconnected|device not found|action was interrupted/i.test(`${nativeErrorName}: ${nativeErrorMessage}`);
+            const stillEnumerated = disconnectedByMessage
+                ? false
+                : yield this.isDeviceStillEnumerated(path);
+            const errorCode = disconnectedByMessage || stillEnumerated === false
+                ? hdShared.HardwareErrorCode.BridgeDeviceDisconnected
+                : hdShared.HardwareErrorCode.WebUsbDeviceAccessError;
+            throw hdShared.ERRORS.TypedError(errorCode, nativeErrorMessage || undefined, {
+                operation,
+                nativeErrorName: nativeErrorName || undefined,
+                nativeErrorMessage: nativeErrorMessage || undefined,
+            });
+        });
+    }
     isRetryablePacketIoError(error) {
         const message = this.getErrorMessage(error).toLowerCase();
         return (message.includes('transferout') ||
@@ -525,7 +583,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     lastError = error;
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        throw error;
+                        return this.throwWebUsbIoError(path, 'transferOut', error);
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -536,7 +594,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            throw lastError;
+            return this.throwWebUsbIoError(path, 'transferOut', lastError);
         });
     }
     transferOutOnce(path, packet) {
@@ -577,7 +635,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                     const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
                     if (!shouldRetry) {
-                        throw error;
+                        return this.throwWebUsbIoError(path, 'transferIn', error);
                     }
                     try {
                         yield this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -588,7 +646,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                 }
             }
-            throw lastError;
+            return this.throwWebUsbIoError(path, 'transferIn', lastError);
         });
     }
     transferInOnce(path, length) {
@@ -665,7 +723,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 });
                 return true;
             }
-            catch (_error) {
+            catch (error) {
+                if (this.isWebUsbIoHardwareError(error))
+                    throw error;
                 return false;
             }
         });
@@ -680,6 +740,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
                 logger: this.Log,
                 logPrefix: 'ProtocolV2 WebUSB',
+                shouldRethrow: error => this.isWebUsbIoHardwareError(error),
             });
         });
     }
@@ -726,7 +787,15 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     }
     callProtocolV2(path, name, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.callProtocolV2Usb(path, name, data, options);
+            try {
+                return yield this.callProtocolV2Usb(path, name, data, options);
+            }
+            catch (error) {
+                if (!(error instanceof transport.ProtocolV2LinkError) || error.code !== 'io')
+                    throw error;
+                const operation = error.message.includes(' USB write failed:') ? 'transferOut' : 'transferIn';
+                return this.throwWebUsbIoError(path, operation, error);
+            }
         });
     }
     receiveData(path, timeoutMs) {

package/dist/webusb.d.ts

@@ -44,14 +44,18 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     private createProtocolDetectionError;
     private detectProtocol;
     findDevice(path: string): Promise<USBDevice>;
-    connect(path: string, first: boolean): Promise<void>;
+    connect(path: string, first: boolean): Promise<undefined>;
     private discoverEndpoints;
-    connectToDevice(path: string, first: boolean): Promise<void>;
+    connectToDevice(path: string, first: boolean): Promise<undefined>;
     private closeOpenDevice;
     private clearEndpointHalt;
     private assertAcquired;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
+    private getErrorName;
+    private isWebUsbIoHardwareError;
+    private isDeviceStillEnumerated;
+    private throwWebUsbIoError;
     private isRetryablePacketIoError;
     private reconnectForPacketIoRetry;
     private getTransferInData;

package/dist/webusb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.3-alpha.4",
+  "version": "1.2.3-alpha.5",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -21,13 +21,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.3-alpha.4",
-    "@onekeyfe/hd-transport": "1.2.3-alpha.4"
+    "@onekeyfe/hd-shared": "1.2.3-alpha.5",
+    "@onekeyfe/hd-transport": "1.2.3-alpha.5"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.3-alpha.4",
+    "@onekeyfe/hd-transport-electron": "1.2.3-alpha.5",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "705729baaec54b86a4fc28cce310a85b67b82730"
+  "gitHead": "ee493c3ad41a6bc7fb249fba71d4b9bf8efcced8"
 }

package/src/webusb.ts

@@ -13,6 +13,7 @@ import transport, {
 } from '@onekeyfe/hd-transport';
 import {
   ERRORS,
+  HardwareError,
   HardwareErrorCode,
   ONEKEY_WEBUSB_FILTER,
   inferProtocolHintFromUsbId,
@@ -70,6 +71,8 @@ interface TransferCancelToken {
   cancelled: boolean;
 }
 
+type WebUsbOperation = 'claimInterface' | 'transferIn' | 'transferOut';
+
 /**
  * The navigator.usb disconnect listener is module-scoped and attached at most
  * once: listeners on navigator.usb are global and never garbage collected, so a
@@ -592,7 +595,11 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     // Discover endpoints from USB descriptors; descriptors are not used for protocol selection.
     const endpoints = this.discoverEndpoints(device);
     this.deviceEndpoints.set(path, endpoints);
-    await device.claimInterface(endpoints.interfaceNumber);
+    try {
+      await device.claimInterface(endpoints.interfaceNumber);
+    } catch (error) {
+      return this.throwWebUsbIoError(path, 'claimInterface', error);
+    }
     await this.clearEndpointHalt(device, 'in', endpoints.endpointIn);
     await this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
   }
@@ -662,6 +669,65 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     return String(error);
   }
 
+  private getErrorName(error: unknown) {
+    if (typeof error === 'object' && error && 'name' in error) {
+      const { name } = error as { name?: unknown };
+      return typeof name === 'string' ? name : String(name ?? '');
+    }
+    return '';
+  }
+
+  private isWebUsbIoHardwareError(error: unknown): error is HardwareError {
+    return (
+      error instanceof HardwareError &&
+      (error.errorCode === HardwareErrorCode.BridgeDeviceDisconnected ||
+        error.errorCode === HardwareErrorCode.WebUsbDeviceAccessError)
+    );
+  }
+
+  private async isDeviceStillEnumerated(path: string): Promise<boolean | undefined> {
+    if (!this.usb) return undefined;
+    try {
+      const devices = await this.usb.getDevices();
+      return devices.some(device => resolveOneKeyUsbDevicePath(device) === path);
+    } catch (error) {
+      this.Log?.debug('[WebUsbTransport] failed to verify WebUSB device presence:', error);
+      return undefined;
+    }
+  }
+
+  private async throwWebUsbIoError(
+    path: string,
+    operation: WebUsbOperation,
+    error: unknown
+  ): Promise<never> {
+    if (this.isWebUsbIoHardwareError(error)) throw error;
+    if (error instanceof ProtocolV2LinkError && error.code !== 'io') throw error;
+
+    const nativeError = error instanceof ProtocolV2LinkError ? error.cause ?? error : error;
+    if (this.isWebUsbIoHardwareError(nativeError)) throw nativeError;
+
+    const nativeErrorName = this.getErrorName(nativeError);
+    const nativeErrorMessage = this.getErrorMessage(nativeError);
+    const disconnectedByMessage =
+      /(?:device )?disconnected|device not found|action was interrupted/i.test(
+        `${nativeErrorName}: ${nativeErrorMessage}`
+      );
+    const stillEnumerated = disconnectedByMessage
+      ? false
+      : await this.isDeviceStillEnumerated(path);
+    const errorCode =
+      disconnectedByMessage || stillEnumerated === false
+        ? HardwareErrorCode.BridgeDeviceDisconnected
+        : HardwareErrorCode.WebUsbDeviceAccessError;
+
+    throw ERRORS.TypedError(errorCode, nativeErrorMessage || undefined, {
+      operation,
+      nativeErrorName: nativeErrorName || undefined,
+      nativeErrorMessage: nativeErrorMessage || undefined,
+    });
+  }
+
   private isRetryablePacketIoError(error: unknown) {
     const message = this.getErrorMessage(error).toLowerCase();
     return (
@@ -742,7 +808,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         lastError = error;
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          throw error;
+          return this.throwWebUsbIoError(path, 'transferOut', error);
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'out', attempt, error);
@@ -756,7 +822,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    throw lastError;
+    return this.throwWebUsbIoError(path, 'transferOut', lastError);
   }
 
   private async transferOutOnce(path: string, packet: Uint8Array) {
@@ -798,7 +864,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
         const shouldRetry = attempt < PACKET_IO_MAX_RETRIES && this.isRetryablePacketIoError(error);
         if (!shouldRetry) {
-          throw error;
+          return this.throwWebUsbIoError(path, 'transferIn', error);
         }
         try {
           await this.reconnectForPacketIoRetry(path, 'in', attempt, error);
@@ -812,7 +878,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
     }
-    throw lastError;
+    return this.throwWebUsbIoError(path, 'transferIn', lastError);
   }
 
   private async transferInOnce(path: string, length: number): Promise<DataView> {
@@ -894,7 +960,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       );
       return true;
-    } catch (_error) {
+    } catch (error) {
+      if (this.isWebUsbIoHardwareError(error)) throw error;
       return false;
     }
   }
@@ -909,6 +976,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
       logger: this.Log,
       logPrefix: 'ProtocolV2 WebUSB',
+      shouldRethrow: error => this.isWebUsbIoHardwareError(error),
     });
   }
 
@@ -986,7 +1054,13 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     data: Record<string, unknown>,
     options?: TransportCallOptions
   ) {
-    return this.callProtocolV2Usb(path, name, data, options);
+    try {
+      return await this.callProtocolV2Usb(path, name, data, options);
+    } catch (error) {
+      if (!(error instanceof ProtocolV2LinkError) || error.code !== 'io') throw error;
+      const operation = error.message.includes(' USB write failed:') ? 'transferOut' : 'transferIn';
+      return this.throwWebUsbIoError(path, operation, error);
+    }
   }
 
   /**