react-native-update 10.42.3 → 10.42.4

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

@@ -7,7 +7,6 @@ import { bundleManager } from '@kit.AbilityKit';
 import logger from './Logger';
 import { UpdateContext } from './UpdateContext';
 import { EventHub } from './EventHub';
-import { util } from '@kit.ArkTS';
 
 const TAG = 'PushyTurboModule';
 
@@ -47,33 +46,6 @@ export class PushyTurboModule extends UITurboModule {
     return bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
   }
 
-  private getPackageVersion(): string {
-    try {
-      const bundleInfo = bundleManager.getBundleInfoForSelfSync(
-        this.getBundleFlags(),
-      );
-      return bundleInfo?.versionName || 'Unknown';
-    } catch (error) {
-      console.error('Failed to get bundle info:', error);
-      return '';
-    }
-  }
-
-  private getBuildTime(): string {
-    try {
-      const content = this.mUiCtx.resourceManager.getRawFileContentSync(
-        'meta.json',
-      );
-      const metaData = JSON.parse(
-        new util.TextDecoder().decodeToString(content),
-      ) as Record<string, string | number | boolean | null | undefined>;
-      if (metaData.pushy_build_time) {
-        return String(metaData.pushy_build_time);
-      }
-    } catch {}
-    return '';
-  }
-
   private requireHash(hash: string, methodName: string): string {
     if (!hash) {
       throw Error(`${methodName}: empty hash`);
@@ -95,8 +67,8 @@ export class PushyTurboModule extends UITurboModule {
 
   getConstants(): Object {
     logger.debug(TAG, ',call getConstants');
-    const packageVersion = this.getPackageVersion();
-    const buildTime = this.getBuildTime();
+    const packageVersion = this.context.getPackageVersion();
+    const buildTime = this.context.getBuildTime();
     this.context.syncStateWithBinaryVersion(packageVersion, buildTime);
 
     const currentVersion = this.context.getCurrentVersion();

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

@@ -3,6 +3,8 @@ import fileIo from '@ohos.file.fs';
 import { DownloadTask } from './DownloadTask';
 import common from '@ohos.app.ability.common';
 import { DownloadTaskParams } from './DownloadTaskParams';
+import { bundleManager } from '@kit.AbilityKit';
+import { util } from '@kit.ArkTS';
 import NativePatchCore, {
   STATE_OP_CLEAR_FIRST_TIME,
   STATE_OP_CLEAR_ROLLBACK_MARK,
@@ -13,6 +15,10 @@ import NativePatchCore, {
   StateCoreResult,
 } from './NativePatchCore';
 
+type FlushablePreferences = preferences.Preferences & {
+  flushSync?: () => void;
+};
+
 export class UpdateContext {
   private context: common.UIAbilityContext;
   private rootDir: string;
@@ -32,6 +38,10 @@ export class UpdateContext {
       console.error('Failed to create root directory:', e);
     }
     this.initPreferences();
+    this.syncStateWithBinaryVersion(
+      this.getPackageVersion(),
+      this.getBuildTime(),
+    );
   }
 
   private initPreferences() {
@@ -44,6 +54,37 @@ export class UpdateContext {
     }
   }
 
+  private getBundleFlags(): bundleManager.BundleFlag {
+    return bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
+  }
+
+  public getPackageVersion(): string {
+    try {
+      const bundleInfo = bundleManager.getBundleInfoForSelfSync(
+        this.getBundleFlags(),
+      );
+      return bundleInfo?.versionName || 'Unknown';
+    } catch (error) {
+      console.error('Failed to get bundle info:', error);
+      return '';
+    }
+  }
+
+  public getBuildTime(): string {
+    try {
+      const content = this.context.resourceManager.getRawFileContentSync(
+        'meta.json',
+      );
+      const metaData = JSON.parse(
+        new util.TextDecoder().decodeToString(content),
+      ) as Record<string, string | number | boolean | null | undefined>;
+      if (metaData.pushy_build_time) {
+        return String(metaData.pushy_build_time);
+      }
+    } catch {}
+    return '';
+  }
+
   private readString(key: string): string {
     const value = this.preferences.getSync(key, '') as
       | string
@@ -87,6 +128,20 @@ export class UpdateContext {
     return defaultValue;
   }
 
+  private flushPreferences(reason: string): void {
+    try {
+      const flushablePreferences = this.preferences as FlushablePreferences;
+      if (typeof flushablePreferences.flushSync === 'function') {
+        flushablePreferences.flushSync();
+        return;
+      }
+      throw Error('preferences.flushSync is not available');
+    } catch (error) {
+      console.error(`Failed to flush preferences for ${reason}:`, error);
+      throw error;
+    }
+  }
+
   private putNullableString(key: string, value?: string): void {
     if (value) {
       this.preferences.putSync(key, value);
@@ -136,7 +191,7 @@ export class UpdateContext {
     if (options.removeStaleHash && state.staleVersionToDelete) {
       this.preferences.deleteSync(`hash_${state.staleVersionToDelete}`);
     }
-    this.preferences.flush();
+    this.flushPreferences('persist state');
     if (options.cleanUp) {
       this.cleanUp();
     }
@@ -196,7 +251,7 @@ export class UpdateContext {
 
   public setKv(key: string, value: string): void {
     this.preferences.putSync(key, value);
-    this.preferences.flush();
+    this.flushPreferences(`set key ${key}`);
   }
 
   public getKv(key: string): string {

package/package.json

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