@onekeyfe/hd-transport-react-native 1.2.0-alpha.74 → 1.2.0-alpha.75

package/dist/index.js

@@ -216,6 +216,10 @@ class BleTransport {
     }
     writeWithRetry(data) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (reactNative.Platform.OS === 'ios' && this.writeCharacteristic.isWritableWithResponse) {
+                yield this.writeCharacteristic.writeWithResponse(data);
+                return;
+            }
             yield this.writeCharacteristic.writeWithoutResponse(data);
         });
     }
@@ -276,12 +280,6 @@ 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;
@@ -321,24 +319,11 @@ const ANDROID_REQUEST_MTU = 517;
 const BLE_MTU_REFRESH_RETRY_DELAY_MS = 200;
 const ANDROID_HIGH_PRIORITY_IDLE_MS = 1000;
 const getRequestedBleMtu = () => reactNative.Platform.OS === 'android' ? ANDROID_REQUEST_MTU : IOS_REQUEST_MTU;
-const BLE_NATIVE_CONNECT_TIMEOUT_MS = 3000;
 const connectOptions = {
     requestMTU: getRequestedBleMtu(),
-    timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
+    timeout: 3000,
     refreshGatt: 'OnConnected',
 };
-const fallbackConnectOptions = {
-    timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
-};
-const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
-const BLE_GATT_SETUP_TIMEOUT_MS = 10000;
-const PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = 3;
-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 isNativeOperationTimeoutError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === reactNativeBlePlx.BleErrorCode.OperationTimedOut;
 const tryToGetConfiguration = (device) => {
     if (!device || !device.serviceUUIDs)
         return null;
@@ -398,12 +383,7 @@ class ReactNativeBleTransport {
         this.runPromiseDeviceId = null;
         this.firmwareUploadWriteRecoveryIds = new Set();
         this.deviceProtocol = new Map();
-        this.probingProtocols = new Map();
-        this.writeTimeoutCounts = new Map();
-        this.connectionSetupTimeoutCounts = new Map();
         this.deviceProtocolHints = new Map();
-        this.sessionProtocols = new Map();
-        this.protocolReprobeFailures = new Map();
         this.protocolV2Assemblers = new Map();
         this.protocolV2FrameQueues = new Map();
         this.protocolV2FramePromises = new Map();
@@ -598,19 +578,19 @@ class ReactNativeBleTransport {
                 const isConnected = yield device.isConnected().catch(() => false);
                 if (!isConnected) {
                     try {
-                        device = yield this.connectWithTimeout(uuid, () => device.connect(connectOptions));
+                        device = yield device.connect(connectOptions);
                     }
                     catch (e) {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                             e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
-                            device = yield this.connectWithTimeout(uuid, () => device.connect());
+                            device = yield device.connect();
                         }
                         else if (e.errorCode !== reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
                             throw e;
                         }
                     }
                 }
-                const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, device);
+                const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(device);
                 transport.device = device;
                 transport.writeCharacteristic = writeCharacteristic;
                 transport.notifyCharacteristic = notifyCharacteristic;
@@ -747,7 +727,7 @@ class ReactNativeBleTransport {
     }
     installTransportForAcquire(uuid, device, characteristics) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsWithTimeout(uuid, device));
+            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristics(device));
             const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
             transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : undefined;
             const monitorToken = this.nextMonitorToken;
@@ -854,17 +834,14 @@ class ReactNativeBleTransport {
             if (!device) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device: ', uuid);
                 try {
-                    device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, connectOptions));
+                    device = yield 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 this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, fallbackConnectOptions));
+                        device = yield blePlxManager.connectToDevice(uuid);
                     }
                     else if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('device already connected');
@@ -880,27 +857,23 @@ 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 this.connectWithTimeout(uuid, () => disconnectedDevice.connect(connectOptions));
+                    device = yield device.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 this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
+                            device = yield device.connect();
                         }
                         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 disconnectedDevice.cancelConnection();
