@onekeyfe/hd-transport-react-native 1.2.0-alpha.56 → 1.2.0-alpha.62

package/dist/index.js

@@ -210,7 +210,7 @@ class BleTransport {
     }
     writeWithRetry(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.writeCharacteristic.writeWithResponse(data);
+            yield this.writeCharacteristic.writeWithoutResponse(data);
         });
     }
 }
@@ -222,7 +222,6 @@ const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 :
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = reactNative.Platform.OS === 'ios' ? 8 : 10;
 const FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS = reactNative.Platform.OS === 'ios' ? 24 : 30;
 const FIRMWARE_UPLOAD_WRITE_MAX_RETRIES = 8;
-const IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS = 5;
 const ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH = 192;
 const FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH;
 const ANDROID_GATT_CONGESTED_STATUS = 143;
@@ -245,6 +244,12 @@ const getFirmwareUploadWriteRetryType = (error) => {
 const resolveFirmwareUploadRetryDelay = (attempt, baseDelayMs = 200, maxDelayMs = 1200) => Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10000;
+const BLE_WRITE_PACKET_TIMEOUT_MS = 10000;
+const WEDGED_WRITE_MESSAGE = 'BLE write timeout after';
+const isWedgedWriteError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleWriteCharacteristicError &&
+    typeof (error === null || error === void 0 ? void 0 : error.message) === 'string' &&
+    error.message.startsWith(WEDGED_WRITE_MESSAGE);
+const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const DEVICE_SCAN_TIMEOUT_MS = 3000;
 const IOS_NOTIFY_READY_DELAY_MS = 150;
 const ANDROID_NOTIFY_READY_DELAY_MS = 300;
@@ -280,11 +285,21 @@ function getDeviceDisplayName(device) {
     return (device === null || device === void 0 ? void 0 : device.name) || (device === null || device === void 0 ? void 0 : device.localName) || null;
 }
 const ANDROID_REQUEST_MTU = 256;
+const BLE_NATIVE_CONNECT_TIMEOUT_MS = 3000;
 const connectOptions = {
     requestMTU: ANDROID_REQUEST_MTU,
-    timeout: 3000,
+    timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
     refreshGatt: 'OnConnected',
 };
+const fallbackConnectOptions = {
+    timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
+};
+const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
+const BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
+const CONNECT_TIMEOUT_MESSAGE = 'BLE connect timeout after';
+const isConnectTimeoutError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleConnectedError &&
+    typeof (error === null || error === void 0 ? void 0 : error.message) === 'string' &&
+    error.message.startsWith(CONNECT_TIMEOUT_MESSAGE);
 const tryToGetConfiguration = (device) => {
     if (!device || !device.serviceUUIDs)
         return null;
@@ -342,6 +357,9 @@ class ReactNativeBleTransport {
         this.runPromiseDeviceId = null;
         this.firmwareUploadWriteRecoveryIds = new Set();
         this.deviceProtocol = new Map();
+        this.probingProtocols = new Map();
+        this.writeTimeoutCounts = new Map();
+        this.connectTimeoutCounts = new Map();
         this.deviceProtocolHints = new Map();
         this.protocolV2Assemblers = new Map();
         this.protocolV2FrameQueues = new Map();
@@ -534,12 +552,12 @@ class ReactNativeBleTransport {
                 const isConnected = yield device.isConnected().catch(() => false);
                 if (!isConnected) {
                     try {
-                        device = yield device.connect(connectOptions);
+                        device = yield this.connectWithTimeout(uuid, () => device.connect(connectOptions));
                     }
                     catch (e) {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                             e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
-                            device = yield device.connect();
+                            device = yield this.connectWithTimeout(uuid, () => device.connect());
                         }
                         else if (e.errorCode !== reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
                             throw e;
@@ -615,17 +633,12 @@ class ReactNativeBleTransport {
                         return;
                     }
                     const displayName = getDeviceDisplayName(device);
-                    const isUnnamedIOSPeripheral = reactNative.Platform.OS === 'ios' && !(displayName === null || displayName === void 0 ? void 0 : displayName.trim());
-                    const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.name) ||
-                        hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.localName);
-                    const isOneKey = !isUnnamedIOSPeripheral &&
-                        !isFindMyPeripheral &&
-                        hdShared.isOnekeyBluetoothDevice({
-                            id: device === null || device === void 0 ? void 0 : device.id,
-                            name: device === null || device === void 0 ? void 0 : device.name,
-                            localName: device === null || device === void 0 ? void 0 : device.localName,
-                            serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
-                        });
+                    const isOneKey = hdShared.isOnekeyBluetoothDevice({
+                        id: device === null || device === void 0 ? void 0 : device.id,
+                        name: device === null || device === void 0 ? void 0 : device.name,
+                        localName: device === null || device === void 0 ? void 0 : device.localName,
+                        serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
+                    });
                     if (isOneKey) {
                         addDevice(device);
                     }
@@ -643,15 +656,12 @@ class ReactNativeBleTransport {
                         const localName = 'localName' in device && typeof device.localName === 'string'
                             ? device.localName
                             : null;
-                        const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device.name) ||
-                            hdShared.isPro2FindMyAdvertisementName(localName);
-                        if (!isFindMyPeripheral &&
-                            hdShared.isOnekeyBluetoothDevice({
-                                id: device.id,
-                                name: device.name,
-                                localName,
-                                serviceUuids: device.serviceUUIDs,
-                            })) {
+                        if (hdShared.isOnekeyBluetoothDevice({
+                            id: device.id,
+                            name: device.name,
+                            localName,
+                            serviceUuids: device.serviceUUIDs,
+                        })) {
                             Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
                             addDevice(device);
                         }
@@ -766,14 +776,17 @@ class ReactNativeBleTransport {
             if (!device) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device: ', uuid);
                 try {
-                    device = yield blePlxManager.connectToDevice(uuid, connectOptions);
+                    device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, connectOptions));
                 }
                 catch (e) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device has error: ', e);
+                    if (isConnectTimeoutError(e)) {
+                        throw e;
+                    }
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('first try to reconnect without params');
-                        device = yield blePlxManager.connectToDevice(uuid);
+                        device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, fallbackConnectOptions));
                     }
                     else if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('device already connected');
@@ -789,23 +802,27 @@ class ReactNativeBleTransport {
             }
             if (!(yield device.isConnected())) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('not connected, try to connect to device: ', uuid);
+                const disconnectedDevice = device;
                 try {
-                    device = yield device.connect(connectOptions);
+                    device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(connectOptions));
                 }
                 catch (e) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('not connected, try to connect to device has error: ', e);
