react-native-update 10.59.1 → 10.60.0

package/harmony/pushy/src/main/ets/DownloadTaskParams.ts

@@ -3,13 +3,11 @@
  */
 export class DownloadTaskParams {
   // 任务类型常量
-  static readonly TASK_TYPE_CLEANUP: number = 0; // 保留hash和originHash
   static readonly TASK_TYPE_PATCH_FULL: number = 1; // 全量补丁
   static readonly TASK_TYPE_PATCH_FROM_APP: number = 2; // 从APP补丁
   static readonly TASK_TYPE_PATCH_FROM_PPK: number = 3; // 从PPK补丁
-  static readonly TASK_TYPE_PLAIN_DOWNLOAD: number = 4; // 普通下载
 
-  type: number = DownloadTaskParams.TASK_TYPE_CLEANUP; // 任务类型
+  type: number = DownloadTaskParams.TASK_TYPE_PATCH_FULL; // 任务类型
   url: string = ''; // 下载URL
   hash: string = ''; // 文件哈希值
   originHash: string = ''; // 原始文件哈希值

package/harmony/pushy/src/main/ets/ErrorCodes.ts

@@ -1,5 +1,5 @@
 // ArkTS mirror of cpp/patch_core/error_codes.h — keep in sync by hand
-// (harmony/pushy/src/test/check-constant-parity.js asserts the values match).
+// (scripts/check-constant-parity.js asserts the values match).
 // 与 Android/iOS 共用的稳定错误码:JS 层(src/error.ts)按 code 聚合遥测,
 // 消息文案各平台可不同,只有码是契约。
 //
@@ -62,16 +62,3 @@ export function toPushyError(error: unknown, defaultCode: string): PushyError {
   }
   return new PushyError(defaultCode, getErrorMessage(error));
 }
-
-/** 从 `[CODE] message` 形式的消息里解析错误码;无前缀返回空串。 */
-export function parseErrorCodePrefix(message: string): string {
-  if (typeof message !== 'string' || !message.startsWith('[')) {
-    return '';
-  }
-  const end = message.indexOf('] ');
-  if (end <= 1) {
-    return '';
-  }
-  const code = message.substring(1, end);
-  return /^[A-Z][A-Z0-9_]*$/.test(code) ? code : '';
-}

package/harmony/pushy/src/main/ets/EventHub.ts

@@ -1,5 +1,5 @@
 // The subset of RNOH's RNInstance the SDK needs: device events for download
-// progress. Typed structurally so the hypium tests can pass a mock.
+// progress. Typed structurally so tests can pass a mock.
 export interface DeviceEventEmitter {
   emitDeviceEvent(eventName: string, payload: Object): void;
 }

package/harmony/pushy/src/main/ets/InstallRecord.ts

@@ -1,187 +1,88 @@
-import fileIo from '@ohos.file.fs';
-import { util } from '@kit.ArkTS';
 import NativePatchCore from './NativePatchCore';
-import { ERROR_SWITCH_VERSION_FAILED, createPushyError } from './ErrorCodes';
+import {
+  ERROR_DELTA_FAILED,
+  ERROR_SWITCH_VERSION_FAILED,
+  createPushyError,
+  getErrorMessage,
+} from './ErrorCodes';
 
-// ArkTS mirror of cpp/patch_core/install_record.h — keep in sync by hand
-// (harmony/pushy/src/test/check-constant-parity.js asserts the values match).
-// 两阶段安装的完成记录:作为安装最后一步写进 staging 目录,随后 staging
-// 原子 rename 成版本目录;激活前重新校验 bundle 摘要。空文件 = 旧版 SDK
-// 写的历史标记,仍视为完整安装(无摘要可验)。
-export const INSTALL_RECORD_SCHEMA = 1;
-export const INSTALL_RECORD_FILE_NAME = '.pushy-complete';
+// 两阶段安装的完成记录(cpp/patch_core/install_record.h,三端共用的唯一
+// 实现):解压/打补丁全在 staging 目录里进行,最后写入记录,再一次 rename 成
+// 版本目录;激活前重新校验 bundle 摘要。这里只拼路径、把原生结果映射成
+// 稳定错误码。
+// STAGING_SUFFIX 镜像 kStagingSuffix(scripts/check-constant-parity.js 断言)。
 export const STAGING_SUFFIX = '.staging';
