react-native-update 10.59.0 → 10.59.2

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

@@ -10,9 +10,9 @@ import { UpdateContext } from './UpdateContext';
 import { EventHub } from './EventHub';
 import {
   KEY_CONFIG,
-  markJsCheckCompleted,
+  recordJsRound,
   KEY_RESP_CACHE,
-} from './NativeCheckOrchestrator';
+} from './SyncCoordinator';
 import {
   ERROR_FILE_OPERATION_FAILED,
   ERROR_INVALID_HASH_INFO,
@@ -22,10 +22,11 @@ import {
   ERROR_RESTART_FAILED,
   ERROR_SWITCH_VERSION_FAILED,
   ERROR_UNSUPPORTED_PLATFORM,
-  createUpdateError,
+  createPushyError,
   getErrorMessage,
-  toUpdateError,
+  toPushyError,
 } from './ErrorCodes';
+import { DEVTOOLS_RESTART_EVENT, DEVTOOLS_RESTART_REASON, STORAGE_DIR_NAME } from './Texts';
 
 export { getErrorMessage } from './ErrorCodes';
 
@@ -41,13 +42,13 @@ interface RestartableApplicationContext {
   restartApp?: (want: RestartWant) => void;
 }
 
-interface ReloadEventEmitter {
+interface RestartEventEmitter {
   emit(event: string, payload: Object): void;
 }
 
 // RNOH 的 devToolsController 不在公开的 UITurboModuleContext 类型里。
 interface DevToolsControllerHolder {
-  devToolsController?: { eventEmitter: ReloadEventEmitter };
+  devToolsController?: { eventEmitter: RestartEventEmitter };
 }
 
 export function validateHashInfo(info: string): void {
@@ -59,7 +60,7 @@ export function validateHashInfo(info: string): void {
     valid = false;
   }
   if (!valid) {
-    throw createUpdateError(ERROR_INVALID_HASH_INFO, 'invalid json string');
+    throw createPushyError(ERROR_INVALID_HASH_INFO, 'invalid json string');
   }
 }
 
@@ -96,7 +97,7 @@ export class PushyTurboModule extends UITurboModule {
 
   private requireHash(hash: string, methodName: string): string {
     if (!hash) {
-      throw createUpdateError(
+      throw createPushyError(
         ERROR_INVALID_OPTIONS,
         `${methodName}: empty hash`,
       );
@@ -104,11 +105,11 @@ export class PushyTurboModule extends UITurboModule {
     return hash;
   }
 
-  private softReload(): void {
+  private softRestart(): void {
     const holder = this.ctx as unknown as DevToolsControllerHolder;
     const devToolsController = holder.devToolsController;
     if (devToolsController) {
-      devToolsController.eventEmitter.emit('RELOAD', { reason: 'HotReload2' });
+      devToolsController.eventEmitter.emit(DEVTOOLS_RESTART_EVENT, { reason: DEVTOOLS_RESTART_REASON });
     }
   }
 
@@ -146,10 +147,10 @@ export class PushyTurboModule extends UITurboModule {
 
   private async reloadBridge(): Promise<void> {
     if (this.ctx.isDebugModeEnabled) {
-      logger.debug(TAG, 'reloadBridge via devToolsController RELOAD (debug mode)');
-      this.softReload();
+      logger.debug(TAG, 'restart via devToolsController (debug mode)');
+      this.softRestart();
     } else {
-      logger.debug(TAG, 'reloadBridge via restartAbility (release mode)');
+      logger.debug(TAG, 'restart via restartAbility (release mode)');
       // If the process truly restarts, this timer dies with it. It only fires
       // when the app is still alive after 1.5s — i.e. restartApp resolved but
       // was silently suppressed (HarmonyOS rate-limits restarts within a few
@@ -157,16 +158,16 @@ export class PushyTurboModule extends UITurboModule {
       // soft reload must take over. So the timer is NOT cleared on the success
       // path, only in the catch branch where the soft reload runs immediately.
       const fallbackTimer = setTimeout(() => {
-        logger.warn(TAG, 'restartAbility did not restart the app within 1.5s, triggering soft reload fallback');
-        this.softReload();
+        logger.warn(TAG, 'restartAbility did not restart the app within 1.5s, triggering soft restart fallback');
+        this.softRestart();
       }, 1500);
 
       try {
         await this.restartAbility();
       } catch (error) {
         clearTimeout(fallbackTimer);
-        logger.error(TAG, `restartAbility failed: ${getErrorMessage(error)}, triggering soft reload fallback`);
-        this.softReload();
+        logger.error(TAG, `restartAbility failed: ${getErrorMessage(error)}, triggering soft restart fallback`);
+        this.softRestart();
       }
     }
   }
@@ -193,7 +194,7 @@ export class PushyTurboModule extends UITurboModule {
     }
 
     const result = {
-      downloadRootDir: `${this.mUiCtx.filesDir}/_update`,
+      downloadRootDir: `${this.mUiCtx.filesDir}/${STORAGE_DIR_NAME}`,
       currentVersionInfo,
       currentBundleSha256,
       packageVersion,
@@ -232,7 +233,7 @@ export class PushyTurboModule extends UITurboModule {
     try {
       await this.context.setKv(`hash_${hash}`, info);
     } catch (error) {
-      throw toUpdateError(error, ERROR_FILE_OPERATION_FAILED);
+      throw toPushyError(error, ERROR_FILE_OPERATION_FAILED);
     }
   }
 
@@ -253,7 +254,7 @@ export class PushyTurboModule extends UITurboModule {
     try {
       await this.context.setKv('uuid', uuid);
     } catch (error) {
-      throw toUpdateError(error, ERROR_FILE_OPERATION_FAILED);
+      throw toPushyError(error, ERROR_FILE_OPERATION_FAILED);
     }
   }
 
@@ -267,7 +268,7 @@ export class PushyTurboModule extends UITurboModule {
     try {
       JSON.parse(config);
     } catch (e) {
-      throw createUpdateError(
+      throw createPushyError(
         ERROR_INVALID_OPTIONS,
         `syncNativeConfig: config is not valid JSON: ${getErrorMessage(e)}`,
       );
@@ -275,7 +276,7 @@ export class PushyTurboModule extends UITurboModule {
     try {
       await this.context.setNativeConfig(config);
     } catch (error) {
-      throw toUpdateError(error, ERROR_FILE_OPERATION_FAILED);
+      throw toPushyError(error, ERROR_FILE_OPERATION_FAILED);
     }
   }
 
@@ -283,12 +284,12 @@ export class PushyTurboModule extends UITurboModule {
   async markJsCheckCompleted(config: string): Promise<void> {
     logger.debug(TAG, ',call markJsCheckCompleted');
     if (typeof config !== 'string' || config.length === 0) {
-      throw createUpdateError(
+      throw createPushyError(
         ERROR_INVALID_OPTIONS,
         'config must be a non-empty string',
       );
     }
-    markJsCheckCompleted(config);
+    recordJsRound(config);
   }
 
   // 原生冷启动检测落盘的原始响应缓存,JS 侧新鲜期内直接复用免二次请求
@@ -299,22 +300,22 @@ export class PushyTurboModule extends UITurboModule {
   }
 
   async reloadUpdate(options: { hash: string }): Promise<void> {
-    logger.debug(TAG, ',call reloadUpdate');
-    const hash = this.requireHash(options.hash, 'reloadUpdate');
+    logger.debug(TAG, ',call switch and restart');
+    const hash = this.requireHash(options.hash, 'switch and restart');
 
     // 切换必须真正落盘(switchVersion 内 await flush)后才重启:重启会立刻
     // 杀进程,未落盘的切换就是"重启回旧 bundle"。
     try {
       await this.context.switchVersion(hash);
     } catch (error) {
-      logger.error(TAG, `reloadUpdate switch failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_SWITCH_VERSION_FAILED);
+      logger.error(TAG, `switch failed: ${getErrorMessage(error)}`);
+      throw toPushyError(error, ERROR_SWITCH_VERSION_FAILED);
     }
     try {
       await this.reloadBridge();
     } catch (error) {
-      logger.error(TAG, `reloadUpdate restart failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_RESTART_FAILED);
+      logger.error(TAG, `restart failed: ${getErrorMessage(error)}`);
+      throw toPushyError(error, ERROR_RESTART_FAILED);
     }
   }
 
@@ -324,19 +325,19 @@ export class PushyTurboModule extends UITurboModule {
       await this.reloadBridge();
     } catch (error) {
       logger.error(TAG, `restartApp failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_RESTART_FAILED);
+      throw toPushyError(error, ERROR_RESTART_FAILED);
     }
   }
 
   async setNeedUpdate(options: { hash: string }): Promise<void> {
-    logger.debug(TAG, ',call setNeedUpdate');
-    const hash = this.requireHash(options.hash, 'setNeedUpdate');
+    logger.debug(TAG, ',call select for next launch');
+    const hash = this.requireHash(options.hash, 'select for next launch');
 
     try {
       await this.context.switchVersion(hash);
     } catch (error) {
-      logger.error(TAG, `setNeedUpdate failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_SWITCH_VERSION_FAILED);
+      logger.error(TAG, `select for next launch failed: ${getErrorMessage(error)}`);
+      throw toPushyError(error, ERROR_SWITCH_VERSION_FAILED);
     }
   }
 
@@ -346,7 +347,7 @@ export class PushyTurboModule extends UITurboModule {
       await this.context.markSuccess();
     } catch (error) {
       logger.error(TAG, `markSuccess failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_MARK_SUCCESS_FAILED);
+      throw toPushyError(error, ERROR_MARK_SUCCESS_FAILED);
     }
   }
 
@@ -367,7 +368,7 @@ export class PushyTurboModule extends UITurboModule {
       await this.context.resetToPackagedBundle();
     } catch (error) {
       logger.error(TAG, `resetToPackagedBundle failed: ${getErrorMessage(error)}`);
-      throw toUpdateError(error, ERROR_RESET_FAILED);
+      throw toPushyError(error, ERROR_RESET_FAILED);
     }
   }
 
@@ -376,7 +377,7 @@ export class PushyTurboModule extends UITurboModule {
     hash: string;
     originHash: string;
   }): Promise<void> {
-    logger.debug(TAG, ',call downloadPatchFromPpk');
+    logger.debug(TAG, ',call fetch ppk delta');
     return this.context.downloadPatchFromPpk(
       options.updateUrl,
       options.hash,
@@ -388,7 +389,7 @@ export class PushyTurboModule extends UITurboModule {
     updateUrl: string;
     hash: string;
   }): Promise<void> {
-    logger.debug(TAG, ',call downloadPatchFromPackage');
+    logger.debug(TAG, ',call fetch package delta');
     return this.context.downloadPatchFromPackage(
       options.updateUrl,
       options.hash,
@@ -399,7 +400,7 @@ export class PushyTurboModule extends UITurboModule {
     updateUrl: string;
     hash: string;
   }): Promise<void> {
-    logger.debug(TAG, ',call downloadFullUpdate');
+    logger.debug(TAG, ',call fetch full package');
     return this.context.downloadFullUpdate(options.updateUrl, options.hash);
   }
 
@@ -409,7 +410,7 @@ export class PushyTurboModule extends UITurboModule {
     hash: string;
   }): Promise<void> {
     logger.debug(TAG, ',call downloadAndInstallApk');
-    throw createUpdateError(
+    throw createPushyError(
       ERROR_UNSUPPORTED_PLATFORM,
       'downloadAndInstallApk is only supported on Android',
     );

package/harmony/pushy/src/main/ets/{NativeCheckOrchestrator.ts → SyncCoordinator.ts}

@@ -6,10 +6,11 @@ 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 { monotonicNowMs } from './MonotonicClock';
 import {
   ERROR_DOWNLOAD_FAILED,
-  createUpdateError,
+  createPushyError,
   getErrorMessage,
 } from './ErrorCodes';
 
@@ -20,7 +21,7 @@ import {
 // 风暴,不拉黑版本。
 // 鸿蒙的 debug 门控由触发点天然承担:dev 走 MetroJSBundleProvider,
 // PushyFileJSBundleProvider.getBundleUrl 不会被调用。
-const TAG = 'NativeCheck';
+const TAG = 'NativeSync';
 export const KEY_CONFIG = 'nativeConfig';
 // 供 JS 侧复用的原始响应缓存(§10.3),同时记录请求与配置指纹以限定命中范围。
 export const KEY_RESP_CACHE = 'nativeCheckResp';
@@ -31,7 +32,7 @@ export const KEY_RESP_CACHE = 'nativeCheckResp';
 export const KEY_ROUND_INCOMPLETE = 'nativeCheckIncomplete';
 const REQUEST_TIMEOUT_MS = 10000;
 const REQUEST_CALL_TIMEOUT_MS = 15000;
-const MAX_CHECK_HTTP_ATTEMPTS = 8;
+const MAX_QUERY_HTTP_ATTEMPTS = 8;
 const START_DELAY_MS = 5000;
 const DOWNLOAD_PHASE_TIMEOUT_MS = 10 * 60 * 1000;
 const DOWNLOAD_TYPE_DIFF = 'diff';
@@ -62,7 +63,7 @@ interface FlowCInfo {
   uuid: string;
 }
 
-interface FlowCheckInput {
+interface FlowInput {
   packageVersion: string;
   currentVersion?: string;
   buildTime: string;
@@ -129,7 +130,7 @@ function startNativeRound(
     try {
       await runOnce(context, launchRolledBackVersion);
     } catch (e) {
-      logger.error(TAG, `native check failed: ${getErrorMessage(e)}`);
+      logger.error(TAG, `native sync failed: ${getErrorMessage(e)}`);
       roundResult = bundlePreparationResult('failed', 'internal_error');
     }
     return roundResult;
@@ -200,20 +201,20 @@ export async function prepareBundleNative(
 // 进程级:下次启动无信号,冷启动轮次照常运行。
 let jsCompletedConfig: string | undefined;
 
-export function markJsCheckCompleted(config: string): void {
+export function recordJsRound(config: string): void {
   jsCompletedConfig = config;
 }
 
 // JS 已用与原生完全相同的配置拿到有效响应(§10.3):延迟轮次就是一次重复请求。
 // 只有计划内的轮次会问这个问题——JS 没起来、启动即崩、检查失败时都不会有信号。
-function isJsCheckCompleted(context: UpdateContext): boolean {
+function hasJsRound(context: UpdateContext): boolean {
   return (
     jsCompletedConfig !== undefined &&
     jsCompletedConfig === context.getKv(KEY_CONFIG)
   );
 }
 
-export function scheduleNativeCheck(
+export function scheduleNativeSync(
   context: UpdateContext,
   launchRolledBackVersion: string,
 ): void {
@@ -227,16 +228,16 @@ export function scheduleNativeCheck(
   // 除非上个进程死于轮中(残留标记),那时每一秒启动时间都要用来续传。
   const delayMs = context.getKv(KEY_ROUND_INCOMPLETE) ? 0 : START_DELAY_MS;
   setTimeout(() => {
-    if (isJsCheckCompleted(context)) {
+    if (hasJsRound(context)) {
       logger.info(
         TAG,
-        'native check skipped: JS check completed in this process',
+        'native sync skipped: JS already queried in this process',
       );
       return;
     }
     startNativeRound(context, launchRolledBackVersion).catch((e: Object) => {
       // 救援路径自身绝不能把应用拖垮。
-      logger.error(TAG, `native check failed: ${getErrorMessage(e)}`);
+      logger.error(TAG, `native sync failed: ${getErrorMessage(e)}`);
     });
   }, delayMs);
 }
@@ -361,7 +362,7 @@ async function runConfiguredRound(
     uuid,
   };
 
-  const input: FlowCheckInput = {
+  const input: FlowInput = {
     packageVersion: identity.packageVersion,
     currentVersion,
     buildTime: context.getBuildTime(),
@@ -369,14 +370,14 @@ async function runConfiguredRound(
     supportedDiffVersion: NativePatchCore.getSupportedDiffVersion(),
     bundleHash: await context.getBundleHash(),
   };
-  const body = NativePatchCore.buildCheckRequestBody(JSON.stringify(input));
+  const body = NativePatchCore.buildRequestBody(JSON.stringify(input));
   if (!body) {
     roundResult = bundlePreparationResult('failed', 'invalid_request');
     return;
   }
 
   const httpsOnly = isHttpsOnly(config);
-  const responseText = await runCheckRequest(config, appKey, body, httpsOnly);
+  const responseText = await runQueryRequest(config, appKey, body, httpsOnly);
   if (!responseText) {
     logger.warn(TAG, 'no endpoint reachable, giving up until next launch');
     return;
@@ -384,7 +385,7 @@ async function runConfiguredRound(
   // Anchor cache freshness to response arrival, before download/patch work.
   const responseAtSeconds = Math.floor(Date.now() / 1000);
 
-  const decisionJson = NativePatchCore.handleCheckResponse(
+  const decisionJson = NativePatchCore.handleResponse(
     responseText,
     JSON.stringify(identity),
     config.afterDownload ?? '',
@@ -395,7 +396,7 @@ async function runConfiguredRound(
   }
   const decision = JSON.parse(decisionJson) as Decision;
   if (decision.action !== 'download') {
-    const committed = await context.commitNativeCheckResult(
+    const committed = await context.commitSyncResult(
       resetGeneration,
       '',
       '',
@@ -403,7 +404,7 @@ async function runConfiguredRound(
       buildResponseCacheJson(configJson, body, responseText, responseAtSeconds),
     );
     roundResult = committed
-      ? bundlePreparationResult('noUpdate', decision.reason ?? '')
+      ? bundlePreparationResult(STATUS_NONE, decision.reason ?? '')
       : bundlePreparationResult('cancelled', 'reset');
     logger.info(TAG, `nothing to do (${decision.reason ?? ''})`);
     return;
@@ -430,7 +431,7 @@ async function runConfiguredRound(
   }
   if (!downloaded) {
     logger.warn(TAG, `all download attempts for ${hash} failed`);
-    const committed = await context.commitNativeCheckResult(
+    const committed = await context.commitSyncResult(
       resetGeneration,
       '',
       '',
@@ -466,13 +467,13 @@ async function runConfiguredRound(
     hashInfoJson = JSON.stringify(hashInfo);
   }
 
-  // 版本元信息、激活与响应缓存一次性原子提交(见 commitNativeCheckResult);
+  // 版本元信息、激活与响应缓存一次性原子提交(见 commitSyncResult);
   // 缓存只在原生文件/状态工作结束后公开,避免 JS 观察到响应后并发下载。
   // 静默策略、或服务端按版本标记的 forceBoot(远程覆盖,救砖指令)才激活。
   const activate = decision.activate === true;
   let committed = false;
   try {
-    committed = await context.commitNativeCheckResult(
+    committed = await context.commitSyncResult(
       resetGeneration,
       hash,
       hashInfoJson,
@@ -511,12 +512,12 @@ function buildResponseCacheJson(
   return JSON.stringify(cacheEntry);
 }
 
-function isValidCheckResponse(responseText: string | undefined): boolean {
+function isValidResponse(responseText: string | undefined): boolean {
   if (responseText === undefined) {
     return false;
   }
   try {
-    return NativePatchCore.isValidCheckResponse(responseText);
+    return NativePatchCore.isValidResponse(responseText);
   } catch (e) {
     return false;
   }
@@ -570,7 +571,7 @@ async function httpRequest(
 // 顺序回退(§5.1):按纯层给出的候选序逐个请求,单请求超时;整轮失败后经
 // queryUrls 发现远程候选(排除已试过的)再来一轮。刻意不做 hedged race——
 // 该路径对延迟不敏感。
-async function runCheckRequest(
+async function runQueryRequest(
   config: NativeConfig,
   appKey: string,
   body: string,
@@ -591,12 +592,12 @@ async function runCheckRequest(
     if (!base || tried.has(base)) {
       continue;
     }
-    if (httpAttempts++ >= MAX_CHECK_HTTP_ATTEMPTS) {
+    if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
       return undefined;
     }
     tried.add(base);
-    const response = await httpRequest(`${base}/checkUpdate/${appKey}`, body);
-    if (isValidCheckResponse(response)) {
+    const response = await httpRequest(`${base}${QUERY_PATH}${appKey}`, body);
+    if (isValidResponse(response)) {
       return response;
     }
   }
@@ -604,7 +605,7 @@ async function runCheckRequest(
     if (!listUrl) {
       continue;
     }
-    if (httpAttempts++ >= MAX_CHECK_HTTP_ATTEMPTS) {
+    if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
       return undefined;
     }
     const listText = await httpRequest(listUrl);
@@ -634,12 +635,12 @@ async function runCheckRequest(
         logger.warn(TAG, `ignoring non-https remote endpoint ${base}`);
         continue;
       }
-      if (httpAttempts++ >= MAX_CHECK_HTTP_ATTEMPTS) {
+      if (httpAttempts++ >= MAX_QUERY_HTTP_ATTEMPTS) {
         return undefined;
       }
       tried.add(base);
-      const response = await httpRequest(`${base}/checkUpdate/${appKey}`, body);
-      if (isValidCheckResponse(response)) {
+      const response = await httpRequest(`${base}${QUERY_PATH}${appKey}`, body);
+      if (isValidResponse(response)) {
         return response;
       }
     }
@@ -659,7 +660,7 @@ async function runWithinDeadline(
 ): Promise<void> {
   const remainingMs = deadlineUptimeMs - monotonicNowMs();
   if (remainingMs <= 0) {
-    throw createUpdateError(
+    throw createPushyError(
       ERROR_DOWNLOAD_FAILED,
       'Download phase deadline expired before start',
     );
@@ -668,7 +669,7 @@ async function runWithinDeadline(
   const deadlinePromise = new Promise<void>((_, reject) => {
     deadlineTimer = setTimeout(() => {
       reject(
-        createUpdateError(
+        createPushyError(
           ERROR_DOWNLOAD_FAILED,
           'Download phase deadline exceeded',
         ),

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

@@ -0,0 +1,28 @@
+// Encoded text shared by the Harmony module. No imports, so any file can use it
+// without forming an import cycle.
+
+// Decodes text produced by scripts/encode-native-text.ts (byte i XORed with
+// (0x5A + 0x1D * i) & 0xFF), keeping service addresses and paths out of static
+// string scans of the package. Not a secret.
+export function revealText(hex: string): string {
+  let text = '';
+  for (let i = 0; i < hex.length / 2; i++) {
+    const byte = parseInt(hex.substring(i * 2, i * 2 + 2), 16);
+    text += String.fromCharCode(byte ^ ((0x5a + 0x1d * i) & 0xff));
+  }
+  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');
+export const APP_DELTA_SUFFIX: string = revealText('7416e4c1e09b69512137');
+export const BUNDLE_DELTA_ENTRY: string = revealText('3802fad5a28e264d232d11f6d8aade67596914e0ead8b0');
+export const DEVTOOLS_RESTART_EVENT: string = revealText('0832d8fe8faf');
+export const DEVTOOLS_RESTART_REASON: string = revealText('1218e0e3ab876744266d');