fix type error

* support to Expo

* update

* update

* update

---------

Co-authored-by: Steven <steven@Stevens-MacBook-Pro.local>

.nvmrc

@@ -1 +0,0 @@
-18

Example/testHotUpdate/.nvmrc

@@ -1 +0,0 @@
-18

Example/testHotUpdate/bun.lock

@@ -12,7 +12,7 @@
         "react-native-paper": "^5.13.1",
         "react-native-safe-area-context": "^5.3.0",
         "react-native-svg": "^15.11.2",
-        "react-native-update": "^10.26.0",
+        "react-native-update": "^10.26.4",
         "react-native-vector-icons": "^10.2.0",
       },
       "devDependencies": {
@@ -1412,7 +1412,7 @@
 
     "react-native-svg": ["react-native-svg@15.11.2", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-+YfF72IbWQUKzCIydlijV1fLuBsQNGMT6Da2kFlo1sh+LE3BIm/2Q7AR1zAAR6L0BFLi1WaQPLfFUC9bNZpOmw=="],
 
-    "react-native-update": ["react-native-update@10.26.0", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-DHVIeKDx4HiVTtyOFLloLl6fwhuJ71vdVZU6Aw5i989g0s2wltVTo+HW1xqQaRgrJUwV4yOreNxKpStRWnpMXA=="],
+    "react-native-update": ["react-native-update@10.26.4", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-o7R6hOtUYk+pXijdztS0FLrdmg9pNzKagtNZloLBIa0kbPdKgbOgGpu4OLCWyo7v3Bj2mWbX1r1fxtpMHX9/UA=="],
 
     "react-native-url-polyfill": ["react-native-url-polyfill@2.0.0", "", { "dependencies": { "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "react-native": "*" } }, "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA=="],
 

Example/testHotUpdate/ios/Podfile.lock

@@ -1304,7 +1304,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-update (10.26.0):
+  - react-native-update (10.26.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1318,8 +1318,8 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-update/HDiffPatch (= 10.26.0)
+    - react-native-update/HDiffPatch (= 10.26.4)
-    - react-native-update/RCTPushy (= 10.26.0)
+    - react-native-update/RCTPushy (= 10.26.4)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1329,7 +1329,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/HDiffPatch (10.26.0):
+  - react-native-update/HDiffPatch (10.26.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1352,7 +1352,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - SSZipArchive
     - Yoga
-  - react-native-update/RCTPushy (10.26.0):
+  - react-native-update/RCTPushy (10.26.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2015,7 +2015,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: 3c11cee7737609275c7b66bd0b1de475f094cedf
   React-microtasksnativemodule: 843f352b32aacbe13a9c750190d34df44c3e6c2c
   react-native-safe-area-context: 0f14bce545abcdfbff79ce2e3c78c109f0be283e
-  react-native-update: ae3d7e91c2ce65a161769fa00e2fb0eb2b26b39e
+  react-native-update: 7f8b9954150ff2b360fdfd999c20c16c0af2c491
   React-NativeModulesApple: 88433b6946778bea9c153e27b671de15411bf225
   React-perflogger: 9e8d3c0dc0194eb932162812a168aa5dc662f418
   React-performancetimeline: 5a2d6efef52bdcefac079c7baa30934978acd023

Example/testHotUpdate/package.json

@@ -22,7 +22,7 @@
     "react-native-paper": "^5.13.1",
     "react-native-safe-area-context": "^5.3.0",
     "react-native-svg": "^15.11.2",
-    "react-native-update": "^10.26.0",
+    "react-native-update": "^10.26.4",
     "react-native-vector-icons": "^10.2.0"
   },
   "devDependencies": {
@@ -52,4 +52,4 @@
     "detox",
     "dtrace-provider"
   ]
-}
+}

Example/testHotUpdate/src/index.tsx

@@ -204,17 +204,18 @@ const styles = StyleSheet.create({
 });
 
 // use Pushy for China users
-// const updateClient = new Pushy({
+const updateClient = new Pushy({
+  appKey,
+  debug: true,
+  // updateStrategy: 'silentAndLater',
+});
+
+// use Cresc for global users
+// const updateClient = new Cresc({
 //   appKey,
 //   debug: true,
 // });
 
-// use Cresc for global users
-const updateClient = new Cresc({
-  appKey,
-  debug: true,
-});
-
 export default function Root() {
   return (
     <UpdateProvider client={updateClient}>
@@ -223,4 +224,4 @@ export default function Root() {
       </PaperProvider>
     </UpdateProvider>
   );
-}
+}

Example/testHotUpdate/update.json

@@ -7,4 +7,4 @@
     "appId": 27509,
     "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
   }
-}
+}

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'
+
+    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 {

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);
+} 

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 {

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");

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")
+  }
+}

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;
+    }
+}

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(mContext, promise);
+    }
+
     @Override
     public void setNeedUpdate(ReadableMap options,Promise promise) {
         UpdateModuleImpl.setNeedUpdate(updateContext, options,promise);

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");

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"
+    ]
+  }
+}

