@onekeyfe/hd-transport-web-device 1.2.0-alpha.99 → 1.2.0

package/dist/index.js

@@ -54,8 +54,22 @@ const PACKET_IO_RETRY_DELAY = 300;
 const PROTOCOL_V1_PROBE_TIMEOUT = 5000;
 const PROTOCOL_V2_PROBE_TIMEOUT = 1000;
 const EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS = 2;
-function inferProtocolHintFromDeviceName$1(name) {
-    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
+let activeWebUsbTransport;
+let usbDisconnectListenerAttached = false;
+function registerActiveWebUsbTransport(instance, usb) {
+    activeWebUsbTransport = instance;
+    if (usbDisconnectListenerAttached)
+        return;
+    usbDisconnectListenerAttached = true;
+    usb.addEventListener('disconnect', event => {
+        if (!event.device)
+            return;
+        const path = hdShared.resolveOneKeyUsbDevicePath(event.device);
+        if (!path)
+            return;
+        activeWebUsbTransport === null || activeWebUsbTransport === void 0 ? void 0 : activeWebUsbTransport.markProtocolStale(path);
+        activeWebUsbTransport === null || activeWebUsbTransport === void 0 ? void 0 : activeWebUsbTransport.emitDeviceDisconnect(path, event.device);
+    });
 }
 class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
     constructor() {
@@ -65,7 +79,11 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             logPrefix: 'ProtocolV2 WebUSB',
         });
         this.deviceProtocol = new Map();
+        this.confirmedDeviceProtocols = new Map();
         this.deviceProtocolHints = new Map();
+        this.staleProtocolPaths = new Set();
+        this.acquiredPaths = new Set();
+        this.probedDeviceObjects = new Map();
         this.deviceEndpoints = new Map();
         this.name = 'WebUsbTransport';
         this.stopped = false;
@@ -75,13 +93,27 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         this.endpointId = ENDPOINT_ID;
         this.interfaceId = INTERFACE_ID;
     }
-    init(logger) {
+    init(logger, emitter) {
         this.Log = logger;
+        this.emitter = emitter;
         const { usb } = navigator;
         if (!usb) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'WebUSB is not supported by current browsers');
         }
         this.usb = usb;
+        registerActiveWebUsbTransport(this, usb);
+    }
+    emitDeviceDisconnect(path, device) {
+        var _a, _b;
+        (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+            name: (_b = device === null || device === void 0 ? void 0 : device.productName) !== null && _b !== void 0 ? _b : '',
+            id: path,
+            connectId: path,
+        });
+    }
+    markProtocolStale(path) {
+        this.staleProtocolPaths.add(path);
+        this.probedDeviceObjects.delete(path);
     }
     configure(signedData) {
         const messages = parseConfigure$1(signedData);
@@ -129,26 +161,29 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             const devices = yield this.usb.getDevices();
             const onekeyDevices = devices.filter(dev => {
                 const isOneKey = hdShared.ONEKEY_WEBUSB_FILTER.some((desc) => dev.vendorId === desc.vendorId && dev.productId === desc.productId);
-                const hasSerialNumber = typeof dev.serialNumber === 'string' && dev.serialNumber.length > 0;
-                return isOneKey && hasSerialNumber && !hdShared.isKnownTrezorWebUsbDevice(dev);
+                return isOneKey && !hdShared.isKnownTrezorWebUsbDevice(dev);
             });
-            this.deviceList = onekeyDevices.map(device => {
-                const path = device.serialNumber;
-                const protocolHint = inferProtocolHintFromDeviceName$1(device.productName);
+            this.deviceList = onekeyDevices.flatMap(device => {
+                const path = hdShared.resolveOneKeyUsbDevicePath(device);
+                if (!path)
+                    return [];
+                const protocolHint = hdShared.inferProtocolHintFromUsbId(device.vendorId, device.productId);
                 if (protocolHint) {
                     this.deviceProtocolHints.set(path, protocolHint);
                 }
-                return {
-                    path,
-                    device,
-                    commType: 'webusb',
-                };
+                return [
+                    {
+                        path,
+                        device,
+                        commType: 'webusb',
+                    },
+                ];
             });
             return this.deviceList;
         });
     }
     acquire(input) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (!input.path)
                 return;
