npm - @onekeyfe/hd-transport-react-native - Versions diffs - 1.2.2-alpha.115 → 1.2.2-alpha.117 - Mend

@onekeyfe/hd-transport-react-native 1.2.2-alpha.115 → 1.2.2-alpha.117

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/index.d.ts +24 -23
package/dist/index.d.ts.map +1 -1
package/dist/index.js +181 -71
package/package.json +5 -5
package/src/__tests__/connectTimeout.test.ts +84 -0
package/src/__tests__/protocolV2Link.test.ts +413 -30
package/src/index.ts +261 -137

package/dist/index.d.ts CHANGED Viewed

@@ -74,6 +74,16 @@ declare function getProtocolV2BleTuning(): {
     iosPacketLength: number;
     androidPacketLength: number;
 };
+/**
+ * With no cached GATT table the stack runs its own discovery (up to ~8s) before the MTU
+ * exchange, so the bound sits above that; a stuck exchange never completes.
+ */
+declare const ANDROID_MTU_EXCHANGE_TIMEOUT_MS = 12000;
+/**
+ * Android keeps an LE link, with per-link ATT state such as a pending MTU exchange, for its
+ * 4s GATT link idle timer after the last client closes; a reconnect inside it reuses the link.
+ */
+declare const ANDROID_LINK_DROP_QUIET_MS = 5000;
 /**
  * JS backstop for connect. The native adapter applies its own 3s budget, but it
  * schedules that timeout on its serial queue, so a busy queue (e.g. right after a
@@ -135,15 +145,10 @@ declare class ReactNativeBleTransport {
     private confirmedProtocolV2;
     /** Consecutive detections that failed while trusting sessionProtocols. */
     private protocolReprobeFailures;
-    /** Endpoints whose last detection got no answer on any protocol. */
+    /** Endpoints whose last detection got no answer; 'woken' once their Initialize wake is spent. */
     private silentDetections;
-    /**
-     * Endpoints already sent a Protocol V1 wake. The wake starts a fresh wallet session
-     * on the device, and a failed detection tears the link down and reconnects on every
-     * poll, so neither set is cleared on teardown: one wake is spent per endpoint until a
-     * detection succeeds, which re-arms it for the next time the device sleeps.
-     */
-    private protocolWakeAttempts;
+    /** Android endpoints whose cached GATT table is suspect; the next connect refreshes it. */
+    private androidGattCacheRefreshes;
     /**
      * Native encryption/pairing failures seen before Protocol V2 probe starts.
      * Pro2/Neo GATT connect can succeed on a stale iOS bond; the CCCD write then
@@ -203,6 +208,13 @@ declare class ReactNativeBleTransport {
     private runBestEffortNativeOperation;
     private runLifecycleOperation;
     cancel(): Promise<void>;
+    /**
+     * Android: request the MTU with nothing queued ahead and never close the client while it is
+     * outstanding; a link that times out or stays at MTU 23 is dropped.
+     */
+    private negotiateAndroidMtu;
+    /** Close the client and wait out the link idle timer so the next connect gets a fresh link. */
+    private dropAndroidLink;
     /** Run a native connect under the JS backstop budget. */
     private connectWithTimeout;
     /** Resolve the complete GATT shape under a budget so acquire() always settles. */
