@onekeyfe/hd-core 1.2.0-alpha.70 → 1.2.0-alpha.71

package/__tests__/check-all-firmware-release-protocol-v2.test.ts

@@ -163,6 +163,34 @@ describe('checkAllFirmwareRelease Protocol V2 support', () => {
     });
   });
 
+  test('marks SE03 and SE04 as unsupported in a Neo firmware plan', () => {
+    const neoRelease: IFirmwareReleaseInfo = {
+      ...release,
+      installOrder: ['se01', 'se02', 'se03', 'se04'],
+      components: {
+        se01: { target: 'SE01', url: 'https://example.com/se01.bin', version: [2, 0, 0] },
+        se02: { target: 'SE02', url: 'https://example.com/se02.bin', version: [3, 0, 0] },
+        se03: { target: 'SE03', url: 'https://example.com/se03.bin', version: [2, 0, 0] },
+        se04: { target: 'SE04', url: 'https://example.com/se04.bin', version: [2, 0, 0] },
+      },
+    };
+
+    const result = buildProtocolV2FirmwareRelease({
+      currentVersions,
+      firmwareType: EFirmwareType.Universal,
+      release: neoRelease,
+      deviceType: 'neo',
+    });
+
+    expect(result.targetsToUpdate).toEqual(['se01', 'se02']);
+    expect(result.components).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ configKey: 'se03', status: 'unsupported', updateTarget: null }),
+        expect.objectContaining({ configKey: 'se04', status: 'unsupported', updateTarget: null }),
+      ])
+    );
+  });
+
   test('returns an unavailable plan when no Pro2 release is configured', () => {
     expect(
       buildProtocolV2FirmwareRelease({

package/__tests__/protocol-v2-firmware-targets.test.ts

@@ -1,5 +1,10 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
+
 import { ProtocolV2FirmwareTargetType } from '../src/protocols/protocol-v2/firmware';
-import { isProtocolV2FirmwareFingerprintValid } from '../src/api/FirmwareUpdateV4';
+import {
+  assertProtocolV2FirmwareTargetsSupported,
+  isProtocolV2FirmwareFingerprintValid,
+} from '../src/api/FirmwareUpdateV4';
 
 jest.mock('../src/data/config', () => ({
   DEFAULT_DOMAIN: 'https://example.com/',
@@ -34,4 +39,31 @@ describe('Protocol V2 firmware target contract', () => {
     ).toBe(true);
     expect(isProtocolV2FirmwareFingerprintValid(binary, '00'.repeat(32))).toBe(false);
   });
+
+  test('allows only SE01 and SE02 firmware targets on Neo', () => {
+    expect(() =>
+      assertProtocolV2FirmwareTargetsSupported(EDeviceType.Neo, {
+        platform: 'web',
+        targetsToUpdate: ['se01', 'se02'],
+      })
+    ).not.toThrow();
+
+    expect(() =>
+      assertProtocolV2FirmwareTargetsSupported(EDeviceType.Neo, {
+        platform: 'web',
+        targetsToUpdate: ['se03'],
+        se04Binary: new ArrayBuffer(1),
+      })
+    ).toThrow('Neo only supports SE01 and SE02; unsupported firmware targets: se03, se04');
+  });
+
+  test('keeps all four SE firmware targets available on Pro2', () => {
+    expect(() =>
+      assertProtocolV2FirmwareTargetsSupported(EDeviceType.Pro2, {
+        platform: 'web',
+        targetsToUpdate: ['se03'],
+        se04Binary: new ArrayBuffer(1),
+      })
+    ).not.toThrow();
+  });
 });

package/__tests__/protocol-v2-resources.test.ts

@@ -95,7 +95,7 @@ describe('Pro2 resource configuration', () => {
     DataManager.lastCheckTimestamp = 0;
   });
 
-  test('accepts exactly six resources and normalizes their deterministic order', () => {
+  test('accepts exactly seven resources and normalizes their deterministic order', () => {
     const parsed = parseProtocolV2Resources({
       stable: [...resources].reverse(),
       boot: bootResources,
@@ -106,15 +106,18 @@ describe('Pro2 resource configuration', () => {
     expect(PROTOCOL_V2_RESOURCE_DEVICE_PATHS.translations).toBe(
       'vol0:/bundles/translations/translations.okpkg'
     );
+    expect(PROTOCOL_V2_RESOURCE_DEVICE_PATHS.firmware_logo).toBe(
+      'vol0:/bundles/firmware_logo.okpkg'
+    );
   });
 
   test('rejects incomplete, duplicate, or malformed stable sets', () => {
     expect(() => parseProtocolV2Resources({ stable: resources.slice(1) })).toThrow(
-      'six unique resource types'
+      '7 unique resource types'
     );
     expect(() =>
-      parseProtocolV2Resources({ stable: [...resources.slice(0, 5), resources[0]] })
-    ).toThrow('six unique resource types');
+      parseProtocolV2Resources({ stable: [...resources.slice(0, 6), resources[0]] })
+    ).toThrow('7 unique resource types');
     expect(() =>
       parseProtocolV2Resources({
         stable: resources.map((resource, index) =>
@@ -224,7 +227,7 @@ describe('Pro2 resource configuration', () => {
     );
     expect(typedCall.mock.calls.some(call => call[0] === 'ResourceInventoryGet')).toBe(false);
     expect(typedCall.mock.calls.filter(call => call[0] === 'FilesystemPathInfoQuery')).toHaveLength(
-      6
+      7
     );
     expect(typedCall.mock.calls.some(call => call[0] === 'FilesystemFileRead')).toBe(true);
   });
@@ -255,7 +258,7 @@ describe('Pro2 resource configuration', () => {
     });
     expect(
       buildProtocolV2ResourceUpdatePlan({ resources, mode: 'bootloader-recovery' }).resources
-    ).toHaveLength(6);
+    ).toHaveLength(7);
   });
 
   test('uses a filesystem inventory for incremental recovery mode updates', () => {

package/__tests__/protocol-v2.test.ts

@@ -35,7 +35,10 @@ import ProtocolInfoRequest from '../src/api/protocol-v2/ProtocolInfoRequest';
 import EVMSignTypedData from '../src/api/evm/EVMSignTypedData';
 import EVMSignMessageEIP712 from '../src/api/evm/EVMSignMessageEIP712';
 import FirmwareUpdateV3 from '../src/api/FirmwareUpdateV3';
-import FirmwareUpdateV4, { assertProtocolV2ReconnectIdentity } from '../src/api/FirmwareUpdateV4';
+import FirmwareUpdateV4, {
+  assertProtocolV2FirmwareTargetsSupported,
+  assertProtocolV2ReconnectIdentity,
+} from '../src/api/FirmwareUpdateV4';
 import GetPassphraseState from '../src/api/GetPassphraseState';
 import GetOnekeyFeatures from '../src/api/GetOnekeyFeatures';
 import { batchGetPublickeys } from '../src/api/helpers/batchGetPublickeys';
@@ -255,7 +258,10 @@ describe('UploadPortfolio', () => {
       'FilesystemFileWrite',
       'FilesystemFile',
       expect.any(Object),
-      { timeoutMs: undefined }
+      expect.objectContaining({
+        timeoutMs: undefined,
+        onWriteCompleted: expect.any(Function),
+      })
     );
     expect(typedCall).toHaveBeenNthCalledWith(2, 'PortfolioUpdate', 'Success', {});
   });
@@ -298,7 +304,10 @@ describe('UploadPortfolio', () => {
         append: false,
         ui_percentage: 100,
       },
-      { timeoutMs: undefined }
+      expect.objectContaining({
+        timeoutMs: undefined,
+        onWriteCompleted: expect.any(Function),
+      })
     );
     expect(typedCall).toHaveBeenNthCalledWith(2, 'PortfolioUpdate', 'Success', {});
     expect(method.postMessage).not.toHaveBeenCalled();
@@ -3989,6 +3998,10 @@ describe('Protocol V2 firmware update targets', () => {
     });
 
     const order: string[] = [];
+    (method as any).prepareProtocolV2BootResources = jest.fn().mockImplementation(() => {
+      order.push('prepare-startup-resources');
+      return Promise.resolve([]);
+    });
     (method as any).enterProtocolV2BootloaderMode = jest.fn().mockImplementation(() => {
       order.push('enter-bootloader');
       return Promise.resolve(true);
@@ -4017,7 +4030,12 @@ describe('Protocol V2 firmware update targets', () => {
 
     await method.run();
 
-    expect(order).toEqual(['enter-bootloader', 'prepare-resources', 'execute-update']);
+    expect(order).toEqual([
+      'prepare-startup-resources',
+      'enter-bootloader',
+      'prepare-resources',
+      'execute-update',
+    ]);
   });
 
   test('reboots Protocol V2 normal-mode device to bootloader before transfer', async () => {
@@ -4261,6 +4279,41 @@ describe('Protocol V2 firmware update targets', () => {
     expect(typedCall.mock.calls.map(call => call[0])).toEqual(['DeviceInfoGet']);
   });
 
+  test('polls again when Protocol V2 bootloader serial is temporarily unavailable', async () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+      },
+    });
+    const typedCall = jest
+      .fn()
+      .mockResolvedValueOnce({
+        type: 'DeviceInfo',
+        message: { protocol_version: 1, hw: {} },
+      })
+      .mockResolvedValueOnce({
+        type: 'DeviceInfo',
+        message: protocolV2BootloaderDeviceInfo,
+      });
+    const reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
+    (method as any).device = stubDevice({
+      originalDescriptor: { id: 'ble-id', protocolType: 'V2' },
+      getCommands: () => ({ typedCall }),
+      probeProtocolV2RuntimeState: jest.fn().mockResolvedValue({
+        mode: 'bootloader',
+        bootloaderMode: true,
+      }),
+    });
+    (method as any).reconnectProtocolV2Device = reconnectProtocolV2Device;
+    (method as any).protocolV2ExpectedSerialNumber = 'PR9999999999';
+
+    await (method as any).waitForProtocolV2BootloaderMode(60 * 1000, 0);
+
+    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(2);
+    expect(typedCall).toHaveBeenCalledTimes(2);
+  });
+
   test('does not run generic initialize during Protocol V2 USB firmware reconnect', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
@@ -6374,8 +6427,14 @@ describe('Protocol V2 firmware update targets', () => {
     expect(writePayloads.map(payload => payload.file.data.byteLength)).toEqual([1800, 1]);
     expect(writePayloads.map(payload => payload.ui_percentage)).toEqual([0, 100]);
     expect(typedCall.mock.calls.map(call => call[3])).toEqual([
-      { writeWithResponse: true },
-      { writeWithResponse: true },
+      expect.objectContaining({
+        writeWithResponse: false,
+        onWriteCompleted: expect.any(Function),
+      }),
+      expect.objectContaining({
+        writeWithResponse: false,
+        onWriteCompleted: expect.any(Function),
+      }),
     ]);
   });
 
@@ -6941,7 +7000,7 @@ describe('Protocol V2 firmware reconnect identity', () => {
     resourcesSpy.mockRestore();
   });
 
-  test('does not resolve boot resources unless the optional target is selected', async () => {
+  test('does not resolve boot resources when no resource target is selected', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: { method: 'firmwareUpdateV4', platform: 'web' },
@@ -6956,7 +7015,7 @@ describe('Protocol V2 firmware reconnect identity', () => {
     expect(downloadSpy).not.toHaveBeenCalled();
   });
 
-  test('downloads and maps selected boot resources as direct RES files', async () => {
+  test('includes startup resources in the complete resource target', async () => {
     const bytes = new Uint8Array([1, 2, 3, 4]);
     const binary = bytes.buffer as ArrayBuffer;
     const fileHash = Array.from(sha256(bytes), byte => byte.toString(16).padStart(2, '0')).join('');
@@ -6978,7 +7037,7 @@ describe('Protocol V2 firmware reconnect identity', () => {
       payload: {
         method: 'firmwareUpdateV4',
         platform: 'web',
-        targetsToUpdate: ['boot_resources'],
+        targetsToUpdate: ['resource'],
       },
     });
     method.init();
@@ -7921,7 +7980,10 @@ describe('Protocol V2 file write method', () => {
         append: false,
         ui_percentage: 100,
       },
-      { timeoutMs: undefined }
+      expect.objectContaining({
+        timeoutMs: undefined,
+        onWriteCompleted: expect.any(Function),
+      })
     );
     expect(method.postMessage).toHaveBeenCalledWith({
       event: 'UI_EVENT',
@@ -7970,7 +8032,10 @@ describe('Protocol V2 file write method', () => {
         append: false,
         ui_percentage: 0,
       },
-      { timeoutMs: undefined }
+      expect.objectContaining({
+        timeoutMs: undefined,
+        onWriteCompleted: expect.any(Function),
+      })
     );
     expect(typedCall).toHaveBeenNthCalledWith(
       2,
@@ -7987,7 +8052,10 @@ describe('Protocol V2 file write method', () => {
         append: false,
         ui_percentage: 100,
       },
-      { timeoutMs: undefined }
+      expect.objectContaining({
+        timeoutMs: undefined,
+        onWriteCompleted: expect.any(Function),
+      })
     );
     expect(result).toMatchObject({
       path: 'vol1:test.bin',

package/__tests__/protocolV2FileWrite.test.ts

@@ -131,10 +131,43 @@ describe('writeProtocolV2File', () => {
       'FilesystemFileWrite',
       'FilesystemFile',
       expect.objectContaining({ ui_percentage: 42 }),
-      { writeWithResponse: true }
+      expect.objectContaining({
+        writeWithResponse: true,
+        onWriteCompleted: expect.any(Function),
+      })
     );
   });
 
+  test('记录主机整帧写入与设备响应等待的分段耗时', async () => {
+    const log = getLogger(LoggerNames.Core);
+    const logSpy = jest.spyOn(log, 'log').mockImplementation(() => undefined);
+    const typedCall = jest.fn().mockImplementation((_type, _resType, _request, options) => {
+      options.onWriteCompleted({ elapsedMs: 25, frameBytes: 128 });
+      return Promise.resolve({ message: { processed_byte: 3 } });
+    });
+    const dateNowSpy = jest
+      .spyOn(Date, 'now')
+      .mockReturnValueOnce(1_000)
+      .mockReturnValueOnce(1_010)
+      .mockReturnValueOnce(1_040)
+      .mockReturnValueOnce(1_050);
+
+    try {
+      await writeProtocolV2File({
+        commands: { typedCall } as any,
+        path: 'vol0:/firmware.bin',
+        data: new Uint8Array([1, 2, 3]),
+      });
+
+      expect(logSpy).toHaveBeenLastCalledWith(
+        '[FileWrite] metrics transport=unknown status=completed path=vol0:/firmware.bin bytes=3/3 elapsed=0.05s speed=0.06 KiB/s hostWriteTotal=0.03s responseWaitTotal=0.03s measuredAttempts=1'
+      );
+    } finally {
+      dateNowSpy.mockRestore();
+      logSpy.mockRestore();
+    }
+  });
+
   test('按确认分片的时间窗口记录实时传输速率', async () => {
     const data = new Uint8Array(4097);
     const typedCall = jest.fn().mockResolvedValue({ message: {} });
@@ -175,7 +208,7 @@ describe('writeProtocolV2File', () => {
   });
 
   test('通过 Core Log 每十秒输出一次 BLE 传输关键指标', async () => {
-    const log = getLogger(LoggerNames.Method);
+    const log = getLogger(LoggerNames.Core);
     const logSpy = jest.spyOn(log, 'log').mockImplementation(() => undefined);
     const getSettingsSpy = jest
       .spyOn(DataManager, 'getSettings')
@@ -197,14 +230,18 @@ describe('writeProtocolV2File', () => {
         data,
       });
 
-      expect(logSpy).toHaveBeenCalledTimes(2);
+      expect(logSpy).toHaveBeenCalledTimes(3);
       expect(logSpy).toHaveBeenNthCalledWith(
         1,
-        '[FileWrite] metrics transport=BLE status=progress bytes=3600/5400 elapsed=10.00s speed=0.35 KiB/s'
+        '[FileWrite] started transport=BLE path=vol1:/wallpapers/test.bin bytes=5400 offset=0 chunk=1800'
       );
       expect(logSpy).toHaveBeenNthCalledWith(
         2,
-        '[FileWrite] metrics transport=BLE status=completed bytes=5400/5400 elapsed=14.00s speed=0.44 KiB/s'
+        '[FileWrite] metrics transport=BLE status=progress path=vol1:/wallpapers/test.bin bytes=3600/5400 elapsed=10.00s speed=0.35 KiB/s'
+      );
+      expect(logSpy).toHaveBeenNthCalledWith(
+        3,
+        '[FileWrite] metrics transport=BLE status=completed path=vol1:/wallpapers/test.bin bytes=5400/5400 elapsed=14.00s speed=0.44 KiB/s'
       );
     } finally {
       dateNowSpy.mockRestore();
@@ -215,7 +252,7 @@ describe('writeProtocolV2File', () => {
   });
 
   test('写入失败时通过 Core Log 输出已传输字节和平均速率', async () => {
-    const log = getLogger(LoggerNames.Method);
+    const log = getLogger(LoggerNames.Core);
     const logSpy = jest.spyOn(log, 'log').mockImplementation(() => undefined);
     const typedCall = jest.fn().mockRejectedValue(new Error('write failed'));
     const dateNowSpy = jest
@@ -234,7 +271,11 @@ describe('writeProtocolV2File', () => {
 
       expect(logSpy).toHaveBeenNthCalledWith(
         1,
-        '[FileWrite] metrics transport=unknown status=failed bytes=0/4000 elapsed=1.00s speed=0.00 KiB/s'
+        '[FileWrite] started transport=unknown path=vol1:/wallpapers/test.bin bytes=4000 offset=0 chunk=4000'
+      );
+      expect(logSpy).toHaveBeenNthCalledWith(
+        2,
+        '[FileWrite] metrics transport=unknown status=failed path=vol1:/wallpapers/test.bin bytes=0/4000 elapsed=1.00s speed=0.00 KiB/s'
       );
     } finally {
       dateNowSpy.mockRestore();

package/dist/api/CheckAllFirmwareRelease.d.ts

@@ -13,13 +13,14 @@ type ProtocolV2FirmwareReleasePlan = {
     targetsToUpdate: FirmwareUpdateV4Target[];
     release: IFirmwareReleaseInfo | undefined;
 };
-export declare function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification, checkFirmwareHash, remotePayloadHashes, firmwareType, release, }: {
+export declare function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification, checkFirmwareHash, remotePayloadHashes, firmwareType, release, deviceType, }: {
     currentVersions: DeviceStateVersions;
     currentVerification?: Partial<DeviceFeaturesVerify>;
     checkFirmwareHash?: boolean;
     remotePayloadHashes?: Readonly<Record<string, string | null>>;
     firmwareType: EFirmwareType;
     release: IFirmwareReleaseInfo | undefined;
+    deviceType?: 'pro2' | 'neo';
 }): ProtocolV2FirmwareReleasePlan;
 export default class CheckAllFirmwareRelease extends BaseMethod {
     getSupportedProtocols(): readonly ["V1", "V2"];

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

@@ -1 +1 @@
-{"version":3,"file":"CheckAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckAllFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAyB1C,OAAO,KAAK,EACV,kBAAkB,EAElB,kCAAkC,EAClC,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,UAAU,CAAC;AAgIlB,KAAK,6BAA6B,GAAG;IACnC,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,+BAA+B,CAAC;IACxC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC;IACrC,UAAU,EAAE,kCAAkC,EAAE,CAAC;IACjD,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,EAC7C,eAAe,EACf,mBAAwB,EACxB,iBAAyB,EACzB,mBAAwB,EACxB,YAAY,EACZ,OAAO,GACR,EAAE;IACD,eAAe,EAAE,mBAAmB,CAAC;IACrC,mBAAmB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC9D,YAAY,EAAE,aAAa,CAAC;IAC5B,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAC;CAC3C,GAAG,6BAA6B,CAqEhC;AAID,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,qBAAqB;IAIrB,IAAI;IAME,GAAG;YAuFK,aAAa;CA2F5B"}
+{"version":3,"file":"CheckAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckAllFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAyB1C,OAAO,KAAK,EACV,kBAAkB,EAElB,kCAAkC,EAClC,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EAGrB,MAAM,UAAU,CAAC;AAgIlB,KAAK,6BAA6B,GAAG;IACnC,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,+BAA+B,CAAC;IACxC,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC;IACrC,UAAU,EAAE,kCAAkC,EAAE,CAAC;IACjD,eAAe,EAAE,sBAAsB,EAAE,CAAC;IAC1C,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,EAC7C,eAAe,EACf,mBAAwB,EACxB,iBAAyB,EACzB,mBAAwB,EACxB,YAAY,EACZ,OAAO,EACP,UAAU,GACX,EAAE;IACD,eAAe,EAAE,mBAAmB,CAAC;IACrC,mBAAmB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACpD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,mBAAmB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC9D,YAAY,EAAE,aAAa,CAAC;IAC5B,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CAC7B,GAAG,6BAA6B,CAiFhC;AAID,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,qBAAqB;IAIrB,IAAI;IAME,GAAG;YAuFK,aAAa;CA4F5B"}

package/dist/api/FirmwareUpdateV4.d.ts

@@ -1,5 +1,7 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import type { FirmwareUpdateV4Params } from '../types/api/firmwareUpdate';
+export declare function assertProtocolV2FirmwareTargetsSupported(deviceType: EDeviceType | string | undefined, params: FirmwareUpdateV4Params): void;
 export declare const isProtocolV2FirmwareFingerprintValid: (binary: ArrayBuffer | Uint8Array, fingerprint: string | undefined) => boolean;
 export declare const assertProtocolV2ReconnectIdentity: (expectedSerialNumber?: string, actualSerialNumber?: string, expectedPath?: string, actualPath?: string) => void;
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAwB/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAiWrC,eAAO,MAAM,oCAAoC,WACvC,WAAW,GAAG,UAAU,eACnB,MAAM,GAAG,SAAS,YAKhC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,iBACZ,MAAM,eACR,MAAM,SAsBpB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAoHJ,OAAO,CAAC,8BAA8B;IAoBhC,GAAG;;;;;YAKK,aAAa;YA+Gb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqD/B,gCAAgC;YAmDhC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,kCAAkC;IAS1C,OAAO,CAAC,8BAA8B;YAMxB,iCAAiC;YAOjC,iCAAiC;YAkBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;YAkBlB,iCAAiC;YAmCjC,+BAA+B;IAqD7C,OAAO,CAAC,uBAAuB;YAMjB,8BAA8B;IAuB5C,OAAO,CAAC,sCAAsC;YAmChC,gCAAgC;YAqChC,0BAA0B;IAexC,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA8C9B,kCAAkC;IAgChD,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;IAc3B,6BAA6B;YAgCrB,+BAA+B;IAkD7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YA0CvB,8BAA8B;YA2D9B,6BAA6B;IAuE3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;IAyGpC,OAAO,CAAC,6BAA6B;YAcvB,uCAAuC;YA0JvC,gCAAgC;YAehC,yBAAyB;YAQzB,8BAA8B;IAQ5C,OAAO,CAAC,0BAA0B;YAkBpB,mCAAmC;YAWnC,qCAAqC;YAgDrC,yBAAyB;YA8DzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAI5B,cAAc;YAoCd,6BAA6B;YAW7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkD,MAAM,qBAAqB,CAAC;AAwBlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAwB/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AA2CrC,wBAAgB,wCAAwC,CACtD,UAAU,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,EAC5C,MAAM,EAAE,sBAAsB,QAkB/B;AA0TD,eAAO,MAAM,oCAAoC,WACvC,WAAW,GAAG,UAAU,eACnB,MAAM,GAAG,SAAS,YAKhC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,iBACZ,MAAM,eACR,MAAM,SAsBpB,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAoHJ,OAAO,CAAC,8BAA8B;IAoBhC,GAAG;;;;;YAKK,aAAa;YAuHb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqD/B,gCAAgC;YAmDhC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,kCAAkC;IAS1C,OAAO,CAAC,8BAA8B;YAMxB,iCAAiC;YAOjC,iCAAiC;YAkBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;YAkBlB,iCAAiC;YAmCjC,+BAA+B;IAqD7C,OAAO,CAAC,uBAAuB;YAMjB,8BAA8B;IA4B5C,OAAO,CAAC,sCAAsC;YAmChC,gCAAgC;YAqChC,0BAA0B;IAexC,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA8C9B,kCAAkC;IAgChD,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,yBAAyB;IAc3B,6BAA6B;YAgCrB,+BAA+B;IAkD7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YA0CvB,8BAA8B;YA2D9B,6BAA6B;IAuE3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;IAyGpC,OAAO,CAAC,6BAA6B;YAcvB,uCAAuC;YA0JvC,gCAAgC;YAehC,yBAAyB;YAQzB,8BAA8B;IAQ5C,OAAO,CAAC,0BAA0B;YAkBpB,mCAAmC;YAWnC,qCAAqC;YAgDrC,yBAAyB;YA8DzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAQ5B,cAAc;YAuCd,6BAA6B;YAW7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/api/helpers/protocolV2FileWrite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocolV2FileWrite.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/protocolV2FileWrite.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE,MAAM,MAAM,uBAAuB,GAAG,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC;AAE/E,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,uBAAuB,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,+BAA+B,KAAK,MAAM,GAAG,SAAS,CAAC;IACnF,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC9D,CAAC;AA2CF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,WASzD;AA8CD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;;;;;;GAgM5E"}
+{"version":3,"file":"protocolV2FileWrite.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/protocolV2FileWrite.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAIlE,MAAM,MAAM,uBAAuB,GAAG,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC;AAE/E,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,uBAAuB,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,+BAA+B,KAAK,MAAM,GAAG,SAAS,CAAC;IACnF,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,IAAI,CAAC;CAC9D,CAAC;AAyDF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,WASzD;AA8CD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B;;;;;;GAoO5E"}

package/dist/index.d.ts

@@ -211,7 +211,7 @@ type IProtocolV2FirmwareComponent = {
     expectedSize?: number;
     version?: IVersionArray;
 };
-type IProtocolV2ResourceType = 'images' | 'animation' | 'wallpaper' | 'translations' | 'roobert' | 'noto';
+type IProtocolV2ResourceType = 'images' | 'animation' | 'wallpaper' | 'translations' | 'roobert' | 'noto' | 'firmware_logo';
 /** Pro2 RES package descriptor. Hashes identify content without a human-managed version. */
 type IProtocolV2Resource = {
     type: IProtocolV2ResourceType;

package/dist/index.js

@@ -40511,6 +40511,7 @@ const PROTOCOL_V2_RESOURCE_TYPES = [
     'translations',
     'roobert',
     'noto',
+    'firmware_logo',
 ];
 const PROTOCOL_V2_RESOURCE_DEVICE_PATHS = {
     images: 'vol0:/bundles/images/images.okpkg',
@@ -40519,6 +40520,7 @@ const PROTOCOL_V2_RESOURCE_DEVICE_PATHS = {
     translations: 'vol0:/bundles/translations/translations.okpkg',
     roobert: 'vol0:/bundles/font/roobert.okpkg',
     noto: 'vol0:/bundles/font/noto.okpkg',
+    firmware_logo: 'vol0:/bundles/firmware_logo.okpkg',
 };
 const RESOURCE_TYPE_SET = new Set(PROTOCOL_V2_RESOURCE_TYPES);
 const SHA256_HEX_LENGTH = 64;
@@ -40725,7 +40727,7 @@ function parseProtocolV2Resources(value) {
     const stable = config.stable.map(validateResource);
     const types = new Set(stable.map(resource => resource.type));
     if (stable.length !== PROTOCOL_V2_RESOURCE_TYPES.length || types.size !== stable.length) {
-        throw new Error('Invalid Pro2 resources config: stable must contain six unique resource types');
+        throw new Error(`Invalid Pro2 resources config: stable must contain ${PROTOCOL_V2_RESOURCE_TYPES.length} unique resource types`);
     }
     for (const type of PROTOCOL_V2_RESOURCE_TYPES) {
         if (!types.has(type)) {
@@ -47498,7 +47500,7 @@ function buildComponentRelease({ configKey, component, currentVersions, currentV
         required: releaseRequired && status === 'outdated',
     };
 }
-function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification = {}, checkFirmwareHash = false, remotePayloadHashes = {}, firmwareType, release, }) {
+function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification = {}, checkFirmwareHash = false, remotePayloadHashes = {}, firmwareType, release, deviceType, }) {
     if (!release) {
         return {
             firmwareType,
@@ -47511,17 +47513,24 @@ function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification =
             release: undefined,
         };
     }
-    let components = getOrderedComponentEntries(release).map(([configKey, component]) => buildComponentRelease({
-        configKey,
-        component,
-        currentVersions,
-        currentVerification,
-        checkFirmwareHash,
-        remotePayloadHash: Object.prototype.hasOwnProperty.call(remotePayloadHashes, configKey)
-            ? remotePayloadHashes[configKey]
-            : normalizeHex(component.payloadHash),
-        releaseRequired: release.required,
-    }));
+    let components = getOrderedComponentEntries(release).map(([configKey, component]) => {
+        const result = buildComponentRelease({
+            configKey,
+            component,
+            currentVersions,
+            currentVerification,
+            checkFirmwareHash,
+            remotePayloadHash: Object.prototype.hasOwnProperty.call(remotePayloadHashes, configKey)
+                ? remotePayloadHashes[configKey]
+                : normalizeHex(component.payloadHash),
+            releaseRequired: release.required,
+        });
+        if (deviceType === 'neo' &&
+            (result.componentTarget === 'SE03' || result.componentTarget === 'SE04')) {
+            return Object.assign(Object.assign({}, result), { updateTarget: null, status: 'unsupported', required: false });
+        }
+        return result;
+    });
     if (!currentVersions.applicationP2) {
         const applicationP1 = components.find(component => component.componentTarget === 'APPLICATION_P1');
         if (applicationP1) {
@@ -47663,6 +47672,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 checkFirmwareHash,
                 firmwareType,
                 release,
+                deviceType: state.identity.deviceType,
             });
             const resourceDeviceType = state.identity.deviceType === 'neo' ? hdShared.EDeviceType.Neo : hdShared.EDeviceType.Pro2;
             const resources = DataManager.getProtocolV2Resources(resourceDeviceType);
@@ -50939,6 +50949,20 @@ const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
 const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
+const PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS = new Set(['se03', 'se04']);
+function assertProtocolV2FirmwareTargetsSupported(deviceType, params) {
+    var _a;
+    if (deviceType !== hdShared.EDeviceType.Neo)
+        return;
+    const unsupportedTargets = new Set(((_a = params.targetsToUpdate) !== null && _a !== void 0 ? _a : []).filter(target => PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS.has(target)));
+    if (params.se03Binary)
+        unsupportedTargets.add('se03');
+    if (params.se04Binary)
+        unsupportedTargets.add('se04');
+    if (unsupportedTargets.size) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Neo only supports SE01 and SE02; unsupported firmware targets: ${Array.from(unsupportedTargets).join(', ')}`);
+    }
+}
 const getProtocolV2DeviceTransferProgress = (bytesBeforeChunk, bytesAfterChunk, totalBytes) => {
     if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
         return 100;
@@ -51292,10 +51316,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     runProtocolV2() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.captureProtocolV2PhysicalIdentity();
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
+            const currentDeviceType = this.device.getCurrentDeviceType();
+            const capabilityDeviceType = currentDeviceType === hdShared.EDeviceType.Pro2 || currentDeviceType === hdShared.EDeviceType.Neo
+                ? currentDeviceType
+                : getDeviceType(deviceFeatures);
+            assertProtocolV2FirmwareTargetsSupported(capabilityDeviceType, this.params);
             const deviceFirmwareType = getFirmwareType(deviceFeatures);
             const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             this.validateExpectedTargetVersions();
@@ -51304,7 +51333,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 return this.runProtocolV2PreparedArtifacts(deviceFeatures, firmwareType);
             }
             const needsRemoteResources = !((_c = this.params.resourceFiles) === null || _c === void 0 ? void 0 : _c.length) && !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('resource'));
-            const needsRemoteBootResources = !!((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.includes('boot_resources'));
+            const needsRemoteBootResources = !!((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.includes('resource')) ||
+                !!((_f = this.params.targetsToUpdate) === null || _f === void 0 ? void 0 : _f.includes('boot_resources'));
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let installItems;
@@ -51787,10 +51817,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         throw new Error(`Unsupported Protocol V2 device type: ${deviceType}`);
     }
     prepareProtocolV2BootResources() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('boot_resources')))
+            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource')) &&
+                !((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('boot_resources'))) {
                 return undefined;
+            }
             const resource = DataManager.getProtocolV2BootResources(this.getProtocolV2DeviceType());
             if (!resource)
                 throw new Error('Missing Protocol V2 boot resources configuration');
@@ -51802,7 +51834,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     throw new Error(`Boot resource file verification failed: ${file.devicePath}`);
                 }
                 files.push({
-                    name: (_c = (_b = file.name) !== null && _b !== void 0 ? _b : file.devicePath.split('/').pop()) !== null && _c !== void 0 ? _c : file.devicePath,
+                    name: (_d = (_c = file.name) !== null && _c !== void 0 ? _c : file.devicePath.split('/').pop()) !== null && _d !== void 0 ? _d : file.devicePath,
                     binary,
                     devicePath: file.devicePath,
                 });
@@ -52623,7 +52655,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     isProtocolV2ReconnectIdentityError(error) {
-        return this.normalizeErrorMessage(error).includes('Protocol V2 reconnect physical identity');
+        return this.normalizeErrorMessage(error).includes('Protocol V2 reconnect physical identity mismatch');
     }
     fileWriteChunk(filePath, totalFileSize, offset, chunk, overwrite, progress) {
         var _a;
@@ -52639,7 +52671,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 overwrite,
                 append: false,
                 ui_percentage: progress !== null && progress !== void 0 ? progress : undefined,
-            }, { writeWithResponse: true });
+            }, {
+                writeWithResponse: false,
+                onWriteCompleted: () => undefined,
+            });
             if (writeRes.type !== 'FilesystemFile') {
                 if (writeRes.type === 'CallMethodError') {
                     if (((_a = writeRes.message.error) !== null && _a !== void 0 ? _a : '').indexOf(SESSION_ERROR) > -1) {
@@ -52808,7 +52843,7 @@ class DeviceGetOnboardingStatus extends BaseMethod {
     }
 }
 
-const Log$4 = getLogger(exports.LoggerNames.Method);
+const Log$4 = getLogger(exports.LoggerNames.Core);
 const MIN_FILE_CHUNK_SIZE = 64;
 const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
 const FILE_TRANSFER_LOG_INTERVAL_MS = 10000;
@@ -52825,8 +52860,11 @@ function getFileTransferTransport() {
     const env = DataManager.getSettings('env');
     return env && DataManager.isBleConnect(env) ? 'BLE' : String(env !== null && env !== void 0 ? env : 'unknown');
 }
-function logFileTransferMetrics({ transport, status, transferredBytes, totalBytes, elapsedMs, rateBytesPerSecond, }) {
-    Log$4.log(`[FileWrite] metrics transport=${transport} status=${status} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s`);
+function logFileTransferMetrics({ transport, status, path, transferredBytes, totalBytes, elapsedMs, rateBytesPerSecond, hostWriteElapsedMs, responseWaitElapsedMs, measuredAttempts, }) {
+    const segmentedMetrics = measuredAttempts > 0
+        ? ` hostWriteTotal=${(hostWriteElapsedMs / 1000).toFixed(2)}s responseWaitTotal=${(responseWaitElapsedMs / 1000).toFixed(2)}s measuredAttempts=${measuredAttempts}`
+        : '';
+    Log$4.log(`[FileWrite] metrics transport=${transport} status=${status} path=${path} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s${segmentedMetrics}`);
 }
 function isProtocolV2ResponseTimeout(error) {
     var _a, _b;
@@ -52908,7 +52946,11 @@ function writeProtocolV2File(options) {
         let lastConfirmedAt = startTime;
         let logWindowStartedAt = startTime;
         let logWindowStartedBytes = 0;
+        let hostWriteElapsedMs = 0;
+        let responseWaitElapsedMs = 0;
+        let measuredAttempts = 0;
         const transport = getFileTransferTransport();
+        Log$4.log(`[FileWrite] started transport=${transport} path=${options.path} bytes=${dataLength} offset=${startOffset} chunk=${chunkSize}`);
         try {
             while (written < dataLength) {
                 (_c = options.throwIfAborted) === null || _c === void 0 ? void 0 : _c.call(options);
@@ -52930,10 +52972,21 @@ function writeProtocolV2File(options) {
                 let response;
                 let isWritePending = true;
                 while (isWritePending) {
+                    let currentHostWriteElapsedMs;
+                    let responseWaitStartedAt;
                     try {
                         const callOptions = options.writeWithResponse === undefined
-                            ? { timeoutMs: options.timeoutMs }
-                            : Object.assign(Object.assign({}, (options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })), { writeWithResponse: options.writeWithResponse });
+                            ? {
+                                timeoutMs: options.timeoutMs,
+                                onWriteCompleted: ({ elapsedMs }) => {
+                                    currentHostWriteElapsedMs = elapsedMs;
+                                    responseWaitStartedAt = Date.now();
+                                },
+                            }
+                            : Object.assign(Object.assign({}, (options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })), { writeWithResponse: options.writeWithResponse, onWriteCompleted: ({ elapsedMs }) => {
+                                    currentHostWriteElapsedMs = elapsedMs;
+                                    responseWaitStartedAt = Date.now();
+                                } });
                         response = yield options.commands.typedCall('FilesystemFileWrite', 'FilesystemFile', request, callOptions);
                         isWritePending = false;
                     }
@@ -52943,6 +52996,13 @@ function writeProtocolV2File(options) {
                         retryCount += 1;
                         (_k = options.throwIfAborted) === null || _k === void 0 ? void 0 : _k.call(options);
                     }
+                    finally {
+                        if (currentHostWriteElapsedMs !== undefined && responseWaitStartedAt !== undefined) {
+                            hostWriteElapsedMs += currentHostWriteElapsedMs;
+                            responseWaitElapsedMs += Math.max(Date.now() - responseWaitStartedAt, 0);
+                            measuredAttempts += 1;
+                        }
+                    }
                 }
                 if (!response) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'FilesystemFileWrite completed without a response');
@@ -52995,10 +53055,14 @@ function writeProtocolV2File(options) {
                     logFileTransferMetrics({
                         transport,
                         status: 'progress',
+                        path: options.path,
                         transferredBytes,
                         totalBytes: dataLength,
                         elapsedMs,
                         rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+                        hostWriteElapsedMs,
+                        responseWaitElapsedMs,
+                        measuredAttempts,
                     });
                     logWindowStartedAt = now;
                     logWindowStartedBytes = transferredBytes;
@@ -53018,10 +53082,14 @@ function writeProtocolV2File(options) {
             logFileTransferMetrics({
                 transport,
                 status: 'failed',
+                path: options.path,
                 transferredBytes: written,
                 totalBytes: dataLength,
                 elapsedMs,
                 rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+                hostWriteElapsedMs,
+                responseWaitElapsedMs,
+                measuredAttempts,
             });
             throw error;
         }
@@ -53031,10 +53099,14 @@ function writeProtocolV2File(options) {
         logFileTransferMetrics({
             transport,
             status: 'completed',
+            path: options.path,
             transferredBytes: written,
             totalBytes: dataLength,
             elapsedMs,
             rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+            hostWriteElapsedMs,
+            responseWaitElapsedMs,
+            measuredAttempts,
         });
         return Object.assign(Object.assign({}, lastMessage), { path: options.path, offset: startOffset, total_size: totalSize, processed_byte: startOffset + written, chunks });
     });

package/dist/protocols/protocol-v2/resources.d.ts

@@ -1,6 +1,6 @@
 import type { IProtocolV2Resource, IProtocolV2ResourceFile, IProtocolV2ResourceType, IProtocolV2Resources } from '../../types';
 import type { DeviceCommands } from '../../device/DeviceCommands';
-export declare const PROTOCOL_V2_RESOURCE_TYPES: readonly ["images", "animation", "wallpaper", "translations", "roobert", "noto"];
+export declare const PROTOCOL_V2_RESOURCE_TYPES: readonly ["images", "animation", "wallpaper", "translations", "roobert", "noto", "firmware_logo"];
 export declare const PROTOCOL_V2_RESOURCE_DEVICE_PATHS: Readonly<Record<IProtocolV2ResourceType, string>>;
 export declare const PROTOCOL_V2_RESOURCE_INVENTORY_TIMEOUT_MS: number;
 export type ProtocolV2ResourceInventoryItem = {

package/dist/protocols/protocol-v2/resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,0BAA0B,kFAOgB,CAAC;AAExD,eAAO,MAAM,iCAAiC,EAAE,QAAQ,CAAC,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAQ7F,CAAC;AAaJ,eAAO,MAAM,yCAAyC,QAAW,CAAC;AAElE,MAAM,MAAM,+BAA+B,GAAG;IAC5C,IAAI,EAAE,uBAAuB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,aAAa,GAAG,qBAAqB,CAAC;AAEjF,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACzC,SAAS,EAAE,mBAAmB,EAAE,CAAC;CAClC,CAAC;AAwHF,wBAAsB,+BAA+B,CAAC,EACpD,QAAQ,EACR,SAAS,EACT,SAAgD,EAChD,SAAqD,GACtD,EAAE;IACD,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC5C,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC,CAmB7C;AAiGD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAgCzF;AAGD,wBAAgB,iCAAiC,CAAC,EAChD,SAAS,EACT,SAAS,EACT,IAAI,EACJ,MAAc,GACf,EAAE;IACD,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,SAAS,+BAA+B,EAAE,CAAC;IACvD,IAAI,EAAE,4BAA4B,CAAC;IACnC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,4BAA4B,CA8B/B;AAOD,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,UAAU,CAAC,GAC3D,OAAO,CAGT"}
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,eAAO,MAAM,0BAA0B,mGAQgB,CAAC;AAExD,eAAO,MAAM,iCAAiC,EAAE,QAAQ,CAAC,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAS7F,CAAC;AAaJ,eAAO,MAAM,yCAAyC,QAAW,CAAC;AAElE,MAAM,MAAM,+BAA+B,GAAG;IAC5C,IAAI,EAAE,uBAAuB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,aAAa,GAAG,qBAAqB,CAAC;AAEjF,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;IACzC,SAAS,EAAE,mBAAmB,EAAE,CAAC;CAClC,CAAC;AAwHF,wBAAsB,+BAA+B,CAAC,EACpD,QAAQ,EACR,SAAS,EACT,SAAgD,EAChD,SAAqD,GACtD,EAAE;IACD,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC5C,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC,CAmB7C;AAiGD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CAkCzF;AAGD,wBAAgB,iCAAiC,CAAC,EAChD,SAAS,EACT,SAAS,EACT,IAAI,EACJ,MAAc,GACf,EAAE;IACD,SAAS,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAC1C,SAAS,CAAC,EAAE,SAAS,+BAA+B,EAAE,CAAC;IACvD,IAAI,EAAE,4BAA4B,CAAC;IACnC,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GAAG,4BAA4B,CA8B/B;AAOD,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,UAAU,CAAC,GAC3D,OAAO,CAGT"}

package/dist/types/settings.d.ts

@@ -35,7 +35,7 @@ export type IProtocolV2FirmwareComponent = {
     expectedSize?: number;
     version?: IVersionArray;
 };
-export type IProtocolV2ResourceType = 'images' | 'animation' | 'wallpaper' | 'translations' | 'roobert' | 'noto';
+export type IProtocolV2ResourceType = 'images' | 'animation' | 'wallpaper' | 'translations' | 'roobert' | 'noto' | 'firmware_logo';
 export type IProtocolV2Resource = {
     type: IProtocolV2ResourceType;
     url: string;

package/dist/types/settings.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.70",
+  "version": "1.2.0-alpha.71",
   "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.0-alpha.70",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.70",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.71",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.71",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "d86b033cf970f97e060c49fe4cf618f38b9ce666"
+  "gitHead": "c58f39f2e5c54a98faa8844cd8b6b0453a17d80c"
 }

package/src/api/CheckAllFirmwareRelease.ts

@@ -191,6 +191,7 @@ export function buildProtocolV2FirmwareRelease({
   remotePayloadHashes = {},
   firmwareType,
   release,
+  deviceType,
 }: {
   currentVersions: DeviceStateVersions;
   currentVerification?: Partial<DeviceFeaturesVerify>;
@@ -198,6 +199,7 @@ export function buildProtocolV2FirmwareRelease({
   remotePayloadHashes?: Readonly<Record<string, string | null>>;
   firmwareType: EFirmwareType;
   release: IFirmwareReleaseInfo | undefined;
+  deviceType?: 'pro2' | 'neo';
 }): ProtocolV2FirmwareReleasePlan {
   if (!release) {
     return {
@@ -212,8 +214,8 @@ export function buildProtocolV2FirmwareRelease({
     };
   }
 
-  let components = getOrderedComponentEntries(release).map(([configKey, component]) =>
-    buildComponentRelease({
+  let components = getOrderedComponentEntries(release).map(([configKey, component]) => {
+    const result = buildComponentRelease({
       configKey,
       component,
       currentVersions,
@@ -223,8 +225,20 @@ export function buildProtocolV2FirmwareRelease({
         ? remotePayloadHashes[configKey]
         : normalizeHex(component.payloadHash),
       releaseRequired: release.required,
-    })
-  );
+    });
+    if (
+      deviceType === 'neo' &&
+      (result.componentTarget === 'SE03' || result.componentTarget === 'SE04')
+    ) {
+      return {
+        ...result,
+        updateTarget: null,
+        status: 'unsupported' as const,
+        required: false,
+      };
+    }
+    return result;
+  });
   if (!currentVersions.applicationP2) {
     const applicationP1 = components.find(
       component => component.componentTarget === 'APPLICATION_P1'
@@ -401,6 +415,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       checkFirmwareHash,
       firmwareType,
       release,
+      deviceType: state.identity.deviceType,
     });
     const resourceDeviceType =
       state.identity.deviceType === 'neo' ? EDeviceType.Neo : EDeviceType.Pro2;

package/src/api/FirmwareUpdateV4.ts

@@ -15,6 +15,7 @@ import {
   getDeviceBLEFirmwareVersion,
   getDeviceBootloaderVersion,
   getDeviceFirmwareVersion,
+  getDeviceType,
   getFirmwareType,
   getLogger,
 } from '../utils';
@@ -90,6 +91,30 @@ const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
 const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
 
+const PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS = new Set<FirmwareUpdateV4Target>(['se03', 'se04']);
+
+export function assertProtocolV2FirmwareTargetsSupported(
+  deviceType: EDeviceType | string | undefined,
+  params: FirmwareUpdateV4Params
+) {
+  if (deviceType !== EDeviceType.Neo) return;
+
+  const unsupportedTargets = new Set(
+    (params.targetsToUpdate ?? []).filter(target => PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS.has(target))
+  );
+  if (params.se03Binary) unsupportedTargets.add('se03');
+  if (params.se04Binary) unsupportedTargets.add('se04');
+
+  if (unsupportedTargets.size) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      `Neo only supports SE01 and SE02; unsupported firmware targets: ${Array.from(
+        unsupportedTargets
+      ).join(', ')}`
+    );
+  }
+}
+
 const getProtocolV2DeviceTransferProgress = (
   bytesBeforeChunk: number,
   bytesAfterChunk: number,
@@ -610,6 +635,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async runProtocolV2() {
     await this.captureProtocolV2PhysicalIdentity();
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
+    const currentDeviceType = this.device.getCurrentDeviceType();
+    const capabilityDeviceType =
+      currentDeviceType === EDeviceType.Pro2 || currentDeviceType === EDeviceType.Neo
+        ? currentDeviceType
+        : getDeviceType(deviceFeatures);
+    assertProtocolV2FirmwareTargetsSupported(capabilityDeviceType, this.params);
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
     this.validateExpectedTargetVersions();
@@ -622,7 +653,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
     const needsRemoteResources =
       !this.params.resourceFiles?.length && !!this.params.targetsToUpdate?.includes('resource');
-    const needsRemoteBootResources = !!this.params.targetsToUpdate?.includes('boot_resources');
+    const needsRemoteBootResources =
+      !!this.params.targetsToUpdate?.includes('resource') ||
+      !!this.params.targetsToUpdate?.includes('boot_resources');
 
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
@@ -1223,7 +1256,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async prepareProtocolV2BootResources(): Promise<
     ProtocolV2ResourceBundleBinary[] | undefined
   > {
-    if (!this.params.targetsToUpdate?.includes('boot_resources')) return undefined;
+    if (
+      !this.params.targetsToUpdate?.includes('resource') &&
+      !this.params.targetsToUpdate?.includes('boot_resources')
+    ) {
+      return undefined;
+    }
     const resource = DataManager.getProtocolV2BootResources(this.getProtocolV2DeviceType());
     if (!resource) throw new Error('Missing Protocol V2 boot resources configuration');
 
@@ -2289,7 +2327,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private isProtocolV2ReconnectIdentityError(error: unknown) {
-    return this.normalizeErrorMessage(error).includes('Protocol V2 reconnect physical identity');
+    // A serial can be temporarily unavailable while Loader starts, and BLE has no stable path.
+    // Keep polling unless the device explicitly reports a different serial.
+    return this.normalizeErrorMessage(error).includes(
+      'Protocol V2 reconnect physical identity mismatch'
+    );
   }
 
   private async fileWriteChunk(
@@ -2315,7 +2357,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         append: false,
         ui_percentage: progress ?? undefined,
       },
-      { writeWithResponse: true }
+      {
+        writeWithResponse: false,
+        onWriteCompleted: () => undefined,
+      }
     );
     if (writeRes.type !== 'FilesystemFile') {
       if ((writeRes as any).type === 'CallMethodError') {

package/src/api/helpers/protocolV2FileWrite.ts

@@ -9,7 +9,7 @@ import { LoggerNames, getLogger } from '../../utils/logger';
 
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
-const Log = getLogger(LoggerNames.Method);
+const Log = getLogger(LoggerNames.Core);
 
 export type ProtocolV2FileWriteData = ArrayBuffer | Uint8Array | Blob | string;
 
@@ -69,22 +69,36 @@ function getFileTransferTransport() {
 function logFileTransferMetrics({
   transport,
   status,
+  path,
   transferredBytes,
   totalBytes,
   elapsedMs,
   rateBytesPerSecond,
+  hostWriteElapsedMs,
+  responseWaitElapsedMs,
+  measuredAttempts,
 }: {
   transport: string;
   status: 'progress' | 'completed' | 'failed';
+  path: string;
   transferredBytes: number;
   totalBytes: number;
   elapsedMs: number;
   rateBytesPerSecond: number;
+  hostWriteElapsedMs: number;
+  responseWaitElapsedMs: number;
+  measuredAttempts: number;
 }) {
+  const segmentedMetrics =
+    measuredAttempts > 0
+      ? ` hostWriteTotal=${(hostWriteElapsedMs / 1000).toFixed(2)}s responseWaitTotal=${(
+          responseWaitElapsedMs / 1000
+        ).toFixed(2)}s measuredAttempts=${measuredAttempts}`
+      : '';
   Log.log(
-    `[FileWrite] metrics transport=${transport} status=${status} bytes=${transferredBytes}/${totalBytes} elapsed=${(
+    `[FileWrite] metrics transport=${transport} status=${status} path=${path} bytes=${transferredBytes}/${totalBytes} elapsed=${(
       elapsedMs / 1000
-    ).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s`
+    ).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s${segmentedMetrics}`
   );
 }
 
@@ -177,7 +191,13 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
   let lastConfirmedAt = startTime;
   let logWindowStartedAt = startTime;
   let logWindowStartedBytes = 0;
+  let hostWriteElapsedMs = 0;
+  let responseWaitElapsedMs = 0;
+  let measuredAttempts = 0;
   const transport = getFileTransferTransport();
+  Log.log(
+    `[FileWrite] started transport=${transport} path=${options.path} bytes=${dataLength} offset=${startOffset} chunk=${chunkSize}`
+  );
 
   try {
     while (written < dataLength) {
@@ -203,13 +223,25 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
       let response;
       let isWritePending = true;
       while (isWritePending) {
+        let currentHostWriteElapsedMs: number | undefined;
+        let responseWaitStartedAt: number | undefined;
         try {
           const callOptions =
             options.writeWithResponse === undefined
-              ? { timeoutMs: options.timeoutMs }
+              ? {
+                  timeoutMs: options.timeoutMs,
+                  onWriteCompleted: ({ elapsedMs }: { elapsedMs: number }) => {
+                    currentHostWriteElapsedMs = elapsedMs;
+                    responseWaitStartedAt = Date.now();
+                  },
+                }
               : {
                   ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
                   writeWithResponse: options.writeWithResponse,
+                  onWriteCompleted: ({ elapsedMs }: { elapsedMs: number }) => {
+                    currentHostWriteElapsedMs = elapsedMs;
+                    responseWaitStartedAt = Date.now();
+                  },
                 };
           response = await options.commands.typedCall(
             'FilesystemFileWrite',
@@ -222,6 +254,12 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
           if (retryCount >= maxChunkRetries || !isProtocolV2ResponseTimeout(error)) throw error;
           retryCount += 1;
           options.throwIfAborted?.();
+        } finally {
+          if (currentHostWriteElapsedMs !== undefined && responseWaitStartedAt !== undefined) {
+            hostWriteElapsedMs += currentHostWriteElapsedMs;
+            responseWaitElapsedMs += Math.max(Date.now() - responseWaitStartedAt, 0);
+            measuredAttempts += 1;
+          }
         }
       }
       if (!response) {
@@ -285,10 +323,14 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
         logFileTransferMetrics({
           transport,
           status: 'progress',
+          path: options.path,
           transferredBytes,
           totalBytes: dataLength,
           elapsedMs,
           rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+          hostWriteElapsedMs,
+          responseWaitElapsedMs,
+          measuredAttempts,
         });
         logWindowStartedAt = now;
         logWindowStartedBytes = transferredBytes;
@@ -307,10 +349,14 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
     logFileTransferMetrics({
       transport,
       status: 'failed',
+      path: options.path,
       transferredBytes: written,
       totalBytes: dataLength,
       elapsedMs,
       rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+      hostWriteElapsedMs,
+      responseWaitElapsedMs,
+      measuredAttempts,
     });
     throw error;
   }
@@ -321,10 +367,14 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
   logFileTransferMetrics({
     transport,
     status: 'completed',
+    path: options.path,
     transferredBytes: written,
     totalBytes: dataLength,
     elapsedMs,
     rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+    hostWriteElapsedMs,
+    responseWaitElapsedMs,
+    measuredAttempts,
   });
 
   return {

package/src/protocols/protocol-v2/resources.ts

@@ -17,6 +17,7 @@ export const PROTOCOL_V2_RESOURCE_TYPES = [
   'translations',
   'roobert',
   'noto',
+  'firmware_logo',
 ] as const satisfies readonly IProtocolV2ResourceType[];
 
 export const PROTOCOL_V2_RESOURCE_DEVICE_PATHS: Readonly<Record<IProtocolV2ResourceType, string>> =
@@ -27,6 +28,7 @@ export const PROTOCOL_V2_RESOURCE_DEVICE_PATHS: Readonly<Record<IProtocolV2Resou
     translations: 'vol0:/bundles/translations/translations.okpkg',
     roobert: 'vol0:/bundles/font/roobert.okpkg',
     noto: 'vol0:/bundles/font/noto.okpkg',
+    firmware_logo: 'vol0:/bundles/firmware_logo.okpkg',
   };
 
 const RESOURCE_TYPE_SET = new Set<string>(PROTOCOL_V2_RESOURCE_TYPES);
@@ -313,7 +315,9 @@ export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources |
   const stable = config.stable.map(validateResource);
   const types = new Set(stable.map(resource => resource.type));
   if (stable.length !== PROTOCOL_V2_RESOURCE_TYPES.length || types.size !== stable.length) {
-    throw new Error('Invalid Pro2 resources config: stable must contain six unique resource types');
+    throw new Error(
+      `Invalid Pro2 resources config: stable must contain ${PROTOCOL_V2_RESOURCE_TYPES.length} unique resource types`
+    );
   }
   for (const type of PROTOCOL_V2_RESOURCE_TYPES) {
     if (!types.has(type)) {

package/src/types/settings.ts

@@ -70,7 +70,8 @@ export type IProtocolV2ResourceType =
   | 'wallpaper'
   | 'translations'
   | 'roobert'
-  | 'noto';
+  | 'noto'
+  | 'firmware_logo';
 
 /** Pro2 RES package descriptor. Hashes identify content without a human-managed version. */
 export type IProtocolV2Resource = {