@onekeyfe/hd-transport-react-native 1.2.2-alpha.116 → 1.2.2-alpha.118

package/dist/index.js

@@ -384,8 +384,7 @@ const shouldRethrowProtocolProbeError = (error) => {
         code === hdShared.HardwareErrorCode.BleDeviceDisconnected ||
         code === hdShared.HardwareErrorCode.BleCharacteristicNotifyError ||
         code === hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure ||
-        code === hdShared.HardwareErrorCode.BleWriteCharacteristicError ||
-        isProtocolV2DefaultMtuError(error));
+        code === hdShared.HardwareErrorCode.BleWriteCharacteristicError);
 };
 const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const DEVICE_SCAN_TIMEOUT_MS = 3000;
@@ -433,25 +432,14 @@ const connectOptions = {
 const fallbackConnectOptions = {
     timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
 };
-const androidConnectOptions = {
-    timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
-};
 const androidRefreshGattConnectOptions = {
     timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
     refreshGatt: 'OnConnected',
 };
 const ANDROID_MTU_EXCHANGE_TIMEOUT_MS = 12000;
 const ANDROID_LINK_DROP_QUIET_MS = 5000;
-const ANDROID_LINK_DROP_TIMEOUT_MS = 8000;
 const ANDROID_LINK_DROP_POLL_MS = 250;
 const isKnownDefaultMtu = (mtu) => typeof mtu === 'number' && Number.isFinite(mtu) && mtu <= 23;
-const DEFAULT_MTU_LINK_MESSAGE = 'BLE link stayed at the default MTU';
-const createDefaultMtuLinkError = (mtu) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `${DEFAULT_MTU_LINK_MESSAGE} ${String(mtu)}, reconnecting on a fresh link`);
-const PROTOCOL_V2_DEFAULT_MTU_MESSAGE = 'Protocol V2 needs a negotiated BLE MTU';
-const isProtocolV2DefaultMtuError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleConnectedError &&
-    typeof (error === null || error === void 0 ? void 0 : error.message) === 'string' &&
-    error.message.startsWith(PROTOCOL_V2_DEFAULT_MTU_MESSAGE);
-const createProtocolV2DefaultMtuError = (mtu) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `${PROTOCOL_V2_DEFAULT_MTU_MESSAGE}, current MTU ${String(mtu)}`);
 const isMissingGattShapeError = (error) => {
     const code = error === null || error === void 0 ? void 0 : error.errorCode;
     const message = error === null || error === void 0 ? void 0 : error.message;
@@ -481,9 +469,10 @@ const isWedgedBleSetupError = (error) => (error === null || error === void 0 ? v
     error.message.startsWith(BLE_SETUP_WEDGED_MESSAGE);
 const shouldRethrowBleSetupError = (error) => isConnectTimeoutError(error) || isWedgedBleSetupError(error);
 const isNativeOperationTimeoutError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === reactNativeBlePlx.BleErrorCode.OperationTimedOut;
-const isAbandonedNativeOperationError = (error) => {
+const isMtuOrCancelledConnectError = (error) => {
     const errorCode = error === null || error === void 0 ? void 0 : error.errorCode;
-    return (errorCode === reactNativeBlePlx.BleErrorCode.OperationTimedOut || errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled);
+    return (errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
+        errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled);
 };
 const tryToGetConfiguration = (device) => {
     if (!device || !device.serviceUUIDs)
@@ -498,7 +487,7 @@ const tryToGetConfiguration = (device) => {
 };
 const requestNegotiatedMtu = (device, stage, attempt, cancelTransaction) => __awaiter(void 0, void 0, void 0, function* () {
     if (reactNative.Platform.OS !== 'ios' && reactNative.Platform.OS !== 'android')
-        return { device, abandoned: false };
+        return { device, timedOut: false };
     const transactionId = `${device.id}:mtu:${stage}:${attempt}:${Date.now()}`;
     let timeoutId;
     let timedOut = false;
@@ -514,7 +503,7 @@ const requestNegotiatedMtu = (device, stage, attempt, cancelTransaction) => __aw
                 }, BLE_MTU_REQUEST_TIMEOUT_MS);
             }),
         ]);
