@onekeyfe/hd-transport-web-device 1.2.8-alpha.52 → 1.2.8-alpha.53

package/dist/index.js

@@ -51,11 +51,15 @@ const REPORT_ID = transport.PROTOCOL_V1_REPORT_ID;
 const HEADER_LENGTH = transport.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 PROTOCOL_V1_PROBE_TIMEOUT = 5000;
 const PROTOCOL_V2_PROBE_TIMEOUT = 1000;
 const EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS = 2;
 let activeWebUsbTransport;
 let usbDisconnectListenerAttached = false;
+const identityProbeHandles = new WeakSet();
+const openingHandles = new WeakSet();
+const normalHandleOwners = new WeakMap();
 function registerActiveWebUsbTransport(instance, usb) {
     activeWebUsbTransport = instance;
     if (usbDisconnectListenerAttached)
@@ -72,17 +76,22 @@ function registerActiveWebUsbTransport(instance, usb) {
     });
 }
 class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
-    constructor() {
+    constructor(identityProbe = false) {
         super({
             router: transport.PROTOCOL_V2_CHANNEL_USB,
             maxFrameBytes: transport.PROTOCOL_V2_FRAME_MAX_BYTES,
             logPrefix: 'ProtocolV2 WebUSB',
         });
+        this.identityProbe = identityProbe;
         this.deviceProtocol = new Map();
         this.confirmedDeviceProtocols = new Map();
         this.deviceProtocolHints = new Map();
         this.staleProtocolPaths = new Set();
         this.acquiredPaths = new Set();
+        this.identityProbeDevices = new Map();
+        this.normalDevices = new Map();
+        this.pendingHandleOperations = new Set();
+        this.identityProbeCleanupPaths = new Set();
         this.probedDeviceObjects = new Map();
         this.deviceEndpoints = new Map();
         this.name = 'WebUsbTransport';
@@ -101,7 +110,104 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'WebUSB is not supported by current browsers');
         }
         this.usb = usb;
-        registerActiveWebUsbTransport(this, usb);
+        if (!this.identityProbe)
+            registerActiveWebUsbTransport(this, usb);
+    }
+    stop() {
+        this.stopped = true;
+        this.acquiredPaths.clear();
+        if (activeWebUsbTransport === this)
+            activeWebUsbTransport = undefined;
+        if (!this.stopPromise) {
+            this.stopPromise = this.stopResources().catch(error => {
+                this.stopPromise = undefined;
+                throw error;
+            });
+        }
+        return this.stopPromise;
+    }
+    stopResources() {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            let cleanupError;
+            try {
+                yield this.disposeProtocolV2UsbLinks('WebUSB transport stopped');
+            }
+            catch (error) {
+                cleanupError = error;
+            }
+            yield Promise.allSettled([...this.pendingHandleOperations]);
+            const handles = this.identityProbe
+                ? [...this.identityProbeDevices].map(([path, device]) => [device, path])
+                : [...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 = (_b = (_a = this.deviceEndpoints.get(path)) === null || _a === void 0 ? void 0 : _a.interfaceNumber) !== null && _b !== void 0 ? _b : this.interfaceId;
+                            try {
+                                yield device.releaseInterface(iface);
+                            }
+                            catch (error) {
+                                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug('[WebUsbTransport] stop releaseInterface failed:', error);
+                            }
+                            yield 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 !== null && cleanupError !== void 0 ? cleanupError : (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));
+            }
+        });
+    }
+    assertRunning() {
+        if (this.stopped) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'WebUSB transport is stopped');
+        }
+    }
+    runHandleOperation(operation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.assertRunning();
+            const pending = Promise.resolve(operation());
+            this.pendingHandleOperations.add(pending);
+            try {
+                const result = yield pending;
+                this.assertRunning();
+                return result;
+            }
+            finally {
+                this.pendingHandleOperations.delete(pending);
+            }
+        });
     }
     emitDeviceDisconnect(path, device) {
         var _a, _b;
@@ -150,15 +256,36 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     }
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
+            for (const path of this.identityProbeCleanupPaths) {
+                try {
+                    yield this.release(path);
+                }
+                catch (_a) {
+                }
+            }
             yield this.getConnectedDevices();
             return this.deviceList;
         });
     }
     getConnectedDevices() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            this.assertRunning();
             if (!this.usb)
                 return [];
             const devices = yield this.usb.getDevices();
