@onekeyfe/hd-transport-react-native 1.1.34-alpha.2 → 1.1.34-alpha.3

package/dist/index.js

@@ -1,12 +1,13 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', { value: true });
+
 var reactNative = require('react-native');
 var buffer = require('buffer');
 var reactNativeBlePlx = require('react-native-ble-plx');
 var ByteBuffer = require('bytebuffer');
 var transport = require('@onekeyfe/hd-transport');
 var hdShared = require('@onekeyfe/hd-shared');
-var hdCore = require('@onekeyfe/hd-core');
 var BleUtils = require('@onekeyfe/react-native-ble-utils');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -45,44 +46,116 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const Logger = hdCore.getLogger(hdCore.LoggerNames.HdBleTransport);
+let activeLogger;
+const setBleLogger = (logger) => {
+    activeLogger = logger;
+};
+const bleLogger = {
+    debug: (...args) => { var _a; return (_a = activeLogger === null || activeLogger === void 0 ? void 0 : activeLogger.debug) === null || _a === void 0 ? void 0 : _a.call(activeLogger, ...args); },
+    error: (...args) => { var _a; return (_a = activeLogger === null || activeLogger === void 0 ? void 0 : activeLogger.error) === null || _a === void 0 ? void 0 : _a.call(activeLogger, ...args); },
+    warn: (...args) => { var _a; return (_a = activeLogger === null || activeLogger === void 0 ? void 0 : activeLogger.warn) === null || _a === void 0 ? void 0 : _a.call(activeLogger, ...args); },
+};
+
+const Logger = bleLogger;
 const getConnectedDeviceIds = (serviceUuids) => BleUtils__default["default"].getConnectedPeripherals(serviceUuids);
 const pairDevice = (macAddress) => BleUtils__default["default"].pairDevice(macAddress);
 const onDeviceBondState = (bleMacAddress) => new Promise((resolve, reject) => {
-    let timeout;
-    const cleanup = (cleanupListener) => {
+    const cleanup = () => {
         if (timeout) {
             clearTimeout(timeout);
         }
         if (cleanupListener)
             cleanupListener();
     };
+    const timeout = setTimeout(() => {
+        cleanup();
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+    }, 60 * 1000);
     const cleanupListener = BleUtils__default["default"].onDeviceBondState(peripheral => {
         var _a;
         if (((_a = peripheral.id) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== bleMacAddress.toLowerCase()) {
             return;
         }
         const { bondState } = peripheral;
-        if (bondState.preState === 'BOND_NONE' && bondState.state === 'BOND_BONDING') {
-            timeout = setTimeout(() => {
-                cleanup(cleanupListener);
-                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
-            }, 60 * 1000);
-        }
         const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
         const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
         Logger.debug('onDeviceBondState bondState:', bondState);
         if (hasBonded) {
-            cleanup(cleanupListener);
+            cleanup();
             resolve(peripheral);
         }
         else if (hasCanceled) {
-            cleanup(cleanupListener);
+            cleanup();
             reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
         }
     });
 });
 
+const IOS_PACKET_LENGTH = 128;
+const ANDROID_PACKET_LENGTH = 192;
+const ANDROID_DEFAULT_MTU = 23;
+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 ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
+const Pro2ServiceUUID = 'fffd';
+const OneKeyServices = {
+    classic: {
+        [ClassicServiceUUID]: {
+            serviceUuid: ClassicServiceUUID,
+            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 = [];
+for (const deviceType of Object.keys(OneKeyServices)) {
+    const services = OneKeyServices[deviceType];
+    bluetoothServices.push(...Object.keys(services));
+}
+const getBluetoothServiceUuids = () => bluetoothServices;
+const getInfosForServiceUuid = (serviceUuid, deviceType) => {
+    var _a;
+    const services = OneKeyServices[deviceType];
+    if (!services) {
+        return null;
+    }
+    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));
+    if (!service) {
+        return null;
+    }
+    return service;
+};
+const isSameBleUuid = (left, right) => {
+    const normalizedLeft = normalizeBleUuid(left);
+    const normalizedRight = normalizeBleUuid(right);
+    return (normalizedLeft === normalizedRight ||
+        (getBleUuidKey(left) !== '' && getBleUuidKey(left) === getBleUuidKey(right)));
+};
+
+function hasWritableCapability(characteristic) {
+    return !!(characteristic.isWritableWithResponse || characteristic.isWritableWithoutResponse);
+}
+function resolveProtocolV2PacketCapacity({ platform, iosPacketLength = IOS_PACKET_LENGTH, androidPacketLength = ANDROID_PACKET_LENGTH, mtu, }) {
+    if (platform === 'ios') {
+        return iosPacketLength;
+    }
+    if (platform === 'android') {
+        const payloadLength = Math.max((mtu !== null && mtu !== void 0 ? mtu : ANDROID_DEFAULT_MTU) - 3, 1);
+        return Math.min(androidPacketLength, payloadLength);
+    }
+    return androidPacketLength;
+}
+
 const timer = process.env.NODE_ENV === 'development'
     ? {
         timeout: (fn, ms) => {
@@ -108,7 +181,6 @@ const timer = process.env.NODE_ENV === 'development'
 const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject) => {
     let done = false;
     const subscription = bleManager.onStateChange(state => {
-        console.log('ble state -> ', state);
         if (state === 'PoweredOn') {
             if (done)
                 return;
@@ -126,58 +198,27 @@ const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject)
     }, ms);
 });
 
-const IOS_PACKET_LENGTH = 128;
-const ANDROID_PACKET_LENGTH = 192;
-const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
-const OneKeyServices = {
-    classic: {
-        [ClassicServiceUUID]: {
-            serviceUuid: ClassicServiceUUID,
-            writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
-            notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
-        },
-    },
-};
-const bluetoothServices = [];
-for (const deviceType of Object.keys(OneKeyServices)) {
-    const services = OneKeyServices[deviceType];
-    bluetoothServices.push(...Object.keys(services));
-}
-const getBluetoothServiceUuids = () => bluetoothServices;
-const getInfosForServiceUuid = (serviceUuid, deviceType) => {
-    const services = OneKeyServices[deviceType];
-    if (!services) {
-        return null;
-    }
-    const service = services[serviceUuid];
-    if (!service) {
-        return null;
-    }
-    return service;
-};
-
 const isHeaderChunk = (chunk) => {
     if (chunk.length < 9)
         return false;
     const [MagicQuestionMark, sharp1, sharp2] = chunk;
-    if (String.fromCharCode(MagicQuestionMark) === String.fromCharCode(transport.MESSAGE_TOP_CHAR) &&
-        String.fromCharCode(sharp1) === String.fromCharCode(transport.MESSAGE_HEADER_BYTE) &&
-        String.fromCharCode(sharp2) === String.fromCharCode(transport.MESSAGE_HEADER_BYTE)) {
+    if (String.fromCharCode(MagicQuestionMark) === String.fromCharCode(transport.PROTOCOL_V1_REPORT_ID) &&
+        String.fromCharCode(sharp1) === String.fromCharCode(transport.PROTOCOL_V1_HEADER_BYTE) &&
+        String.fromCharCode(sharp2) === String.fromCharCode(transport.PROTOCOL_V1_HEADER_BYTE)) {
         return true;
     }
     return false;
 };
 
-const Log$1 = hdCore.getLogger(hdCore.LoggerNames.HdBleTransport);
+const Log$1 = bleLogger;
 class BleTransport {
     constructor(device, writeCharacteristic, notifyCharacteristic) {
         this.name = 'ReactNativeBleTransport';
-        this.mtuSize = 20;
+        this.mtuSize = 23;
         this.id = device.id;
         this.device = device;
         this.writeCharacteristic = writeCharacteristic;
         this.notifyCharacteristic = notifyCharacteristic;
-        console.log(`BleTransport(${String(this.id)}) new instance`);
     }
     writeWithRetry(data, retryCount = BleTransport.MAX_RETRIES) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -187,7 +228,7 @@ class BleTransport {
             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 hdCore.wait(BleTransport.RETRY_DELAY);
+                    yield hdShared.wait(BleTransport.RETRY_DELAY);
                     if (error.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected ||
                         error.errorCode === reactNativeBlePlx.BleErrorCode.CharacteristicNotFound) {
                         try {
@@ -211,8 +252,20 @@ class BleTransport {
 BleTransport.MAX_RETRIES = 5;
 BleTransport.RETRY_DELAY = 2000;
 
-const { check, buildBuffers, receiveOne, parseConfigure } = transport__default["default"];
-const Log = hdCore.getLogger(hdCore.LoggerNames.HdBleTransport);
+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;
 const transportCache = {};
 const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 : 5;
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = reactNative.Platform.OS === 'ios' ? 8 : 10;
@@ -222,11 +275,6 @@ 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;
-const getBleIdentityName = (device) => {
-    var _a, _b;
-    const localName = device === null || device === void 0 ? void 0 : device.localName;
-    return (_b = (_a = device === null || device === void 0 ? void 0 : device.name) !== null && _a !== void 0 ? _a : localName) !== null && _b !== void 0 ? _b : null;
-};
 const delay = (ms) => new Promise(resolve => {
     setTimeout(resolve, ms);
 });
@@ -248,20 +296,83 @@ const getFirmwareUploadWriteRetryType = (error) => {
     return /GATT_CONGESTED|status\s*[:=]?\s*143/.test(text) ? 'congested' : null;
 };
 const resolveFirmwareUploadRetryDelay = (attempt, baseDelayMs = 200, maxDelayMs = 1200) => Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
-let connectOptions = {
-    requestMTU: 256,
+const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
+const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10000;
+const DEVICE_SCAN_TIMEOUT_MS = 8000;
+const IOS_NOTIFY_READY_DELAY_MS = 150;
+const ANDROID_NOTIFY_READY_DELAY_MS = 300;
+const DEFAULT_PROTOCOL_V2_BLE_TUNING = {
+    iosPacketLength: IOS_PACKET_LENGTH,
+    androidPacketLength: ANDROID_PACKET_LENGTH,
+};
+let protocolV2BleTuning = Object.assign({}, DEFAULT_PROTOCOL_V2_BLE_TUNING);
+const normalizePositiveInteger = (value, fallback) => {
+    const normalized = Number(value);
+    if (!Number.isFinite(normalized) || normalized <= 0)
+        return fallback;
+    return Math.floor(normalized);
+};
+function configureProtocolV2BleTuning(tuning = {}) {
+    protocolV2BleTuning = {
+        iosPacketLength: normalizePositiveInteger(tuning.iosPacketLength, protocolV2BleTuning.iosPacketLength),
+        androidPacketLength: normalizePositiveInteger(tuning.androidPacketLength, protocolV2BleTuning.androidPacketLength),
+    };
+    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE tuning configured', protocolV2BleTuning);
+}
+function resetProtocolV2BleTuning() {
+    protocolV2BleTuning = Object.assign({}, DEFAULT_PROTOCOL_V2_BLE_TUNING);
+    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE tuning reset', protocolV2BleTuning);
+}
+function getProtocolV2BleTuning() {
+    return Object.assign({}, protocolV2BleTuning);
+}
+function inferProtocolHintFromDeviceName(name) {
+    return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
+}
+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,
     timeout: 3000,
     refreshGatt: 'OnConnected',
 };
 const tryToGetConfiguration = (device) => {
     if (!device || !device.serviceUUIDs)
         return null;
-    const [serviceUUID] = device.serviceUUIDs;
+    const serviceUUID = device.serviceUUIDs.find(uuid => getInfosForServiceUuid(uuid, 'classic'));
+    if (!serviceUUID)
+        return null;
     const infos = getInfosForServiceUuid(serviceUUID, 'classic');
     if (!infos)
         return null;
     return infos;
 };
+const requestAndroidMtu = (device) => __awaiter(void 0, void 0, void 0, function* () {
+    if (reactNative.Platform.OS !== 'android')
+        return device;
+    try {
+        const mtuDevice = yield device.requestMTU(ANDROID_REQUEST_MTU);
+        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] MTU configured', {
+            deviceId: device.id,
+            requested: ANDROID_REQUEST_MTU,
+            actual: mtuDevice.mtu,
+        });
+        return mtuDevice;
+    }
+    catch (error) {
+        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Android MTU request failed:', error);
+        return device;
+    }
+});
 function remapError(error) {
     var _a;
     if (error instanceof reactNativeBlePlx.BleError) {
@@ -286,12 +397,41 @@ class ReactNativeBleTransport {
         this.name = 'ReactNativeBleTransport';
         this.configured = false;
         this.stopped = false;
-        this.scanTimeout = 3000;
+        this.scanTimeout = DEVICE_SCAN_TIMEOUT_MS;
         this.runPromise = null;
         this.firmwareUploadWriteRecoveryIds = new Set();
-        this.scanTimeout = (_a = options.scanTimeout) !== null && _a !== void 0 ? _a : 3000;
+        this.deviceProtocol = new Map();
+        this.deviceProtocolHints = new Map();
+        this.protocolV2Assemblers = new Map();
+        this.protocolV2FrameQueues = new Map();
+        this.protocolV2FramePromises = new Map();
+        this.protocolV2Links = new transport.ProtocolV2LinkManager({
+            getSchemas: () => {
+                if (!this._messages || !this._messagesV2) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
+                }
+                return {
+                    protocolV1: this._messages,
+                    protocolV2: this._messagesV2,
+                };
+            },
+            classifyError: () => 'link-fatal',
+            onLinkInvalidated: (uuid, reason) => __awaiter(this, void 0, void 0, function* () {
+                var _b;
+                (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
+                this.rejectProtocolV2Frames(uuid, new Error(reason));
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 link invalidated:', uuid, reason);
+                if (reason.startsWith('Protocol V2 link-fatal error:')) {
+                    yield this.release(uuid, true);
+                }
+            }),
+        });
+        this.monitorTokens = new Map();
+        this.nextMonitorToken = 1;
+        this.scanTimeout = (_a = options.scanTimeout) !== null && _a !== void 0 ? _a : DEVICE_SCAN_TIMEOUT_MS;
     }
-    init(_logger, emitter) {
+    init(logger, emitter) {
+        setBleLogger(logger);
         this.emitter = emitter;
     }
     configure(signedData) {
@@ -299,6 +439,12 @@ class ReactNativeBleTransport {
         this.configured = true;
         this._messages = messages;
     }
+    configureProtocolV2(signedData) {
+        this._messagesV2 = parseConfigure(signedData);
+        this.protocolV2Links
+            .invalidateAllLinks('Protocol V2 schema reconfigured')
+            .catch(error => Log === null || Log === void 0 ? void 0 : Log.debug('Protocol V2 schema link cleanup failed:', error));
+    }
     listen() {
     }
     getPlxManager() {
@@ -308,6 +454,7 @@ 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);
@@ -324,7 +471,19 @@ 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) {
                 try {
                     Log === null || Log === void 0 ? void 0 : Log.debug('cancel connection when service not found');
                     yield device.cancelConnection();
@@ -334,7 +493,12 @@ class ReactNativeBleTransport {
                 }
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
-            const { serviceUuid, writeUuid, notifyUuid } = infos;
+            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';
+            if (!serviceUuid) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
+            }
             if (!characteristics) {
                 characteristics = yield device.characteristicsForService(serviceUuid);
             }
@@ -344,10 +508,10 @@ class ReactNativeBleTransport {
             let writeCharacteristic;
             let notifyCharacteristic;
             for (const c of characteristics) {
-                if (c.uuid === writeUuid) {
+                if (isSameBleUuid(c.uuid, writeUuid)) {
                     writeCharacteristic = c;
                 }
-                else if (c.uuid === notifyUuid) {
+                else if (isSameBleUuid(c.uuid, notifyUuid)) {
                     notifyCharacteristic = c;
                 }
             }
@@ -357,7 +521,7 @@ class ReactNativeBleTransport {
             if (!notifyCharacteristic) {
                 throw hdShared.ERRORS.TypedError('BLECharacteristicNotFound: notify characteristic not found');
             }
-            if (!writeCharacteristic.isWritableWithResponse) {
+            if (!hasWritableCapability(writeCharacteristic)) {
                 throw hdShared.ERRORS.TypedError('BLECharacteristicNotWritable: write characteristic not writable');
             }
             if (!notifyCharacteristic.isNotifiable) {
@@ -378,6 +542,10 @@ class ReactNativeBleTransport {
                 Log === null || Log === void 0 ? void 0 : Log.debug('device disconnect ignored during FirmwareUpload write recovery: ', uuid);
                 return;
             }
+            if (transportCache[uuid] !== transport) {
+                Log === null || Log === void 0 ? void 0 : Log.debug('device disconnect ignored for stale transport: ', device === null || device === void 0 ? void 0 : device.id);
+                return;
+            }
             try {
                 Log === null || Log === void 0 ? void 0 : Log.debug('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
                 (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-disconnect', {
@@ -386,14 +554,16 @@ class ReactNativeBleTransport {
                     connectId: device === null || device === void 0 ? void 0 : device.id,
                 });
                 if (this.runPromise) {
-                    this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError));
+                    const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError);
+                    this.runPromise.reject(error);
+                    this.rejectAllProtocolV2Frames(error);
                 }
             }
             catch (e) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('device disconnect error: ', e);
             }
             finally {
-                this.release(uuid);
+                this.release(uuid, true);
             }
         });
     }
@@ -415,7 +585,6 @@ class ReactNativeBleTransport {
                     catch (e) {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                             e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
-                            connectOptions = {};
                             device = yield device.connect();
                         }
                         else if (e.errorCode !== reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
@@ -427,7 +596,13 @@ class ReactNativeBleTransport {
                 transport.device = device;
                 transport.writeCharacteristic = writeCharacteristic;
                 transport.notifyCharacteristic = notifyCharacteristic;
-                transport.notifySubscription = this._monitorCharacteristic(notifyCharacteristic, uuid);
+                const monitorToken = this.nextMonitorToken;
+                this.nextMonitorToken += 1;
+                const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+                transport.monitorToken = monitorToken;
+                transport.notifyTransactionId = notifyTransactionId;
+                this.monitorTokens.set(uuid, monitorToken);
+                transport.notifySubscription = this._monitorCharacteristic(notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
                 this.attachDisconnectSubscription(transport, device, uuid);
             }
             finally {
@@ -462,11 +637,11 @@ class ReactNativeBleTransport {
                     }
                 }
                 blePlxManager.startDeviceScan(getBluetoothServiceUuids(), {
+                    allowDuplicates: true,
                     scanMode: reactNativeBlePlx.ScanMode.LowLatency,
                 }, (error, device) => {
-                    var _a;
+                    var _a, _b, _c;
                     if (error) {
-                        Log === null || Log === void 0 ? void 0 : Log.debug('ble scan manager: ', blePlxManager);
                         Log === null || Log === void 0 ? void 0 : Log.debug('ble scan error: ', error);
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
                             reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
@@ -485,12 +660,20 @@ class ReactNativeBleTransport {
                         }
                         return;
                     }
-                    if (hdShared.isOnekeyDevice(getBleIdentityName(device), device === null || device === void 0 ? void 0 : device.id)) {
-                        Log === null || Log === void 0 ? void 0 : Log.debug('search device start ======================');
-                        const { name, localName, id } = device !== null && device !== void 0 ? device : {};
-                        Log === null || Log === void 0 ? void 0 : Log.debug(`device name: ${name !== null && name !== void 0 ? name : ''}\nlocalName: ${localName !== null && localName !== void 0 ? localName : ''}\nid: ${id !== null && id !== void 0 ? id : ''}`);
+                    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);
+                    if (isOneKey) {
                         addDevice(device);
-                        Log === null || Log === void 0 ? void 0 : Log.debug('search device end ======================\n');
+                    }
+                    else if (displayName && /\bpro\s*2\b/i.test(displayName)) {
+                        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Pro2-like BLE device was not accepted:', {
+                            name: device === null || device === void 0 ? void 0 : device.name,
+                            localName: device === null || device === void 0 ? void 0 : device.localName,
+                            id: device === null || device === void 0 ? void 0 : device.id,
+                            serviceUUIDs: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
+                        });
                     }
                 });
                 getConnectedDeviceIds(reactNative.Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(devices => {
@@ -499,14 +682,25 @@ class ReactNativeBleTransport {
                         const hasCachedServiceUuid = Boolean(serviceUUIDs === null || serviceUUIDs === void 0 ? void 0 : serviceUUIDs.length);
                         const keepDevice = reactNative.Platform.OS === 'ios' || hasCachedServiceUuid;
                         if (keepDevice) {
-                            Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
                             addDevice(device);
                         }
                     }
                 });
                 const addDevice = (device) => {
+                    var _a;
                     if (deviceList.every(d => d.id !== device.id)) {
-                        deviceList.push(Object.assign(Object.assign({}, device), { commType: 'ble' }));
+                        const displayName = (_a = getDeviceDisplayName(device)) !== null && _a !== void 0 ? _a : 'Unknown BLE Device';
+                        const protocolHint = inferProtocolHintFromDeviceName(displayName);
+                        if (protocolHint) {
+                            this.deviceProtocolHints.set(device.id, protocolHint);
+                        }
+                        deviceList.push(Object.assign(Object.assign({}, device), { name: displayName, commType: 'ble' }));
+                        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] OneKey BLE device discovered', {
+                            deviceId: device.id,
+                            name: displayName,
+                            serviceUUIDs: device.serviceUUIDs,
+                            protocolHint,
+                        });
                     }
                 };
                 timer.timeout(() => {
@@ -517,19 +711,31 @@ class ReactNativeBleTransport {
         });
     }
     acquire(input) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const { uuid, forceCleanRunPromise } = input;
+            const { uuid, forceCleanRunPromise, expectedProtocol } = input;
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
-            let device = null;
-            if (transportCache[uuid]) {
-                Log === null || Log === void 0 ? void 0 : Log.debug('transport not be released, will release: ', uuid);
-                yield this.release(uuid);
+            const cachedTransport = transportCache[uuid];
+            if (cachedTransport) {
+                const cachedProtocol = this.deviceProtocol.get(uuid);
+                const isCachedDeviceConnected = yield cachedTransport.device.isConnected().catch(() => false);
+                if (isCachedDeviceConnected &&
+                    cachedProtocol &&
+                    (!expectedProtocol || cachedProtocol === expectedProtocol)) {
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] reuse cached BLE transport:', uuid, cachedProtocol);
+                    return { uuid, protocolType: cachedProtocol };
+                }
+                Log === null || Log === void 0 ? void 0 : Log.debug('transport not reusable, will release: ', uuid);
+                yield this.release(uuid, true);
             }
+            let device = null;
             if (forceCleanRunPromise && this.runPromise) {
-                this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise));
+                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
+                this.runPromise.reject(error);
+                this.rejectAllProtocolV2Frames(error);
+                this.runPromise = null;
                 Log === null || Log === void 0 ? void 0 : Log.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
             }
             const blePlxManager = yield this.getPlxManager();
@@ -545,6 +751,9 @@ class ReactNativeBleTransport {
                 if (bondState.bonding) {
                     yield onDeviceBondState(uuid);
                 }
+                else if (!bondState.bonded) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
+                }
             }
             if (!device) {
                 const devices = yield blePlxManager.devices([uuid]);
@@ -565,7 +774,6 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device has error: ', e);
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
-                        connectOptions = {};
                         Log === null || Log === void 0 ? void 0 : Log.debug('first try to reconnect without params');
                         device = yield blePlxManager.connectToDevice(uuid);
                     }
@@ -584,23 +792,22 @@ class ReactNativeBleTransport {
             if (!(yield device.isConnected())) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('not connected, try to connect to device: ', uuid);
                 try {
-                    yield device.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 (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
-                        connectOptions = {};
                         Log === null || Log === void 0 ? void 0 : Log.debug('second try to reconnect without params');
                         try {
-                            yield device.connect();
+                            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 device.cancelConnection();
-                                yield device.connect();
+                                device = yield device.connect();
                             }
                         }
                     }
@@ -609,58 +816,124 @@ class ReactNativeBleTransport {
                     }
                 }
             }
+            device = yield requestAndroidMtu(device);
             const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(device);
-            yield this.release(uuid);
-            const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-            transport.notifySubscription = this._monitorCharacteristic(transport.notifyCharacteristic, uuid);
-            transportCache[uuid] = transport;
-            (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-connect', {
+            const protocolHint = expectedProtocol
+                ? undefined
+                : (_a = this.deviceProtocolHints.get(uuid)) !== null && _a !== void 0 ? _a : inferProtocolHintFromDeviceName(getDeviceDisplayName(device));
+            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());
+            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);
+            }
+            const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
+            (_b = this.emitter) === null || _b === void 0 ? void 0 : _b.emit('device-connect', {
                 name: device.name,
                 id: device.id,
                 connectId: device.id,
             });
-            this.attachDisconnectSubscription(transport, device, uuid);
-            return { uuid };
+            this.attachDisconnectSubscription(transport$1, device, uuid);
+            return { uuid, protocolType };
         });
     }