-                                device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
+                                yield device.cancelConnection();
+                                device = yield device.connect();
                             }
                         }
                     }
@@ -911,7 +884,7 @@ class ReactNativeBleTransport {
             }
             device = yield resolveNegotiatedMtu(device);
             const acquiredDevice = device;
-            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice);
+            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(acquiredDevice);
             const protocolHint = expectedProtocol
                 ? undefined
                 : (_b = (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
@@ -956,7 +929,7 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
                     return;
                 }
-                if (this.getActiveProtocol(uuid) === 'V2') {
+                if (this.deviceProtocol.get(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;
@@ -1007,7 +980,7 @@ class ReactNativeBleTransport {
             }
             try {
                 const data = buffer.Buffer.from(c.value, 'base64');
-                const protocol = this.getActiveProtocol(uuid);
+                const protocol = this.deviceProtocol.get(uuid);
                 if (!protocol) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor data ignored before protocol detection: ', uuid);
                     return;
@@ -1035,7 +1008,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.getActiveProtocol(uuid) === 'V2') {
+                if (this.deviceProtocol.get(uuid) === 'V2') {
                     this.rejectProtocolV2Frames(uuid, notifyError);
                 }
                 else if (this.runPromiseDeviceId === uuid) {
@@ -1093,7 +1066,6 @@ class ReactNativeBleTransport {
             }
             this.protocolV2HighVolumeLogSignatures.delete(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);
@@ -1142,19 +1114,8 @@ 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;
@@ -1175,9 +1136,6 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
-                                if (isWedgedWriteError(e)) {
-                                    throw e;
-                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1205,9 +1163,6 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
-                                if (isWedgedWriteError(e)) {
-                                    throw e;
-                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1218,8 +1173,8 @@ class ReactNativeBleTransport {
                 });
             }
             if (name === 'EmmcFileWrite') {
-                yield writeChunkedData(buffers, data => this.writeBlePacket(uuid, data, payload => transport.writeWithRetry(payload), isCurrentOwner), e => {
-                    releaseOwnershipIfCurrent();
+                yield writeChunkedData(buffers, data => transport.writeWithRetry(data), e => {
+                    this.runPromise = null;
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1235,7 +1190,7 @@ class ReactNativeBleTransport {
                     let attempt = 0;
                     while (true) {
                         try {
-                            yield this.writeBlePacket(uuid, data, payload => transport.writeWithRetry(payload), isCurrentOwner);
+                            yield transport.writeWithRetry(data);
                             return;
                         }
                         catch (error) {
@@ -1254,7 +1209,7 @@ class ReactNativeBleTransport {
                         }
                     }
                 }), e => {
-                    releaseOwnershipIfCurrent();
+                    this.runPromise = null;
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1263,16 +1218,16 @@ class ReactNativeBleTransport {
                     const outData = o.toString('base64');
                     try {
                         const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
-                        yield this.writeBlePacket(uuid, outData, payload => shouldUseWriteWithResponse
-                            ? transport.writeCharacteristic.writeWithResponse(payload)
-                            : transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
+                        if (shouldUseWriteWithResponse) {
+                            yield transport.writeCharacteristic.writeWithResponse(outData);
+                        }
+                        else {
+                            yield transport.writeCharacteristic.writeWithoutResponse(outData);
+                        }
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
-                        releaseOwnershipIfCurrent();
-                        if (isWedgedWriteError(e)) {
-                            throw e;
-                        }
+                        this.runPromise = null;
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
@@ -1312,9 +1267,7 @@ 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);
                 }
@@ -1385,10 +1338,7 @@ class ReactNativeBleTransport {
                 delete transportCache[session];
             }
             this.deviceProtocol.delete(session);
-            this.probingProtocols.delete(session);
             this.deviceProtocolHints.delete(session);
-            this.sessionProtocols.delete(session);
-            this.protocolReprobeFailures.delete(session);
             this.protocolV2Assemblers.delete(session);
             this.resetProtocolV2Frames(session);
             try {
@@ -1409,91 +1359,6 @@ 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);
-                    }),
-                ]);
-                return result;
-            }
-            catch (error) {
-                if (timedOut || isNativeOperationTimeoutError(error)) {
-                    this.abandonStalledConnection(uuid, timedOut ? 'connect-backstop' : 'connect-native');
-                }
-                throw error;
-            }
-            finally {
-                if (timer)
-                    clearTimeout(timer);
-            }
-        });
-    }
-    resolveCharacteristicsWithTimeout(uuid, device) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let timer;
-            let timedOut = false;
-            const pending = this.resolveCharacteristics(device);
-            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 GATT setup timeout after ${BLE_GATT_SETUP_TIMEOUT_MS}ms for ${uuid}`));
-                        }, BLE_GATT_SETUP_TIMEOUT_MS);
-                    }),
-                ]);
-                this.connectionSetupTimeoutCounts.delete(uuid);
-                return result;
-            }
-            catch (error) {
-                if (timedOut || isNativeOperationTimeoutError(error)) {
-                    this.abandonStalledConnection(uuid, timedOut ? 'gatt-backstop' : 'gatt-native');
-                }
-                throw error;
-            }
-            finally {
-                if (timer)
-                    clearTimeout(timer);
-            }
-        });
-    }
-    abandonStalledConnection(uuid, stage) {
-        var _a, _b;
-        const timeouts = ((_a = this.connectionSetupTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
-        this.connectionSetupTimeoutCounts.set(uuid, timeouts);
-        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE setup timed out:', uuid, {
-            stage,
-            setupTimeoutsSinceSuccess: 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 setup wedged repeatedly, resetting BLE manager');
-            this.resetPlxManager();
-            this.connectionSetupTimeoutCounts.delete(uuid);
-        }
-    }
     getCachedTransport(uuid) {
         const transport = transportCache[uuid];
         if (!transport) {
@@ -1501,82 +1366,6 @@ 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.sessionProtocols.clear();
-        this.protocolReprobeFailures.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`);
     }
@@ -1584,19 +1373,11 @@ 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);
         }
     }