@@ -238,20 +250,9 @@ declare class ReactNativeBleTransport {
     private getActiveProtocol;
     private detectProtocol;
     /**
-     * Sent once before probing when the previous detection on this endpoint got no answer
-     * at all. On Classic-family firmware that silence is also what a sleeping device looks
-     * like: its BLE co-processor keeps serving connect, GATT and MTU while the main MCU
-     * sits in the screensaver loop, whose host-message filter accepts only Initialize and
-     * the *Ack messages. GetFeatures and Ping are dropped there without a reply, so no
-     * amount of probing can bring the device back.
-     *
-     * Initialize is the one message that breaks that loop, but it also starts a fresh
-     * wallet session, which is why it is not the probe itself — a bare Initialize on every
-     * acquire would drop a hidden-wallet session before Core can restore it. Requiring a
-     * fully silent previous detection keeps it to devices with no session left to protect.
-     *
-     * The firmware consumes the wake to leave its loop and does not reliably answer it, so
-     * the result is ignored: the probes that follow are what decide the protocol.
+     * A sleeping Classic drops GetFeatures/Ping and only leaves its screensaver on Initialize, which
+     * resets the wallet session, so it is sent once after a fully silent detection. The firmware does
+     * not reliably answer it, so its timeout must not drop the link.
      */
     private wakeSilentProtocolV1Device;
     private resetProbeStateAfterProtocolProbe;
@@ -277,4 +278,4 @@ declare class ReactNativeBleTransport {
     getProtocolType(path: string): ProtocolType | undefined;
 }
-export { BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_GATT_SETUP_TIMEOUT_MS, BLE_NATIVE_TEARDOWN_TIMEOUT_MS, BLE_SETUP_WEDGED_MESSAGE, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, PROTOCOL_REPROBE_FALLBACK_ATTEMPTS, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };
+export { ANDROID_LINK_DROP_QUIET_MS, ANDROID_MTU_EXCHANGE_TIMEOUT_MS, BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_GATT_SETUP_TIMEOUT_MS, BLE_NATIVE_TEARDOWN_TIMEOUT_MS, BLE_SETUP_WEDGED_MESSAGE, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, PROTOCOL_REPROBE_FALLBACK_ATTEMPTS, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAGL,UAAU,IAAI,aAAa,EAG5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAChB,KAAK,oBAAoB,EAIzB,KAAK,YAAY,EAKjB,KAAK,oBAAoB,EAI1B,MAAM,wBAAwB,CAAC;AAgChC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,8BAA8B,GAAG,eAAe,GAAG;IAMtD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAkBF,KAAK,4BAA4B,GAAG,WAAW,CAAC;AAChD,KAAK,0BAA0B,GAAG;IAChC,mBAAmB,EAAE,cAAc,CAAC;IACpC,oBAAoB,EAAE,cAAc,CAAC;CACtC,CAAC;AAkCF,eAAO,MAAM,+BAA+B,UACnC,OAAO,KACb,4BAA4B,GAAG,IAsBjC,CAAC;AAcF,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AAwBpD,eAAO,MAAM,yCAAyC,IAAI,CAAC;AAI3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAiBF,wBAAgB,4BAA4B,CAAC,MAAM,GAAE,mBAAwB,QAY5E;AAED,wBAAgB,wBAAwB,SAGvC;AAED,wBAAgB,sBAAsB;;;EAErC;~~AAkCD~~,eAAO,MAAM,sBAAsB,QAA2C,CAAC;AAO/E,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAQhD,eAAO,MAAM,kCAAkC,IAAI,CAAC;AAEpD,eAAO,MAAM,2CAA2C,IAAI,CAAC;AAE7D,eAAO,MAAM,wBAAwB,gCAAgC,CAAC;~~AA6BtE~~,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;~~AA0H1D~~,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,IAAI,SAA6B;IAEjC,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAyB;IAE7D,WAAW,SAA0B;IAErC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,8BAA8B,cAAqB;IAGnD,OAAO,CAAC,cAAc,CAAwC;IAQ9D,OAAO,CAAC,gBAAgB,CAAwC;IAGhE,OAAO,CAAC,kBAAkB,CAAkC;IAG5D,OAAO,CAAC,4BAA4B,CAAkC;IAEtE,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,gBAAgB,CAAwC;IAGhE,OAAO,CAAC,mBAAmB,CAAqB;IAGhD,OAAO,CAAC,uBAAuB,CAAkC;IAGjE,OAAO,CAAC,gBAAgB,~~CAAqB~~;~~IAQ7C~~,OAAO,CAAC,~~oBAAoB~~,CAAqB;~~IAOjD~~,OAAO,CAAC,eAAe,CAAiC;IAGxD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAwC;IAErE,OAAO,CAAC,uBAAuB,CAAgD;IAE/E,OAAO,CAAC,eAAe,CA2BpB;IAEH,OAAO,CAAC,aAAa,CAAkC;IAEvD,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,iCAAiC,CAAuC;IAEhF,OAAO,CAAC,0BAA0B,CAA0B;IAE5D,OAAO,CAAC,0BAA0B,CAAyD;IAE3F,OAAO,CAAC,gBAAgB,CAAK;IAG7B,OAAO,CAAC,mBAAmB,CAAyC;IAEpE,OAAO,CAAC,WAAW,CAAC,CAAgB;IAEpC,OAAO,CAAC,YAAY,CAAkC;gBAE1C,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAgBnC,MAAM;IAIA,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;YAS/B,mBAAmB;IAqB3B,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAmFjF,4BAA4B,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAgClF,OAAO,CAAC,oBAAoB;IAgBtB,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAsDtE,SAAS;YA0JD,0BAA0B;IA+ClC,OAAO,CAAC,KAAK,EAAE,8BAA8B;;;;YAUrC,eAAe;~~IAqV7B~~,sBAAsB,CACpB,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,YAAY;~~IAsIT~~,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ;YAI7B,eAAe;YAKf,aAAa;IA8ErB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAajE,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA6BlB,cAAc;~~IAyP5B~~,IAAI;IA8CE,UAAU,CAAC,OAAO,EAAE,MAAM;YAIlB,kBAAkB;YAmFlB,iBAAiB;IAkC/B,OAAO,CAAC,4BAA4B;YAQtB,qBAAqB;IAoB7B,MAAM;~~YAiBE~~,kBAAkB;YAkDlB,iCAAiC;~~IAwD~~/C,OAAO,CAAC,wBAAwB;~~IAoChC~~,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,kBAAkB;YAcZ,cAAc;IA8C5B,OAAO,CAAC,kBAAkB;IA+B1B,OAAO,CAAC,eAAe;~~IAmEvB~~,OAAO,CAAC,2BAA2B;IASnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;YAIX,cAAc;~~YA+Hd~~,0BAA0B;~~YAyB1B~~,iCAAiC;YAoDjC,eAAe;YAsBf,eAAe;IA4B7B,OAAO,CAAC,4BAA4B;IA2BpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,qBAAqB;YAOf,mBAAmB;YAiBnB,qBAAqB;YAmErB,oBAAoB;YAgCpB,cAAc;YAmFd,iCAAiC;IAsB/C,OAAO,CAAC,8BAA8B;YAQxB,mCAAmC;IAsBjD,OAAO,CAAC,yCAAyC;YAanC,gCAAgC;IAoB9C,OAAO,CAAC,uBAAuB;IAmD/B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -432,6 +432,29 @@ const connectOptions = {
 const fallbackConnectOptions = {
     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_POLL_MS = 250;
+const isKnownDefaultMtu = (mtu) => typeof mtu === 'number' && Number.isFinite(mtu) && mtu <= 23;
+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;
+    return (code === hdShared.HardwareErrorCode.BleServiceNotFound ||
+        code === hdShared.HardwareErrorCode.BleCharacteristicNotFound ||
+        (typeof message === 'string' &&
+            (message.includes('BLECharacteristicNotFound') ||
+                message.includes('BLECharacteristicNotWritable') ||
+                message.includes('BLECharacteristicNotNotifiable'))));
+};
+const isStaleGattTableNotifyReason = (reason) => !!reason &&
+    (reason.includes('Cannot write client characteristic config descriptor') ||
+        reason.includes('Cannot find client characteristic config descriptor') ||
+        reason.includes('The handle is invalid') ||
+        reason.includes('Writing is not permitted'));
 const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
 const BLE_GATT_SETUP_TIMEOUT_MS = 10000;
 const PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = 3;
@@ -446,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)
@@ -463,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;
@@ -479,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) {
@@ -507,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)
@@ -518,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) {
@@ -555,8 +580,8 @@ class ReactNativeBleTransport {
         this.sessionProtocols = new Map();
         this.confirmedProtocolV2 = new Set();
         this.protocolReprobeFailures = new Map();
-        this.silentDetections = new Set();
-        this.protocolWakeAttempts = new Set();
+        this.silentDetections = new Map();
+        this.androidGattCacheRefreshes = new Set();
         this.staleBondErrors = new Map();
         this.acquiringProtocolV2 = new Set();
         this.protocolV2Assemblers = new Map();
@@ -1030,7 +1055,9 @@ class ReactNativeBleTransport {
                     const isCachedDeviceConnected = yield cachedTransport.device
                         .isConnected()
                         .catch(() => false);
+                    const isCachedAndroidLinkUsable = reactNative.Platform.OS !== 'android' || !this.androidGattCacheRefreshes.has(uuid);
                     if (isCachedDeviceConnected &&
+                        isCachedAndroidLinkUsable &&
                         cachedProtocol &&
                         (!expectedProtocol || cachedProtocol === expectedProtocol)) {
                         if (this.stopped)
@@ -1043,7 +1070,15 @@ class ReactNativeBleTransport {
                 }
             }
             let device = null;
-            let mtuHandshakeRefused = false;
+            const isAndroid = reactNative.Platform.OS === 'android';
+            const refreshAndroidGattCache = isAndroid && (!!skipProtocolProbe || this.androidGattCacheRefreshes.has(uuid));
+            let nativeConnectOptions = connectOptions;
+            if (isAndroid) {
+                nativeConnectOptions = refreshAndroidGattCache
+                    ? androidRefreshGattConnectOptions
+                    : fallbackConnectOptions;
+            }
+            let androidRefreshConnectRan = false;
             if (forceCleanRunPromise && this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
@@ -1052,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);
             }
@@ -1093,18 +1129,17 @@ class ReactNativeBleTransport {
             if (!device) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device: ', uuid);
                 try {
-                    device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, connectOptions));
+                    device = yield this.connectWithTimeout(uuid, () => blePlxManager.connectToDevice(uuid, nativeConnectOptions));
+                    androidRefreshConnectRan = refreshAndroidGattCache;
                 }
                 catch (e) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('try to connect to device has error: ', e);
                     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');
-                        mtuHandshakeRefused = true;
-                        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) {
@@ -1119,22 +1154,28 @@ class ReactNativeBleTransport {
             if (!device) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'unable to connect to device');
             }