@@ -156,18 +191,63 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 yield this.rotateProtocolV2UsbGeneration(input.path, 'WebUSB transport acquired');
                 yield this.closeOpenDevice(input.path);
                 yield this.connect((_a = input.path) !== null && _a !== void 0 ? _a : '', true);
-                const deviceName = (_b = this.deviceList.find(device => device.path === input.path)) === null || _b === void 0 ? void 0 : _b.device.productName;
-                const protocolHint = input.expectedProtocol
-                    ? undefined
-                    : (_d = (_c = input.protocolHint) !== null && _c !== void 0 ? _c : this.deviceProtocolHints.get(input.path)) !== null && _d !== void 0 ? _d : inferProtocolHintFromDeviceName$1(deviceName);
-                if (protocolHint) {
-                    this.deviceProtocolHints.set(input.path, protocolHint);
+                if (input.skipProtocolProbe) {
+                    if (!input.expectedProtocol) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'skipProtocolProbe requires an expected protocol');
+                    }
+                    if (this.confirmedDeviceProtocols.get(input.path) !== input.expectedProtocol) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'skipProtocolProbe requires a previously confirmed protocol for this WebUSB endpoint');
+                    }
+                    this.staleProtocolPaths.delete(input.path);
+                    this.deviceProtocol.set(input.path, input.expectedProtocol);
+                    const currentDevice = (_b = this.deviceList.find(d => d.path === input.path)) === null || _b === void 0 ? void 0 : _b.device;
+                    if (currentDevice) {
+                        this.probedDeviceObjects.set(input.path, currentDevice);
+                    }
+                }
+                else if (input.forceProtocolDetection) {
+                    this.staleProtocolPaths.delete(input.path);
+                    this.deviceProtocol.delete(input.path);
+                    this.deviceProtocolHints.delete(input.path);
+                }
+                if (!input.skipProtocolProbe && this.staleProtocolPaths.has(input.path)) {
+                    this.staleProtocolPaths.delete(input.path);
+                    this.deviceProtocol.delete(input.path);
+                }
+                if (!input.skipProtocolProbe && this.deviceProtocol.has(input.path)) {
+                    const currentDevice = (_c = this.deviceList.find(d => d.path === input.path)) === null || _c === void 0 ? void 0 : _c.device;
+                    if (!currentDevice || currentDevice !== this.probedDeviceObjects.get(input.path)) {
+                        this.deviceProtocol.delete(input.path);
+                    }
                 }
-                yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
+                const cachedProtocol = this.deviceProtocol.get(input.path);
+                if (!input.skipProtocolProbe &&
+                    cachedProtocol &&
+                    input.expectedProtocol &&
+                    cachedProtocol !== input.expectedProtocol) {
+                    this.deviceProtocol.delete(input.path);
+                }
+                if (!this.deviceProtocol.has(input.path)) {
+                    const usbDevice = (_d = this.deviceList.find(device => device.path === input.path)) === null || _d === void 0 ? void 0 : _d.device;
+                    const protocolHint = input.expectedProtocol
+                        ? undefined
+                        : (_f = (_e = input.protocolHint) !== null && _e !== void 0 ? _e : this.deviceProtocolHints.get(input.path)) !== null && _f !== void 0 ? _f : hdShared.inferProtocolHintFromUsbId(usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.vendorId, usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.productId);
+                    if (protocolHint) {
+                        this.deviceProtocolHints.set(input.path, protocolHint);
+                    }
+                    const detectedProtocol = yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
+                    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.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);
                 throw e;
             }
@@ -177,7 +257,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
     createProtocolProbeTimeoutError(expected, attempts) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol ${expected} probe timeout after ${attempts} attempts`);
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Protocol ${expected} probe timeout after ${attempts} attempts`);
     }
     createProtocolDetectionError() {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
@@ -351,8 +431,18 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
         });
     }
