@onekeyfe/hd-core 1.2.0-alpha.97 → 1.2.0-alpha.98

package/src/types/api/checkFirmwareRelease.ts

@@ -1,17 +1,6 @@
-import type { IFirmwareReleaseInfo } from '../settings';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
 import type { Response } from '../params';
-import type { IDeviceFirmwareStatus } from '../device';
-
-type FirmwareRelease = {
-  status: IDeviceFirmwareStatus;
-  changelog: {
-    'en-US': string;
-    'zh-CN': string;
-  }[];
-  release: IFirmwareReleaseInfo;
-  bootloaderMode: boolean;
-};
+import type { FirmwareReleaseCheckResult } from './checkAllFirmwareRelease';
 
 export type CheckFirmwareReleaseParams = {
   firmwareType?: EFirmwareType;
@@ -20,4 +9,4 @@ export type CheckFirmwareReleaseParams = {
 export declare function checkFirmwareRelease(
   connectId?: string,
   params?: CheckFirmwareReleaseParams
-): Response<FirmwareRelease>;
+): Response<FirmwareReleaseCheckResult | null>;

package/src/types/api/checkFirmwareTypeAvailable.ts

@@ -1,6 +1,6 @@
 import type { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 import type { Response } from '../params';
-import type { FirmwareRelease } from './checkAllFirmwareRelease';
+import type { FirmwareReleaseCheckResult } from './checkAllFirmwareRelease';
 
 export type CheckFirmwareTypeAvailableParams = {
   deviceType: EDeviceType;
@@ -9,4 +9,4 @@ export type CheckFirmwareTypeAvailableParams = {
 
 export declare function checkFirmwareTypeAvailable(
   params: CheckFirmwareTypeAvailableParams
-): Response<FirmwareRelease | undefined>;
+): Response<FirmwareReleaseCheckResult | undefined>;

package/src/types/api/deviceUpdateBootloader.ts

@@ -8,6 +8,7 @@ export type DeviceUpdateBootloaderParams = {
   preparedPlan?: FirmwareUpdatePreparedPlan;
   hostBindingGeneration?: number;
   binary?: ArrayBuffer;
+  /** @deprecated Core derives the bootloader artifact from preparedPlan. */
   artifact?: FirmwareArtifactReference;
   artifactReader?: FirmwareArtifactReader;
   firmwareType?: EFirmwareType;

package/src/types/api/export.ts

@@ -50,7 +50,12 @@ export type {
   FirmwareUpdatePreparedPlan,
 } from './firmwareUpdatePreparedPlan';
 export type { FirmwareUpdateCapabilities } from './firmwareUpdateCapabilities';
-export type { AllFirmwareRelease } from './checkAllFirmwareRelease';
+export type {
+  AllFirmwareRelease,
+  BridgeReleaseCheckResult,
+  FirmwareReleaseCheckResult,
+  ProtocolV2ComponentReleaseInfo,
+} from './checkAllFirmwareRelease';
 export type {
   ProtocolV2FirmwareComponentRelease,
   ProtocolV2FirmwareComponentReleaseStatus,

package/src/types/api/firmwareUpdate.ts

@@ -26,6 +26,8 @@ export interface FirmwareArtifactReader {
 
 export interface FirmwareUpdateHostBinding {
   artifactReader: FirmwareArtifactReader;
+  /** 将读取器 generation 绑定到包含 ZIP 条目的完整 PreparedPlan。 */
+  preparedPlanDigest: string;
 }
 
 export interface FirmwareUpdateBinaryParams {
@@ -36,7 +38,8 @@ export interface FirmwareUpdateBinaryParams {
 export interface FirmwareUpdateArtifactParams {
   preparedPlan: FirmwareUpdatePreparedPlan;
   hostBindingGeneration: number;
-  artifact: FirmwareArtifactReference;
+  /** @deprecated Core derives the component artifact from preparedPlan. */
+  artifact?: FirmwareArtifactReference;
   resourceEntries?: Array<{
     entryName: string;
     artifact: FirmwareArtifactReference;
@@ -118,6 +121,7 @@ export interface FirmwareUpdateV3Params {
  */
 export type FirmwareUpdateV4Target =
   | 'boot'
+  /** @deprecated Use resource with resourceArchiveBinary. */
   | 'boot_resources'
   | 'app_v1'
   | 'app_v2'
@@ -130,6 +134,7 @@ export type FirmwareUpdateV4Target =
 
 export interface FirmwareUpdateV4Params {
   preparedPlan?: FirmwareUpdatePreparedPlan;
+  /** Required whenever preparedPlan is present; Core resolves the reader from this digest-bound host. */
   hostBindingGeneration?: number;
   platform: IPlatform;
   expectedDeviceId?: string;
@@ -153,26 +158,16 @@ export interface FirmwareUpdateV4Params {
   se02Binary?: ArrayBuffer;
   se03Binary?: ArrayBuffer;
   se04Binary?: ArrayBuffer;
+  /** Complete Protocol V2 resource ZIP for local development; Core converts it to a local PreparedPlan. */
+  resourceArchiveBinary?: ArrayBuffer;
   forcedUpdateRes?: boolean;
-  /**
-   * 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;
-    devicePath: string;
-    size?: number;
-    fileHash?: string;
-  }>;
   artifactReader?: FirmwareArtifactReader;
   componentArtifacts?: Partial<
-    Record<Exclude<FirmwareUpdateV4Target, 'resource'>, FirmwareArtifactReference>
+    Record<
+      Exclude<FirmwareUpdateV4Target, 'resource' | 'boot_resources'>,
+      FirmwareArtifactReference
+    >
   >;
-  resourceBundleArtifacts?: Array<{
-    name: string;
-    artifact: FirmwareArtifactReference;
-  }>;
 }
 
 export declare function registerFirmwareUpdateHostBinding(

package/src/types/api/firmwareUpdatePlan.ts

@@ -20,8 +20,8 @@ export interface FirmwareUpdatePlanArtifact {
   url: string;
   container: 'raw' | 'zip';
   logicalName?: string;
-  expectedSize?: number;
-  expectedSha256?: string;
+  expectedSize: number;
+  expectedSha256: string;
   targetVersion?: string;
 }
 

package/src/types/settings.ts

@@ -64,66 +64,44 @@ export type IProtocolV2FirmwareComponent = {
   version?: IVersionArray;
 };
 
-export type IProtocolV2ResourceType =
-  | 'images'
-  | 'animation'
-  | 'wallpaper'
-  | 'translations'
-  | 'roobert'
-  | 'noto'
-  | 'firmware_logo';
-
-/** Pro2 RES package descriptor. Hashes identify content without a human-managed version. */
-export type IProtocolV2Resource = {
-  type: IProtocolV2ResourceType;
-  url: string;
-  /** Complete okpkg file size in bytes. */
-  size: number;
-  /** SHA-256 of the complete okpkg file. */
-  fileHash: string;
-  /** SHA3-512 header_hash from the signed okpkg header. */
-  headerHash: string;
-};
-
-/** A file from the Protocol V2 resource manifest, written directly with FileWrite. */
-export type IProtocolV2ResourceFile = {
-  name?: string;
-  url: string;
-  devicePath: string;
-  size: number;
-  /** SHA-256 of the complete file. */
-  fileHash: string;
+export type IProtocolV2ResourceSource = {
+  archiveUrl: string;
+  archiveSha256: string;
+  archiveSize: number;
 };
 
-/** Optional Protocol V2 boot resources restored as individual files. */
-export type IProtocolV2BootResources = {
-  required: false;
-  target: 'RES';
-  manifestUrl?: string;
-  files: IProtocolV2ResourceFile[];
+export type IProtocolV2Resources = {
+  source: IProtocolV2ResourceSource;
 };
 
-export type IProtocolV2Resources = {
-  stable: IProtocolV2Resource[];
-  boot?: IProtocolV2BootResources;
+export type IProtocolV2ResourceManifestFile = {
+  archive_path: string;
+  original_name: string;
+  device_path: string;
+  size: number;
+  sha256: string;
+  signed: true;
+  sig_algo: 'ed25519' | 'mldsa65';
+  payload_version: string | null;
 };
 
-/** Pro2 RESC bundle okpkg descriptor for incremental FileWrite synchronization. */
-export type IProtocolV2ResourceBundle = {
-  /** Bundle name, such as images, animation, translations, or fonts_roobert. */
-  name: string;
-  /** Download URL. */
-  url: string;
-  fingerprint?: string;
-  expectedSize?: number;
-  /** Device target path, such as vol0:/bundles/images/images.okpkg. */
-  devicePath: string;
-  /** okpkg payload_version used to skip matching content after FileRead. */
-  version?: IVersionArray;
-  /** okpkg payload_hash used for SHA3-512 comparison after FileRead. */
-  payloadHash?: string;
-  /** okpkg header_hash used for SHA3-512 comparison after FileRead. */
-  headerHash?: string;
+export type IProtocolV2ResourceManifest = {
+  schema: 1;
+  artifact_name: string;
+  release_name: string;
+  variant: 'resource';
+  commit: string;
+  short_sha: string;
+  timestamp_utc: string;
+  core_version: string;
+  key_set: string;
+  device_root: 'vol0:';
+  restore_mode: 'bootloader_update';
+  trees: Array<{
+    path: string;
+    device: string;
+  }>;
+  files: IProtocolV2ResourceManifestFile[];
 };
 
 /** STM32 firmware config */
@@ -153,8 +131,6 @@ export type IFirmwareReleaseInfo = {
   upgradeType?: 'payload-package-set' | string;
   components?: Record<string, IProtocolV2FirmwareComponent>;
   installOrder?: string[];
-  /** Pro2 RESC bundles for incremental direct FileWrite synchronization. */
-  resourceBundles?: IProtocolV2ResourceBundle[];
   bootloaderChangelog?: {
     [k in ILocale]: string;
   };
@@ -183,22 +159,20 @@ export type IBLEFirmwareReleaseInfo = {
 };
 
 type IKnownDevice = Exclude<IDeviceType, 'unknown'>;
-type ILegacyKnownDevice = Exclude<IKnownDevice, 'neo'>;
-
 type IDeviceReleaseInfo = {
-  firmware: IFirmwareReleaseInfo[];
+  firmware?: IFirmwareReleaseInfo[];
   /** Protocol V2 payload package set */
   'firmware-v1'?: IFirmwareReleaseInfo[];
   'firmware-v2'?: IFirmwareReleaseInfo[];
   'firmware-v8'?: IFirmwareReleaseInfo[];
   'firmware-btc-v8'?: IFirmwareReleaseInfo[];
-  ble: IBLEFirmwareReleaseInfo[];
+  ble?: IBLEFirmwareReleaseInfo[];
   /** Independent Protocol V2 resource release configuration. */
   resources?: IProtocolV2Resources;
 };
 
 export type DeviceTypeMap = {
-  [k in ILegacyKnownDevice]: IDeviceReleaseInfo;
+  [k in Exclude<IKnownDevice, 'neo'>]: IDeviceReleaseInfo;
 } & {
   /** Optional until every remote-config producer publishes a Neo entry. */
   neo?: IDeviceReleaseInfo;

package/src/utils/deviceFeaturesUtils.ts

@@ -328,7 +328,7 @@ export const getFirmwareUpdateField = ({
   if (deviceType === EDeviceType.Pro) {
     return latestFirmwareField;
   }
-  if (deviceType === EDeviceType.Pro2) {
+  if (deviceType === EDeviceType.Pro2 || deviceType === EDeviceType.Neo) {
     return 'firmware-v1';
   }
   return 'firmware';
@@ -374,7 +374,7 @@ export const getFirmwareUpdateFieldArray = (
     return ['firmware-v8'];
   }
 
-  if (deviceType === 'pro2') {
+  if (deviceType === 'pro2' || deviceType === 'neo') {
     return ['firmware-v1'];
   }