react-native-update 10.29.0-beta.2 → 10.29.1

package/android/proguard.pro

@@ -1,3 +1,37 @@
+# Keep our update module classes
 -keepnames class cn.reactnative.modules.update.DownloadTask { *; }
 -keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
--keepnames class com.facebook.react.ReactInstanceManager { *; }
+-keepnames class cn.reactnative.modules.update.** { *; }
+
+# Keep React Native classes
+-keepnames class com.facebook.react.ReactInstanceManager { *; }
+-keepnames class com.facebook.react.** { *; }
+-keepnames class com.facebook.react.bridge.** { *; }
+-keepnames class com.facebook.react.devsupport.** { *; }
+
+# Keep fields used in reflection
+-keepclassmembers class com.facebook.react.ReactInstanceManager {
+    private JSBundleLoader mBundleLoader;
+    private String mJSBundleFile;
+}
+
+-keepclassmembers class com.facebook.react.ReactDelegate {
+    private ReactHost mReactHost;
+}
+
+-keepclassmembers class com.facebook.react.ReactHost {
+    private boolean mUseDevSupport;
+    private ReactHostDelegate mReactHostDelegate;
+}
+
+# Keep Expo related classes
+-keepnames class expo.modules.ExpoReactHostFactory$ExpoReactHostDelegate { *; }
+
+# Keep methods used in reflection
+-keepclassmembers class com.facebook.react.ReactActivity {
+    public ReactDelegate getReactDelegate();
+}
+
+-keepclassmembers class com.facebook.react.ReactHost {
+    public void reload(java.lang.String);
+}

package/android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -169,17 +169,19 @@ public class UpdateContext {
     }
 
     public void markSuccess() {
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putBoolean("firstTimeOk", true);
-        String lastVersion = sp.getString("lastVersion", null);
-        String curVersion = sp.getString("currentVersion", null);
-        if (lastVersion != null && !lastVersion.equals(curVersion)) {
-            editor.remove("lastVersion");
-            editor.remove("hash_" + lastVersion);
-        }
-        editor.apply();
+        if (!BuildConfig.DEBUG) {
+            SharedPreferences.Editor editor = sp.edit();
+            editor.putBoolean("firstTimeOk", true);
+            String lastVersion = sp.getString("lastVersion", null);
+            String curVersion = sp.getString("currentVersion", null);
+            if (lastVersion != null && !lastVersion.equals(curVersion)) {
+                editor.remove("lastVersion");
+                editor.remove("hash_" + lastVersion);
+            }
+            editor.apply();
 
-        this.cleanUp();
+            this.cleanUp();
+        }
     }
 
     public void clearFirstTime() {

package/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java

@@ -147,13 +147,22 @@ public class UpdateModuleImpl {
                         reactHostField.setAccessible(true);
                         Object reactHost = reactHostField.get(reactDelegate);
 
+                        Field devSupport = reactHost.getClass().getDeclaredField("mUseDevSupport");
+                        devSupport.setAccessible(true);
+                        devSupport.set(reactHost, false);
+
                         // Access the mReactHostDelegate field
                         Field reactHostDelegateField = reactHost.getClass().getDeclaredField("mReactHostDelegate");
                         reactHostDelegateField.setAccessible(true);
                         Object reactHostDelegate = reactHostDelegateField.get(reactHost);
 
+                        String bundleFieldName = "jsBundleLoader";
+                        if (reactHostDelegate.getClass().getCanonicalName().equals("expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate")) {
+                            bundleFieldName = "_jsBundleLoader";
+                        }
+
                         // Modify the jsBundleLoader field
-                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+                        Field jsBundleLoaderField = reactHostDelegate.getClass().getDeclaredField(bundleFieldName);
                         jsBundleLoaderField.setAccessible(true);
                         jsBundleLoaderField.set(reactHostDelegate, loader);
                         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.29.0-beta.2",
+  "version": "10.29.1",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -72,6 +72,5 @@
     "react-native": "0.73",
     "ts-jest": "^29.3.2",
     "typescript": "^5.6.3"
-  },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  }
 }

package/src/client.ts

