@onekeyfe/hd-transport-react-native 1.2.0-alpha.33 → 1.2.0-alpha.35

package/dist/index.js

@@ -95,7 +95,6 @@ const IOS_PACKET_LENGTH = 128;
 const ANDROID_PACKET_LENGTH = 192;
 const ANDROID_DEFAULT_MTU = 23;
 const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
-const Pro2ServiceUUID = 'fffd';
 const OneKeyServices = {
     classic: {
         [ClassicServiceUUID]: {
@@ -103,11 +102,6 @@ const OneKeyServices = {
             writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
             notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
         },
-        [Pro2ServiceUUID]: {
-            serviceUuid: Pro2ServiceUUID,
-            writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
-            notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
-        },
     },
 };
 const bluetoothServices = [];
@@ -124,22 +118,17 @@ const getInfosForServiceUuid = (serviceUuid, deviceType) => {
     }
     const normalizedServiceUuid = normalizeBleUuid(serviceUuid);
     const service = (_a = services[serviceUuid]) !== null && _a !== void 0 ? _a : Object.values(services).find(item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid ||
-        getBleUuidKey(item.serviceUuid) === getBleUuidKey(serviceUuid));
+        hdShared.matchesKnownBleUuid(serviceUuid, hdShared.createKnownBleUuidAliases(item.serviceUuid)));
     if (!service) {
         return null;
     }
     return service;
 };
 const normalizeBleUuid = (uuid) => (uuid !== null && uuid !== void 0 ? uuid : '').replace(/-/g, '').toLowerCase();
-const getBleUuidKey = (uuid) => {
-    const normalized = normalizeBleUuid(uuid);
-    return normalized.length >= 8 ? normalized.substring(4, 8) : normalized;
-};
 const isSameBleUuid = (left, right) => {
-    const normalizedLeft = normalizeBleUuid(left);
-    const normalizedRight = normalizeBleUuid(right);
-    return (normalizedLeft === normalizedRight ||
-        (getBleUuidKey(left) !== '' && getBleUuidKey(left) === getBleUuidKey(right)));
+    if (!left || !right)
+        return false;
+    return hdShared.matchesKnownBleUuid(left, hdShared.createKnownBleUuidAliases(right));
 };
 
 function hasWritableCapability(characteristic) {
@@ -210,7 +199,6 @@ const isHeaderChunk = (chunk) => {
     return false;
 };
 
-const Log$1 = bleLogger;
 class BleTransport {
     constructor(device, writeCharacteristic, notifyCharacteristic) {
         this.name = 'ReactNativeBleTransport';
@@ -220,49 +208,12 @@ class BleTransport {
         this.writeCharacteristic = writeCharacteristic;
         this.notifyCharacteristic = notifyCharacteristic;
     }
-    writeWithRetry(data, retryCount = BleTransport.MAX_RETRIES) {
+    writeWithRetry(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.writeCharacteristic.writeWithoutResponse(data);
-            }
-            catch (error) {
-                Log$1 === null || Log$1 === void 0 ? void 0 : Log$1.debug(`Write retry attempt ${BleTransport.MAX_RETRIES - retryCount + 1}, error: ${error}`);
-                if (retryCount > 0) {
-                    yield hdShared.wait(BleTransport.RETRY_DELAY);
-                    if (error.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected ||
-                        error.errorCode === reactNativeBlePlx.BleErrorCode.CharacteristicNotFound) {
-                        try {
-                            yield this.device.connect();
-                            yield this.device.discoverAllServicesAndCharacteristics();
-                        }
-                        catch (e) {
-                            Log$1 === null || Log$1 === void 0 ? void 0 : Log$1.debug(`Connect or discoverAllServicesAndCharacteristics error: ${e}`);
-                        }
-                    }
-                    else {
-                        Log$1 === null || Log$1 === void 0 ? void 0 : Log$1.debug(`writeCharacteristic error: ${error}`);
-                    }
-                    return this.writeWithRetry(data, retryCount - 1);
-                }
-                throw error;
-            }
+            yield this.writeCharacteristic.writeWithoutResponse(data);
         });
     }
 }