-// 归档不得携带任何 `.pushy-` 前缀的条目(任意深度):这些名字保留给 SDK 自己
-// 写的记录,与 Android 的规则一致。
-export const RESERVED_ENTRY_PREFIX = '.pushy-';
 export const HARMONY_BUNDLE_FILE_NAME = 'bundle.harmony.js';
 
-export interface InstallRecordData {
-  schema?: number;
-  versionHash?: string;
-  bundleSha256?: string;
-  artifactSha256?: string;
-}
-
 export function stagingDirectoryFor(versionDir: string): string {
   return `${versionDir}${STAGING_SUFFIX}`;
 }
 
-export function isReservedEntryName(name: string): boolean {
-  return name.startsWith(RESERVED_ENTRY_PREFIX);
-}
-
-export function buildInstallRecord(
+/**
+ * 在 native 工作线程计算 staging 里 bundle 的摘要并原子写入完成记录
+ * (schema 1 的 bundleSha256 必填:算不出摘要就安装失败)。失败 = PATCH_FAILED。
+ */
+export async function sealInstallRecord(
+  stagingDir: string,
   versionHash: string,
-  bundleSha256: string,
   artifactSha256: string,
-): string {
-  const record: InstallRecordData = {
-    schema: INSTALL_RECORD_SCHEMA,
-    versionHash,
-  };
-  if (bundleSha256) {
-    record.bundleSha256 = bundleSha256;
-  }
-  if (artifactSha256) {
-    record.artifactSha256 = artifactSha256;
-  }
-  return JSON.stringify(record);
-}
-
-/** 写入并 fsync:紧随其后的 rename 必须能在盘上看到它。 */
-export async function writeInstallRecord(
-  versionDir: string,
-  recordJson: string,
 ): Promise<void> {
-  const path = `${versionDir}/${INSTALL_RECORD_FILE_NAME}`;
-  if (fileIo.accessSync(path)) {
-    await fileIo.unlink(path);
-  }
-  const file = await fileIo.open(
-    path,
-    fileIo.OpenMode.CREATE | fileIo.OpenMode.WRITE_ONLY,
-  );
-  try {
-    const bytes = new util.TextEncoder().encodeInto(recordJson);
-    await fileIo.write(file.fd, bytes.buffer as ArrayBuffer);
-    await fileIo.fsync(file.fd);
-  } finally {
-    await fileIo.close(file);
-  }
-}
-
-/**
- * 解析记录文本:空串(历史标记)返回 {};畸形/非对象返回 null。纯函数,
- * 供 readInstallRecord 与单测共用。
- */
-export function parseInstallRecord(text: string): InstallRecordData | null {
-  if (text.length === 0) {
-    return {};
-  }
   try {
-    const parsed = JSON.parse(text) as InstallRecordData | null;
-    return parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)
-      ? parsed
-      : null;
+    await NativePatchCore.sealInstallRecord(
+      stagingDir,
+      versionHash,
+      HARMONY_BUNDLE_FILE_NAME,
+      artifactSha256,
+    );
   } catch (e) {
-    return null;
+    throw createPushyError(ERROR_DELTA_FAILED, getErrorMessage(e));
   }
 }
 
