react-native-update 10.59.1 → 10.60.0

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

@@ -6,10 +6,12 @@ import type { UpdateContext } from './UpdateContext';
 import { BundlePreparationRound, bundlePreparationResult } from './BundlePreparationResult';
 import type { BundlePreparationResult } from './BundlePreparationResult';
 import { isSafePathComponent } from './PathUtils';
-import { QUERY_PATH, STATUS_NONE } from './Texts';
+import { STATUS_NONE } from './Texts';
 import { monotonicNowMs } from './MonotonicClock';
 import {
+  ERROR_DELTA_FAILED,
   ERROR_DOWNLOAD_FAILED,
+  PushyError,
   createPushyError,
   getErrorMessage,
 } from './ErrorCodes';
@@ -38,38 +40,26 @@ const DOWNLOAD_PHASE_TIMEOUT_MS = 10 * 60 * 1000;
 const DOWNLOAD_TYPE_DIFF = 'diff';
 const DOWNLOAD_TYPE_PDIFF = 'pdiff';
 
-interface NativeConfig {
-  appKey?: string;
-  packageVersion?: string;
-  endpoints?: string[];
-  queryUrls?: string[];
-  afterDownload?: string;
-  rnu?: string;
-  rn?: string;
-  disabled?: boolean;
-}
-
-interface FlowIdentity {
+// 本次启动的事实,交给共享内核(cpp/update_flow_core/native_round.h)。
+interface RoundEnv {
   packageVersion: string;
-  currentVersion?: string;
+  currentVersion: string;
   uuid: string;
-  rolledBackVersion?: string;
+  rolledBackVersion: string;
+  buildTime: string;
+  os: string;
+  bundleHash: string;
 }
 
-interface FlowCInfo {
-  rnu: string;
-  rn: string;
-  os: string;
-  uuid: string;
+interface PreparedRound {
+  body: string;
+  query: Object;
 }
 
-interface FlowInput {
-  packageVersion: string;
-  currentVersion?: string;
-  buildTime: string;
-  cInfo: FlowCInfo;
-  supportedDiffVersion: number;
-  bundleHash: string;
+interface QueryStep {
+  url?: string;
+  post?: boolean;
+  found?: boolean;
 }
 
 interface DecisionAttempt {
@@ -77,35 +67,16 @@ interface DecisionAttempt {
   urls?: string[];
 }
 
-interface DecisionInfoConfig {
-  forceBoot?: boolean;
-}
-
-interface DecisionInfo {
-  name?: string;
-  description?: string;
-  metaInfo?: string;
-  // 服务端按版本下发的配置(forceBoot = 救砖指令)。
-  config?: DecisionInfoConfig;
-  // 写进 hash 信息:这个版本是被救援通道送进来的,JS 在 markSuccess 时据此
-  // 上报 forceBootRescue 回执(与 Android/iOS 一致)。
-  forceBootRescue?: boolean;
-}
-
 interface Decision {
   action?: string;
   reason?: string;
   hash?: string;
   attempts?: DecisionAttempt[];
   activate?: boolean;
-  info?: DecisionInfo;
-}
-
-interface RespCacheEntry {
-  ts: number;
-  body: string;
-  request: string;
-  config: string;
+  // 要与版本一起持久化的元信息(JS 侧 setLocalHashInfo;forceBootRescue 由内核标记)。
+  hashInfo?: Object;
+  // 供 JS 复用的响应缓存文本(§10.3)。
+  cache?: string;
 }
 
 let scheduled = false;
@@ -137,28 +108,37 @@ function startNativeRound(
   });
 }
 
+interface ConfigRead {
+  json: string;
+  /** Set when the persisted configuration cannot start a round. */
+  rejection?: BundlePreparationResult;
+}
+
+// The single configuration gate shared by the preflight, the host API and
+// the round itself, so the three can never disagree about what is runnable.
+// The verdict is the shared core's (cpp/update_flow_core ParseRunnableConfig,
+// also used by Android and iOS).
+interface RunnableVerdict {
+  status?: string;
+  reason?: string;
+}
+
+function readNativeConfig(context: UpdateContext): ConfigRead {
+  const json = context.getKv(KEY_CONFIG);
+  const verdict = JSON.parse(NativePatchCore.runnableConfig(json)) as RunnableVerdict;
+  if (verdict.status !== undefined) {
+    return {
+      json,
+      rejection: bundlePreparationResult(verdict.status, verdict.reason ?? ''),
+    };
+  }
+  return { json };
+}
+
 // A preflight skip must not consume the process's only round: configuration
 // may arrive after the delayed startup timer on a first-ever launch.
 function configurationError(context: UpdateContext): BundlePreparationResult | undefined {
-  const json = context.getKv(KEY_CONFIG);
-  if (!json) {
-    return bundlePreparationResult('skipped', 'not_configured');
-  }
-  try {
-    const config = JSON.parse(json) as NativeConfig;
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      return bundlePreparationResult('failed', 'invalid_config');
-    }
-    if (config.disabled) {
-      return bundlePreparationResult('skipped', 'disabled');
-    }
-    if (typeof config.appKey !== 'string' || config.appKey.trim().length === 0) {
-      return bundlePreparationResult('failed', 'invalid_config');
-    }
-  } catch (e) {
-    return bundlePreparationResult('failed', 'invalid_config');
-  }
-  return undefined;
+  return readNativeConfig(context).rejection;
 }
 
 export async function prepareBundleNative(
@@ -167,24 +147,11 @@ export async function prepareBundleNative(
   if (scheduledContext !== context) {
     return bundlePreparationResult('skipped', 'not_initialized');
   }
-  const configJson = context.getKv(KEY_CONFIG);
-  if (!configJson) {
-    return bundlePreparationResult('skipped', 'not_configured');
-  }
-  try {
-    const config = JSON.parse(configJson) as NativeConfig;
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      return bundlePreparationResult('failed', 'invalid_config');
-    }
-    if (config.disabled) {
-      return bundlePreparationResult('skipped', 'disabled');
-    }
-    if (typeof config.appKey !== 'string' || !config.appKey) {
-      return bundlePreparationResult('failed', 'invalid_config');
-    }
-  } catch (e) {
-    return bundlePreparationResult('failed', 'invalid_config');
+  const read = readNativeConfig(context);
+  if (read.rejection !== undefined) {
+    return read.rejection;
   }
+  const configJson = read.json;
   const result = await startNativeRound(context, scheduledRollback);
   if (roundConfigGeneration !== context.getNativeConfigGeneration()
       || configJson !== roundConfigJson || configJson !== context.getKv(KEY_CONFIG)) {
@@ -205,13 +172,11 @@ export function recordJsRound(config: string): void {
   jsCompletedConfig = config;
 }
 
-// JS 已用与原生完全相同的配置拿到有效响应(§10.3):延迟轮次就是一次重复请求。
+// JS 已用与原生等价的配置(C1:规范形式相同,而非逐字相同——宿主持有的配置
+// 与 JS 序列化格式不同)拿到有效响应(§10.3):延迟轮次就是一次重复请求。
 // 只有计划内的轮次会问这个问题——JS 没起来、启动即崩、检查失败时都不会有信号。
 function hasJsRound(context: UpdateContext): boolean {
-  return (
-    jsCompletedConfig !== undefined &&
-    jsCompletedConfig === context.getKv(KEY_CONFIG)
-  );
+  return !!jsCompletedConfig && context.isStoredNativeConfig(jsCompletedConfig);
 }
 
 export function scheduleNativeSync(
@@ -252,33 +217,13 @@ async function runOnce(
   roundGeneration = resetGeneration;
   roundConfigGeneration = context.getNativeConfigGeneration();
   roundResult = bundlePreparationResult('failed', 'check_failed');
-  const configJson = context.getKv(KEY_CONFIG);
-  roundConfigJson = configJson;
-  if (!configJson) {
-    // No persisted configuration: report the rollout gate to native callers.
-    roundResult = bundlePreparationResult('skipped', 'not_configured');
-    return;
-  }
-  let config: NativeConfig;
-  try {
-    config = JSON.parse(configJson) as NativeConfig;
-    if (!config || typeof config !== 'object' || Array.isArray(config)) {
-      roundResult = bundlePreparationResult('failed', 'invalid_config');
-      return;
-    }
-  } catch (e) {
-    roundResult = bundlePreparationResult('failed', 'invalid_config');
-    return;
-  }
-  if (config.disabled) {
-    roundResult = bundlePreparationResult('skipped', 'disabled');
-    return;
-  }
-  const appKey = config.appKey ?? '';
-  if (!appKey) {
-    roundResult = bundlePreparationResult('failed', 'invalid_config');
+  const read = readNativeConfig(context);
+  roundConfigJson = read.json;
+  if (read.rejection !== undefined) {
+    roundResult = read.rejection;
     return;
   }
+  const configJson = read.json;
   // 从这里起本轮开始做真实工作:留下面包屑,死于轮中时下次启动零延迟续传。
   logger.info(
     TAG,
@@ -296,8 +241,6 @@ async function runOnce(
       launchRolledBackVersion,
       resetGeneration,
       configJson,
-      config,
-      appKey,
     );
   } finally {
     try {
@@ -309,103 +252,84 @@ async function runOnce(
   }
 }
 
-// 配置端点全为 https 时,网络下发的端点列表/制品 URL 一律拒绝明文 http:
-// @ohos.net.http 内部跟随重定向且不暴露最终 URL,这是鸿蒙侧唯一能做的
-// https→http 降级防线(SR-1);其余依赖宿主 network_config.json 的
-// cleartextTrafficPermitted:false(见 harmony/pushy/src/README.md)。
-function isHttpsOnly(config: NativeConfig): boolean {
-  const endpoints = config.endpoints ?? [];
-  return (
-    endpoints.length > 0 &&
-    endpoints.every(endpoint => isHttpsUrl(endpoint))
-  );
-}
-
-function isHttpsUrl(url: string): boolean {
-  return typeof url === 'string' && url.toLowerCase().startsWith('https://');
-}
-
-function isCleartextUrl(url: string): boolean {
-  return typeof url === 'string' && url.toLowerCase().startsWith('http://');
-}
-
 async function runConfiguredRound(
   context: UpdateContext,
   launchRolledBackVersion: string,
   resetGeneration: number,
   configJson: string,
-  config: NativeConfig,
-  appKey: string,
 ): Promise<void> {
   const currentVersion = context.getCurrentVersion();
-  // getConstants consumes the persisted rollback marker during startup; use
-  // the launch-path snapshot captured before that happens.
-  const rolledBackVersion = launchRolledBackVersion;
-  const uuid = context.getKv('uuid') ?? '';
-  const packageVersion = config.packageVersion || context.getPackageVersion();
-
-  const identity: FlowIdentity = {
-    packageVersion,
+  const env: RoundEnv = {
+    packageVersion: context.getPackageVersion(),
+    // 与 JS 常量同形(无版本时为 ''),JS 才能复用这次请求的响应缓存。
     currentVersion,
-    uuid,
-  };
-  if (rolledBackVersion) {
-    identity.rolledBackVersion = rolledBackVersion;
-  }
-
-  const cInfo: FlowCInfo = {
-    rnu: config.rnu ?? '',
-    rn: config.rn ?? '',
+    uuid: context.getKv('uuid') ?? '',
+    // getConstants consumes the persisted rollback marker during startup; use
+    // the launch-path snapshot captured before that happens.
+    rolledBackVersion: launchRolledBackVersion,
+    buildTime: context.getBuildTime(),
     // RNOH's Platform.Version is osFullName; use the same value so JS can
     // reuse the response cache produced by this native request.
     os: `harmony ${deviceInfo.osFullName}`,
-    uuid,
-  };
-
-  const input: FlowInput = {
-    packageVersion: identity.packageVersion,
-    currentVersion,
-    buildTime: context.getBuildTime(),
-    cInfo,
-    supportedDiffVersion: NativePatchCore.getSupportedDiffVersion(),
     bundleHash: await context.getBundleHash(),
   };
-  const body = NativePatchCore.buildRequestBody(JSON.stringify(input));
-  if (!body) {
+  const envJson = JSON.stringify(env);
+  const preparedJson = NativePatchCore.prepareRound(configJson, envJson, Math.random());
+  if (!preparedJson) {
     roundResult = bundlePreparationResult('failed', 'invalid_request');
     return;
   }
-
-  const httpsOnly = isHttpsOnly(config);
-  const responseText = await runQueryRequest(config, appKey, body, httpsOnly);
+  const prepared = JSON.parse(preparedJson) as PreparedRound;
+  const responseText = await runQueryRequest(
+    JSON.stringify(prepared.query),
+    prepared.body,
+  );
   if (!responseText) {
     logger.warn(TAG, 'no endpoint reachable, giving up until next launch');
     return;
   }
-  // Anchor cache freshness to response arrival, before download/patch work.
-  const responseAtSeconds = Math.floor(Date.now() / 1000);
-
+  // 规划好的 attempts、hashInfo 与响应缓存(时间戳取响应到达时)都来自共享内核。
   const decisionJson = NativePatchCore.handleResponse(
     responseText,
-    JSON.stringify(identity),
-    config.afterDownload ?? '',
+    configJson,
+    envJson,
+    prepared.body,
+    Math.floor(Date.now() / 1000),
   );
   if (!decisionJson) {
     roundResult = bundlePreparationResult('failed', 'invalid_response');
     return;
   }
   const decision = JSON.parse(decisionJson) as Decision;
-  if (decision.action !== 'download') {
+  const responseCacheJson = decision.cache ?? '';
+  // Commits the round's persistent outcome (see commitSyncResult) and maps
+  // it to the round result; a reset during the round wins over `result`.
+  const commit = async (
+    hash: string,
+    hashInfoJson: string,
+    activate: boolean,
+    result: BundlePreparationResult,
+  ): Promise<boolean> => {
     const committed = await context.commitSyncResult(
       resetGeneration,
+      hash,
+      hashInfoJson,
+      activate,
+      responseCacheJson,
+    );
+    roundResult = committed
+      ? result
+      : bundlePreparationResult('cancelled', 'reset');
+    return committed;
+  };
+
+  if (decision.action !== 'download') {
+    await commit(
       '',
       '',
       false,
-      buildResponseCacheJson(configJson, body, responseText, responseAtSeconds),
+      bundlePreparationResult(STATUS_NONE, decision.reason ?? ''),
     );
-    roundResult = committed
-      ? bundlePreparationResult(STATUS_NONE, decision.reason ?? '')
-      : bundlePreparationResult('cancelled', 'reset');
     logger.info(TAG, `nothing to do (${decision.reason ?? ''})`);
     return;
   }
@@ -426,46 +350,15 @@ async function runConfiguredRound(
       decision.attempts ?? [],
       hash,
       currentVersion,
-      httpsOnly,
     );
   }
   if (!downloaded) {
     logger.warn(TAG, `all download attempts for ${hash} failed`);
-    const committed = await context.commitSyncResult(
-      resetGeneration,
-      '',
-      '',
-      false,
-      buildResponseCacheJson(configJson, body, responseText, responseAtSeconds),
-    );
-    roundResult = committed
-      ? bundlePreparationResult('failed', 'download_failed')
-      : bundlePreparationResult('cancelled', 'reset');
+    await commit('', '', false, bundlePreparationResult('failed', 'download_failed'));
     return;
   }
 
-  // 与 JS 侧下载成功后的 setLocalHashInfo 对齐,持久化版本元信息。
-  const info = decision.info;
-  let hashInfoJson = '';
-  if (info) {
-    const hashInfo: DecisionInfo = {};
-    if (typeof info.name === 'string') {
-      hashInfo.name = info.name;
-    }
-    if (typeof info.description === 'string') {
-      hashInfo.description = info.description;
-    }
-    if (typeof info.metaInfo === 'string') {
-      hashInfo.metaInfo = info.metaInfo;
-    }
-    // forceBoot 激活就是救砖路径:记进持久化元信息,这个版本活到 markSuccess
-    // 时 JS 上报 forceBootRescue。只认服务端下发的指令——静默策略的激活是
-    // 普通投递(Android/iOS 同一规则)。
-    if (info.config && info.config.forceBoot) {
-      hashInfo.forceBootRescue = true;
-    }
-    hashInfoJson = JSON.stringify(hashInfo);
-  }
+  const hashInfoJson = JSON.stringify(decision.hashInfo);
 
   // 版本元信息、激活与响应缓存一次性原子提交(见 commitSyncResult);
   // 缓存只在原生文件/状态工作结束后公开,避免 JS 观察到响应后并发下载。
@@ -473,12 +366,11 @@ async function runConfiguredRound(
   const activate = decision.activate === true;
   let committed = false;
   try {
-    committed = await context.commitSyncResult(
-      resetGeneration,
+    committed = await commit(
       hash,
       hashInfoJson,
       activate,
-      buildResponseCacheJson(configJson, body, responseText, responseAtSeconds),
+      bundlePreparationResult('downloaded', '', hash, activate),
     );
   } catch (e) {
     logger.error(TAG, `commit failed: ${getErrorMessage(e)}`);
@@ -492,35 +384,6 @@ async function runConfiguredRound(
   } else {
     logger.info(TAG, `downloaded ${hash}, activation left to JS`);
   }
-  roundResult = committed
-    ? bundlePreparationResult('downloaded', '', hash, activate)
-    : bundlePreparationResult('cancelled', 'reset');
-}
-
-function buildResponseCacheJson(
-  configJson: string,
-  requestBody: string,
-  responseText: string,
-  responseAtSeconds: number,
-): string {
-  const cacheEntry: RespCacheEntry = {
-    ts: responseAtSeconds,
-    body: responseText,
-    request: requestBody,
-    config: configJson,
-  };
-  return JSON.stringify(cacheEntry);
-}
-
-function isValidResponse(responseText: string | undefined): boolean {
-  if (responseText === undefined) {
-    return false;
-  }
-  try {
-    return NativePatchCore.isValidResponse(responseText);
-  } catch (e) {
-    return false;
-  }
 }
 
 async function httpRequest(
@@ -568,92 +431,32 @@ async function httpRequest(
   }
 }
 
-// 顺序回退(§5.1):按纯层给出的候选序逐个请求,单请求超时;整轮失败后经
-// queryUrls 发现远程候选(排除已试过的)再来一轮。刻意不做 hedged race——
-// 该路径对延迟不敏感。
+// 顺序回退(§5.1):按共享内核给出的下一步逐个请求,单请求超时
+// (NativePatchCore.nextQueryStep:候选序、queryUrls 发现、远程端点的 https
+// 门槛、请求预算、响应 schema)。刻意不做 hedged race——该路径对延迟不敏感。
 async function runQueryRequest(
-  config: NativeConfig,
-  appKey: string,
+  query: string,
   body: string,
-  httpsOnly: boolean,
 ): Promise<string | undefined> {
-  const orderedJson = NativePatchCore.orderEndpointCandidates(
-    JSON.stringify(config.endpoints ?? []),
-    Math.random(),
-  );
-  if (!orderedJson) {
-    return undefined;
-  }
-  const ordered = JSON.parse(orderedJson) as string[];
-  const tried = new Set<string>();
-  let httpAttempts = 0;
-  for (const rawBase of ordered) {
-    const base = normalizeEndpointBase(rawBase);
-    if (!base || tried.has(base)) {
-      continue;
+  let state: string | undefined = query;
+  let text: string | undefined = undefined;
+  while (state !== undefined) {
+    state = NativePatchCore.nextQueryStep(state, text);
+    if (state === undefined) {
+      break;
     }
-    if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
-      return undefined;
+    const step = JSON.parse(state) as QueryStep;
+    if (step.found) {
+      return text;
     }
-    tried.add(base);
-    const response = await httpRequest(`${base}${QUERY_PATH}${appKey}`, body);
-    if (isValidResponse(response)) {
-      return response;
+    if (!step.url) {
+      break;
     }
-  }
-  for (const listUrl of config.queryUrls ?? []) {
-    if (!listUrl) {
-      continue;
-    }
-    if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
-      return undefined;
-    }
-    const listText = await httpRequest(listUrl);
-    if (listText === undefined) {
-      continue;
-    }
-    let remote: string[];
-    try {
-      const parsed = JSON.parse(listText) as Object;
-      if (!Array.isArray(parsed)) {
-        continue;
-      }
-      remote = parsed as string[];
-    } catch (e) {
-      continue;
-    }
-    for (const rawBase of remote) {
-      if (typeof rawBase !== 'string') {
-        continue;
-      }
-      const base = normalizeEndpointBase(rawBase);
-      if (!base || tried.has(base)) {
-        continue;
-      }
-      if (httpsOnly && !isHttpsUrl(base)) {
-        // 远程注入的端点不得把 https 配置降级成明文。
-        logger.warn(TAG, `ignoring non-https remote endpoint ${base}`);
-        continue;
-      }
-      if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
-        return undefined;
-      }
-      tried.add(base);
-      const response = await httpRequest(`${base}${QUERY_PATH}${appKey}`, body);
-      if (isValidResponse(response)) {
-        return response;
-      }
-    }
-    // 拉到一份可解析的远程列表就够了。
-    break;
+    text = await httpRequest(step.url, step.post ? body : undefined);
   }
   return undefined;
 }
 
-function normalizeEndpointBase(base: string): string {
-  return base.replace(/\/+$/, '');
-}
-
 async function runWithinDeadline(
   start: () => Promise<void>,
   deadlineUptimeMs: number,
@@ -691,16 +494,11 @@ async function performAttempts(
   attempts: DecisionAttempt[],
   hash: string,
   originHash: string,
-  httpsOnly: boolean,
 ): Promise<boolean> {
   const incrementalDeadline = monotonicNowMs() + DOWNLOAD_PHASE_TIMEOUT_MS;
   let fullDeadline = 0;
   for (const attempt of attempts) {
     const type = attempt.type ?? '';
-    if (type === DOWNLOAD_TYPE_DIFF && !originHash) {
-      // diff 以当前运行版本为源;没有运行中的热更版本就跳过。
-      continue;
-    }
     const isFullAttempt =
       type !== DOWNLOAD_TYPE_DIFF && type !== DOWNLOAD_TYPE_PDIFF;
     if (isFullAttempt && fullDeadline === 0) {
@@ -710,14 +508,6 @@ async function performAttempts(
     }
     const deadline = isFullAttempt ? fullDeadline : incrementalDeadline;
     for (const url of attempt.urls ?? []) {
-      if (!url) {
-        continue;
-      }
-      if (httpsOnly && isCleartextUrl(url)) {
-        // 决策里的明文制品 URL 不得把 https 配置降级(SR-1)。
-        logger.warn(TAG, `ignoring cleartext ${type} url ${url}`);
-        continue;
-      }
       if (monotonicNowMs() >= deadline) {
         if (isFullAttempt) {
           return false;
@@ -744,8 +534,19 @@ async function performAttempts(
         return true;
       } catch (e) {
         logger.warn(TAG, `${type} attempt failed: ${getErrorMessage(e)}`);
+        if (!isMirrorRetryable(e)) {
+          // The bytes arrived but could not be applied: every mirror serves
+          // the same artifact, so move on to the next strategy instead of
+          // re-downloading it (update_flow_core IsMirrorRetryableCode, JS
+          // client.ts isMirrorRetryableCode).
+          break;
+        }
       }
     }
   }
   return false;
 }
+
+function isMirrorRetryable(error: unknown): boolean {
+  return !(error instanceof PushyError && error.code === ERROR_DELTA_FAILED);
+}

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

@@ -13,12 +13,8 @@ export function revealText(hex: string): string {
   return text;
 }
 
-// Request path appended to an endpoint base.
-export const QUERY_PATH: string = revealText('7514fcd4ad805d55263e08fc99');
-
 // Protocol values, version-info flags and storage names, stored encoded.
 export const STATUS_NONE: string = revealText('3418c1c1aa8a7c40');
-export const POLICY_NEXT_LAUNCH: string = revealText('2912e0ffab8e6c70323b1dedd3');
 export const STORAGE_DIR_NAME: string = revealText('0502e4d5af9f6d');
 export const PREFERENCES_NAME: string = revealText('2f07f0d0ba8e');
 export const PPK_DELTA_SUFFIX: string = revealText('7407e4dae09b69512137');