@onekeyfe/hd-transport-react-native 1.2.3-alpha.5 → 1.2.3-alpha.6

package/dist/bleNativeDisconnect.d.ts.map

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

@@ -213,42 +213,22 @@ const timer = process.env.NODE_ENV === 'development'
 
 const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject) => {
     let done = false;
-    let cancelTimeout = () => undefined;
-    let removeSubscription = () => undefined;
-    const finish = (error) => {
-        if (done)
-            return;
-        done = true;
-        cancelTimeout();
-        removeSubscription();
-        if (error)
-            reject(error);
-        else
-            resolve();
-    };
     const subscription = bleManager.onStateChange(state => {
         if (state === 'PoweredOn') {
-            finish();
-        }
-        else if (state === 'PoweredOff') {
-            finish(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff));
-        }
-        else if (state === 'Unsupported') {
-            finish(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported));
-        }
-        else if (state === 'Unauthorized') {
-            finish(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
+            if (done)
+                return;
+            clearTimeout();
+            done = true;
+            subscription.remove();
+            resolve();
         }
     }, true);
-    removeSubscription = () => subscription.remove();
-    if (done) {
-        removeSubscription();
-    }
-    else {
-        cancelTimeout = timer.timeout(() => {
-            finish(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleScanError));
-        }, ms);
-    }
+    const clearTimeout = timer.timeout(() => {
+        if (done)
+            return;
+        subscription.remove();
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
+    }, ms);
 });
 
 const BLE_PLX_DEVICE_DISCONNECTED = 201;
@@ -262,8 +242,7 @@ const isNativeBleDisconnectError = (error) => {
     }
     const nativeError = error;
     return (nativeError.errorCode === BLE_PLX_DEVICE_DISCONNECTED ||
-        nativeError.iosErrorCode === IOS_PERIPHERAL_DISCONNECTED ||
-        nativeErrorText$1(nativeError).toLowerCase().includes('was disconnected'));
+        nativeError.iosErrorCode === IOS_PERIPHERAL_DISCONNECTED);
 };
 const toBleDisconnectHardwareError = (error) => {
     if ((error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleDeviceDisconnected) {
@@ -566,7 +545,7 @@ const resolveNegotiatedMtu = (device, cancelTransaction) => shouldRefreshNegotia
     ? requestNegotiatedMtu(device, 'connected', 0, cancelTransaction)
     : Promise.resolve({ device, timedOut: false });
 function remapError(error) {
-    var _a, _b;
+    var _a;
     if (error instanceof reactNativeBlePlx.BleError) {
         if (isNativeBleStaleBondError(error)) {
             throw toBleStaleBondHardwareError(error);
@@ -575,13 +554,12 @@ function remapError(error) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondError);
         }
     }
-    if (isNativeBleDisconnectError(error)) {
-        throw toBleDisconnectHardwareError(error);
-    }
-    if (error instanceof Error && ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('not found'))) {
+    if (error instanceof Error &&
+        error.message &&
+        (error.message.includes('was disconnected') || error.message.includes('not found'))) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
     }
-    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_b = error.reason) !== null && _b !== void 0 ? _b : error);
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = error.reason) !== null && _a !== void 0 ? _a : error);
 }
 class ReactNativeBleTransport {
     constructor(options) {
@@ -927,11 +905,8 @@ class ReactNativeBleTransport {
                     var _a, _b;
                     if (error) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('ble scan error: ', error);
-                        if (error.errorCode === reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff) {
-                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePoweredOff));
-                        }
-                        else if (error.errorCode === reactNativeBlePlx.BleErrorCode.BluetoothUnsupported) {
-                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleUnsupported));
+                        if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
+                            finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
                         }
                         else if (error.errorCode === reactNativeBlePlx.BleErrorCode.BluetoothUnauthorized) {
                             finishScan(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError));
@@ -2063,12 +2038,6 @@ class ReactNativeBleTransport {
                         throw this.createWedgedBleSetupError();
                     }
                 }
