@onekeyfe/hd-core 1.2.6-alpha.2 → 1.2.6-alpha.3

package/__tests__/core-error-output.test.ts

@@ -6,6 +6,8 @@ import TransportManager from '../src/data-manager/TransportManager';
 import { IFRAME } from '../src/events';
 import SearchDevices from '../src/api/SearchDevices';
 import { DeviceList } from '../src/device/DeviceList';
+import { Device } from '../src/device/Device';
+import { DevicePool } from '../src/device/DevicePool';
 
 jest.mock('../src/data/config', () => ({
   getSDKVersion: jest.fn(() => '1.0.0-test'),
@@ -205,3 +207,112 @@ describe('Core 错误输出边界', () => {
     await core.dispose();
   });
 });
+
+describe('Portfolio firmware compatibility through Core', () => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  test.each(
+    (['pro2', 'neo'] as const).flatMap(deviceType =>
+      (['silent', 'progress'] as const).map(uiMode => ({ deviceType, uiMode }))
+    )
+  )(
+    'checks the current $deviceType firmware before a $uiMode upload',
+    async ({ deviceType, uiMode }) => {
+      DevicePool.resetState();
+      jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
+      const device = Device.fromDescriptor({
+        id: 'portfolio-device',
+        path: 'portfolio-device',
+        commType: 'ble',
+        protocolType: 'V2',
+      } as never);
+      jest.spyOn(Device, 'fromDescriptor').mockReturnValue(device);
+      jest.spyOn(device, 'acquire').mockResolvedValue(undefined);
+      jest.spyOn(device, 'initialize').mockResolvedValue(undefined);
+      jest.spyOn(device, 'release').mockResolvedValue(undefined);
+      jest.spyOn(device, 'ensureProtocolV2RuntimeContext').mockResolvedValue({
+        version: 2,
+        supported_messages: [60805, 61400],
+      });
+      const typedCall = jest.fn();
+      device.commands = {
+        typedCall,
+        disposed: false,
+        dispose: jest.fn(),
+        checkDisposed: jest.fn(),
+      } as never;
+      const core = initCore();
+      let id = 0;
+      const upload = () =>
+        core.handleMessage({
+          id: ++id,
+          type: IFRAME.CALL,
+          payload: {
+            method: 'uploadPortfolio',
+            connectId: 'portfolio-device',
+            connectProtocol: 'V2',
+            packageBase64: 'AQID',
+            uiMode,
+          },
+        } as never);
+
+      try {
+        // Reuse one device across version changes to cover a retry after upgrading.
+        for (const firmwareVersion of ['1.0.1', '1.0.2', '1.0.3', '1.0.10']) {
+          device.features = {
+            protocol: 'V2',
+            deviceType,
+            firmwareType: 'universal',
+            firmwareVersion,
+            mode: 'normal',
+            initialized: true,
+            bootloaderMode: false,
+            capabilities: [],
+          } as never;
+          typedCall.mockReset();
+          typedCall
+            .mockResolvedValueOnce({ message: { processed_byte: 3 } })
+            .mockResolvedValueOnce({ message: { message: 'Portfolio updated' } });
+
+          const response = await upload();
+          if (firmwareVersion === '1.0.1' || firmwareVersion === '1.0.2') {
+            expect(response).toMatchObject({
+              success: false,
+              payload: {
+                code: HardwareErrorCode.CallMethodNeedUpgradeFirmware,
+                params: { current: firmwareVersion, require: '1.0.3', method: 'uploadPortfolio' },
+              },
+            });
+            expect(typedCall).not.toHaveBeenCalled();
+          } else {
+            expect(response).toMatchObject({ success: true, payload: { portfolioUpdated: true } });
+            expect(typedCall).toHaveBeenCalledTimes(2);
+            expect(typedCall).toHaveBeenLastCalledWith('PortfolioUpdate', 'Success', {});
+          }
+        }
+
+        typedCall.mockReset();
+        typedCall
+          .mockResolvedValueOnce({ message: { processed_byte: 3 } })
+          .mockRejectedValueOnce(
+            ERRORS.TypedError(
+              HardwareErrorCode.RuntimeError,
+              'Failure_DataError,Invalid portfolio package'
+            )
+          );
+        await expect(upload()).resolves.toMatchObject({
+          success: false,
+          payload: {
+            code: HardwareErrorCode.RuntimeError,
+            error: 'Failure_DataError,Invalid portfolio package',
+          },
+        });
+      } finally {
+        await core.dispose();
+        DevicePool.resetState();
+      }
+    }
+  );
+});

package/dist/api/UploadPortfolio.d.ts

@@ -5,6 +5,11 @@ export type UploadPortfolioParams = {
     uiMode?: 'silent' | 'progress';
 };
 export default class UploadPortfolio extends FileWrite {
+    getVersionRange(): {
+        model_pro2: {
+            min: string;
+        };
+    };
     init(): void;
     run(): Promise<{
         portfolioUpdated: boolean;

package/dist/api/UploadPortfolio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}
+{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,eAAe;;;;;IAKf,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}

package/dist/index.js

@@ -55547,6 +55547,9 @@ const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
+    getVersionRange() {
+        return { model_pro2: { min: '1.0.3' } };
+    }
     init() {
         const { packageBase64, timeoutMs, uiMode = 'silent' } = this.payload;
         const packageBytes = decodeCanonicalBase64({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.6-alpha.2",
+  "version": "1.2.6-alpha.3",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.6-alpha.2",
-    "@onekeyfe/hd-transport": "1.2.6-alpha.2",
+    "@onekeyfe/hd-shared": "1.2.6-alpha.3",
+    "@onekeyfe/hd-transport": "1.2.6-alpha.3",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "c01014c750c5c0bc4f6bff2e07b2fee985893f59"
+  "gitHead": "4ca9104edb5113a625070484628fe4b2a56478e5"
 }

package/src/api/UploadPortfolio.ts

@@ -18,6 +18,11 @@ const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 
 export default class UploadPortfolio extends FileWrite {
+  getVersionRange() {
+    // Pro2 and Neo rotated the Portfolio verification key in firmware 1.0.3.
+    return { model_pro2: { min: '1.0.3' } };
+  }
+
   init() {
     const { packageBase64, timeoutMs, uiMode = 'silent' } = this.payload as UploadPortfolioParams;
     const packageBytes = decodeCanonicalBase64({