+            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);
+            }
             if (!(yield device.isConnected())) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('not connected, try to connect to device: ', uuid);
                 const disconnectedDevice = device;
                 try {
-                    device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(connectOptions));
+                    device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(nativeConnectOptions));
+                    androidRefreshConnectRan = refreshAndroidGattCache;
                 }
                 catch (e) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('not connected, try to connect to device has error: ', e);
                     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');
-                        mtuHandshakeRefused = true;
-                        yield this.runBestEffortNativeOperation('connect cancelled: cancel device connection', () => disconnectedDevice.cancelConnection());
                         try {
                             device = yield this.connectWithTimeout(uuid, () => disconnectedDevice.connect(fallbackConnectOptions));
                         }
@@ -1169,26 +1210,35 @@ class ReactNativeBleTransport {
             }
             if (this.stopped)
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
-            if (mtuHandshakeRefused) {
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] skipping MTU refresh after cancelled MTU connect', {
-                    connectIdSuffix: uuid.slice(-8),
-                    actual: 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');
+            let characteristics;
+            if (isAndroid) {
+                if (refreshAndroidGattCache) {
+                    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);
+            }
+            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 } = yield this.resolveCharacteristicsWithTimeout(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
@@ -1255,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}`);
@@ -1272,16 +1322,16 @@ 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;
                     }
                     this.rejectProtocolV2Frames(uuid, hdShared.ERRORS.TypedError(errorCode));
@@ -1289,14 +1339,11 @@ class ReactNativeBleTransport {
                 }
                 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);
                         this.runPromise.reject(notifyError);
                         Log === null || Log === void 0 ? void 0 : Log.debug(`${hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`);
@@ -1338,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'));
                     }
                 }
             }
@@ -1349,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);
@@ -1625,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 &&
@@ -1832,6 +1880,72 @@ class ReactNativeBleTransport {
             }
         });
     }
+    negotiateAndroidMtu(uuid, manager, device) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!shouldRefreshNegotiatedMtu(device.mtu))
+                return device;
+            const startedAt = Date.now();
+            let timer;
+            let timedOut = false;
+            let negotiated = device;
+            let failure;
+            try {
+                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 ${ANDROID_MTU_EXCHANGE_TIMEOUT_MS}ms`));
+                        }, ANDROID_MTU_EXCHANGE_TIMEOUT_MS);
+                    }),
+                ]);
+            }
+            catch (error) {
+                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) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.runNativeTeardown(uuid, manager, () => __awaiter(this, void 0, void 0, function* () {
+                yield Promise.all([
+                    this.runBestEffortNativeOperation(`${reason}: cancel manager connection`, () => manager.cancelDeviceConnection(uuid)),
+                    this.runBestEffortNativeOperation(`${reason}: cancel device connection`, () => device.cancelConnection()),
+                ]);
+            }));
+            const startedAt = Date.now();
+            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,
+                stopped: this.stopped,
+            });
+        });
+    }
     connectWithTimeout(uuid, connect) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped)
