@onekeyfe/hd-core 1.2.0-alpha.164 → 1.2.0-alpha.166

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

@@ -49,10 +49,22 @@ export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources |
   };
 }
 
-const PROTOCOL_V2_RESOURCE_DEVICE_ROOTS = ['vol0:/bundles/', 'vol0:/loaders/rom/'] as const;
+export function isProtocolV2ResourceArchiveEntryName(entryName: string): boolean {
+  const normalized = entryName.replace(/\\/g, '/');
+  if (!normalized.toLowerCase().endsWith('.okpkg')) {
+    return false;
+  }
+  const parts = normalized.split('/');
+  const fileName = parts[parts.length - 1] ?? '';
+  return (
+    fileName.length > 0 &&
+    !fileName.startsWith('.') &&
+    !parts.some(part => part === '__MACOSX' || part === '.' || part === '..' || part === '')
+  );
+}
 
-function isAllowedResourceDevicePath(path: string): boolean {
-  if (
+function isSafeResourceDevicePath(path: string): boolean {
+  return !(
     path.includes('\\') ||
     path.includes('//') ||
     [...path].some(char => {
@@ -60,14 +72,6 @@ function isAllowedResourceDevicePath(path: string): boolean {
       return code <= 0x1f || code === 0x7f;
     }) ||
     path.split('/').some(part => part === '.' || part === '..')
-  ) {
-    return false;
-  }
-  if (path === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH) {
-    return true;
-  }
-  return (
-    path.endsWith('.okpkg') && PROTOCOL_V2_RESOURCE_DEVICE_ROOTS.some(root => path.startsWith(root))
   );
 }
 
@@ -93,7 +97,7 @@ function readResourceDevicePath(bytes: Uint8Array): string {
     throw new Error('Invalid Pro2 RESOURCE package device path metadata');
   }
   const path = readAscii(pathBytes, 0, pathBytes.byteLength);
-  if (!isAllowedResourceDevicePath(path)) {
+  if (!isSafeResourceDevicePath(path)) {
     throw new Error(`Invalid Pro2 RESOURCE package device path: ${path}`);
   }
   return path;

package/src/types/api/firmwareUpdate.ts

@@ -158,7 +158,7 @@ export interface FirmwareUpdateV4Params {
   se02Binary?: ArrayBuffer;
   se03Binary?: ArrayBuffer;
   se04Binary?: ArrayBuffer;
-  /** Complete Protocol V2 resource ZIP for local development; Core converts it to a local PreparedPlan. */
+  /** Complete Protocol V2 resource ZIP. Core parses RESC packages and writes only changed files. */
   resourceArchiveBinary?: ArrayBuffer;
   forcedUpdateRes?: boolean;
   artifactReader?: FirmwareArtifactReader;

package/src/utils/deviceFeaturesCompat.ts

@@ -1,4 +1,8 @@
-import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
+import {
+  EDeviceType,
+  EFirmwareType,
+  canonicalizePro2BleAdvertisementName,
+} from '@onekeyfe/hd-shared';
 import { Enum_Capability } from '@onekeyfe/hd-transport';
 
 import type { PROTO } from '../constants';
@@ -125,9 +129,10 @@ export const resolveDeviceFirmwareType = (features?: DeviceFeaturesInput): EFirm
 export const resolveDeviceBleName = (features?: DeviceFeaturesInput): string | null => {
   if (!features) return null;
   const compatible = asCompatibleFeatures(features);
-  return (
-    firstNonEmptyString(compatible.bleName, compatible.onekey_ble_name, compatible.ble_name) ?? null
-  );
+  const bleName =
+    firstNonEmptyString(compatible.bleName, compatible.onekey_ble_name, compatible.ble_name) ??
+    null;
+  return bleName ? canonicalizePro2BleAdvertisementName(bleName) : null;
 };
 
 export const resolveDeviceFirmwareVersion = (features?: DeviceFeaturesInput): string | null => {

package/src/utils/deviceInfoUtils.ts

@@ -31,7 +31,9 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
   if (/^Touch/i.test(name)) return EDeviceType.Touch;
 
   const compactName = name.replace(/[\s-]/g, '');
-  if (/\bPro\s*2\b/i.test(name) || /^Pro2/i.test(name) || /^(?:OneKey)?Pro2/i.test(compactName)) {
+  // Require a 4-hex Pro2 suffix in the compact form. A bare `^Pro2` prefix
+  // would also match OneKey Pro names such as "Pro 22D8" / "Pro 2D8F".
+  if (/\bPro\s*2\b/i.test(name) || /^(?:OneKey)?Pro2[a-f0-9]{4}$/i.test(compactName)) {
     return EDeviceType.Pro2;
   }
   if (/\bNeo\b/i.test(name) || /^Neo/i.test(name) || /^(?:OneKey)?Neo/i.test(compactName)) {

package/__tests__/firmware-memory-host.test.ts

@@ -1,126 +0,0 @@
-import { prepareFirmwareUpdateV4MemoryHost } from '../src/api/firmware/FirmwareMemoryHost';
-
-import type { CoreApi } from '../src/types/api';
-import type { FirmwareUpdatePlan } from '../src/types/api/firmwareUpdatePlan';
-
-describe('prepareFirmwareUpdateV4MemoryHost', () => {
-  test('registers artifact-backed component and resource readers', async () => {
-    const componentBinary = new Uint8Array([1, 2, 3, 4]).buffer;
-    const archiveBinary = new Uint8Array([5, 6]).buffer;
-    const manifestBinary = new TextEncoder().encode('{"schema":1}').buffer;
-    let artifactReader: Parameters<
-      CoreApi['registerFirmwareUpdateHostBinding']
-    >[0]['artifactReader'];
-    const unregisterFirmwareUpdateHostBinding = jest.fn();
-    const sdk = {
-      prepareFirmwareUpdatePlan: jest.fn(({ plan, artifacts }) => ({
-        schemaVersion: 2,
-        preparedPlanDigest: 'b'.repeat(64),
-        planDigest: plan.planDigest,
-        networkPolicy: 'forbid',
-        executor: plan.executor,
-        deviceIdentity: plan.deviceIdentity,
-        deviceModel: plan.deviceModel,
-        firmwareType: plan.firmwareType,
-        platform: plan.platform,
-        leaseRef: 'test-lease',
-        targetsToUpdate: plan.targetsToUpdate,
-        artifacts: plan.artifacts.map(planArtifact => {
-          const input = artifacts.find(item => item.artifactId === planArtifact.artifactId);
-          return {
-            ...planArtifact,
-            artifact: input?.artifact,
-            materializedEntries: input?.materializedEntries,
-          };
-        }),
-      })),
-      registerFirmwareUpdateHostBinding: jest.fn(binding => {
-        artifactReader = binding.artifactReader;
-        return 7;
-      }),
-      unregisterFirmwareUpdateHostBinding,
-    } as unknown as Pick<
-      CoreApi,
-      | 'prepareFirmwareUpdatePlan'
-      | 'registerFirmwareUpdateHostBinding'
-      | 'unregisterFirmwareUpdateHostBinding'
-    >;
-    const plan = {
-      schemaVersion: 2,
-      planDigest: 'a'.repeat(64),
-      executor: 'v4',
-      deviceIdentity: 'device-id',
-      deviceModel: 'pro2',
-      firmwareType: 0,
-      platform: 'web',
-      targetsToUpdate: ['boot', 'resource'],
-      artifacts: [
-        {
-          artifactId: 'component:boot',
-          role: 'component',
-          target: 'boot',
-          url: 'https://example.com/boot.okpkg',
-          container: 'raw',
-        },
-        {
-          artifactId: 'resource:archive',
-          role: 'resourceBundle',
-          target: 'resource',
-          url: 'https://example.com/resource.zip',
-          container: 'zip',
-          logicalName: 'resource-archive',
-        },
-      ],
-    } as FirmwareUpdatePlan;
-
-    const host = prepareFirmwareUpdateV4MemoryHost({
-      sdk,
-      plan,
-      artifacts: [
-        { artifactId: 'component:boot', binary: componentBinary },
-        {
-          artifactId: 'resource:archive',
-          binary: archiveBinary,
-          materializedEntries: [{ entryName: 'manifest.json', binary: manifestBinary }],
-        },
-      ],
-    });
-
-    expect(host.hostBindingGeneration).toBe(7);
-    expect(sdk.registerFirmwareUpdateHostBinding).toHaveBeenCalledWith(
-      expect.objectContaining({ preparedPlanDigest: host.preparedPlan.preparedPlanDigest })
-    );
-    const componentArtifact = host.preparedPlan.artifacts.find(
-      artifact => artifact.target === 'boot'
-    )?.artifact;
-    const resourceEntryArtifact = host.preparedPlan.artifacts.find(
-      artifact => artifact.target === 'resource'
-    )?.materializedEntries?.[0]?.artifact;
-    expect(componentArtifact?.size).toBe(componentBinary.byteLength);
-    expect(resourceEntryArtifact?.size).toBe(manifestBinary.byteLength);
-    if (!artifactReader || !componentArtifact || !resourceEntryArtifact) {
-      throw new Error('Firmware memory host test setup is incomplete');
-    }
-    new Uint8Array(componentBinary).fill(9);
-    const opened = await artifactReader.open({
-      artifactRef: componentArtifact.artifactRef,
-    });
-    const chunk = await artifactReader.read({
-      readerId: opened.readerId,
-      offset: 1,
-      length: 2,
-    });
-    expect(Array.from(new Uint8Array(chunk.data))).toEqual([2, 3]);
-    await artifactReader.close({ readerId: opened.readerId });
-
-    // Materialized ZIP entries are receipts only. Execution opens the approved
-    // archive and re-derives these bytes, so the memory host must not retain a
-    // second readable copy of every expanded resource file.
-    expect(() => artifactReader.open({ artifactRef: resourceEntryArtifact.artifactRef })).toThrow(
-      'Firmware memory artifact is unavailable'
-    );
-
-    host.release();
-    expect(unregisterFirmwareUpdateHostBinding).toHaveBeenCalledWith(7);
-  });
-});

package/dist/api/firmware/FirmwareMemoryHost.d.ts

@@ -1,22 +0,0 @@
-import type { CoreApi } from '../../types/api';
-import type { FirmwareUpdatePlan } from '../../types/api/firmwareUpdatePlan';
-export type FirmwareMemoryArtifactEntry = {
-    entryName: string;
-    binary: ArrayBuffer;
-};
-export type FirmwareMemoryArtifact = {
-    artifactId: string;
-    binary: ArrayBuffer;
-    materializedEntries?: FirmwareMemoryArtifactEntry[];
-};
-export type FirmwareUpdateV4MemoryHost = {
-    preparedPlan: ReturnType<CoreApi['prepareFirmwareUpdatePlan']>;
-    hostBindingGeneration: number;
-    release: () => void;
-};
-export declare function prepareFirmwareUpdateV4MemoryHost({ sdk, plan, artifacts, }: {
-    sdk: Pick<CoreApi, 'prepareFirmwareUpdatePlan' | 'registerFirmwareUpdateHostBinding' | 'unregisterFirmwareUpdateHostBinding'>;
-    plan: FirmwareUpdatePlan;
-    artifacts: FirmwareMemoryArtifact[];
-}): FirmwareUpdateV4MemoryHost;
-//# sourceMappingURL=FirmwareMemoryHost.d.ts.map

package/dist/api/firmware/FirmwareMemoryHost.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FirmwareMemoryHost.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareMemoryHost.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK/C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,2BAA2B,EAAE,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC/D,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAaF,wBAAgB,iCAAiC,CAAC,EAChD,GAAG,EACH,IAAI,EACJ,SAAS,GACV,EAAE;IACD,GAAG,EAAE,IAAI,CACP,OAAO,EACL,2BAA2B,GAC3B,mCAAmC,GACnC,qCAAqC,CACxC,CAAC;IACF,IAAI,EAAE,kBAAkB,CAAC;IACzB,SAAS,EAAE,sBAAsB,EAAE,CAAC;CACrC,GAAG,0BAA0B,CA0F7B"}

package/src/api/firmware/FirmwareMemoryHost.ts

@@ -1,143 +0,0 @@
-import { sha256 } from '@noble/hashes/sha256';
-import { bytesToHex } from '@noble/hashes/utils';
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-
-import type { CoreApi } from '../../types/api';
-import type {
-  FirmwareArtifactReader,
-  FirmwareArtifactReference,
-} from '../../types/api/firmwareUpdate';
-import type { FirmwareUpdatePlan } from '../../types/api/firmwareUpdatePlan';
-
-export type FirmwareMemoryArtifactEntry = {
-  entryName: string;
-  binary: ArrayBuffer;
-};
-
-export type FirmwareMemoryArtifact = {
-  artifactId: string;
-  binary: ArrayBuffer;
-  materializedEntries?: FirmwareMemoryArtifactEntry[];
-};
-
-export type FirmwareUpdateV4MemoryHost = {
-  preparedPlan: ReturnType<CoreApi['prepareFirmwareUpdatePlan']>;
-  hostBindingGeneration: number;
-  release: () => void;
-};
-
-let memoryHostSequence = 0;
-
-const createReference = (binary: ArrayBuffer, prefix: string): FirmwareArtifactReference => {
-  const digest = bytesToHex(sha256(new Uint8Array(binary)));
-  return {
-    artifactRef: `fwmem:${prefix}:${digest.slice(0, 32)}`,
-    size: binary.byteLength,
-    sha256: digest,
-  };
-};
-
-export function prepareFirmwareUpdateV4MemoryHost({
-  sdk,
-  plan,
-  artifacts,
-}: {
-  sdk: Pick<
-    CoreApi,
-    | 'prepareFirmwareUpdatePlan'
-    | 'registerFirmwareUpdateHostBinding'
-    | 'unregisterFirmwareUpdateHostBinding'
-  >;
-  plan: FirmwareUpdatePlan;
-  artifacts: FirmwareMemoryArtifact[];
-}): FirmwareUpdateV4MemoryHost {
-  if (plan.executor !== 'v4') {
-    throw ERRORS.TypedError(
-      HardwareErrorCode.RuntimeError,
-      'Firmware memory host only supports V4 plans'
-    );
-  }
-  memoryHostSequence += 1;
-  const hostId = `${Date.now()}:${memoryHostSequence}`;
-  const binaries = new Map<string, Uint8Array>();
-  const inputs = artifacts.map((input, artifactIndex) => {
-    const artifactBinary = new Uint8Array(input.binary).slice();
-    const artifact = createReference(
-      artifactBinary.buffer as ArrayBuffer,
-      `${hostId}:artifact:${artifactIndex}`
-    );
-    binaries.set(artifact.artifactRef, artifactBinary);
-    const materializedEntries = input.materializedEntries?.map((entry, entryIndex) => {
-      const entryArtifact = createReference(
-        entry.binary,
-        `${hostId}:entry:${artifactIndex}:${entryIndex}`
-      );
-      // Entry references are compact receipts for bytes that will be re-derived
-      // from the verified archive. Retaining another readable copy here doubles
-      // resource memory without adding an execution trust boundary.
-      return {
-        entryName: entry.entryName,
-        artifact: entryArtifact,
-      };
-    });
-    return {
-      artifactId: input.artifactId,
-      artifact,
-      ...(materializedEntries?.length ? { materializedEntries } : {}),
-    };
-  });
-  const preparedPlan = sdk.prepareFirmwareUpdatePlan({
-    plan,
-    leaseRef: `fwmemlease:${hostId}`,
-    artifacts: inputs,
-  });
-  const readers = new Map<string, Uint8Array>();
-  let readerSequence = 0;
-  const artifactReader: FirmwareArtifactReader = {
-    open({ artifactRef }) {
-      const binary = binaries.get(artifactRef);
-      if (!binary) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.RuntimeError,
-          'Firmware memory artifact is unavailable'
-        );
-      }
-      readerSequence += 1;
-      const readerId = `fwmemreader:${hostId}:${readerSequence}`;
-      readers.set(readerId, binary);
-      return Promise.resolve({ readerId, size: binary.byteLength });
-    },
-    read({ readerId, offset, length }) {
-      const binary = readers.get(readerId);
-      if (!binary || offset < 0 || length <= 0 || offset + length > binary.byteLength) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.RuntimeError,
-          'Firmware memory artifact read is invalid'
-        );
-      }
-      const data = binary.slice(offset, offset + length).buffer;
-      return Promise.resolve({
-        data,
-        bytesRead: data.byteLength,
-        eof: offset + length === binary.byteLength,
-      });
-    },
-    close({ readerId }) {
-      readers.delete(readerId);
-      return Promise.resolve();
-    },
-  };
-  const hostBindingGeneration = sdk.registerFirmwareUpdateHostBinding({
-    artifactReader,
-    preparedPlanDigest: preparedPlan.preparedPlanDigest,
-  });
-  return {
-    preparedPlan,
-    hostBindingGeneration,
-    release: () => {
-      sdk.unregisterFirmwareUpdateHostBinding(hostBindingGeneration);
-      readers.clear();
-      binaries.clear();
-    },
-  };
-}