@onekeyfe/hd-core 1.2.0-alpha.171 → 1.2.0-alpha.172

package/__tests__/firmware-update/firmware-update-v4-install-poll.test.ts

@@ -73,7 +73,7 @@ describe('FirmwareUpdateV4 install polling', () => {
     );
   });
 
-  test('writes the BLE Request and consumes its terminal Success from status polling', async () => {
+  test('writes the BLE Request and completes only from target status polling', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -85,7 +85,30 @@ describe('FirmwareUpdateV4 install polling', () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ type: 'Success', message: {} })
-      .mockResolvedValueOnce({ type: 'Success', message: {} });
+      .mockResolvedValueOnce({
+        type: 'DeviceFirmwareUpdateStatus',
+        message: {
+          records: [
+            {
+              target_id: 6,
+              status: 'FW_MGMT_UPDATER_TASK_STATUS_IN_PROGRESS',
+              path: 'vol0:/coprocessor.bin',
+            },
+          ],
+        },
+      })
+      .mockResolvedValueOnce({
+        type: 'DeviceFirmwareUpdateStatus',
+        message: {
+          records: [
+            {
+              target_id: 6,
+              status: 'FW_MGMT_UPDATER_TASK_STATUS_FINISHED',
+              path: 'vol0:/coprocessor.bin',
+            },
+          ],
+        },
+      });
     const call = jest.fn().mockResolvedValue({
       type: 'WriteCompleted',
       message: {},
@@ -96,6 +119,7 @@ describe('FirmwareUpdateV4 install polling', () => {
       createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
       toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2-ble' }),
       setCancelableAction: jest.fn(),
+      clearCancelableAction: jest.fn(),
     } as unknown as Device;
     method.postMessage = jest.fn();
     method.postProgressMessage = jest.fn();
@@ -116,13 +140,18 @@ describe('FirmwareUpdateV4 install polling', () => {
     expect(call).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateRequest',
       {},
-      { returnAfterWrite: true }
+      expect.objectContaining({
+        returnAfterWrite: true,
+        expectedTypes: ['Success'],
+        onResponseAfterWrite: expect.any(Function),
+      })
     );
     expect(method.postProgressMessage).not.toHaveBeenCalled();
 
     await firmwareUpdate.waitForProtocolV2FirmwareUpdateComplete(targets, true);
 
     expect(typedCall.mock.calls[1]?.[0]).toBe('DeviceFirmwareUpdateStatusGet');
+    expect(typedCall.mock.calls[1]?.[1]).toBe('DeviceFirmwareUpdateStatus');
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 

package/__tests__/pro2Wallpaper.test.ts

@@ -1,48 +1,5 @@
 import { encodePro2Wallpaper } from '../src/utils/pro2Wallpaper';
 
-// The test decoder mirrors LZ4's bit-packed token and offset format.
-/* eslint-disable no-bitwise */
-
-function decodeLz4Block(data: Uint8Array, expectedLength: number) {
-  const output = new Uint8Array(expectedLength);
-  let inputOffset = 0;
-  let outputOffset = 0;
-
-  const readLength = (initialLength: number) => {
-    let length = initialLength;
-    if (length === 0x0f) {
-      let extension = 0xff;
-      while (extension === 0xff) {
-        extension = data[inputOffset];
-        inputOffset += 1;
-        length += extension;
-      }
-    }
-    return length;
-  };
-
-  while (inputOffset < data.byteLength) {
-    const token = data[inputOffset];
-    inputOffset += 1;
-    const literalLength = readLength(token >> 4);
-    output.set(data.subarray(inputOffset, inputOffset + literalLength), outputOffset);
-    inputOffset += literalLength;
-    outputOffset += literalLength;
-    if (inputOffset >= data.byteLength) break;
-
-    const matchOffset = data[inputOffset] | (data[inputOffset + 1] << 8);
-    inputOffset += 2;
-    const matchLength = readLength(token & 0x0f) + 4;
-    for (let index = 0; index < matchLength; index += 1) {
-      output[outputOffset] = output[outputOffset - matchOffset];
-      outputOffset += 1;
-    }
-  }
-
-  expect(outputOffset).toBe(expectedLength);
-  return output;
-}
-
 describe('encodePro2Wallpaper', () => {
   test('encodes opaque pixels as aligned LVGL v9 RGB565 data', () => {
     const result = encodePro2Wallpaper({
@@ -71,29 +28,6 @@ describe('encodePro2Wallpaper', () => {
     expect(Array.from(result.data.slice(12))).toEqual([0x1f, 0x00, 0xff, 0xff, 128, 255]);
   });
 
-  test('encodes an I8 palette and pixel indices as an LVGL LZ4 block', () => {
-    const result = encodePro2Wallpaper({
-      width: 2,
-      height: 1,
-      rgba: new Uint8Array([255, 0, 0, 255, 0, 255, 0, 255]),
-      encoding: 'i8-lz4',
-    });
-
-    expect(result.colorFormat).toBe('I8');
-    expect(Array.from(result.data.slice(0, 12))).toEqual([
-      0x19, 0x0a, 0x08, 0, 2, 0, 1, 0, 2, 0, 0, 0,
-    ]);
-    const view = new DataView(result.data.buffer, result.data.byteOffset, result.data.byteLength);
-    expect(view.getUint32(12, true)).toBe(2);
-    expect(view.getUint32(16, true)).toBe(result.data.byteLength - 24);
-    expect(view.getUint32(20, true)).toBe(1026);
-
-    const rawData = decodeLz4Block(result.data.slice(24), 1026);
-    expect(Array.from(rawData.slice(210 * 4, 210 * 4 + 4))).toEqual([0, 0, 255, 255]);
-    expect(Array.from(rawData.slice(36 * 4, 36 * 4 + 4))).toEqual([0, 255, 0, 255]);
-    expect(Array.from(rawData.slice(-2))).toEqual([210, 36]);
-  });
-
   test('rejects invalid dimensions and RGBA byte length', () => {
     expect(() => encodePro2Wallpaper({ width: 0, height: 1, rgba: new Uint8Array() })).toThrow(
       'width'

package/__tests__/protocol-v2.test.ts

@@ -194,13 +194,7 @@ describe('DeviceUploadWallpaper', () => {
       refreshProtocolV2SettingsAfterMutation: jest.fn().mockResolvedValue({}),
     });
 
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  test('uses I8 with LZ4 when uploading a Pro2 wallpaper over BLE', async () => {
-    jest.spyOn(DataManager, 'getSettings').mockReturnValue('lowlevel');
-    jest.spyOn(DataManager, 'isBleConnect').mockReturnValue(true);
+  test('encodes, uploads and applies a Pro2 wallpaper', async () => {
     const typedCall = jest.fn().mockImplementation((request, _response, params) => {
       if (request === 'FilesystemDirMake') return { message: { message: 'directory ready' } };
       if (request === 'FilesystemFileWrite') {
@@ -243,7 +237,7 @@ describe('DeviceUploadWallpaper', () => {
     });
     expect(device.refreshProtocolV2SettingsAfterMutation).toHaveBeenCalledTimes(1);
     expect(typedCall.mock.calls.some(call => call[0] === 'SetWallpaper')).toBe(false);
-    expect(result).toMatchObject({ colorFormat: 'I8', message: 'wallpaper applied' });
+    expect(result).toMatchObject({ colorFormat: 'RGB565', message: 'wallpaper applied' });
     const fileWriteCallCount = typedCall.mock.calls.filter(
       call => call[0] === 'FilesystemFileWrite'
     ).length;
@@ -281,8 +275,6 @@ describe('DeviceUploadWallpaper', () => {
   });
 
   test('returns success when wallpaper read-back fails after apply', async () => {
-    jest.spyOn(DataManager, 'getSettings').mockReturnValue('desktop-webusb');
-    jest.spyOn(DataManager, 'isBleConnect').mockReturnValue(false);
     const typedCall = jest.fn().mockImplementation((request, _response, params) => {
       if (request === 'FilesystemDirMake') return { message: {} };
       if (request === 'FilesystemFileWrite') {
@@ -308,10 +300,7 @@ describe('DeviceUploadWallpaper', () => {
     (method as any).device = device;
     method.init();
 
-    await expect(method.run()).resolves.toMatchObject({
-      colorFormat: 'RGB565',
-      message: 'wallpaper applied',
-    });
+    await expect(method.run()).resolves.toMatchObject({ message: 'wallpaper applied' });
     expect(device.refreshProtocolV2SettingsAfterMutation).toHaveBeenCalledTimes(1);
   });
 
@@ -328,19 +317,6 @@ describe('DeviceUploadWallpaper', () => {
     expect(() => method.init()).toThrow('fileName');
   });
 
-  test('rejects unsupported wallpaper encodings before device communication', () => {
-    const method = new DeviceUploadWallpaper({
-      id: 1,
-      payload: {
-        method: 'deviceUploadWallpaper',
-        jpegBase64: createJpegBase64(604, 1024),
-        encoding: 'gzip',
-      } as any,
-    });
-
-    expect(() => method.init()).toThrow('encoding');
-  });
-
   test('rejects unsupported firmware before creating or writing files', async () => {
     const typedCall = jest.fn();
     const method = new DeviceUploadWallpaper({
@@ -4978,7 +4954,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(commands.mainId).toBe('usb-path');
   });
 
-  test('scans and reacquires the same BLE peripheral without probing during install recovery', async () => {
+  test('reacquires the same BLE peripheral by id without scanning during install recovery', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -5000,7 +4976,7 @@ describe('Protocol V2 firmware update targets', () => {
 
     await (method as any).reconnectProtocolV2Device({ skipProtocolProbe: true });
 
-    expect(enumerate).toHaveBeenCalledTimes(1);
+    expect(enumerate).not.toHaveBeenCalled();
     expect(acquire).toHaveBeenCalledWith('ble-id', null, true, 'V2', undefined, undefined, true);
     expect(commands.disposed).toBe(false);
     expect(commands.mainId).toBe('ble-id');
@@ -5571,7 +5547,11 @@ describe('Protocol V2 firmware update targets', () => {
     expect(call).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateRequest',
       {},
-      { returnAfterWrite: true }
+      expect.objectContaining({
+        returnAfterWrite: true,
+        expectedTypes: ['Success'],
+        onResponseAfterWrite: expect.any(Function),
+      })
     );
     expect(typedCall).not.toHaveBeenCalledWith('DeviceFirmwareUpdateRequest', 'Success', {});
     expect((method as any).protocolV2InstallNeedsBleReconnect).toBe(true);
@@ -5679,7 +5659,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 
-  test('keeps polling after install ACK until the target finishes', async () => {
+  test('keeps polling after an empty status response until the target finishes', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -5688,7 +5668,10 @@ describe('Protocol V2 firmware update targets', () => {
     });
     const typedCall = jest
       .fn()
-      .mockResolvedValueOnce({ type: 'Success', message: {} })
+      .mockResolvedValueOnce({
+        type: 'DeviceFirmwareUpdateStatus',
+        message: { records: [] },
+      })
       .mockResolvedValueOnce({
         type: 'DeviceFirmwareUpdateStatus',
         message: { records: [] },
@@ -5830,6 +5813,38 @@ describe('Protocol V2 firmware update targets', () => {
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 
+  test('does not count a stale finished target when only another target was live', () => {
+    const method = new FirmwareUpdateV4({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV4',
+      },
+    });
+    const assertProtocolV2TargetStatus = (method as any).assertProtocolV2TargetStatus.bind(method);
+    const expectedTargetIds = new Set([3, 4]);
+    const expectedPaths = new Map([
+      [3, 'vol0:/bootloader.bin'],
+      [4, 'vol0:/application_p1.bin'],
+    ]);
+    const liveTargetIds = new Set([4]);
+    method.postProgressMessage = jest.fn();
+
+    const completed = assertProtocolV2TargetStatus(
+      [
+        { target_id: 3, status: 2, path: 'vol0:/bootloader.bin' },
+        { target_id: 4, status: 2, path: 'vol0:/application_p1.bin' },
+      ],
+      expectedTargetIds,
+      expectedPaths,
+      liveTargetIds
+    );
+
+    expect(completed).toBe(false);
+    expect((method as any).protocolV2CompletedTargetIds).toEqual(new Set([4]));
+    expect(method.postProgressMessage).toHaveBeenCalledWith(50, 'installingFirmware');
+    expect(method.postProgressMessage).not.toHaveBeenCalledWith(100, 'installingFirmware');
+  });
+
   test('ignores stale failed records until the current install starts', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
@@ -6119,7 +6134,6 @@ describe('Protocol V2 firmware update targets', () => {
     });
     const typedCall = jest
       .fn()
-      .mockResolvedValueOnce({ type: 'Success', message: {} })
       .mockRejectedValueOnce(new Error('Pro2 is rebooting'))
       .mockResolvedValueOnce({
         type: 'DeviceFirmwareUpdateStatus',
@@ -6136,6 +6150,7 @@ describe('Protocol V2 firmware update targets', () => {
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall }),
     });
+    (method as any).protocolV2InstallRequestConfirmed = true;
     (method as any).reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
     (method as any).verifyProtocolV2ReconnectIdentity = jest.fn().mockResolvedValue(deviceInfo);
     (method as any).probeProtocolV2NormalMode = jest.fn().mockResolvedValue(true);
@@ -6566,7 +6581,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(reconnectProtocolV2Device).not.toHaveBeenCalled();
     expect(typedCall).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateStatusGet',
-      ['DeviceFirmwareUpdateStatus', 'Success'],
+      'DeviceFirmwareUpdateStatus',
       expect.anything(),
       expect.anything()
     );
@@ -6848,7 +6863,7 @@ describe('Protocol V2 firmware update targets', () => {
     });
     expect(typedCall).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateStatusGet',
-      ['DeviceFirmwareUpdateStatus', 'Success'],
+      'DeviceFirmwareUpdateStatus',
       {
         fields: {
           status: true,

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

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

package/dist/api/protocol-v2/DeviceUploadWallpaper.d.ts

@@ -1,10 +1,9 @@
 import { BaseMethod } from '../BaseMethod';
-import { type Pro2WallpaperColorFormat, type Pro2WallpaperEncoding } from '../../utils/pro2Wallpaper';
+import { type Pro2WallpaperColorFormat } from '../../utils/pro2Wallpaper';
 export type DeviceUploadWallpaperParams = {
     jpegBase64: string;
     fileName?: string;
     chunkSize?: number;
-    encoding?: Pro2WallpaperEncoding;
 };
 export type DeviceUploadWallpaperResponse = {
     path: string;

package/dist/api/protocol-v2/DeviceUploadWallpaper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadWallpaper.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadWallpaper.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,qBAAqB,EAE3B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,qBAAqB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAmBF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,2BAA2B,CAAC;IACxF,qBAAqB;IAIrB,OAAO,CAAC,OAAO,CAAC,CAA8D;IAE9E,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,IAAI,CAAM;IAElB,IAAI;YAkCU,kBAAkB;YAgBlB,eAAe;YAaf,MAAM;IAwBd,GAAG,IAAI,OAAO,CAAC,6BAA6B,CAAC;CAyBpD"}
+{"version":3,"file":"DeviceUploadWallpaper.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadWallpaper.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,EAGL,KAAK,wBAAwB,EAE9B,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,wBAAwB,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAmBF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,2BAA2B,CAAC;IACxF,qBAAqB;IAIrB,OAAO,CAAC,OAAO,CAAC,CAA8D;IAE9E,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,IAAI,CAAM;IAElB,IAAI;YA2BU,kBAAkB;YAgBlB,eAAe;YAaf,MAAM;IAwBd,GAAG,IAAI,OAAO,CAAC,6BAA6B,CAAC;CAyBpD"}

package/dist/index.d.ts

@@ -1113,13 +1113,11 @@ declare const switchTransport: ({ env, Transport, plugin, }: {
 
 declare const PRO2_WALLPAPER_WIDTH = 604;
 declare const PRO2_WALLPAPER_HEIGHT = 1024;
-type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8' | 'I8';
-type Pro2WallpaperEncoding = 'rgb565' | 'i8-lz4';
+type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8';
 declare function encodePro2Wallpaper(options: {
     width: number;
     height: number;
     rgba: Uint8Array | ArrayBuffer;
-    encoding?: Pro2WallpaperEncoding;
 }): {
     data: Uint8Array;
     colorFormat: Pro2WallpaperColorFormat;
@@ -1129,7 +1127,6 @@ type DeviceUploadWallpaperParams = {
     jpegBase64: string;
     fileName?: string;
     chunkSize?: number;
-    encoding?: Pro2WallpaperEncoding;
 };
 type DeviceUploadWallpaperResponse = {
     path: string;

package/dist/index.js

@@ -42476,18 +42476,6 @@ const PRO2_WALLPAPER_WIDTH = 604;
 const PRO2_WALLPAPER_HEIGHT = 1024;
 const COLOR_FORMAT_RGB565 = 0x12;
 const COLOR_FORMAT_RGB565A8 = 0x14;
-const COLOR_FORMAT_I8 = 0x0a;
-const IMAGE_FLAG_COMPRESSED = 0x0008;
-const IMAGE_COMPRESSION_LZ4 = 0x00000002;
-const I8_PALETTE_SIZE = 256 * 4;
-const I8_RED_LEVELS = 6;
-const I8_GREEN_LEVELS = 7;
-const I8_BLUE_LEVELS = 6;
-const LZ4_MIN_MATCH = 4;
-const LZ4_LAST_LITERALS = 5;
-const LZ4_MATCH_FIND_LIMIT = 12;
-const LZ4_HASH_BITS = 16;
-const LZ4_HASH_MULTIPLIER = -1640531535;
 const RED_THRESHOLD = [
     1, 7, 3, 5, 0, 8, 2, 6, 7, 1, 5, 3, 8, 0, 6, 2, 3, 5, 0, 8, 2, 6, 1, 7, 5, 3, 8, 0, 6, 2, 7, 1, 0,
     8, 2, 6, 1, 7, 3, 5, 8, 0, 6, 2, 7, 1, 5, 3, 2, 6, 1, 7, 3, 5, 0, 8, 6, 2, 7, 1, 5, 3, 8, 0,
@@ -42509,149 +42497,6 @@ function asBytes(rgba) {
 function align(value, boundary) {
     return Math.ceil(value / boundary) * boundary;
 }
-function writeLz4Length(output, offset, length) {
-    let cursor = offset;
-    let remaining = length;
-    while (remaining >= 0xff) {
-        output[cursor] = 0xff;
-        cursor += 1;
-        remaining -= 0xff;
-    }
-    output[cursor] = remaining;
-    return cursor + 1;
-}
-function readUint32LittleEndian(data, offset) {
-    return (data[offset] | (data[offset + 1] << 8) | (data[offset + 2] << 16) | (data[offset + 3] << 24));
-}
-function getLz4Hash(sequence) {
-    return (Math.imul(sequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_BITS)) & 0xffff;
-}
-function compressLz4Block(input) {
-    const output = new Uint8Array(input.byteLength + Math.floor(input.byteLength / 0xff) + 16);
-    const hashTable = new Int32Array(1 << LZ4_HASH_BITS);
-    hashTable.fill(-1);
-    let anchor = 0;
-    let inputOffset = 0;
-    let outputOffset = 0;
-    const matchFindEnd = input.byteLength - LZ4_MATCH_FIND_LIMIT;
-    const matchCopyEnd = input.byteLength - LZ4_LAST_LITERALS;
-    while (inputOffset <= matchFindEnd) {
-        const sequence = readUint32LittleEndian(input, inputOffset);
-        const hash = getLz4Hash(sequence);
-        const reference = hashTable[hash];
-        hashTable[hash] = inputOffset;
-        const matchOffset = inputOffset - reference;
-        const hasMatch = reference >= 0 &&
-            matchOffset <= 0xffff &&
-            readUint32LittleEndian(input, reference) === sequence;
-        if (hasMatch) {
-            let matchLength = LZ4_MIN_MATCH;
-            while (inputOffset + matchLength < matchCopyEnd &&
-                input[reference + matchLength] === input[inputOffset + matchLength]) {
-                matchLength += 1;
-            }
-            const literalLength = inputOffset - anchor;
-            const encodedMatchLength = matchLength - LZ4_MIN_MATCH;
-            const tokenOffset = outputOffset;
-            outputOffset += 1;
-            output[tokenOffset] =
-                (Math.min(literalLength, 0x0f) << 4) | Math.min(encodedMatchLength, 0x0f);
-            if (literalLength >= 0x0f) {
-                outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-            }
-            output.set(input.subarray(anchor, inputOffset), outputOffset);
-            outputOffset += literalLength;
-            output[outputOffset] = matchOffset & 0xff;
-            output[outputOffset + 1] = matchOffset >> 8;
-            outputOffset += 2;
-            if (encodedMatchLength >= 0x0f) {
-                outputOffset = writeLz4Length(output, outputOffset, encodedMatchLength - 0x0f);
-            }
-            const matchStart = inputOffset;
-            inputOffset += matchLength;
-            anchor = inputOffset;
-            for (let cursor = Math.max(matchStart + 1, inputOffset - 2); cursor < inputOffset; cursor += 1) {
-                if (cursor <= matchFindEnd) {
-                    hashTable[getLz4Hash(readUint32LittleEndian(input, cursor))] = cursor;
-                }
-            }
-        }
-        else {
-            inputOffset += 1;
-        }
-    }
-    const literalLength = input.byteLength - anchor;
-    const tokenOffset = outputOffset;
-    outputOffset += 1;
-    output[tokenOffset] = Math.min(literalLength, 0x0f) << 4;
-    if (literalLength >= 0x0f) {
-        outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-    }
-    output.set(input.subarray(anchor), outputOffset);
-    outputOffset += literalLength;
-    return output.slice(0, outputOffset);
-}
-function quantizeChannel(value, levels) {
-    return Math.floor((value * (levels - 1) + 0x7f) / 0xff);
-}
-function expandChannel(value, levels) {
-    return Math.floor((value * 0xff + Math.floor((levels - 1) / 2)) / (levels - 1));
-}
-function encodePro2I8Lz4(options) {
-    const { width, height } = options;
-    if (!Number.isInteger(width) || width <= 0 || width > 0xffff) {
-        throw invalidParameter$2('Wallpaper width must be an integer between 1 and 65535.');
-    }
-    if (!Number.isInteger(height) || height <= 0 || height > 0xffff) {
-        throw invalidParameter$2('Wallpaper height must be an integer between 1 and 65535.');
-    }
-    const rgba = asBytes(options.rgba);
-    const expectedLength = width * height * 4;
-    if (rgba.byteLength !== expectedLength) {
-        throw invalidParameter$2(`Wallpaper RGBA data length must be ${expectedLength} bytes, received ${rgba.byteLength}.`);
-    }
-    const stride = width;
-    const rawData = new Uint8Array(I8_PALETTE_SIZE + stride * height);
-    for (let red = 0; red < I8_RED_LEVELS; red += 1) {
-        for (let green = 0; green < I8_GREEN_LEVELS; green += 1) {
-            for (let blue = 0; blue < I8_BLUE_LEVELS; blue += 1) {
-                const paletteIndex = (red * I8_GREEN_LEVELS + green) * I8_BLUE_LEVELS + blue;
-                const paletteOffset = paletteIndex * 4;
-                rawData[paletteOffset] = expandChannel(blue, I8_BLUE_LEVELS);
-                rawData[paletteOffset + 1] = expandChannel(green, I8_GREEN_LEVELS);
-                rawData[paletteOffset + 2] = expandChannel(red, I8_RED_LEVELS);
-                rawData[paletteOffset + 3] = 0xff;
-            }
-        }
-    }
-    for (let pixel = 0; pixel < width * height; pixel += 1) {
-        const sourceOffset = pixel * 4;
-        const alpha = rgba[sourceOffset + 3];
-        const red = Math.round((rgba[sourceOffset] * alpha) / 0xff);
-        const green = Math.round((rgba[sourceOffset + 1] * alpha) / 0xff);
-        const blue = Math.round((rgba[sourceOffset + 2] * alpha) / 0xff);
-        const paletteIndex = (quantizeChannel(red, I8_RED_LEVELS) * I8_GREEN_LEVELS +
-            quantizeChannel(green, I8_GREEN_LEVELS)) *
-            I8_BLUE_LEVELS +
-            quantizeChannel(blue, I8_BLUE_LEVELS);
-        rawData[I8_PALETTE_SIZE + pixel] = paletteIndex;
-    }
-    const compressed = compressLz4Block(rawData);
-    const data = new Uint8Array(24 + compressed.byteLength);
-    const view = new DataView(data.buffer);
-    data[0] = 0x19;
-    data[1] = COLOR_FORMAT_I8;
-    view.setUint16(2, IMAGE_FLAG_COMPRESSED, true);
-    view.setUint16(4, width, true);
-    view.setUint16(6, height, true);
-    view.setUint16(8, stride, true);
-    view.setUint16(10, 0, true);
-    view.setUint32(12, IMAGE_COMPRESSION_LZ4, true);
-    view.setUint32(16, compressed.byteLength, true);
-    view.setUint32(20, rawData.byteLength, true);
-    data.set(compressed, 24);
-    return { data, colorFormat: 'I8' };
-}
 function encodePro2Image(options) {
     var _a;
     const { width, height } = options;
@@ -42719,9 +42564,6 @@ function encodePro2Image(options) {
     return { data, colorFormat };
 }
 function encodePro2Wallpaper(options) {
-    if (options.encoding === 'i8-lz4') {
-        return encodePro2I8Lz4(options);
-    }
     return encodePro2Image(options);
 }
 
@@ -53483,7 +53325,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
             seenTargetIds.add(targetId);
         }
-        const completedTargets = matchingTargets.filter(target => isProtocolV2TargetStatusFinished(target.status));
+        const completedTargets = matchingTargets.filter(target => {
+            const targetId = normalizeProtocolV2TargetId(target.target_id);
+            return (isProtocolV2TargetStatusFinished(target.status) &&
+                (!liveTargetIds || (targetId !== undefined && liveTargetIds.has(targetId))));
+        });
         const completedTargetIds = new Set();
         completedTargets.forEach(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53592,26 +53438,17 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     const currentDeviceInfo = deviceInfo;
                     try {
-                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', ['DeviceFirmwareUpdateStatus', 'Success'], {
+                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
                             fields: {
                                 status: true,
                                 payload_version: true,
                                 path: true,
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
-                        if (statusResponse.type === 'Success') {
-                            if (this.isBleReconnect()) {
-                                Log$7.log('[FirmwareUpdateV4] BLE firmware install completed by terminal Success response');
-                                this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
-                                this.postProgressMessage(100, 'installingFirmware');
-                                return;
-                            }
+                        if (this.protocolV2InstallRequestConfirmed) {
                             installEvidenceObserved = true;
-                            lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
-                        const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
-                            ? ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : [])
-                            : [];
+                        const statusTargets = ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : []);
                         this.collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds);
                         if (liveTargetIds.size > 0) {
                             currentInstallStatusObserved = true;
@@ -53650,9 +53487,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         if (statusTargets.length === 0) {
-                            if (statusResponse.type !== 'Success') {
-                                lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
-                            }
+                            lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                         }
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
@@ -53947,7 +53782,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     acquireProtocolV2BleDevice(skipProtocolProbe = false) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const connector = this.device.deviceConnector;
             const expectedId = this.device.originalDescriptor.id;
@@ -53955,14 +53789,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL));
                 return;
             }
-            const deviceDiff = yield (connector === null || connector === void 0 ? void 0 : connector.enumerate());
-            const reconnectDescriptor = (_a = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) === null || _a === void 0 ? void 0 : _a.find(descriptor => descriptor.id === expectedId);
-            if (!reconnectDescriptor) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
-            }
-            yield (connector === null || connector === void 0 ? void 0 : connector.acquire(reconnectDescriptor.id, null, true, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, skipProtocolProbe));
+            yield (connector === null || connector === void 0 ? void 0 : connector.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL, undefined, undefined, skipProtocolProbe));
             this.device.commands.disposed = false;
-            this.device.getCommands().mainId = reconnectDescriptor.id;
+            this.device.getCommands().mainId = expectedId;
         });
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
@@ -53977,7 +53806,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, Object.assign({ device: this.device.toMessageObject(), source: 'method-lifecycle', reason: 'firmware-update', completion: 'operation-completed', deviceOnly: true, operation: this.name }, (interaction ? { interaction } : {}))));
             if (this.isBleReconnect()) {
                 try {
-                    yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
+                    yield commands.call('DeviceFirmwareUpdateRequest', {}, {
+                        returnAfterWrite: true,
+                        expectedTypes: ['Success'],
+                        onResponseAfterWrite: response => {
+                            if (response.type !== 'Success')
+                                return;
+                            this.protocolV2InstallRequestConfirmed = true;
+                            this.device.clearCancelableAction();
+                            this.postProgressMessage(1, 'installingFirmware');
+                            Log$7.log('[FirmwareUpdateV4] BLE firmware install confirmed by device response');
+                        },
+                    });
                     Log$7.log('[FirmwareUpdateV4] BLE firmware install request written; continue with status polling');
                 }
                 catch (error) {
@@ -54493,15 +54333,10 @@ class DeviceUploadWallpaper extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { jpegBase64, fileName, chunkSize, encoding } = this.payload;
+        const { jpegBase64, fileName, chunkSize } = this.payload;
         if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
             throw invalidParameter$1('Parameter [chunkSize] must be a positive integer.');
         }
-        if (encoding !== undefined && encoding !== 'rgb565' && encoding !== 'i8-lz4') {
-            throw invalidParameter$1('Parameter [encoding] must be either rgb565 or i8-lz4.');
-        }
-        const env = DataManager.getSettings('env');
-        const resolvedEncoding = encoding !== null && encoding !== void 0 ? encoding : (env && DataManager.isBleConnect(env) ? 'i8-lz4' : 'rgb565');
         const decoded = decodeJpegBase64ToRgba({
             jpegBase64,
             parameterName: 'jpegBase64',
@@ -54512,10 +54347,9 @@ class DeviceUploadWallpaper extends BaseMethod {
             width: PRO2_WALLPAPER_WIDTH,
             height: PRO2_WALLPAPER_HEIGHT,
             rgba: decoded.data,
-            encoding: resolvedEncoding,
         });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-        this.params = { jpegBase64, fileName, chunkSize, encoding: resolvedEncoding };
+        this.params = { jpegBase64, fileName, chunkSize };
         this.unlockPolicy = 'unlock-before-run';
         this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.skipForceUpdateCheck = true;

package/dist/utils/pro2Wallpaper.d.ts

@@ -1,7 +1,6 @@
 export declare const PRO2_WALLPAPER_WIDTH = 604;
 export declare const PRO2_WALLPAPER_HEIGHT = 1024;
-export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8' | 'I8';
-export type Pro2WallpaperEncoding = 'rgb565' | 'i8-lz4';
+export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8';
 export type Pro2ImageAlphaMode = 'preserve' | 'black-background';
 export declare function encodePro2Image(options: {
     width: number;
@@ -16,7 +15,6 @@ export declare function encodePro2Wallpaper(options: {
     width: number;
     height: number;
     rgba: Uint8Array | ArrayBuffer;
-    encoding?: Pro2WallpaperEncoding;
 }): {
     data: Uint8Array;
     colorFormat: Pro2WallpaperColorFormat;

package/dist/utils/pro2Wallpaper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,GAAG,IAAI,CAAC;AAEpE,MAAM,MAAM,qBAAqB,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,CAAC;AA4NjE,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4E9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,QAAQ,CAAC,EAAE,qBAAqB,CAAC;CAClC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CAK9D"}
+{"version":3,"file":"pro2Wallpaper.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Wallpaper.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAE1C,MAAM,MAAM,wBAAwB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE7D,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,kBAAkB,CAAC;AA8BjE,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CA4E9D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,wBAAwB,CAAA;CAAE,CAE9D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.171",
+  "version": "1.2.0-alpha.172",
   "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.171",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.171",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.172",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.172",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "68de201cc95fe521936c74f828addb3fb5251c67"
+  "gitHead": "4c6c4a4fcc52bcdd0b3ec9c36454b2074fa17a8c"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -2316,9 +2316,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       }
       seenTargetIds.add(targetId);
     }
-    const completedTargets = matchingTargets.filter(target =>
-      isProtocolV2TargetStatusFinished(target.status)
-    );
+    const completedTargets = matchingTargets.filter(target => {
+      const targetId = normalizeProtocolV2TargetId(target.target_id);
+      return (
+        isProtocolV2TargetStatusFinished(target.status) &&
+        (!liveTargetIds || (targetId !== undefined && liveTargetIds.has(targetId)))
+      );
+    });
     const completedTargetIds = new Set<number>();
     completedTargets.forEach(target => {
       const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -2465,7 +2469,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         try {
           const statusResponse = await this.device.getCommands().typedCall(
             'DeviceFirmwareUpdateStatusGet',
-            ['DeviceFirmwareUpdateStatus', 'Success'],
+            'DeviceFirmwareUpdateStatus',
             {
               fields: {
                 status: true,
@@ -2475,24 +2479,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             },
             { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT }
           );
-          if (statusResponse.type === 'Success') {
-            if (this.isBleReconnect()) {
-              Log.log(
-                '[FirmwareUpdateV4] BLE firmware install completed by terminal Success response'
-              );
-              this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
-              this.postProgressMessage(100, 'installingFirmware');
-              return;
-            }
+          if (this.protocolV2InstallRequestConfirmed) {
             installEvidenceObserved = true;
-            lastError = new Error(
-              'Protocol V2 firmware install acknowledged; waiting for target status'
-            );
           }
-          const statusTargets =
-            statusResponse.type === 'DeviceFirmwareUpdateStatus'
-              ? ((statusResponse.message.records ?? []) as ProtocolV2FirmwareUpdateStatusTarget[])
-              : [];
+          const statusTargets = (statusResponse.message.records ??
+            []) as ProtocolV2FirmwareUpdateStatusTarget[];
           this.collectProtocolV2LiveTargetIds(statusTargets, expectedTargetIds, liveTargetIds);
           if (liveTargetIds.size > 0) {
             currentInstallStatusObserved = true;
@@ -2552,11 +2543,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           }
 
           if (statusTargets.length === 0) {
-            if (statusResponse.type !== 'Success') {
-              lastError = new Error(
-                'Protocol V2 firmware update is waiting for user confirmation or target status'
-              );
-            }
+            lastError = new Error(
+              'Protocol V2 firmware update is waiting for user confirmation or target status'
+            );
           } else {
             const missingTargetIds = this.getProtocolV2MissingTargetIds(
               statusTargets,
@@ -2952,15 +2941,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       await connector?.acquire(expectedId, null, true, PROTOCOL_V2_CONNECT_PROTOCOL);
       return;
     }
-    const deviceDiff = await connector?.enumerate();
-    const reconnectDescriptor = deviceDiff?.descriptors?.find(
-      descriptor => descriptor.id === expectedId
-    );
-    if (!reconnectDescriptor) {
-      throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
-    }
     await connector?.acquire(
-      reconnectDescriptor.id,
+      expectedId,
       null,
       true,
       PROTOCOL_V2_CONNECT_PROTOCOL,
@@ -2969,7 +2951,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       skipProtocolProbe
     );
     this.device.commands.disposed = false;
-    this.device.getCommands().mainId = reconnectDescriptor.id;
+    this.device.getCommands().mainId = expectedId;
   }
 
   private async protocolV2StartFirmwareUpdate({
@@ -2998,7 +2980,21 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     if (this.isBleReconnect()) {
       try {
-        await commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
+        await commands.call(
+          'DeviceFirmwareUpdateRequest',
+          {},
+          {
+            returnAfterWrite: true,
+            expectedTypes: ['Success'],
+            onResponseAfterWrite: response => {
+              if (response.type !== 'Success') return;
+              this.protocolV2InstallRequestConfirmed = true;
+              this.device.clearCancelableAction();
+              this.postProgressMessage(1, 'installingFirmware');
+              Log.log('[FirmwareUpdateV4] BLE firmware install confirmed by device response');
+            },
+          }
+        );
         Log.log(
           '[FirmwareUpdateV4] BLE firmware install request written; continue with status polling'
         );

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -7,7 +7,6 @@ import { BaseMethod } from '../BaseMethod';
 import { decodeJpegBase64ToRgba } from '../helpers/base64Data';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
-import { DataManager } from '../../data-manager';
 import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import { supportsProtocolV2Message } from '../../protocols/protocol-v2/features';
 import { LoggerNames, getLogger } from '../../utils';
@@ -15,7 +14,6 @@ import {
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
   type Pro2WallpaperColorFormat,
-  type Pro2WallpaperEncoding,
   encodePro2Wallpaper,
 } from '../../utils/pro2Wallpaper';
 
@@ -23,7 +21,6 @@ export type DeviceUploadWallpaperParams = {
   jpegBase64: string;
   fileName?: string;
   chunkSize?: number;
-  encoding?: Pro2WallpaperEncoding;
 };
 
 export type DeviceUploadWallpaperResponse = {
@@ -64,16 +61,10 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   private path = '';
 
   init() {
-    const { jpegBase64, fileName, chunkSize, encoding } = this.payload;
+    const { jpegBase64, fileName, chunkSize } = this.payload;
     if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
       throw invalidParameter('Parameter [chunkSize] must be a positive integer.');
     }
-    if (encoding !== undefined && encoding !== 'rgb565' && encoding !== 'i8-lz4') {
-      throw invalidParameter('Parameter [encoding] must be either rgb565 or i8-lz4.');
-    }
-    const env = DataManager.getSettings('env');
-    const resolvedEncoding: Pro2WallpaperEncoding =
-      encoding ?? (env && DataManager.isBleConnect(env) ? 'i8-lz4' : 'rgb565');
 
     const decoded = decodeJpegBase64ToRgba({
       jpegBase64,
@@ -85,10 +76,9 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       width: PRO2_WALLPAPER_WIDTH,
       height: PRO2_WALLPAPER_HEIGHT,
       rgba: decoded.data,
-      encoding: resolvedEncoding,
     });
     this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-    this.params = { jpegBase64, fileName, chunkSize, encoding: resolvedEncoding };
+    this.params = { jpegBase64, fileName, chunkSize };
     this.unlockPolicy = 'unlock-before-run';
     // File writes and wallpaper apply require an unlocked device. Either PIN
     // may authorize this device-management action.

package/src/utils/pro2Wallpaper.ts

@@ -6,26 +6,12 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 export const PRO2_WALLPAPER_WIDTH = 604;
 export const PRO2_WALLPAPER_HEIGHT = 1024;
 
-export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8' | 'I8';
-
-export type Pro2WallpaperEncoding = 'rgb565' | 'i8-lz4';
+export type Pro2WallpaperColorFormat = 'RGB565' | 'RGB565A8';
 
 export type Pro2ImageAlphaMode = 'preserve' | 'black-background';
 
 const COLOR_FORMAT_RGB565 = 0x12;
 const COLOR_FORMAT_RGB565A8 = 0x14;
-const COLOR_FORMAT_I8 = 0x0a;
-const IMAGE_FLAG_COMPRESSED = 0x0008;
-const IMAGE_COMPRESSION_LZ4 = 0x00000002;
-const I8_PALETTE_SIZE = 256 * 4;
-const I8_RED_LEVELS = 6;
-const I8_GREEN_LEVELS = 7;
-const I8_BLUE_LEVELS = 6;
-const LZ4_MIN_MATCH = 4;
-const LZ4_LAST_LITERALS = 5;
-const LZ4_MATCH_FIND_LIMIT = 12;
-const LZ4_HASH_BITS = 16;
-const LZ4_HASH_MULTIPLIER = -1640531535;
 
 const RED_THRESHOLD = [
   1, 7, 3, 5, 0, 8, 2, 6, 7, 1, 5, 3, 8, 0, 6, 2, 3, 5, 0, 8, 2, 6, 1, 7, 5, 3, 8, 0, 6, 2, 7, 1, 0,
@@ -52,184 +38,6 @@ function align(value: number, boundary: number): number {
   return Math.ceil(value / boundary) * boundary;
 }
 
-function writeLz4Length(output: Uint8Array, offset: number, length: number) {
-  let cursor = offset;
-  let remaining = length;
-  while (remaining >= 0xff) {
-    output[cursor] = 0xff;
-    cursor += 1;
-    remaining -= 0xff;
-  }
-  output[cursor] = remaining;
-  return cursor + 1;
-}
-
-function readUint32LittleEndian(data: Uint8Array, offset: number) {
-  return (
-    data[offset] | (data[offset + 1] << 8) | (data[offset + 2] << 16) | (data[offset + 3] << 24)
-  );
-}
-
-function getLz4Hash(sequence: number) {
-  return (Math.imul(sequence, LZ4_HASH_MULTIPLIER) >>> (32 - LZ4_HASH_BITS)) & 0xffff;
-}
-
-function compressLz4Block(input: Uint8Array) {
-  const output = new Uint8Array(input.byteLength + Math.floor(input.byteLength / 0xff) + 16);
-  const hashTable = new Int32Array(1 << LZ4_HASH_BITS);
-  hashTable.fill(-1);
-
-  let anchor = 0;
-  let inputOffset = 0;
-  let outputOffset = 0;
-  const matchFindEnd = input.byteLength - LZ4_MATCH_FIND_LIMIT;
-  const matchCopyEnd = input.byteLength - LZ4_LAST_LITERALS;
-
-  while (inputOffset <= matchFindEnd) {
-    const sequence = readUint32LittleEndian(input, inputOffset);
-    const hash = getLz4Hash(sequence);
-    const reference = hashTable[hash];
-    hashTable[hash] = inputOffset;
-
-    const matchOffset = inputOffset - reference;
-    const hasMatch =
-      reference >= 0 &&
-      matchOffset <= 0xffff &&
-      readUint32LittleEndian(input, reference) === sequence;
-    if (hasMatch) {
-      let matchLength = LZ4_MIN_MATCH;
-      while (
-        inputOffset + matchLength < matchCopyEnd &&
-        input[reference + matchLength] === input[inputOffset + matchLength]
-      ) {
-        matchLength += 1;
-      }
-
-      const literalLength = inputOffset - anchor;
-      const encodedMatchLength = matchLength - LZ4_MIN_MATCH;
-      const tokenOffset = outputOffset;
-      outputOffset += 1;
-      output[tokenOffset] =
-        (Math.min(literalLength, 0x0f) << 4) | Math.min(encodedMatchLength, 0x0f);
-
-      if (literalLength >= 0x0f) {
-        outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-      }
-      output.set(input.subarray(anchor, inputOffset), outputOffset);
-      outputOffset += literalLength;
-
-      output[outputOffset] = matchOffset & 0xff;
-      output[outputOffset + 1] = matchOffset >> 8;
-      outputOffset += 2;
-      if (encodedMatchLength >= 0x0f) {
-        outputOffset = writeLz4Length(output, outputOffset, encodedMatchLength - 0x0f);
-      }
-
-      const matchStart = inputOffset;
-      inputOffset += matchLength;
-      anchor = inputOffset;
-      for (
-        let cursor = Math.max(matchStart + 1, inputOffset - 2);
-        cursor < inputOffset;
-        cursor += 1
-      ) {
-        if (cursor <= matchFindEnd) {
-          hashTable[getLz4Hash(readUint32LittleEndian(input, cursor))] = cursor;
-        }
-      }
-    } else {
-      inputOffset += 1;
-    }
-  }
-
-  const literalLength = input.byteLength - anchor;
-  const tokenOffset = outputOffset;
-  outputOffset += 1;
-  output[tokenOffset] = Math.min(literalLength, 0x0f) << 4;
-  if (literalLength >= 0x0f) {
-    outputOffset = writeLz4Length(output, outputOffset, literalLength - 0x0f);
-  }
-  output.set(input.subarray(anchor), outputOffset);
-  outputOffset += literalLength;
-
-  return output.slice(0, outputOffset);
-}
-
-function quantizeChannel(value: number, levels: number) {
-  return Math.floor((value * (levels - 1) + 0x7f) / 0xff);
-}
-
-function expandChannel(value: number, levels: number) {
-  return Math.floor((value * 0xff + Math.floor((levels - 1) / 2)) / (levels - 1));
-}
-
-function encodePro2I8Lz4(options: {
-  width: number;
-  height: number;
-  rgba: Uint8Array | ArrayBuffer;
-}): { data: Uint8Array; colorFormat: Pro2WallpaperColorFormat } {
-  const { width, height } = options;
-  if (!Number.isInteger(width) || width <= 0 || width > 0xffff) {
-    throw invalidParameter('Wallpaper width must be an integer between 1 and 65535.');
-  }
-  if (!Number.isInteger(height) || height <= 0 || height > 0xffff) {
-    throw invalidParameter('Wallpaper height must be an integer between 1 and 65535.');
-  }
-  const rgba = asBytes(options.rgba);
-  const expectedLength = width * height * 4;
-  if (rgba.byteLength !== expectedLength) {
-    throw invalidParameter(
-      `Wallpaper RGBA data length must be ${expectedLength} bytes, received ${rgba.byteLength}.`
-    );
-  }
-  const stride = width;
-  const rawData = new Uint8Array(I8_PALETTE_SIZE + stride * height);
-
-  for (let red = 0; red < I8_RED_LEVELS; red += 1) {
-    for (let green = 0; green < I8_GREEN_LEVELS; green += 1) {
-      for (let blue = 0; blue < I8_BLUE_LEVELS; blue += 1) {
-        const paletteIndex = (red * I8_GREEN_LEVELS + green) * I8_BLUE_LEVELS + blue;
-        const paletteOffset = paletteIndex * 4;
-        // LVGL stores its ARGB8888 palette as B, G, R, A bytes on little-endian devices.
-        rawData[paletteOffset] = expandChannel(blue, I8_BLUE_LEVELS);
-        rawData[paletteOffset + 1] = expandChannel(green, I8_GREEN_LEVELS);
-        rawData[paletteOffset + 2] = expandChannel(red, I8_RED_LEVELS);
-        rawData[paletteOffset + 3] = 0xff;
-      }
-    }
-  }
-
-  for (let pixel = 0; pixel < width * height; pixel += 1) {
-    const sourceOffset = pixel * 4;
-    const alpha = rgba[sourceOffset + 3];
-    const red = Math.round((rgba[sourceOffset] * alpha) / 0xff);
-    const green = Math.round((rgba[sourceOffset + 1] * alpha) / 0xff);
-    const blue = Math.round((rgba[sourceOffset + 2] * alpha) / 0xff);
-    const paletteIndex =
-      (quantizeChannel(red, I8_RED_LEVELS) * I8_GREEN_LEVELS +
-        quantizeChannel(green, I8_GREEN_LEVELS)) *
-        I8_BLUE_LEVELS +
-      quantizeChannel(blue, I8_BLUE_LEVELS);
-    rawData[I8_PALETTE_SIZE + pixel] = paletteIndex;
-  }
-
-  const compressed = compressLz4Block(rawData);
-  const data = new Uint8Array(24 + compressed.byteLength);
-  const view = new DataView(data.buffer);
-  data[0] = 0x19;
-  data[1] = COLOR_FORMAT_I8;
-  view.setUint16(2, IMAGE_FLAG_COMPRESSED, true);
-  view.setUint16(4, width, true);
-  view.setUint16(6, height, true);
-  view.setUint16(8, stride, true);
-  view.setUint16(10, 0, true);
-  view.setUint32(12, IMAGE_COMPRESSION_LZ4, true);
-  view.setUint32(16, compressed.byteLength, true);
-  view.setUint32(20, rawData.byteLength, true);
-  data.set(compressed, 24);
-  return { data, colorFormat: 'I8' };
-}
-
 export function encodePro2Image(options: {
   width: number;
   height: number;
@@ -317,10 +125,6 @@ export function encodePro2Wallpaper(options: {
   width: number;
   height: number;
   rgba: Uint8Array | ArrayBuffer;
-  encoding?: Pro2WallpaperEncoding;
 }): { data: Uint8Array; colorFormat: Pro2WallpaperColorFormat } {
-  if (options.encoding === 'i8-lz4') {
-    return encodePro2I8Lz4(options);
-  }
   return encodePro2Image(options);
 }