@@ -1899,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 {
@@ -2057,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();
@@ -2152,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,
@@ -2161,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);
             }
@@ -2175,17 +2291,12 @@ class ReactNativeBleTransport {
     }
     wakeSilentProtocolV1Device(uuid, probeOrder) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._messages)
-                return;
-            if (!probeOrder.includes('V1'))
+            if (reactNative.Platform.OS !== 'android' ||
+                !probeOrder.includes('V1') ||
+                this.silentDetections.get(uuid) !== 'silent') {
                 return;
-            if (!this.silentDetections.has(uuid))
-                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),
             });
@@ -2194,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');
@@ -2522,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)}`);
             }
         });
@@ -2639,6 +2747,8 @@ class ReactNativeBleTransport {
     }
 }
+exports.ANDROID_LINK_DROP_QUIET_MS = ANDROID_LINK_DROP_QUIET_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;
 exports.BLE_GATT_SETUP_TIMEOUT_MS = BLE_GATT_SETUP_TIMEOUT_MS;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.115",
+  "version": "1.2.2-alpha.117",
   "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.115",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.115",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.115",
+    "@onekeyfe/hd-core": "1.2.2-alpha.117",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.117",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.117",
     "@onekeyfe/react-native-ble-utils": "0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "a115ca6998586c05c22996f278091778fd5471f1"
+  "gitHead": "2ebb459218ac2f15e5295dd42be1fdda9cd9bc0e"
 }