@@ -1,33 +1,33 @@
-import { CheckResult, ClientOptions, ProgressData, EventType } from './type';
-import {
-  assertWeb,
-  emptyObj,
-  enhancedFetch,
-  joinUrls,
-  log,
-  noop,
-  promiseAny,
-  testUrls,
-} from './utils';
 import {
+  DeviceEventEmitter,
   EmitterSubscription,
   Platform,
-  DeviceEventEmitter,
 } from 'react-native';
-import { PermissionsAndroid } from './permissions';
 import {
   PushyModule,
   buildTime,
   cInfo,
-  pushyNativeEventEmitter,
   currentVersion,
+  getCurrentVersionInfo,
+  isFirstTime,
+  isRolledBack,
   packageVersion,
+  pushyNativeEventEmitter,
   rolledBackVersion,
   setLocalHashInfo,
-  isFirstTime,
-  isRolledBack,
-  getCurrentVersionInfo,
 } from './core';
+import { PermissionsAndroid } from './permissions';
+import { CheckResult, ClientOptions, EventType, ProgressData } from './type';
+import {
+  assertWeb,
+  emptyObj,
+  enhancedFetch,
+  joinUrls,
+  log,
+  noop,
+  promiseAny,
+  testUrls,
+} from './utils';
 
 const SERVER_PRESETS = {
   // cn
@@ -395,7 +395,7 @@ export class Pushy {
     let lastError: any;
     let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));
-    if (diffUrl) {
+    if (diffUrl && !__DEV__) {
       log('downloading diff');
       try {
         await PushyModule.downloadPatchFromPpk({
@@ -408,16 +408,12 @@ export class Pushy {
         const errorMessage = `diff error: ${e.message}`;
         errorMessages.push(errorMessage);
         lastError = new Error(errorMessage);
-        if (__DEV__) {
-          succeeded = 'diff';
-        } else {
-          log(errorMessage);
-        }
+        log(errorMessage);
       }
     }
     if (!succeeded) {
       const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
-      if (pdiffUrl) {
+      if (pdiffUrl && !__DEV__) {
         log('downloading pdiff');
         try {
           await PushyModule.downloadPatchFromPackage({
@@ -429,12 +425,7 @@ export class Pushy {
           const errorMessage = `pdiff error: ${e.message}`;
           errorMessages.push(errorMessage);
           lastError = new Error(errorMessage);
-          if (__DEV__ && !full) {
-            succeeded = 'pdiff';
-            log('当前是开发环境，无法执行增量式热更新。如果需要在开发环境中测试全量热更新，请打开“忽略时间戳”开关再重试。');
-          } else {
-            log(errorMessage);
-          }
+          log(errorMessage);
         }
       }
     }
@@ -452,12 +443,15 @@ export class Pushy {
           const errorMessage = `full patch error: ${e.message}`;
           errorMessages.push(errorMessage);
           lastError = new Error(errorMessage);
-          if (__DEV__) {
-            succeeded = 'full';
-          } else {
-            log(errorMessage);
-          }
+          log(errorMessage);
         }
+      } else if (__DEV__) {
+        log(
+          `当前是开发环境，无法执行增量式热更新，重启不会生效。
+          如果需要在开发环境中测试可生效的全量热更新（但也会在再次重启后重新连接 metro），
+          请打开“忽略时间戳”开关再重试。`,
+        );
+        succeeded = 'full';
       }
     }
     if (sharedState.progressHandlers[hash]) {

package/android/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>react-native-update</name>
-	<comment>Project react-native-update created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1727963310481</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

package/android/bin/.project

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>react-native-update</name>
-	<comment>Project react-native-update created by Buildship.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1727963310481</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

package/android/bin/.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +0,0 @@
-arguments=--init-script /var/folders/l6/0fn3x28s5s585ld3p04gsy1h0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/l6/0fn3x28s5s585ld3p04gsy1h0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
-auto.sync=false
-build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
-connection.project.dir=
-eclipse.preferences.version=1
-gradle.user.home=
-java.home=/Users/sunny/.sdkman/candidates/java/17.0.9-zulu/zulu-17.jdk/Contents/Home
-jvm.arguments=
-offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true