react-native-update 10.42.5 → 10.42.7

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

@@ -9,36 +9,35 @@ import { UpdateContext } from './UpdateContext';
 
 export class PushyFileJSBundleProvider extends JSBundleProvider {
   private updateContext: UpdateContext;
-  private path: string = '';
 
   constructor(context: common.UIAbilityContext) {
     super();
     this.updateContext = new UpdateContext(context);
-    this.path = this.updateContext.getBundleUrl();
   }
 
   getURL(): string {
-    return this.path;
+    return this.updateContext.getBundleUrl();
   }
 
   async getBundle(): Promise<FileJSBundle> {
-    if (!this.path) {
+    const path = this.updateContext.getBundleUrl();
+    if (!path) {
       throw new JSBundleProviderError({
         whatHappened: 'No pushy bundle found. using default bundle',
         howCanItBeFixed: [''],
       });
     }
     try {
-      await fs.access(this.path, fs.OpenMode.READ_ONLY);
+      await fs.access(path, fs.OpenMode.READ_ONLY);
       return {
-        filePath: this.path,
+        filePath: path,
       };
     } catch (error) {
       throw new JSBundleProviderError({
-        whatHappened: `Couldn't load JSBundle from ${this.path}`,
+        whatHappened: `Couldn't load JSBundle from ${path}`,
         extraData: error,
         howCanItBeFixed: [
-          `Check if a bundle exists at "${this.path}" on your device.`,
+          `Check if a bundle exists at "${path}" on your device.`,
         ],
       });
     }

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

@@ -65,6 +65,17 @@ export class PushyTurboModule extends UITurboModule {
     await this.mUiCtx.startAbility(want);
   }
 
+  private async reloadBridge(): Promise<void> {
+    const devToolsController = (this.ctx as Record<string, any>).devToolsController;
+    if (devToolsController) {
+      logger.debug(TAG, 'reloadBridge via devToolsController RELOAD');
+      devToolsController.eventEmitter.emit("RELOAD", { reason: 'HotReload2' });
+    } else {
+      logger.debug(TAG, 'reloadBridge via restartAbility');
+      await this.restartAbility();
+    }
+  }
+
   getConstants(): Object {
     logger.debug(TAG, ',call getConstants');
     const packageVersion = this.context.getPackageVersion();
@@ -121,7 +132,7 @@ export class PushyTurboModule extends UITurboModule {
 
     try {
       this.context.switchVersion(hash);
-      await this.restartAbility();
+      await this.reloadBridge();
     } catch (error) {
       logger.error(TAG, `reloadUpdate failed: ${getErrorMessage(error)}`);
       throw Error(`switchVersion failed ${getErrorMessage(error)}`);
@@ -131,7 +142,7 @@ export class PushyTurboModule extends UITurboModule {
   async restartApp(): Promise<void> {
     logger.debug(TAG, ',call restartApp');
     try {
-      await this.restartAbility();
+      await this.reloadBridge();
     } catch (error) {
       logger.error(TAG, `restartApp failed: ${getErrorMessage(error)}`);
       throw Error(`restartApp failed ${getErrorMessage(error)}`);

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

@@ -26,6 +26,8 @@ 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 = '';
 
   constructor(context: common.UIAbilityContext) {
     this.context = context;
@@ -60,11 +62,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 +78,9 @@ export class UpdateContext {
   }
 
   public getBuildTime(): string {
+    if (UpdateContext.cachedBuildTime) {
+      return UpdateContext.cachedBuildTime;
+    }
     try {
       const content =
         this.context.resourceManager.getRawFileContentSync('meta.json');
@@ -79,9 +88,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 +256,9 @@ export class UpdateContext {
     packageVersion: string,
     buildTime: string,
   ): void {
+    if (!packageVersion || !buildTime) {
+      return;
+    }
     const currentState = this.getStateSnapshot();
     const nextState = NativePatchCore.syncStateWithBinaryVersion(
       packageVersion,

package/ios/ImportReact.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.42.5",
+  "version": "10.42.7",
   "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,
+});