-    _monitorCharacteristic(characteristic, uuid) {
+    _monitorCharacteristic(characteristic, uuid, monitorToken, notifyTransactionId) {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+            const isCurrentMonitor = this.monitorTokens.get(uuid) === monitorToken;
             if (error) {
                 Log === null || Log === void 0 ? void 0 : Log.debug(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
                 if (this.firmwareUploadWriteRecoveryIds.has(uuid)) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('notify error ignored during FirmwareUpload write recovery: ', uuid);
                     return;
                 }
-                if (this.runPromise) {
-                    let ERROR = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
+                if (!isCurrentMonitor) {
+                    Log === null || Log === void 0 ? void 0 : Log.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
+                    return;
+                }
+                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')) {
-                        ERROR = hdShared.HardwareErrorCode.BleTimeoutError;
+                        errorCode = hdShared.HardwareErrorCode.BleTimeoutError;
                     }
-                    if ((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('Encryption is insufficient')) {
-                        ERROR = hdShared.HardwareErrorCode.BleDeviceBondError;
+                    else if ((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('Encryption is insufficient')) {
+                        errorCode = hdShared.HardwareErrorCode.BleDeviceBondError;
                     }
-                    if (((_c = error.reason) === null || _c === void 0 ? void 0 : _c.includes('Cannot write client characteristic config descriptor')) ||
+                    else if (((_c = error.reason) === null || _c === void 0 ? void 0 : _c.includes('Cannot write client characteristic config descriptor')) ||
                         ((_d = error.reason) === null || _d === void 0 ? void 0 : _d.includes('Cannot find client characteristic config descriptor')) ||
                         ((_e = error.reason) === null || _e === void 0 ? void 0 : _e.includes('The handle is invalid')) ||
                         ((_f = error.reason) === null || _f === void 0 ? void 0 : _f.includes('Writing is not permitted')) ||
                         ((_g = error.reason) === null || _g === void 0 ? void 0 : _g.includes('notify change failed for device'))) {
-                        this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure));
+                        errorCode = hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure;
+                    }
+                    this.rejectProtocolV2Frames(uuid, hdShared.ERRORS.TypedError(errorCode));
+                    return;
+                }
+                if (this.runPromise) {
+                    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;
+                    }
+                    if ((_j = error.reason) === null || _j === void 0 ? void 0 : _j.includes('Encryption is insufficient')) {
+                        ERROR = hdShared.HardwareErrorCode.BleDeviceBondError;
+                    }
+                    if (((_k = error.reason) === null || _k === void 0 ? void 0 : _k.includes('Cannot write client characteristic config descriptor')) ||
+                        ((_l = error.reason) === null || _l === void 0 ? void 0 : _l.includes('Cannot find client characteristic config descriptor')) ||
+                        ((_m = error.reason) === null || _m === void 0 ? void 0 : _m.includes('The handle is invalid')) ||
+                        ((_o = error.reason) === null || _o === void 0 ? void 0 : _o.includes('Writing is not permitted')) ||
+                        ((_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;
                     }
-                    this.runPromise.reject(hdShared.ERRORS.TypedError(ERROR));
+                    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;
             }
+            if (!isCurrentMonitor) {
+                Log === null || Log === void 0 ? void 0 : Log.debug('monitor data ignored for stale transport: ', uuid, notifyTransactionId);
+                return;
+            }
             if (!c) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleMonitorError);
             }
             try {
                 const data = buffer.Buffer.from(c.value, 'base64');
+                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;
+                }
+                if (protocol === 'V2') {
+                    this.handleProtocolV2Notification(uuid, monitorToken, new Uint8Array(data));
+                    return;
+                }
                 if (isHeaderChunk(data)) {
                     bufferLength = data.readInt32BE(5);
                     buffer$1 = [...data.subarray(3)];
@@ -668,33 +941,74 @@ class ReactNativeBleTransport {
                 else {
                     buffer$1 = buffer$1.concat([...data]);
                 }
-                if (buffer$1.length - transport.COMMON_HEADER_SIZE >= bufferLength) {
+                if (buffer$1.length - transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE >= bufferLength) {
                     const value = buffer.Buffer.from(buffer$1);
                     bufferLength = 0;
                     buffer$1 = [];
-                    (_h = this.runPromise) === null || _h === void 0 ? void 0 : _h.resolve(value.toString('hex'));
+                    (_q = this.runPromise) === null || _q === void 0 ? void 0 : _q.resolve(value.toString('hex'));
                 }
             }
             catch (error) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('monitor data error: ', error);
-                (_j = this.runPromise) === null || _j === void 0 ? void 0 : _j.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError));
+                const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+                if (this.deviceProtocol.get(uuid) === 'V2') {
+                    this.rejectProtocolV2Frames(uuid, notifyError);
+                }
+                else {
+                    (_r = this.runPromise) === null || _r === void 0 ? void 0 : _r.reject(notifyError);
+                }
             }
-        }, uuid);
+        }, notifyTransactionId);
         return subscription;
     }
