@onekeyfe/hd-transport-react-native 1.2.0-alpha.2 → 1.2.0-alpha.21

package/dist/index.js

@@ -138,21 +138,6 @@ const isSameBleUuid = (left, right) => {
 function hasWritableCapability(characteristic) {
     return !!(characteristic.isWritableWithResponse || characteristic.isWritableWithoutResponse);
 }
-function resolveBleWriteMode(characteristic, preferredMode = 'withoutResponse') {
-    if (preferredMode === 'withoutResponse' && characteristic.isWritableWithoutResponse) {
-        return 'withoutResponse';
-    }
-    if (preferredMode === 'withResponse' && characteristic.isWritableWithResponse) {
-        return 'withResponse';
-    }
-    if (characteristic.isWritableWithoutResponse) {
-        return 'withoutResponse';
-    }
-    if (characteristic.isWritableWithResponse) {
-        return 'withResponse';
-    }
-    return preferredMode;
-}
 function resolveProtocolV2PacketCapacity({ platform, iosPacketLength = IOS_PACKET_LENGTH, androidPacketLength = ANDROID_PACKET_LENGTH, mtu, }) {
     if (platform === 'ios') {
         return iosPacketLength;
@@ -189,7 +174,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;
@@ -261,6 +245,18 @@ class BleTransport {
 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;
 const transportCache = {};
@@ -299,16 +295,9 @@ 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 HIGH_VOLUME_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 : 6;
-const HIGH_VOLUME_WRITE_PAUSE_MS = reactNative.Platform.OS === 'ios' ? 6 : 2;
-const HIGH_VOLUME_WRITE_FLUSH_DELAY_MS = reactNative.Platform.OS === 'ios' ? 20 : 8;
 const DEFAULT_PROTOCOL_V2_BLE_TUNING = {
     iosPacketLength: IOS_PACKET_LENGTH,
     androidPacketLength: ANDROID_PACKET_LENGTH,
-    highVolumeWriteBurstSize: HIGH_VOLUME_WRITE_BURST_SIZE,
-    highVolumeWritePauseMs: HIGH_VOLUME_WRITE_PAUSE_MS,
-    highVolumeWriteFlushDelayMs: HIGH_VOLUME_WRITE_FLUSH_DELAY_MS,
-    highVolumeWriteWithResponse: false,
 };
 let protocolV2BleTuning = Object.assign({}, DEFAULT_PROTOCOL_V2_BLE_TUNING);
 const normalizePositiveInteger = (value, fallback) => {
@@ -318,20 +307,15 @@ const normalizePositiveInteger = (value, fallback) => {
     return Math.floor(normalized);
 };
 function configureProtocolV2BleTuning(tuning = {}) {
-    var _a;
     protocolV2BleTuning = {
         iosPacketLength: normalizePositiveInteger(tuning.iosPacketLength, protocolV2BleTuning.iosPacketLength),
         androidPacketLength: normalizePositiveInteger(tuning.androidPacketLength, protocolV2BleTuning.androidPacketLength),
-        highVolumeWriteBurstSize: normalizePositiveInteger(tuning.highVolumeWriteBurstSize, protocolV2BleTuning.highVolumeWriteBurstSize),
-        highVolumeWritePauseMs: normalizePositiveInteger(tuning.highVolumeWritePauseMs, protocolV2BleTuning.highVolumeWritePauseMs),
-        highVolumeWriteFlushDelayMs: normalizePositiveInteger(tuning.highVolumeWriteFlushDelayMs, protocolV2BleTuning.highVolumeWriteFlushDelayMs),
-        highVolumeWriteWithResponse: (_a = tuning.highVolumeWriteWithResponse) !== null && _a !== void 0 ? _a : protocolV2BleTuning.highVolumeWriteWithResponse,
     };
-    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 BLE tuning configured:', protocolV2BleTuning);
+    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] Protocol V2 BLE tuning reset:', protocolV2BleTuning);
+    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE tuning reset', protocolV2BleTuning);
 }
 function getProtocolV2BleTuning() {
     return Object.assign({}, protocolV2BleTuning);
@@ -371,9 +355,10 @@ const requestAndroidMtu = (device) => __awaiter(void 0, void 0, void 0, function
         return device;
     try {
         const mtuDevice = yield device.requestMTU(ANDROID_REQUEST_MTU);
-        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Android MTU requested:', {
+        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] MTU configured', {
+            deviceId: device.id,
             requested: ANDROID_REQUEST_MTU,
-            mtu: mtuDevice.mtu,
+            actual: mtuDevice.mtu,
         });
         return mtuDevice;
     }
@@ -414,8 +399,27 @@ class ReactNativeBleTransport {
         this.protocolV2Assemblers = new Map();
         this.protocolV2FrameQueues = new Map();
         this.protocolV2FramePromises = new Map();
-        this.activeProtocolV2Call = null;
-        this.nextProtocolV2CallToken = 1;
+        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;
@@ -431,7 +435,9 @@ class ReactNativeBleTransport {
     }
     configureProtocolV2(signedData) {
         this._messagesV2 = parseConfigure(signedData);
-        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 schema configured');
+        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() {
     }
@@ -624,13 +630,12 @@ class ReactNativeBleTransport {
                         return;
                     }
                 }
-                blePlxManager.startDeviceScan(null, {
+                blePlxManager.startDeviceScan(getBluetoothServiceUuids(), {
                     allowDuplicates: true,
                     scanMode: reactNativeBlePlx.ScanMode.LowLatency,
                 }, (error, device) => {
                     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));
@@ -653,22 +658,8 @@ class ReactNativeBleTransport {
                     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 shouldTraceCandidate = !!displayName && /onekey|bixinkey|pro\s*2|pro\b|touch|^k\d|^t\d/i.test(displayName);
-                    if (shouldTraceCandidate) {
-                        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] scan candidate', {
-                            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,
-                            accepted: isOneKey,
-                        });
-                    }
                     if (isOneKey) {
-                        Log === null || Log === void 0 ? void 0 : Log.debug('search device start ======================');
-                        const { name, localName, id, serviceUUIDs } = 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 : ''}\nserviceUUIDs: ${(serviceUUIDs !== null && serviceUUIDs !== void 0 ? serviceUUIDs : []).join(',')}`);
                         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:', {
@@ -679,10 +670,15 @@ class ReactNativeBleTransport {
                         });
                     }
                 });
-                getConnectedDeviceIds(getBluetoothServiceUuids()).then(devices => {
+                getConnectedDeviceIds(reactNative.Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(devices => {
                     for (const device of devices) {
-                        Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
-                        addDevice(device);
+                        const { serviceUUIDs } = device;
+                        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) => {
@@ -694,6 +690,12 @@ class ReactNativeBleTransport {
                             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(() => {
@@ -729,7 +731,6 @@ class ReactNativeBleTransport {
                 this.runPromise.reject(error);
                 this.rejectAllProtocolV2Frames(error);
                 this.runPromise = null;
-                this.activeProtocolV2Call = null;
                 Log === null || Log === void 0 ? void 0 : Log.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
             }
             const blePlxManager = yield this.getPlxManager();
@@ -854,7 +855,7 @@ class ReactNativeBleTransport {
         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}`);
@@ -866,19 +867,37 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
                     return;
                 }
-                if (this.runPromise) {
-                    let ERROR = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
+                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'))) {
+                        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);
@@ -907,7 +926,7 @@ class ReactNativeBleTransport {
                     return;
                 }
                 if (protocol === 'V2') {
-                    this.handleProtocolV2Notification(uuid, new Uint8Array(data));
+                    this.handleProtocolV2Notification(uuid, monitorToken, new Uint8Array(data));
                     return;
                 }
                 if (isHeaderChunk(data)) {
@@ -921,28 +940,32 @@ class ReactNativeBleTransport {
                     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);
                 const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
-                (_j = this.runPromise) === null || _j === void 0 ? void 0 : _j.reject(notifyError);
-                this.rejectAllProtocolV2Frames(notifyError);
+                if (this.deviceProtocol.get(uuid) === 'V2') {
+                    this.rejectProtocolV2Frames(uuid, notifyError);
+                }
+                else {
+                    (_r = this.runPromise) === null || _r === void 0 ? void 0 : _r.reject(notifyError);
+                }
             }
         }, notifyTransactionId);
         return subscription;
     }
     release(uuid, onclose = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const 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);
