npm - @onekeyfe/hd-transport-react-native - Versions diffs - 1.2.0-alpha.53 → 1.2.0-alpha.54 - Mend

@onekeyfe/hd-transport-react-native 1.2.0-alpha.53 → 1.2.0-alpha.54

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 (10) hide show

package/dist/index.d.ts +38 -1
package/dist/index.d.ts.map +1 -1
package/dist/index.js +160 -74
package/jest.config.js +5 -0
package/package.json +5 -5
package/src/__tests__/protocolV2Link.test.ts +41 -230
package/src/__tests__/staleCallTimeout.test.ts +211 -0
package/src/__tests__/writePacketTimeout.test.ts +306 -0
package/src/index.ts +235 -74
package/src/__tests__/enumerate.test.ts +0 -132

package/dist/index.d.ts CHANGED Viewed

@@ -35,6 +35,17 @@ type ResolvedBleCharacteristics = {
     notifyCharacteristic: Characteristic;
 };
 declare const getFirmwareUploadWriteRetryType: (error: unknown) => FirmwareUploadWriteRetryType | null;
+/**
+ * Per-packet write budget. iOS only resolves writeWithoutResponse once CoreBluetooth
+ * reports the peripheral ready again; a peripheral wedged by its own firmware reboot
+ * stops reporting ready while staying connected, so the write promise never settles.
+ * Response timeouts cannot cover that — they are armed after the writes complete —
+ * and an unbounded write leaves the whole transport unusable until the process dies.
+ * A healthy packet completes in milliseconds, so this only fires on a dead link.
+ */
+declare const BLE_WRITE_PACKET_TIMEOUT_MS = 10000;
+/** Consecutive wedged writes on one device before the BLE manager itself is recreated. */
+declare const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 type ProtocolV2BleTuning = {
     iosPacketLength?: number;
     androidPacketLength?: number;
@@ -61,6 +72,15 @@ declare class ReactNativeBleTransport {
     firmwareUploadWriteRecoveryIds: Set<string>;
     /** Per-device protocol type detected by active wire-level probe after connect. */
     private deviceProtocol;
+    /**
+     * Protocol a probe is currently trying, before the device has confirmed it. Calls
+     * must route with it, but acquire() must not treat it as a detected protocol: a
+     * probe that never answers would otherwise leave the reuse fast path handing out a
+     * transport that was never validated.
+     */
+    private probingProtocols;
+    /** Consecutive write timeouts per device; reset by any write that completes. */
+    private writeTimeoutCounts;
     private deviceProtocolHints;
     private protocolV2Assemblers;
     private protocolV2FrameQueues;
@@ -100,9 +120,26 @@ declare class ReactNativeBleTransport {
     disconnect(session: string): Promise<void>;
     cancel(): void;
     private getCachedTransport;
+    /**
+     * Write one packet under a bounded budget. A write that never settles means the
+     * peripheral is wedged even though the GATT link still reports connected, so the
+     * link is torn down: releasing JS state alone would leave the poisoned peripheral
+     * cached and every later call would hang on it again.
+     */
+    private writeBlePacket;
+    /**
+     * Drop a link whose writes stopped completing. The JS state is purged synchronously
+     * so the next acquire() cannot reuse the dead transport, while the native teardown is
+     * intentionally NOT awaited: it talks to the very layer that just stopped settling
+     * promises, so awaiting it could hang exactly like the write it is recovering from.
+     */
+    private tearDownWedgedLink;
+    private resetPlxManager;
     private createProtocolMismatchError;
     private createProtocolDetectionError;
     private clearProbeProtocol;
+    /** Protocol to route a call with: confirmed if known, otherwise the one being probed. */
+    private getActiveProtocol;
     private detectProtocol;
     private resetProbeStateAfterProtocolProbe;
     private probeProtocolV1;
@@ -120,4 +157,4 @@ declare class ReactNativeBleTransport {
     getProtocolType(path: string): ProtocolType | undefined;
 }
-export { IOneKeyDevice, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };
+export { BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, 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,EAIL,UAAU,IAAI,aAAa,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAEhB,KAAK,oBAAoB,EAIzB,KAAK,YAAY,EAKjB,KAAK,oBAAoB,EAG1B,MAAM,wBAAwB,CAAC;~~AAoBhC~~,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAK1C,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;~~AAiBjE~~,KAAK,4BAA4B,GAAG,WAAW,CAAC;AAChD,KAAK,0BAA0B,GAAG;IAChC,mBAAmB,EAAE,cAAc,CAAC;IACpC,oBAAoB,EAAE,cAAc,CAAC;CACtC,CAAC;AAOF,eAAO,MAAM,+BAA+B,UACnC,OAAO,KACb,4BAA4B,GAAG,IAsBjC,CAAC;~~AASF~~,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;AAkBD,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;AA4D1D,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,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;~~IAE9D~~,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAwC;IAErE,OAAO,CAAC,uBAAuB,CAAgD;IAE/E,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,aAAa,CAAkC;IAEvD,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,gBAAgB,CAAK;gBAEjB,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;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAMjC,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;IAuDtE,SAAS;~~YAiJD~~,0BAA0B;IAwClC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IAsKpC,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;YAK7B,aAAa;~~IA8DrB~~,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA+BlB,cAAc;~~IA2M5B~~,IAAI;IAIE,UAAU,CAAC,OAAO,EAAE,MAAM;~~IA8EhC~~,MAAM;IASN,OAAO,CAAC,kBAAkB;~~IAQ1B~~,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;~~YAMZ~~,cAAc;~~YAmFd~~,iCAAiC;YAoDjC,eAAe;~~YAkBf~~,eAAe;~~IAwB7B~~,OAAO,CAAC,4BAA4B;IA2BpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;YAiBnB,qBAAqB;~~YA2CrB~~,oBAAoB;~~YAwCpB~~,cAAc;IAoC5B,OAAO,CAAC,uBAAuB;~~IA4C~~/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

@@ -222,7 +222,6 @@ const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 :
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = reactNative.Platform.OS === 'ios' ? 8 : 10;
 const FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS = reactNative.Platform.OS === 'ios' ? 24 : 30;
 const FIRMWARE_UPLOAD_WRITE_MAX_RETRIES = 8;
-const IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS = 5;
 const ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH = 192;
 const FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH;
 const ANDROID_GATT_CONGESTED_STATUS = 143;
@@ -245,6 +244,12 @@ const getFirmwareUploadWriteRetryType = (error) => {
 const resolveFirmwareUploadRetryDelay = (attempt, baseDelayMs = 200, maxDelayMs = 1200) => Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10000;
+const BLE_WRITE_PACKET_TIMEOUT_MS = 10000;
+const WEDGED_WRITE_MESSAGE = 'BLE write timeout after';
+const isWedgedWriteError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleWriteCharacteristicError &&
+    typeof (error === null || error === void 0 ? void 0 : error.message) === 'string' &&
+    error.message.startsWith(WEDGED_WRITE_MESSAGE);
+const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const DEVICE_SCAN_TIMEOUT_MS = 3000;
 const IOS_NOTIFY_READY_DELAY_MS = 150;
 const ANDROID_NOTIFY_READY_DELAY_MS = 300;
@@ -342,6 +347,8 @@ class ReactNativeBleTransport {
         this.runPromiseDeviceId = null;
         this.firmwareUploadWriteRecoveryIds = new Set();
         this.deviceProtocol = new Map();
+        this.probingProtocols = new Map();
+        this.writeTimeoutCounts = new Map();
         this.deviceProtocolHints = new Map();
         this.protocolV2Assemblers = new Map();
         this.protocolV2FrameQueues = new Map();
@@ -615,17 +622,12 @@ class ReactNativeBleTransport {
                         return;
                     }
                     const displayName = getDeviceDisplayName(device);
-                    const isUnnamedIOSPeripheral = reactNative.Platform.OS === 'ios' && !(displayName === null || displayName === void 0 ? void 0 : displayName.trim());
-                    const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.name) ||
-                        hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.localName);
-                    const isOneKey = !isUnnamedIOSPeripheral &&
-                        !isFindMyPeripheral &&
-                        hdShared.isOnekeyBluetoothDevice({
-                            id: device === null || device === void 0 ? void 0 : device.id,
-                            name: device === null || device === void 0 ? void 0 : device.name,
-                            localName: device === null || device === void 0 ? void 0 : device.localName,
-                            serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
-                        });
+                    const isOneKey = hdShared.isOnekeyBluetoothDevice({
+                        id: device === null || device === void 0 ? void 0 : device.id,
+                        name: device === null || device === void 0 ? void 0 : device.name,
+                        localName: device === null || device === void 0 ? void 0 : device.localName,
+                        serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
+                    });
                     if (isOneKey) {
                         addDevice(device);
                     }
@@ -643,15 +645,12 @@ class ReactNativeBleTransport {
                         const localName = 'localName' in device && typeof device.localName === 'string'
                             ? device.localName
                             : null;
-                        const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device.name) ||
-                            hdShared.isPro2FindMyAdvertisementName(localName);
-                        if (!isFindMyPeripheral &&
-                            hdShared.isOnekeyBluetoothDevice({
-                                id: device.id,
-                                name: device.name,
-                                localName,
-                                serviceUuids: device.serviceUUIDs,
-                            })) {
+                        if (hdShared.isOnekeyBluetoothDevice({
+                            id: device.id,
+                            name: device.name,
+                            localName,
+                            serviceUuids: device.serviceUUIDs,
+                        })) {
                             Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
                             addDevice(device);
                         }
@@ -861,7 +860,7 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
                     return;
                 }
-                if (this.deviceProtocol.get(uuid) === 'V2') {
+                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;
@@ -912,7 +911,7 @@ class ReactNativeBleTransport {
             }
             try {
                 const data = buffer.Buffer.from(c.value, 'base64');
-                const protocol = this.deviceProtocol.get(uuid);
+                const protocol = this.getActiveProtocol(uuid);
                 if (!protocol) {
                     Log === null || Log === void 0 ? void 0 : Log.debug('monitor data ignored before protocol detection: ', uuid);
                     return;
@@ -940,7 +939,7 @@ class ReactNativeBleTransport {
             catch (error) {
                 Log === null || Log === void 0 ? void 0 : Log.debug('monitor data error: ', error);
                 const notifyError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
-                if (this.deviceProtocol.get(uuid) === 'V2') {
+                if (this.getActiveProtocol(uuid) === 'V2') {
                     this.rejectProtocolV2Frames(uuid, notifyError);
                 }
                 else if (this.runPromiseDeviceId === uuid) {
@@ -996,6 +995,7 @@ class ReactNativeBleTransport {
                 delete transportCache[uuid];
             }
             this.deviceProtocol.delete(uuid);
+            this.probingProtocols.delete(uuid);
             (_f = this.protocolV2Assemblers.get(uuid)) === null || _f === void 0 ? void 0 : _f.reset();
             this.protocolV2Assemblers.delete(uuid);
             this.resetProtocolV2Frames(uuid);
@@ -1044,8 +1044,19 @@ class ReactNativeBleTransport {
             const transport = this.getCachedTransport(uuid);
             const runPromise = hdShared.createDeferred();
             runPromise.promise.catch(() => undefined);
+            const supersededRunPromise = this.runPromise;
+            if (supersededRunPromise) {
+                supersededRunPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise));
+            }
             this.runPromise = runPromise;
             this.runPromiseDeviceId = uuid;
+            const releaseOwnershipIfCurrent = () => {
+                if (this.runPromise === runPromise) {
+                    this.runPromise = null;
+                    this.runPromiseDeviceId = null;
+                }
+            };
+            const isCurrentOwner = () => this.runPromise === runPromise;
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
             let timeout;
@@ -1066,6 +1077,9 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
+                                if (isWedgedWriteError(e)) {
+                                    throw e;
+                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1093,6 +1107,9 @@ class ReactNativeBleTransport {
                             }
                             catch (e) {
                                 onError(e);
+                                if (isWedgedWriteError(e)) {
+                                    throw e;
+                                }
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError);
                             }
                         }
@@ -1103,8 +1120,8 @@ class ReactNativeBleTransport {
                 });
             }
             if (name === 'EmmcFileWrite') {
-                yield writeChunkedData(buffers, data => transport.writeWithRetry(data), e => {
-                    this.runPromise = null;
+                yield writeChunkedData(buffers, data => this.writeBlePacket(uuid, data, payload => transport.writeWithRetry(payload), isCurrentOwner), e => {
+                    releaseOwnershipIfCurrent();
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1120,7 +1137,7 @@ class ReactNativeBleTransport {
                     let attempt = 0;
                     while (true) {
                         try {
-                            yield transport.writeCharacteristic.writeWithoutResponse(data);
+                            yield this.writeBlePacket(uuid, data, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
                             return;
                         }
                         catch (error) {
@@ -1139,7 +1156,7 @@ class ReactNativeBleTransport {
                         }
                     }
                 }), e => {
-                    this.runPromise = null;
+                    releaseOwnershipIfCurrent();
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1147,17 +1164,14 @@ class ReactNativeBleTransport {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
                     try {
-                        const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
-                        if (shouldUseWriteWithResponse) {
-                            yield transport.writeCharacteristic.writeWithResponse(outData);
-                        }
-                        else {
-                            yield transport.writeCharacteristic.writeWithoutResponse(outData);
-                        }
+                        yield this.writeBlePacket(uuid, outData, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
-                        this.runPromise = null;
+                        releaseOwnershipIfCurrent();
+                        if (isWedgedWriteError(e)) {
+                            throw e;
+                        }
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
@@ -1197,7 +1211,9 @@ class ReactNativeBleTransport {
                     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 &&
                     (e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError) {
                     yield this.disconnect(uuid);
                 }
@@ -1268,6 +1284,7 @@ class ReactNativeBleTransport {
                 delete transportCache[session];
             }
             this.deviceProtocol.delete(session);
+            this.probingProtocols.delete(session);
             this.deviceProtocolHints.delete(session);
             this.protocolV2Assemblers.delete(session);
             this.resetProtocolV2Frames(session);
@@ -1296,6 +1313,80 @@ class ReactNativeBleTransport {
         }
         return transport;
     }
+    writeBlePacket(uuid, data, write, isCurrentOwner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let timer;
+            let timedOut = false;
+            try {
+                yield Promise.race([
+                    write(data),
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => {
+                            timedOut = true;
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError, `BLE write timeout after ${BLE_WRITE_PACKET_TIMEOUT_MS}ms`));
+                        }, BLE_WRITE_PACKET_TIMEOUT_MS);
+                    }),
+                ]);
+                this.writeTimeoutCounts.delete(uuid);
+            }
+            catch (error) {
+                if (timedOut) {
+                    if (isCurrentOwner && !isCurrentOwner()) {
+                        Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] stale BLE write timed out, link kept:', uuid);
+                    }
+                    else {
+                        this.tearDownWedgedLink(uuid);
+                    }
+                }
+                throw error;
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+            }
+        });
+    }
+    tearDownWedgedLink(uuid) {
+        var _a;
+        const timeouts = ((_a = this.writeTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.writeTimeoutCounts.set(uuid, timeouts);
+        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE write timed out, tearing down link:', uuid, {
+            consecutiveWriteTimeouts: timeouts,
+        });
+        const wedged = transportCache[uuid];
+        this.disconnect(uuid).catch(error => {
+            Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] wedged link teardown failed (ignored):', error);
+        });
+        if (wedged && transportCache[uuid] === wedged) {
+            delete transportCache[uuid];
+        }
+        this.deviceProtocol.delete(uuid);
+        this.probingProtocols.delete(uuid);
+        this.protocolV2Assemblers.delete(uuid);
+        this.resetProtocolV2Frames(uuid);
+        if (timeouts >= BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD) {
+            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE writes wedged repeatedly, resetting BLE manager');
+            this.resetPlxManager();
+            this.writeTimeoutCounts.delete(uuid);
+        }
+    }
+    resetPlxManager() {
+        const manager = this.blePlxManager;
+        this.blePlxManager = undefined;
+        Object.keys(transportCache).forEach(key => {
+            delete transportCache[key];
+        });
+        this.deviceProtocol.clear();
+        this.probingProtocols.clear();
+        this.monitorTokens.clear();
+        this.protocolV2Assemblers.clear();
+        try {
+            manager === null || manager === void 0 ? void 0 : manager.destroy();
+        }
+        catch (error) {
+            Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE manager destroy failed (ignored):', error);
+        }
+    }
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
@@ -1303,30 +1394,19 @@ class ReactNativeBleTransport {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping');
     }
     clearProbeProtocol(uuid, protocol) {
+        if (this.probingProtocols.get(uuid) === protocol) {
+            this.probingProtocols.delete(uuid);
+        }
         if (this.deviceProtocol.get(uuid) === protocol) {
             this.deviceProtocol.delete(uuid);
         }
     }
-    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
+    getActiveProtocol(uuid) {
         var _a;
+        return (_a = this.deviceProtocol.get(uuid)) !== null && _a !== void 0 ? _a : this.probingProtocols.get(uuid);
+    }
+    detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (reactNative.Platform.OS === 'ios') {
-                const protocol = (_a = expectedProtocol !== null && expectedProtocol !== void 0 ? expectedProtocol : protocolHint) !== null && _a !== void 0 ? _a : 'V1';
-                let source = 'ios-legacy-default';
-                if (expectedProtocol) {
-                    source = 'expected';
-                }
-                else if (protocolHint) {
-                    source = 'hint';
-                }
-                this.deviceProtocol.set(uuid, protocol);
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol selected', {
-                    deviceId: uuid,
-                    protocol,
-                    source,
-                });
-                return protocol;
-            }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
@@ -1375,6 +1455,7 @@ class ReactNativeBleTransport {
                 }
             }
             this.deviceProtocol.delete(uuid);
+            this.probingProtocols.delete(uuid);
             throw this.createProtocolDetectionError();
         });
     }
@@ -1426,13 +1507,17 @@ class ReactNativeBleTransport {
                 return false;
             }
             try {
-                this.deviceProtocol.set(uuid, 'V1');
+                this.probingProtocols.set(uuid, 'V1');
                 yield this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+                this.probingProtocols.delete(uuid);
                 return true;
             }
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe failed:', error);
+                if (isWedgedWriteError(error)) {
+                    throw error;
+                }
                 return false;
             }
         });
@@ -1443,7 +1528,7 @@ class ReactNativeBleTransport {
             if (!this._messages || !this._messagesV2) {
                 return false;
             }
-            this.deviceProtocol.set(uuid, 'V2');
+            this.probingProtocols.set(uuid, 'V2');
             (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
             const detected = yield transport.probeProtocolV2({
                 call: (name, data, options) => this.callProtocolV2(uuid, name, data, options),
@@ -1459,6 +1544,9 @@ class ReactNativeBleTransport {
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
             }
+            else {
+                this.probingProtocols.delete(uuid);
+            }
             return detected;
         });
     }
@@ -1530,11 +1618,8 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration) {
+    writeProtocolV2Packet(uuid, transport, base64, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
-            const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' &&
-                !context.highVolume &&
-                transport.writeCharacteristic.isWritableWithResponse;
             let attempt = 0;
             for (;;) {
                 assertCurrentGeneration();
@@ -1542,12 +1627,15 @@ class ReactNativeBleTransport {
                     throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
                 }
                 try {
-                    if (shouldUseWriteWithResponse) {
-                        yield transport.writeCharacteristic.writeWithResponse(base64);
-                    }
-                    else {
-                        yield transport.writeCharacteristic.writeWithoutResponse(base64);
-                    }
+                    yield this.writeBlePacket(uuid, base64, payload => transport.writeCharacteristic.writeWithoutResponse(payload), () => {
+                        try {
+                            assertCurrentGeneration();
+                            return !context.signal.aborted;
+                        }
+                        catch (_a) {
+                            return false;
+                        }
+                    });
                     assertCurrentGeneration();
                     return;
                 }
@@ -1568,7 +1656,7 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Frame(transport$1, frame, context, assertCurrentGeneration) {
+    writeProtocolV2Frame(uuid, transport$1, frame, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
             const tuning = getProtocolV2BleTuning();
             const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1577,21 +1665,17 @@ class ReactNativeBleTransport {
                 androidPacketLength: tuning.androidPacketLength,
                 mtu: reactNative.Platform.OS === 'android' ? transport$1.mtuSize : undefined,
             });
-            const initialDelayMs = reactNative.Platform.OS === 'ios' && !context.highVolume && frame.length <= packetCapacity
-                ? IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS
-                : 0;
             yield transport.writeProtocolV2BleFrame({
                 frame,
                 packetCapacity,
                 assertActive: assertCurrentGeneration,
                 signal: context.signal,
                 abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
-                initialDelayMs,
                 burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
                 burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
                 flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
                 wait: delay,
-                writePacket: packet => this.writeProtocolV2Packet(transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
+                writePacket: packet => this.writeProtocolV2Packet(uuid, transport$1, buffer.Buffer.from(packet).toString('base64'), context, assertCurrentGeneration),
             });
         });
     }
@@ -1640,7 +1724,7 @@ class ReactNativeBleTransport {
             writeFrame: (frame, context) => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
                 const currentTransport = this.getCachedTransport(uuid);
-                yield this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
+                yield this.writeProtocolV2Frame(uuid, currentTransport, frame, context, assertCurrentGeneration);
             }),
             readFrame: () => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
@@ -1661,10 +1745,12 @@ class ReactNativeBleTransport {
         };
     }
     getProtocolType(path) {
-        return this.deviceProtocol.get(path);
+        return this.getActiveProtocol(path);
     }
 }
+exports.BLE_WRITE_PACKET_TIMEOUT_MS = BLE_WRITE_PACKET_TIMEOUT_MS;
+exports.BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD;
 exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
 exports["default"] = ReactNativeBleTransport;
 exports.getFirmwareUploadWriteRetryType = getFirmwareUploadWriteRetryType;

package/jest.config.js CHANGED Viewed

@@ -2,4 +2,9 @@ module.exports = {
   preset: '../../jest.config.js',
   testEnvironment: 'node',
   modulePathIgnorePatterns: ['node_modules', '<rootDir>/dist'],
+  moduleNameMapper: {
+    // The workspace symlinks resolve to prebuilt dist outputs that can lag behind src.
+    '^@onekeyfe/hd-transport$': '<rootDir>/../hd-transport/src/index.ts',
+    '^@onekeyfe/hd-shared$': '<rootDir>/../shared/src/index.ts',
+  },
 };

package/package.json CHANGED Viewed

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