@onekeyfe/hd-transport-web-device 1.2.8-alpha.103 → 1.2.8-alpha.104

package/src/webusb.ts

@@ -45,8 +45,6 @@ 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.
@@ -76,23 +74,6 @@ 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
@@ -102,7 +83,6 @@ interface WebUsbConnectOptions {
  */
 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>();
@@ -127,14 +107,6 @@ 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. */
@@ -232,30 +204,15 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   }
 
   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;
-        }
-      );
+      this.stopPromise = this.stopResources().catch(error => {
+        // A later discovery can retry closure without dropping the handle guard.
+        this.stopPromise = undefined;
+        throw error;
+      });
     }
     return this.stopPromise;
   }
@@ -280,34 +237,12 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         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);
-              }
+            try {
+              await 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(),
-            });
+            await device.close();
             if (device.opened) throw new Error('WebUSB handle remains open after stop');
           }
           if (this.identityProbe) {
@@ -358,122 +293,6 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     }
   }
 
-  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;
-    }
-  }
-
   /**
    * Announce that a USB device left. Called from the module-scoped disconnect
    * listener, which is why it is public rather than inlined.
@@ -537,22 +356,10 @@ 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)
@@ -567,35 +374,16 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
    * It does NOT prompt the user to select a device
    */
   async enumerate() {
-    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.
-        }
+    // 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;
     }
+    await this.getConnectedDevices();
+    return this.deviceList;
   }
 
   /**
@@ -605,24 +393,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     this.assertRunning();
     if (!this.usb) return [];
 
-    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;
-    }
+    const devices = await this.usb.getDevices();
     this.assertRunning();
     for (const owner of new Set(devices.map(device => normalHandleOwners.get(device)))) {
       if (owner?.stopped) {
@@ -668,28 +439,16 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   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),
-    });
+    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));
+    }
     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, {
-        expectedProtocol: input.expectedProtocol,
-        forceProtocolDetection: input.forceProtocolDetection,
-      });
+      await this.connect(input.path ?? '', true);
       if (input.skipProtocolProbe) {
         if (!input.expectedProtocol) {
           throw ERRORS.TypedError(
@@ -767,18 +526,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       }
       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);
       try {
@@ -904,55 +653,18 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   /**
    * Connect to device with retry mechanism
    */