-        return { device: mtuDevice, abandoned: false };
+        return { device: mtuDevice, timedOut: false };
     }
     catch (error) {
         if (timedOut && cancelTransaction) {
@@ -542,9 +531,10 @@ const requestNegotiatedMtu = (device, stage, attempt, cancelTransaction) => __aw
             stage,
             attempt,
             actual: device.mtu,
+            timedOut,
             error: error instanceof Error ? error.message : String(error),
         });
-        return { device, abandoned: timedOut };
+        return { device, timedOut };
     }
     finally {
         if (timeoutId)
@@ -553,7 +543,7 @@ const requestNegotiatedMtu = (device, stage, attempt, cancelTransaction) => __aw
 });
 const resolveNegotiatedMtu = (device, cancelTransaction) => shouldRefreshNegotiatedMtu(device.mtu)
     ? requestNegotiatedMtu(device, 'connected', 0, cancelTransaction)
-    : Promise.resolve({ device, abandoned: false });
+    : Promise.resolve({ device, timedOut: false });
 function remapError(error) {
     var _a;
     if (error instanceof reactNativeBlePlx.BleError) {
@@ -590,12 +580,8 @@ class ReactNativeBleTransport {
         this.sessionProtocols = new Map();
         this.confirmedProtocolV2 = new Set();
         this.protocolReprobeFailures = new Map();
-        this.silentDetections = new Set();
+        this.silentDetections = new Map();
         this.androidGattCacheRefreshes = new Set();
-        this.androidMtuExchangeTimeoutMs = ANDROID_MTU_EXCHANGE_TIMEOUT_MS;
-        this.androidLinkDropQuietMs = ANDROID_LINK_DROP_QUIET_MS;
-        this.androidLinkDropTimeoutMs = ANDROID_LINK_DROP_TIMEOUT_MS;
-        this.protocolWakeAttempts = new Set();
         this.staleBondErrors = new Map();
         this.acquiringProtocolV2 = new Set();
         this.protocolV2Assemblers = new Map();
@@ -829,10 +815,9 @@ class ReactNativeBleTransport {
                 transport.notifySubscription = undefined;
                 let { device } = transport;
                 const isConnected = yield device.isConnected().catch(() => false);
-                const reconnectOptions = reactNative.Platform.OS === 'android' ? androidRefreshGattConnectOptions : connectOptions;
                 if (!isConnected) {
                     try {
-                        device = yield this.connectWithTimeout(uuid, () => device.connect(reconnectOptions));
+                        device = yield this.connectWithTimeout(uuid, () => device.connect(connectOptions));
                     }
                     catch (e) {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
@@ -845,16 +830,7 @@ class ReactNativeBleTransport {
                     }
                 }
                 const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, device);
-                if (reactNative.Platform.OS === 'android') {
-                    const manager = yield this.getPlxManager();
-                    device = yield this.negotiateAndroidMtu(uuid, manager, device);
-                    if (isKnownDefaultMtu(device.mtu)) {
-                        yield this.dropAndroidLink(uuid, manager, device, 'firmware reconnect default mtu');
-                        throw createDefaultMtuLinkError(device.mtu);
-                    }
-                }
                 transport.device = device;
-                transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
                 transport.writeCharacteristic = writeCharacteristic;
                 transport.notifyCharacteristic = notifyCharacteristic;
                 const monitorToken = this.nextMonitorToken;
@@ -1001,7 +977,7 @@ class ReactNativeBleTransport {
     }
     installTransportForAcquire(uuid, device, characteristics) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsForAcquire(uuid, device));
+            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsWithTimeout(uuid, device));
             if (this.stopped)
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
@@ -1079,9 +1055,7 @@ class ReactNativeBleTransport {
                     const isCachedDeviceConnected = yield cachedTransport.device
                         .isConnected()
                         .catch(() => false);
-                    const isCachedAndroidLinkUsable = reactNative.Platform.OS !== 'android' ||
-                        (!isKnownDefaultMtu(cachedTransport.mtuSize) &&
-                            !this.androidGattCacheRefreshes.has(uuid));
+                    const isCachedAndroidLinkUsable = reactNative.Platform.OS !== 'android' || !this.androidGattCacheRefreshes.has(uuid);
                     if (isCachedDeviceConnected &&
                         isCachedAndroidLinkUsable &&
                         cachedProtocol &&
@@ -1102,7 +1076,7 @@ class ReactNativeBleTransport {
             if (isAndroid) {
                 nativeConnectOptions = refreshAndroidGattCache
                     ? androidRefreshGattConnectOptions
-                    : androidConnectOptions;
+                    : fallbackConnectOptions;
             }
             let androidRefreshConnectRan = false;
             if (forceCleanRunPromise && this.runPromise) {
@@ -1113,6 +1087,7 @@ class ReactNativeBleTransport {
                 Log === null || Log === void 0 ? void 0 : Log.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
             }
             const blePlxManager = yield this.getPlxManager();
+            let skipPostConnectMtu = false;
             try {
                 yield subscribeBleOn(blePlxManager);
             }
@@ -1162,10 +1137,9 @@ class ReactNativeBleTransport {
                     if (shouldRethrowBleSetupError(e)) {
                         throw e;
                     }
-                    if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
-                        e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
+                    if (isMtuOrCancelledConnectError(e)) {
+                        skipPostConnectMtu = true;
                         Log === null || Log === void 0 ? void 0 : Log.debug('first try to reconnect without params');
-                        yield this.runBestEffortNativeOperation('connect cancelled: cancel manager connection', () => blePlxManager.cancelDeviceConnection(uuid));
                         device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, fallbackConnectOptions));
                     }
                     else if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
@@ -1180,7 +1154,9 @@ class ReactNativeBleTransport {
             if (!device) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'unable to connect to device');
             }
-            if (isAndroid && refreshAndroidGattCache && (yield device.isConnected().catch(() => false))) {
+            if (refreshAndroidGattCache &&
+                !androidRefreshConnectRan &&
+                (yield device.isConnected().catch(() => false))) {
                 yield this.dropAndroidLink(uuid, blePlxManager, device, 'gatt cache refresh');
                 if (this.stopped)
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
@@ -1197,10 +1173,9 @@ class ReactNativeBleTransport {
                     if (shouldRethrowBleSetupError(e)) {
                         throw e;
                     }
-                    if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
-                        e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
+                    if (isMtuOrCancelledConnectError(e)) {
+                        skipPostConnectMtu = true;
                         Log === null || Log === void 0 ? void 0 : Log.debug('second try to reconnect without params');
-                        yield this.runBestEffortNativeOperation('connect cancelled: cancel device connection', () => disconnectedDevice.cancelConnection());
                         try {
                             device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
                         }
@@ -1238,35 +1213,32 @@ class ReactNativeBleTransport {
             let characteristics;
             if (isAndroid) {
                 if (refreshAndroidGattCache) {
-                    characteristics = yield this.resolveCharacteristicsForAcquire(uuid, device);
+                    characteristics = yield this.resolveCharacteristicsWithTimeout(uuid, device);
                     if (androidRefreshConnectRan)
                         this.androidGattCacheRefreshes.delete(uuid);
                     if (this.stopped)
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
                 }
                 device = yield this.negotiateAndroidMtu(uuid, blePlxManager, device);
-                if (isKnownDefaultMtu(device.mtu)) {
-                    const resetManager = this.abandonStalledConnection(uuid, 'mtu-default');
-                    yield this.dropAndroidLink(uuid, blePlxManager, device, 'default mtu');
-                    if (resetManager)
-                        throw this.createWedgedBleSetupError();
-                    throw createDefaultMtuLinkError(device.mtu);
-                }
             }
-            else {
-                const negotiatedMtu = yield resolveNegotiatedMtu(device, transactionId => blePlxManager.cancelTransaction(transactionId));
-                device = negotiatedMtu.device;
-                if (negotiatedMtu.abandoned) {
-                    yield this.runNativeTeardown(uuid, blePlxManager, () => __awaiter(this, void 0, void 0, function* () {
-                        yield this.runBestEffortNativeOperation('mtu abandoned: cancel manager connection', () => blePlxManager.cancelDeviceConnection(uuid));
-                    }));
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'BLE MTU negotiation abandoned, reconnecting');
+            else if (!skipPostConnectMtu) {
+                const mtuResult = yield resolveNegotiatedMtu(device, transactionId => blePlxManager.cancelTransaction(transactionId));
+                device = mtuResult.device;
+                if (mtuResult.timedOut) {
+                    if (this.stopped)
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] post-connect MTU timed out, reconnecting without requesting MTU');
+                    const timedOutDevice = device;
+                    yield this.runBestEffortNativeOperation('mtu timeout: cancel device connection', () => timedOutDevice.cancelConnection());
+                    if (this.stopped)
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+                    device = yield this.connectWithTimeout(uuid, () => timedOutDevice.connect(fallbackConnectOptions));
                 }
             }
             if (this.stopped)
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const acquiredDevice = device;
-            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsForAcquire(uuid, acquiredDevice));
+            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice));
             if (this.stopped)
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const protocolHint = expectedProtocol
@@ -1333,7 +1305,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, _k, _l, _m, _o, _p;
+            var _a, _b, _c, _d, _e, _f;
             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}`);
@@ -1350,38 +1322,29 @@ class ReactNativeBleTransport {
                     this.rememberStaleBondError(uuid, toBleStaleBondHardwareError(error));
                     return;
                 }
+                if (reactNative.Platform.OS === 'android' && isStaleGattTableNotifyReason(error.reason)) {
+                    this.androidGattCacheRefreshes.add(uuid);
+                }
                 if (this.getActiveProtocol(uuid) === 'V2') {
                     let errorCode = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
                     if ((_a = error.reason) === null || _a === void 0 ? void 0 : _a.includes('The connection has timed out unexpectedly')) {
                         errorCode = hdShared.HardwareErrorCode.BleTimeoutError;
                     }
-                    else if (((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('Cannot write client characteristic config descriptor')) ||
-                        ((_c = error.reason) === null || _c === void 0 ? void 0 : _c.includes('Cannot find client characteristic config descriptor')) ||
-                        ((_d = error.reason) === null || _d === void 0 ? void 0 : _d.includes('The handle is invalid')) ||
-                        ((_e = error.reason) === null || _e === void 0 ? void 0 : _e.includes('Writing is not permitted')) ||
-                        ((_f = error.reason) === null || _f === void 0 ? void 0 : _f.includes('notify change failed for device'))) {
+                    else if (isStaleGattTableNotifyReason(error.reason) ||
+                        ((_b = error.reason) === null || _b === void 0 ? void 0 : _b.includes('notify change failed for device'))) {
                         errorCode = hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure;
                     }
-                    if (reactNative.Platform.OS === 'android' && isStaleGattTableNotifyReason(error.reason)) {
-                        this.androidGattCacheRefreshes.add(uuid);
-                    }
                     this.rejectProtocolV2Frames(uuid, hdShared.ERRORS.TypedError(errorCode));
                     return;
                 }
                 if (this.runPromise && this.runPromiseDeviceId === uuid) {
                     let ERROR = hdShared.HardwareErrorCode.BleCharacteristicNotifyError;
-                    if ((_g = error.reason) === null || _g === void 0 ? void 0 : _g.includes('The connection has timed out unexpectedly')) {
+                    if ((_c = error.reason) === null || _c === void 0 ? void 0 : _c.includes('The connection has timed out unexpectedly')) {
                         ERROR = hdShared.HardwareErrorCode.BleTimeoutError;
                     }
-                    if (((_h = error.reason) === null || _h === void 0 ? void 0 : _h.includes('Cannot write client characteristic config descriptor')) ||
-                        ((_j = error.reason) === null || _j === void 0 ? void 0 : _j.includes('Cannot find client characteristic config descriptor')) ||
-                        ((_k = error.reason) === null || _k === void 0 ? void 0 : _k.includes('The handle is invalid')) ||
-                        ((_l = error.reason) === null || _l === void 0 ? void 0 : _l.includes('Writing is not permitted')) ||
-                        ((_m = error.reason) === null || _m === void 0 ? void 0 : _m.includes('notify change failed for device'))) {
+                    if (isStaleGattTableNotifyReason(error.reason) ||
+                        ((_d = error.reason) === null || _d === void 0 ? void 0 : _d.includes('notify change failed for device'))) {
                         const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure);
-                        if (reactNative.Platform.OS === 'android' && isStaleGattTableNotifyReason(error.reason)) {
-                            this.androidGattCacheRefreshes.add(uuid);
-                        }
                         this.runPromise.reject(notifyError);
                         Log === null || Log === void 0 ? void 0 : Log.debug(`${hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`);
                         return;
@@ -1422,7 +1385,7 @@ class ReactNativeBleTransport {
                     bufferLength = 0;
                     buffer$1 = [];
                     if (this.runPromiseDeviceId === uuid) {
-                        (_o = this.runPromise) === null || _o === void 0 ? void 0 : _o.resolve(value.toString('hex'));
+                        (_e = this.runPromise) === null || _e === void 0 ? void 0 : _e.resolve(value.toString('hex'));
                     }
                 }
             }
@@ -1433,7 +1396,7 @@ class ReactNativeBleTransport {
                     this.rejectProtocolV2Frames(uuid, notifyError);
                 }
                 else if (this.runPromiseDeviceId === uuid) {
-                    (_p = this.runPromise) === null || _p === void 0 ? void 0 : _p.reject(notifyError);
+                    (_f = this.runPromise) === null || _f === void 0 ? void 0 : _f.reject(notifyError);
                 }
             }
         }, notifyTransactionId);
@@ -1709,13 +1672,14 @@ class ReactNativeBleTransport {
                 return check.call(jsonData);
             }
             catch (e) {
-                if (name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS) {
-                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe call failed:', e);
+                const isProbeTimeout = (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS &&
+                    (name === 'GetFeatures' || name === 'Initialize');
+                if (isProbeTimeout) {
+                    Log === null || Log === void 0 ? void 0 : Log.debug(`[ReactNativeBleTransport] Protocol V1 ${name} probe call failed:`, e);
                 }
                 else {
                     Log === null || Log === void 0 ? void 0 : Log.error('call error: ', e);
                 }
-                const isProbeTimeout = name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS;
                 const isStaleCall = this.runPromise !== runPromise;
                 if (!isProbeTimeout &&
                     !isStaleCall &&
@@ -1921,51 +1885,46 @@ class ReactNativeBleTransport {
             if (!shouldRefreshNegotiatedMtu(device.mtu))
                 return device;
             const startedAt = Date.now();
-            const transactionId = `${device.id}:mtu:connected:0:${startedAt}`;
             let timer;
             let timedOut = false;
-            const request = device.requestMTU(ANDROID_REQUEST_MTU, transactionId);
-            request.catch(() => undefined);
+            let negotiated = device;
+            let failure;
             try {
-                const negotiated = yield Promise.race([
-                    request,
+                negotiated = yield Promise.race([
+                    device.requestMTU(ANDROID_REQUEST_MTU, `${device.id}:mtu:connected:0:${startedAt}`),
                     new Promise((_, reject) => {
                         timer = setTimeout(() => {
                             timedOut = true;
-                            reject(new Error(`BLE MTU exchange timeout after ${this.androidMtuExchangeTimeoutMs}ms`));
-                        }, this.androidMtuExchangeTimeoutMs);
+                            reject(new Error(`BLE MTU exchange timeout after ${ANDROID_MTU_EXCHANGE_TIMEOUT_MS}ms`));
+                        }, ANDROID_MTU_EXCHANGE_TIMEOUT_MS);
                     }),
                 ]);
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE MTU exchange completed', {
-                    connectIdSuffix: uuid.slice(-8),
-                    elapsedMs: Date.now() - startedAt,
-                    actual: negotiated.mtu,
-                });
-                return negotiated;
             }
             catch (error) {
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE MTU exchange failed', {
-                    connectIdSuffix: uuid.slice(-8),
-                    elapsedMs: Date.now() - startedAt,
-                    timedOut,
-                    actual: device.mtu,
-                    error: error instanceof Error ? error.message : String(error),
-                });
-                if (this.stopped)
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
-                if (!timedOut)
-                    return device;
-                yield Promise.resolve(manager.cancelTransaction(transactionId)).catch(() => undefined);
-                const resetManager = this.abandonStalledConnection(uuid, 'mtu-backstop');
-                yield this.dropAndroidLink(uuid, manager, device, 'mtu exchange timeout');
-                if (resetManager)
-                    throw this.createWedgedBleSetupError();
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'BLE MTU exchange did not complete, reconnecting on a fresh link');
+                failure = error instanceof Error ? error.message : String(error);
             }
             finally {
                 if (timer)
                     clearTimeout(timer);
             }
+            Log === null || Log === void 0 ? void 0 : Log.debug(`[ReactNativeBleTransport] BLE MTU exchange ${failure ? 'failed' : 'completed'}`, {
+                connectIdSuffix: uuid.slice(-8),
+                elapsedMs: Date.now() - startedAt,
+                timedOut,
+                actual: negotiated.mtu,
+                error: failure,
+            });
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+            if (!timedOut && !isKnownDefaultMtu(negotiated.mtu))
+                return negotiated;
+            const resetManager = this.abandonStalledConnection(uuid, timedOut ? 'mtu-backstop' : 'mtu-default');
+            yield this.dropAndroidLink(uuid, manager, negotiated, timedOut ? 'mtu exchange timeout' : 'default mtu');
+            if (resetManager)
+                throw this.createWedgedBleSetupError();
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, timedOut
+                ? 'BLE MTU exchange did not complete, reconnecting on a fresh link'
+                : `BLE link stayed at the default MTU ${negotiated.mtu}, reconnecting on a fresh link`);
         });
     }
     dropAndroidLink(uuid, manager, device, reason) {
@@ -1977,50 +1936,16 @@ class ReactNativeBleTransport {
                 ]);
             }));
             const startedAt = Date.now();
-            const target = uuid.toUpperCase();
-            let registryClear = false;
-            let quietPeriodElapsed = false;
-            while (!this.stopped) {
-                const elapsed = Date.now() - startedAt;
-                quietPeriodElapsed = elapsed >= this.androidLinkDropQuietMs;
-                if (!registryClear) {
-                    const connected = yield getConnectedDeviceIds([]).catch(() => undefined);
-                    registryClear =
-                        !!connected &&
-                            !connected.some(peripheral => { var _a; return String((_a = peripheral === null || peripheral === void 0 ? void 0 : peripheral.id) !== null && _a !== void 0 ? _a : '').toUpperCase() === target; });
-                }
-                if ((registryClear && quietPeriodElapsed) || elapsed >= this.androidLinkDropTimeoutMs) {
-                    break;
-                }
+            while (!this.stopped && Date.now() - startedAt < ANDROID_LINK_DROP_QUIET_MS) {
                 yield delay(ANDROID_LINK_DROP_POLL_MS);
             }
             Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Android BLE link drop', {
                 connectIdSuffix: uuid.slice(-8),
                 reason,
-                registryClear,
-                quietPeriodElapsed,
                 stopped: this.stopped,
-                elapsedMs: Date.now() - startedAt,
             });
         });
     }
-    resolveCharacteristicsForAcquire(uuid, device) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield this.resolveCharacteristicsWithTimeout(uuid, device);
-            }
-            catch (error) {
-                if (reactNative.Platform.OS === 'android' && isMissingGattShapeError(error)) {
-                    this.androidGattCacheRefreshes.add(uuid);
-                    const manager = this.blePlxManager;
-                    if (manager) {
-                        yield this.dropAndroidLink(uuid, manager, device, 'stale gatt table');
-                    }
-                }
-                throw error;
-            }
-        });
-    }
     connectWithTimeout(uuid, connect) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped)
@@ -2088,12 +2013,15 @@ class ReactNativeBleTransport {
                 return result;
             }
             catch (error) {
-                if (timedOut || isAbandonedNativeOperationError(error)) {
+                if (timedOut || isNativeOperationTimeoutError(error)) {
                     const resetManager = this.abandonStalledConnection(uuid, timedOut ? 'gatt-backstop' : 'gatt-native');
                     if (resetManager) {
                         throw this.createWedgedBleSetupError();
                     }
                 }
+                if (reactNative.Platform.OS === 'android' && isMissingGattShapeError(error)) {
+                    this.androidGattCacheRefreshes.add(uuid);
+                }
                 throw error;
             }
             finally {
@@ -2246,7 +2174,6 @@ class ReactNativeBleTransport {
         this.sessionProtocols.clear();
         this.protocolReprobeFailures.clear();
         this.silentDetections.clear();
-        this.protocolWakeAttempts.clear();
         this.writeTimeoutCounts.clear();
         this.connectionSetupTimeoutCounts.clear();
         this.monitorTokens.clear();
@@ -2341,7 +2268,6 @@ class ReactNativeBleTransport {
                     }
                     this.protocolReprobeFailures.delete(uuid);
                     this.silentDetections.delete(uuid);
-                    this.protocolWakeAttempts.delete(uuid);
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol,
@@ -2350,7 +2276,8 @@ class ReactNativeBleTransport {
                     return protocol;
                 }
             }
-            this.silentDetections.add(uuid);
+            if (!this.silentDetections.has(uuid))
+                this.silentDetections.set(uuid, 'silent');
             if (trustSessionProtocol) {
                 this.protocolReprobeFailures.set(uuid, reprobeFailures + 1);
             }
@@ -2364,17 +2291,12 @@ class ReactNativeBleTransport {
     }
     wakeSilentProtocolV1Device(uuid, probeOrder) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages)
-                return;
-            if (!probeOrder.includes('V1'))
-                return;
-            if (!this.silentDetections.has(uuid))
+            if (reactNative.Platform.OS !== 'android' ||
+                !probeOrder.includes('V1') ||
+                this.silentDetections.get(uuid) !== 'silent') {
                 return;
-            if (this.protocolWakeAttempts.has(uuid))
-                return;
-            if (!transportCache[uuid])
-                return;
-            this.protocolWakeAttempts.add(uuid);
+            }
+            this.silentDetections.set(uuid, 'woken');
             Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] sending Protocol V1 Initialize wake', {
                 connectIdSuffix: uuid.slice(-8),
             });
@@ -2383,11 +2305,8 @@ class ReactNativeBleTransport {
                 yield this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
             }
             catch (error) {
-                if (shouldRethrowProtocolProbeError(error)) {
-                    this.clearProbeProtocol(uuid, 'V1');
+                if (shouldRethrowProtocolProbeError(error))
                     throw error;
-                }
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 Initialize wake did not answer:', error);
             }
             finally {
                 this.clearProbeProtocol(uuid, 'V1');
@@ -2648,12 +2567,6 @@ class ReactNativeBleTransport {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            if (reactNative.Platform.OS === 'android') {
-                const activeTransport = transportCache[uuid];
-                if (activeTransport && isKnownDefaultMtu(activeTransport.mtuSize)) {
-                    throw createProtocolV2DefaultMtuError(activeTransport.mtuSize);
-                }
-            }
             const isProtocolProbe = this.probingProtocols.get(uuid) === 'V2';
             const callOptions = options;
             const highThroughputWrite = transport.isProtocolV2HighThroughputCall(name);
@@ -2717,11 +2630,11 @@ class ReactNativeBleTransport {
             const transport = this.getCachedTransport(uuid);
             if (!shouldRefreshNegotiatedMtu(transport.mtuSize))
                 return;
-            const { device: refreshedDevice, abandoned } = yield requestNegotiatedMtu(transport.device, 'highThroughput', 1, transactionId => { var _a; return (_a = this.blePlxManager) === null || _a === void 0 ? void 0 : _a.cancelTransaction(transactionId); });
+            const { device: refreshedDevice } = yield requestNegotiatedMtu(transport.device, 'highThroughput', 1, transactionId => { var _a; return (_a = this.blePlxManager) === null || _a === void 0 ? void 0 : _a.cancelTransaction(transactionId); });
             transport.device = refreshedDevice;
             transport.mtuSize =
                 typeof refreshedDevice.mtu === 'number' ? refreshedDevice.mtu : transport.mtuSize;
-            if (abandoned || shouldRefreshNegotiatedMtu(transport.mtuSize)) {
+            if (shouldRefreshNegotiatedMtu(transport.mtuSize)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Protocol V2 high-throughput BLE MTU unavailable: ${String(transport.mtuSize)}`);
             }
         });
@@ -2835,7 +2748,6 @@ class ReactNativeBleTransport {
 }
 
 exports.ANDROID_LINK_DROP_QUIET_MS = ANDROID_LINK_DROP_QUIET_MS;
-exports.ANDROID_LINK_DROP_TIMEOUT_MS = ANDROID_LINK_DROP_TIMEOUT_MS;
 exports.ANDROID_MTU_EXCHANGE_TIMEOUT_MS = ANDROID_MTU_EXCHANGE_TIMEOUT_MS;
 exports.BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD;
 exports.BLE_CONNECT_TIMEOUT_MS = BLE_CONNECT_TIMEOUT_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.116",
+  "version": "1.2.2-alpha.118",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,11 +20,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.2-alpha.116",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.116",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.116",
+    "@onekeyfe/hd-core": "1.2.2-alpha.118",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.118",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.118",
     "@onekeyfe/react-native-ble-utils": "0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "222deb57d08349d95cfcaa8fac4b705e3aeaff8a"
+  "gitHead": "f73c3ec61e0ffe97c1d38b18058a18e169a72217"
 }