fix expo reload

Author: sunnylqm

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

@@ -152,8 +152,13 @@ public void run() {
                         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.json

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

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]) {