react-native-update 10.38.3 → 10.38.5

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

@@ -0,0 +1,346 @@
+import preferences from '@ohos.data.preferences';
+import fileIo from '@ohos.file.fs';
+import { DownloadTask } from './DownloadTask';
+import common from '@ohos.app.ability.common';
+import { DownloadTaskParams } from './DownloadTaskParams';
+import NativePatchCore, {
+  STATE_OP_CLEAR_FIRST_TIME,
+  STATE_OP_CLEAR_ROLLBACK_MARK,
+  STATE_OP_MARK_SUCCESS,
+  STATE_OP_RESOLVE_LAUNCH,
+  STATE_OP_ROLLBACK,
+  STATE_OP_SWITCH_VERSION,
+  StateCoreResult,
+} from './NativePatchCore';
+
+export class UpdateContext {
+  private context: common.UIAbilityContext;
+  private rootDir: string;
+  private preferences: preferences.Preferences;
+  private static DEBUG: boolean = false;
+  private static isUsingBundleUrl: boolean = false;
+
+  constructor(context: common.UIAbilityContext) {
+    this.context = context;
+    this.rootDir = context.filesDir + '/_update';
+
+    try {
+      if (!fileIo.accessSync(this.rootDir)) {
+        fileIo.mkdirSync(this.rootDir);
+      }
+    } catch (e) {
+      console.error('Failed to create root directory:', e);
+    }
+    this.initPreferences();
+  }
+
+  private initPreferences() {
+    try {
+      this.preferences = preferences.getPreferencesSync(this.context, {
+        name: 'update',
+      });
+    } catch (e) {
+      console.error('Failed to init preferences:', e);
+    }
+  }
+
+  private readString(key: string): string {
+    const value = this.preferences.getSync(key, '') as
+      | string
+      | boolean
+      | number
+      | null
+      | undefined;
+    if (typeof value === 'string') {
+      return value;
+    }
+    if (typeof value === 'number') {
+      return String(value);
+    }
+    if (typeof value === 'boolean') {
+      return value ? 'true' : 'false';
+    }
+    return '';
+  }
+
+  private readBoolean(key: string, defaultValue: boolean): boolean {
+    const value = this.preferences.getSync(key, defaultValue) as
+      | string
+      | boolean
+      | number
+      | null
+      | undefined;
+    if (typeof value === 'boolean') {
+      return value;
+    }
+    if (typeof value === 'string') {
+      if (value === 'true') {
+        return true;
+      }
+      if (value === 'false') {
+        return false;
+      }
+    }
+    if (typeof value === 'number') {
+      return value !== 0;
+    }
+    return defaultValue;
+  }
+
+  private putNullableString(key: string, value?: string): void {
+    if (value) {
+      this.preferences.putSync(key, value);
+      return;
+    }
+    this.preferences.deleteSync(key);
+  }
+
+  private getBundlePath(hash: string): string {
+    return `${this.rootDir}/${hash}/bundle.harmony.js`;
+  }
+
+  private getStateSnapshot(): StateCoreResult {
+    return {
+      packageVersion: this.readString('packageVersion'),
+      buildTime: this.readString('buildTime'),
+      currentVersion: this.readString('currentVersion'),
+      lastVersion: this.readString('lastVersion'),
+      firstTime: this.readBoolean('firstTime', false),
+      firstTimeOk: this.readBoolean('firstTimeOk', true),
+      rolledBackVersion: this.readString('rolledBackVersion'),
+    };
+  }
+
+  private applyState(state: StateCoreResult): void {
+    this.putNullableString('packageVersion', state.packageVersion);
+    this.putNullableString('buildTime', state.buildTime);
+    this.putNullableString('currentVersion', state.currentVersion);
+    this.putNullableString('lastVersion', state.lastVersion);
+    this.preferences.putSync('firstTime', !!state.firstTime);
+    this.preferences.putSync('firstTimeOk', state.firstTimeOk !== false);
+    this.putNullableString('rolledBackVersion', state.rolledBackVersion);
+  }
+
+  public syncStateWithBinaryVersion(
+    packageVersion: string,
+    buildTime: string,
+  ): void {
+    const currentState = this.getStateSnapshot();
+    const nextState = NativePatchCore.syncStateWithBinaryVersion(
+      packageVersion,
+      buildTime,
+      currentState,
+    );
+    if (!nextState.changed) {
+      return;
+    }
+
+    this.cleanUp();
+    this.preferences.clear();
+    this.applyState(nextState);
+    this.preferences.flush();
+  }
+
+  public setKv(key: string, value: string): void {
+    this.preferences.putSync(key, value);
+    this.preferences.flush();
+  }
+
+  public getKv(key: string): string {
+    return this.readString(key);
+  }
+
+  public isFirstTime(): boolean {
+    return this.getStateSnapshot().firstTime;
+  }
+
+  public rolledBackVersion(): string {
+    return this.getStateSnapshot().rolledBackVersion || '';
+  }
+
+  public markSuccess(): void {
+    if (UpdateContext.DEBUG) {
+      return;
+    }
+
+    const nextState = NativePatchCore.runStateCore(
+      STATE_OP_MARK_SUCCESS,
+      this.getStateSnapshot(),
+    );
+    this.applyState(nextState);
+    if (nextState.staleVersionToDelete) {
+      this.preferences.deleteSync(`hash_${nextState.staleVersionToDelete}`);
+    }
+    this.preferences.flush();
+    this.cleanUp();
+  }
+
+  public clearFirstTime(): void {
+    const nextState = NativePatchCore.runStateCore(
+      STATE_OP_CLEAR_FIRST_TIME,
+      this.getStateSnapshot(),
+    );
+    this.applyState(nextState);
+    this.preferences.flush();
+    this.cleanUp();
+  }
+
+  public clearRollbackMark(): void {
+    const nextState = NativePatchCore.runStateCore(
+      STATE_OP_CLEAR_ROLLBACK_MARK,
+      this.getStateSnapshot(),
+    );
+    this.applyState(nextState);
+    this.preferences.flush();
+    this.cleanUp();
+  }
+
+  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.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;
+    }
+  }
+
+  public async downloadFile(
+    url: string,
+    hash: string,
+    fileName: string,
+  ): Promise<void> {
+    const params = new DownloadTaskParams();
+    params.type = DownloadTaskParams.TASK_TYPE_PLAIN_DOWNLOAD;
+    params.url = url;
+    params.hash = hash;
+    params.targetFile = this.rootDir + '/' + fileName;
+
+    const downloadTask = new DownloadTask(this.context);
+    await downloadTask.execute(params);
+  }
+
+  public async downloadPatchFromPpk(
+    url: string,
+    hash: string,
+    originHash: string,
+  ): Promise<void> {
+    const params = new DownloadTaskParams();
+    params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_PPK;
+    params.url = url;
+    params.hash = hash;
+    params.originHash = originHash;
+    params.targetFile = `${this.rootDir}/${originHash}_${hash}.ppk.patch`;
+    params.unzipDirectory = `${this.rootDir}/${hash}`;
+    params.originDirectory = `${this.rootDir}/${params.originHash}`;
+
+    const downloadTask = new DownloadTask(this.context);
+    await downloadTask.execute(params);
+  }
+
+  public async downloadPatchFromPackage(
+    url: string,
+    hash: string,
+  ): Promise<void> {
+    try {
+      const params = new DownloadTaskParams();
+      params.type = DownloadTaskParams.TASK_TYPE_PATCH_FROM_APP;
+      params.url = url;
+      params.hash = hash;
+      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 package patch:', e);
+      throw e;
+    }
+  }
+
+  public switchVersion(hash: string): void {
+    try {
+      const bundlePath = this.getBundlePath(hash);
+      if (!fileIo.accessSync(bundlePath)) {
+        throw Error(`Bundle version ${hash} not found.`);
+      }
+
+      const nextState = NativePatchCore.runStateCore(
+        STATE_OP_SWITCH_VERSION,
+        this.getStateSnapshot(),
+        hash,
+      );
+      this.applyState(nextState);
+      this.preferences.flush();
+    } catch (e) {
+      console.error('Failed to switch version:', e);
+      throw e;
+    }
+  }
+
+  public getBundleUrl() {
+    UpdateContext.isUsingBundleUrl = true;
+    const launchState = NativePatchCore.runStateCore(
+      STATE_OP_RESOLVE_LAUNCH,
+      this.getStateSnapshot(),
+      '',
+      false,
+      false,
+    );
+    if (launchState.didRollback || launchState.consumedFirstTime) {
+      this.applyState(launchState);
+      this.preferences.flush();
+    }
+
+    let version = launchState.loadVersion || '';
+    while (version) {
+      const bundleFile = this.getBundlePath(version);
+      try {
+        if (!fileIo.accessSync(bundleFile)) {
+          console.error(`Bundle version ${version} not found.`);
+          version = this.rollBack();
+          continue;
+        }
+        return bundleFile;
+      } catch (e) {
+        console.error('Failed to access bundle file:', e);
+        version = this.rollBack();
+      }
+    }
+    return '';
+  }
+
+  public getCurrentVersion(): string {
+    return this.getStateSnapshot().currentVersion || '';
+  }
+
+  private rollBack(): string {
+    const nextState = NativePatchCore.runStateCore(
+      STATE_OP_ROLLBACK,
+      this.getStateSnapshot(),
+    );
+    this.applyState(nextState);
+    this.preferences.flush();
+    return nextState.currentVersion || '';
+  }
+
+  public cleanUp(): void {
+    const state = this.getStateSnapshot();
+    NativePatchCore.cleanupOldEntries(
+      this.rootDir,
+      state.currentVersion || '',
+      state.lastVersion || '',
+      7,
+    );
+  }
+
+  public getIsUsingBundleUrl(): boolean {
+    return UpdateContext.isUsingBundleUrl;
+  }
+}

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