+                    if (isConnectTimeoutError(e)) {
+                        throw e;
+                    }
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('second try to reconnect without params');
                         try {
-                            device = yield device.connect();
+                            device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
                         }
                         catch (e) {
                             Log === null || Log === void 0 ? void 0 : Log.debug('last try to reconnect error: ', e);
                             if (e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                                 Log === null || Log === void 0 ? void 0 : Log.debug('last try to reconnect');
-                                yield device.cancelConnection();
-                                device = yield device.connect();
+                                yield disconnectedDevice.cancelConnection();
+                                device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
                             }
                         }
                     }
@@ -861,7 +878,7 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
                     return;
                 }
-                if (this.deviceProtocol.get(uuid) === 'V2') {
+                if (this.getActiveProtocol(uuid) === 'V2') {
                     let errorCode = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
                     if ((_a = error.reason) === null || _a === void 0 ? void 0 : _a.includes('The connection has timed out unexpectedly')) {
                         errorCode = hdShared.HardwareErrorCode.BleTimeoutError;
@@ -912,7 +929,7 @@ class ReactNativeBleTransport {
             }
             try {
                 const data = buffer.Buffer.from(c.value, 'base64');
-                const protocol = this.deviceProtocol.get(uuid);
+                const protocol = this.getActiveProtocol(uuid);
                 if (!protocol) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor data ignored before protocol detection: ', uuid);
                     return;
@@ -940,7 +957,7 @@ class ReactNativeBleTransport {
             catch (error) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('monitor data error: ', error);
                 const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
-                if (this.deviceProtocol.get(uuid) === 'V2') {
+                if (this.getActiveProtocol(uuid) === 'V2') {
                     this.rejectProtocolV2Frames(uuid, notifyError);
                 }
                 else if (this.runPromiseDeviceId === uuid) {
@@ -996,6 +1013,7 @@ class ReactNativeBleTransport {
                 delete transportCache[uuid];
             }
             this.deviceProtocol.delete(uuid);
+            this.probingProtocols.delete(uuid);
             (_f = this.protocolV2Assemblers.get(uuid)) === null || _f === void 0 ? void 0 : _f.reset();
             this.protocolV2Assemblers.delete(uuid);
             this.resetProtocolV2Frames(uuid);
@@ -1044,8 +1062,19 @@ class ReactNativeBleTransport {
             const transport = this.getCachedTransport(uuid);
             const runPromise = hdShared.createDeferred();
             runPromise.promise.catch(() => undefined);
+            const supersededRunPromise = this.runPromise;
+            if (supersededRunPromise) {
+                supersededRunPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise));
+            }
             this.runPromise = runPromise;
             this.runPromiseDeviceId = uuid;
+            const releaseOwnershipIfCurrent = () => {
+                if (this.runPromise === runPromise) {
+                    this.runPromise = null;
+                    this.runPromiseDeviceId = null;
+                }
+            };
+            const isCurrentOwner = () => this.runPromise === runPromise;
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
             let timeout;
@@ -1066,6 +1095,9 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
+                                if (isWedgedWriteError(e)) {
+                                    throw e;
+                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1093,6 +1125,9 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
+                                if (isWedgedWriteError(e)) {
+                                    throw e;
+                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1103,8 +1138,8 @@ class ReactNativeBleTransport {
                 });
             }
             if (name === 'EmmcFileWrite') {
-                yield writeChunkedData(buffers, data => transport.writeWithRetry(data), e => {
-                    this.runPromise = null;
+                yield writeChunkedData(buffers, data => this.writeBlePacket(uuid, data, payload => transport.writeWithRetry(payload), isCurrentOwner), e => {
+                    releaseOwnershipIfCurrent();
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1120,7 +1155,7 @@ class ReactNativeBleTransport {
                     let attempt = 0;
                     while (true) {
                         try {
-                            yield transport.writeCharacteristic.writeWithResponse(data);
+                            yield this.writeBlePacket(uuid, data, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
                             return;
                         }
                         catch (error) {
@@ -1139,7 +1174,7 @@ class ReactNativeBleTransport {
                         }
                     }
                 }), e => {
-                    this.runPromise = null;
+                    releaseOwnershipIfCurrent();
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1147,17 +1182,14 @@ class ReactNativeBleTransport {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
                     try {
-                        const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
-                        if (shouldUseWriteWithResponse) {
-                            yield transport.writeCharacteristic.writeWithResponse(outData);
-                        }
-                        else {
-                            yield transport.writeCharacteristic.writeWithoutResponse(outData);
-                        }
+                        yield this.writeBlePacket(uuid, outData, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
-                        this.runPromise = null;
+                        releaseOwnershipIfCurrent();
+                        if (isWedgedWriteError(e)) {
+                            throw e;
+                        }
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
@@ -1197,7 +1229,9 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.error('call error: ', e);
                 }
                 const isProbeTimeout = name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS;
+                const isStaleCall = this.runPromise !== runPromise;
                 if (!isProbeTimeout &&
+                    !isStaleCall &&
                     (e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError) {
                     yield this.disconnect(uuid);
                 }
@@ -1268,6 +1302,7 @@ class ReactNativeBleTransport {
                 delete transportCache[session];
             }
             this.deviceProtocol.delete(session);
+            this.probingProtocols.delete(session);
             this.deviceProtocolHints.delete(session);
             this.protocolV2Assemblers.delete(session);
             this.resetProtocolV2Frames(session);
@@ -1289,6 +1324,60 @@ class ReactNativeBleTransport {
         this.runPromise = null;
         this.runPromiseDeviceId = null;
     }
+    connectWithTimeout(uuid, connect) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let timer;
+            let timedOut = false;
+            const pending = connect();
+            pending.catch(() => undefined);
+            try {
+                const result = yield Promise.race([
+                    pending,
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => {
+                            timedOut = true;
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `BLE connect timeout after ${BLE_CONNECT_TIMEOUT_MS}ms for ${uuid}`));
+                        }, BLE_CONNECT_TIMEOUT_MS);
+                    }),
+                ]);
+                this.connectTimeoutCounts.delete(uuid);
+                return result;
+            }
+            catch (error) {
+                if (timedOut) {
+                    this.abandonStalledConnect(uuid);
+                }
+                throw error;
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+            }
+        });
+    }
+    abandonStalledConnect(uuid) {
+        var _a, _b;
+        const timeouts = ((_a = this.connectTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.connectTimeoutCounts.set(uuid, timeouts);
+        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE connect timed out:', uuid, {
+            consecutiveConnectTimeouts: timeouts,
+        });
+        (_b = this.blePlxManager) === null || _b === void 0 ? void 0 : _b.cancelDeviceConnection(uuid).catch(() => {
+        });
+        const stalled = transportCache[uuid];
+        if (stalled) {
+            delete transportCache[uuid];
+        }
+        this.deviceProtocol.delete(uuid);
+        this.probingProtocols.delete(uuid);
+        this.protocolV2Assemblers.delete(uuid);
+        this.resetProtocolV2Frames(uuid);
+        if (timeouts >= BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD) {
+            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE connects wedged repeatedly, resetting BLE manager');
+            this.resetPlxManager();
+            this.connectTimeoutCounts.delete(uuid);
+        }
+    }
     getCachedTransport(uuid) {
         const transport = transportCache[uuid];
         if (!transport) {
@@ -1296,6 +1385,80 @@ class ReactNativeBleTransport {
         }
         return transport;
     }
+    writeBlePacket(uuid, data, write, isCurrentOwner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let timer;
+            let timedOut = false;
+            try {
+                yield Promise.race([
+                    write(data),
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => {
+                            timedOut = true;
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError, `BLE write timeout after ${BLE_WRITE_PACKET_TIMEOUT_MS}ms`));
+                        }, BLE_WRITE_PACKET_TIMEOUT_MS);
+                    }),
+                ]);
+                this.writeTimeoutCounts.delete(uuid);
+            }
+            catch (error) {
+                if (timedOut) {
+                    if (isCurrentOwner && !isCurrentOwner()) {
+                        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] stale BLE write timed out, link kept:', uuid);
+                    }
+                    else {
+                        this.tearDownWedgedLink(uuid);
+                    }
+                }
+                throw error;
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+            }
+        });
+    }
+    tearDownWedgedLink(uuid) {
+        var _a;
+        const timeouts = ((_a = this.writeTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.writeTimeoutCounts.set(uuid, timeouts);
+        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE write timed out, tearing down link:', uuid, {
+            consecutiveWriteTimeouts: timeouts,
+        });
+        const wedged = transportCache[uuid];
+        this.disconnect(uuid).catch(error => {
+            Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] wedged link teardown failed (ignored):', error);
+        });
+        if (wedged && transportCache[uuid] === wedged) {
+            delete transportCache[uuid];
+        }
+        this.deviceProtocol.delete(uuid);
+        this.probingProtocols.delete(uuid);
+        this.protocolV2Assemblers.delete(uuid);
+        this.resetProtocolV2Frames(uuid);
+        if (timeouts >= BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD) {
+            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE writes wedged repeatedly, resetting BLE manager');
+            this.resetPlxManager();
+            this.writeTimeoutCounts.delete(uuid);
+        }
+    }
+    resetPlxManager() {
+        const manager = this.blePlxManager;
+        this.blePlxManager = undefined;
+        Object.keys(transportCache).forEach(key => {
+            delete transportCache[key];
+        });
+        this.deviceProtocol.clear();
+        this.probingProtocols.clear();
+        this.monitorTokens.clear();
+        this.protocolV2Assemblers.clear();
+        try {
+            manager === null || manager === void 0 ? void 0 : manager.destroy();
+        }
+        catch (error) {
+            Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE manager destroy failed (ignored):', error);
+        }
+    }
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
@@ -1303,30 +1466,19 @@ class ReactNativeBleTransport {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping');
     }
     clearProbeProtocol(uuid, protocol) {
+        if (this.probingProtocols.get(uuid) === protocol) {
+            this.probingProtocols.delete(uuid);
+        }
         if (this.deviceProtocol.get(uuid) === protocol) {
             this.deviceProtocol.delete(uuid);
         }
     }