+    assertAcquired(path) {
+        if (!this.acquiredPaths.has(path)) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device is not acquired for ${path}`);
+        }
+    }
     post(session, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.assertAcquired(session);
+            if (this.deviceProtocol.get(session) === 'V2') {
+                yield this.sendProtocolV2UsbFlowControl(session, name, data);
+                return;
+            }
             yield this.call(session, name, data);
         });
     }
@@ -381,6 +471,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             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);
             try {
                 const currentDevice = yield this.findDevice(path);
@@ -595,6 +686,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             if (this.messages == null) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
+            this.assertAcquired(path);
             const device = yield this.findDevice(path);
             if (!device) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
@@ -603,9 +695,6 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${path}`);
             }
-            if (!transport.shouldSuppressHighVolumeCallLog(name)) {
-                this.Log.debug('transport call', transport.createTransportCallLog(name, protocol, data));
-            }
             if (protocol === 'V2') {
                 return this.callProtocolV2(path, name, data, options);
             }
@@ -677,10 +766,9 @@ 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);
-            this.deviceProtocol.delete(path);
-            this.deviceProtocolHints.delete(path);
             this.deviceEndpoints.delete(path);
         });
     }
@@ -734,14 +822,11 @@ function resolveBlePacketCapacity(mtu, maximumPacketCapacity, fallbackPacketCapa
 }
 
 const { parseConfigure, ProtocolV1, check } = transport__default["default"];
-function inferProtocolHintFromDeviceName(name) {
-    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
-}
 const toBleDescriptor = (device, protocolType) => (Object.assign({ id: device.id, name: device.name, path: device.id, debug: false, commType: 'electron-ble' }, (protocolType ? { protocolType } : {})));
 const BLE_PACKET_SIZE_FALLBACK = 192;
 const BLE_PACKET_SIZE_MAXIMUM = 244;
 const BLE_WRITE_DELAY_MS = 5;