@@ -0,0 +1,123 @@
+import bundleManager from '@ohos.bundle.bundleManager';
+import common from '@ohos.app.ability.common';
+import { UpdateContext } from './UpdateContext';
+import logger from './Logger';
+
+const TAG = 'UpdateModuleImpl';
+
+export class UpdateModuleImpl {
+  static readonly NAME = 'Pushy';
+
+  static async downloadFullUpdate(
+    updateContext: UpdateContext,
+    options: { updateUrl: string; hash: string },
+  ): Promise<void> {
+    return updateContext.downloadFullUpdate(options.updateUrl, options.hash);
+  }
+
+  static async downloadPatchFromPackage(
+    updateContext: UpdateContext,
+    options: { updateUrl: string; hash: string },
+  ): Promise<void> {
+    return updateContext.downloadPatchFromPackage(
+      options.updateUrl,
+      options.hash,
+    );
+  }
+
+  static async downloadPatchFromPpk(
+    updateContext: UpdateContext,
+    options: { updateUrl: string; hash: string; originHash: string },
+  ): Promise<void> {
+    return updateContext.downloadPatchFromPpk(
+      options.updateUrl,
+      options.hash,
+      options.originHash,
+    );
+  }
+
+  static async reloadUpdate(
+    updateContext: UpdateContext,
+    context: common.UIAbilityContext,
+    options: { hash: string },
+  ): Promise<void> {
+    const hash = options.hash;
+    if (!hash) {
+      throw Error('hash不能为空');
+    }
+
+    try {
+      await updateContext.switchVersion(hash);
+      const bundleInfo = await bundleManager.getBundleInfoForSelf(
+        bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION,
+      );
+      await context.terminateSelf();
+      const want = {
+        bundleName: bundleInfo.name,
+        abilityName: context.abilityInfo?.name,
+      };
+      await context.startAbility(want);
+    } catch (error) {
+      logger.error(TAG, `reloadUpdate failed: ${error}`);
+      throw Error(`switchVersion failed ${error.message}`);
+    }
+  }
+
+  static async setNeedUpdate(
+    updateContext: UpdateContext,
+    options: { hash: string },
+  ): Promise<boolean> {
+    const hash = options.hash;
+    if (!hash) {
+      throw Error('empty hash');
+    }
+
+    try {
+      await updateContext.switchVersion(hash);
+      return true;
+    } catch (error) {
+      logger.error(TAG, `setNeedUpdate failed: ${error}`);
+      throw Error(`switchVersionLater failed: ${error.message}`);
+    }
+  }
+
+  static async markSuccess(updateContext: UpdateContext): Promise<boolean> {
+    try {
+      await updateContext.markSuccess();
+      return true;
+    } catch (error) {
+      logger.error(TAG, `markSuccess failed: ${error}`);
+      throw error;
+    }
+  }
+
+  static async setUuid(
+    updateContext: UpdateContext,
+    uuid: string,
+  ): Promise<void> {
+    return updateContext.setKv('uuid', uuid);
+  }
+
+  static checkJson(json: string): boolean {
+    try {
+      JSON.parse(json);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  static setLocalHashInfo(
+    updateContext: UpdateContext,
+    hash: string,
+    info: string,
+  ): boolean {
+    updateContext.setKv(`hash_${hash}`, info);
+    return true;
+  }
+
+  static getLocalHashInfo(updateContext: UpdateContext, hash: string): string {
+    const value = updateContext.getKv(`hash_${hash}`);
+    return value;
+  }
+}

package/harmony/pushy/src/main/module.json5

@@ -0,0 +1,7 @@
+{
+  "module": {
+    "name": "pushy",
+    "type": "har",
+    "deviceTypes": ['default'],
+  },
+}

package/harmony/pushy/src/main/resources/base/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "page_show",
+      "value": "page from npm package"
+    }
+  ]
+}