-    getActiveProtocol(uuid) {
-        var _a;
-        return (_a = this.deviceProtocol.get(uuid)) !== null && _a !== void 0 ? _a : this.probingProtocols.get(uuid);
-    }
     detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (reactNative.Platform.OS === 'ios' && expectedProtocol) {
                 this.deviceProtocol.set(uuid, expectedProtocol);
@@ -1610,7 +1391,6 @@ class ReactNativeBleTransport {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
-                    this.sessionProtocols.set(uuid, 'V1');
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol: 'V1',
@@ -1623,7 +1403,6 @@ class ReactNativeBleTransport {
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
                     this.deviceProtocol.set(uuid, 'V2');
-                    this.sessionProtocols.set(uuid, 'V2');
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol: 'V2',
@@ -1633,13 +1412,7 @@ class ReactNativeBleTransport {
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
-            const sessionProtocol = this.sessionProtocols.get(uuid);
-            const reprobeFailures = (_a = this.protocolReprobeFailures.get(uuid)) !== null && _a !== void 0 ? _a : 0;
-            const fullProbeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
-            const trustSessionProtocol = sessionProtocol !== undefined &&
-                !protocolHint &&
-                reprobeFailures < PROTOCOL_REPROBE_FALLBACK_ATTEMPTS;
-            const probeOrder = trustSessionProtocol ? [sessionProtocol] : fullProbeOrder;
+            const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
             for (let i = 0; i < probeOrder.length; i += 1) {
                 const protocol = probeOrder[i];
                 if (i > 0) {
@@ -1654,8 +1427,6 @@ class ReactNativeBleTransport {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
                 if (detected) {
                     this.deviceProtocol.set(uuid, protocol);
-                    this.sessionProtocols.set(uuid, protocol);
-                    this.protocolReprobeFailures.delete(uuid);
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol,
@@ -1664,14 +1435,7 @@ class ReactNativeBleTransport {
                     return protocol;
                 }
             }
-            if (trustSessionProtocol) {
-                this.protocolReprobeFailures.set(uuid, reprobeFailures + 1);
-            }
-            else {
-                this.protocolReprobeFailures.delete(uuid);
-            }
             this.deviceProtocol.delete(uuid);
-            this.probingProtocols.delete(uuid);
             throw this.createProtocolDetectionError();
         });
     }
@@ -1723,17 +1487,13 @@ class ReactNativeBleTransport {
                 return false;
             }
             try {
-                this.probingProtocols.set(uuid, 'V1');
+                this.deviceProtocol.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;
             }
         });
@@ -1744,7 +1504,7 @@ class ReactNativeBleTransport {
             if (!this._messages || !this._messagesV2) {
                 return false;
             }
-            this.probingProtocols.set(uuid, 'V2');
+            this.deviceProtocol.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),
@@ -1760,9 +1520,6 @@ class ReactNativeBleTransport {
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
             }
-            else {
-                this.probingProtocols.delete(uuid);
-            }
             return detected;
         });
     }
