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

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> {
@@ -45,6 +47,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private prepareRemoteProtocolV2Binaries;
     private getProtocolV2DeviceType;
     private prepareProtocolV2BootResources;
+    private isProtocolV2BootResourceCurrent;
+    private mergeProtocolV2ResourceBundles;
     private prepareExplicitProtocolV2ResourceFiles;
     private prepareProtocolV2ResourceBundles;
     private downloadProtocolV2Resource;

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;AAyBlG,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,QAgB/B;AAgUD,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;IAwBhC,GAAG;;;;;YAKK,aAAa;YAwHb,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;YA0C9B,+BAA+B;IAgD7C,OAAO,CAAC,8BAA8B;IAetC,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

@@ -20,6 +20,7 @@ export type ProtocolV2FileWriteOptions = {
     totalSize?: number;
     chunkSize?: number;
     chunkLen?: number;
+    chunkSizeLimit?: number;
     overwrite?: boolean;
     append?: boolean;
     uiPercentage?: number;

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,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,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;;;;;;GAuO5E"}

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;
@@ -1454,6 +1454,7 @@ interface FirmwareUpdateV4Params {
     /**
      * Arbitrary Protocol V2 resource files written directly with FilesystemFileWrite.
      * Use this for manifest-driven boot resources and other non-RESC files.
+     * When provided, these files are authoritative for resource and boot_resources targets.
      */
     resourceFiles?: Array<{
         binary: ArrayBuffer;

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,22 @@ 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;
+    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 || deviceType === hdShared.EDeviceType.Pro2)
+        return;
+    const targetList = Array.from(unsupportedTargets).join(', ');
+    const message = deviceType === hdShared.EDeviceType.Neo
+        ? `Neo only supports SE01 and SE02; unsupported firmware targets: ${targetList}`
+        : `Cannot safely update ${targetList} without a confirmed Pro2 device type`;
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, message);
+}
 const getProtocolV2DeviceTransferProgress = (bytesBeforeChunk, bytesAfterChunk, totalBytes) => {
     if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
         return 100;
@@ -50993,6 +51019,7 @@ const PROTOCOL_V2_REMOTE_COMPONENT_TARGETS = {
         kind: 'firmware',
     },
 };
+const PROTOCOL_V2_FIRMWARE_STAGING_PATHS = new Set(Object.values(PROTOCOL_V2_REMOTE_COMPONENT_TARGETS).map(target => `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${target.fileName}`));
 const PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID = new Map([
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, 'boot'],
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, 'app_v1'],
@@ -51268,17 +51295,21 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             resourceBundleArtifacts: payload.resourceBundleArtifacts,
         };
     }
