react-native-update 10.27.0 → 10.28.0

package/android/build.gradle

@@ -22,14 +22,42 @@ def supportsNamespace() {
   return major >= 8
 }
 
+def isExpoProject() {
+    def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
+
+    def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
+    def hasExpoDependency = false
+    if (packageJsonFile.exists()) {
+        def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
+        hasExpoDependency = (packageJson.dependencies?.expo != null) || 
+                           (packageJson.devDependencies?.expo != null)
+    }
+    
+    return hasExpoModulesCore || hasExpoDependency
+}
+
+def expoProject = isExpoProject()
+
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
 
+if (expoProject) {
+    group = 'expo.modules.pushy'
+    version = '1.0.0'
 
-android {
+    def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+    useCoreDependencies()
+    useExpoPublishing()
+} else {
+    group = 'cn.reactnative.modules.update'
+    version = '1.0.0'
+}
 
+android {
     if (supportsNamespace()) {
         namespace "cn.reactnative.modules.update"
 
@@ -41,7 +69,6 @@ android {
     }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
-
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
         targetSdkVersion safeExtGet('targetSdkVersion', 27)
@@ -50,6 +77,7 @@ android {
         consumerProguardFiles "proguard.pro"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
+    
     sourceSets {
         main {
             // let gradle pack the shared library into apk
@@ -59,6 +87,12 @@ android {
             } else {
                 java.srcDirs += ['src/oldarch']
             }
+            
+            if (expoProject) {
+                java.srcDirs += ['java/expo/modules/pushy']
+            } else {
+                java.exclude 'expo/modules/pushy/**'
+            }
         }
     }
 
@@ -70,6 +104,10 @@ android {
             resValue("string", "pushy_build_time", "0")
         }
     }
+    
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {

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

@@ -0,0 +1,13 @@
+package cn.reactnative.modules.update;
+
+import androidx.annotation.Nullable;
+
+public interface ReactNativeHostHandler {
+    @Nullable
+    String getJSBundleFile(boolean useDeveloperSupport);
+    
+    @Nullable
+    String getBundleAssetName(boolean useDeveloperSupport);
+    
+    void onWillCreateReactInstance(boolean useDeveloperSupport);
+} 

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

@@ -7,14 +7,11 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
 import android.util.Log;
-
 import com.facebook.react.ReactInstanceManager;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-
 import java.io.File;
 
 public class UpdateContext {

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

@@ -176,6 +176,35 @@ public class UpdateModuleImpl {
         });
     }
 
+    public static void restartApp(final ReactApplicationContext mContext, Promise promise) {
+          UiThreadUtil.runOnUiThread(new Runnable() {
+              @Override
+              public void run() {
+                  try {
+                      final Context application = mContext.getApplicationContext();
+                      ReactInstanceManager instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+
+                      instanceManager.recreateReactContextInBackground();
+                      promise.resolve(true);
+
+                  } catch (Throwable err) {
+                      promise.reject("restartApp failed: "+err.getMessage());
+                      Log.e("pushy", "restartApp failed", err);
+
+                      final Activity currentActivity = mContext.getCurrentActivity();
+                      if (currentActivity == null) {
+                          return;
+                      }
+                      currentActivity.runOnUiThread(new Runnable() {
+                          @Override
+                          public void run() {
+                              currentActivity.recreate();
+                          }
+                      });
+                  }
+              }
+          });
+      }
 
     public static void setNeedUpdate(UpdateContext updateContext, ReadableMap options, Promise promise) {
         final String hash = options.getString("hash");

package/android/src/main/java/expo/modules/pushy/ExpoPushyModule.kt

@@ -0,0 +1,10 @@
+package expo.modules.pushy
+
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class ExpoPushyModule : Module() {
+  override fun definition() = ModuleDefinition {
+    Name("ExpoPushy")
+  }
+}

package/android/src/main/java/expo/modules/pushy/ExpoPushyPackage.java

@@ -0,0 +1,27 @@
+package expo.modules.pushy;
+
+import android.content.Context;
+import android.util.Log;
+import androidx.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import cn.reactnative.modules.update.UpdateContext;
+import expo.modules.core.interfaces.Package;
+import expo.modules.core.interfaces.ReactNativeHostHandler;
+
+public class ExpoPushyPackage  implements Package {
+    @Override
+    public List<ReactNativeHostHandler> createReactNativeHostHandlers(Context context) {
+        List<ReactNativeHostHandler> handlers = new ArrayList<>();
+        handlers.add(new ReactNativeHostHandler() {
+            @Nullable
+            @Override
+            public String getJSBundleFile(boolean useDeveloperSupport) {
+                return UpdateContext.getBundleUrl(context);
+            }
+        });
+        return handlers;
+    }
+}

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

@@ -97,6 +97,11 @@ public class UpdateModule extends NativePushySpec {
         UpdateModuleImpl.reloadUpdate(updateContext, mContext, options,promise);
     }
 
+    @Override
+    public void restartApp(Promise promise) {
+        UpdateModuleImpl.restartApp(updateContext, mContext, promise);
+    }
+
     @Override
     public void setNeedUpdate(ReadableMap options,Promise promise) {
         UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);

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

@@ -224,6 +224,29 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         });
     }
 
+    @ReactMethod
+    public void restartApp(final Promise promise) {
+
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    final Context application = getReactApplicationContext().getApplicationContext();
+                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
+                    if (instanceManager == null) {
+                        instanceManager = ((ReactApplication) application).getReactNativeHost().getReactInstanceManager();
+                    }
+                    instanceManager.recreateReactContextInBackground();
+                    promise.resolve(true);
+
+                } catch (Throwable err) {
+                    promise.reject(err);
+                    Log.e("pushy", "restartApp failed ", err);
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void setNeedUpdate(ReadableMap options) {
         final String hash = options.getString("hash");

package/expo-module.config.json

@@ -0,0 +1,13 @@
+{
+ "platforms": ["apple", "android"],
+  "apple": {
+    "modules": ["ExpoPushyModule"],
+    "reactDelegateHandlers": ["ExpoPushyReactDelegateHandler"],
+    "podspecPath":"react-native-update.podspec"
+  },
+  "android": {
+    "modules": [
+      "expo.modules.pushy.ExpoPushyModule"
+    ]
+  }
+}

package/ios/Expo/ExpoPushyModule.swift

@@ -0,0 +1,7 @@
+import ExpoModulesCore
+
+public class ExpoPushyModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoPushy")
+  }
+}

package/ios/Expo/ExpoPushyReactDelegateHandler.swift

@@ -0,0 +1,10 @@
+import ExpoModulesCore
+import react_native_update
+
+public final class ExpoPushyReactDelegateHandler: ExpoReactDelegateHandler {
+  private weak var reactDelegate: ExpoReactDelegate?
+
+  public override func bundleURL(reactDelegate: ExpoReactDelegate) -> URL? {
+    return  RCTPushy.bundleURL()
+  }
+}

package/ios/RCTPushy/RCTPushy.mm

@@ -338,6 +338,26 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
     }
 }
 
+RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    @try {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.bridge reload];
+        });
+        #if __has_include("RCTReloadCommand.h")
+            // reload 0.62+
+            RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+            RCTTriggerReloadCommandListeners(@"pushy restartApp");
+        #endif
+
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", exception.reason, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {

package/package.json

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

package/react-native-update.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.platform = :ios, "8.0"
   s.platforms = { :ios => "11.0" }
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
-  s.source_files    = "ios/**/*.{h,m,mm,swift}"
+  s.source_files    = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") }
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -33,11 +33,25 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
+  project_root = File.expand_path('../../', __dir__)
+  project_package_json = File.join(project_root, 'package.json')
+  is_expo_project = false
+
+  if (File.exist?(project_package_json))
+    package_json = JSON.parse(File.read(project_package_json))
+    has_expo_dependency = package_json['dependencies'] && package_json['dependencies']['expo']
+    has_expo_modules_core = Dir.exist?('node_modules/expo-modules-core')
+    is_expo_project = has_expo_dependency || has_expo_modules_core
+    if is_expo_project
+      s.dependency 'ExpoModulesCore'
+    end
+  end
+
   s.subspec 'RCTPushy' do |ss|
     ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
     ss.public_header_files = ['ios/RCTPushy/RCTPushy.h']
   end
-  
+
   s.subspec 'HDiffPatch' do |ss|
     ss.source_files = ['ios/RCTPushy/HDiffPatch/**/*.{h,m,c}',
                        'android/jni/hpatch.{h,c}',
@@ -47,7 +61,13 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
-  
+
+  if is_expo_project
+    s.subspec 'Expo' do |ss|
+      ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
+    end
+  end
+
   if defined?(install_modules_dependencies()) != nil
     install_modules_dependencies(s);
   else
@@ -60,7 +80,6 @@ Pod::Spec.new do |s|
           "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
       }