-    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
+    getActiveProtocol(uuid) {
         var _a;
+        return (_a = this.deviceProtocol.get(uuid)) !== null && _a !== void 0 ? _a : this.probingProtocols.get(uuid);
+    }
+    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (reactNative.Platform.OS === 'ios') {
-                const protocol = (_a = expectedProtocol !== null && expectedProtocol !== void 0 ? expectedProtocol : protocolHint) !== null && _a !== void 0 ? _a : 'V1';
-                let source = 'ios-legacy-default';
-                if (expectedProtocol) {
-                    source = 'expected';
-                }
-                else if (protocolHint) {
-                    source = 'hint';
-                }
-                this.deviceProtocol.set(uuid, protocol);
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol selected', {
-                    deviceId: uuid,
-                    protocol,
-                    source,
-                });
-                return protocol;
-            }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
@@ -1375,6 +1527,7 @@ class ReactNativeBleTransport {
                 }
             }
             this.deviceProtocol.delete(uuid);
+            this.probingProtocols.delete(uuid);
             throw this.createProtocolDetectionError();
         });
     }
@@ -1426,13 +1579,17 @@ class ReactNativeBleTransport {
                 return false;
             }
             try {
-                this.deviceProtocol.set(uuid, 'V1');
+                this.probingProtocols.set(uuid, 'V1');
                 yield this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+                this.probingProtocols.delete(uuid);
                 return true;
             }
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe failed:', error);
+                if (isWedgedWriteError(error)) {
+                    throw error;
+                }
                 return false;
             }
         });