-    getProtocolV2FirmwareChunkSize(direction = 'write') {
+    getProtocolV2FirmwareChunkSize(direction = 'write', filePath) {
         var _a, _b;
         const payloadChunkSize = Number((_a = this.params) === null || _a === void 0 ? void 0 : _a.chunkSize);
         const env = DataManager.getSettings('env');
         const isBle = ((_b = this.params) === null || _b === void 0 ? void 0 : _b.platform) === 'native' || (env && DataManager.isBleConnect(env));
         let maxChunkSize = hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
         if (isBle) {
-            maxChunkSize =
-                direction === 'read'
-                    ? hdTransport.PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE
+            if (direction === 'read') {
+                maxChunkSize = hdTransport.PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE;
+            }
+            else {
+                maxChunkSize = PROTOCOL_V2_FIRMWARE_STAGING_PATHS.has(filePath !== null && filePath !== void 0 ? filePath : '')
+                    ? hdTransport.PROTOCOL_V2_BLE_FIRMWARE_FILE_CHUNK_SIZE
                     : hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+            }
         }
         if (!Number.isFinite(payloadChunkSize) || payloadChunkSize <= 0) {
             return maxChunkSize;
@@ -51296,6 +51327,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         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();
@@ -51303,8 +51339,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 ((_b = this.params.resourceBundleArtifacts) === null || _b === void 0 ? void 0 : _b.length)) {
                 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 hasExplicitResourceFiles = !!((_c = this.params.resourceFiles) === null || _c === void 0 ? void 0 : _c.length);
+            const wantsStableResources = !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('resource'));
+            const wantsBootResources = !!((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.includes('boot_resources'));
+            const needsRemoteResources = !hasExplicitResourceFiles && wantsStableResources;
+            const needsRemoteBootResources = !hasExplicitResourceFiles && (wantsBootResources || wantsStableResources);
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let installItems;
@@ -51335,7 +51374,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
                 const bootResourceFiles = yield this.prepareProtocolV2BootResources();
                 if (bootResourceFiles === null || bootResourceFiles === void 0 ? void 0 : bootResourceFiles.length) {
-                    resourceBundles = [...(resourceBundles !== null && resourceBundles !== void 0 ? resourceBundles : []), ...bootResourceFiles];
+                    resourceBundles = this.mergeProtocolV2ResourceBundles(resourceBundles, bootResourceFiles);
                 }
                 if (!needsRemoteResources) {
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
@@ -51358,7 +51397,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 const enteredBootloader = yield this.enterProtocolV2BootloaderMode();
                 try {
                     const stableResources = yield this.prepareProtocolV2ResourceBundles();
-                    resourceBundles = [...(resourceBundles !== null && resourceBundles !== void 0 ? resourceBundles : []), ...(stableResources !== null && stableResources !== void 0 ? stableResources : [])];
+                    resourceBundles = this.mergeProtocolV2ResourceBundles(resourceBundles, stableResources);
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
                 }
                 catch (err) {
@@ -51787,29 +51826,95 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         throw new Error(`Unsupported Protocol V2 device type: ${deviceType}`);
     }
     prepareProtocolV2BootResources() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('boot_resources')))
+            const wantsStableResources = !!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource'));
+            const wantsBootResources = !!((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('boot_resources'));
+            if (!wantsStableResources && !wantsBootResources) {
                 return undefined;
+            }
+            if ((_c = this.params.resourceFiles) === null || _c === void 0 ? void 0 : _c.length) {
+                return undefined;
+            }
             const resource = DataManager.getProtocolV2BootResources(this.getProtocolV2DeviceType());
-            if (!resource)
-                throw new Error('Missing Protocol V2 boot resources configuration');
+            if (!resource) {
+                if (wantsBootResources) {
+                    throw new Error('Missing Protocol V2 boot resources configuration');
+                }
+                Log$6.debug('[FirmwareUpdateV4] no boot resources configured; continue with stable resources');
+                return undefined;
+            }
             const files = [];
             for (const file of resource.files) {
-                Log$6.log(`[FirmwareUpdateV4] downloading boot resource ${file.devicePath}`);
-                const { binary } = yield getSysResourceBinary(file.url);
-                if (!isProtocolV2ResourceFileValid(binary, file)) {
-                    throw new Error(`Boot resource file verification failed: ${file.devicePath}`);
+                const isCurrent = !this.params.forcedUpdateRes && (yield this.isProtocolV2BootResourceCurrent(file));
+                if (isCurrent) {
+                    Log$6.log(`[FirmwareUpdateV4] boot resource unchanged, skipping ${file.devicePath}`);
+                }
+                else {
+                    Log$6.log(`[FirmwareUpdateV4] downloading boot resource ${file.devicePath}`);
+                    const { binary } = yield getSysResourceBinary(file.url);
+                    if (!isProtocolV2ResourceFileValid(binary, file)) {
+                        throw new Error(`Boot resource file verification failed: ${file.devicePath}`);
+                    }
+                    files.push({
+                        name: (_e = (_d = file.name) !== null && _d !== void 0 ? _d : file.devicePath.split('/').pop()) !== null && _e !== void 0 ? _e : file.devicePath,
+                        binary,
+                        devicePath: 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,
-                    binary,
-                    devicePath: file.devicePath,
-                });
             }
             return files;
         });
     }
+    isProtocolV2BootResourceCurrent(file) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const commands = this.device.getCommands();
+                const pathInfo = yield commands.typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path: file.devicePath }, { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT });
+                const size = toProtocolV2FiniteNumber((_a = pathInfo.message) === null || _a === void 0 ? void 0 : _a.size);
+                if (!((_b = pathInfo.message) === null || _b === void 0 ? void 0 : _b.exist) ||
+                    ((_c = pathInfo.message) === null || _c === void 0 ? void 0 : _c.directory) ||
+                    !Number.isSafeInteger(size) ||
+                    size !== file.size) {
+                    return false;
+                }
+                const digest = sha256.sha256.create();
+                const chunkSize = this.getProtocolV2FirmwareChunkSize();
+                let offset = 0;
+                while (offset < file.size) {
+                    const response = yield commands.typedCall('FilesystemFileRead', 'FilesystemFile', {
+                        file: { path: file.devicePath, offset, total_size: 0 },
+                        chunk_len: Math.min(chunkSize, file.size - offset),
+                    }, { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT });
+                    const data = toProtocolV2Bytes((_d = response.message) === null || _d === void 0 ? void 0 : _d.data);
+                    if (data.byteLength === 0)
+                        return false;
+                    const consumed = data.subarray(0, Math.min(data.byteLength, file.size - offset));
+                    digest.update(consumed);
+                    offset += consumed.byteLength;
+                }
+                return bytesToHex(digest.digest()) === normalizeProtocolV2Hex(file.fileHash);
+            }
+            catch (error) {
+                Log$6.debug(`[FirmwareUpdateV4] unable to compare boot resource ${file.devicePath}; scheduling rewrite`, error);
+                return false;
+            }
+        });
+    }
+    mergeProtocolV2ResourceBundles(...groups) {
+        const merged = groups.flatMap(group => group !== null && group !== void 0 ? group : []);
+        if (!merged.length)
+            return undefined;
+        const seenPaths = new Set();
+        for (const bundle of merged) {
+            if (seenPaths.has(bundle.devicePath)) {
+                throw new Error(`Duplicate Protocol V2 resource devicePath: ${bundle.devicePath}`);
+            }
+            seenPaths.add(bundle.devicePath);
+        }
+        return merged;
+    }
     prepareExplicitProtocolV2ResourceFiles() {
         var _a;
         const files = (_a = this.params.resourceFiles) !== null && _a !== void 0 ? _a : [];
@@ -52240,7 +52345,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     const transferStartedAt = Date.now();
                     yield writeFirmwareByteSource({
                         source,
-                        chunkSize: this.getProtocolV2FirmwareChunkSize(),
+                        chunkSize: this.getProtocolV2FirmwareChunkSize('write', filePath),
                         write: ({ data, sourceOffset, length, first }) => __awaiter(this, void 0, void 0, function* () {
                             const chunkEnd = sourceOffset + length;
                             const deviceProgress = getProtocolV2DeviceTransferProgress(processedSize + sourceOffset, processedSize + chunkEnd, totalSize);
@@ -52623,7 +52728,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 +52744,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 +52916,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 +52933,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;
@@ -52897,7 +53008,12 @@ function writeProtocolV2File(options) {
         if (totalSize < startOffset + dataLength) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
         }
-        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, getProtocolV2FileChunkLimit());
+        const defaultChunkSizeLimit = getProtocolV2FileChunkLimit();
+        const configuredChunkSizeLimit = Number(options.chunkSizeLimit);
+        const chunkSizeLimit = Number.isFinite(configuredChunkSizeLimit) && configuredChunkSizeLimit > 0
+            ? Math.floor(configuredChunkSizeLimit)
+            : defaultChunkSizeLimit;
+        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, chunkSizeLimit);
         let written = 0;
         let chunks = 0;
         let lastMessage;
@@ -52908,7 +53024,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 +53050,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 +53074,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 +53133,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 +53160,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 +53177,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 = {