package/harmony/pushy/src/main/resources/en_US/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "page_show",
+      "value": "page from npm package"
+    }
+  ]
+}

package/harmony/pushy/src/main/resources/zh_CN/element/string.json

@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "page_show",
+      "value": "page from npm package"
+    }
+  ]
+}

package/package.json

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

package/src/client.ts

@@ -22,6 +22,7 @@ import {
   ClientOptions,
   EventType,
   ProgressData,
+  UpdateCheckState,
   UpdateServerConfig,
 } from './type';
 import {
@@ -207,6 +208,16 @@ export class Pushy {
       throw e;
     }
   };
+  notifyAfterCheckUpdate = (state: UpdateCheckState) => {
+    const { afterCheckUpdate } = this.options;
+    if (!afterCheckUpdate) {
+      return;
+    }
+    // 这里仅做状态通知，不阻塞原有检查流程
+    Promise.resolve(afterCheckUpdate(state)).catch((error: any) => {
+      log('afterCheckUpdate failed:', error?.message || error);
+    });
+  };
   getCheckUrl = (endpoint: string) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
@@ -329,9 +340,11 @@ export class Pushy {
   };
   checkUpdate = async (extra?: Record<string, any>) => {
     if (!this.assertDebug('checkUpdate()')) {
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     if (!assertWeb()) {
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     if (
@@ -339,6 +352,7 @@ export class Pushy {
       (await this.options.beforeCheckUpdate()) === false
     ) {
       log('beforeCheckUpdate returned false, skipping check');
+      this.notifyAfterCheckUpdate({ status: 'skipped' });
       return;
     }
     const now = Date.now();
@@ -347,7 +361,9 @@ export class Pushy {
       this.lastChecking &&
       now - this.lastChecking < 1000 * 5
     ) {
-      return await this.lastRespJson;
+      const result = await this.lastRespJson;
+      this.notifyAfterCheckUpdate({ status: 'completed', result });
+      return result;
     }
     this.lastChecking = now;
     const fetchBody = {
@@ -387,6 +403,7 @@ export class Pushy {
 
       log('checking result:', result);
 
+      this.notifyAfterCheckUpdate({ status: 'completed', result });
       return result;
     } catch (e: any) {
       this.lastRespJson = previousRespJson;
@@ -396,6 +413,7 @@ export class Pushy {
         type: 'errorChecking',
         message: errorMessage,
       });
+      this.notifyAfterCheckUpdate({ status: 'error', error: e });
       this.throwIfEnabled(e);
       return previousRespJson ? await previousRespJson : emptyObj;
     }

package/src/provider.tsx

@@ -165,6 +165,7 @@ export const UpdateProvider = ({
     async ({ extra }: { extra?: Partial<{ toHash: string }> } = {}) => {
       const now = Date.now();
       if (lastChecking.current && now - lastChecking.current < 1000) {
+        client.notifyAfterCheckUpdate({ status: 'skipped' });
         return;
       }
       lastChecking.current = now;

package/src/type.ts

@@ -35,6 +35,13 @@ export interface ProgressData {
   total: number;
 }
 
+// 用于描述一次检查结束后的最终状态，便于业务侧感知成功、跳过或失败
+export interface UpdateCheckState {
+  status: 'completed' | 'skipped' | 'error';
+  result?: CheckResult;
+  error?: Error;
+}
+
 export type EventType =
   | 'rollback'
   | 'errorChecking'
@@ -98,6 +105,8 @@ export interface ClientOptions {
   debug?: boolean;
   throwError?: boolean;
   beforeCheckUpdate?: () => Promise<boolean> | boolean;
+  // 每次检查结束后都会触发，不影响原有检查流程
+  afterCheckUpdate?: (state: UpdateCheckState) => Promise<void> | void;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
   afterDownloadUpdate?: (info: CheckResult) => Promise<boolean> | boolean;
   onPackageExpired?: (info: CheckResult) => Promise<boolean> | boolean;