@onekeyfe/hd-core 1.1.34-alpha.3 → 1.1.34-alpha.4

package/src/utils/deviceVersionUtils.ts

@@ -1,42 +1,79 @@
 import semver from 'semver';
 
-import {
-  resolveDeviceBleFirmwareVersion,
-  resolveDeviceBoardVersion,
-  resolveDeviceBootloaderVersion,
-  resolveDeviceFirmwareVersion,
-} from './deviceFeaturesCompat';
+import type { Features, IVersionArray } from '../types';
 
-import type { IVersionArray } from '../types';
-import type { DeviceFeaturesInput } from './deviceFeaturesCompat';
+/**
+ * Get Connected Device version by features
+ */
+export const getDeviceFirmwareVersion = (features: Features | undefined): IVersionArray => {
+  if (!features) return [0, 0, 0];
 
-const EMPTY_VERSION: IVersionArray = [0, 0, 0];
+  if (semver.valid(features.onekey_firmware_version)) {
+    return features.onekey_firmware_version?.split('.') as unknown as IVersionArray;
+  }
 
-const parseDeviceVersion = (version?: string | null): IVersionArray => {
-  const parsed = version ? semver.parse(version) : null;
-  return parsed ? [parsed.major, parsed.minor, parsed.patch] : [...EMPTY_VERSION];
+  if (semver.valid(features.onekey_version)) {
+    return features.onekey_version?.split('.') as unknown as IVersionArray;
+  }
+
+  return [0, 0, 0];
 };
 
 /**
- * Get Connected Device version by features
+ * Get Connected Device bluetooth firmware version by features
  */
-export const getDeviceFirmwareVersion = (features?: DeviceFeaturesInput): IVersionArray =>
-  parseDeviceVersion(resolveDeviceFirmwareVersion(features));
+export const getDeviceBLEFirmwareVersion = (features: Features): IVersionArray => {
+  const bleVer = features?.onekey_ble_version || features?.ble_ver;
+
+  if (!bleVer) {
+    return [0, 0, 0];
+  }
+
+  if (!semver.valid(bleVer)) {
+    return [0, 0, 0];
+  }
+
+  if (bleVer) {
+    return bleVer.split('.').map(Number) as IVersionArray;
+  }
+  return [0, 0, 0];
+};
 
 /**
  * Get Connected Device bootloader version by features
  */
-export const getDeviceBootloaderVersion = (features?: DeviceFeaturesInput): IVersionArray =>
-  parseDeviceVersion(resolveDeviceBootloaderVersion(features));
+export const getDeviceBootloaderVersion = (features: Features | undefined): IVersionArray => {
+  if (!features) return [0, 0, 0];
 
-/**
- * Get Connected Device boardloader/romloader version by features
- */
-export const getDeviceBoardloaderVersion = (features?: DeviceFeaturesInput): IVersionArray =>
-  parseDeviceVersion(resolveDeviceBoardVersion(features));
+  // classic1s 3.5.0 pro 4.6.0
+  if (semver.valid(features.onekey_boot_version)) {
+    return features.onekey_boot_version?.split('.') as unknown as IVersionArray;
+  }
+
+  // low version hardware
+  if (!features.bootloader_version) {
+    if (features.bootloader_mode) {
+      return [
+        features?.major_version ?? 0,
+        features?.minor_version ?? 0,
+        features?.patch_version ?? 0,
+      ];
+    }
+    return [0, 0, 0];
+  }
+  if (semver.valid(features.bootloader_version)) {
+    return features.bootloader_version?.split('.') as unknown as IVersionArray;
+  }
+  return [0, 0, 0];
+};
 
 /**
- * Get Connected Device bluetooth firmware version by features
+ * Get Connected Device boardloader version by features
  */
-export const getDeviceBLEFirmwareVersion = (features?: DeviceFeaturesInput): IVersionArray =>
-  parseDeviceVersion(resolveDeviceBleFirmwareVersion(features));
+export const getDeviceBoardloaderVersion = (features: Features): IVersionArray => {
+  if (semver.valid(features?.onekey_board_version)) {
+    return features?.onekey_board_version?.split('.') as unknown as IVersionArray;
+  }
+
+  return [0, 0, 0];
+};

package/src/utils/findDefectiveBatchDevice.ts

@@ -1,11 +1,11 @@
-import { getDeviceSerialNo, getDeviceType } from './deviceInfoUtils';
+import { getDeviceType, getDeviceUUID } from './deviceInfoUtils';
 
 import type { Features } from '../types';
 
 /**
  * 检测故障固件设备
  * 检测规则：
- * - Serial number range: 21032200001 through 21032201500
+ * - 序列号范围：21032200001 到 21032201500 (从 onekey_serial 字段提取)
  * - SE版本为 1.1.0.2
  *
  * 对齐之前版本的检测逻辑
@@ -13,13 +13,13 @@ import type { Features } from '../types';
 export const findDefectiveBatchDevice = (features: Features) => {
   if (!features) return;
 
-  const { serialNo, seVersion } = features;
-  if (!serialNo) return;
+  const { onekey_serial: onekeySerial, se_ver: seVer } = features;
+  if (!onekeySerial) return;
 
-  const versionNum = +serialNo.slice(5);
+  const versionNum = +onekeySerial.slice(5);
   if (Number.isNaN(versionNum)) return;
 
-  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVersion === '1.1.0.2';
+  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVer === '1.1.0.2';
 };
 
 /**
@@ -27,9 +27,9 @@ export const findDefectiveBatchDevice = (features: Features) => {
  */
 export const getDefectiveDeviceInfo = (features: Features) => {
   if (!findDefectiveBatchDevice(features)) return null;
-  const serialNo = getDeviceSerialNo(features);
+  const serialNo = getDeviceUUID(features);
   const deviceType = getDeviceType(features);
-  const { seVersion } = features;
+  const seVersion = features.se_ver;
 
   return {
     serialNo,

package/src/utils/homescreen.ts

@@ -3,7 +3,6 @@ import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
-import { PRO2_WALLPAPER_HEIGHT, PRO2_WALLPAPER_WIDTH } from './pro2Wallpaper';
 
 import type { Features, IDeviceType } from '../types';
 
@@ -311,15 +310,6 @@ export const getHomeScreenSize = ({
   homeScreenType: 'WallPaper' | 'Nft';
   thumbnail?: boolean;
 }) => {
-  if (deviceType === EDeviceType.Pro2) {
-    return thumbnail
-      ? undefined
-      : {
-          width: PRO2_WALLPAPER_WIDTH,
-          height: PRO2_WALLPAPER_HEIGHT,
-        };
-  }
-
   const sizes: Partial<
     Record<
       IDeviceType,

package/src/utils/index.ts

@@ -8,11 +8,9 @@ export {
   getDeviceTypeByBleName,
   getDeviceType,
   getDeviceBleName,
-  getDeviceSerialNo,
   getDeviceUUID,
   getDeviceLabel,
   getMethodVersionRange,
-  isMethodVersionRangeUnsupported,
   getFirmwareType,
 } from './deviceInfoUtils';
 export {
@@ -39,8 +37,6 @@ export { getHDPath, getScriptType, getOutputScriptType } from '../api/helpers/pa
 export const isBleConnect = (env: string) => env === 'react-native' || env === 'lowlevel';
 
 export { getHomeScreenHex, getHomeScreenDefaultList, getHomeScreenSize } from './homescreen';
-export { encodePro2Wallpaper, PRO2_WALLPAPER_HEIGHT, PRO2_WALLPAPER_WIDTH } from './pro2Wallpaper';
-export type { Pro2WallpaperColorFormat } from './pro2Wallpaper';
 
 export const wait = (ms: number) =>
   new Promise(resolve => {

package/src/utils/tracing.ts

@@ -164,9 +164,7 @@ export function completeRequestContext(responseID: number, error?: Error): void
     context.status = error ? 'error' : 'success';
     if (error) {
       context.error = error.message;
-      // Method errors already reach callers through the standard API response.
-      // Request tracing is diagnostic and must not emit a second user-facing error.
-      Log.debug(
+      Log.error(
         `[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`
       );
     }

package/__tests__/AllNetworkGetAddressBase.tracing.test.ts

@@ -1,75 +0,0 @@
-import AllNetworkGetAddressBase from '../src/api/allnetwork/AllNetworkGetAddressBase';
-import { findMethod } from '../src/api/utils';
-import { getActiveRequestsByDeviceInstance } from '../src/utils/tracing';
-
-jest.mock('../src/data/config', () => ({
-  getSDKVersion: jest.fn(() => '1.0.0'),
-  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
-}));
-
-jest.mock('../src/api/utils', () => ({
-  findMethod: jest.fn(),
-}));
-
-class TestAllNetworkMethod extends AllNetworkGetAddressBase {
-  async getAllNetworkAddress() {
-    return Promise.resolve([]);
-  }
-}
-
-describe('AllNetworkGetAddressBase tracing', () => {
-  test('releases the nested request context when an unhandled error escapes', async () => {
-    const deviceInstanceId = 'device-instance';
-    const innerMethod = {
-      checkSafetyLevelOnTestNet: jest.fn().mockResolvedValue(false),
-      connectId: 'connect-id',
-      deviceId: 'device-id',
-      getVersionRange: jest.fn().mockReturnValue({}),
-      init: jest.fn(),
-      name: 'xrpGetAddress',
-      responseID: 42,
-      run: jest.fn().mockRejectedValue(new Error('address failed')),
-      setDevice: jest.fn(),
-      strictCheckDeviceSupport: false,
-    };
-    (findMethod as jest.Mock).mockReturnValue(innerMethod);
-    const method = new TestAllNetworkMethod({
-      id: 1,
-      payload: {
-        method: 'allNetworkGetAddress',
-        connectId: 'connect-id',
-        deviceId: 'device-id',
-        bundle: [],
-      },
-    });
-    method.device = {
-      instanceId: deviceInstanceId,
-      getCurrentFirmwareType: jest.fn(),
-      getCurrentFirmwareVersionString: jest.fn().mockReturnValue('1.0.0'),
-      getCurrentMethodVersionRange: jest
-        .fn()
-        .mockImplementation((getRange: (type: string) => unknown) => getRange('classic')),
-      off: jest.fn(),
-      on: jest.fn(),
-    } as any;
-
-    await expect(
-      method.callMethod(
-        'xrpGetAddress',
-        {
-          bundle: [
-            {
-              _originRequestParams: {
-                network: 'xrp',
-                path: "m/44'/144'/0'/0/0",
-              },
-            },
-          ],
-        },
-        0
-      )
-    ).rejects.toThrow('address failed');
-
-    expect(getActiveRequestsByDeviceInstance(deviceInstanceId)).toEqual([]);
-  });
-});

package/__tests__/RequestQueue.test.ts

@@ -1,140 +0,0 @@
-import RequestQueue from '../src/core/RequestQueue';
-
-import type { BaseMethod } from '../src/api/BaseMethod';
-
-jest.mock('../src/data/config', () => ({
-  getSDKVersion: jest.fn(() => '1.0.0'),
-  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
-}));
-
-function buildMethod(responseID: number, operationId?: string) {
-  return {
-    connectId: 'device-1',
-    executionPriority: 'normal',
-    payload: { operationId },
-    responseID,
-  } as unknown as BaseMethod;
-}
-
-function buildBackgroundMethod(responseID: number, operationId?: string) {
-  return {
-    ...buildMethod(responseID, operationId),
-    executionPriority: 'background',
-  } as unknown as BaseMethod;
-}
-
-describe('RequestQueue operation cancellation', () => {
-  test('aborts only the request matching the operation id', () => {
-    const queue = new RequestQueue();
-    const portfolio = queue.createTask(buildMethod(1, 'portfolio-1'));
-    const userAction = queue.createTask(buildMethod(2, 'user-action'));
-
-    expect(queue.abortOperation('portfolio-1')).toBe(true);
-    expect(portfolio.abortController?.signal.aborted).toBe(true);
-    expect(userAction.abortController?.signal.aborted).toBe(false);
-  });
-
-  test('returns false for an unknown operation id', () => {
-    const queue = new RequestQueue();
-    queue.createTask(buildMethod(1, 'portfolio-1'));
-
-    expect(queue.abortOperation('missing')).toBe(false);
-  });
-
-  test('honors cancellation that arrives before the request is registered', () => {
-    const queue = new RequestQueue();
-
-    expect(queue.abortOperation('portfolio-1')).toBe(false);
-
-    const portfolio = queue.createTask(buildMethod(1, 'portfolio-1'));
-    const userAction = queue.createTask(buildMethod(2, 'user-action'));
-
-    expect(portfolio.abortController?.signal.aborted).toBe(true);
-    expect(userAction.abortController?.signal.aborted).toBe(false);
-  });
-
-  test('expires a cancellation that is never matched', () => {
-    const nowSpy = jest.spyOn(Date, 'now');
-    nowSpy.mockReturnValueOnce(1_000);
-    const queue = new RequestQueue();
-    queue.abortOperation('portfolio-1');
-    nowSpy.mockReturnValue(31_001);
-
-    const portfolio = queue.createTask(buildMethod(1, 'portfolio-1'));
-
-    expect(portfolio.abortController?.signal.aborted).toBe(false);
-    nowSpy.mockRestore();
-  });
-
-  test('rejects a background request while the device has an active user request', async () => {
-    const queue = new RequestQueue();
-    queue.createTask(buildMethod(1, 'user-action'));
-
-    await expect(
-      queue.admitTask(buildBackgroundMethod(2, 'portfolio-1'), {
-        backgroundPreemptTimeoutMs: 100,
-      })
-    ).resolves.toMatchObject({ status: 'busy' });
-    expect(queue.getTask(2)).toBeUndefined();
-  });
-
-  test('aborts and waits for an active background request before admitting a user request', async () => {
-    const queue = new RequestQueue();
-    const portfolio = queue.createTask(buildBackgroundMethod(1, 'portfolio-1'));
-
-    const admission = queue.admitTask(buildMethod(2, 'user-action'), {
-      backgroundPreemptTimeoutMs: 100,
-    });
-    await Promise.resolve();
-
-    expect(portfolio.abortController?.signal.aborted).toBe(true);
-    expect(queue.getTask(2)).toBeUndefined();
-
-    portfolio.settled.resolve();
-    await Promise.resolve();
-    expect(queue.getTask(2)).toBeUndefined();
-
-    queue.releaseTask(1);
-
-    await expect(admission).resolves.toMatchObject({
-      status: 'reserved',
-      task: { id: 2 },
-    });
-  });
-
-  test('uses the background method abort latency when no admission override is provided', async () => {
-    const queue = new RequestQueue();
-    const portfolio = queue.createTask(buildBackgroundMethod(1, 'portfolio-1'));
-    portfolio.method.maxAbortLatencyMs = 12_000;
-    const waitForTasksReleased = jest
-      .spyOn(queue as any, 'waitForTasksReleased')
-      .mockResolvedValue(false);
-
-    await expect(queue.admitTask(buildMethod(2, 'user-action'))).resolves.toMatchObject({
-      status: 'busy',
-    });
-    expect(waitForTasksReleased).toHaveBeenCalledWith([portfolio], 12_000);
-  });
-
-  test('returns busy when an aborted background request does not release in time', async () => {
-    const queue = new RequestQueue();
-    const portfolio = queue.createTask(buildBackgroundMethod(1, 'portfolio-1'));
-
-    await expect(
-      queue.admitTask(buildMethod(2, 'user-action'), {
-        backgroundPreemptTimeoutMs: 1,
-      })
-    ).resolves.toMatchObject({
-      status: 'busy',
-      blockingTask: { id: 1 },
-    });
-    expect(portfolio.abortController?.signal.aborted).toBe(true);
-    expect(queue.getTask(2)).toBeUndefined();
-
-    queue.releaseTask(1);
-    await expect(queue.admitTask(buildMethod(3, 'user-retry'))).resolves.toMatchObject({
-      status: 'reserved',
-      task: { id: 3 },
-    });
-  });
-});

package/__tests__/UploadPortfolio.test.ts

@@ -1,46 +0,0 @@
-import UploadPortfolio from '../src/api/UploadPortfolio';
-
-jest.mock('../src/data/config', () => ({
-  getSDKVersion: jest.fn(() => '1.0.0'),
-  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
-}));
-
-describe('UploadPortfolio timeout', () => {
-  test('applies the command timeout to staging and PortfolioUpdate', async () => {
-    const packageBytes = new Uint8Array([1, 2, 3]);
-    const typedCall = jest
-      .fn()
-      .mockResolvedValueOnce({ message: { processed_byte: 3 } })
-      .mockResolvedValueOnce({ message: {} });
-    const method = new UploadPortfolio({
-      id: 1,
-      payload: {
-        method: 'uploadPortfolio',
-        packageBytes,
-      },
-    });
-    method.device = {
-      commands: { typedCall },
-    } as any;
-    method.postMessage = jest.fn();
-
-    method.init();
-    await method.run();
-
-    expect(method.executionPriority).toBe('background');
-    expect(typedCall).toHaveBeenNthCalledWith(
-      1,
-      'FilesystemFileWrite',
-      'FilesystemFile',
-      expect.any(Object),
-      { timeoutMs: 5_000 }
-    );
-    expect(typedCall).toHaveBeenNthCalledWith(
-      2,
-      'PortfolioUpdate',
-      'Success',
-      {},
-      { timeoutMs: 5_000 }
-    );
-  });
-});

package/__tests__/connectSettings.test.ts

@@ -1,61 +0,0 @@
-import DataManager from '../src/data-manager/DataManager';
-import { parseConnectSettings } from '../src/data-manager/connectSettings';
-
-import type { RemoteConfigResponse } from '../src/types';
-
-jest.mock('axios', () => ({
-  get: jest.fn(),
-}));
-
-jest.mock('../src/data/config', () => ({
-  getSDKVersion: jest.fn(() => '1.0.0'),
-  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
-}));
-
-const mockAxiosGet: jest.Mock = jest.requireMock('axios').get;
-
-describe('parseConnectSettings', () => {
-  const preloadedConfig = {
-    bridge: {},
-    classic: { firmware: [], ble: [] },
-    classic1s: { firmware: [], ble: [] },
-    classicpure: { firmware: [], ble: [] },
-    mini: { firmware: [], ble: [] },
-    touch: { firmware: [], ble: [] },
-    pro: { firmware: [], ble: [] },
-    pro2: { firmware: [], ble: [] },
-  } as unknown as RemoteConfigResponse;
-
-  it('keeps a serializable preloaded config in parsed settings', () => {
-    const settings = parseConnectSettings({
-      firmwareManifestMode: 'sdk-managed',
-      preloadedConfig,
-    });
-
-    expect(settings.firmwareManifestMode).toBe('sdk-managed');
-    expect(settings.preloadedConfig).toBe(preloadedConfig);
-  });
-
-  it('uses the preloaded config before the SDK network client', async () => {
-    const settings = parseConnectSettings({
-      firmwareManifestMode: 'sdk-managed',
-      preloadedConfig,
-    });
-
-    await DataManager.load(settings);
-
-    expect(mockAxiosGet).not.toHaveBeenCalled();
-    expect(DataManager.deviceMap.classic).toEqual({ firmware: [], ble: [] });
-  });
-
-  it('fails closed without a preloaded config in external-only mode', async () => {
-    const settings = parseConnectSettings({
-      firmwareManifestMode: 'external-only',
-    });
-
-    await expect(DataManager.load(settings)).rejects.toThrow(
-      'External firmware config snapshot is required'
-    );
-    expect(mockAxiosGet).not.toHaveBeenCalled();
-  });
-});

package/__tests__/device-lifecycle-events.test.ts

@@ -1,117 +0,0 @@
-import { initConnector, initCore } from '../src/core';
-import { DataManager } from '../src/data-manager';
-import TransportManager from '../src/data-manager/TransportManager';
-import { Device } from '../src/device/Device';
-import { DevicePool } from '../src/device/DevicePool';
-import { CORE_EVENT, DEVICE, IFRAME } from '../src/events';
-
-import type Core from '../src/core';
-import type { CoreMessage } from '../src/events';
-import type { KnownDevice } from '../src/types';
-
-jest.mock('../src/data/config', () => ({
-  getSDKVersion: jest.fn(() => '1.0.0-test'),
-  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0-test/',
-}));
-
-const createInitializedDevice = (protocol: 'V1' | 'V2') => {
-  const device = Device.fromDescriptor({
-    id: 'ble-discovery-id',
-    path: 'ble-discovery-id',
-    commType: 'ble',
-    protocolType: protocol,
-  } as never);
-  device.mainId = 'ble-connect-id';
-  device.features = {
-    protocol,
-    deviceType: protocol === 'V2' ? 'pro2' : 'classic',
-    firmwareType: 'universal',
-    deviceId: 'wallet-device-id',
-    serialNo: 'SERIAL-001',
-    label: 'OneKey Test',
-    bleName: 'OneKey Test BLE',
-    capabilities: [],
-    mode: 'normal',
-    initialized: true,
-    bootloaderMode: false,
-    firmwareVersion: '1.2.3',
-    bootloaderVersion: '1.0.0',
-    boardVersion: '1.0.0',
-    bleVersion: '2.3.4',
-  } as never;
-  return device;
-};
-
-describe('public device lifecycle events', () => {
-  let core: Core | undefined;
-
-  beforeEach(() => {
-    DevicePool.resetState();
-    jest.spyOn(TransportManager, 'load').mockImplementation();
-    TransportManager.transport = {
-      stop: jest.fn().mockResolvedValue(undefined),
-    } as never;
-  });
-
-  afterEach(async () => {
-    await core?.dispose();
-    core = undefined;
-    jest.restoreAllMocks();
-  });
-
-  test.each([
-    ['react-native', 'V1'],
-    ['react-native', 'V2'],
-    ['lowlevel', 'V1'],
-    ['lowlevel', 'V2'],
-  ] as const)(
-    'emits KnownDevice snapshots for %s Protocol %s connect and disconnect events',
-    async (env, protocol) => {
-      jest.spyOn(DataManager, 'getSettings').mockReturnValue(env as never);
-      core = initCore();
-      initConnector();
-
-      await core.handleMessage({
-        id: 'register-device-connect-listener',
-        event: IFRAME.CALL,
-        type: IFRAME.CALL,
-        payload: { method: 'clearSessionCache' },
-      } as CoreMessage);
-
-      const messages: CoreMessage[] = [];
-      core.on(CORE_EVENT, message => messages.push(message));
-      const internalDevice = createInitializedDevice(protocol);
-
-      DevicePool.emitter.emit(DEVICE.CONNECT, internalDevice);
-      internalDevice.updateState({ identity: { label: 'Updated label' } }, 'apply-settings');
-      DevicePool.emitter.emit(DEVICE.DISCONNECT, internalDevice);
-
-      const connectMessage = messages.find(message => message.type === DEVICE.CONNECT);
-      const disconnectMessage = messages.find(message => message.type === DEVICE.DISCONNECT);
-      const connectedDevice = connectMessage?.payload.device as KnownDevice;
-      const disconnectedDevice = disconnectMessage?.payload.device as KnownDevice;
-
-      expect(connectedDevice).toMatchObject({
-        connectId: 'ble-connect-id',
-        serialNo: 'SERIAL-001',
-        uuid: 'SERIAL-001',
-        label: 'OneKey Test',
-        state: { protocol },
-      });
-      expect(disconnectedDevice).toMatchObject({
-        connectId: 'ble-connect-id',
-        serialNo: 'SERIAL-001',
-        uuid: 'SERIAL-001',
-        label: 'Updated label',
-        state: { protocol },
-      });
-      expect(connectedDevice).not.toBe(internalDevice);
-      expect(connectedDevice).not.toBe(disconnectedDevice);
-      expect(connectedDevice).not.toHaveProperty('run');
-      expect(connectedDevice).not.toHaveProperty('acquire');
-      expect(connectedDevice).not.toHaveProperty('commands');
-      expect(() => JSON.stringify(connectedDevice)).not.toThrow();
-      expect(connectedDevice.label).toBe('OneKey Test');
-    }
-  );
-});