@@ -1834,7 +1591,7 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Packet(uuid, transport, base64, context, assertCurrentGeneration) {
+    writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
             const shouldUseWriteWithResponse = shouldWriteProtocolV2WithResponse({
                 platform: reactNative.Platform.OS,
@@ -1849,17 +1606,12 @@ class ReactNativeBleTransport {
                     throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
                 }
                 try {
-                    yield this.writeBlePacket(uuid, base64, payload => shouldUseWriteWithResponse
-                        ? transport.writeCharacteristic.writeWithResponse(payload)
-                        : transport.writeCharacteristic.writeWithoutResponse(payload), () => {
-                        try {
-                            assertCurrentGeneration();
-                            return !context.signal.aborted;
-                        }
-                        catch (_a) {
-                            return false;
-                        }
-                    });
+                    if (shouldUseWriteWithResponse) {
+                        yield transport.writeCharacteristic.writeWithResponse(base64);
+                    }
+                    else {
+                        yield transport.writeCharacteristic.writeWithoutResponse(base64);
+                    }
                     assertCurrentGeneration();
                     return;
                 }
@@ -1880,7 +1632,7 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Frame(uuid, transport$1, frame, context, assertCurrentGeneration) {
+    writeProtocolV2Frame(transport$1, frame, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
             const tuning = getProtocolV2BleTuning();
             const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1896,7 +1648,7 @@ class ReactNativeBleTransport {
                 signal: context.signal,
                 abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
                 wait: delay,
-                writePacket: packet => this.writeProtocolV2Packet(uuid, transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
+                writePacket: packet => this.writeProtocolV2Packet(transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
             });
         });
     }
@@ -2050,7 +1802,7 @@ class ReactNativeBleTransport {
             writeFrame: (frame, context) => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
                 const currentTransport = this.getCachedTransport(uuid);
-                yield this.writeProtocolV2Frame(uuid, currentTransport, frame, context, assertCurrentGeneration);
+                yield this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
             }),
             readFrame: () => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
@@ -2071,16 +1823,10 @@ class ReactNativeBleTransport {
         };
     }
     getProtocolType(path) {
-        return this.getActiveProtocol(path);
+        return this.deviceProtocol.get(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_GATT_SETUP_TIMEOUT_MS = BLE_GATT_SETUP_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.PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = PROTOCOL_REPROBE_FALLBACK_ATTEMPTS;
 exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
 exports["default"] = ReactNativeBleTransport;
 exports.getFirmwareUploadWriteRetryType = getFirmwareUploadWriteRetryType;

package/jest.config.js

@@ -2,9 +2,4 @@ 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',
-  },
 };