-/**
- * 读取记录:文件缺失/畸形返回 null;空文件(历史标记)返回 {}。
- */
-export function readInstallRecord(versionDir: string): InstallRecordData | null {
-  const path = `${versionDir}/${INSTALL_RECORD_FILE_NAME}`;
-  if (!fileIo.accessSync(path)) {
-    return null;
-  }
+/** staging rename 成版本目录(调用方先删掉已有的版本目录)。失败 = PATCH_FAILED。 */
+export async function promoteStaging(
+  stagingDir: string,
+  versionDir: string,
+): Promise<void> {
   try {
-    const stat = fileIo.statSync(path);
-    if (stat.size === 0) {
-      return {};
-    }
-    if (stat.size > 64 * 1024) {
-      return null;
-    }
-    return parseInstallRecord(fileIo.readTextSync(path));
+    await NativePatchCore.promoteStaging(stagingDir, versionDir);
   } catch (e) {
-    return null;
-  }
-}
-
-/** 记录是否宣告本版本完整安装(历史空记录视为是)。纯函数。 */
-export function isRecordForVersion(
-  record: InstallRecordData | null,
-  versionHash: string,
-): boolean {
-  if (record === null) {
-    return false;
-  }
-  if (Object.keys(record).length === 0) {
-    return true;
+    throw createPushyError(ERROR_DELTA_FAILED, getErrorMessage(e));
   }
-  return (
-    record.schema === INSTALL_RECORD_SCHEMA && record.versionHash === versionHash
-  );
 }
 
-/** 存在性判定(启动/去重路径,不算摘要):记录存在且(非历史空文件时)指向本版本。 */
+/** 存在性判定(启动/去重路径,不算摘要)。 */
 export function isInstallComplete(versionDir: string, versionHash: string): boolean {
-  return isRecordForVersion(readInstallRecord(versionDir), versionHash);
+  return NativePatchCore.isInstallComplete(
+    versionDir,
+    versionHash,
+    HARMONY_BUNDLE_FILE_NAME,
+  );
 }
 
-/**
- * 激活前的记录校验(不含摘要):返回需要复核的 bundle 摘要,历史空记录或
- * 无摘要记录返回空串;记录缺失/不符抛 SWITCH_VERSION_FAILED。纯函数。
- */
-export function expectedBundleSha256ForActivation(
-  record: InstallRecordData | null,
-  versionHash: string,
-): string {
-  if (record === null) {
-    throw createPushyError(
-      ERROR_SWITCH_VERSION_FAILED,
-      `Bundle version ${versionHash} has no valid completion record.`,
-    );
-  }
-  if (Object.keys(record).length === 0) {
-    return '';
-  }
-  if (
-    record.schema !== INSTALL_RECORD_SCHEMA ||
-    record.versionHash !== versionHash
-  ) {
-    throw createPushyError(
-      ERROR_SWITCH_VERSION_FAILED,
-      `Bundle version ${versionHash} completion record mismatch.`,
-    );
-  }
-  return record.bundleSha256 ?? '';
+/** 记录里的 bundleSha256(崩溃归因);没有时为空串。 */
+export function recordedBundleSha256(versionDir: string): string {
+  return NativePatchCore.recordedBundleSha256(versionDir);
 }
 
 /**
- * 激活前校验:记录带摘要时在 native 工作线程重新计算 bundle 摘要(整包
- * 几十 MB,不能在 UI 线程同步算);不通过则抛错说明原因。
+ * 激活前校验:bundle 在盘上,且记录的摘要与盘上字节一致(整包几十 MB,在
+ * native 工作线程算)。无记录文件的目录只有是 current/last(grandfathered,
+ * 标记机制之前就激活过)时放行。不通过抛 SWITCH_VERSION_FAILED。
  */
 export async function verifyInstallForActivation(
   versionDir: string,
   versionHash: string,
-  bundlePath: string,
+  grandfathered: boolean,
 ): Promise<void> {
-  const expected = expectedBundleSha256ForActivation(
-    readInstallRecord(versionDir),
-    versionHash,
-  );
-  if (!expected) {
-    return;
-  }
-  const actual = await NativePatchCore.sha256HexFileAsync(bundlePath);
-  if (actual.toLowerCase() !== expected.toLowerCase()) {
-    throw createPushyError(
-      ERROR_SWITCH_VERSION_FAILED,
-      `Bundle version ${versionHash} bundle digest mismatch.`,
+  try {
+    await NativePatchCore.checkActivation(
+      versionDir,
+      versionHash,
+      HARMONY_BUNDLE_FILE_NAME,
+      grandfathered,
     );
+  } catch (e) {
+    throw createPushyError(ERROR_SWITCH_VERSION_FAILED, getErrorMessage(e));
   }
 }

package/harmony/pushy/src/main/ets/Logger.ts

@@ -1,5 +1,12 @@
 import hilog from '@ohos.hilog';
 
+type HilogFunction = (
+  domain: number,
+  tag: string,
+  format: string,
+  ...args: string[]
+) => void;
+
 class Logger {
   private domain: number;
   private prefix: string;
@@ -24,54 +31,33 @@ class Logger {
     this.isDebug = enabled;
   }
 
-  private tagOf(args: string[]): string {
-    return args.length > 0 ? args[0] : '';
-  }
-
-  private messageOf(args: string[]): string {
-    return args.length > 1 ? args.slice(1).join(' ') : '';
+  // args[0] is the tag, the rest is joined into the message.
+  private log(fn: HilogFunction, args: string[]): void {
+    fn(
+      this.domain,
+      this.prefix,
+      this.format,
+      args.length > 0 ? args[0] : '',
+      args.length > 1 ? args.slice(1).join(' ') : '',
+    );
   }
 
   debug(...args: string[]): void {
     if (this.isDebug) {
-      hilog.debug(
-        this.domain,
-        this.prefix,
-        this.format,
-        this.tagOf(args),
-        this.messageOf(args),
-      );
+      this.log(hilog.debug, args);
     }
   }
 
   info(...args: string[]): void {
-    hilog.info(
-      this.domain,
-      this.prefix,
-      this.format,
-      this.tagOf(args),
-      this.messageOf(args),
-    );
+    this.log(hilog.info, args);
   }
 
   warn(...args: string[]): void {
-    hilog.warn(
-      this.domain,
-      this.prefix,
-      this.format,
-      this.tagOf(args),
-      this.messageOf(args),
-    );
+    this.log(hilog.warn, args);
   }
 
   error(...args: string[]): void {
-    hilog.error(
-      this.domain,
-      this.prefix,
-      this.format,
-      this.tagOf(args),
-      this.messageOf(args),
-    );
+    this.log(hilog.error, args);
   }
 }
 

package/harmony/pushy/src/main/ets/NativePatchCore.ts

@@ -3,11 +3,9 @@ import NativeCore from 'librnpushy.so';
 export const STATE_OP_SWITCH_VERSION = 1;
 export const STATE_OP_MARK_SUCCESS = 2;
 export const STATE_OP_ROLLBACK = 3;
-export const STATE_OP_CLEAR_FIRST_TIME = 4;
 export const STATE_OP_CLEAR_ROLLBACK_MARK = 5;
 export const STATE_OP_RESOLVE_LAUNCH = 6;
 
-export const ARCHIVE_PATCH_TYPE_FULL = 1;
 export const ARCHIVE_PATCH_TYPE_FROM_PACKAGE = 2;
 export const ARCHIVE_PATCH_TYPE_FROM_PPK = 3;
 
@@ -26,29 +24,43 @@ export interface StateCoreResult {
   consumedFirstTime?: boolean;
 }
 
-export interface ArchivePatchPlanResult {
-  mergeSourceSubdir?: string;
-  enableMerge: boolean;
-}
-
 export interface CopyGroupResult {
   from: string;
   toPaths: string[];
+  /** 源内容必须匹配的 CRC32(__diff.json copiesCrc);未声明时缺省 */
+  expectedCrc?: number;
 }
 
-export interface FileSourcePatchRequest {
-  copyFroms: string[];
-  copyTos: string[];
-  deletes: string[];
+/**
+ * 一次 patch 安装的原生部分(cpp/patch_core/archive_patch_core.h
+ * ApplyArchivePatch):校验条目、解析并校验 __diff.json、重建 bundle;
+ * hostCopiesResources 为 false 时同时完成拷贝/删除/合并。
+ */
+export interface ArchivePatchRequest {
+  archiveType: number;
+  /** staging 目录里解压出的条目名 */
+  entryNames: string[];
+  /** __diff.json 原文;归档里没有时为空串 */
+  manifestJson: string;
+  bundleDeltaEntry: string;
+  /** 从拷贝源开头剥掉的前缀(包内 rawfile 路径) */
+  copySourcePrefix?: string;
   sourceRoot: string;
   targetRoot: string;
   originBundlePath: string;
   bundleDeltaPath: string;
   bundleOutputPath: string;
-  mergeSourceSubdir?: string;
-  enableMerge?: boolean;
-  /** __diff.json 中该 bundle patch 条目的 hbcTransform 元数据(原始 JSON) */
-  bundleHbcTransformMeta?: string;
+  /** 资源不在 sourceRoot 下(rawfile):只重建 bundle,拷贝分组交回调用方 */
+  hostCopiesResources?: boolean;
+}
+
+export interface FreeSpaceProbePlan {
+  /** 本次写入前是否需要探测可用空间。 */
+  probe: boolean;
+  /** 探测时要求的字节数(不含 FREE_DISK_MARGIN_BYTES)。 */
+  reserve: number;
+  /** 计划后的"已预留到"位置(相对本次响应体起点)。 */
+  reservedUntil: number;
 }
 
 interface NativePatchCoreBindings {
@@ -64,16 +76,8 @@ interface NativePatchCoreBindings {
     flagA?: boolean,
     flagB?: boolean,
   ): StateCoreResult;
-  buildArchivePlan(
-    patchType: number,
-    entryNames: string[],
-    copyFroms: string[],
-    copyTos: string[],
-    deletes: string[],
-    bundlePatchEntryName?: string,
-  ): ArchivePatchPlanResult;
-  buildCopyGroups(copyFroms: string[], copyTos: string[]): CopyGroupResult[];
-  applyDeltaFromSource(options: FileSourcePatchRequest): Promise<void>;
+  /** 工作线程执行;resolve 为调用方仍需完成的拷贝(hostCopiesResources 之外为空) */
+  applyArchiveDelta(request: ArchivePatchRequest): Promise<CopyGroupResult[]>;
   /**
    * 删除 rootDir 下超过 maxAgeDays 且名字不在 keepNames 里的条目(native
    * 工作线程)。keepNames 必须包含所有可能仍在使用的版本:持久化的
@@ -84,34 +88,104 @@ interface NativePatchCoreBindings {
     keepNames: string[],
     maxAgeDays: number,
   ): Promise<void>;
-  /** sha256(小写 hex)。同步:输入是已在内存的 rawfile bundle,哈希毫秒级 */
-  sha256Hex(data: Uint8Array): string;
-  // 文件流式 SHA-256(小写 hex;不可读时空串)。同步,仅限小文件——整包/
-  // 整 bundle 用下面的异步版本,避免冻结 UI 线程。
-  sha256HexFile(path: string): string;
-  // 同上,在 libuv 工作线程计算;文件不可读时 reject。
+  // 文件流式 SHA-256(小写 hex),在 libuv 工作线程计算;文件不可读时 reject。
   sha256HexFileAsync(path: string): Promise<string>;
+  // fd 上 [offset, offset + length) 区间的 SHA-256(小写 hex),工作线程
+  // pread 流式计算(内嵌 bundle 走 resourceManager.getRawFd)。fd 由调用方
+  // 持有,promise 落定前不得关闭;读失败/提前 EOF 时 reject。
+  sha256HexRawFdAsync(fd: number, offset: number, length: number): Promise<string>;
+  // 完成记录(cpp/patch_core/install_record.h,与 Android/iOS 共用)。
+  /** 存在性判定(启动/去重路径,不算摘要):bundle 在盘上且记录指向本版本 */
+  isInstallComplete(
+    versionDir: string,
+    versionHash: string,
+    bundleFileName: string,
+  ): boolean;
+  /** 记录里的 bundleSha256(崩溃归因);没有时为空串 */
+  recordedBundleSha256(versionDir: string): string;
+  /** 工作线程上计算 staging 里 bundle 的摘要并原子写入完成记录 */
+  sealInstallRecord(
+    stagingDir: string,
+    versionHash: string,
+    bundleFileName: string,
+    artifactSha256: string,
+  ): Promise<void>;
+  /** 把已写完记录的 staging 目录 rename 成版本目录(调用方先删掉旧目录) */
+  promoteStaging(stagingDir: string, versionDir: string): Promise<void>;
+  /**
+   * 激活前校验(工作线程重算 bundle 摘要);不可激活时以原因 reject。
+   * grandfathered = 该版本是持久化的 current/last。
+   */
+  checkActivation(
+    versionDir: string,
+    versionHash: string,
+    bundleFileName: string,
+    grandfathered: boolean,
+  ): Promise<void>;
+  // 解压资源上限(cpp/patch_core/archive_limits.h,与 Android/iOS 共用)。
+  /** 整包解压量与整包压缩比;超限时返回原因,否则 undefined */
+  checkUncompressedSize(
+    archiveBytes: number,
+    uncompressedBytes: number,
+  ): string | undefined;
+  /** 工作线程遍历刚解压的目录(不跟随符号链接),超限/保留名/符号链接时以原因 reject */
+  checkExtractedDirectory(directory: string, archiveBytes: number): Promise<void>;
+  /**
+   * 未知长度下载每个 chunk 写入前的磁盘探测计划。writtenBefore 是本次响应体
+   * 在该 chunk 之前已收到的字节数;knownTotal > 0 时从不探测。
+   */
+  planFreeSpaceProbe(
+    knownTotal: number,
+    writtenBefore: number,
+    chunkBytes: number,
+    reservedUntil: number,
+  ): FreeSpaceProbePlan;
   /** CRC32(zip/zlib 多项式)。pdiff 拷贝前与 copiesCrc 比对用 */
   crc32(data: Uint8Array | ArrayBuffer): number;
   /** 原生 patch 内核可消费的 diff 轨道版本(2 = hdiffv2 轨道) */
   getSupportedDiffVersion(): number;
 
-  // 更新流程决策层(cpp/update_flow_core,NATIVE_CHECKUPDATE_DESIGN §10):
-  // JSON 字符串进出,与决策层自身的边界一致。返回 undefined = 输入未通过
-  // 解析,编排器跳过本轮检测。
-  buildRequestBody(inputJson: string): string | undefined;
-  orderEndpointCandidates(
-    endpointsJson: string,
+  // 原生冷启动轮次(cpp/update_flow_core/native_round.h,与 Android/iOS 共用):
+  // JSON 字符串进出。返回 undefined = 内核拒收了输入,本轮失败。
+  // envJson 描述本次启动(字段见 native_round.h)。
+  /** {"body": 请求体文本, "query": 首个查询状态};配置不可运行时 undefined */
+  prepareRound(
+    configJson: string,
+    envJson: string,
     randomSample: number,
   ): string | undefined;
+  /**
+   * 下一步查询状态:带 "url"(及 "post")= 发这个请求后再调;"found" = 刚传入
+   * 的文本就是有效响应;都没有 = 查询结束。responseText 为 undefined 表示请求
+   * 失败或尚未发出。
+   */
+  nextQueryStep(
+    stateJson: string,
+    responseText: string | undefined,
+  ): string | undefined;
+  /** 决策(已按本机规划的 attempts)、要持久化的 hashInfo 与响应缓存文本 */
   handleResponse(
     responseText: string,
-    identityJson: string,
-    afterDownload: string,
+    configJson: string,
+    envJson: string,
+    requestBody: string,
+    responseAtSeconds: number,
   ): string | undefined;
-  // 响应 schema 门槛(update_flow_core::IsValidResponse):200 但只带
-  // `{"error":...}` 的节点算失败,不得阻止继续 fallback。
-  isValidResponse(responseText: string): boolean;
+
+  // 持久化的原生配置(cpp/update_flow_core/native_config.h,与 Android/iOS
+  // 共用)。undefined 视同空串:缺省配置。
+  /** C1 配置等价:同一配置的不同序列化。任一缺省即不等价。 */
+  configsEquivalent(a: string | undefined, b: string | undefined): boolean;
+  /**
+   * 轮次门槛:可运行时为 {"appKey": 去空白后的值},否则
+   * {"status": "skipped" | "failed", "reason": ...}。
+   */
+  runnableConfig(configJson: string | undefined): string;
+  /**
+   * 校验宿主 configure() 的选项(JSON 对象文本),返回要持久化的配置;
+   * 不合法时抛出 Error("Invalid native configuration: ...")。
+   */
+  normalizeConfiguration(optionsJson: string | undefined): string;
 }
 
 export default NativeCore as unknown as NativePatchCoreBindings;

package/harmony/pushy/src/main/ets/PushyConfiguration.ts

@@ -1,4 +1,4 @@
-import { POLICY_NEXT_LAUNCH, revealText } from './Texts';
+import NativePatchCore from './NativePatchCore';
 
 /** Options accepted by PushyFileJSBundleProvider.configure(). */
 export interface PushyConfiguration {
@@ -16,89 +16,12 @@ export interface PushyConfiguration {
   rn?: string;
 }
 
-interface PersistedPushyConfiguration {
-  appKey: string;
-  endpoints: string[];
-  queryUrls: string[];
-  afterDownload: string;
-  disabled: boolean;
-  packageVersion?: string;
-  rnu: string;
-  rn: string;
-}
-
-const DEFAULT_ENDPOINTS: string[] = [
-  revealText('3203e0c1bdd1270a372f18f8c2b6de7f4f2607f5b3d5b9817b592947e5cdefbc8a7e'),
-  revealText('3203e0c1bdd1270a372f18f8c2b6de7f4f2607f5f0daac9c644a620ae88ca1ad93'),
-];
-const DEFAULT_QUERY_URLS: string[] = [
-  revealText('3203e0c1bdd1270a253608fcd3fd9362476817f4f0d5a1996342631be3c2a3a9d779552507fdcde8928a6f512f5ce2ccbdc869404d2f1de79daa826d562c0913eec4fa9b7d4426'),
-  revealText('3203e0c1bdd1270a213b12b7dca09468462e12f3b0d5bd813d482446f4c6a1be8e79552507fdcda68cd06e5c3710e480a4867048483e55e0c2ab8d7d43030d1ce9c3b183214e2601f2f0d5b782601e2719e8ca'),
-];
-const CONFIG_KEYS: string[] = [
-  'appKey', 'endpoints', 'queryUrls', 'afterDownload', 'disabled',
-  'packageVersion', 'rnu', 'rn',
-];
-
-function configString(value: string, name: string, allowEmpty: boolean): string {
-  if (typeof value !== 'string' || (!allowEmpty && value.trim().length === 0)) {
-    throw new Error(`Invalid native configuration: ${name} must be a string${allowEmpty ? '' : ' and must not be blank'}`);
-  }
-  return value;
-}
-
-function configUrls(values: string[], name: string, base: boolean): string[] {
-  if (!Array.isArray(values) || (base && values.length === 0)) {
-    throw new Error(`Invalid native configuration: ${name} must be ${base ? 'a non-empty' : 'an'} array`);
-  }
-  const result: string[] = [];
-  for (const value of values) {
-    const url = configString(value, name, false).trim();
-    // Restrict the authority and scheme, without relying on browser URL globals
-    // unavailable in ArkTS. Platform networking performs the final URL parsing.
-    if (!/^https?:\/\/(\[[0-9a-fA-F:]+\]|[a-zA-Z0-9.-]+)(:[0-9]+)?([/?#]|$)/.test(url)
-        || /\s|\\/.test(url) || (base && /[?#]/.test(url))) {
-      throw new Error(`Invalid native configuration: ${name} requires absolute HTTP(S) URLs without credentials${base ? ', queries or fragments' : ''}`);
-    }
-    const normalized = base ? url.replace(/\/+$/, '') : url;
-    if (!result.includes(normalized)) {
-      result.push(normalized);
-    }
-  }
-  return result;
-}
-
-/** Pure validation, before any native state is touched. Does not mutate options. */
+/**
+ * Pure validation, before any native state is touched. Does not mutate options.
+ * The rules and defaults are the shared core's (cpp/update_flow_core
+ * NormalizeConfiguration, also used by Android and iOS); it throws
+ * Error("Invalid native configuration: ...") for options the host must fix.
+ */
 export function normalizePushyConfiguration(options: PushyConfiguration): string {
-  if (!options || typeof options !== 'object' || Array.isArray(options)) {
-    throw new Error('Invalid native configuration: expected an object');
-  }
-  for (const key of Object.keys(options)) {
-    if (!CONFIG_KEYS.includes(key)) {
-      throw new Error(`Invalid native configuration: unknown option ${key}`);
-    }
-  }
-  const appKey = configString(options.appKey, 'appKey', false);
-  const customEndpoints = options.endpoints !== undefined;
-  const endpoints = configUrls(customEndpoints ? options.endpoints! : DEFAULT_ENDPOINTS, 'endpoints', true);
-  const queryUrls = configUrls(
-    options.queryUrls !== undefined ? options.queryUrls : (customEndpoints ? [] : DEFAULT_QUERY_URLS),
-    'queryUrls', false,
-  );
-  const afterDownload = options.afterDownload === undefined ? 'none' : options.afterDownload;
-  if (afterDownload !== 'none' && afterDownload !== POLICY_NEXT_LAUNCH) {
-    throw new Error(`Invalid native configuration: afterDownload must be none or ${POLICY_NEXT_LAUNCH}`);
-  }
-  if (options.disabled !== undefined && typeof options.disabled !== 'boolean') {
-    throw new Error('Invalid native configuration: disabled must be a boolean');
-  }
-  const result: PersistedPushyConfiguration = {
-    appKey, endpoints, queryUrls, afterDownload, disabled: options.disabled ?? false,
-    rnu: options.rnu === undefined ? '' : configString(options.rnu, 'rnu', true),
-    rn: options.rn === undefined ? '' : configString(options.rn, 'rn', true),
-  };
-  if (options.packageVersion !== undefined) {
-    result.packageVersion = configString(options.packageVersion, 'packageVersion', false);
-  }
-  return JSON.stringify(result);
+  return NativePatchCore.normalizeConfiguration(JSON.stringify(options));
 }