react-native-update 10.42.6 → 10.42.9

package/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets

@@ -12,7 +12,7 @@ export class PushyFileJSBundleProvider extends JSBundleProvider {
 
   constructor(context: common.UIAbilityContext) {
     super();
-    this.updateContext = new UpdateContext(context);
+    this.updateContext = UpdateContext.getInstance(context);
   }
 
   getURL(): string {

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

@@ -38,7 +38,7 @@ export class PushyTurboModule extends UITurboModule {
     super(ctx);
     logger.debug(TAG, ',PushyTurboModule constructor');
     this.mUiCtx = ctx.uiAbilityContext;
-    this.context = new UpdateContext(this.mUiCtx);
+    this.context = UpdateContext.getInstance(this.mUiCtx);
     EventHub.getInstance().setRNInstance(ctx.rnInstance);
   }
 
@@ -78,6 +78,7 @@ export class PushyTurboModule extends UITurboModule {
 
   getConstants(): Object {
     logger.debug(TAG, ',call getConstants');
+    this.context.logStateSnapshot('getConstants:enter');
     const packageVersion = this.context.getPackageVersion();
     const buildTime = this.context.getBuildTime();
     this.context.syncStateWithBinaryVersion(packageVersion, buildTime);
@@ -95,7 +96,7 @@ export class PushyTurboModule extends UITurboModule {
       this.context.clearRollbackMark();
     }
 
-    return {
+    const result = {
       downloadRootDir: `${this.mUiCtx.filesDir}/_update`,
       currentVersionInfo,
       packageVersion,
@@ -106,6 +107,19 @@ export class PushyTurboModule extends UITurboModule {
       rolledBackVersion,
       uuid,
     };
+    const logResult = {
+      downloadRootDir: result.downloadRootDir,
+      currentVersionInfo: result.currentVersionInfo,
+      packageVersion: result.packageVersion,
+      currentVersion: result.currentVersion,
+      buildTime: result.buildTime,
+      isUsingBundleUrl: result.isUsingBundleUrl,
+      isFirstTime: result.isFirstTime,
+      rolledBackVersion: result.rolledBackVersion,
+      uuidSet: !!result.uuid,
+    };
+    logger.info(TAG, `,getConstants result: ${JSON.stringify(logResult)}`);
+    return result;
   }
 
   setLocalHashInfo(hash: string, info: string): boolean {

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

@@ -5,6 +5,7 @@ import common from '@ohos.app.ability.common';
 import { DownloadTaskParams } from './DownloadTaskParams';
 import { bundleManager } from '@kit.AbilityKit';
 import { util } from '@kit.ArkTS';
+import logger from './Logger';
 import NativePatchCore, {
   STATE_OP_CLEAR_FIRST_TIME,
   STATE_OP_CLEAR_ROLLBACK_MARK,
@@ -26,10 +27,25 @@ export class UpdateContext {
   private static DEBUG: boolean = false;
   private static isUsingBundleUrl: boolean = false;
   private static ignoreRollback: boolean = false;
+  private static cachedPackageVersion: string = '';
+  private static cachedBuildTime: string = '';
+  // 单例：确保 bundle provider 与 TurboModule 共用同一份 preferences 内存状态，
+  // 避免 RNOH RN 实例重建后两处 UpdateContext 各自持有 preferences 缓存导致读写分裂。
+  private static instance: UpdateContext | null = null;
+  private static instanceCounter: number = 0;
+  private readonly instanceId: string;
+
+  public static getInstance(context: common.UIAbilityContext): UpdateContext {
+    if (!UpdateContext.instance) {
+      UpdateContext.instance = new UpdateContext(context);
+    }
+    return UpdateContext.instance;
+  }
 
-  constructor(context: common.UIAbilityContext) {
+  private constructor(context: common.UIAbilityContext) {
     this.context = context;
     this.rootDir = context.filesDir + '/_update';
+    this.instanceId = `uc#${++UpdateContext.instanceCounter}`;
 
     try {
       if (!fileIo.accessSync(this.rootDir)) {
@@ -39,12 +55,36 @@ export class UpdateContext {
       console.error('Failed to create root directory:', e);
     }
     this.initPreferences();
+    this.trace('ctor');
     this.syncStateWithBinaryVersion(
       this.getPackageVersion(),
       this.getBuildTime(),
     );
   }
 
+  /**
+   * 诊断日志：打印本实例 id 与关键状态，用于定位 preferences 多实例 / 状态分裂问题。
+   * 通过 hilog 输出，prefix=pushy，可在 hilog 中按 "UpdateContext" 过滤。
+   */
+  private trace(point: string): void {
+    const snap = this.getStateSnapshot();
+    logger.info(
+      'UpdateContext',
+      `trace id=${this.instanceId} ${point}` +
+        ` pkg=${snap.packageVersion} bt=${snap.buildTime}` +
+        ` cv=${snap.currentVersion} lv=${snap.lastVersion}` +
+        ` ft=${snap.firstTime} fto=${snap.firstTimeOk}` +
+        ` rb=${snap.rolledBackVersion}` +
+        ` flm=${this.readString('firstLoadMarked')}` +
+        ` uuidSet=${!!this.readString('uuid')}`,
+    );
+  }
+
+  /** 对外诊断入口，供 TurboModule 在 getConstants 等关键节点打印状态。 */
+  public logStateSnapshot(point: string): void {
+    this.trace(point);
+  }
+
   private initPreferences() {
     try {
       this.preferences = preferences.getPreferencesSync(this.context, {
@@ -60,11 +100,15 @@ export class UpdateContext {
   }
 
   public getPackageVersion(): string {
+    if (UpdateContext.cachedPackageVersion) {
+      return UpdateContext.cachedPackageVersion;
+    }
     try {
       const bundleInfo = bundleManager.getBundleInfoForSelfSync(
         this.getBundleFlags(),
       );
-      return bundleInfo?.versionName || 'Unknown';
+      UpdateContext.cachedPackageVersion = bundleInfo?.versionName || 'Unknown';
+      return UpdateContext.cachedPackageVersion;
     } catch (error) {
       console.error('Failed to get bundle info:', error);
       return '';
@@ -72,6 +116,9 @@ export class UpdateContext {
   }
 
   public getBuildTime(): string {
+    if (UpdateContext.cachedBuildTime) {
+      return UpdateContext.cachedBuildTime;
+    }
     try {
       const content =
         this.context.resourceManager.getRawFileContentSync('meta.json');
@@ -79,9 +126,12 @@ export class UpdateContext {
         new util.TextDecoder().decodeToString(content),
       ) as Record<string, string | number | boolean | null | undefined>;
       if (metaData.pushy_build_time) {
-        return String(metaData.pushy_build_time);
+        UpdateContext.cachedBuildTime = String(metaData.pushy_build_time);
+        return UpdateContext.cachedBuildTime;
       }
-    } catch {}
+    } catch (error) {
+      console.error('Failed to read build time from raw file:', error);
+    }
     return '';
   }
 
@@ -244,6 +294,9 @@ export class UpdateContext {
     packageVersion: string,
     buildTime: string,
   ): void {
+    if (!packageVersion || !buildTime) {
+      return;
+    }
     const currentState = this.getStateSnapshot();
     const nextState = NativePatchCore.syncStateWithBinaryVersion(
       packageVersion,
@@ -254,9 +307,17 @@ export class UpdateContext {
       return;
     }
 
+    logger.info(
+      'UpdateContext',
+      `binary version changed, resetting update state id=${this.instanceId}`,
+    );
     UpdateContext.ignoreRollback = false;
     this.cleanUp();
-    this.persistState(nextState, { clearExisting: true });
+    // 仅重置状态机字段（currentVersion / lastVersion / firstTime / firstTimeOk /
+    // rolledBackVersion）。不再 clearExisting，避免连带清除 uuid / firstLoadMarked /
+    // hash_* 等与 binary 版本无关的 KV —— 它们在多实例场景下本就脆弱，连带清除会
+    // 让 getConstants() 永远读到空，从而 isFirstTime=false、markSuccess 永不执行。
+    this.persistState(nextState);
   }
 
   public setKv(key: string, value: string): void {
@@ -373,8 +434,10 @@ export class UpdateContext {
         throw Error(`Bundle version ${hash} not found.`);
       }
 
+      this.trace(`switchVersion:before ${hash}`);
       this.runStateOperation(STATE_OP_SWITCH_VERSION, hash);
       UpdateContext.ignoreRollback = false;
+      this.trace(`switchVersion:after ${hash}`);
     } catch (e) {
       console.error('Failed to switch version:', e);
       throw e;
@@ -383,6 +446,7 @@ export class UpdateContext {
 
   public consumeFirstLoadMarker(): boolean {
     const marked = this.readString('firstLoadMarked') === 'true';
+    this.trace(`consumeFirstLoadMarker:marked=${marked}`);
     if (marked) {
       this.preferences.deleteSync('firstLoadMarked');
       this.flushPreferences('clear first load marker');
@@ -392,6 +456,7 @@ export class UpdateContext {
 
   public getBundleUrl() {
     UpdateContext.isUsingBundleUrl = true;
+    this.trace('getBundleUrl:enter');
     const launchState = NativePatchCore.runStateCore(
       STATE_OP_RESOLVE_LAUNCH,
       this.getStateSnapshot(),
@@ -407,6 +472,11 @@ export class UpdateContext {
     if (launchState.consumedFirstTime) {
       UpdateContext.ignoreRollback = true;
     }
+    this.trace(
+      `getBundleUrl:load=${launchState.loadVersion}` +
+        ` consumed=${launchState.consumedFirstTime}` +
+        ` rollback=${launchState.didRollback}`,
+    );
 
     let version = launchState.loadVersion || '';
     while (version) {
@@ -427,7 +497,9 @@ export class UpdateContext {
   }
 
   public getCurrentVersion(): string {
-    return this.getStateSnapshot().currentVersion || '';
+    const cv = this.getStateSnapshot().currentVersion || '';
+    this.trace(`getCurrentVersion:${cv}`);
+    return cv;
   }
 
   private rollBack(): string {

package/ios/ImportReact.h

@@ -0,0 +1,2 @@
+@import React;
+

package/package.json

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

package/react-native-update.podspec

@@ -104,6 +104,7 @@ Pod::Spec.new do |s|
 
   # Conditionally add Expo dependency
   if valid_expo_project
+    s.public_header_files = ['ios/ImportReact.h']
     s.dependency 'ExpoModulesCore'
   end
 

package/scripts/prepublish.ts

@@ -8,6 +8,12 @@ function normalizeVersion(version: string): string {
   return version.trim().replace(/^refs\/tags\//, '').replace(/^v/, '');
 }
 
+const SEMVER_REGEX = /^\d+\.\d+\.\d+(-.+)?$/;
+
+function isValidSemver(version: string): boolean {
+  return SEMVER_REGEX.test(version);
+}
+
 function getVersionFromEnvironment(): string | null {
   const candidates = [
     process.env.RELEASE_VERSION,
@@ -134,6 +140,13 @@ async function main(): Promise<void> {
   try {
     if (isGitHubCI()) {
       const version = await resolveVersion();
+      if (!isValidSemver(version)) {
+        throw new Error(
+          `Resolved version "${version}" is not a valid semantic version. ` +
+            `Please ensure RELEASE_VERSION, GITHUB_REF, or GITHUB_REF_NAME is set correctly, ` +
+            `or that the git history is fully fetched.`
+        );
+      }
       console.log(`Using publish version ${version}`);
       await modifyPackageJson({ version });
     } else {

package/src/core.ts

@@ -1,58 +1,59 @@
 import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import { emptyModule, error, log } from './utils';
 import i18n from './i18n';
+import { emptyModule, error, log } from './utils';
+
 /* eslint-disable @react-native/no-deep-imports */
 const {
-  version: v,
+	version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
 const isTurboModuleEnabled =
-  // https://github.com/facebook/react-native/pull/48362
-  (global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
+	// https://github.com/facebook/react-native/pull/48362
+	(global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
 
 export const PushyModule =
-  Platform.OS === 'web'
-    ? emptyModule
-    : isTurboModuleEnabled
-    ? require('./NativePushy').default
-    : NativeModules.Pushy;
+	Platform.OS === 'web'
+		? emptyModule
+		: isTurboModuleEnabled
+			? require('./NativePushy').default
+			: NativeModules.Pushy;
 
 export const UpdateModule = PushyModule;
 
 if (!PushyModule) {
-  throw Error(
-    'Failed to load react-native-update native module, please try to recompile',
-  );
+	throw Error(
+		'Failed to load react-native-update native module, please try to recompile',
+	);
 }
 
 const PushyConstants = isTurboModuleEnabled
-  ? PushyModule.getConstants()
-  : PushyModule;
+	? PushyModule.getConstants()
+	: PushyModule;
 
 export const downloadRootDir: string = PushyConstants.downloadRootDir;
 export const packageVersion: string = PushyConstants.packageVersion;
 export const currentVersion: string = PushyConstants.currentVersion;
 
 export function setLocalHashInfo(hash: string, info: Record<string, any>) {
-  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
+	PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
 }
 
 const currentVersionInfoString: string = PushyConstants.currentVersionInfo;
 let _currentVersionInfo: Record<string, any> = {};
 let isDebugChannel = false;
 if (currentVersionInfoString) {
-  try {
-    _currentVersionInfo = JSON.parse(currentVersionInfoString);
-    if (_currentVersionInfo.debugChannel) {
-      isDebugChannel = true;
-      delete _currentVersionInfo.debugChannel;
-      setLocalHashInfo(currentVersion, _currentVersionInfo);
-    }
-  } catch {
-    error(
-      i18n.t('error_parse_version_info', { info: currentVersionInfoString }),
-    );
-  }
+	try {
+		_currentVersionInfo = JSON.parse(currentVersionInfoString);
+		if (_currentVersionInfo.debugChannel) {
+			isDebugChannel = true;
+			delete _currentVersionInfo.debugChannel;
+			setLocalHashInfo(currentVersion, _currentVersionInfo);
+		}
+	} catch {
+		error(
+			i18n.t('error_parse_version_info', { info: currentVersionInfoString }),
+		);
+	}
 }
 export const currentVersionInfo = _currentVersionInfo;
 
@@ -64,32 +65,39 @@ export const isRolledBack: boolean = !!rolledBackVersion;
 export const buildTime: string = PushyConstants.buildTime;
 let uuid = PushyConstants.uuid;
 
-
 async function getLocalHashInfo(hash: string) {
-  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
+	return JSON.parse(await PushyModule.getLocalHashInfo(hash));
 }
 
 // @deprecated use currentVersionInfo instead
 export async function getCurrentVersionInfo(): Promise<{
-  name?: string;
-  description?: string;
-  metaInfo?: string;
+	name?: string;
+	description?: string;
+	metaInfo?: string;
 }> {
-  return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
+	return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
 }
 
 export const pushyNativeEventEmitter = new NativeEventEmitter(PushyModule);
 
 if (!uuid) {
-  uuid = require('nanoid/non-secure').nanoid();
-  PushyModule.setUuid(uuid);
+	uuid = require('nanoid/non-secure').nanoid();
+	PushyModule.setUuid(uuid);
 }
 
-log('uuid: ' + uuid);
-
 export const cInfo = {
-  rnu: require('../package.json').version,
-  rn: RNVersion,
-  os: Platform.OS + ' ' + Platform.Version,
-  uuid,
+	rnu: require('../package.json').version,
+	rn: RNVersion,
+	os: `${Platform.OS} ${Platform.Version}`,
+	uuid,
 };
+
+log('bootup status', {
+	packageVersion,
+	currentVersion,
+	currentVersionInfo,
+	isFirstTime,
+	isFirstTimeDebug,
+	isDebugChannel,
+	cInfo,
+});