-    release(uuid) {
-        var _a, _b, _c;
+    release(uuid, onclose = false) {
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const transport = transportCache[uuid];
+            yield this.protocolV2Links.invalidateLink(uuid, 'React Native BLE transport released');
+            if (this.runPromise) {
+                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
+                this.runPromise.reject(error);
+                this.runPromise = null;
+                this.rejectAllProtocolV2Frames(error);
+            }
+            else {
+                this.resetProtocolV2Frames(uuid);
+            }
+            if (reactNative.Platform.OS === 'android' && !onclose && transport) {
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.resetProtocolV2Frames(uuid);
+                return Promise.resolve(true);
+            }
             if (transport) {
+                if (this.monitorTokens.get(uuid) === transport.monitorToken) {
+                    this.monitorTokens.delete(uuid);
+                }
                 Log === null || Log === void 0 ? void 0 : Log.debug('release: removing disconnect subscription for device: ', uuid);
-                (_a = transport.disconnectSubscription) === null || _a === void 0 ? void 0 : _a.remove();
+                (_b = transport.disconnectSubscription) === null || _b === void 0 ? void 0 : _b.remove();
                 transport.disconnectSubscription = undefined;
-                Log === null || Log === void 0 ? void 0 : Log.debug('release: removing notify subscription, characteristic: ', (_b = transport.notifyCharacteristic) === null || _b === void 0 ? void 0 : _b.uuid);
-                (_c = transport.notifySubscription) === null || _c === void 0 ? void 0 : _c.remove();
+                Log === null || Log === void 0 ? void 0 : Log.debug('release: removing notify subscription, characteristic: ', (_c = transport.notifyCharacteristic) === null || _c === void 0 ? void 0 : _c.uuid);
+                (_d = transport.notifySubscription) === null || _d === void 0 ? void 0 : _d.remove();
                 transport.notifySubscription = undefined;
+                if (transport.notifyTransactionId) {
+                    try {
+                        yield ((_e = this.blePlxManager) === null || _e === void 0 ? void 0 : _e.cancelTransaction(transport.notifyTransactionId));
+                    }
+                    catch (e) {
+                        Log === null || Log === void 0 ? void 0 : Log.debug('release: cancel notify transaction error (ignored): ', (e === null || e === void 0 ? void 0 : e.message) || e);
+                    }
+                }
                 delete transportCache[uuid];
-                if (reactNative.Platform.OS === 'android') ;
+            }
+            this.deviceProtocol.delete(uuid);
+            (_f = this.protocolV2Assemblers.get(uuid)) === null || _f === void 0 ? void 0 : _f.reset();
+            this.protocolV2Assemblers.delete(uuid);
+            this.resetProtocolV2Frames(uuid);
+            try {
+                yield ((_g = this.blePlxManager) === null || _g === void 0 ? void 0 : _g.cancelTransaction(uuid));
+            }
+            catch (e) {
+                Log === null || Log === void 0 ? void 0 : Log.debug('release: cancel transaction error (ignored): ', (e === null || e === void 0 ? void 0 : e.message) || e);
             }
             return Promise.resolve(true);
         });