@@ -1443,7 +1600,7 @@ class ReactNativeBleTransport {
             if (!this._messages || !this._messagesV2) {
                 return false;
             }
-            this.deviceProtocol.set(uuid, 'V2');
+            this.probingProtocols.set(uuid, 'V2');
             (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
             const detected = yield transport.probeProtocolV2({
                 call: (name, data, options) => this.callProtocolV2(uuid, name, data, options),
@@ -1459,6 +1616,9 @@ class ReactNativeBleTransport {
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
             }
+            else {
+                this.probingProtocols.delete(uuid);
+            }
             return detected;
         });
     }
@@ -1530,10 +1690,8 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration) {
+    writeProtocolV2Packet(uuid, transport, base64, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
-            const shouldUseWriteWithResponse = transport.writeCharacteristic.isWritableWithResponse &&
-                (context.writeWithResponse === true || (reactNative.Platform.OS === 'ios' && !context.highVolume));
             let attempt = 0;
             for (;;) {
                 assertCurrentGeneration();
@@ -1541,12 +1699,15 @@ class ReactNativeBleTransport {
                     throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
                 }
                 try {
-                    if (shouldUseWriteWithResponse) {
-                        yield transport.writeCharacteristic.writeWithResponse(base64);
-                    }
-                    else {
-                        yield transport.writeCharacteristic.writeWithoutResponse(base64);
-                    }
+                    yield this.writeBlePacket(uuid, base64, payload => transport.writeCharacteristic.writeWithoutResponse(payload), () => {
+                        try {
+                            assertCurrentGeneration();
+                            return !context.signal.aborted;
+                        }
+                        catch (_a) {
+                            return false;
+                        }
+                    });
                     assertCurrentGeneration();
                     return;
                 }
@@ -1567,7 +1728,7 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Frame(transport$1, frame, context, assertCurrentGeneration) {
+    writeProtocolV2Frame(uuid, transport$1, frame, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
             const tuning = getProtocolV2BleTuning();
             const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1576,21 +1737,17 @@ class ReactNativeBleTransport {
                 androidPacketLength: tuning.androidPacketLength,
                 mtu: reactNative.Platform.OS === 'android' ? transport$1.mtuSize : undefined,
             });
-            const initialDelayMs = reactNative.Platform.OS === 'ios' && !context.highVolume && frame.length <= packetCapacity
-                ? IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS
-                : 0;
             yield transport.writeProtocolV2BleFrame({
                 frame,
                 packetCapacity,
                 assertActive: assertCurrentGeneration,
                 signal: context.signal,
                 abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
-                initialDelayMs,
                 burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
                 burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
                 flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
                 wait: delay,
-                writePacket: packet => this.writeProtocolV2Packet(transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
+                writePacket: packet => this.writeProtocolV2Packet(uuid, transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
             });
         });
     }
@@ -1605,7 +1762,7 @@ class ReactNativeBleTransport {
                 const tuning = getProtocolV2BleTuning();
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 high-volume write configured', {
                     name,
-                    writeMode: (options === null || options === void 0 ? void 0 : options.writeWithResponse) ? 'withResponse' : 'withoutResponse',
+                    writeMode: 'withoutResponse',
                     packetCapacity: reactNative.Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
                 });
             }
@@ -1639,7 +1796,7 @@ class ReactNativeBleTransport {
             writeFrame: (frame, context) => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
                 const currentTransport = this.getCachedTransport(uuid);
-                yield this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
+                yield this.writeProtocolV2Frame(uuid, currentTransport, frame, context, assertCurrentGeneration);
             }),
             readFrame: () => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
@@ -1660,10 +1817,14 @@ class ReactNativeBleTransport {
         };
     }
     getProtocolType(path) {
-        return this.deviceProtocol.get(path);
+        return this.getActiveProtocol(path);
     }
 }
 
+exports.BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD;
+exports.BLE_CONNECT_TIMEOUT_MS = BLE_CONNECT_TIMEOUT_MS;
+exports.BLE_WRITE_PACKET_TIMEOUT_MS = BLE_WRITE_PACKET_TIMEOUT_MS;
+exports.BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD;
 exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
 exports["default"] = ReactNativeBleTransport;
 exports.getFirmwareUploadWriteRetryType = getFirmwareUploadWriteRetryType;

package/jest.config.js

@@ -2,4 +2,9 @@ module.exports = {
   preset: '../../jest.config.js',
   testEnvironment: 'node',
   modulePathIgnorePatterns: ['node_modules', '<rootDir>/dist'],
+  moduleNameMapper: {
+    // The workspace symlinks resolve to prebuilt dist outputs that can lag behind src.
+    '^@onekeyfe/hd-transport$': '<rootDir>/../hd-transport/src/index.ts',
+    '^@onekeyfe/hd-shared$': '<rootDir>/../shared/src/index.ts',
+  },
 };