-const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
+const PROTOCOL_PROBE_TIMEOUT_MS = 3000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 class ElectronBleTransport {
     constructor() {
@@ -752,6 +837,7 @@ class ElectronBleTransport {
         this.connectedDevices = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
+        this.confirmedProtocolV2 = new Set();
         this.deviceMtus = new Map();
         this.devicePacketCapacities = new Map();
         this.v1Buffers = new Map();
@@ -782,11 +868,32 @@ class ElectronBleTransport {
         this.warnedMissingRelease = false;
         this.notificationCleanups = new Map();
         this.mtuCleanups = new Map();
-        this.disconnectCleanups = new Map();
         this.notificationTokens = new Map();
         this.nextNotificationToken = 1;
     }
-    handleBluetoothError(error) {
+    toStaleBondError(error) {
+        var _a;
+        if (hdShared.isBleStaleBondHardwareError(error)) {
+            return error;
+        }
+        const errorMessage = error && typeof error === 'object' && 'message' in error
+            ? String((_a = error.message) !== null && _a !== void 0 ? _a : '')
+            : String(error !== null && error !== void 0 ? error : '');
+        if (!hdShared.isBleStaleBondErrorText(errorMessage)) {
+            return null;
+        }
+        const normalizedErrorMessage = errorMessage.toLowerCase();
+        return hdShared.ERRORS.TypedError(normalizedErrorMessage.includes('peer removed pairing information')
+            ? hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation
+            : hdShared.HardwareErrorCode.BleDeviceBondError, errorMessage);
+    }
+    handleBluetoothError(error, mapProtocolV2StaleBond = false) {
+        if (mapProtocolV2StaleBond) {
+            const staleBondError = this.toStaleBondError(error);
+            if (staleBondError) {
+                throw staleBondError;
+            }
+        }
         if (error && typeof error === 'object') {
             if ('code' in error) {
                 if (error.code === hdShared.HardwareErrorCode.BlePoweredOff) {
@@ -842,11 +949,6 @@ class ElectronBleTransport {
             mtuCleanup();
             this.mtuCleanups.delete(deviceId);
         }
-        const disconnectCleanup = this.disconnectCleanups.get(deviceId);
-        if (disconnectCleanup) {
-            disconnectCleanup();
-            this.disconnectCleanups.delete(deviceId);
-        }
     }
     init(logger, emitter) {
         var _a, _b;
@@ -855,8 +957,26 @@ class ElectronBleTransport {
         if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble BLE API is not available. Please ensure you are running in Electron with Noble support.');
         }
+        this.subscribeHostDisconnects();
         (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] Transport initialized');
     }
+    subscribeHostDisconnects() {
+        var _a, _b, _c;
+        (_a = this.hostDisconnectCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.hostDisconnectCleanup = (_c = (_b = window.desktopApi) === null || _b === void 0 ? void 0 : _b.nobleBle) === null || _c === void 0 ? void 0 : _c.onDeviceDisconnected((disconnectedDevice) => {
+            var _a, _b, _c;
+            const uuid = disconnectedDevice === null || disconnectedDevice === void 0 ? void 0 : disconnectedDevice.id;
+            if (!uuid)
+                return;
+            this.cleanupDeviceState(uuid);
+            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Device link dropped:', uuid, (_b = disconnectedDevice.reason) !== null && _b !== void 0 ? _b : hdShared.EBleDisconnectReason.DeviceDisconnected);
+            (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+                name: disconnectedDevice.name,
+                id: uuid,
+                connectId: uuid,
+            });
+        });
+    }
     configure(signedData) {
         this._messages = parseConfigure(signedData);
         this.configured = true;
@@ -891,10 +1011,6 @@ class ElectronBleTransport {
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Electron BLE] enumerate found ${devices.length} device(s):`);
                 for (const dev of devices) {
                     (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Electron BLE]   id="${dev.id}" name="${dev.name}"`);
-                    const protocolHint = inferProtocolHintFromDeviceName(dev.name);
-                    if (protocolHint) {
-                        this.deviceProtocolHints.set(dev.id, protocolHint);
-                    }
                 }
                 return devices.map(device => toBleDescriptor(device));
             }
@@ -905,9 +1021,12 @@ class ElectronBleTransport {
         });
     }
     acquire(input) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
+            const shouldMapProtocolV2StaleBond = expectedProtocol
+                ? expectedProtocol === 'V2'
+                : this.confirmedProtocolV2.has(uuid);
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
@@ -930,7 +1049,7 @@ class ElectronBleTransport {
                 }
                 const protocolHint = expectedProtocol
                     ? undefined
-                    : (_c = (_b = input.protocolHint) !== null && _b !== void 0 ? _b : this.deviceProtocolHints.get(uuid)) !== null && _c !== void 0 ? _c : inferProtocolHintFromDeviceName(device.name);
+                    : (_b = input.protocolHint) !== null && _b !== void 0 ? _b : this.deviceProtocolHints.get(uuid);
                 if (protocolHint) {
                     this.deviceProtocolHints.set(uuid, protocolHint);
                 }
@@ -939,7 +1058,7 @@ class ElectronBleTransport {
                     this.connectedDevices.add(uuid);
                 }
                 catch (error) {
-                    this.handleBluetoothError(error);
+                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
                 }
                 const mtuCleanup = this.createMtuSubscription(uuid);
                 if (mtuCleanup) {
@@ -947,44 +1066,35 @@ class ElectronBleTransport {
                 }
                 this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
                 this.v2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
-                yield window.desktopApi.nobleBle.subscribe(uuid);
+                try {
+                    yield window.desktopApi.nobleBle.subscribe(uuid);
+                }
+                catch (error) {
+                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+                }
                 yield this.refreshBlePacketCapacity(uuid);
                 const cleanup = this.createNotificationSubscription(uuid);
                 this.notificationCleanups.set(uuid, cleanup);
-                const connectionToken = this.notificationTokens.get(uuid);
                 const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
                 if (protocolType === 'V2') {
-                    (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug('[Electron BLE] Protocol V2 write configured', {
+                    (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug('[Electron BLE] Protocol V2 write configured', {
                         writeMode: 'withoutResponse',
                         negotiatedMtu: this.deviceMtus.get(uuid),
-                        packetCapacity: (_e = this.devicePacketCapacities.get(uuid)) !== null && _e !== void 0 ? _e : BLE_PACKET_SIZE_FALLBACK,
+                        packetCapacity: (_d = this.devicePacketCapacities.get(uuid)) !== null && _d !== void 0 ? _d : BLE_PACKET_SIZE_FALLBACK,
                     });
                 }
-                const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected((disconnectedDevice) => {
-                    var _a;
-                    if (disconnectedDevice.id === uuid &&
-                        this.notificationTokens.get(uuid) === connectionToken) {
-                        this.cleanupDeviceState(uuid);
-                        (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
-                            name: disconnectedDevice.name,
-                            id: disconnectedDevice.id,
-                            connectId: disconnectedDevice.id,
-                        });
-                    }
-                });
-                this.disconnectCleanups.set(uuid, disconnectCleanup);
                 return Object.assign(Object.assign({}, toBleDescriptor({ id: device.id, name: device.name }, protocolType)), { uuid });
             }
             catch (error) {
-                (_f = this.Log) === null || _f === void 0 ? void 0 : _f.error('[Electron BLE] acquire failed:', error);
+                (_e = this.Log) === null || _e === void 0 ? void 0 : _e.error('[Electron BLE] acquire failed:', error);
                 try {
-                    if (((_g = window.desktopApi) === null || _g === void 0 ? void 0 : _g.nobleBle) && this.connectedDevices.has(uuid)) {
+                    if (((_f = window.desktopApi) === null || _f === void 0 ? void 0 : _f.nobleBle) && this.connectedDevices.has(uuid)) {
                         yield window.desktopApi.nobleBle.unsubscribe(uuid);
                         yield window.desktopApi.nobleBle.disconnect(uuid);
                     }
                 }
                 catch (cleanupError) {
-                    (_h = this.Log) === null || _h === void 0 ? void 0 : _h.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
+                    (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
                 }
                 this.cleanupDeviceState(uuid);
                 throw error;
@@ -1051,8 +1161,9 @@ class ElectronBleTransport {
             }
         });
     }
-    createProtocolMismatchError(expected) {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
+    createProtocolMismatchError(expected, uuid) {
+        const isStaleV2Bond = expected === 'V2' && this.confirmedProtocolV2.has(uuid);
+        return hdShared.ERRORS.TypedError(isStaleV2Bond ? hdShared.HardwareErrorCode.BleDeviceBondError : hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
     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');
@@ -1066,20 +1177,18 @@ class ElectronBleTransport {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
-                if (yield this.probeProtocolV1(uuid)) {
-                    this.deviceProtocol.set(uuid, 'V1');
-                    (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected)`);
-                    return 'V1';
-                }
-                throw this.createProtocolMismatchError(expectedProtocol);
+                this.deviceProtocol.set(uuid, 'V1');
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected, no probe)`);
+                return 'V1';
             }
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
                     this.deviceProtocol.set(uuid, 'V2');
+                    this.confirmedProtocolV2.add(uuid);
                     (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
                     return 'V2';
                 }
-                throw this.createProtocolMismatchError(expectedProtocol);
+                throw this.createProtocolMismatchError(expectedProtocol, uuid);
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
             for (let i = 0; i < probeOrder.length; i += 1) {
@@ -1090,6 +1199,9 @@ class ElectronBleTransport {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
                 if (detected) {
                     this.deviceProtocol.set(uuid, protocol);
+                    if (protocol === 'V2') {
+                        this.confirmedProtocolV2.add(uuid);
+                    }
                     (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
                     return protocol;
                 }
@@ -1113,7 +1225,7 @@ class ElectronBleTransport {
         });
     }
     resetProbeStateAfterProtocolProbe(uuid, protocol) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.protocolV2Links.invalidateLink(uuid, `Reset notify state after Protocol ${protocol} probe`);
             this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
@@ -1125,37 +1237,10 @@ class ElectronBleTransport {
                 this.runPromise = null;
                 this.runPromiseDeviceId = null;
             }
-            const notifyCleanup = this.notificationCleanups.get(uuid);
-            if (notifyCleanup) {
-                notifyCleanup();
-                this.notificationCleanups.delete(uuid);
-            }
-            this.notificationTokens.delete(uuid);
-            try {
-                yield ((_c = (_b = window.desktopApi) === null || _b === void 0 ? void 0 : _b.nobleBle) === null || _c === void 0 ? void 0 : _c.unsubscribe(uuid));
-            }
-            catch (error) {
-                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[Electron BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
-            }
-            try {
-                yield ((_f = (_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) === null || _f === void 0 ? void 0 : _f.disconnect(uuid));
-            }
-            catch (error) {
-                (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug(`[Electron BLE] disconnect after Protocol ${protocol} probe failed:`, error);
-            }
-            this.connectedDevices.delete(uuid);
-            try {
-                yield ((_j = (_h = window.desktopApi) === null || _h === void 0 ? void 0 : _h.nobleBle) === null || _j === void 0 ? void 0 : _j.connect(uuid));
-                this.connectedDevices.add(uuid);
-                yield ((_l = (_k = window.desktopApi) === null || _k === void 0 ? void 0 : _k.nobleBle) === null || _l === void 0 ? void 0 : _l.subscribe(uuid));
-                yield this.refreshBlePacketCapacity(uuid);
-            }
-            catch (error) {
-                (_m = this.Log) === null || _m === void 0 ? void 0 : _m.debug(`[Electron BLE] reconnect after Protocol ${protocol} probe failed:`, error);
-                throw error;
+            if (!this.notificationCleanups.has(uuid)) {
+                const cleanup = this.createNotificationSubscription(uuid);
+                this.notificationCleanups.set(uuid, cleanup);
             }
-            const cleanup = this.createNotificationSubscription(uuid);
-            this.notificationCleanups.set(uuid, cleanup);
         });
     }
     probeProtocolV1(uuid) {
@@ -1172,6 +1257,9 @@ class ElectronBleTransport {
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
                 (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Protocol V1 GetFeatures probe failed:', error);
+                if (transport.isProtocolV2LinkDisabledError(error)) {
+                    throw error;
+                }
                 return false;
             }
         });
@@ -1194,6 +1282,7 @@ class ElectronBleTransport {
                     (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                     this.resetProtocolV2Frames(uuid);
                 },
+                shouldRethrow: error => hdShared.isBleStaleBondHardwareError(error) || transport.isProtocolV2LinkDisabledError(error),
             });
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
@@ -1208,7 +1297,16 @@ class ElectronBleTransport {
             if (!nobleBle) {
                 throw new Error('Noble BLE API not available');
             }
-            yield nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+            try {
+                yield nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+            }
+            catch (error) {
+                const staleBondError = this.toStaleBondError(error);
+                if (staleBondError) {
+                    throw staleBondError;
+                }
+                throw error;
+            }
         });
     }
     refreshBlePacketCapacity(uuid) {
@@ -1277,8 +1375,27 @@ class ElectronBleTransport {
             this.handleProtocolV2Notification(deviceId, hexData);
             return;
         }
+        const linkDisabledError = this.readProtocolV2LinkDisabledFailure(deviceId, hexData);
+        if (linkDisabledError) {
+            if (this.runPromise && this.runPromiseDeviceId === deviceId) {
+                this.runPromise.reject(linkDisabledError);
+            }
+            return;
+        }
         this.handleProtocolV1Notification(deviceId, hexData);
     }
+    readProtocolV2LinkDisabledFailure(deviceId, hexData) {
+        if (!this._messages || !this._messagesV2)
+            return undefined;
+        const assembler = this.v2Assemblers.get(deviceId);
+        if (!assembler)
+            return undefined;
+        return transport.detectProtocolV2LinkDisabledError({
+            schemas: { protocolV1: this._messages, protocolV2: this._messagesV2 },
+            assembler,
+            bytes: transport.hexToBytes(hexData),
+        });
+    }
     handleProtocolV2Notification(deviceId, hexData) {
         var _a;
         try {
@@ -1362,7 +1479,6 @@ class ElectronBleTransport {
         }
     }
     call(uuid, name, data, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
@@ -1374,15 +1490,21 @@ class ElectronBleTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            if (!transport.shouldSuppressHighVolumeCallLog(name)) {
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('transport call', transport.createTransportCallLog(name, protocol, data));
-            }
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);
             }
             return this.callProtocolV1(uuid, name, data, options);
         });
     }
+    post(uuid, name, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.deviceProtocol.get(uuid) === 'V2') {
+                yield this.protocolV2Links.sendFlowControl(uuid, () => this.createProtocolV2Adapter(uuid), name, data);
+                return;
+            }
+            yield this.callProtocolV1(uuid, name, data);
+        });
+    }
     callProtocolV1(uuid, name, data, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {