react-native-update 10.37.2 → 10.37.4

package/harmony/pushy/hvigor-plugin.ts

@@ -23,7 +23,7 @@ export function reactNativeUpdatePlugin() {
       }
 
       const metaContent = {
-        pushy_build_time: Date.now(),
+        pushy_build_time: String(Date.now()),
         versionName,
       };
 

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

@@ -193,9 +193,13 @@ export class DownloadTask {
         }
         const obj = JSON.parse(jsonContent);
 
-        const copies = obj.copies;
-        for (const to in copies) {
-          let from = copies[to].replace('resources/rawfile/', '');
+        const copies = obj.copies as Record<string, string>;
+        for (const [to, rawPath] of Object.entries(copies)) {
+          if (!rawPath.startsWith('resources/rawfile/')) {
+            // skip other resource
+            continue;
+          }
+          let from = rawPath.replace('resources/rawfile/', '');
           if (from === '') {
             from = to;
           }
@@ -355,10 +359,12 @@ export class DownloadTask {
   private async copyFromResource(
     copyList: Map<string, Array<string>>,
   ): Promise<void> {
+    let currentFrom = '';
     try {
       const resourceManager = this.context.resourceManager;
 
       for (const [from, targets] of copyList.entries()) {
+        currentFrom = from;
         const fromContent = await resourceManager.getRawFileContent(from);
         for (const target of targets) {
           const fileStream = fileIo.createStreamSync(target, 'w+');
@@ -367,7 +373,7 @@ export class DownloadTask {
         }
       }
     } catch (error) {
-      console.error('Copy from resource failed:', error);
+      console.error('Copy from resource failed:', currentFrom, error.message);
       throw error;
     }
   }
@@ -427,9 +433,8 @@ export class DownloadTask {
           throw Error(`Unknown task type: ${params.type}`);
       }
 
-      params.listener?.onDownloadCompleted(params);
     } catch (error) {
-      console.error('Task execution failed:', error);
+      console.error('Task execution failed:', error.message);
       if (params.type !== DownloadTaskParams.TASK_TYPE_CLEANUP) {
         try {
           if (params.type === DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD) {
@@ -438,10 +443,10 @@ export class DownloadTask {
             await this.removeDirectory(params.unzipDirectory);
           }
         } catch (cleanupError) {
-          console.error('Cleanup after error failed:', cleanupError);
+          console.error('Cleanup after error failed:', cleanupError.message);
         }
       }
-      params.listener?.onDownloadFailed(error);
+      throw error;
     }
   }
 }

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

@@ -1,25 +1,19 @@
-export interface DownloadTaskListener {
-  onDownloadCompleted(params: DownloadTaskParams): void;
-  onDownloadFailed(error: Error): void;
-}
-
 /**
  * 下载任务参数类
  */
 export class DownloadTaskParams {
   // 任务类型常量
-  static readonly TASK_TYPE_CLEANUP: number = 0;        // 保留hash和originHash
-  static readonly TASK_TYPE_PATCH_FULL: number = 1;     // 全量补丁
+  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;                 // 任务类型
-  url: string;                  // 下载URL
-  hash: string;                 // 文件哈希值
-  originHash: string;           // 原始文件哈希值
-  targetFile: string;           // 目标文件路径
-  unzipDirectory: string;       // 解压目录路径
-  originDirectory: string;      // 原始文件目录路径
-  listener: DownloadTaskListener; // 下载监听器
-}
+  type: number; // 任务类型
+  url: string; // 下载URL
+  hash: string; // 文件哈希值
+  originHash: string; // 原始文件哈希值
+  targetFile: string; // 目标文件路径
+  unzipDirectory: string; // 解压目录路径
+  originDirectory: string; // 原始文件目录路径
+}

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

@@ -89,23 +89,19 @@ export class UpdateContext {
     this.cleanUp();
   }
 
-  public async downloadFullUpdate(
-    url: string,
-    hash: string,
-    listener: DownloadFileListener,
-  ): Promise<void> {
+  public async downloadFullUpdate(url: string, hash: string): Promise<void> {
     try {
       const params = new DownloadTaskParams();
       params.type = DownloadTaskParams.TASK_TYPE_PATCH_FULL;
       params.url = url;
       params.hash = hash;
-      params.listener = listener;
       params.targetFile = `${this.rootDir}/${hash}.ppk`;
       params.unzipDirectory = `${this.rootDir}/${hash}`;
       const downloadTask = new DownloadTask(this.context);
       await downloadTask.execute(params);
     } catch (e) {
       console.error('Failed to download full update:', e);
+      throw e;
     }
   }
 
@@ -113,13 +109,11 @@ export class UpdateContext {
     url: string,
     hash: string,
     fileName: string,
-    listener: DownloadFileListener,
   ): Promise<void> {
     const params = new DownloadTaskParams();
     params.type = DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD;
     params.url = url;
     params.hash = hash;
-    params.listener = listener;
     params.targetFile = this.rootDir + '/' + fileName;
 
     const downloadTask = new DownloadTask(this.context);
@@ -130,14 +124,12 @@ export class UpdateContext {
     url: string,
     hash: string,
     originHash: string,
-    listener: DownloadFileListener,
   ): Promise<void> {
     const params = new DownloadTaskParams();
     params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK;
     params.url = url;
     params.hash = hash;
     params.originHash = originHash;
-    params.listener = listener;
     params.targetFile = `${this.rootDir}/${originHash}_${hash}.ppk.patch`;
     params.unzipDirectory = `${this.rootDir}/${hash}`;
     params.originDirectory = `${this.rootDir}/${params.originHash}`;
@@ -149,21 +141,19 @@ export class UpdateContext {
   public async downloadPatchFromPackage(
     url: string,
     hash: string,
-    listener: DownloadFileListener,
   ): Promise<void> {
     try {
       const params = new DownloadTaskParams();
       params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_APP;
       params.url = url;
       params.hash = hash;
-      params.listener = listener;
       params.targetFile = `${this.rootDir}/${hash}.app.patch`;
       params.unzipDirectory = `${this.rootDir}/${hash}`;
 
       const downloadTask = new DownloadTask(this.context);
       return await downloadTask.execute(params);
     } catch (e) {
-      console.error('Failed to download APK patch:', e);
+      console.error('Failed to download package patch:', e);
       throw e;
     }
   }
@@ -186,6 +176,7 @@ export class UpdateContext {
       this.setKv('rolledBackVersion', '');
     } catch (e) {
       console.error('Failed to switch version:', e);
+      throw e;
     }
   }
 
@@ -269,8 +260,3 @@ export class UpdateContext {
     return UpdateContext.isUsingBundleUrl;
   }
 }
-
-export interface DownloadFileListener {
-  onDownloadCompleted(params: DownloadTaskParams): void;
-  onDownloadFailed(error: Error): void;
-}

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

@@ -1,7 +1,6 @@
 import bundleManager from '@ohos.bundle.bundleManager';
 import common from '@ohos.app.ability.common';
 import { UpdateContext } from './UpdateContext';
-import { DownloadTaskParams } from './DownloadTaskParams';
 import logger from './Logger';
 
 const TAG = 'UpdateModuleImpl';
@@ -13,89 +12,28 @@ export class UpdateModuleImpl {
     updateContext: UpdateContext,
     options: { updateUrl: string; hash: string },
   ): Promise<void> {
-    try {
-      await updateContext.downloadFullUpdate(options.updateUrl, options.hash, {
-        onDownloadCompleted: (params: DownloadTaskParams) => {
-          return Promise.resolve();
-        },
-        onDownloadFailed: (error: Error) => {
-          return Promise.reject(error);
-        },
-      });
-    } catch (error) {
-      logger.error(TAG, `downloadFullUpdate failed: ${error}`);
-      throw error;
-    }
-  }
-
-  static async downloadAndInstallApk(
-    context: common.UIAbilityContext,
-    options: { url: string; hash: string; target: string },
-  ): Promise<void> {
-    try {
-      const want = {
-        action: 'action.system.home',
-        parameters: {
-          uri: 'appmarket://details',
-        },
-      };
-
-      if (!context) {
-        throw Error('获取context失败');
-      }
-
-      await context.startAbility(want);
-    } catch (error) {
-      logger.error(TAG, `installApk failed: ${error}`);
-      throw error;
-    }
+    return updateContext.downloadFullUpdate(options.updateUrl, options.hash);
   }
 
   static async downloadPatchFromPackage(
     updateContext: UpdateContext,
     options: { updateUrl: string; hash: string },
   ): Promise<void> {
-    try {
-      return await updateContext.downloadPatchFromPackage(
-        options.updateUrl,
-        options.hash,
-        {
-          onDownloadCompleted: (params: DownloadTaskParams) => {
-            return Promise.resolve();
-          },
-          onDownloadFailed: (error: Error) => {
-            return Promise.reject(error);
-          },
-        },
-      );
-    } catch (error) {
-      logger.error(TAG, `downloadPatchFromPackage failed: ${error}`);
-      throw error;
-    }
+    return updateContext.downloadPatchFromPackage(
+      options.updateUrl,
+      options.hash,
+    );
   }
 
   static async downloadPatchFromPpk(
     updateContext: UpdateContext,
     options: { updateUrl: string; hash: string; originHash: string },
   ): Promise<void> {
-    try {
-      await updateContext.downloadPatchFromPpk(
-        options.updateUrl,
-        options.hash,
-        options.originHash,
-        {
-          onDownloadCompleted: (params: DownloadTaskParams) => {
-            return Promise.resolve();
-          },
-          onDownloadFailed: (error: Error) => {
-            return Promise.reject(error);
-          },
-        },
-      );
-    } catch (error) {
-      logger.error(TAG, `downloadPatchFromPpk failed: ${error}`);
-      throw Error(`执行报错: ${error.message}`);
-    }
+    return updateContext.downloadPatchFromPpk(
+      options.updateUrl,
+      options.hash,
+      options.originHash,
+    );
   }
 
   static async reloadUpdate(
@@ -121,7 +59,7 @@ export class UpdateModuleImpl {
       await context.startAbility(want);
     } catch (error) {
       logger.error(TAG, `reloadUpdate failed: ${error}`);
-      throw Error(`pushy:switchVersion failed ${error.message}`);
+      throw Error(`switchVersion failed ${error.message}`);
     }
   }
 
@@ -156,14 +94,8 @@ export class UpdateModuleImpl {
   static async setUuid(
     updateContext: UpdateContext,
     uuid: string,
-  ): Promise<boolean> {
-    try {
-      await updateContext.setKv('uuid', uuid);
-      return true;
-    } catch (error) {
-      logger.error(TAG, `setUuid failed: ${error}`);
-      throw Error(`执行报错: ${error.message}`);
-    }
+  ): Promise<void> {
+    return updateContext.setKv('uuid', uuid);
   }
 
   static checkJson(json: string): boolean {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.37.2",
+  "version": "10.37.4",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/locales/en.ts

@@ -70,7 +70,7 @@ export default {
 
   // Development environment messages
   dev_incremental_update_disabled:
-    'Currently in development environment, incremental hot update cannot be executed and restart will not take effect. If you need to test effective full hot update in development environment (but will reconnect to metro after restart), please enable "ignore timestamp" switch and retry.',
+    'Currently in development environment, incremental hot update cannot be executed and restart will not take effect. If you need to test effective full hot update in development environment (but will reconnect to metro after restart), please enable "ignore timestamp" in app settings in admin dashboard and retry.',
 
   // Context error messages
   error_use_update_outside_provider:

package/src/locales/zh.ts

@@ -67,7 +67,7 @@ export default {
 
   // Development environment messages
   dev_incremental_update_disabled:
-    '当前是开发环境，无法执行增量式热更新，重启不会生效。如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），请打开"忽略时间戳"开关再重试。',
+    '当前是开发环境，无法执行增量式热更新，重启不会生效。如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），请在网页管理后台的应用设置中打开"忽略时间戳"开关再重试。',
 
   // Context error messages
   error_use_update_outside_provider:

package/src/provider.tsx

@@ -162,7 +162,7 @@ export const UpdateProvider = ({
   );
 
   const checkUpdate = useCallback(
-    async ({ extra }: { extra?: Record<string, any> } | undefined = {}) => {
+    async ({ extra }: { extra?: Partial<{ toHash: string }> } = {}) => {
       const now = Date.now();
       if (lastChecking.current && now - lastChecking.current < 1000) {
         return;
@@ -197,7 +197,9 @@ export const UpdateProvider = ({
           }
           log(`${info.name} in ${rollout}% rollout, continue`);
         }
-        info.description = info.description ?? '';
+        if (info.update) {
+          info.description = info.description ?? '';
+        }
         updateInfoRef.current = info;
         setUpdateInfo(info);
         if (info.expired) {
@@ -250,7 +252,7 @@ export const UpdateProvider = ({
             client.t('alert_title'),
             client.t('alert_new_version_found', {
               name: info.name!,
-              description: info.description,
+              description: info.description!,
             }),
             [
               { text: client.t('alert_cancel'), style: 'cancel' },

package/src/type.ts

@@ -98,10 +98,10 @@ export interface ClientOptions {
   dismissErrorAfter?: number;
   debug?: boolean;
   throwError?: boolean;
-  beforeCheckUpdate?: () => Promise<boolean>;
-  beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
-  afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
-  onPackageExpired?: (info: CheckResult) => Promise<boolean>;
+  beforeCheckUpdate?: () => Promise<boolean> | boolean;
+  beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
+  afterDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
+  onPackageExpired?: (info: CheckResult) => Promise<boolean> | boolean;
   overridePackageVersion?: string;
 }