ios/Expo/ExpoPushyModule.swift

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

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()
+  }
+}

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.json

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

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"

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: {

src/client.ts

@@ -26,6 +26,7 @@ import {
   setLocalHashInfo,
   isFirstTime,
   isRolledBack,
+  getCurrentVersionInfo,
 } from './core';
 
 const SERVER_PRESETS = {
@@ -60,6 +61,31 @@ const defaultClientOptions: ClientOptions = {
   throwError: false,
 };
 
+export const sharedState: {
+  progressHandlers: Record<string, EmitterSubscription>;
+  downloadedHash?: string;
+  apkStatus: 'downloading' | 'downloaded' | null;
+  marked: boolean;
+  applyingUpdate: boolean;
+} = {
+  progressHandlers: {},
+  downloadedHash: undefined,
+  apkStatus: null,
+  marked: false,
+  applyingUpdate: false,
+};
+
+const assertHash = (hash: string) => {
+  if (!sharedState.downloadedHash) {
+    return;
+  }
+  if (hash !== sharedState.downloadedHash) {
+    log(`use downloaded hash ${sharedState.downloadedHash} first`);
+    return;
+  }
+  return true;
+};
+
 // for China users
 export class Pushy {
   options = defaultClientOptions;
@@ -67,13 +93,6 @@ export class Pushy {
   lastChecking?: number;
   lastRespJson?: Promise<any>;
 
-  static progressHandlers: Record<string, EmitterSubscription> = {};
-  static downloadedHash?: string;
-
-  static apkStatus: 'downloading' | 'downloaded' | null = null;
-
-  static marked = false;
-  static applyingUpdate = false;
   version = cInfo.rnu;
   loggerPromise = (() => {
     let resolve: (value?: unknown) => void = () => {};
@@ -128,6 +147,7 @@ export class Pushy {
     log(type + ' ' + message);
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
+    const info = await getCurrentVersionInfo();
     logger({
       type,
       data: {
@@ -137,6 +157,7 @@ export class Pushy {
         packageVersion,
         buildTime,
         message,
+        ...info,
         ...data,
       },
     });
@@ -149,16 +170,6 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
-  static assertHash = (hash: string) => {
-    if (!this.downloadedHash) {
-      return;
-    }
-    if (hash !== this.downloadedHash) {
-      log(`use downloaded hash ${Pushy.downloadedHash} first`);
-      return;
-    }
-    return true;
-  };
   assertDebug = () => {
     if (__DEV__ && !this.options.debug) {
       console.info(
@@ -169,10 +180,10 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    if (Pushy.marked || __DEV__ || !isFirstTime) {
+    if (sharedState.marked || __DEV__ || !isFirstTime) {
       return;
     }
-    Pushy.marked = true;
+    sharedState.marked = true;
     PushyModule.markSuccess();
     this.report({ type: 'markSuccess' });
   };
@@ -180,9 +191,9 @@ export class Pushy {
     if (!assertDev('switchVersion()')) {
       return;
     }
-    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
+    if (assertHash(hash) && !sharedState.applyingUpdate) {
       log('switchVersion: ' + hash);
-      Pushy.applyingUpdate = true;
+      sharedState.applyingUpdate = true;
       return PushyModule.reloadUpdate({ hash });
     }
   };
@@ -191,7 +202,7 @@ export class Pushy {
     if (!assertDev('switchVersionLater()')) {
       return;
     }
-    if (Pushy.assertHash(hash)) {
+    if (assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       return PushyModule.setNeedUpdate({ hash });
     }
@@ -346,17 +357,18 @@ export class Pushy {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
     }
-    if (Pushy.downloadedHash === hash) {
+    if (sharedState.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
+      log(`duplicated downloaded hash ${sharedState.downloadedHash}, ignored`);
-      return Pushy.downloadedHash;
+      return sharedState.downloadedHash;
     }
-    if (Pushy.progressHandlers[hash]) {
+    if (sharedState.progressHandlers[hash]) {
       return;
     }
+    const patchStartTime = Date.now();
     if (onDownloadProgress) {
       // @ts-expect-error harmony not in existing platforms
       if (Platform.OS === 'harmony') {
-        Pushy.progressHandlers[hash] = DeviceEventEmitter.addListener(
+        sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
           'RCTPushyDownloadProgress',
           progressData => {
             if (progressData.hash === hash) {
@@ -365,14 +377,15 @@ export class Pushy {
           },
         );
       } else {
-        Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+        sharedState.progressHandlers[hash] =
-          'RCTPushyDownloadProgress',
+          pushyNativeEventEmitter.addListener(
-          progressData => {
+            'RCTPushyDownloadProgress',
-            if (progressData.hash === hash) {
+            progressData => {
-              onDownloadProgress(progressData);
+              if (progressData.hash === hash) {
-            }
+                onDownloadProgress(progressData);
-          },
+              }
-        );
+            },
+          );
       }
     }
     let succeeded = '';
@@ -440,9 +453,9 @@ export class Pushy {
         }
       }
     }
-    if (Pushy.progressHandlers[hash]) {
+    if (sharedState.progressHandlers[hash]) {
-      Pushy.progressHandlers[hash].remove();
+      sharedState.progressHandlers[hash].remove();
-      delete Pushy.progressHandlers[hash];
+      delete sharedState.progressHandlers[hash];
     }
     if (__DEV__) {
       return hash;
@@ -458,9 +471,18 @@ export class Pushy {
       }
       return;
     } else {
+      const duration = Date.now() - patchStartTime;
+      const data: Record<string, any> = {
+        newVersion: hash,
+        diff: succeeded,
+        duration,
+      };
+      if (errorMessages.length > 0) {
+        data.error = errorMessages.join(';');
+      }
       this.report({
         type: 'downloadSuccess',
-        data: { newVersion: hash, diff: succeeded },
+        data,
       });
     }
     log(`downloaded ${succeeded} hash:`, hash);
@@ -469,7 +491,7 @@ export class Pushy {
       description,
       metaInfo,
     });
-    Pushy.downloadedHash = hash;
+    sharedState.downloadedHash = hash;
     return hash;
   };
   downloadAndInstallApk = async (
@@ -479,10 +501,10 @@ export class Pushy {
     if (Platform.OS !== 'android') {
       return;
     }
-    if (Pushy.apkStatus === 'downloading') {
+    if (sharedState.apkStatus === 'downloading') {
       return;
     }
-    if (Pushy.apkStatus === 'downloaded') {
+    if (sharedState.apkStatus === 'downloaded') {
       this.report({ type: 'errorInstallApk' });
       this.throwIfEnabled(new Error('errorInstallApk'));
       return;
@@ -503,37 +525,41 @@ export class Pushy {
         return;
       }
     }
-    Pushy.apkStatus = 'downloading';
+    sharedState.apkStatus = 'downloading';
     this.report({ type: 'downloadingApk' });
     const progressKey = 'downloadingApk';
     if (onDownloadProgress) {
-      if (Pushy.progressHandlers[progressKey]) {
+      if (sharedState.progressHandlers[progressKey]) {
-        Pushy.progressHandlers[progressKey].remove();
+        sharedState.progressHandlers[progressKey].remove();
       }
-      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+      sharedState.progressHandlers[progressKey] =
-        'RCTPushyDownloadProgress',
+        pushyNativeEventEmitter.addListener(
-        (progressData: ProgressData) => {
+          'RCTPushyDownloadProgress',
-          if (progressData.hash === progressKey) {
+          (progressData: ProgressData) => {
-            onDownloadProgress(progressData);
+            if (progressData.hash === progressKey) {
-          }
+              onDownloadProgress(progressData);
-        },
+            }
-      );
+          },
+        );
     }
     await PushyModule.downloadAndInstallApk({
       url,
       target: 'update.apk',
       hash: progressKey,
     }).catch(() => {
-      Pushy.apkStatus = null;
+      sharedState.apkStatus = null;
       this.report({ type: 'errorDownloadAndInstallApk' });
       this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
     });
-    Pushy.apkStatus = 'downloaded';
+    sharedState.apkStatus = 'downloaded';
-    if (Pushy.progressHandlers[progressKey]) {
+    if (sharedState.progressHandlers[progressKey]) {
-      Pushy.progressHandlers[progressKey].remove();
+      sharedState.progressHandlers[progressKey].remove();
-      delete Pushy.progressHandlers[progressKey];
+      delete sharedState.progressHandlers[progressKey];
     }
   };
+  restartApp = async () => {
+    return PushyModule.restartApp();
+  };
 }
 
 // for international users

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;
@@ -43,6 +45,5 @@ export const UpdateContext = createContext<{
 
 export const useUpdate = () => useContext(UpdateContext);
 
+/** @deprecated Please use `useUpdate` instead */
 export const usePushy = useUpdate;
-
-export const useCresc = useUpdate;

src/index.ts

@@ -1,4 +1,4 @@
 export { Pushy, Cresc } from './client';
-export { UpdateContext, usePushy, useCresc, useUpdate } from './context';
+export { UpdateContext, usePushy, useUpdate } from './context';
 export { PushyProvider, UpdateProvider } from './provider';
 export { PushyModule, UpdateModule } from './core';

src/provider.tsx

@@ -12,7 +12,7 @@ import {
   Platform,
   Linking,
 } from 'react-native';
-import { Pushy, Cresc } from './client';
+import { Pushy, Cresc, sharedState } from './client';
 import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
 import { CheckResult, ProgressData, UpdateTestPayload } from './type';
 import { UpdateContext } from './context';
@@ -100,6 +100,14 @@ export const UpdateProvider = ({
           return false;
         }
         stateListener.current && stateListener.current.remove();
+
+        if (
+          options.afterDownloadUpdate &&
+          (await options.afterDownloadUpdate(info)) === false
+        ) {
+          log('afterDownloadUpdate returned false, skipping');
+          return false;
+        }
         if (options.updateStrategy === 'silentAndNow') {
           client.switchVersion(hash);
           return true;
@@ -131,13 +139,7 @@ export const UpdateProvider = ({
         return false;
       }
     },
-    [
+    [client, options, alertUpdate, alertError, throwErrorIfEnabled],
-      client,
-      options.updateStrategy,
-      alertUpdate,
-      alertError,
-      throwErrorIfEnabled,
-    ],
   );
 
   const downloadAndInstallApk = useCallback(
@@ -169,7 +171,7 @@ export const UpdateProvider = ({
         return;
       }
       const rollout = info.config?.rollout?.[packageVersion];
-      if (rollout) {
+      if (info.update && rollout) {
         if (!isInRollout(rollout)) {
           log(`not in ${rollout}% rollout, ignored`);
           return;
@@ -180,8 +182,15 @@ export const UpdateProvider = ({
       updateInfoRef.current = info;
       setUpdateInfo(info);
       if (info.expired) {
+        if (
+          options.onPackageExpired &&
+          (await options.onPackageExpired(info)) === false
+        ) {
+          log('onPackageExpired returned false, skipping');
+          return;
+        }
         const { downloadUrl } = info;
-        if (downloadUrl) {
+        if (downloadUrl && sharedState.apkStatus === null) {
           if (options.updateStrategy === 'silentAndNow') {
             if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
               downloadAndInstallApk(downloadUrl);
@@ -232,7 +241,7 @@ export const UpdateProvider = ({
       client,
       alertError,
       throwErrorIfEnabled,
-      options.updateStrategy,
+      options,
       alertUpdate,
       downloadAndInstallApk,
       downloadUpdate,
@@ -314,6 +323,10 @@ export const UpdateProvider = ({
     [parseTestPayload],
   );
 
+  const restartApp = useCallback(async () => {
+    return client.restartApp();
+  }, [client]);
+
   useEffect(() => {
     const parseLinking = (url: string | null) => {
       if (!url) {
@@ -359,10 +372,12 @@ export const UpdateProvider = ({
         downloadAndInstallApk,
         getCurrentVersionInfo,
         parseTestQrCode,
+        restartApp,
       }}>
       {children}
     </UpdateContext.Provider>
   );
 };
 
+/** @deprecated Please use `UpdateProvider` instead */
 export const PushyProvider = UpdateProvider;

src/type.ts

@@ -54,6 +54,9 @@ export interface EventData {
   message?: string;
   rolledBackVersion?: string;
   newVersion?: string;
+  name?: string;
+  description?: string;
+  metaInfo?: string;
   [key: string]: any;
 }
 
@@ -88,6 +91,8 @@ export interface ClientOptions {
   throwError?: boolean;
   beforeCheckUpdate?: () => Promise<boolean>;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+  afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+  onPackageExpired?: (info: CheckResult) => Promise<boolean>;
 }
 
 export interface UpdateTestPayload {

src/utils.ts

@@ -49,20 +49,20 @@ 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);
               }
-            }, 2000),
+            }, 5000),
           ),
         ]);
       };
@@ -77,10 +77,14 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-  const ret = await promiseAny(urls.map(ping));
+
-  if (ret) {
+  try {
-    return ret;
+    const ret = await promiseAny(urls.map(ping));
-  }
+    if (ret) {
+      log('ping success, use url:', ret);
+      return ret;
+    }
+  } catch {}
   log('all ping failed, use first url:', urls[0]);
   return urls[0];
 };