-BleTransport.MAX_RETRIES = 5;
-BleTransport.RETRY_DELAY = 2000;
-
-function createTransportCallLog(name, protocol, data) {
-    if (name === 'ResourceUpdate' || name === 'ResourceAck') {
-        return {
-            name,
-            protocol,
-            file_name: data.file_name,
-            hash: data.hash,
-        };
-    }
-    return { name, protocol };
-}
 
 const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 const Log = bleLogger;
@@ -271,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 FIRMWARE_UPLOAD_RECONNECT_RETRY_DELAY_MS = 2000;
 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;
@@ -282,10 +232,6 @@ const getFirmwareUploadWriteRetryType = (error) => {
     if (!error || typeof error !== 'object')
         return null;
     const bleWriteError = error;
-    if (bleWriteError.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected ||
-        bleWriteError.errorCode === reactNativeBlePlx.BleErrorCode.CharacteristicNotFound) {
-        return 'reconnectable';
-    }
     if (bleWriteError.androidErrorCode === ANDROID_GATT_CONGESTED_STATUS ||
         bleWriteError.status === ANDROID_GATT_CONGESTED_STATUS) {
         return 'congested';
@@ -332,13 +278,6 @@ function inferProtocolHintFromDeviceName(name) {
 function getDeviceDisplayName(device) {
     return (device === null || device === void 0 ? void 0 : device.name) || (device === null || device === void 0 ? void 0 : device.localName) || null;
 }
-function isGenericBleService(uuid) {
-    return ['1800', '1801', '180a'].includes(getBleUuidKey(uuid));
-}
-function hasKnownOneKeyService(device) {
-    var _a;
-    return ((_a = device === null || device === void 0 ? void 0 : device.serviceUUIDs) !== null && _a !== void 0 ? _a : []).some(serviceUuid => getInfosForServiceUuid(serviceUuid, 'classic'));
-}
 const ANDROID_REQUEST_MTU = 256;
 const connectOptions = {
     requestMTU: ANDROID_REQUEST_MTU,
@@ -399,6 +338,7 @@ class ReactNativeBleTransport {
         this.stopped = false;
         this.scanTimeout = DEVICE_SCAN_TIMEOUT_MS;
         this.runPromise = null;
+        this.runPromiseDeviceId = null;
         this.firmwareUploadWriteRecoveryIds = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
@@ -463,7 +403,6 @@ class ReactNativeBleTransport {
         return Promise.resolve(this.blePlxManager);
     }
     resolveCharacteristics(device) {
-        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             yield device.discoverAllServicesAndCharacteristics();
             let infos = tryToGetConfiguration(device);
@@ -480,19 +419,11 @@ class ReactNativeBleTransport {
                     }
                 }
             }
-            let fallbackServiceUuid;
             if (!infos) {
                 const services = yield device.services();
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Known OneKey service UUID not found, discovered services:', services === null || services === void 0 ? void 0 : services.map(service => service.uuid));
-                const knownService = services.find(service => getInfosForServiceUuid(service.uuid, 'classic'));
-                const fallbackService = (_a = knownService !== null && knownService !== void 0 ? knownService : services.find(service => !isGenericBleService(service.uuid))) !== null && _a !== void 0 ? _a : services[0];
-                if (fallbackService) {
-                    fallbackServiceUuid = fallbackService.uuid;
-                    characteristics = yield device.characteristicsForService(fallbackService.uuid);
-                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Using fallback BLE service:', fallbackService.uuid);
-                }
             }
-            if (!infos && !fallbackServiceUuid) {
+            if (!infos) {
                 try {
                     Log === null || Log === void 0 ? void 0 : Log.debug('cancel connection when service not found');
                     yield device.cancelConnection();
@@ -502,9 +433,7 @@ class ReactNativeBleTransport {
                 }
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
-            const serviceUuid = (_b = infos === null || infos === void 0 ? void 0 : infos.serviceUuid) !== null && _b !== void 0 ? _b : fallbackServiceUuid;
-            const writeUuid = (_c = infos === null || infos === void 0 ? void 0 : infos.writeUuid) !== null && _c !== void 0 ? _c : '00000002-0000-1000-8000-00805f9b34fb';
-            const notifyUuid = (_d = infos === null || infos === void 0 ? void 0 : infos.notifyUuid) !== null && _d !== void 0 ? _d : '00000003-0000-1000-8000-00805f9b34fb';
+            const { serviceUuid, writeUuid, notifyUuid } = infos;
             if (!serviceUuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
@@ -562,10 +491,9 @@ class ReactNativeBleTransport {
             try {
                 Log === null || Log === void 0 ? void 0 : Log.debug('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
                 this.emitDeviceDisconnect(uuid, device === null || device === void 0 ? void 0 : device.name, monitorToken);
-                if (this.runPromise) {
+                if (this.runPromise && this.runPromiseDeviceId === uuid) {
                     const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError);
                     this.runPromise.reject(error);
-                    this.rejectAllProtocolV2Frames(error);
                 }
             }
             catch (e) {
@@ -665,7 +593,7 @@ class ReactNativeBleTransport {
                     allowDuplicates: true,
                     scanMode: reactNativeBlePlx.ScanMode.LowLatency,
                 }, (error, device) => {
-                    var _a, _b, _c;
+                    var _a;
                     if (error) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('ble scan error: ', error);
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
@@ -686,9 +614,12 @@ class ReactNativeBleTransport {
                         return;
                     }
                     const displayName = getDeviceDisplayName(device);
-                    const isOneKey = hdShared.isOnekeyDevice((_b = device === null || device === void 0 ? void 0 : device.name) !== null && _b !== void 0 ? _b : null, device === null || device === void 0 ? void 0 : device.id) ||
-                        hdShared.isOnekeyDevice((_c = device === null || device === void 0 ? void 0 : device.localName) !== null && _c !== void 0 ? _c : null, device === null || device === void 0 ? void 0 : device.id) ||
-                        hasKnownOneKeyService(device);
+                    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);
                     }
@@ -703,10 +634,15 @@ class ReactNativeBleTransport {
                 });
                 getConnectedDeviceIds(reactNative.Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(devices => {
                     for (const device of devices) {
-                        const { serviceUUIDs } = device;
-                        const hasCachedServiceUuid = Boolean(serviceUUIDs === null || serviceUUIDs === void 0 ? void 0 : serviceUUIDs.length);
-                        const keepDevice = reactNative.Platform.OS === 'ios' || hasCachedServiceUuid;
-                        if (keepDevice) {
+                        const localName = 'localName' in device && typeof device.localName === 'string'
+                            ? device.localName
+                            : null;
+                        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);
                         }
@@ -736,8 +672,35 @@ 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.resolveCharacteristics(device));
+            const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
+            if (reactNative.Platform.OS === 'android') {
+                transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport$1.mtuSize;
+            }
+            const monitorToken = this.nextMonitorToken;
+            this.nextMonitorToken += 1;
+            const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+            transport$1.monitorToken = monitorToken;
+            transport$1.notifyTransactionId = notifyTransactionId;
+            this.monitorTokens.set(uuid, monitorToken);
+            transport$1.notifySubscription = this._monitorCharacteristic(transport$1.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
+            transportCache[uuid] = transport$1;
+            this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
+            if (reactNative.Platform.OS === 'ios') {
+                yield new Promise(resolve => {
+                    setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
+                });
+            }
+            else if (reactNative.Platform.OS === 'android') {
+                yield delay(ANDROID_NOTIFY_READY_DELAY_MS);
+            }
+            return transport$1;
+        });
+    }
     acquire(input) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
             if (!uuid) {
@@ -760,8 +723,8 @@ class ReactNativeBleTransport {
             if (forceCleanRunPromise && this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
-                this.rejectAllProtocolV2Frames(error);
                 this.runPromise = null;
+                this.runPromiseDeviceId = null;
                 Log === null || Log === void 0 ? void 0 : Log.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
             }
             const blePlxManager = yield this.getPlxManager();
@@ -843,38 +806,34 @@ class ReactNativeBleTransport {
                 }
             }
             device = yield requestAndroidMtu(device);
-            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(device);
+            const acquiredDevice = device;
+            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(acquiredDevice);
             const protocolHint = expectedProtocol
                 ? undefined
-                : (_a = this.deviceProtocolHints.get(uuid)) !== null && _a !== void 0 ? _a : inferProtocolHintFromDeviceName(getDeviceDisplayName(device));
+                : (_b = (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
             yield this.release(uuid, true);
             if (protocolHint) {
                 this.deviceProtocolHints.set(uuid, protocolHint);
             }
-            const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-            if (reactNative.Platform.OS === 'android') {
-                transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport$1.mtuSize;
-            }
-            const monitorToken = this.nextMonitorToken;
-            this.nextMonitorToken += 1;
-            const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
-            transport$1.monitorToken = monitorToken;
-            transport$1.notifyTransactionId = notifyTransactionId;
-            this.monitorTokens.set(uuid, monitorToken);
-            transport$1.notifySubscription = this._monitorCharacteristic(transport$1.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
-            transportCache[uuid] = transport$1;
-            this.protocolV2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
-            if (reactNative.Platform.OS === 'ios') {
-                yield new Promise(resolve => {
-                    setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
-                });
+            yield this.installTransportForAcquire(uuid, acquiredDevice, {
+                writeCharacteristic,
+                notifyCharacteristic,
+            });
+            try {
+                const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint, () => __awaiter(this, void 0, void 0, function* () {
+                    yield this.installTransportForAcquire(uuid, acquiredDevice);
+                }));
+                const currentTransport = transportCache[uuid];
+                if (!currentTransport) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+                }
+                this.attachDisconnectSubscription(currentTransport, acquiredDevice, uuid);
+                return { uuid, protocolType };
             }
-            else if (reactNative.Platform.OS === 'android') {
-                yield delay(ANDROID_NOTIFY_READY_DELAY_MS);
+            catch (error) {
+                yield this.release(uuid, true);
+                throw error;
             }
-            const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
-            this.attachDisconnectSubscription(transport$1, device, uuid);
-            return { uuid, protocolType };
         });
     }
     _monitorCharacteristic(characteristic, uuid, monitorToken, notifyTransactionId) {
@@ -911,7 +870,7 @@ class ReactNativeBleTransport {
                     this.rejectProtocolV2Frames(uuid, hdShared.ERRORS.TypedError(errorCode));
                     return;
                 }
-                if (this.runPromise) {
+                if (this.runPromise && this.runPromiseDeviceId === uuid) {
                     let ERROR = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
                     if ((_h = error.reason) === null || _h === void 0 ? void 0 : _h.includes('The connection has timed out unexpectedly')) {
                         ERROR = hdShared.HardwareErrorCode.BleTimeoutError;
@@ -926,13 +885,11 @@ class ReactNativeBleTransport {
                         ((_p = error.reason) === null || _p === void 0 ? void 0 : _p.includes('notify change failed for device'))) {
                         const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure);
                         this.runPromise.reject(notifyError);
-                        this.rejectAllProtocolV2Frames(notifyError);
                         Log === null || Log === void 0 ? void 0 : Log.debug(`${hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`);
                         return;
                     }
                     const notifyError = hdShared.ERRORS.TypedError(ERROR);
                     this.runPromise.reject(notifyError);
-                    this.rejectAllProtocolV2Frames(notifyError);
                     Log === null || Log === void 0 ? void 0 : Log.debug(': monitor notify error, and has unreleased Promise', Error);
                 }
                 return;
@@ -966,7 +923,9 @@ class ReactNativeBleTransport {
                     const value = buffer.Buffer.from(buffer$1);
                     bufferLength = 0;
                     buffer$1 = [];
-                    (_q = this.runPromise) === null || _q === void 0 ? void 0 : _q.resolve(value.toString('hex'));
+                    if (this.runPromiseDeviceId === uuid) {
+                        (_q = this.runPromise) === null || _q === void 0 ? void 0 : _q.resolve(value.toString('hex'));
+                    }
                 }
             }
             catch (error) {
@@ -975,7 +934,7 @@ class ReactNativeBleTransport {
                 if (this.deviceProtocol.get(uuid) === 'V2') {
                     this.rejectProtocolV2Frames(uuid, notifyError);
                 }
-                else {
+                else if (this.runPromiseDeviceId === uuid) {
                     (_r = this.runPromise) === null || _r === void 0 ? void 0 : _r.reject(notifyError);
                 }
             }
@@ -992,11 +951,12 @@ class ReactNativeBleTransport {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const transport = transportCache[uuid];
-            if (this.runPromise) {
+            if (this.runPromise && this.runPromiseDeviceId === uuid) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
                 this.runPromise = null;
-                this.rejectAllProtocolV2Frames(error);
+                this.runPromiseDeviceId = null;
+                this.rejectProtocolV2Frames(uuid, error);
             }
             else {
                 this.resetProtocolV2Frames(uuid);
@@ -1056,7 +1016,7 @@ class ReactNativeBleTransport {
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            Log === null || Log === void 0 ? void 0 : Log.debug('transport call', createTransportCallLog(name, protocol, data));
+            Log === null || Log === void 0 ? void 0 : Log.debug('transport call', transport.createTransportCallLog(name, protocol, data));
             if (protocol === 'V2') {
                 return this.callProtocolV2(uuid, name, data, options);
             }
@@ -1076,6 +1036,7 @@ class ReactNativeBleTransport {
             const runPromise = hdShared.createDeferred();
             runPromise.promise.catch(() => undefined);
             this.runPromise = runPromise;
+            this.runPromiseDeviceId = uuid;
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
             let timeout;
@@ -1158,32 +1119,14 @@ class ReactNativeBleTransport {
                             if (!retryType || attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
                                 throw error;
                             }
-                            const shouldReconnect = retryType === 'reconnectable';
-                            const delayMs = shouldReconnect
-                                ? FIRMWARE_UPLOAD_RECONNECT_RETRY_DELAY_MS
-                                : resolveFirmwareUploadRetryDelay(attempt);
+                            const delayMs = resolveFirmwareUploadRetryDelay(attempt);
                             Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] FirmwareUpload write retry:', {
                                 attempt: attempt + 1,
                                 delayMs,
-                                reconnect: shouldReconnect,
                                 error,
                             });
-                            if (shouldReconnect) {
-                                this.firmwareUploadWriteRecoveryIds.add(uuid);
-                            }
                             yield delay(delayMs);
                             attempt += 1;
-                            if (shouldReconnect) {
-                                try {
-                                    yield this.reconnectFirmwareUploadTransport(uuid, transport);
-                                }
-                                catch (e) {
-                                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] FirmwareUpload reconnect error:', e);
-                                    if (attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
-                                        throw e;
-                                    }
-                                }
-                            }
                         }
                     }
                 }), e => {
@@ -1232,12 +1175,17 @@ class ReactNativeBleTransport {
                 return check.call(jsonData);
             }
             catch (e) {
-                if (name === 'Initialize' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS) {
-                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 Initialize probe call failed:', e);
+                if (name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS) {
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe call failed:', e);
                 }
                 else {
                     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;
+                if (!isProbeTimeout &&
+                    (e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError) {
+                    yield this.disconnect(uuid);
+                }
                 throw e;
             }
             finally {
@@ -1245,6 +1193,7 @@ class ReactNativeBleTransport {
                     clearTimeout(timeout);
                 if (this.runPromise === runPromise) {
                     this.runPromise = null;
+                    this.runPromiseDeviceId = null;
                 }
             }
         });
@@ -1323,6 +1272,7 @@ class ReactNativeBleTransport {
         Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native transport cancel');
         if (this.runPromise) ;
         this.runPromise = null;
+        this.runPromiseDeviceId = null;
     }
     getCachedTransport(uuid) {
         const transport = transportCache[uuid];
@@ -1335,14 +1285,14 @@ class ReactNativeBleTransport {
         return hdShared.ERRORS.TypedError(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 Initialize or Protocol V2 Ping');
+        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.deviceProtocol.get(uuid) === protocol) {
             this.deviceProtocol.delete(uuid);
         }
     }
-    detectProtocol(uuid, expectedProtocol, protocolHint) {
+    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
@@ -1373,6 +1323,12 @@ class ReactNativeBleTransport {
                 const protocol = probeOrder[i];
                 if (i > 0) {
                     yield this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
+                    if (!transportCache[uuid]) {
+                        if (!rebuildTransport) {
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+                        }
+                        yield rebuildTransport();
+                    }
                 }
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
                 if (detected) {
@@ -1438,12 +1394,12 @@ class ReactNativeBleTransport {
             }
             try {
                 this.deviceProtocol.set(uuid, 'V1');
-                yield this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+                yield this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
                 return true;
             }
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 Initialize probe failed:', error);
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe failed:', error);
                 return false;
             }
         });
@@ -1512,16 +1468,8 @@ class ReactNativeBleTransport {
         }
         this.getProtocolV2FrameQueue(uuid).push(frame);
     }
-    rejectAllProtocolV2Frames(error) {
-        this.protocolV2FrameQueues.clear();
-        for (const framePromise of this.protocolV2FramePromises.values()) {
-            framePromise.reject(error);
-        }
-        this.protocolV2FramePromises.clear();
-    }
     resetProtocolV2Frames(uuid) {
-        this.protocolV2FrameQueues.delete(uuid);
-        this.protocolV2FramePromises.delete(uuid);
+        this.rejectProtocolV2Frames(uuid, new Error(`Protocol V2 frame state reset for ${uuid}`));
     }
     rejectProtocolV2Frames(uuid, error) {
         this.protocolV2FrameQueues.delete(uuid);
@@ -1674,5 +1622,6 @@ class ReactNativeBleTransport {
 
 exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
 exports["default"] = ReactNativeBleTransport;
+exports.getFirmwareUploadWriteRetryType = getFirmwareUploadWriteRetryType;
 exports.getProtocolV2BleTuning = getProtocolV2BleTuning;
 exports.resetProtocolV2BleTuning = resetProtocolV2BleTuning;

package/dist/transportLog.d.ts

@@ -1,13 +1,2 @@
-import type { ProtocolType } from '@onekeyfe/hd-transport';
-export declare function createTransportCallLog(name: string, protocol: ProtocolType, data: Record<string, unknown>): {
-    name: string;
-    protocol: ProtocolType;
-    file_name: unknown;
-    hash: unknown;
-} | {
-    name: string;
-    protocol: ProtocolType;
-    file_name?: undefined;
-    hash?: undefined;
-};
+export { createTransportCallLog } from '@onekeyfe/hd-transport';
 //# sourceMappingURL=transportLog.d.ts.map

package/dist/transportLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transportLog.d.ts","sourceRoot":"","sources":["../src/transportLog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;;;EAY9B"}
+{"version":3,"file":"transportLog.d.ts","sourceRoot":"","sources":["../src/transportLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/types.d.ts

@@ -7,5 +7,6 @@ export type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
     expectedProtocol?: ProtocolType;
+    protocolHint?: ProtocolType;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.33",
+  "version": "1.2.0-alpha.35",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,11 +20,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.0-alpha.33",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.33",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.33",
+    "@onekeyfe/hd-core": "1.2.0-alpha.35",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.35",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.35",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "965e837c93fc67225ccfac28d22c3403ff96ad25"
+  "gitHead": "638bd33030686c4a3321e4feb4924c3f9f5c81a8"
 }