-
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

package/src/NativePushy.ts

@@ -15,6 +15,7 @@ export interface Spec extends TurboModule {
   getLocalHashInfo(hash: string): Promise<string>;
   setUuid(uuid: string): Promise<void>;
   reloadUpdate(options: { hash: string }): Promise<void>;
+  restartApp(): Promise<void>;
   setNeedUpdate(options: { hash: string }): Promise<void>;
   markSuccess(): Promise<void>;
   downloadPatchFromPpk(options: {

package/src/client.ts

@@ -544,6 +544,9 @@ export class Pushy {
       delete Pushy.progressHandlers[progressKey];
     }
   };
+  restartApp = async () => {
+    return PushyModule.restartApp();
+  };
 }
 
 // for international users

package/src/context.ts

@@ -13,6 +13,7 @@ export const defaultContext = {
   dismissError: noop,
   downloadUpdate: asyncNoop,
   downloadAndInstallApk: asyncNoop,
+  restartApp: asyncNoop,
   getCurrentVersionInfo: () => Promise.resolve({}),
   parseTestQrCode: () => false,
   currentHash: '',
@@ -33,6 +34,7 @@ export const UpdateContext = createContext<{
     metaInfo?: string;
   }>;
   parseTestQrCode: (code: string) => boolean;
+  restartApp: () => Promise<void>;
   currentHash: string;
   packageVersion: string;
   client?: Pushy | Cresc;

package/src/provider.tsx

@@ -316,6 +316,10 @@ export const UpdateProvider = ({
     [parseTestPayload],
   );
 
+  const restartApp = useCallback(async () => {
+    return client.restartApp();
+  }, [client]);
+
   useEffect(() => {
     const parseLinking = (url: string | null) => {
       if (!url) {
@@ -361,6 +365,7 @@ export const UpdateProvider = ({
         downloadAndInstallApk,
         getCurrentVersionInfo,
         parseTestQrCode,
+        restartApp,
       }}>
       {children}
     </UpdateContext.Provider>

package/src/utils.ts

@@ -49,16 +49,16 @@ const ping =
                 return url;
               }
               log('ping failed', url, status, statusText);
-              return null;
+              throw new Error('Ping failed');
             })
             .catch(e => {
               pingFinished = true;
               log('ping error', url, e);
-              return null;
+              throw e;
             }),
-          new Promise(r =>
+          new Promise((_, reject) =>
             setTimeout(() => {
-              r(null);
+              reject(new Error('Ping timeout'));
               if (!pingFinished) {
                 log('ping timeout', url);
               }
@@ -77,10 +77,13 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-  const ret = await promiseAny(urls.map(ping));
-  if (ret) {
-    return ret;
-  }
+
+  try {
+    const ret = await promiseAny(urls.map(ping));
+    if (ret) {
+      return ret;
+    }
+  } catch {}
   log('all ping failed, use first url:', urls[0]);
   return urls[0];
 };