react-native-update 10.58.1 → 10.59.1

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',
     );