@onekeyfe/hd-transport-web-device 1.2.8-alpha.105 → 1.2.8-alpha.107

package/__tests__/webusb-identity-probe.test.ts

@@ -594,9 +594,10 @@ describe('WebUSB identity probe ownership', () => {
       };
       jest.spyOn(internals, 'rotateProtocolV2UsbGeneration').mockResolvedValue(undefined);
       jest.spyOn(internals, 'detectProtocol').mockResolvedValue('V1');
+      const acquireFailure = new Error('probe failed');
       jest.spyOn(probe, 'connect').mockImplementation(() => {
         device.opened = true;
-        if (phase === 'acquire failure') return Promise.reject(new Error('probe failed'));
+        if (phase === 'acquire failure') return Promise.reject(acquireFailure);
         return Promise.resolve();
       });
       const closeFailure = new Error('native close failed');
@@ -605,7 +606,7 @@ describe('WebUSB identity probe ownership', () => {
         await probe.acquire({ path: 'USB_PATH' });
         await expect(probe.release('USB_PATH')).rejects.toBe(closeFailure);
       } else {
-        await expect(probe.acquire({ path: 'USB_PATH' })).rejects.toBe(closeFailure);
+        await expect(probe.acquire({ path: 'USB_PATH' })).rejects.toBe(acquireFailure);
       }
       expect(device.opened).toBe(true);
       const active = new WebUsbTransport();

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

@@ -64,6 +64,66 @@ describe('WebUsbTransport protocol probe cache', () => {
     }
   );
 
+  test.each([undefined, 2, 1])(
+    'configures a replacement V1 handle only when needed during packet recovery: %s',
+    async configurationValue => {
+      const webusb = new WebUsbTransport();
+      const path = 'replacement-v1-device';
+      const state = webusb as unknown as {
+        Log: { debug: jest.Mock };
+        deviceProtocol: Map<string, 'V1' | 'V2'>;
+        reconnectForPacketIoRetry: (
+          path: string,
+          direction: 'in' | 'out',
+          attempt: number,
+          error: unknown
+        ) => Promise<void>;
+      };
+      state.Log = { debug: jest.fn() };
+      state.deviceProtocol.set(path, 'V1');
+      const replacement = {
+        opened: false,
+        configuration: configurationValue ? { configurationValue } : undefined,
+        configurations: [],
+        open: jest.fn().mockImplementation(() => {
+          replacement.opened = true;
+          return Promise.resolve();
+        }),
+        selectConfiguration: jest.fn().mockImplementation((value: number) => {
+          replacement.configuration = { configurationValue: value };
+          return Promise.resolve();
+        }),
+        reset: jest.fn(),
+        clearHalt: jest.fn(),
+        claimInterface: jest.fn().mockImplementation(() => {
+          if (replacement.configuration?.configurationValue !== 1) {
+            return Promise.reject(new Error('USB configuration is not selected'));
+          }
+          return Promise.resolve();
+        }),
+      };
+      let current = { opened: false } as USBDevice;
+      jest.spyOn(webusb, 'findDevice').mockImplementation(() => Promise.resolve(current));
+      jest.spyOn(webusb, 'getConnectedDevices').mockImplementation(() => {
+        current = replacement as unknown as USBDevice;
+        return Promise.resolve([]);
+      });
+
+      await state.reconnectForPacketIoRetry(path, 'in', 0, new Error('transferIn failed'));
+
+      expect(replacement.selectConfiguration).toHaveBeenCalledTimes(
+        configurationValue === 1 ? 0 : 1
+      );
+      if (configurationValue !== 1) {
+        expect(replacement.selectConfiguration).toHaveBeenCalledWith(1);
+      }
+      expect(replacement.open).toHaveBeenCalledTimes(1);
+      expect(replacement.claimInterface).toHaveBeenCalledWith(0);
+      expect(replacement.reset).not.toHaveBeenCalled();
+      expect(replacement.clearHalt).not.toHaveBeenCalled();
+    }
+  );
+
   test('uses the SDK 1.1.31 WebUSB sequence with descriptor endpoints for Protocol V1', async () => {
     const webusb = new WebUsbTransport() as any;
     const logger = { debug: jest.fn() };
@@ -225,7 +285,7 @@ describe('WebUsbTransport protocol probe cache', () => {
     expect(webusb.connectToDevice).toHaveBeenCalledTimes(2);
   });
 
-  test('closes every owned handle after claimInterface fails across re-enumeration', async () => {
+  test.each([false, true])('retains claim error when cleanup fails=%s', async cleanupFails => {
     const webusb = new WebUsbTransport() as any;
     const logger = { debug: jest.fn() };
     const path = 'sensitive-device-path';
@@ -275,6 +335,9 @@ describe('WebUsbTransport protocol probe cache', () => {
       }),
       clearHalt: jest.fn().mockResolvedValue(undefined),
     };
+    if (cleanupFails) {
+      replacementDevice.close.mockRejectedValueOnce(new Error('native close failed'));
+    }
     webusb.Log = logger;
     webusb.usb = { getDevices: jest.fn().mockResolvedValue([replacementDevice]) };
     webusb.deviceList = [{ path, device: originalDevice, commType: 'webusb' }];
@@ -291,7 +354,26 @@ describe('WebUsbTransport protocol probe cache', () => {
     expect(originalDevice.close).toHaveBeenCalledTimes(1);
     expect(replacementDevice.close).toHaveBeenCalledTimes(1);
     expect(originalDevice.opened).toBe(false);
-    expect(replacementDevice.opened).toBe(false);
+    expect(replacementDevice.opened).toBe(cleanupFails);
+    if (cleanupFails) {
+      expect(logger.debug).toHaveBeenCalledWith(
+        '[WebUsbTransport][lifecycle]',
+        expect.objectContaining({
+          event: 'acquire-cleanup',
+          phase: 'error',
+          errorMessage: 'native close failed',
+        })
+      );
+      const competing = new WebUsbTransport();
+      jest
+        .spyOn(competing, 'findDevice')
+        .mockResolvedValue(replacementDevice as unknown as USBDevice);
+      await expect(competing.connectToDevice(path, true)).rejects.toThrow(
+        'USB device is already in use'
+      );
+      await webusb.release(path);
+      expect(replacementDevice.opened).toBe(false);
+    }
     expect(logger.debug).toHaveBeenCalledWith(
       '[WebUsbTransport][lifecycle]',
       expect.objectContaining({

package/dist/index.js

@@ -542,6 +542,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 try {
                     yield this.closeOpenDevice(input.path);
                 }
+                catch (cleanupError) {
+                    this.logLifecycle('acquire-cleanup', Object.assign({ phase: 'error' }, this.getDiagnosticError(cleanupError, input.path)));
+                }
                 finally {
                     this.releaseIdentityProbeHandle(input.path);
                     this.releaseNormalHandles(input.path);
@@ -738,13 +741,17 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 }
             }
             if (this.shouldUseLegacyV1Connection(path, options)) {
-                if (first) {
+                if (first ||
+                    !device.configuration ||
+                    device.configuration.configurationValue !== this.configurationId) {
                     yield this.runLoggedHandleOperation({
                         operation: 'selectConfiguration',
                         device,
                         path,
                         task: () => device.selectConfiguration(this.configurationId),
                     });
+                }
+                if (first) {
                     try {
                         yield this.runLoggedHandleOperation({
                             operation: 'reset',

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.8-alpha.105",
+  "version": "1.2.8-alpha.107",
   "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.8-alpha.105",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.105"
+    "@onekeyfe/hd-shared": "1.2.8-alpha.107",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.107"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.105",
+    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.107",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "dab4ffe21ce85e811885bf6e90ab40f874e5288c"
+  "gitHead": "727ca38ba11acbed3c08433ebd8958d9c43e9198"
 }

package/src/webusb.ts

@@ -783,6 +783,11 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       this.acquiredPaths.delete(input.path);
       try {
         await this.closeOpenDevice(input.path);
+      } catch (cleanupError) {
+        this.logLifecycle('acquire-cleanup', {
+          phase: 'error',
+          ...this.getDiagnosticError(cleanupError, input.path),
+        });
       } finally {
         this.releaseIdentityProbeHandle(input.path);
         this.releaseNormalHandles(input.path);
@@ -1031,13 +1036,19 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     if (this.shouldUseLegacyV1Connection(path, options)) {
       // Match the last V1-only WebUSB lifecycle from SDK 1.1.31. Legacy devices
       // configure before reset and keep the same USBDevice object afterwards.
-      if (first) {
+      if (
+        first ||
+        !device.configuration ||
+        device.configuration.configurationValue !== this.configurationId
+      ) {
         await this.runLoggedHandleOperation({
           operation: 'selectConfiguration',
           device,
           path,
           task: () => device.selectConfiguration(this.configurationId),
         });
+      }
+      if (first) {
         try {
           await this.runLoggedHandleOperation({
             operation: 'reset',