-                this.activeProtocolV2Call = null;
             }
             else {
                 this.resetProtocolV2Frames(uuid);
@@ -950,9 +973,6 @@ class ReactNativeBleTransport {
             if (reactNative.Platform.OS === 'android' && !onclose && transport) {
                 (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                 this.resetProtocolV2Frames(uuid);
-                if (((_b = this.activeProtocolV2Call) === null || _b === void 0 ? void 0 : _b.uuid) === uuid) {
-                    this.activeProtocolV2Call = null;
-                }
                 return Promise.resolve(true);
             }
             if (transport) {
@@ -960,14 +980,14 @@ class ReactNativeBleTransport {
                     this.monitorTokens.delete(uuid);
                 }
                 Log === null || Log === void 0 ? void 0 : Log.debug('release: removing disconnect subscription for device: ', uuid);
-                (_c = transport.disconnectSubscription) === null || _c === void 0 ? void 0 : _c.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: ', (_d = transport.notifyCharacteristic) === null || _d === void 0 ? void 0 : _d.uuid);
-                (_e = transport.notifySubscription) === null || _e === void 0 ? void 0 : _e.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 ((_f = this.blePlxManager) === null || _f === void 0 ? void 0 : _f.cancelTransaction(transport.notifyTransactionId));
+                        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);
@@ -976,12 +996,11 @@ class ReactNativeBleTransport {
                 delete transportCache[uuid];
             }
             this.deviceProtocol.delete(uuid);
-            this.deviceProtocolHints.delete(uuid);
-            (_g = this.protocolV2Assemblers.get(uuid)) === null || _g === void 0 ? void 0 : _g.reset();
+            (_f = this.protocolV2Assemblers.get(uuid)) === null || _f === void 0 ? void 0 : _f.reset();
             this.protocolV2Assemblers.delete(uuid);
             this.resetProtocolV2Frames(uuid);
             try {
-                yield ((_h = this.blePlxManager) === null || _h === void 0 ? void 0 : _h.cancelTransaction(uuid));
+                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);
@@ -1002,30 +1021,18 @@ class ReactNativeBleTransport {
             if (this._messages == null) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            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 protocol = this.getProtocolType(uuid);
             if (!protocol) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol has not been detected for ${uuid}`);
             }
-            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, ' protocol: ', protocol);
-            }
-            else {
-                Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data, ' protocol: ', protocol);
-            }
+            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';
+            if (this.runPromise && !forceRun) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
+            }
             return this.callProtocolV1(uuid, name, data, options);
         });
     }
@@ -1101,7 +1108,7 @@ class ReactNativeBleTransport {
                 });
             }
             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,
@@ -1190,7 +1197,6 @@ class ReactNativeBleTransport {
                 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 = ProtocolV1.decodeMessage(messages, response);
                 return check.call(jsonData);
             }
@@ -1216,9 +1222,9 @@ class ReactNativeBleTransport {
         this.stopped = true;
     }
     disconnect(session) {
-        var _a, _b, _c, _d, _e, _f;
+        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 {
@@ -1269,12 +1275,9 @@ class ReactNativeBleTransport {
             this.deviceProtocolHints.delete(session);
             this.protocolV2Assemblers.delete(session);
             this.resetProtocolV2Frames(session);
-            if (((_d = this.activeProtocolV2Call) === null || _d === void 0 ? void 0 : _d.uuid) === session) {
-                this.activeProtocolV2Call = null;
-            }
             try {
-                (_e = this.emitter) === null || _e === void 0 ? void 0 : _e.emit('device-disconnect', {
-                    name: (_f = transport === null || transport === void 0 ? void 0 : transport.device) === null || _f === void 0 ? void 0 : _f.name,
+                (_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,
                     id: session,
                     connectId: session,
                 });
@@ -1313,14 +1316,22 @@ class ReactNativeBleTransport {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
-                    Log === null || Log === void 0 ? void 0 : Log.debug(`[ReactNativeBleTransport] detectProtocol: uuid=${uuid} -> V1 (expected)`);
+                    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] detectProtocol: uuid=${uuid} -> V2 (expected)`);
+                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'];
@@ -1332,7 +1343,11 @@ class ReactNativeBleTransport {
                 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] detectProtocol: uuid=${uuid} -> ${protocol}`);
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
+                        deviceId: uuid,
+                        protocol,
+                        source: 'probe',
+                    });
                     return protocol;
                 }
             }
@@ -1341,14 +1356,12 @@ class ReactNativeBleTransport {
         });
     }
     resetProbeStateAfterProtocolProbe(uuid, protocol) {
-        var _a, _b, _c, _d;
+        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 (((_b = this.activeProtocolV2Call) === null || _b === void 0 ? void 0 : _b.uuid) === uuid) {
-                this.activeProtocolV2Call = null;
-            }
             if (this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
@@ -1360,11 +1373,11 @@ class ReactNativeBleTransport {
             if (this.monitorTokens.get(uuid) === transport.monitorToken) {
                 this.monitorTokens.delete(uuid);
             }
-            (_c = transport.notifySubscription) === null || _c === void 0 ? void 0 : _c.remove();
+            (_b = transport.notifySubscription) === null || _b === void 0 ? void 0 : _b.remove();
             transport.notifySubscription = undefined;
             if (previousNotifyTransactionId) {
                 try {
-                    yield ((_d = this.blePlxManager) === null || _d === void 0 ? void 0 : _d.cancelTransaction(previousNotifyTransactionId));
+                    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);
@@ -1426,14 +1439,10 @@ class ReactNativeBleTransport {
             return detected;
         });
     }
-    handleProtocolV2Notification(uuid, data) {
-        var _a, _b, _c;
+    handleProtocolV2Notification(uuid, monitorToken, data) {
         try {
-            if (!this.runPromise || ((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) !== uuid) {
-                (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
-                this.resetProtocolV2Frames(uuid);
+            if (this.monitorTokens.get(uuid) !== monitorToken)
                 return;
-            }
             if (data.length === 0)
                 return;
             const assembler = this.protocolV2Assemblers.get(uuid);
@@ -1446,8 +1455,10 @@ class ReactNativeBleTransport {
         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);
-            (_c = this.runPromise) === null || _c === void 0 ? void 0 : _c.reject(notifyError);
-            this.rejectAllProtocolV2Frames(notifyError);
+            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) {
@@ -1478,9 +1489,13 @@ class ReactNativeBleTransport {
         this.protocolV2FrameQueues.delete(uuid);
         this.protocolV2FramePromises.delete(uuid);
     }
-    isActiveProtocolV2Call(uuid, token) {
-        var _a;
-        return ((_a = this.activeProtocolV2Call) === null || _a === void 0 ? void 0 : _a.uuid) === uuid && this.activeProtocolV2Call.token === token;
+    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* () {
@@ -1500,7 +1515,7 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Frame(transport, frame, options) {
+    writeProtocolV2Frame(transport, frame) {
         return __awaiter(this, void 0, void 0, function* () {
             const tuning = getProtocolV2BleTuning();
             const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1509,131 +1524,79 @@ class ReactNativeBleTransport {
                 androidPacketLength: tuning.androidPacketLength,
                 mtu: reactNative.Platform.OS === 'android' ? transport.mtuSize : undefined,
             });
-            const writeWithResponse = !!(options === null || options === void 0 ? void 0 : options.writeWithResponse) || (!!(options === null || options === void 0 ? void 0 : options.highVolume) && tuning.highVolumeWriteWithResponse);
-            const writeMode = resolveBleWriteMode(transport.writeCharacteristic, writeWithResponse ? 'withResponse' : 'withoutResponse');
-            const shouldThrottle = !!(options === null || options === void 0 ? void 0 : options.highVolume) && writeMode === 'withoutResponse';
-            let packetsWritten = 0;
-            try {
-                for (let offset = 0; offset < frame.length; offset += packetCapacity) {
-                    const chunk = frame.slice(offset, offset + packetCapacity);
-                    const base64 = buffer.Buffer.from(chunk).toString('base64');
-                    if (writeMode === 'withResponse') {
-                        yield transport.writeCharacteristic.writeWithResponse(base64);
-                    }
-                    else {
-                        yield transport.writeCharacteristic.writeWithoutResponse(base64);
-                    }
-                    packetsWritten += 1;
-                    if (shouldThrottle &&
-                        packetsWritten % tuning.highVolumeWriteBurstSize === 0 &&
-                        offset + packetCapacity < frame.length) {
-                        yield delay(tuning.highVolumeWritePauseMs);
-                    }
-                }
-                if (shouldThrottle) {
-                    yield delay(tuning.highVolumeWriteFlushDelayMs);
-                }
-            }
-            catch (error) {
-                if ((options === null || options === void 0 ? void 0 : options.highVolume) && !writeWithResponse && packetsWritten === 0) {
-                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 high-volume writeWithoutResponse failed before data was sent, fallback to writeWithResponse:', error);
-                    yield this.writeProtocolV2Frame(transport, frame, {
-                        highVolume: true,
-                        writeWithResponse: true,
-                    });
-                    return;
-                }
-                throw error;
+            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) {
-        var _a, _b, _c, _d;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
-            if (this.runPromise) {
-                if (!forceRun) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
-                }
-                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
-                this.runPromise.reject(error);
-                this.rejectAllProtocolV2Frames(error);
-                this.runPromise = null;
-                this.activeProtocolV2Call = null;
-            }
-            const transport$1 = this.getCachedTransport(uuid);
-            const runPromise = hdShared.createDeferred();
-            runPromise.promise.catch(() => undefined);
-            this.runPromise = runPromise;
-            const callToken = this.nextProtocolV2CallToken++;
-            this.activeProtocolV2Call = { uuid, token: callToken };
-            (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
-            this.resetProtocolV2Frames(uuid);
-            let completed = false;
-            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_b = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _b !== void 0 ? _b : BLE_RESPONSE_TIMEOUT_MS });
+            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : BLE_RESPONSE_TIMEOUT_MS });
             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 uses throttled writeWithoutResponse:', name, {
+                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,
-                    burstSize: tuning.highVolumeWriteBurstSize,
-                    pauseMs: tuning.highVolumeWritePauseMs,
-                    flushDelayMs: tuning.highVolumeWriteFlushDelayMs,
-                    writeWithResponse: tuning.highVolumeWriteWithResponse,
                 });
             }
             try {
-                const session = new transport.ProtocolV2Session({
-                    schemas: {
-                        protocolV1: this._messages,
-                        protocolV2: this._messagesV2,
-                    },
-                    router: transport.PROTOCOL_V2_CHANNEL_BLE_UART,
-                    writeFrame: (frame) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.writeProtocolV2Frame(transport$1, frame, {
-                            highVolume: highVolumeWrite,
-                        });
-                    }),
-                    readFrame: () => __awaiter(this, void 0, void 0, function* () {
-                        const rxFrame = yield this.readProtocolV2Frame(uuid);
-                        if (!(rxFrame instanceof Uint8Array)) {
-                            throw new Error('Protocol V2 response is not Uint8Array');
-                        }
-                        return rxFrame;
-                    }),
-                    logger: Log,
-                    logPrefix: 'ProtocolV2 RN-BLE',
-                    createTimeoutError: (_messageName, timeout) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE response timeout after ${timeout}ms for ${name}`),
-                });
-                const result = yield session.call(name, data, callOptions);
-                completed = true;
-                return result;
+                return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, callOptions);
             }
             catch (e) {
-                if (this.isActiveProtocolV2Call(uuid, callToken)) {
-                    (_c = this.protocolV2Assemblers.get(uuid)) === null || _c === void 0 ? void 0 : _c.reset();
-                    this.resetProtocolV2Frames(uuid);
-                }
                 Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
                 throw e;
             }
-            finally {
-                if (this.isActiveProtocolV2Call(uuid, callToken)) {
-                    if (!completed) {
-                        (_d = this.protocolV2Assemblers.get(uuid)) === null || _d === void 0 ? void 0 : _d.reset();
-                    }
-                    this.resetProtocolV2Frames(uuid);
-                    this.activeProtocolV2Call = null;
-                }
-                if (this.runPromise === runPromise) {
-                    this.runPromise = null;
-                }
-            }
         });
     }
+    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);
     }