@@ -704,7 +1018,7 @@ class ReactNativeBleTransport {
             yield this.call(session, name, data);
         });
     }
-    call(uuid, name, data) {
+    call(uuid, name, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped) {
                 return Promise.reject(hdShared.ERRORS.TypedError('Transport stopped.'));
@@ -712,30 +1026,33 @@ class ReactNativeBleTransport {
             if (this._messages == null) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
+            const protocol = this.getProtocolType(uuid);
+            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));
+            if (protocol === 'V2') {
+                return this.callProtocolV2(uuid, name, data, options);
+            }
             const forceRun = name === 'Initialize' || name === 'Cancel';
-            Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native call this.runPromise', this.runPromise);
             if (this.runPromise && !forceRun) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
             }
-            const transport$1 = transportCache[uuid];
-            if (!transport$1) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+            return this.callProtocolV1(uuid, name, data, options);
+        });
+    }
+    callProtocolV1(uuid, name, data, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._messages) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            this.runPromise = hdShared.createDeferred();
+            const transport = this.getCachedTransport(uuid);
+            const runPromise = hdShared.createDeferred();
+            runPromise.promise.catch(() => undefined);
+            this.runPromise = runPromise;
             const messages = this._messages;
-            if (name === 'ResourceUpdate' || name === 'ResourceAck') {
-                Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', {
-                    file_name: data === null || data === void 0 ? void 0 : data.file_name,
-                    hash: data === null || data === void 0 ? void 0 : data.hash,
-                });
-            }
-            else if (transport.LogBlockCommand.has(name)) {
-                Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native', 'call-', ' name: ', name);
-            }
-            else {
-                Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
-            }
-            const buffers = buildBuffers(messages, name, data);
+            const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
+            let timeout;
             function writeChunkedData(buffers, writeFunction, onError) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const packetCapacity = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
@@ -790,13 +1107,13 @@ class ReactNativeBleTransport {
                 });
             }
             if (name === 'EmmcFileWrite') {
-                yield writeChunkedData(buffers, data => transport$1.writeWithRetry(data), e => {
+                yield writeChunkedData(buffers, data => transport.writeWithRetry(data), e => {
                     this.runPromise = null;
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
             else if (name === 'FirmwareUpload') {
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] FirmwareUpload write uses throttled BLE packets:', {
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Firmware upload transport configured', {
                     packetCapacity: FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY,
                     burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
                     pauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
@@ -807,7 +1124,7 @@ class ReactNativeBleTransport {
                     let attempt = 0;
                     while (true) {
                         try {
-                            yield transport$1.writeCharacteristic.writeWithoutResponse(data);
+                            yield transport.writeCharacteristic.writeWithoutResponse(data);
                             return;
                         }
                         catch (error) {
@@ -832,7 +1149,7 @@ class ReactNativeBleTransport {
                             attempt += 1;
                             if (shouldReconnect) {
                                 try {
-                                    yield this.reconnectFirmwareUploadTransport(uuid, transport$1);
+                                    yield this.reconnectFirmwareUploadTransport(uuid, transport);
                                 }
                                 catch (e) {
                                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] FirmwareUpload reconnect error:', e);
@@ -852,7 +1169,7 @@ class ReactNativeBleTransport {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
                     try {
-                        yield transport$1.writeCharacteristic.writeWithoutResponse(outData);
+                        yield transport.writeCharacteristic.writeWithoutResponse(outData);
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
@@ -870,20 +1187,39 @@ class ReactNativeBleTransport {
                 }
             }
             try {
-                const response = yield this.runPromise.promise;
+                const response = yield Promise.race([
+                    runPromise.promise,
+                    new Promise((_, reject) => {
+                        if (options === null || options === void 0 ? void 0 : options.timeoutMs) {
+                            timeout = setTimeout(() => {
+                                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE response timeout after ${options.timeoutMs}ms for ${name}`);
+                                runPromise.reject(error);
+                                reject(error);
+                            }, options.timeoutMs);
+                        }
+                    }),
+                ]);
                 if (typeof response !== 'string') {
                     throw new Error('Returning data is not string.');
                 }
-                Log === null || Log === void 0 ? void 0 : Log.debug('receive data: ', response);
-                const jsonData = receiveOne(messages, response);
+                const jsonData = ProtocolV1.decodeMessage(messages, response);
                 return check.call(jsonData);
             }
             catch (e) {
-                Log === null || Log === void 0 ? void 0 : Log.error('call error: ', 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);
+                }
+                else {
+                    Log === null || Log === void 0 ? void 0 : Log.error('call error: ', e);
+                }
                 throw e;
             }
             finally {
-                this.runPromise = null;
+                if (timeout)
+                    clearTimeout(timeout);
+                if (this.runPromise === runPromise) {
+                    this.runPromise = null;
+                }
             }
         });
     }
@@ -893,7 +1229,7 @@ class ReactNativeBleTransport {
     disconnect(session) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native transport resetSession: ', session);
+            yield this.protocolV2Links.invalidateLink(session, 'React Native BLE transport disconnected');
             const transport = transportCache[session];
             if (transport === null || transport === void 0 ? void 0 : transport.disconnectSubscription) {
                 try {
@@ -940,6 +1276,10 @@ class ReactNativeBleTransport {
             if (transportCache[session]) {
                 delete transportCache[session];
             }
+            this.deviceProtocol.delete(session);
+            this.deviceProtocolHints.delete(session);
+            this.protocolV2Assemblers.delete(session);
+            this.resetProtocolV2Frames(session);
             try {
                 (_d = this.emitter) === null || _d === void 0 ? void 0 : _d.emit('device-disconnect', {
                     name: (_e = transport === null || transport === void 0 ? void 0 : transport.device) === null || _e === void 0 ? void 0 : _e.name,
@@ -958,6 +1298,315 @@ class ReactNativeBleTransport {
         if (this.runPromise) ;
         this.runPromise = null;
     }
+    getCachedTransport(uuid) {
+        const transport = transportCache[uuid];
+        if (!transport) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
+        }
+        return transport;
+    }
+    createProtocolMismatchError(expected) {
+        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');
+    }
+    clearProbeProtocol(uuid, protocol) {
+        if (this.deviceProtocol.get(uuid) === protocol) {
+            this.deviceProtocol.delete(uuid);
+        }
+    }
+    detectProtocol(uuid, expectedProtocol, protocolHint) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (expectedProtocol === 'V1') {
+                if (yield this.probeProtocolV1(uuid)) {
+                    this.deviceProtocol.set(uuid, 'V1');
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
+                        deviceId: uuid,
+                        protocol: 'V1',
+                        source: 'expected',
+                    });
+                    return 'V1';
+                }
+                throw this.createProtocolMismatchError(expectedProtocol);
+            }
+            if (expectedProtocol === 'V2') {
+                this.deviceProtocol.set(uuid, 'V2');
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
+                    deviceId: uuid,
+                    protocol: 'V2',
+                    source: 'expected',
+                });
+                return 'V2';
+            }
+            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) {
+                    yield this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
+                }
+                const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
+                if (detected) {
+                    this.deviceProtocol.set(uuid, protocol);
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
+                        deviceId: uuid,
+                        protocol,
+                        source: 'probe',
+                    });
+                    return protocol;
+                }
+            }
+            this.deviceProtocol.delete(uuid);
+            throw this.createProtocolDetectionError();
+        });
+    }
+    resetProbeStateAfterProtocolProbe(uuid, protocol) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const transport = transportCache[uuid];
+            yield this.protocolV2Links.invalidateLink(uuid, `Reset notify state after Protocol ${protocol} probe`);
+            (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+            this.resetProtocolV2Frames(uuid);
+            if (this.runPromise) {
+                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
+                this.runPromise.reject(error);
+                this.runPromise = null;
+            }
+            if (!transport)
+                return;
+            const previousNotifyTransactionId = transport.notifyTransactionId;
+            if (this.monitorTokens.get(uuid) === transport.monitorToken) {
+                this.monitorTokens.delete(uuid);
+            }
+            (_b = transport.notifySubscription) === null || _b === void 0 ? void 0 : _b.remove();
+            transport.notifySubscription = undefined;
+            if (previousNotifyTransactionId) {
+                try {
+                    yield ((_c = this.blePlxManager) === null || _c === void 0 ? void 0 : _c.cancelTransaction(previousNotifyTransactionId));
+                }
+                catch (error) {
+                    Log === null || Log === void 0 ? void 0 : Log.debug(`[ReactNativeBleTransport] cancel notify after Protocol ${protocol} probe failed:`, (error === null || error === void 0 ? void 0 : error.message) || error);
+                }
+            }
+            const monitorToken = this.nextMonitorToken;
+            this.nextMonitorToken += 1;
+            const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+            transport.monitorToken = monitorToken;
+            transport.notifyTransactionId = notifyTransactionId;
+            this.monitorTokens.set(uuid, monitorToken);
+            transport.notifySubscription = this._monitorCharacteristic(transport.notifyCharacteristic, uuid, monitorToken, notifyTransactionId);
+            if (reactNative.Platform.OS === 'ios') {
+                yield new Promise(resolve => {
+                    setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
+                });
+            }
+        });
+    }
+    probeProtocolV1(uuid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._messages) {
+                return false;
+            }
+            try {
+                this.deviceProtocol.set(uuid, 'V1');
+                yield this.callProtocolV1(uuid, 'Initialize', {}, { 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);
+                return false;
+            }
+        });
+    }
+    probeProtocolV2(uuid) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._messages || !this._messagesV2) {
+                return false;
+            }
+            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),
+                timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
+                logger: Log,
+                logPrefix: 'ProtocolV2 RN-BLE',
+                onProbeFailed: () => {
+                    var _a;
+                    (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                    this.resetProtocolV2Frames(uuid);
+                },
+            });
+            if (!detected) {
+                this.clearProbeProtocol(uuid, 'V2');
+            }
+            return detected;
+        });
+    }
+    handleProtocolV2Notification(uuid, monitorToken, data) {
+        try {
+            if (this.monitorTokens.get(uuid) !== monitorToken)
+                return;
+            if (data.length === 0)
+                return;
+            const assembler = this.protocolV2Assemblers.get(uuid);
+            if (!assembler)
+                return;
+            for (const frameData of assembler.drain(data)) {
+                this.resolveProtocolV2Frame(uuid, frameData);
+            }
+        }
+        catch (error) {
+            Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 notification error:', error);
+            const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+            this.rejectProtocolV2Frames(uuid, notifyError);
+            this.protocolV2Links
+                .invalidateLink(uuid, `Protocol V2 notification error: ${error}`)
+                .catch(invalidateError => Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 notify cleanup failed:', invalidateError));
+        }
+    }
+    getProtocolV2FrameQueue(uuid) {
+        let queue = this.protocolV2FrameQueues.get(uuid);
+        if (!queue) {
+            queue = [];
+            this.protocolV2FrameQueues.set(uuid, queue);
+        }
+        return queue;
+    }
+    resolveProtocolV2Frame(uuid, frame) {
+        const framePromise = this.protocolV2FramePromises.get(uuid);
+        if (framePromise) {
+            framePromise.resolve(frame);
+            this.protocolV2FramePromises.delete(uuid);
+            return;
+        }
+        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);
+    }
+    rejectProtocolV2Frames(uuid, error) {
+        this.protocolV2FrameQueues.delete(uuid);
+        const framePromise = this.protocolV2FramePromises.get(uuid);
+        if (framePromise) {
+            this.protocolV2FramePromises.delete(uuid);
+            framePromise.reject(error);
+        }
+    }
+    readProtocolV2Frame(uuid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const queuedFrame = this.getProtocolV2FrameQueue(uuid).shift();
+            if (queuedFrame) {
+                return queuedFrame;
+            }
+            const framePromise = hdShared.createDeferred();
+            this.protocolV2FramePromises.set(uuid, framePromise);
+            try {
+                return yield framePromise.promise;
+            }
+            finally {
+                if (this.protocolV2FramePromises.get(uuid) === framePromise) {
+                    this.protocolV2FramePromises.delete(uuid);
+                }
+            }
+        });
+    }
+    writeProtocolV2Frame(transport, frame) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tuning = getProtocolV2BleTuning();
+            const packetCapacity = resolveProtocolV2PacketCapacity({
+                platform: reactNative.Platform.OS,
+                iosPacketLength: tuning.iosPacketLength,
+                androidPacketLength: tuning.androidPacketLength,
+                mtu: reactNative.Platform.OS === 'android' ? transport.mtuSize : undefined,
+            });
+            for (let offset = 0; offset < frame.length; offset += packetCapacity) {
+                const chunk = frame.slice(offset, offset + packetCapacity);
+                const base64 = buffer.Buffer.from(chunk).toString('base64');
+                yield transport.writeCharacteristic.writeWithoutResponse(base64);
+            }
+        });
+    }
+    callProtocolV2(uuid, name, data, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._messages || !this._messagesV2) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
+            }
+            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: options === null || options === void 0 ? void 0 : options.timeoutMs });
+            const highVolumeWrite = transport.LogBlockCommand.has(name);
+            if (highVolumeWrite) {
+                const tuning = getProtocolV2BleTuning();
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 high-volume write configured', {
+                    name,
+                    writeMode: 'withoutResponse',
+                    packetCapacity: reactNative.Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
+                });
+            }
+            try {
+                return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, callOptions);
+            }
+            catch (e) {
+                Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
+                throw e;
+            }
+        });
+    }
+    createProtocolV2Adapter(uuid) {
+        var _a;
+        const generation = (_a = this.monitorTokens.get(uuid)) !== null && _a !== void 0 ? _a : 0;
+        const assertCurrentGeneration = () => {
+            if (this.monitorTokens.get(uuid) !== generation) {
+                throw new Error(`Protocol V2 monitor generation changed for ${uuid}`);
+            }
+        };
+        return {
+            router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
+            maxFrameBytes: transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
+            generation,
+            prepareCall: () => {
+                var _a;
+                assertCurrentGeneration();
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.resetProtocolV2Frames(uuid);
+            },
+            writeFrame: (frame) => __awaiter(this, void 0, void 0, function* () {
+                assertCurrentGeneration();
+                const currentTransport = this.getCachedTransport(uuid);
+                yield this.writeProtocolV2Frame(currentTransport, frame);
+            }),
+            readFrame: () => __awaiter(this, void 0, void 0, function* () {
+                assertCurrentGeneration();
+                const rxFrame = yield this.readProtocolV2Frame(uuid);
+                if (!(rxFrame instanceof Uint8Array)) {
+                    throw new Error('Protocol V2 response is not Uint8Array');
+                }
+                return rxFrame;
+            }),
+            reset: (reason) => {
+                var _a;
+                (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
+                this.rejectProtocolV2Frames(uuid, new Error(reason));
+            },
+            logger: Log,
+            logPrefix: 'ProtocolV2 RN-BLE',
+            createTimeoutError: (messageName, timeout) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE response timeout after ${timeout}ms for ${messageName}`),
+        };
+    }
+    getProtocolType(path) {
+        return this.deviceProtocol.get(path);
+    }
 }
 
-module.exports = ReactNativeBleTransport;
+exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
+exports["default"] = ReactNativeBleTransport;
+exports.getProtocolV2BleTuning = getProtocolV2BleTuning;
+exports.resetProtocolV2BleTuning = resetProtocolV2BleTuning;