+            this.assertRunning();
+            for (const owner of new Set(devices.map(device => normalHandleOwners.get(device)))) {
+                if (owner === null || owner === void 0 ? void 0 : owner.stopped) {
+                    try {
+                        yield owner.stop();
+                    }
+                    catch (error) {
+                        (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] stopped owner cleanup failed:', error);
+                    }
+                }
+            }
+            this.assertRunning();
             const onekeyDevices = devices.filter(dev => {
                 const isOneKey = hdShared.ONEKEY_WEBUSB_FILTER.some((desc) => dev.vendorId === desc.vendorId && dev.productId === desc.productId);
                 return isOneKey && !hdShared.isKnownTrezorWebUsbDevice(dev);
@@ -185,8 +312,16 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     acquire(input) {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
+            this.assertRunning();
             if (!input.path)
                 return;
+            if (this.identityProbe) {
+                yield this.getConnectedDevices();
+                this.claimIdentityProbeHandle(input.path, yield this.findDevice(input.path));
+            }
+            else {
+                this.claimNormalHandle(input.path, yield this.findDevice(input.path));
+            }
             try {
                 yield this.rotateProtocolV2UsbGeneration(input.path, 'WebUSB transport acquired');
                 yield this.closeOpenDevice(input.path);
@@ -236,31 +371,44 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                         this.deviceProtocolHints.set(input.path, protocolHint);
                     }
                     const detectedProtocol = yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
+                    this.assertRunning();
                     this.confirmedDeviceProtocols.set(input.path, detectedProtocol);
                     const probedDevice = (_g = this.deviceList.find(d => d.path === input.path)) === null || _g === void 0 ? void 0 : _g.device;
                     if (probedDevice) {
                         this.probedDeviceObjects.set(input.path, probedDevice);
                     }
                 }
+                this.assertRunning();
                 this.acquiredPaths.add(input.path);
                 return yield Promise.resolve(input.path);
             }
             catch (e) {
                 this.Log.debug('acquire error: ', e instanceof Error ? `${e.name}: ${e.message}` : String(e));
                 this.acquiredPaths.delete(input.path);
-                yield this.closeOpenDevice(input.path);
+                try {
+                    yield this.closeOpenDevice(input.path);
+                }
+                finally {
+                    this.releaseIdentityProbeHandle(input.path);
+                    this.releaseNormalHandles(input.path);
+                }
                 throw e;
             }
         });
     }
     createProtocolMismatchError(expected) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+            expectedProtocol: expected,
+        });
     }
     createProtocolProbeTimeoutError(expected, attempts) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Protocol ${expected} probe timeout after ${attempts} attempts`);
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+            expectedProtocol: expected,
+            attempts,
+        });
     }
     createProtocolDetectionError() {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportProtocolProbeFailed);
     }
     detectProtocol(path, expectedProtocol, protocolHint) {
         var _a;
@@ -328,10 +476,12 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         return __awaiter(this, void 0, void 0, function* () {
             const maxRetries = 5;
             for (let i = 0; i < maxRetries; i++) {
+                this.assertRunning();
                 try {
                     return yield this.connectToDevice(path, first);
                 }
                 catch (e) {
+                    this.assertRunning();
                     if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.BridgeNeedsPermission) {
                         throw e;
                     }
@@ -374,42 +524,68 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     connectToDevice(path, first) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            this.assertRunning();
             let device = yield this.findDevice(path);
+            if (this.identityProbe && this.identityProbeDevices.get(path) !== device) {
+                yield 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 {
-                    yield device.open();
+                    yield this.runHandleOperation(() => device.open());
                 }
                 catch (error) {
-                    return this.throwWebUsbIoError(path, 'open', error);
+                    return yield this.throwWebUsbIoError(path, 'open', error);
+                }
+                finally {
+                    openingHandles.delete(device);
                 }
             }
             if (first || this.deviceProtocol.get(path) !== 'V1') {
                 try {
-                    yield device.reset();
+                    yield this.runHandleOperation(() => device.reset());
                 }
                 catch (error) {
+                    this.assertRunning();
                     (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[WebUsbTransport] reset before claim failed, continuing:', error);
                 }
             }
             yield this.getConnectedDevices();
             device = yield this.findDevice(path);
+            if (this.identityProbe && this.identityProbeDevices.get(path) !== device) {
+                yield 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 {
-                    yield device.open();
+                    yield this.runHandleOperation(() => device.open());
                 }
                 catch (error) {
-                    return this.throwWebUsbIoError(path, 'open', error);
+                    return yield this.throwWebUsbIoError(path, 'open', error);
+                }
+                finally {
+                    openingHandles.delete(device);
                 }
             }
             if (first ||
                 !device.configuration ||
                 device.configuration.configurationValue !== this.configurationId) {
-                yield device.selectConfiguration(this.configurationId);
+                yield this.runHandleOperation(() => device.selectConfiguration(this.configurationId));
             }
             const endpoints = this.discoverEndpoints(device);
             this.deviceEndpoints.set(path, endpoints);
             try {
-                yield device.claimInterface(endpoints.interfaceNumber);
+                yield this.runHandleOperation(() => device.claimInterface(endpoints.interfaceNumber));
             }
             catch (error) {
                 return this.throwWebUsbIoError(path, 'claimInterface', error);
@@ -418,40 +594,104 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             yield this.clearEndpointHalt(device, 'out', endpoints.endpointOut);
         });
     }
+    assertHandleAvailable(device) {
+        this.assertRunning();
+        const normalOwner = normalHandleOwners.get(device);
+        if ((normalOwner && normalOwner !== this) ||
+            (identityProbeHandles.has(device) &&
+                ![...this.identityProbeDevices.values()].includes(device))) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, USB_DEVICE_IN_USE);
+        }
+    }
+    claimNormalHandle(path, device) {
+        this.assertHandleAvailable(device);
+        normalHandleOwners.set(device, this);
+        this.normalDevices.set(device, path);
+    }
+    releaseNormalHandles(path) {
+        if (this.stopped)
+            return;
+        for (const [device, ownedPath] of this.normalDevices) {
+            if (ownedPath === path) {
+                normalHandleOwners.delete(device);
+                this.normalDevices.delete(device);
+            }
+        }
+    }
+    isHandleOwnershipError(error) {
+        return (error instanceof hdShared.HardwareError &&
+            error.errorCode === hdShared.HardwareErrorCode.RuntimeError &&
+            this.getErrorMessage(error).includes(USB_DEVICE_IN_USE));
+    }
+    claimIdentityProbeHandle(path, device) {
+        this.assertRunning();
+        if (device.opened ||
+            openingHandles.has(device) ||
+            identityProbeHandles.has(device) ||
+            normalHandleOwners.has(device)) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, USB_DEVICE_IN_USE);
+        }
+        identityProbeHandles.add(device);
+        this.identityProbeDevices.set(path, device);
+    }
+    releaseIdentityProbeHandle(path) {
+        if (this.stopped)
+            return;
+        const device = this.identityProbeDevices.get(path);
+        if (device === null || device === void 0 ? void 0 : device.opened) {
+            this.identityProbeCleanupPaths.add(path);
+            return;
+        }
+        if (device)
+            identityProbeHandles.delete(device);
+        this.identityProbeDevices.delete(path);
+        this.identityProbeCleanupPaths.delete(path);
+    }
     closeOpenDevice(path) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const current = (_a = this.deviceList.find(device => device.path === path)) === null || _a === void 0 ? void 0 : _a.device;
+            if (this.stopped)
+                return;
+            const current = this.identityProbe
+                ? this.identityProbeDevices.get(path)
+                : (_a = this.deviceList.find(device => device.path === path)) === null || _a === void 0 ? void 0 : _a.device;
             if (!(current === null || current === void 0 ? void 0 : current.opened))
                 return;
+            this.assertHandleAvailable(current);
             const endpoints = this.deviceEndpoints.get(path);
             const ifaceNum = (_b = endpoints === null || endpoints === void 0 ? void 0 : endpoints.interfaceNumber) !== null && _b !== void 0 ? _b : this.interfaceId;
             try {
-                yield current.releaseInterface(ifaceNum);
+                yield this.runHandleOperation(() => current.releaseInterface(ifaceNum));
             }
             catch (error) {
                 (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug('[WebUsbTransport] releaseInterface before reconnect failed:', error);
             }
+            this.assertHandleAvailable(current);
             try {
-                yield current.close();
+                yield this.runHandleOperation(() => current.close());
             }
             catch (error) {
                 (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug('[WebUsbTransport] close before reconnect failed:', error);
+                if (this.identityProbe)
+                    throw error;
             }
         });
     }
     clearEndpointHalt(device, direction, endpointNumber) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            this.assertHandleAvailable(device);
             try {
-                yield device.clearHalt(direction, endpointNumber);
+                yield this.runHandleOperation(() => device.clearHalt(direction, endpointNumber));
             }
             catch (error) {
+                this.assertRunning();
                 (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[WebUsbTransport] clearHalt ${direction} endpoint ${endpointNumber} failed, continuing:`, error);
             }
         });
     }
     assertAcquired(path) {
+        this.assertRunning();
         if (!this.acquiredPaths.has(path)) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device is not acquired for ${path}`);
         }
@@ -508,7 +748,8 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     throwWebUsbIoError(path, operation, error) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isWebUsbIoHardwareError(error))
+            this.assertRunning();
+            if (this.isHandleOwnershipError(error) || this.isWebUsbIoHardwareError(error))
                 throw error;
             if (error instanceof transport.ProtocolV2LinkError && error.code !== 'io')
                 throw error;
@@ -542,7 +783,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         return /LIBUSB_ERROR_ACCESS|\b(?:access|permission) denied\b/i.test(message);
     }
     isRetryablePacketIoError(error) {
-        if (this.isWebUsbIoHardwareError(error))
+        if (this.stopped)
+            return false;
+        if (this.isHandleOwnershipError(error) || this.isWebUsbIoHardwareError(error))
             return false;
         const message = this.getErrorMessage(error).toLowerCase();
         if (this.isWebUsbPermissionDeniedMessage(message))
@@ -561,21 +804,27 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             this.Log.debug(`[WebUsbTransport] transfer${direction} failed, retry ${attempt}/${PACKET_IO_MAX_RETRIES}: ${this.getErrorMessage(error)}`);
             this.staleProtocolPaths.add(path);
             yield hdShared.wait(attempt * PACKET_IO_RETRY_DELAY);
+            this.assertRunning();
             try {
                 const currentDevice = yield this.findDevice(path);
+                this.assertHandleAvailable(currentDevice);
                 if (currentDevice.opened) {
                     const endpoints = this.deviceEndpoints.get(path);
                     const ifaceNum = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.interfaceNumber) !== null && _a !== void 0 ? _a : this.interfaceId;
                     try {
-                        yield currentDevice.releaseInterface(ifaceNum);
+                        yield this.runHandleOperation(() => currentDevice.releaseInterface(ifaceNum));
                     }
                     catch (releaseError) {
                         this.Log.debug('[WebUsbTransport] releaseInterface before retry error:', releaseError);
                     }
-                    yield currentDevice.close();
+                    this.assertHandleAvailable(currentDevice);
+                    yield this.runHandleOperation(() => currentDevice.close());
                 }
             }
             catch (closeError) {
+                this.assertRunning();
+                if (this.isHandleOwnershipError(closeError))
+                    throw closeError;
                 this.Log.debug('[WebUsbTransport] close device before retry error:', closeError);
             }
             yield this.getConnectedDevices();
@@ -617,6 +866,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                         yield 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(reconnectError)}`);
                     }
@@ -635,7 +887,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             const endpoints = this.deviceEndpoints.get(path);
             const endpointOut = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.endpointOut) !== null && _a !== void 0 ? _a : this.endpointId;
             const transferBuffer = this.toArrayBuffer(packet.buffer.slice(packet.byteOffset, packet.byteOffset + packet.byteLength));
+            this.assertHandleAvailable(device);
             const result = yield device.transferOut(endpointOut, transferBuffer);
+            this.assertHandleAvailable(device);
             if (result.status !== 'ok') {
                 return this.throwWebUsbIoError(path, 'transferOut', new Error(`transferOut status: ${String(result.status)}`));
             }
@@ -656,7 +910,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     }
                     const endpoints = this.deviceEndpoints.get(path);
                     const endpointIn = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.endpointIn) !== null && _a !== void 0 ? _a : this.endpointId;
+                    this.assertHandleAvailable(device);
                     const result = yield device.transferIn(endpointIn, length);
+                    this.assertHandleAvailable(device);
                     return this.getTransferInData(result);
                 }
                 catch (error) {
@@ -672,6 +928,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                         yield 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(reconnectError)}`);
                     }
@@ -689,7 +948,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             const endpoints = this.deviceEndpoints.get(path);
             const endpointIn = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.endpointIn) !== null && _a !== void 0 ? _a : this.endpointId;
+            this.assertHandleAvailable(device);
             const result = yield device.transferIn(endpointIn, length);
+            this.assertHandleAvailable(device);
             return this.getTransferInData(result);
         });
     }
@@ -749,10 +1010,10 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 return false;
             }
             try {
-                yield this.callProtocolV1(path, 'Initialize', {}, {
+                const response = yield this.callProtocolV1(path, this.identityProbe ? 'GetFeatures' : 'Initialize', {}, {
                     timeoutMs: PROTOCOL_V1_PROBE_TIMEOUT,
                 });
-                return true;
+                return !this.identityProbe || response.type === 'Features';
             }
             catch (error) {
                 if (this.isWebUsbIoHardwareError(error))
@@ -869,8 +1130,14 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     release(path) {
         return __awaiter(this, void 0, void 0, function* () {
             this.acquiredPaths.delete(path);
-            yield this.invalidateProtocolV2UsbLink(path, 'WebUSB transport released');
-            yield this.closeOpenDevice(path);
+            try {
+                yield this.invalidateProtocolV2UsbLink(path, 'WebUSB transport released');
+                yield this.closeOpenDevice(path);
+            }
+            finally {
+                this.releaseIdentityProbeHandle(path);
+                this.releaseNormalHandles(path);
+            }
             this.deviceEndpoints.delete(path);
         });
     }
@@ -1277,10 +1544,12 @@ class ElectronBleTransport {
         });
     }
     createProtocolMismatchError(expected) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+            expectedProtocol: expected,
+        });
     }
     createProtocolDetectionError() {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping');
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportProtocolProbeFailed);
     }
     clearProbeProtocol(uuid, protocol) {
         if (this.deviceProtocol.get(uuid) === protocol) {

package/dist/webusb.d.ts

@@ -9,6 +9,7 @@ export interface DeviceInfo extends OneKeyDeviceInfoBase {
     protocolType?: ProtocolType;
 }
 export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
+    private readonly identityProbe;
     messages: ReturnType<typeof transport.parseConfigure> | undefined;
     messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
     private protocolV2SchemaSource;
@@ -17,6 +18,11 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     private deviceProtocolHints;
     private staleProtocolPaths;
     private acquiredPaths;
+    private identityProbeDevices;
+    private normalDevices;
+    private pendingHandleOperations;
+    private stopPromise?;
+    private identityProbeCleanupPaths;
     private probedDeviceObjects;
     private deviceEndpoints;
     name: string;
@@ -29,8 +35,12 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     configurationId: number;
     endpointId: number;
     interfaceId: number;
-    constructor();
+    constructor(identityProbe?: boolean);
     init(logger: any, emitter?: EventEmitter): void;
+    stop(): Promise<void>;
+    private stopResources;
+    private assertRunning;
+    private runHandleOperation;
     emitDeviceDisconnect(path: string, device?: USBDevice): void;
     markProtocolStale(path: string): void;
     configure(signedData: any): void;
@@ -47,6 +57,12 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     connect(path: string, first: boolean): Promise<undefined>;
     private discoverEndpoints;
     connectToDevice(path: string, first: boolean): Promise<undefined>;
+    private assertHandleAvailable;
+    private claimNormalHandle;
+    private releaseNormalHandles;
+    private isHandleOwnershipError;
+    private claimIdentityProbeHandle;
+    private releaseIdentityProbeHandle;
     private closeOpenDevice;
     private clearEndpointHalt;
     private assertAcquired;

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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"}