-  async connect(path: string, first: boolean, options: WebUsbConnectOptions = {}) {
+  async connect(path: string, first: boolean) {
     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 {
-        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;
+        return await this.connectToDevice(path, first);
       } catch (e) {
         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) {
+        if (e instanceof HardwareError && e.errorCode === HardwareErrorCode.BridgeNeedsPermission) {
           throw e;
         }
-        if (!willRetry) {
+        if (i === maxRetries - 1) {
           throw e;
         }
         await wait(i * 200);
@@ -960,11 +672,6 @@ 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.
@@ -1002,7 +709,7 @@ 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, options: WebUsbConnectOptions = {}) {
+  async connectToDevice(path: string, first: boolean) {
     this.assertRunning();
     let device: USBDevice = await this.findDevice(path);
     if (this.identityProbe && this.identityProbeDevices.get(path) !== device) {
@@ -1015,63 +722,21 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     if (!device.opened) {
       openingHandles.add(device);
       try {
-        await this.runLoggedHandleOperation({
-          operation: 'open',
-          device,
-          path,
-          task: () => device.open(),
-        });
+        await this.runHandleOperation(() => device.open());
       } catch (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) {
-        await this.runLoggedHandleOperation({
-          operation: 'selectConfiguration',
-          device,
-          path,
-          task: () => device.selectConfiguration(this.configurationId),
-        });
-        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 this.runLoggedHandleOperation({
-          operation: 'reset',
-          device,
-          path,
-          task: () => device.reset(),
-        });
-      } catch {
+        await this.runHandleOperation(() => device.reset());
+      } catch (error) {
         this.assertRunning();
-        // Reset remains best-effort; runLoggedHandleOperation already recorded the error.
+        this.Log?.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
       }
     }
     await this.getConnectedDevices();
@@ -1086,12 +751,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     if (!device.opened) {
       openingHandles.add(device);
       try {
-        await this.runLoggedHandleOperation({
-          operation: 'open',
-          device,
-          path,
-          task: () => device.open(),
-        });
+        await this.runHandleOperation(() => device.open());
       } catch (error) {
         return await this.throwWebUsbIoError(path, 'open', error);
       } finally {
@@ -1104,34 +764,19 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       !device.configuration ||
       device.configuration.configurationValue !== this.configurationId
     ) {
-      await this.runLoggedHandleOperation({
-        operation: 'selectConfiguration',
-        device,
-        path,
-        task: () => device.selectConfiguration(this.configurationId),
-      });
+      await this.runHandleOperation(() => 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 this.runLoggedHandleOperation({
-        operation: 'claimInterface',
-        device,
-        path,
-        interfaceNumber: endpoints.interfaceNumber,
-        task: () => device.claimInterface(endpoints.interfaceNumber),
-      });
+      await this.runHandleOperation(() => 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) {
@@ -1155,9 +800,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   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.
+      if (ownedPath === path) {
         normalHandleOwners.delete(device);
         this.normalDevices.delete(device);
       }
@@ -1201,83 +844,36 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
 
   private async closeOpenDevice(path: string) {
     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;
+    const current = this.identityProbe
+      ? this.identityProbeDevices.get(path)
+      : this.deviceList.find(device => device.path === path)?.device;
+    if (!current?.opened) return;
     this.assertHandleAvailable(current);
 
     const endpoints = this.deviceEndpoints.get(path);
     const ifaceNum = endpoints?.interfaceNumber ?? this.interfaceId;
-    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);
-      }
+    try {
+      await this.runHandleOperation(() => current.releaseInterface(ifaceNum));
+    } catch (error) {
+      this.Log?.debug('[WebUsbTransport] releaseInterface before reconnect failed:', error);
     }
     this.assertHandleAvailable(current);
     try {
-      await this.runLoggedHandleOperation({
-        operation: 'close',
-        device: current,
-        path,
-        task: () => current.close(),
-      });
+      await this.runHandleOperation(() => current.close());
     } catch (error) {
       this.Log?.debug('[WebUsbTransport] close before reconnect failed:', error);
-      throw error;
+      if (this.identityProbe) throw error;
     }
   }
 
   private async clearEndpointHalt(
-    path: string,
     device: USBDevice,
     direction: USBDirection,
     endpointNumber: number
   ) {
     this.assertHandleAvailable(device);
     try {
-      await this.runLoggedHandleOperation({
-        operation: direction === 'in' ? 'clearHaltIn' : 'clearHaltOut',
-        device,
-        path,
-        endpointNumber,
-        task: () => device.clearHalt(direction, endpointNumber),
-      });
+      await this.runHandleOperation(() => device.clearHalt(direction, endpointNumber));
     } catch (error) {
       this.assertRunning();
       this.Log?.debug(
@@ -1434,33 +1030,13 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       if (currentDevice.opened) {
         const endpoints = this.deviceEndpoints.get(path);
         const ifaceNum = endpoints?.interfaceNumber ?? this.interfaceId;
-        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);
-          }
+        try {
+          await this.runHandleOperation(() => currentDevice.releaseInterface(ifaceNum));
+        } catch (releaseError) {
+          this.Log.debug('[WebUsbTransport] releaseInterface before retry error:', releaseError);
         }
         this.assertHandleAvailable(currentDevice);
-        await this.runLoggedHandleOperation({
-          operation: 'close',
-          device: currentDevice,
-          path,
-          task: () => currentDevice.close(),
-        });
+        await this.runHandleOperation(() => currentDevice.close());
       }
     } catch (closeError) {
       this.assertRunning();
@@ -1825,23 +1401,10 @@ 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);
     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);