react-native-update 10.31.0-beta.1 → 10.31.0-beta.2

package/.cursor/mcp.json

@@ -1,10 +1,10 @@
 {
   "mcpServers": {
     "RadonAi": {
-      "url": "http://127.0.0.1:50274/mcp",
+      "url": "http://127.0.0.1:53295/mcp",
       "type": "http",
       "headers": {
-        "nonce": "78c8e940-a1ff-41f3-87e0-8a7860bb0749"
+        "nonce": "e61c8e82-c274-465b-b991-2d3541f19dbc"
       }
     }
   }

package/android/src/newarch/cn/reactnative/modules/update/UpdateModule.java

@@ -35,7 +35,9 @@ public class UpdateModule extends NativePushySpec {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        constants.put("currentVersion", updateContext.getCurrentVersion());
+        String currentVersion = updateContext.getCurrentVersion();
+        constants.put("currentVersion", currentVersion);
+        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();

package/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

@@ -48,7 +48,9 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         final Map<String, Object> constants = new HashMap<>();
         constants.put("downloadRootDir", updateContext.getRootDir());
         constants.put("packageVersion", updateContext.getPackageVersion());
-        constants.put("currentVersion", updateContext.getCurrentVersion());
+        String currentVersion = updateContext.getCurrentVersion();
+        constants.put("currentVersion", currentVersion);
+        constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
         boolean isFirstTime = updateContext.isFirstTime();

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

@@ -32,6 +32,7 @@ getConstants(): Object {
   const rolledBackVersion = preferencesManager.getSync("rolledBackVersion", "") as string;
   const uuid = preferencesManager.getSync("uuid", "") as string;
   const currentVersion = preferencesManager.getSync("currentVersion", "") as string;
+  const currentVersionInfo = this.context.getKv(`hash_${currentVersion}`);
   const buildTime = preferencesManager.getSync("buildTime", "") as string;
   const isUsingBundleUrl = this.context.getIsUsingBundleUrl();
   let bundleFlags = bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
@@ -53,6 +54,7 @@ getConstants(): Object {
 
   return {
     downloadRootDir: `${context.filesDir}/_update`,
+    currentVersionInfo,
     packageVersion,
     currentVersion,
     buildTime,
@@ -64,13 +66,13 @@ getConstants(): Object {
 }
 
 
-  async setLocalHashInfo(hash: string, info: string): Promise<boolean>  {
+  setLocalHashInfo(hash: string, info: string): boolean  {
     logger.debug(TAG, ",call setLocalHashInfo");
-    return UpdateModuleImpl.setLocalHashInfo(this.context,hash,info);
+    return UpdateModuleImpl.setLocalHashInfo(this.context, hash, info);
   }
 
-  async getLocalHashInfo(hash: string): Promise<string> {
-    return UpdateModuleImpl.getLocalHashInfo(this.context,hash);
+  getLocalHashInfo(hash: string): string {
+    return UpdateModuleImpl.getLocalHashInfo(this.context, hash);
   }
 
   async setUuid(uuid: string): Promise<boolean>  {

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

@@ -50,8 +50,8 @@ export class UpdateContext {
          this.preferences.flush();
     }
 
-    public  getKv(key: string): string {
-        return  this.preferences.getSync(key, '') as string;
+    public getKv(key: string): string {
+        return this.preferences.getSync(key, '') as string;
     }
 
     public  isFirstTime(): boolean {

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

@@ -171,27 +171,20 @@ export class UpdateModuleImpl {
     }
   }
 
-  static async setLocalHashInfo(
+  static setLocalHashInfo(
     updateContext: UpdateContext,
     hash: string,
     info: string
-  ): Promise<boolean> {
-    if (!this.checkJson(info)) {
-      await updateContext.setKv(`hash_${hash}`, info);
-      throw new Error('校验报错:json字符串格式错误');
-    }
-    await updateContext.setKv(`hash_${hash}`, info);
+  ): boolean {
+    updateContext.setKv(`hash_${hash}`, info);
     return true;
   }
 
-  static async getLocalHashInfo(
+  static getLocalHashInfo(
     updateContext: UpdateContext,
     hash: string
-  ): Promise<string> {
-    const value = await updateContext.getKv(`hash_${hash}`);
-    if (!this.checkJson(value)) {
-      throw new Error('校验报错:json字符串格式错误');
-    }
+  ): string {
+    const value = updateContext.getKv(`hash_${hash}`);
     return value;
   }
 }

package/ios/RCTPushy/RCTPushy.mm

@@ -176,7 +176,9 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
     ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
-    ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];
+    NSString *currentVersion = [pushyInfo objectForKey:paramCurrentVersion];
+    ret[@"currentVersion"] = currentVersion;
+    ret[@"currentVersionInfo"] = [pushyInfo objectForKey:[keyHashInfo stringByAppendingString:currentVersion]];
     
     // clear isFirstTimemarked
     if (ret[@"isFirstTime"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.31.0-beta.1",
+  "version": "10.31.0-beta.2",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/client.ts

@@ -478,11 +478,7 @@ export class Pushy {
           log(errorMessage);
         }
       } else if (__DEV__) {
-        log(
-          `当前是开发环境，无法执行增量式热更新，重启不会生效。
-          如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），
-          请打开“忽略时间戳”开关再重试。`,
-        );
+        log(this.t('dev_incremental_update_disabled'));
         succeeded = 'full';
       }
     }

package/src/context.ts

@@ -18,6 +18,7 @@ export const defaultContext = {
   parseTestQrCode: () => false,
   currentHash: '',
   packageVersion: '',
+  currentVersionInfo: {},
 };
 
 export const UpdateContext = createContext<{
@@ -28,11 +29,17 @@ export const UpdateContext = createContext<{
   dismissError: () => void;
   downloadUpdate: () => Promise<boolean | void>;
   downloadAndInstallApk: (url: string) => Promise<void>;
+  // @deprecated use currentVersionInfo instead
   getCurrentVersionInfo: () => Promise<{
     name?: string;
     description?: string;
     metaInfo?: string;
   }>;
+  currentVersionInfo: {
+    name?: string;
+    description?: string;
+    metaInfo?: string;
+  } | null;
   parseTestQrCode: (code: string) => boolean;
   restartApp: () => Promise<void>;
   currentHash: string;

package/src/core.ts

@@ -30,6 +30,21 @@ const PushyConstants = isTurboModuleEnabled
 export const downloadRootDir: string = PushyConstants.downloadRootDir;
 export const packageVersion: string = PushyConstants.packageVersion;
 export const currentVersion: string = PushyConstants.currentVersion;
+
+const currentVersionInfoString: string = PushyConstants.currentVersionInfo;
+let _currentVersionInfo = {};
+if (currentVersionInfoString) {
+  try {
+    _currentVersionInfo = JSON.parse(currentVersionInfoString);
+  } catch (error) {
+    console.error(
+      'Failed to parse currentVersionInfo:',
+      currentVersionInfoString,
+    );
+  }
+}
+export const currentVersionInfo = _currentVersionInfo;
+
 export const isFirstTime: boolean = PushyConstants.isFirstTime;
 export const rolledBackVersion: string = PushyConstants.rolledBackVersion;
 export const isRolledBack: boolean = typeof rolledBackVersion === 'string';
@@ -45,6 +60,7 @@ async function getLocalHashInfo(hash: string) {
   return JSON.parse(await PushyModule.getLocalHashInfo(hash));
 }
 
+// @deprecated use currentVersionInfo instead
 export async function getCurrentVersionInfo(): Promise<{
   name?: string;
   description?: string;

package/src/locales/en.ts

@@ -67,4 +67,8 @@ export default {
   // More alert messages
   alert_new_version_found:
     'New version {{name}} found. Download now?\n{{description}}',
+
+  // 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.',
 };

package/src/locales/zh.ts

@@ -64,4 +64,8 @@ export default {
   // More alert messages
   alert_new_version_found:
     '检查到新的版本{{name}}，是否下载？\n{{description}}',
+
+  // Development environment messages
+  dev_incremental_update_disabled:
+    '当前是开发环境，无法执行增量式热更新，重启不会生效。如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），请打开"忽略时间戳"开关再重试。',
 };

package/src/provider.tsx

@@ -13,7 +13,7 @@ import {
   Linking,
 } from 'react-native';
 import { Pushy, Cresc, sharedState } from './client';
-import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
+import { currentVersion, packageVersion, getCurrentVersionInfo, currentVersionInfo } from './core';
 import {
   CheckResult,
   MixedCheckResult,
@@ -23,7 +23,7 @@ import {
 import { UpdateContext } from './context';
 import { URL } from 'react-native-url-polyfill';
 import { isInRollout } from './isInRollout';
-import { log } from './utils';
+import { assertWeb, log } from './utils';
 
 export const UpdateProvider = ({
   client,
@@ -277,6 +277,9 @@ export const UpdateProvider = ({
     if (!client.assertDebug('checkUpdate()')) {
       return;
     }
+    if (!assertWeb()) {
+      return;
+    }
     const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (autoMarkSuccess) {
       setTimeout(() => {
@@ -351,6 +354,9 @@ export const UpdateProvider = ({
   }, [client]);
 
   useEffect(() => {
+    if (!assertWeb()) {
+      return;
+    }
     const parseLinking = (url: string | null) => {
       if (!url) {
         return;
@@ -394,6 +400,7 @@ export const UpdateProvider = ({
         progress,
         downloadAndInstallApk,
         getCurrentVersionInfo,
+        currentVersionInfo,
         parseTestQrCode,
         restartApp,
       }}>

package/src/utils.ts

@@ -5,6 +5,8 @@ export function log(...args: any[]) {
   console.log(i18n.t('dev_log_prefix'), ...args);
 }
 
+export const isWeb = Platform.OS === 'web';
+
 export function promiseAny<T>(promises: Promise<T>[]) {
   return new Promise<T>((resolve, reject) => {
     let count = 0;
@@ -35,38 +37,37 @@ class EmptyModule {
 }
 export const emptyModule = new EmptyModule();
 
-const ping =
-  Platform.OS === 'web'
-    ? Promise.resolve
-    : async (url: string) => {
-        let pingFinished = false;
-        return Promise.race([
-          enhancedFetch(url, {
-            method: 'HEAD',
+const ping = isWeb
+  ? Promise.resolve
+  : async (url: string) => {
+      let pingFinished = false;
+      return Promise.race([
+        enhancedFetch(url, {
+          method: 'HEAD',
+        })
+          .then(({ status, statusText, url: finalUrl }) => {
+            pingFinished = true;
+            if (status === 200) {
+              return finalUrl;
+            }
+            log('ping failed', url, status, statusText);
+            throw new Error(i18n.t('error_ping_failed'));
           })
-            .then(({ status, statusText, url: finalUrl }) => {
-              pingFinished = true;
-              if (status === 200) {
-                return finalUrl;
-              }
-              log('ping failed', url, status, statusText);
-              throw new Error(i18n.t('error_ping_failed'));
-            })
-            .catch(e => {
-              pingFinished = true;
-              log('ping error', url, e);
-              throw e;
-            }),
-          new Promise((_, reject) =>
-            setTimeout(() => {
-              reject(new Error(i18n.t('error_ping_timeout')));
-              if (!pingFinished) {
-                log('ping timeout', url);
-              }
-            }, 5000),
-          ),
-        ]);
-      };
+          .catch(e => {
+            pingFinished = true;
+            log('ping error', url, e);
+            throw e;
+          }),
+        new Promise((_, reject) =>
+          setTimeout(() => {
+            reject(new Error(i18n.t('error_ping_timeout')));
+            if (!pingFinished) {
+              log('ping timeout', url);
+            }
+          }, 5000),
+        ),
+      ]);
+    };
 
 export function joinUrls(paths: string[], fileName?: string) {
   if (fileName) {
@@ -91,7 +92,7 @@ export const testUrls = async (urls?: string[]) => {
 };
 
 export const assertWeb = () => {
-  if (Platform.OS === 'web') {
+  if (isWeb) {
     console.warn(i18n.t('dev_web_not_supported'));
     return false;
   }