@onekeyfe/hd-transport-react-native 1.2.2-alpha.104 → 1.2.2-alpha.106

package/README.md

@@ -26,4 +26,4 @@ yar update:protobuf to generate new ./messages.json and ./src/types/messages.ts
 
 ## Docs
 
-Documentation is available [hardware-js-sdk](https://developer.onekey.so/connect-to-hardware/hardware-sdk/start)
+Documentation is available [Hardware SDK Getting Started](https://developer.onekey.so/en/hardware-sdk/getting-started)

package/dist/bleNativeDisconnect.d.ts

@@ -0,0 +1,3 @@
+export declare const isNativeBleDisconnectError: (error: unknown) => boolean;
+export declare const toBleDisconnectHardwareError: (error: unknown) => Error;
+//# sourceMappingURL=bleNativeDisconnect.d.ts.map

package/dist/bleNativeDisconnect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bleNativeDisconnect.d.ts","sourceRoot":"","sources":["../src/bleNativeDisconnect.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,0BAA0B,UAAW,OAAO,KAAG,OAU3D,CAAC;AAEF,eAAO,MAAM,4BAA4B,UAAW,OAAO,UAU1D,CAAC"}

package/dist/index.d.ts

@@ -154,12 +154,15 @@ declare class ReactNativeBleTransport {
     private nextMonitorToken;
     /** Serializes transport lifecycle changes for the same physical device. */
     private lifecycleOperations;
+    private stopPromise?;
+    private scanCleanups;
     constructor(options: TransportOptions);
     init(logger: any, emitter: EventEmitter): void;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): void;
     getPlxManager(): Promise<BleManager>;
+    private waitForManagerReset;
     resolveCharacteristics(device: Device): Promise<ResolvedBleCharacteristics>;
     attachDisconnectSubscription(transport: BleTransport, device: Device, uuid: string): void;
     private emitDeviceDisconnect;
@@ -183,13 +186,13 @@ declare class ReactNativeBleTransport {
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     call(uuid: string, name: string, data: Record<string, unknown>, options?: TransportCallOptions): Promise<transport.MessageFromOneKey>;
     private callProtocolV1;
-    stop(): void;
+    stop(): Promise<void>;
     disconnect(session: string): Promise<void>;
     private disconnectUnlocked;
     private runNativeTeardown;
     private runBestEffortNativeOperation;
     private runLifecycleOperation;
-    cancel(): void;
+    cancel(): Promise<void>;
     /** Run a native connect under the JS backstop budget. */
     private connectWithTimeout;
     /** Resolve the complete GATT shape under a budget so acquire() always settles. */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -194,6 +194,27 @@ const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject)
     }, ms);
 });
 
+const BLE_PLX_DEVICE_DISCONNECTED = 201;
+const IOS_PERIPHERAL_DISCONNECTED = 7;
+const nativeErrorText$1 = (error) => [error.reason, error.message]
+    .filter((value) => typeof value === 'string')
+    .join(' ');
+const isNativeBleDisconnectError = (error) => {
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const nativeError = error;
+    return (nativeError.errorCode === BLE_PLX_DEVICE_DISCONNECTED ||
+        nativeError.iosErrorCode === IOS_PERIPHERAL_DISCONNECTED);
+};
+const toBleDisconnectHardwareError = (error) => {
+    if ((error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleDeviceDisconnected) {
+        return error;
+    }
+    const nativeError = (error !== null && error !== void 0 ? error : {});
+    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected, nativeErrorText$1(nativeError) || undefined);
+};
+
 const ATT_INSUFFICIENT_AUTHENTICATION = 5;
 const ATT_INSUFFICIENT_ENCRYPTION = 15;
 const IOS_PEER_REMOVED_PAIRING_INFORMATION = 14;
