@onekeyfe/hd-transport-web-device 1.2.8-alpha.13 → 1.2.8-alpha.131

package/src/webusb.ts

@@ -44,6 +44,9 @@ const REPORT_ID = PROTOCOL_V1_REPORT_ID;
 const HEADER_LENGTH = PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
+const USB_DEVICE_IN_USE = 'USB device is already in use';
+const WEBUSB_LIFECYCLE_LOG_PREFIX = '[WebUsbTransport][lifecycle]';
+const WEBUSB_ERROR_MESSAGE_LIMIT = 240;
 // Legacy devices can take longer to answer Initialize after a WebUSB reset.
 // Keep this aligned with Node USB so a slow Protocol V1 response is not
 // misreported as a protocol mismatch during acquire.
@@ -73,6 +76,23 @@ interface TransferCancelToken {
 
 type WebUsbOperation = 'open' | 'claimInterface' | 'transferIn' | 'transferOut';
 
+type WebUsbHandleOperation =
+  | 'open'
+  | 'reset'
+  | 'selectConfiguration'
+  | 'claimInterface'
+  | 'clearHaltIn'
+  | 'clearHaltOut'
+  | 'releaseInterface'
+  | 'close';
+
+type WebUsbLifecyclePhase = 'start' | 'success' | 'error' | 'skipped';
+
+interface WebUsbConnectOptions {
+  expectedProtocol?: ProtocolType;
+  forceProtocolDetection?: boolean;
+}
+
 /**
  * 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
@@ -82,6 +102,13 @@ type WebUsbOperation = 'open' | 'claimInterface' | 'transferIn' | 'transferOut';
  */
 let activeWebUsbTransport: WebUsbTransport | undefined;
 let usbDisconnectListenerAttached = false;
+let nextWebUsbTransportInstanceId = 0;
+// Only isolated discovery owns these handles. Normal calls must never close or
+// open them, including while native open() is still pending.
+const identityProbeHandles = new WeakSet<USBDevice>();
+const openingHandles = new WeakSet<USBDevice>();
+// A normal acquire keeps ownership even while recovery temporarily closes the handle.
+const normalHandleOwners = new WeakMap<USBDevice, WebUsbTransport>();
 
 function registerActiveWebUsbTransport(instance: WebUsbTransport, usb: USB) {
   activeWebUsbTransport = instance;
@@ -100,6 +127,14 @@ function registerActiveWebUsbTransport(instance: WebUsbTransport, usb: USB) {
 }
 
 export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
+  private readonly transportInstanceId = ++nextWebUsbTransportInstanceId;
+
+  private handleOperationSequence = 0;
+
+  private deviceLogSequence = 0;
+
+  private deviceLogIds = new WeakMap<USBDevice, number>();
+
   messages: ReturnType<typeof transport.parseConfigure> | undefined;
 
   /** Protobuf schema for Protocol V2 transports. */
@@ -124,6 +159,16 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   /** Paths currently acquired (between a successful acquire() and its release()). */
   private acquiredPaths: Set<string> = new Set();
 
+  private identityProbeDevices = new Map<string, USBDevice>();
+
+  private normalDevices = new Map<USBDevice, string>();
+
+  private pendingHandleOperations = new Set<Promise<unknown>>();
+
+  private stopPromise?: Promise<void>;
+
+  private identityProbeCleanupPaths = new Set<string>();
+
   /**
    * The exact USBDevice object each cached protocol was probed against. The
    * browser returns the same object identity for a device as long as it stays
@@ -160,7 +205,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
 
   interfaceId = INTERFACE_ID;
 
-  constructor() {
+  constructor(private readonly identityProbe = false) {
     super({
       router: PROTOCOL_V2_CHANNEL_USB,
       maxFrameBytes: PROTOCOL_V2_FRAME_MAX_BYTES,
@@ -183,7 +228,250 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       );
     }
     this.usb = usb;
-    registerActiveWebUsbTransport(this, usb);
+    if (!this.identityProbe) registerActiveWebUsbTransport(this, usb);
+  }
+
+  stop(): Promise<void> {
+    const startedAt = Date.now();
+    this.stopped = true;
+    this.acquiredPaths.clear();
+    if (activeWebUsbTransport === this) activeWebUsbTransport = undefined;
+    if (!this.stopPromise) {
+      this.logLifecycle('stop', { phase: 'start' });
+      this.stopPromise = this.stopResources().then(
+        () => {
+          this.logLifecycle('stop', {
+            phase: 'success',
+            durationMs: Date.now() - startedAt,
+          });
+        },
+        error => {
+          this.logLifecycle('stop', {
+            phase: 'error',
+            durationMs: Date.now() - startedAt,
+            ...this.getDiagnosticError(error),
+          });
+          // A later discovery can retry closure without dropping the handle guard.
+          this.stopPromise = undefined;
+          throw error;
+        }
+      );
+    }
+    return this.stopPromise;
+  }
+
+  private async stopResources() {
+    let cleanupError: unknown;
+    try {
+      await this.disposeProtocolV2UsbLinks('WebUSB transport stopped');
+    } catch (error) {
+      cleanupError = error;
+    }
+    // Wait for late open/reset/claim/close completions before releasing ownership.
+    // Reads are aborted by closing their handle and reject late results below.
+    await Promise.allSettled([...this.pendingHandleOperations]);
+    const handles = this.identityProbe
+      ? [...this.identityProbeDevices].map(([path, device]) => [device, path] as const)
+      : [...this.normalDevices];
+    for (const [device, path] of handles) {
+      if (!this.identityProbe && normalHandleOwners.get(device) !== this) {
+        this.normalDevices.delete(device);
+      } else {
+        try {
+          if (device.opened) {
+            const iface = this.deviceEndpoints.get(path)?.interfaceNumber ?? this.interfaceId;
+            if (this.getInterfaceClaimed(device, iface) === false) {
+              this.logSkippedHandleOperation(
+                'releaseInterface',
+                device,
+                'interface-not-claimed',
+                iface
+              );
+            } else {
+              try {
+                await this.runLoggedHandleOperation({
+                  operation: 'releaseInterface',
+                  device,
+                  path,
+                  interfaceNumber: iface,
+                  allowStopped: true,
+                  task: () => device.releaseInterface(iface),
+                });
+              } catch (error) {
+                this.Log?.debug('[WebUsbTransport] stop releaseInterface failed:', error);
+              }
+            }
+            await this.runLoggedHandleOperation({
+              operation: 'close',
+              device,
+              path,
+              allowStopped: true,
+              task: () => device.close(),
+            });
+            if (device.opened) throw new Error('WebUSB handle remains open after stop');
+          }
+          if (this.identityProbe) {
+            identityProbeHandles.delete(device);
+            this.identityProbeDevices.delete(path);
+            this.identityProbeCleanupPaths.delete(path);
+          } else {
+            normalHandleOwners.delete(device);
+            this.normalDevices.delete(device);
+          }
+        } catch (error) {
+          cleanupError ??= error;
+        }
+      }
+    }
+    this.deviceList = [];
+    this.deviceProtocol.clear();
+    this.confirmedDeviceProtocols.clear();
+    this.deviceProtocolHints.clear();
+    this.staleProtocolPaths.clear();
+    this.probedDeviceObjects.clear();
+    if (!this.normalDevices.size && !this.identityProbeDevices.size) {
+      this.deviceEndpoints.clear();
+    }
+    if (cleanupError) {
+      throw cleanupError instanceof Error
+        ? cleanupError
+        : new Error(this.getErrorMessage(cleanupError));
+    }
+  }
+
+  private assertRunning() {
+    if (this.stopped) {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'WebUSB transport is stopped');
+    }
+  }
+
+  private async runHandleOperation<T>(operation: () => Promise<T>): Promise<T> {
+    this.assertRunning();
+    const pending = Promise.resolve(operation());
+    this.pendingHandleOperations.add(pending);
+    try {
+      const result = await pending;
+      this.assertRunning();
+      return result;
+    } finally {
+      this.pendingHandleOperations.delete(pending);
+    }
+  }
+
+  private getInterfaceClaimed(device: USBDevice, interfaceNumber: number) {
+    return device.configuration?.interfaces?.find(
+      usbInterface => usbInterface.interfaceNumber === interfaceNumber
+    )?.claimed;
+  }
+
+  private getDeviceLogId(device: USBDevice) {
+    const existing = this.deviceLogIds.get(device);
+    if (existing) return existing;
+    const next = ++this.deviceLogSequence;
+    this.deviceLogIds.set(device, next);
+    return next;
+  }
+
+  private getHandleLogState(device: USBDevice, interfaceNumber?: number) {
+    const interfaceClaimed =
+      interfaceNumber === undefined ? undefined : this.getInterfaceClaimed(device, interfaceNumber);
+    return {
+      deviceRefId: this.getDeviceLogId(device),
+      opened: device.opened,
+      configurationValue: device.configuration?.configurationValue ?? null,
+      interfaceNumber: interfaceNumber ?? null,
+      interfaceClaimed: interfaceClaimed ?? null,
+      identityProbe: this.identityProbe,
+      stopped: this.stopped,
+      acquiredPathCount: this.acquiredPaths.size,
+      normalHandleCount: this.normalDevices.size,
+      identityProbeHandleCount: this.identityProbeDevices.size,
+      pendingHandleOperationCount: this.pendingHandleOperations.size,
+    };
+  }
+
+  private getDiagnosticError(error: unknown, path?: string) {
+    const errorMessage = this.getErrorMessage(error);
+    const redactedMessage = path ? errorMessage.split(path).join('<device>') : errorMessage;
+    return {
+      errorName: this.getErrorName(error) || 'Error',
+      errorMessage: redactedMessage.slice(0, WEBUSB_ERROR_MESSAGE_LIMIT),
+      errorCode: error instanceof HardwareError ? error.errorCode : undefined,
+    };
+  }
+
+  private logLifecycle(event: string, payload: Record<string, unknown> = {}) {
+    this.Log?.debug(WEBUSB_LIFECYCLE_LOG_PREFIX, {
+      event,
+      transportInstanceId: this.transportInstanceId,
+      ...payload,
+    });
+  }
+
+  private logSkippedHandleOperation(
+    operation: WebUsbHandleOperation,
+    device: USBDevice,
+    reason: string,
+    interfaceNumber?: number
+  ) {
+    const operationId = ++this.handleOperationSequence;
+    this.logLifecycle('handle-operation', {
+      operationId,
+      operation,
+      phase: 'skipped' satisfies WebUsbLifecyclePhase,
+      reason,
+      ...this.getHandleLogState(device, interfaceNumber),
+    });
+  }
+
+  private async runLoggedHandleOperation<T>({
+    operation,
+    device,
+    task,
+    path,
+    interfaceNumber,
+    endpointNumber,
+    allowStopped = false,
+  }: {
+    operation: WebUsbHandleOperation;
+    device: USBDevice;
+    task: () => Promise<T>;
+    path?: string;
+    interfaceNumber?: number;
+    endpointNumber?: number;
+    allowStopped?: boolean;
+  }): Promise<T> {
+    const operationId = ++this.handleOperationSequence;
+    const startedAt = Date.now();
+    const details = {
+      operationId,
+      operation,
+      ...(endpointNumber === undefined ? {} : { endpointNumber }),
+    };
+    this.logLifecycle('handle-operation', {
+      ...details,
+      phase: 'start' satisfies WebUsbLifecyclePhase,
+      ...this.getHandleLogState(device, interfaceNumber),
+    });
+    try {
+      const result = allowStopped ? await task() : await this.runHandleOperation(task);
+      this.logLifecycle('handle-operation', {
+        ...details,
+        phase: 'success' satisfies WebUsbLifecyclePhase,
+        durationMs: Date.now() - startedAt,
+        ...this.getHandleLogState(device, interfaceNumber),
+      });
+      return result;
+    } catch (error) {
+      this.logLifecycle('handle-operation', {
+        ...details,
+        phase: 'error' satisfies WebUsbLifecyclePhase,
+        durationMs: Date.now() - startedAt,
+        ...this.getHandleLogState(device, interfaceNumber),
+        ...this.getDiagnosticError(error, path),
+      });
+      throw error;
+    }
   }
 
   /**
@@ -249,10 +537,22 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    */
   async promptDeviceAccess() {
     if (!this.usb) return null;
+    const startedAt = Date.now();
+    this.logLifecycle('prompt-device-access', { phase: 'start' });
     try {
       const device = await this.usb.requestDevice({ filters: ONEKEY_WEBUSB_FILTER });
+      this.logLifecycle('prompt-device-access', {
+        phase: 'success',
+        durationMs: Date.now() - startedAt,
+        selected: Boolean(device),
+      });
       return device;
     } catch (e) {
+      this.logLifecycle('prompt-device-access', {
+        phase: 'error',
+        durationMs: Date.now() - startedAt,
+        ...this.getDiagnosticError(e),
+      });
       this.Log.debug(
         'requestDevice error: ',
         e instanceof Error ? `${e.name}: ${e.message}` : String(e)
@@ -267,17 +567,73 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * It does NOT prompt the user to select a device
    */
   async enumerate() {
-    await this.getConnectedDevices();
-    return this.deviceList;
+    const startedAt = Date.now();
+    this.logLifecycle('enumerate', {
+      phase: 'start',
+      pendingProbeCleanupCount: this.identityProbeCleanupPaths.size,
+    });
+    try {
+      // Retry only our failed cleanup before Core skips already-open USB handles.
+      for (const path of this.identityProbeCleanupPaths) {
+        try {
+          await this.release(path);
+        } catch {
+          // Keep ownership while native close still fails; retry on the next probe.
+        }
+      }
+      await this.getConnectedDevices();
+      this.logLifecycle('enumerate', {
+        phase: 'success',
+        durationMs: Date.now() - startedAt,
+        deviceCount: this.deviceList.length,
+      });
+      return this.deviceList;
+    } catch (error) {
+      this.logLifecycle('enumerate', {
+        phase: 'error',
+        durationMs: Date.now() - startedAt,
+        ...this.getDiagnosticError(error),
+      });
+      throw error;
+    }
   }
 
   /**
    * Get list of connected devices
    */
   async getConnectedDevices() {
+    this.assertRunning();
     if (!this.usb) return [];
 
-    const devices = await this.usb.getDevices();
+    const startedAt = Date.now();
+    this.logLifecycle('get-devices', { phase: 'start' });
+    let devices: USBDevice[];
+    try {
+      devices = await this.usb.getDevices();
+      this.logLifecycle('get-devices', {
+        phase: 'success',
+        durationMs: Date.now() - startedAt,
+        authorizedDeviceCount: devices.length,
+      });
+    } catch (error) {
+      this.logLifecycle('get-devices', {
+        phase: 'error',
+        durationMs: Date.now() - startedAt,
+        ...this.getDiagnosticError(error),
+      });
+      throw error;
+    }
+    this.assertRunning();
+    for (const owner of new Set(devices.map(device => normalHandleOwners.get(device)))) {
+      if (owner?.stopped) {
+        try {
+          await owner.stop();
+        } catch (error) {
+          this.Log?.debug('[WebUsbTransport] stopped owner cleanup failed:', error);
+        }
+      }
+    }
+    this.assertRunning();
     const onekeyDevices = devices.filter(dev => {
       const isOneKey = ONEKEY_WEBUSB_FILTER.some(
         (desc: { vendorId: number; productId: number }) =>
@@ -310,11 +666,30 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * Acquire device control
    */
   async acquire(input: AcquireInput) {
+    this.assertRunning();
     if (!input.path) return;
+    const startedAt = Date.now();
+    this.logLifecycle('acquire', {
+      phase: 'start',
+      expectedProtocol: input.expectedProtocol ?? null,
+      protocolHint: input.protocolHint ?? null,
+      forceProtocolDetection: Boolean(input.forceProtocolDetection),
+      skipProtocolProbe: Boolean(input.skipProtocolProbe),
+      hasCachedProtocol: this.deviceProtocol.has(input.path),
+    });
     try {
+      if (this.identityProbe) {
+        await this.getConnectedDevices();
+        this.claimIdentityProbeHandle(input.path, await this.findDevice(input.path));
+      } else {
+        this.claimNormalHandle(input.path, await this.findDevice(input.path));
+      }
       await this.rotateProtocolV2UsbGeneration(input.path, 'WebUSB transport acquired');
       await this.closeOpenDevice(input.path);
-      await this.connect(input.path ?? '', true);
+      await this.connect(input.path ?? '', true, {
+        expectedProtocol: input.expectedProtocol,
+        forceProtocolDetection: input.forceProtocolDetection,
+      });
       if (input.skipProtocolProbe) {
         if (!input.expectedProtocol) {
           throw ERRORS.TypedError(
@@ -383,18 +758,40 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
           input.expectedProtocol,
           protocolHint
         );
+        this.assertRunning();
         this.confirmedDeviceProtocols.set(input.path, detectedProtocol);
         const probedDevice = this.deviceList.find(d => d.path === input.path)?.device;
         if (probedDevice) {
           this.probedDeviceObjects.set(input.path, probedDevice);
         }
       }
+      this.assertRunning();
       this.acquiredPaths.add(input.path);
+      this.logLifecycle('acquire', {
+        phase: 'success',
+        durationMs: Date.now() - startedAt,
+        protocol: this.deviceProtocol.get(input.path) ?? null,
+      });
       return await Promise.resolve(input.path);
     } catch (e) {
+      this.logLifecycle('acquire', {
+        phase: 'error',
+        durationMs: Date.now() - startedAt,
+        ...this.getDiagnosticError(e, input.path),
+      });
       this.Log.debug('acquire error: ', e instanceof Error ? `${e.name}: ${e.message}` : String(e));
       this.acquiredPaths.delete(input.path);
-      await this.closeOpenDevice(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);
+      }
       throw e;
     }
   }
@@ -405,21 +802,20 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * fall back to a Protocol V2 Ping probe.
    */
   private createProtocolMismatchError(expected: ProtocolType) {
-    return ERRORS.TypedError(
-      HardwareErrorCode.RuntimeError,
-      `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`
-    );
+    return ERRORS.TypedError(HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+      expectedProtocol: expected,
+    });
   }
 
   private createProtocolProbeTimeoutError(expected: ProtocolType, attempts: number) {
-    return ERRORS.TypedError(
-      HardwareErrorCode.DeviceInitializeFailed,
-      `Protocol ${expected} probe timeout after ${attempts} attempts`
-    );
+    return ERRORS.TypedError(HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+      expectedProtocol: expected,
+      attempts,
+    });
   }
 
   private createProtocolDetectionError() {
-    return ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
+    return ERRORS.TypedError(HardwareErrorCode.TransportProtocolProbeFailed);
   }
 
   private async detectProtocol(
@@ -513,16 +909,55 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   /**
    * Connect to device with retry mechanism
    */
-  async connect(path: string, first: boolean) {
+  async connect(path: string, first: boolean, options: WebUsbConnectOptions = {}) {
     const maxRetries = 5;
     for (let i = 0; i < maxRetries; i++) {
+      this.assertRunning();
+      const attempt = i + 1;
+      const startedAt = Date.now();
+      const connectionStrategy = this.shouldUseLegacyV1Connection(path, options)
+        ? 'protocol-v1-legacy-1.1.31'
+        : 'current';
+      this.logLifecycle('connect-attempt', {
+        phase: 'start',
+        attempt,
+        maxAttempts: maxRetries,
+        first,
+        connectionStrategy,
+      });
       try {
-        return await this.connectToDevice(path, first);
+        const result = await this.connectToDevice(path, first, options);
+        this.logLifecycle('connect-attempt', {
+          phase: 'success',
+          attempt,
+          maxAttempts: maxRetries,
+          first,
+          connectionStrategy,
+          durationMs: Date.now() - startedAt,
+        });
+        return result;
       } catch (e) {
-        if (e instanceof HardwareError && e.errorCode === HardwareErrorCode.BridgeNeedsPermission) {
+        this.assertRunning();
+        const isTerminalError =
+          this.isHandleOwnershipError(e) ||
+          (e instanceof HardwareError &&
+            (e.errorCode === HardwareErrorCode.BridgeNeedsPermission ||
+              e.errorCode === HardwareErrorCode.WebUsbDeviceAccessError));
+        const willRetry = !isTerminalError && attempt < maxRetries;
+        this.logLifecycle('connect-attempt', {
+          phase: 'error',
+          attempt,
+          maxAttempts: maxRetries,
+          first,
+          connectionStrategy,
+          durationMs: Date.now() - startedAt,
+          willRetry,
+          ...this.getDiagnosticError(e, path),
+        });
+        if (isTerminalError) {
           throw e;
         }
-        if (i === maxRetries - 1) {
+        if (!willRetry) {
           throw e;
         }
         await wait(i * 200);
@@ -530,6 +965,11 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     }
   }
 
+  private shouldUseLegacyV1Connection(path: string, options: WebUsbConnectOptions) {
+    if (options.expectedProtocol) return options.expectedProtocol === 'V1';
+    return !options.forceProtocolDetection && this.deviceProtocol.get(path) === 'V1';
+  }
+
   /**
    * 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.
@@ -567,31 +1007,106 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * Connect to specific device.
    * Discovers interface/endpoint numbers from USB descriptors on first connection.
    */
-  async connectToDevice(path: string, first: boolean) {
+  async connectToDevice(path: string, first: boolean, options: WebUsbConnectOptions = {}) {
+    this.assertRunning();
     let device: USBDevice = await this.findDevice(path);
+    if (this.identityProbe && this.identityProbeDevices.get(path) !== device) {
+      await this.closeOpenDevice(path);
+      this.releaseIdentityProbeHandle(path);
+      this.claimIdentityProbeHandle(path, device);
+    }
+    if (!this.identityProbe) this.claimNormalHandle(path, device);
+    this.assertHandleAvailable(device);
     if (!device.opened) {
+      openingHandles.add(device);
       try {
-        await device.open();
+        await this.runLoggedHandleOperation({
+          operation: 'open',
+          device,
+          path,
+          task: () => device.open(),
+        });
       } catch (error) {
-        return this.throwWebUsbIoError(path, 'open', error);
+        return await this.throwWebUsbIoError(path, 'open', error);
+      } finally {
+        openingHandles.delete(device);
+      }
+    }
+
+    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 ||
+        !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',
+            device,
+            path,
+            task: () => device.reset(),
+          });
+        } catch {
+          this.assertRunning();
+          // Reset is best-effort in 1.1.31; runLoggedHandleOperation already recorded the error.
+        }
       }
+
+      // Descriptor lookup is local-only and does not alter the 1.1.31 USB
+      // operation order. Defaults remain available for legacy descriptors.
+      const legacyEndpoints = this.discoverEndpoints(device);
+      this.deviceEndpoints.set(path, legacyEndpoints);
+      await this.claimDeviceInterface(path, device, legacyEndpoints);
+      return;
     }
+
     // A V1 packet retry continues an in-flight exchange. Preserve its endpoint
     // state as in the legacy transport; probing and V2 recovery still reset.
     if (first || this.deviceProtocol.get(path) !== 'V1') {
       try {
-        await device.reset();
-      } catch (error) {
-        this.Log?.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
+        await this.runLoggedHandleOperation({
+          operation: 'reset',
+          device,
+          path,
+          task: () => device.reset(),
+        });
+      } catch {
+        this.assertRunning();
+        // Reset remains best-effort; runLoggedHandleOperation already recorded the error.
       }
     }
     await this.getConnectedDevices();
     device = await this.findDevice(path);
+    if (this.identityProbe && this.identityProbeDevices.get(path) !== device) {
+      await this.closeOpenDevice(path);
+      this.releaseIdentityProbeHandle(path);
+      this.claimIdentityProbeHandle(path, device);
+    }
+    if (!this.identityProbe) this.claimNormalHandle(path, device);
+    this.assertHandleAvailable(device);
     if (!device.opened) {
+      openingHandles.add(device);
       try {
-        await device.open();
+        await this.runLoggedHandleOperation({
+          operation: 'open',
+          device,
+          path,
+          task: () => device.open(),
+        });
       } catch (error) {
-        return this.throwWebUsbIoError(path, 'open', error);
+        return await this.throwWebUsbIoError(path, 'open', error);
+      } finally {
+        openingHandles.delete(device);
       }
     }
 
@@ -600,47 +1115,182 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       !device.configuration ||
       device.configuration.configurationValue !== this.configurationId
     ) {
-      await device.selectConfiguration(this.configurationId);
+      await this.runLoggedHandleOperation({
+        operation: 'selectConfiguration',
+        device,
+        path,
+        task: () => device.selectConfiguration(this.configurationId),
+      });
     }
 
     // Discover endpoints from USB descriptors; descriptors are not used for protocol selection.
     const endpoints = this.discoverEndpoints(device);
     this.deviceEndpoints.set(path, endpoints);
+    await this.claimDeviceInterface(path, device, endpoints);
+    await this.clearEndpointHalt(path, device, 'in', endpoints.endpointIn);
+    await this.clearEndpointHalt(path, device, 'out', endpoints.endpointOut);
+  }
+
+  private async claimDeviceInterface(path: string, device: USBDevice, endpoints: DeviceEndpoints) {
     try {
-      await device.claimInterface(endpoints.interfaceNumber);
+      await this.runLoggedHandleOperation({
+        operation: 'claimInterface',
+        device,
+        path,
+        interfaceNumber: endpoints.interfaceNumber,
+        task: () => 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);
+  }
+
+  private assertHandleAvailable(device: USBDevice) {
+    this.assertRunning();
+    const normalOwner = normalHandleOwners.get(device);
+    if (
+      (normalOwner && normalOwner !== this) ||
+      (identityProbeHandles.has(device) &&
+        ![...this.identityProbeDevices.values()].includes(device))
+    ) {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, USB_DEVICE_IN_USE);
+    }
+  }
+
+  private claimNormalHandle(path: string, device: USBDevice) {
+    this.assertHandleAvailable(device);
+    normalHandleOwners.set(device, this);
+    this.normalDevices.set(device, path);
+  }
+
+  private releaseNormalHandles(path: string) {
+    if (this.stopped) return;
+    for (const [device, ownedPath] of this.normalDevices) {
+      if (ownedPath === path && !device.opened) {
+        // Do not expose a native handle to another transport while close failed.
+        // A later release/stop can retry cleanup through normalDevices.
+        normalHandleOwners.delete(device);
+        this.normalDevices.delete(device);
+      }
+    }
+  }
+
+  private isHandleOwnershipError(error: unknown): error is HardwareError {
+    return (
+      error instanceof HardwareError &&
+      error.errorCode === HardwareErrorCode.RuntimeError &&
+      this.getErrorMessage(error).includes(USB_DEVICE_IN_USE)
+    );
+  }
+
+  private claimIdentityProbeHandle(path: string, device: USBDevice) {
+    this.assertRunning();
+    if (
+      device.opened ||
+      openingHandles.has(device) ||
+      identityProbeHandles.has(device) ||
+      normalHandleOwners.has(device)
+    ) {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, USB_DEVICE_IN_USE);
+    }
+    identityProbeHandles.add(device);
+    this.identityProbeDevices.set(path, device);
+  }
+
+  private releaseIdentityProbeHandle(path: string) {
+    if (this.stopped) return;
+    const device = this.identityProbeDevices.get(path);
+    // A failed native close must not make an open probe handle available to other callers.
+    if (device?.opened) {
+      this.identityProbeCleanupPaths.add(path);
+      return;
+    }
+    if (device) identityProbeHandles.delete(device);
+    this.identityProbeDevices.delete(path);
+    this.identityProbeCleanupPaths.delete(path);
   }
 
   private async closeOpenDevice(path: string) {
-    const current = this.deviceList.find(device => device.path === path)?.device;
-    if (!current?.opened) return;
+    if (this.stopped) return;
+    const devices = this.identityProbe
+      ? [this.identityProbeDevices.get(path)].filter(
+          (device): device is USBDevice => device !== undefined
+        )
+      : [...this.normalDevices]
+          .filter(([, ownedPath]) => ownedPath === path)
+          .map(([device]) => device);
+    let firstCloseError: unknown;
+    for (const device of devices) {
+      try {
+        await this.closeDeviceHandle(path, device);
+      } catch (error) {
+        firstCloseError ??= error;
+      }
+    }
+    if (firstCloseError) {
+      throw firstCloseError instanceof Error
+        ? firstCloseError
+        : new Error(this.getErrorMessage(firstCloseError));
+    }
+  }
+
+  private async closeDeviceHandle(path: string, current: USBDevice) {
+    if (!current.opened) return;
+    this.assertHandleAvailable(current);
 
     const endpoints = this.deviceEndpoints.get(path);
     const ifaceNum = endpoints?.interfaceNumber ?? this.interfaceId;
-    try {
-      await current.releaseInterface(ifaceNum);
-    } catch (error) {
-      this.Log?.debug('[WebUsbTransport] releaseInterface before reconnect failed:', error);
+    if (this.getInterfaceClaimed(current, ifaceNum) === false) {
+      this.logSkippedHandleOperation(
+        'releaseInterface',
+        current,
+        'interface-not-claimed',
+        ifaceNum
+      );
+    } else {
+      try {
+        await this.runLoggedHandleOperation({
+          operation: 'releaseInterface',
+          device: current,
+          path,
+          interfaceNumber: ifaceNum,
+          task: () => current.releaseInterface(ifaceNum),
+        });
+      } catch (error) {
+        this.Log?.debug('[WebUsbTransport] releaseInterface before reconnect failed:', error);
+      }
     }
+    this.assertHandleAvailable(current);
     try {
-      await current.close();
+      await this.runLoggedHandleOperation({
+        operation: 'close',
+        device: current,
+        path,
+        task: () => current.close(),
+      });
     } catch (error) {
       this.Log?.debug('[WebUsbTransport] close before reconnect failed:', error);
+      throw error;
     }
   }
 
   private async clearEndpointHalt(
+    path: string,
     device: USBDevice,
     direction: USBDirection,
     endpointNumber: number
   ) {
+    this.assertHandleAvailable(device);
     try {
-      await device.clearHalt(direction, endpointNumber);
+      await this.runLoggedHandleOperation({
+        operation: direction === 'in' ? 'clearHaltIn' : 'clearHaltOut',
+        device,
+        path,
+        endpointNumber,
+        task: () => device.clearHalt(direction, endpointNumber),
+      });
     } catch (error) {
+      this.assertRunning();
       this.Log?.debug(
         `[WebUsbTransport] clearHalt ${direction} endpoint ${endpointNumber} failed, continuing:`,
         error
@@ -656,6 +1306,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * protocol entry produced the same fail-fast).
    */
   private assertAcquired(path: string) {
+    this.assertRunning();
     if (!this.acquiredPaths.has(path)) {
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, `Device is not acquired for ${path}`);
     }
@@ -713,7 +1364,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     operation: WebUsbOperation,
     error: unknown
   ): Promise<never> {
-    if (this.isWebUsbIoHardwareError(error)) throw error;
+    this.assertRunning();
+    if (this.isHandleOwnershipError(error) || this.isWebUsbIoHardwareError(error)) throw error;
     if (error instanceof ProtocolV2LinkError && error.code !== 'io') throw error;
 
     const nativeError = error instanceof ProtocolV2LinkError ? error.cause ?? error : error;
@@ -753,7 +1405,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   }
 
   private isRetryablePacketIoError(error: unknown) {
-    if (this.isWebUsbIoHardwareError(error)) return false;
+    if (this.stopped) return false;
+    if (this.isHandleOwnershipError(error) || this.isWebUsbIoHardwareError(error)) return false;
     const message = this.getErrorMessage(error).toLowerCase();
     if (this.isWebUsbPermissionDeniedMessage(message)) return false;
     return (
@@ -784,20 +1437,45 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     // USB disconnect event itself was missed.
     this.staleProtocolPaths.add(path);
     await wait(attempt * PACKET_IO_RETRY_DELAY);
+    this.assertRunning();
 
     try {
       const currentDevice = await this.findDevice(path);
+      this.assertHandleAvailable(currentDevice);
       if (currentDevice.opened) {
         const endpoints = this.deviceEndpoints.get(path);
         const ifaceNum = endpoints?.interfaceNumber ?? this.interfaceId;
-        try {
-          await currentDevice.releaseInterface(ifaceNum);
-        } catch (releaseError) {
-          this.Log.debug('[WebUsbTransport] releaseInterface before retry error:', releaseError);
+        if (this.getInterfaceClaimed(currentDevice, ifaceNum) === false) {
+          this.logSkippedHandleOperation(
+            'releaseInterface',
+            currentDevice,
+            'interface-not-claimed',
+            ifaceNum
+          );
+        } else {
+          try {
+            await this.runLoggedHandleOperation({
+              operation: 'releaseInterface',
+              device: currentDevice,
+              path,
+              interfaceNumber: ifaceNum,
+              task: () => currentDevice.releaseInterface(ifaceNum),
+            });
+          } catch (releaseError) {
+            this.Log.debug('[WebUsbTransport] releaseInterface before retry error:', releaseError);
+          }
         }
-        await currentDevice.close();
+        this.assertHandleAvailable(currentDevice);
+        await this.runLoggedHandleOperation({
+          operation: 'close',
+          device: currentDevice,
+          path,
+          task: () => currentDevice.close(),
+        });
       }
     } catch (closeError) {
+      this.assertRunning();
+      if (this.isHandleOwnershipError(closeError)) throw closeError;
       this.Log.debug('[WebUsbTransport] close device before retry error:', closeError);
     }
 
@@ -839,6 +1517,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         try {
           await this.reconnectForPacketIoRetry(path, 'out', attempt, error);
         } catch (reconnectError) {
+          this.assertRunning();
+          if (this.isHandleOwnershipError(reconnectError)) throw reconnectError;
           lastError = reconnectError;
           this.Log.debug(
             `[WebUsbTransport] transferout reconnect failed on retry ${attempt}/${PACKET_IO_MAX_RETRIES}: ${this.getErrorMessage(
@@ -861,7 +1541,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     const transferBuffer = this.toArrayBuffer(
       packet.buffer.slice(packet.byteOffset, packet.byteOffset + packet.byteLength)
     );
+    this.assertHandleAvailable(device);
     const result = await device.transferOut(endpointOut, transferBuffer);
+    this.assertHandleAvailable(device);
     if (result.status !== 'ok') {
       return this.throwWebUsbIoError(
         path,
@@ -888,7 +1570,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
         const endpoints = this.deviceEndpoints.get(path);
         const endpointIn = endpoints?.endpointIn ?? this.endpointId;
+        this.assertHandleAvailable(device);
         const result = await device.transferIn(endpointIn, length);
+        this.assertHandleAvailable(device);
         return this.getTransferInData(result);
       } catch (error) {
         lastError = error;
@@ -902,6 +1586,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         try {
           await this.reconnectForPacketIoRetry(path, 'in', attempt, error);
         } catch (reconnectError) {
+          this.assertRunning();
+          if (this.isHandleOwnershipError(reconnectError)) throw reconnectError;
           lastError = reconnectError;
           this.Log.debug(
             `[WebUsbTransport] transferin reconnect failed on retry ${attempt}/${PACKET_IO_MAX_RETRIES}: ${this.getErrorMessage(
@@ -921,7 +1607,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     }
     const endpoints = this.deviceEndpoints.get(path);
     const endpointIn = endpoints?.endpointIn ?? this.endpointId;
+    this.assertHandleAvailable(device);
     const result = await device.transferIn(endpointIn, length);
+    this.assertHandleAvailable(device);
     return this.getTransferInData(result);
   }
 
@@ -984,15 +1672,15 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     }
 
     try {
-      await this.callProtocolV1(
+      const response = await this.callProtocolV1(
         path,
-        'Initialize',
+        this.identityProbe ? 'GetFeatures' : 'Initialize',
         {},
         {
           timeoutMs: PROTOCOL_V1_PROBE_TIMEOUT,
         }
       );
-      return true;
+      return !this.identityProbe || response.type === 'Features';
     } catch (error) {
       if (this.isWebUsbIoHardwareError(error)) throw error;
       return false;
@@ -1148,9 +1836,27 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * Release device
    */
   async release(path: string) {
+    const startedAt = Date.now();
+    this.logLifecycle('release', { phase: 'start' });
     this.acquiredPaths.delete(path);
-    await this.invalidateProtocolV2UsbLink(path, 'WebUSB transport released');
-    await this.closeOpenDevice(path);
+    try {
+      await this.invalidateProtocolV2UsbLink(path, 'WebUSB transport released');
+      await this.closeOpenDevice(path);
+      this.logLifecycle('release', {
+        phase: 'success',
+        durationMs: Date.now() - startedAt,
+      });
+    } catch (error) {
+      this.logLifecycle('release', {
+        phase: 'error',
+        durationMs: Date.now() - startedAt,
+        ...this.getDiagnosticError(error, path),
+      });
+      throw error;
+    } finally {
+      this.releaseIdentityProbeHandle(path);
+      this.releaseNormalHandles(path);
+    }
     // Keep deviceProtocol/deviceProtocolHints across release: the probe result is a
     // physical-device property, so the next acquire can skip the wire-level probe.
     // V2 entries are still dropped by onProtocolV2UsbLinkInvalidated via the link