-                if (isNativeBleStaleBondError(error) || hdShared.isBleStaleBondHardwareError(error)) {
-                    throw toBleStaleBondHardwareError(error);
-                }
-                if (isNativeBleDisconnectError(error)) {
-                    throw toBleDisconnectHardwareError(error);
-                }
                 if (reactNative.Platform.OS === 'android' && isMissingGattShapeError(error)) {
                     this.androidGattCacheRefreshes.add(uuid);
                 }

package/dist/subscribeBleOn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribeBleOn.d.ts","sourceRoot":"","sources":["../src/subscribeBleOn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,eAAO,MAAM,cAAc,eAAgB,aAAa,kBAAc,QAAQ,IAAI,CAmC9E,CAAC"}
+{"version":3,"file":"subscribeBleOn.d.ts","sourceRoot":"","sources":["../src/subscribeBleOn.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,eAAO,MAAM,cAAc,eAAgB,aAAa,kBAAc,QAAQ,IAAI,CAmB9E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.3-alpha.5",
+  "version": "1.2.3-alpha.6",
   "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.3-alpha.5",
-    "@onekeyfe/hd-shared": "1.2.3-alpha.5",
-    "@onekeyfe/hd-transport": "1.2.3-alpha.5",
+    "@onekeyfe/hd-core": "1.2.3-alpha.6",
+    "@onekeyfe/hd-shared": "1.2.3-alpha.6",
+    "@onekeyfe/hd-transport": "1.2.3-alpha.6",
     "@onekeyfe/react-native-ble-utils": "0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "ee493c3ad41a6bc7fb249fba71d4b9bf8efcced8"
+  "gitHead": "80a130479ef3ca8479cfb9041d80097ae43d2574"
 }

package/src/__tests__/bleNativeDisconnect.test.ts

@@ -30,25 +30,4 @@ describe('native BLE disconnect mapping', () => {
       })
     ).toBe(false);
   });
-
-  test('recognizes the unstructured ble-plx disconnect observed during GATT discovery', () => {
-    const nativeError = {
-      errorCode: 0,
-      message: 'BleError: Device stalled-connect-device was disconnected',
-    };
-
-    expect(isNativeBleDisconnectError(nativeError)).toBe(true);
-    expect(toBleDisconnectHardwareError(nativeError)).toMatchObject({
-      errorCode: HardwareErrorCode.BleDeviceDisconnected,
-    });
-  });
-
-  test('does not infer a disconnect from an unrelated discovery failure', () => {
-    expect(
-      isNativeBleDisconnectError({
-        errorCode: 0,
-        message: 'Known OneKey service UUID not found',
-      })
-    ).toBe(false);
-  });
 });

package/src/__tests__/connectTimeout.test.ts

@@ -623,44 +623,6 @@ describe('BLE connect timeout', () => {
     expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(UUID);
   });
 
-  test.each([
-    {
-      nativeFields: { errorCode: BleErrorCode.DeviceDisconnected, iosErrorCode: 14 },
-      reason: 'Peer removed pairing information',
-      errorCode: HardwareErrorCode.BlePeerRemovedPairingInformation,
-    },
-    {
-      nativeFields: { errorCode: 0, attErrorCode: 5 },
-      reason: 'GATT_INSUF_AUTHENTICATION',
-      errorCode: HardwareErrorCode.BleDeviceBondError,
-    },
-  ])(
-    'maps a stale bond during GATT discovery to canonical error $errorCode',
-    async ({ nativeFields, reason, errorCode }) => {
-      const { transport, device } = createHarness(() => Promise.resolve());
-      const nativeError = Object.assign(new Error(reason), nativeFields, { reason });
-      device.discoverAllServicesAndCharacteristics.mockRejectedValueOnce(nativeError);
-
-      await expect(
-        (transport as any).resolveCharacteristicsWithTimeout(UUID, device)
-      ).rejects.toMatchObject({ errorCode });
-    }
-  );
-
-  test('normalizes an unstructured GATT disconnect instead of leaking an unknown error', async () => {
-    const { transport, device } = createHarness(() => Promise.resolve());
-    const nativeError = Object.assign(new Error(`BleError: Device ${UUID} was disconnected`), {
-      errorCode: 0,
-    });
-    device.discoverAllServicesAndCharacteristics.mockRejectedValueOnce(nativeError);
-
-    await expect(
-      (transport as any).resolveCharacteristicsWithTimeout(UUID, device)
-    ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleDeviceDisconnected,
-    });
-  });
-
   test('a successful GATT retry clears the timeout budget before an abandoned call settles', async () => {
     const { transport, device, bleManager } = createHarness(() => Promise.resolve());
     let resolveAbandonedDiscovery: (() => void) | undefined;

package/src/__tests__/enumerate.test.ts

@@ -1,8 +1,5 @@
 import { EventEmitter } from 'events';
 
-import { BleErrorCode } from 'react-native-ble-plx';
-import { HardwareErrorCode } from '@onekeyfe/hd-shared';
-
 import { getConnectedDeviceIds } from '../BleManager';
 import ReactNativeBleTransport from '../index';
 
@@ -17,14 +14,7 @@ jest.mock(
 
 jest.mock('react-native-ble-plx', () => ({
   BleError: class BleError extends Error {},
-  BleErrorCode: {
-    BluetoothUnsupported: 100,
-    BluetoothUnauthorized: 101,
-    BluetoothPoweredOff: 102,
-    BluetoothInUnknownState: 103,
-    ScanStartFailed: 600,
-    LocationServicesDisabled: 601,
-  },
+  BleErrorCode: {},
   BleManager: jest.fn(),
   ScanMode: { LowLatency: 2 },
 }));
@@ -41,31 +31,6 @@ jest.mock('../subscribeBleOn', () => ({
 
 const ONEKEY_SERVICE_UUID = '00000001-0000-1000-8000-00805f9b34fb';
 
-describe('ReactNativeBleTransport scan error mapping', () => {
-  test.each([
-    [BleErrorCode.BluetoothPoweredOff, HardwareErrorCode.BlePoweredOff],
-    [BleErrorCode.BluetoothUnsupported, HardwareErrorCode.BleUnsupported],
-    [BleErrorCode.BluetoothInUnknownState, HardwareErrorCode.BleScanError],
-    [BleErrorCode.BluetoothUnauthorized, HardwareErrorCode.BleLocationError],
-  ])('maps native BLE error %s to hardware error %s', async (nativeCode, errorCode) => {
-    jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([]);
-    const blePlxManager = {
-      startDeviceScan: jest.fn((_serviceUUIDs, _options, listener) => {
-        queueMicrotask(() => {
-          listener({ errorCode: nativeCode, reason: 'native scan failure' }, null);
-        });
-      }),
-      stopDeviceScan: jest.fn(() => Promise.resolve()),
-    };
-    const transport = new ReactNativeBleTransport({ scanTimeout: 10_000 });
-    transport.blePlxManager = blePlxManager as never;
-    transport.init({ debug: jest.fn(), error: jest.fn() }, new EventEmitter());
-
-    await expect(transport.enumerate()).rejects.toMatchObject({ errorCode });
-    expect(blePlxManager.stopDeviceScan).toHaveBeenCalledTimes(1);
-  });
-});
-
 describe('ReactNativeBleTransport iOS discovery', () => {
   test('keeps a bonded Pro2 communication peripheral after Find My changes its name', async () => {
     jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([

package/src/bleNativeDisconnect.ts

@@ -23,8 +23,7 @@ export const isNativeBleDisconnectError = (error: unknown): boolean => {
   const nativeError = error as NativeBleErrorFields;
   return (
     nativeError.errorCode === BLE_PLX_DEVICE_DISCONNECTED ||
-    nativeError.iosErrorCode === IOS_PERIPHERAL_DISCONNECTED ||
-    nativeErrorText(nativeError).toLowerCase().includes('was disconnected')
+    nativeError.iosErrorCode === IOS_PERIPHERAL_DISCONNECTED
   );
 };
 

package/src/index.ts

@@ -175,8 +175,8 @@ const shouldRethrowProtocolProbeError = (error: unknown): boolean => {
   const code = (error as { errorCode?: unknown })?.errorCode;
   // Bonding and GATT failures are not evidence of a protocol mismatch. Preserve
   // them instead of probing another protocol on an unusable connection.
-  // Native PLX disconnects (errorCode 201 / iOS 7, or the unstructured
-  // "was disconnected" fallback) must match before Protocol V2 probing.
+  // Native PLX disconnects (errorCode 201 / iOS 7) must match before they are
+  // mapped: Protocol V2 writes rethrow them unchanged unless normalized first.
   return (
     isBleStaleBondHardwareError(error) ||
     isNativeBleDisconnectError(error) ||
@@ -460,11 +460,11 @@ function remapError(error: IOBleErrorRemap) {
     }
   }
 
-  if (isNativeBleDisconnectError(error)) {
-    throw toBleDisconnectHardwareError(error);
-  }
-
-  if (error instanceof Error && error.message?.includes('not found')) {
+  if (
+    error instanceof Error &&
+    error.message &&
+    (error.message.includes('was disconnected') || error.message.includes('not found'))
+  ) {
     throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
   }
 
@@ -910,10 +910,12 @@ export default class ReactNativeBleTransport {
         (error, device) => {
           if (error) {
             Log?.debug('ble scan error: ', error);
-            if (error.errorCode === BleErrorCode.BluetoothPoweredOff) {
-              finishScan(ERRORS.TypedError(HardwareErrorCode.BlePoweredOff));
-            } else if (error.errorCode === BleErrorCode.BluetoothUnsupported) {
-              finishScan(ERRORS.TypedError(HardwareErrorCode.BleUnsupported));
+            if (
+              [BleErrorCode.BluetoothPoweredOff, BleErrorCode.BluetoothInUnknownState].includes(
+                error.errorCode
+              )
+            ) {
+              finishScan(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
             } else if (error.errorCode === BleErrorCode.BluetoothUnauthorized) {
               finishScan(ERRORS.TypedError(HardwareErrorCode.BleLocationError));
             } else if (error.errorCode === BleErrorCode.LocationServicesDisabled) {
@@ -2341,12 +2343,6 @@ export default class ReactNativeBleTransport {
           throw this.createWedgedBleSetupError();
         }
       }
-      if (isNativeBleStaleBondError(error) || isBleStaleBondHardwareError(error)) {
-        throw toBleStaleBondHardwareError(error);
-      }
-      if (isNativeBleDisconnectError(error)) {
-        throw toBleDisconnectHardwareError(error);
-      }
       if (Platform.OS === 'android' && isMissingGattShapeError(error)) {
         this.androidGattCacheRefreshes.add(uuid);
       }

package/src/subscribeBleOn.ts

@@ -7,36 +7,20 @@ import type { BlePlxManager } from './types';
 export const subscribeBleOn = (bleManager: BlePlxManager, ms = 1000): Promise<void> =>
   new Promise((resolve, reject) => {
     let done = false;
-    let cancelTimeout: () => void = () => undefined;
-    let removeSubscription: () => void = () => undefined;
-
-    const finish = (error?: Error) => {
-      if (done) return;
-      done = true;
-      cancelTimeout();
-      removeSubscription();
-      if (error) reject(error);
-      else resolve();
-    };
 
     const subscription = bleManager.onStateChange(state => {
       if (state === 'PoweredOn') {
-        finish();
-      } else if (state === 'PoweredOff') {
-        finish(ERRORS.TypedError(HardwareErrorCode.BlePoweredOff));
-      } else if (state === 'Unsupported') {
-        finish(ERRORS.TypedError(HardwareErrorCode.BleUnsupported));
-      } else if (state === 'Unauthorized') {
-        finish(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
+        if (done) return;
+        clearTimeout();
+        done = true;
+        subscription.remove();
+        resolve();
       }
     }, true);
-    removeSubscription = () => subscription.remove();
 
-    if (done) {
-      removeSubscription();
-    } else {
-      cancelTimeout = timer.timeout(() => {
-        finish(ERRORS.TypedError(HardwareErrorCode.BleScanError));
-      }, ms);
-    }
+    const clearTimeout = timer.timeout(() => {
+      if (done) return;
+      subscription.remove();
+      reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
+    }, ms);
   });

package/src/__tests__/subscribeBleOn.test.ts

@@ -1,111 +0,0 @@
-import { HardwareErrorCode } from '@onekeyfe/hd-shared';
-
-import { subscribeBleOn } from '../subscribeBleOn';
-
-import type { BlePlxManager } from '../types';
-
-type BleState = Parameters<Parameters<BlePlxManager['onStateChange']>[0]>[0];
-
-const createBleManager = () => {
-  let stateListener: ((state: BleState) => void) | undefined;
-  const remove = jest.fn();
-  const bleManager = {
-    onStateChange: jest.fn(listener => {
-      stateListener = listener;
-      return { remove };
-    }),
-  } as unknown as BlePlxManager;
-
-  return {
-    bleManager,
-    emitState: (state: BleState) => stateListener?.(state),
-    remove,
-  };
-};
-
-describe('subscribeBleOn', () => {
-  beforeAll(() => {
-    jest.useFakeTimers({ doNotFake: ['performance'] });
-  });
-
-  afterAll(() => {
-    jest.useRealTimers();
-  });
-
-  afterEach(() => {
-    jest.clearAllTimers();
-  });
-
-  test('resolves when Bluetooth is powered on', async () => {
-    const { bleManager, emitState, remove } = createBleManager();
-    const result = subscribeBleOn(bleManager);
-
-    emitState('PoweredOn');
-
-    await expect(result).resolves.toBeUndefined();
-    expect(remove).toHaveBeenCalledTimes(1);
-    expect(jest.getTimerCount()).toBe(0);
-  });
-
-  test('cleans up when the current state is emitted synchronously', async () => {
-    const remove = jest.fn();
-    const bleManager = {
-      onStateChange: jest.fn(listener => {
-        listener('PoweredOn');
-        return { remove };
-      }),
-    } as unknown as BlePlxManager;
-
-    await expect(subscribeBleOn(bleManager)).resolves.toBeUndefined();
-    expect(remove).toHaveBeenCalledTimes(1);
-    expect(jest.getTimerCount()).toBe(0);
-  });
-
-  test.each([
-    ['PoweredOff', HardwareErrorCode.BlePoweredOff],
-    ['Unsupported', HardwareErrorCode.BleUnsupported],
-    ['Unauthorized', HardwareErrorCode.BlePermissionError],
-  ] as const)('maps %s to hardware error %s', async (state, errorCode) => {
-    const { bleManager, emitState, remove } = createBleManager();
-    const result = subscribeBleOn(bleManager);
-    const rejection = expect(result).rejects.toMatchObject({ errorCode });
-
-    emitState(state);
-
-    await rejection;
-    expect(remove).toHaveBeenCalledTimes(1);
-    expect(jest.getTimerCount()).toBe(0);
-  });
-
-  test('settles only once when terminal states repeat', async () => {
-    const { bleManager, emitState, remove } = createBleManager();
-    const result = subscribeBleOn(bleManager);
-    const rejection = expect(result).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BlePoweredOff,
-    });
-
-    emitState('PoweredOff');
-    emitState('PoweredOn');
-
-    await rejection;
-    expect(remove).toHaveBeenCalledTimes(1);
-    expect(jest.getTimerCount()).toBe(0);
-  });
-
-  test.each(['Unknown', 'Resetting'] as const)(
-    'reports %s as a scan error if no stable state arrives before timeout',
-    async state => {
-      const { bleManager, emitState, remove } = createBleManager();
-      const result = subscribeBleOn(bleManager, 1000);
-      const rejection = expect(result).rejects.toMatchObject({
-        errorCode: HardwareErrorCode.BleScanError,
-      });
-
-      emitState(state);
-      jest.advanceTimersByTime(1000);
-
-      await rejection;
-      expect(remove).toHaveBeenCalledTimes(1);
-    }
-  );
-});