@@ -258,6 +279,7 @@ class BleTransport {
 const { check, ProtocolV1, parseConfigure } = transport__default["default"];
 const Log = bleLogger;
 const transportCache = {};
+let bleManagerResetPromise;
 const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 : 5;
 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;
@@ -316,6 +338,17 @@ 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 shouldRethrowProtocolProbeError = (error) => {
+    const code = error === null || error === void 0 ? void 0 : error.errorCode;
+    return (hdShared.isBleStaleBondHardwareError(error) ||
+        isNativeBleDisconnectError(error) ||
+        code === hdShared.HardwareErrorCode.BleDeviceNotBonded ||
+        code === hdShared.HardwareErrorCode.BleDeviceBondedCanceled ||
+        code === hdShared.HardwareErrorCode.BleDeviceDisconnected ||
+        code === hdShared.HardwareErrorCode.BleCharacteristicNotifyError ||
+        code === hdShared.HardwareErrorCode.BleCharacteristicNotifyChangeFailure ||
+        code === hdShared.HardwareErrorCode.BleWriteCharacteristicError);
+};
 const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const DEVICE_SCAN_TIMEOUT_MS = 3000;
 const IOS_NOTIFY_READY_DELAY_MS = 150;
@@ -474,6 +507,7 @@ class ReactNativeBleTransport {
         this.androidPriorityResetTimers = new Map();
         this.nextMonitorToken = 1;
         this.lifecycleOperations = new Map();
+        this.scanCleanups = new Set();
         this.scanTimeout = (_a = options.scanTimeout) !== null && _a !== void 0 ? _a : DEVICE_SCAN_TIMEOUT_MS;
     }
     init(logger, emitter) {
@@ -502,10 +536,38 @@ class ReactNativeBleTransport {
     listen() {
     }
     getPlxManager() {
-        if (this.blePlxManager)
-            return Promise.resolve(this.blePlxManager);
-        this.blePlxManager = new reactNativeBlePlx.BleManager();
-        return Promise.resolve(this.blePlxManager);
+        return __awaiter(this, void 0, void 0, function* () {
+            while (bleManagerResetPromise) {
+                yield this.waitForManagerReset();
+            }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+            if (!this.blePlxManager)
+                this.blePlxManager = new reactNativeBlePlx.BleManager();
+            return this.blePlxManager;
+        });
+    }
+    waitForManagerReset() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!bleManagerResetPromise)
+                return;
+            let timeout;
+            try {
+                yield Promise.race([
+                    bleManagerResetPromise,
+                    new Promise((_, reject) => {
+                        timeout = setTimeout(() => reject(this.createWedgedBleSetupError()), BLE_CONNECT_TIMEOUT_MS);
+                    }),
+                ]);
+            }
+            catch (_a) {
+                throw this.createWedgedBleSetupError();
+            }
+            finally {
+                if (timeout)
+                    clearTimeout(timeout);
+            }
+        });
     }
     resolveCharacteristics(device) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -670,30 +732,55 @@ class ReactNativeBleTransport {
     }
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const deviceList = [];
-                const blePlxManager = yield this.getPlxManager();
-                try {
-                    yield subscribeBleOn(blePlxManager);
-                }
-                catch (error) {
-                    Log === null || Log === void 0 ? void 0 : Log.debug('subscribeBleOn error: ', error);
-                    reject(error);
-                    return;
-                }
-                if (reactNative.Platform.OS === 'android' && reactNative.Platform.Version >= 31) {
-                    Log === null || Log === void 0 ? void 0 : Log.debug('requesting permissions, please wait...');
-                    const resultConnect = yield reactNative.PermissionsAndroid.requestMultiple([
-                        reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT,
-                        reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN,
-                    ]);
-                    Log === null || Log === void 0 ? void 0 : Log.debug('requesting permissions, result: ', resultConnect);
-                    if (resultConnect[reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT] !== 'granted' ||
-                        resultConnect[reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN] !== 'granted') {
-                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
-                        return;
-                    }
+            const scanStartedAt = Date.now();
+            let firstDeviceMs;
+            const blePlxManager = yield this.getPlxManager();
+            yield subscribeBleOn(blePlxManager);
+            if (reactNative.Platform.OS === 'android' && reactNative.Platform.Version >= 31) {
+                Log === null || Log === void 0 ? void 0 : Log.debug('requesting permissions, please wait...');
+                const resultConnect = yield reactNative.PermissionsAndroid.requestMultiple([
+                    reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT,
+                    reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN,
+                ]);
+                Log === null || Log === void 0 ? void 0 : Log.debug('requesting permissions, result: ', resultConnect);
+                if (resultConnect[reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT] !== 'granted' ||
+                    resultConnect[reactNative.PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN] !== 'granted') {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError);
                 }
+            }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+            return new Promise((resolve, reject) => {
+                const deviceList = [];
+                let finished = false;
+                let scanCleanup;
+                const finishScan = (error) => {
+                    if (scanCleanup)
+                        return scanCleanup;
+                    finished = true;
+                    clearScanTimer();
+                    scanCleanup = this.runNativeTeardown('scan', blePlxManager, () => __awaiter(this, void 0, void 0, function* () {
+                        yield blePlxManager.stopDeviceScan();
+                    })).then(() => {
+                        this.scanCleanups.delete(cancelScan);
+                        if (error)
+                            reject(error);
+                        else
+                            resolve(deviceList);
+                    });
+                    return scanCleanup;
+                };
+                const cancelScan = () => finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected));
+                this.scanCleanups.add(cancelScan);
+                const clearScanTimer = timer.timeout(() => {
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] scan completed', {
+                        elapsedMs: Date.now() - scanStartedAt,
+                        firstDeviceMs,
+                        deviceCount: deviceList.length,
+                        scanWindowMs: this.scanTimeout,
+                    });
+                    finishScan();
+                }, this.scanTimeout);
                 blePlxManager.startDeviceScan(getBluetoothServiceUuids(), {
                     allowDuplicates: true,
                     scanMode: reactNativeBlePlx.ScanMode.LowLatency,
@@ -702,19 +789,17 @@ class ReactNativeBleTransport {
                     if (error) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('ble scan error: ', error);
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
-                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
+                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
                         }
                         else if (error.errorCode === reactNativeBlePlx.BleErrorCode.BluetoothUnauthorized) {
-                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError));
+                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError));
                         }
                         else if (error.errorCode === reactNativeBlePlx.BleErrorCode.LocationServicesDisabled) {
-                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationServicesDisabled));
-                        }
-                        else if (error.errorCode === reactNativeBlePlx.BleErrorCode.ScanStartFailed) {
-                            timer.timeout(() => { }, this.scanTimeout);
+                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationServicesDisabled));
                         }
+                        else if (error.errorCode === reactNativeBlePlx.BleErrorCode.ScanStartFailed) ;
                         else {
-                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleScanError, (_a = error.reason) !== null && _a !== void 0 ? _a : ''));
+                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleScanError, (_a = error.reason) !== null && _a !== void 0 ? _a : ''));
                         }
                         return;
                     }
@@ -739,6 +824,8 @@ class ReactNativeBleTransport {
                         });
                     }
                 });
+                if (finished)
+                    return;
                 getConnectedDeviceIds(reactNative.Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(devices => {
                     for (const device of devices) {
                         const localName = 'localName' in device && typeof device.localName === 'string'
@@ -754,10 +841,11 @@ class ReactNativeBleTransport {
                             addDevice(device);
                         }
                     }
-                });
+                }, error => Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral failed:', error));
                 const addDevice = (device) => {
                     var _a;
-                    if (deviceList.every(d => d.id !== device.id)) {
+                    if (!finished && deviceList.every(d => d.id !== device.id)) {
+                        firstDeviceMs !== null && firstDeviceMs !== void 0 ? firstDeviceMs : (firstDeviceMs = Date.now() - scanStartedAt);
                         const displayName = (_a = getDeviceDisplayName(device)) !== null && _a !== void 0 ? _a : 'Unknown BLE Device';
                         deviceList.push(Object.assign(Object.assign({}, device), { name: displayName, commType: 'ble' }));
                         Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] OneKey BLE device discovered', {
@@ -767,11 +855,7 @@ class ReactNativeBleTransport {
                         });
                     }
                 };
-                timer.timeout(() => {
-                    blePlxManager.stopDeviceScan();
-                    resolve(deviceList);
-                }, this.scanTimeout);
-            }));
+            });
         });
     }
     installTransportForAcquire(uuid, device, characteristics) {
@@ -837,6 +921,8 @@ class ReactNativeBleTransport {
     acquireUnlocked(input) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const { uuid, forceCleanRunPromise, expectedProtocol, skipProtocolProbe } = input;
             const shouldMapProtocolV2StaleBond = expectedProtocol
                 ? expectedProtocol === 'V2'
@@ -1042,7 +1128,7 @@ class ReactNativeBleTransport {
                 return { uuid, protocolType };
             }
             catch (error) {
-                if (hdShared.isBleStaleBondHardwareError(error)) {
+                if (hdShared.isBleStaleBondHardwareError(error) || shouldRethrowProtocolProbeError(error)) {
                     yield this.disconnectUnlocked(uuid);
                 }
                 else {
@@ -1455,7 +1541,35 @@ class ReactNativeBleTransport {
         });
     }
     stop() {
+        var _a;
+        if (this.stopPromise)
+            return this.stopPromise;
         this.stopped = true;
+        const deviceIds = new Set([
+            ...this.monitorTokens.keys(),
+            ...this.sessionProtocols.keys(),
+            ...this.lifecycleOperations.keys(),
+            ...(this.runPromiseDeviceId ? [this.runPromiseDeviceId] : []),
+        ]);
+        const scans = Array.from(this.scanCleanups, cleanup => cleanup());
+        this.androidPriorityResetTimers.forEach(timeout => clearTimeout(timeout));
+        this.androidPriorityResetTimers.clear();
+        this.androidHighPriorityDevices.clear();
+        const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+        (_a = this.runPromise) === null || _a === void 0 ? void 0 : _a.reject(error);
+        this.runPromise = null;
+        this.runPromiseDeviceId = null;
+        deviceIds.forEach(uuid => this.rejectProtocolV2Frames(uuid, error));
+        this.stopPromise = Promise.all([
+            ...scans,
+            ...Array.from(deviceIds, uuid => this.disconnect(uuid)),
+        ]).then(() => __awaiter(this, void 0, void 0, function* () {
+            yield this.protocolV2Links.invalidateAllLinks('React Native BLE transport stopped');
+            yield this.waitForManagerReset();
+            this.blePlxManager = undefined;
+            this.emitter = undefined;
+        }));
+        return this.stopPromise;
     }
     disconnect(session) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1585,13 +1699,25 @@ class ReactNativeBleTransport {
         });
     }
     cancel() {
-        Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native transport cancel');
-        if (this.runPromise) ;
-        this.runPromise = null;
-        this.runPromiseDeviceId = null;
+        return __awaiter(this, void 0, void 0, function* () {
+            Log === null || Log === void 0 ? void 0 : Log.debug('transport-react-native transport cancel');
+            const pending = this.runPromise;
+            const deviceId = this.runPromiseDeviceId;
+            if (pending) {
+                pending.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
+                if (this.runPromise === pending) {
+                    this.runPromise = null;
+                    this.runPromiseDeviceId = null;
+                }
+                if (deviceId)
+                    yield this.disconnect(deviceId);
+            }
+        });
     }
     connectWithTimeout(uuid, connect) {
         return __awaiter(this, void 0, void 0, function* () {
+            const startedAt = Date.now();
+            let succeeded = false;
             let timer;
             let timedOut = false;
             const pending = connect();
@@ -1606,6 +1732,7 @@ class ReactNativeBleTransport {
                         }, BLE_CONNECT_TIMEOUT_MS);
                     }),
                 ]);
+                succeeded = true;
                 return result;
             }
             catch (error) {
@@ -1620,11 +1747,19 @@ class ReactNativeBleTransport {
             finally {
                 if (timer)
                     clearTimeout(timer);
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] connect completed', {
+                    connectIdSuffix: uuid.slice(-8),
+                    elapsedMs: Date.now() - startedAt,
+                    succeeded,
+                    backstopExpired: timedOut,
+                });
             }
         });
     }
     resolveCharacteristicsWithTimeout(uuid, device) {
         return __awaiter(this, void 0, void 0, function* () {
+            const startedAt = Date.now();
+            let succeeded = false;
             let timer;
             let timedOut = false;
             const pending = this.resolveCharacteristics(device);
@@ -1640,6 +1775,7 @@ class ReactNativeBleTransport {
                     }),
                 ]);
                 this.connectionSetupTimeoutCounts.delete(uuid);
+                succeeded = true;
                 return result;
             }
             catch (error) {
@@ -1654,6 +1790,12 @@ class ReactNativeBleTransport {
             finally {
                 if (timer)
                     clearTimeout(timer);
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] GATT setup completed', {
+                    connectIdSuffix: uuid.slice(-8),
+                    elapsedMs: Date.now() - startedAt,
+                    succeeded,
+                    backstopExpired: timedOut,
+                });
             }
         });
     }
@@ -1755,6 +1897,8 @@ class ReactNativeBleTransport {
         }
     }
     resetPlxManager() {
+        if (bleManagerResetPromise)
+            return;
         const manager = this.blePlxManager;
         this.blePlxManager = undefined;
         const reason = 'React Native BLE manager reset';
@@ -1796,12 +1940,20 @@ class ReactNativeBleTransport {
         this.connectionSetupTimeoutCounts.clear();
         this.monitorTokens.clear();
         this.protocolV2Assemblers.clear();
+        let reset;
         try {
-            manager === null || manager === void 0 ? void 0 : manager.destroy();
+            reset = Promise.resolve(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);
+            reset = Promise.reject(error);
         }
+        bleManagerResetPromise = reset;
+        reset.then(() => {
+            if (bleManagerResetPromise === reset)
+                bleManagerResetPromise = undefined;
+        }, error => {
+            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE manager destroy failed:', error);
+        });
     }
     createProtocolMismatchError(expected) {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
@@ -1951,7 +2103,7 @@ class ReactNativeBleTransport {
             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)) {
+                if (shouldRethrowProtocolProbeError(error)) {
                     throw error;
                 }
                 return false;
@@ -1977,7 +2129,7 @@ class ReactNativeBleTransport {
                     (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                     this.resetProtocolV2Frames(uuid);
                 },
-                shouldRethrow: hdShared.isBleStaleBondHardwareError,
+                shouldRethrow: shouldRethrowProtocolProbeError,
             });
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
@@ -2104,6 +2256,9 @@ class ReactNativeBleTransport {
                         this.rememberStaleBondError(uuid, bondError);
                         throw bondError;
                     }
+                    if (isNativeBleDisconnectError(error)) {
+                        throw toBleDisconnectHardwareError(error);
+                    }
                     if (getFirmwareUploadWriteRetryType(error) !== 'congested' ||
                         attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
                         throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.104",
+  "version": "1.2.2-alpha.106",
   "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.104",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.104",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.104",
+    "@onekeyfe/hd-core": "1.2.2-alpha.106",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.106",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.106",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "67835939d9f779ffd50cd8b482d8c5b53bd580bd"
+  "gitHead": "e52ad091098aaab6b2845154457ace5e2f8c9098"
 }

package/src/__tests__/bleNativeDisconnect.test.ts

@@ -0,0 +1,33 @@
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import { isNativeBleDisconnectError, toBleDisconnectHardwareError } from '../bleNativeDisconnect';
+
+describe('native BLE disconnect mapping', () => {
+  test.each([
+    [{ errorCode: 201, reason: 'The specified device has disconnected from us.' }],
+    [{ errorCode: 201, iosErrorCode: 7, reason: 'The specified device has disconnected from us.' }],
+    [{ iosErrorCode: 7, reason: 'Peripheral disconnected' }],
+  ])('recognizes %j as a native disconnect', nativeError => {
+    expect(isNativeBleDisconnectError(nativeError)).toBe(true);
+    expect(toBleDisconnectHardwareError(nativeError)).toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceDisconnected,
+    });
+  });
+
+  test('does not treat a stale-bond iOS code as a disconnect', () => {
+    expect(
+      isNativeBleDisconnectError({
+        iosErrorCode: 14,
+        reason: 'Peer removed pairing information',
+      })
+    ).toBe(false);
+  });
+
+  test('does not treat an already-canonical unpaired error as a native disconnect', () => {
+    expect(
+      isNativeBleDisconnectError({
+        errorCode: HardwareErrorCode.BleDeviceNotBonded,
+      })
+    ).toBe(false);
+  });
+});