v10.19.1

fix: check module activity null pointer. (#457 )
Co-authored-by: 黄世城 <huangshicheng@xgd.com>
2025-09-17 19:26:10 +08:00 · 2024-12-11 17:23:44 +08:00 · 2024-12-10 20:42:34 +08:00 · 2024-12-10 20:05:52 +08:00 · 2024-12-10 20:03:13 +08:00 · 2024-12-07 16:43:22 +08:00
30 changed files with 3196 additions and 3143 deletions
--- a/Example/testHotUpdate/android/app/build.gradle
+++ b/Example/testHotUpdate/android/app/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
-apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"

 /**
 * This is the configuration block to customize your React Native Android app.
@@ -50,6 +49,7 @@ react {
    //
    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
    // hermesFlags = ["-O", "-output-source-map"]
+    autolinkLibrariesWithApp()
 }

 /**
@@ -106,21 +106,14 @@ android {
    }
 }

+
 dependencies {
    // The version of react-native is set by the React Native Gradle Plugin
    implementation("com.facebook.react:react-android")

-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
    if (hermesEnabled.toBoolean()) {
        implementation("com.facebook.react:hermes-android")
    } else {
        implementation jscFlavor
    }
 }
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
--- a/Example/testHotUpdate/android/app/src/debug/java/com/awesomeproject/ReactNativeFlipper.java
+++ b/Example/testHotUpdate/android/app/src/debug/java/com/awesomeproject/ReactNativeFlipper.java
@@ -1,73 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
- * directory of this source tree.
- */
-package com.awesomeproject;
-
-import android.content.Context;
-import com.facebook.flipper.android.AndroidFlipperClient;
-import com.facebook.flipper.android.utils.FlipperUtils;
-import com.facebook.flipper.core.FlipperClient;
-import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
-import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
-import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
-import com.facebook.flipper.plugins.inspector.DescriptorMapping;
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
-import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
-import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
-import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceEventListener;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
-
-public class ReactNativeFlipper {
-  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
-    if (FlipperUtils.shouldEnableFlipper(context)) {
-      final FlipperClient client = AndroidFlipperClient.getInstance(context);
-
-      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
-      client.addPlugin(new DatabasesFlipperPlugin(context));
-      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
-      client.addPlugin(CrashReporterPlugin.getInstance());
-
-      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
-      NetworkingModule.setCustomClientBuilder(
-          new NetworkingModule.CustomClientBuilder() {
-            @Override
-            public void apply(OkHttpClient.Builder builder) {
-              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-            }
-          });
-      client.addPlugin(networkFlipperPlugin);
-      client.start();
-
-      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
-      // Hence we run if after all native modules have been initialized
-      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
-      if (reactContext == null) {
-        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceEventListener() {
-              @Override
-              public void onReactContextInitialized(ReactContext reactContext) {
-                reactInstanceManager.removeReactInstanceEventListener(this);
-                reactContext.runOnNativeModulesQueueThread(
-                    new Runnable() {
-                      @Override
-                      public void run() {
-                        client.addPlugin(new FrescoFlipperPlugin());
-                      }
-                    });
-              }
-            });
-      } else {
-        client.addPlugin(new FrescoFlipperPlugin());
-      }
-    }
-  }
-}
--- a/Example/testHotUpdate/android/app/src/main/java/com/awesomeproject/MainApplication.java
+++ b/Example/testHotUpdate/android/app/src/main/java/com/awesomeproject/MainApplication.java
@@ -65,6 +65,5 @@ public class MainApplication extends Application implements ReactApplication {
      // If you opted-in for the New Architecture, we load the native entry point for this app.
      DefaultNewArchitectureEntryPoint.load();
    }
-    ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
  }
 }
--- a/Example/testHotUpdate/android/build.gradle
+++ b/Example/testHotUpdate/android/build.gradle
@@ -1,15 +1,11 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
    ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
        targetSdkVersion = 34
        ndkVersion = "26.1.10909125"
        kotlinVersion = "1.9.24"
-
-        kotlin_version = '1.9.24'
    }
    repositories {
        google()
@@ -21,3 +17,5 @@ buildscript {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
    }
 }
+
+apply plugin: "com.facebook.react.rootproject"
--- a/Example/testHotUpdate/android/gradle.properties
+++ b/Example/testHotUpdate/android/gradle.properties
@@ -21,11 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
-# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.182.0

 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
--- a/Example/testHotUpdate/android/gradlew
+++ b/Example/testHotUpdate/android/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#

 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +134,13 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
--- a/Example/testHotUpdate/android/gradlew.bat
+++ b/Example/testHotUpdate/android/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2

 goto fail

--- a/Example/testHotUpdate/android/settings.gradle
+++ b/Example/testHotUpdate/android/settings.gradle
@@ -1,3 +1,6 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'AwesomeProject'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
--- a/Example/testHotUpdate/babel.config.js
+++ b/Example/testHotUpdate/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
  env: {
    production: {
      plugins: ['react-native-paper/babel'],
--- a/Example/testHotUpdate/bun.lockb
+++ b/Example/testHotUpdate/bun.lockb
--- a/Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj
+++ b/Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		0C06D3B1D2C63EC04B024612 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 77A7A2D881E69AE3DCCE6BFE /* PrivacyInfo.xcprivacy */; };
 		0C80B921A6F3F58F76C31292 /* libPods-AwesomeProject.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-AwesomeProject.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
@@ -26,6 +27,7 @@
 		5709B34CF0A7D63546082F79 /* Pods-AwesomeProject.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-AwesomeProject.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AwesomeProject.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		77A7A2D881E69AE3DCCE6BFE /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = AwesomeProject/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = AwesomeProject/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -52,6 +54,7 @@
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
+				77A7A2D881E69AE3DCCE6BFE /* PrivacyInfo.xcprivacy */,
 			);
 			name = AwesomeProject;
 			sourceTree = "<group>";
@@ -169,6 +172,7 @@
 			files = (
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+				0C06D3B1D2C63EC04B024612 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -336,7 +340,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -400,15 +404,11 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-					" ",
-					"-Wl -ld_classic ",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
+				USE_HERMES = true;
 			};
 			name = Debug;
 		};
@@ -417,7 +417,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -476,15 +476,10 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-					" ",
-					"-Wl -ld_classic ",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
--- a/Example/testHotUpdate/ios/AwesomeProject/AppDelegate.mm
+++ b/Example/testHotUpdate/ios/AwesomeProject/AppDelegate.mm
@@ -15,13 +15,14 @@
  return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }

- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+- (NSURL *)bundleURL
 {
-#if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
-#else
-  return [RCTPushy bundleURL];
-#endif
+  #if DEBUG
+    // 原先DEBUG这里的写法不作修改(所以DEBUG模式下不可热更新)
+    return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+  #else
+    return [RCTPushy bundleURL];  // <--  把这里非DEBUG的情况替换为热更新bundle
+  #endif
 }

@end
--- a/Example/testHotUpdate/ios/AwesomeProject/PrivacyInfo.xcprivacy
+++ b/Example/testHotUpdate/ios/AwesomeProject/PrivacyInfo.xcprivacy
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
--- a/Example/testHotUpdate/ios/Podfile
+++ b/Example/testHotUpdate/ios/Podfile
@@ -8,16 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
 platform :ios, min_ios_version_supported
 prepare_react_native_project!

-# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
-# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
-#
-# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
-# ```js
-# module.exports = {
-#   dependencies: {
-#     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
-# ```
-flipper_config = FlipperConfiguration.disabled

 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
@@ -28,19 +18,8 @@ end
 target 'AwesomeProject' do
  config = use_native_modules!

-  # Flags change depending on the env values.
-  flags = get_default_flags()
-
  use_react_native!(
    :path => config[:reactNativePath],
-    # Hermes is now enabled by default. Disable by setting this flag to false.
-    :hermes_enabled => flags[:hermes_enabled],
-    :fabric_enabled => flags[:fabric_enabled],
-    # Enables Flipper.
-    #
-    # Note that if you have use_frameworks! enabled, Flipper will not work and
-    # you should disable the next line.
-    :flipper_configuration => flipper_config,
    # An absolute path to your application root.
    :app_path => "#{Pod::Config.instance.installation_root}/.."
  )
@@ -50,8 +29,8 @@ target 'AwesomeProject' do
    react_native_post_install(
      installer,
      config[:reactNativePath],
-      :mac_catalyst_enabled => false
+      :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
    )
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
  end
 end
--- a/Example/testHotUpdate/ios/Podfile.lock
+++ b/Example/testHotUpdate/ios/Podfile.lock
--- a/Example/testHotUpdate/package.json
+++ b/Example/testHotUpdate/package.json
@@ -11,37 +11,44 @@
    "lint": "eslint .",
    "postinstall": "patch-package",
    "apk": "cd android && ./gradlew assembleRelease",
-    "dev": "react-native bundle-harmony --dev"
+    "dev:harmony": "react-native bundle-harmony --dev"
  },
  "dependencies": {
+    "form-data": "^4.0.1",
    "patch-package": "^8.0.0",
    "postinstall-postinstall": "^2.1.0",
    "react": "18.3.1",
-    "react-native": "0.75.4",
-    "react-native-camera-kit": "^14.0.0-beta15",
+    "react-native": "0.76.3",
+    "react-native-camera-kit": "^14.1.0",
    "react-native-paper": "^5.12.5",
-    "react-native-safe-area-context": "^4.11.1",
-    "react-native-update": "^10.15.1",
+    "react-native-safe-area-context": "^4.14.0",
+    "react-native-update": "^10.17.1",
    "react-native-vector-icons": "^10.2.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.25.9",
-    "@babel/preset-env": "^7.25.9",
-    "@babel/runtime": "^7.25.9",
-    "@react-native/babel-preset": "0.75.4",
-    "@react-native/eslint-config": "0.75.4",
-    "@react-native/metro-config": "0.75.4",
-    "@react-native/typescript-config": "0.75.4",
-    "@types/react": "^18.3.12",
-    "@types/react-test-renderer": "^18.3.0",
-    "babel-jest": "^29.7.0",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
+    "@react-native-community/cli": "15.0.0-alpha.2",
+    "@react-native-community/cli-platform-android": "15.0.0-alpha.2",
+    "@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
+    "@react-native/babel-preset": "0.76.3",
+    "@react-native/eslint-config": "0.76.3",
+    "@react-native/metro-config": "0.76.3",
+    "@react-native/typescript-config": "0.76.3",
+    "@types/react": "^18.2.6",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
    "eslint": "^8.19.0",
-    "jest": "^29.7.0",
+    "jest": "^29.6.3",
    "prettier": "2.8.8",
    "react-test-renderer": "18.3.1",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
  },
  "engines": {
    "node": ">=16"
-  }
+  },
+  "trustedDependencies": [
+    "postinstall-postinstall"
+  ]
 }
--- a/Example/testHotUpdate/src/TestConsole.js
+++ b/Example/testHotUpdate/src/TestConsole.js
@@ -1,7 +1,8 @@
 /* eslint-disable react-native/no-inline-styles */
 /* eslint-disable react/react-in-jsx-scope */
-import {useCallback, useMemo, useState} from 'react';
+import {useState} from 'react';
 import {
+  Alert,
  ActivityIndicator,
  Modal,
  TextInput,
@@ -13,132 +14,127 @@ import {
  TouchableOpacity,
 } from 'react-native';

-import {PushyModule} from 'react-native-update';
+import {PushyModule} from 'react-native-update/src/core';
 const Hash = '9D5CE6EBA420717BE7E7D308B11F8207681B066C951D68F3994D19828F342474';
 const UUID = '00000000-0000-0000-0000-000000000000';
 const DownloadUrl =
  'http://cos.pgyer.com/697913e94d7441f20c686e2b0996a1aa.apk?sign=7a8f11b1df82cba45c8ac30b1acec88c&t=1680404102&response-content-disposition=attachment%3Bfilename%3DtestHotupdate_1.0.apk';

-const CustomDialog = ({title, visible, onConfirm}) => {
-  if (!visible) {
-    return null;
-  }
-
-  return (
-    <View style={styles.overlay}>
-      <View style={styles.dialog}>
-        <Text style={styles.title}>{title}</Text>
-        <TouchableOpacity
-          testID="done"
-          style={styles.button}
-          onLongPress={onConfirm}>
-          <Text style={styles.buttonText}>确认</Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-};
-export default function TestConsole({visible}) {
+export default function TestConsole({visible, onClose}) {
  const [text, setText] = useState('');
  const [running, setRunning] = useState(false);
-  const [options, setOptions] = useState();
-  const [alertVisible, setAlertVisible] = useState(false);
-  const [alertMsg, setAlertMsg] = useState('');
-  const NativeTestMethod = useMemo(() => {
-    return [
+  const convertCommands = (cmd, params) => {
+    if (typeof params === 'string') {
+      return `${cmd}\n${params}`;
+    }
+    let paramText = '';
+    for (const [k, v] of Object.entries(params)) {
+      paramText += `\n${k}\n${v}`;
+    }
+    return `${cmd}${paramText}`;
+  };
+  const shortCuts = [
      {
        name: 'setLocalHashInfo',
        invoke: () => {
          setText(
-            `setLocalHashInfo\n${Hash}\n{\"version\":\"1.0.0\",\"size\":\"19M\"}`,
+            convertCommands('setLocalHashInfo', {
+              version: '1.0.0',
+              size: '19M',
+            }),
          );
        },
      },
      {
        name: 'getLocalHashInfo',
        invoke: () => {
-          setText(`getLocalHashInfo\n${Hash}`);
+          setText(convertCommands('getLocalHashInfo', Hash));
        },
      },
      {
        name: 'setUuid',
        invoke: () => {
-          setText(`setUuid\n${UUID}`);
+          setText(convertCommands('setUuid', UUID));
        },
      },
      {
        name: 'reloadUpdate',
        invoke: () => {
-          setText('reloadUpdate');
-          setOptions({hash: Hash});
+          setText(convertCommands('reloadUpdate', {hash: Hash}));
        },
      },
      {
        name: 'setNeedUpdate',
        invoke: () => {
-          setText('setNeedUpdate');
-          setOptions({hash: Hash});
+          setText(convertCommands('setNeedUpdate', {hash: Hash}));
        },
      },
      {
        name: 'markSuccess',
        invoke: () => {
-          setText('markSuccess');
-          setOptions(undefined);
+          setText(convertCommands('markSuccess'));
        },
      },
      {
        name: 'downloadPatchFromPpk',
        invoke: () => {
-          setText('downloadPatchFromPpk');
-          setOptions({updateUrl: DownloadUrl, hash: Hash, originHash: Hash});
+          setText(
+            convertCommands('downloadPatchFromPpk', {
+              updateUrl: DownloadUrl,
+              hash: Hash,
+              originHash: Hash,
+            }),
+          );
        },
      },
      {
        name: 'downloadPatchFromPackage',
        invoke: () => {
-          setText('downloadPatchFromPackage');
-          setOptions({updateUrl: DownloadUrl, hash: Hash});
+          setText(
+            convertCommands('downloadPatchFromPackage', {
+              updateUrl: DownloadUrl,
+              hash: Hash,
+            }),
+          );
        },
      },
      {
        name: 'downloadFullUpdate',
        invoke: () => {
-          setText('downloadFullUpdate');
-          setOptions({updateUrl: DownloadUrl, hash: Hash});
+          setText(
+            convertCommands('downloadFullUpdate', {
+              updateUrl: DownloadUrl,
+              hash: Hash,
+            }),
+          );
        },
      },
      {
        name: 'downloadAndInstallApk',
        invoke: () => {
-          setText('downloadAndInstallApk');
-          setOptions({url: DownloadUrl, target: Hash, hash: Hash});
+          setText(
+            convertCommands('downloadAndInstallApk', {
+              url: DownloadUrl,
+              target: Hash,
+              hash: Hash,
+            }),
+          );
        },
      },
    ];
-  }, []);
-
-  const renderTestView = useCallback(() => {
-    const views = [];
-    for (let i = 0; i < NativeTestMethod.length; i++) {
-      views.push(
-        <TouchableOpacity
-          key={i}
-          testID={NativeTestMethod[i].name}
-          onLongPress={() => {
-            NativeTestMethod[i].invoke();
-          }}>
-          <Text>{NativeTestMethod[i].name}</Text>
-        </TouchableOpacity>,
-      );
-    }
-    return <View>{views}</View>;
-  }, [NativeTestMethod]);

  return (
    <Modal visible={visible}>
      <SafeAreaView style={{flex: 1, padding: 10}}>
-        <Text>调试Pushy方法（方法名，参数，值换行）</Text>
+        <View
+          style={{
+            flexDirection: 'row',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+          }}>
+          <Text>调试Pushy方法（方法名，参数，值换行）</Text>
+          <Button title="Close" onPress={onClose} />
+        </View>
        <TextInput
          autoCorrect={false}
          autoCapitalize="none"
@@ -167,46 +163,49 @@ export default function TestConsole({visible}) {
            marginBottom: 5,
          }}
          testID="submit"
-          onLongPress={async () => {
+          onPress={async () => {
            setRunning(true);
            try {
              const inputs = text.split('\n');
              const methodName = inputs[0];
-              let params = [];
+              let params;
              if (inputs.length === 1) {
-                if (options) {
-                  await PushyModule[methodName](options);
-                } else {
-                  await PushyModule[methodName]();
-                }
+                await PushyModule[methodName]();
              } else {
                if (inputs.length === 2) {
-                  params = [inputs[1]];
+                  params = inputs[1];
                } else {
-                  params = [inputs[1], inputs[2]];
+                  params = {};
+                  for (let i = 1; i < inputs.length; i += 2) {
+                    params[inputs[i]] = inputs[i + 1];
+                  }
                  console.log({inputs, params});
                }
-                await PushyModule[methodName](...params);
+                await PushyModule[methodName](params);
              }
-              setAlertVisible(true);
-              setAlertMsg('done');
+              Alert.alert('done');
            } catch (e) {
-              setAlertVisible(true);
-              setAlertMsg(e.message);
+              Alert.alert(e.message);
            }
            setRunning(false);
          }}>
          <Text style={{color: 'white'}}>执行</Text>
        </TouchableOpacity>
        <Button title="重置" onPress={() => setText('')} />
-        {renderTestView()}
-        <CustomDialog
-          title={alertMsg}
-          visible={alertVisible}
-          onConfirm={() => {
-            setAlertVisible(false);
-          }}
-        />
+        {
+          <View>
+            {shortCuts.map(({name, invoke}, i) => (
+              <TouchableOpacity
+                key={i}
+                testID={name}
+                onPress={() => {
+                  invoke();
+                }}>
+                <Text>{name}</Text>
+              </TouchableOpacity>
+            ))}
+          </View>
+        }
      </SafeAreaView>
    </Modal>
  );
--- a/Example/testHotUpdate/src/index.tsx
+++ b/Example/testHotUpdate/src/index.tsx
@@ -124,7 +124,10 @@ function App() {
          react-native-update版本：{client?.version}
        </Text>
      </TouchableOpacity>
-      <TestConsole visible={showTestConsole} />
+      <TestConsole
+        visible={showTestConsole}
+        onClose={() => setShowTestConsole(false)}
+      />
      {snackbarVisible && (
        <Snackbar
          visible={snackbarVisible}
--- a/Example/testHotUpdate/yarn.lock
+++ b/Example/testHotUpdate/yarn.lock
--- a/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java
+++ b/android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java
@@ -1,7 +1,7 @@
 package cn.reactnative.modules.update;

 import android.app.Activity;
-import android.app.Application;
+import android.content.Context;
 import android.util.Log;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -117,8 +117,7 @@ public class UpdateModuleImpl {
            public void run() {
                try {
                    updateContext.switchVersion(hash);
-                    Activity activity = mContext.getCurrentActivity();
-                    Application application = activity.getApplication();
+                    final Context application = mContext.getApplicationContext();
                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();

                    if (instanceManager == null) {
@@ -142,7 +141,10 @@ public class UpdateModuleImpl {
                        promise.resolve(true);
                    } catch (Throwable err) {
                        promise.reject("pushy:"+err.getMessage());
-                        activity.recreate();
+                        final Activity activity = mContext.getCurrentActivity();
+                        if (activity != null) {
+                            activity.recreate();
+                        }
                    }

                } catch (Throwable err) {
--- a/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java
+++ b/android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java
@@ -1,7 +1,7 @@
 package cn.reactnative.modules.update;

 import android.app.Activity;
-import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -176,8 +176,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
            public void run() {
                try {
                    updateContext.switchVersion(hash);
-                    Activity activity = getCurrentActivity();
-                    Application application = activity.getApplication();
+                    final Context application = getReactApplicationContext().getApplicationContext();
                    ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();

                    if (instanceManager == null) {
@@ -200,7 +199,10 @@ public class UpdateModule extends ReactContextBaseJavaModule {
                        instanceManager.recreateReactContextInBackground();
                        promise.resolve(null);
                    } catch (Throwable err) {
-                        activity.recreate();
+                        final Activity activity = getCurrentActivity();
+                        if (activity != null) {
+                            activity.recreate();
+                        }
                        promise.reject(err);
                    }

--- a/bun.lockb
+++ b/bun.lockb
--- a/ios/RCTPushy/RCTPushy.mm
+++ b/ios/RCTPushy/RCTPushy.mm
@@ -1,6 +1,10 @@
 #import "RCTPushy.h"
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
+
+#if __has_include("RCTReloadCommand.h")
+#import "RCTReloadCommand.h"
+#endif
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RCTPushySpec.h"
@@ -311,14 +315,17 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
        if (hash.length) {
            [self setNeedUpdate:options resolver:resolve rejecter:reject];
            
-            // reload 0.62+
-            // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-            // RCTTriggerReloadCommandListeners(@"pushy reload");
-            
-           dispatch_async(dispatch_get_main_queue(), ^{
-               [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-               [self.bridge reload];
-           });
+            #if __has_include("RCTReloadCommand.h")
+                // reload 0.62+
+                RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+                RCTTriggerReloadCommandListeners(@"pushy reload");
+            #else
+                // reload in earlier version
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+                    [self.bridge reload];
+                });
+            #endif
            resolve(@true);
        }else{
            reject(@"执行报错", nil, nil);
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-native-update",
-  "version": "10.15.3",
+  "version": "10.19.1",
  "description": "react-native hot update",
  "main": "src/index",
  "scripts": {
@@ -69,10 +69,11 @@
    "fs-extra": "^11.2.0",
    "jest": "^29.7.0",
    "pod-install": "^0.2.2",
-    "prettier": "^3",
+    "prettier": "^2",
    "react": "18.2.0",
    "react-native": "0.73",
    "ts-jest": "^29.2.5",
    "typescript": "^5.6.3"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }
--- a/src/client.ts
+++ b/src/client.ts
@@ -43,11 +43,13 @@ export class Pushy {
  lastChecking?: number;
  lastRespJson?: Promise<any>;

-  progressHandlers: Record<string, EmitterSubscription> = {};
-  downloadedHash?: string;
+  static progressHandlers: Record<string, EmitterSubscription> = {};
+  static downloadedHash?: string;

-  marked = false;
-  applyingUpdate = false;
+  static apkStatus: 'downloading' | 'downloaded' | null = null;
+
+  static marked = false;
+  static applyingUpdate = false;
  version = cInfo.pushy;
  loggerPromise = (() => {
    let resolve: (value?: unknown) => void = () => {};
@@ -121,21 +123,21 @@ export class Pushy {
  getCheckUrl = (endpoint: string = this.options.server!.main) => {
    return `${endpoint}/checkUpdate/${this.options.appKey}`;
  };
-  assertHash = (hash: string) => {
-    if (!this.downloadedHash) {
+  static assertHash = (hash: string) => {
+    if (!Pushy.downloadedHash) {
      return;
    }
-    if (hash !== this.downloadedHash) {
-      log(`use downloaded hash ${this.downloadedHash} first`);
+    if (hash !== Pushy.downloadedHash) {
+      log(`use downloaded hash ${Pushy.downloadedHash} first`);
      return;
    }
    return true;
  };
  markSuccess = () => {
-    if (this.marked || __DEV__ || !isFirstTime) {
+    if (Pushy.marked || __DEV__ || !isFirstTime) {
      return;
    }
-    this.marked = true;
+    Pushy.marked = true;
    PushyModule.markSuccess();
    this.report({ type: 'markSuccess' });
  };
@@ -146,9 +148,9 @@ export class Pushy {
      );
      return;
    }
-    if (this.assertHash(hash) && !this.applyingUpdate) {
+    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
      log('switchVersion: ' + hash);
-      this.applyingUpdate = true;
+      Pushy.applyingUpdate = true;
      return PushyModule.reloadUpdate({ hash });
    }
  };
@@ -160,7 +162,7 @@ export class Pushy {
      );
      return;
    }
-    if (this.assertHash(hash)) {
+    if (Pushy.assertHash(hash)) {
      log('switchVersionLater: ' + hash);
      return PushyModule.setNeedUpdate({ hash });
    }
@@ -314,15 +316,15 @@ export class Pushy {
      log(`rolledback hash ${rolledBackVersion}, ignored`);
      return;
    }
-    if (this.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${this.downloadedHash}, ignored`);
-      return this.downloadedHash;
+    if (Pushy.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
+      return Pushy.downloadedHash;
    }
-    if (this.progressHandlers[hash]) {
+    if (Pushy.progressHandlers[hash]) {
      return;
    }
    if (onDownloadProgress) {
-      this.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+      Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
        'RCTPushyDownloadProgress',
        progressData => {
          if (progressData.hash === hash) {
@@ -389,9 +391,9 @@ export class Pushy {
        }
      }
    }
-    if (this.progressHandlers[hash]) {
-      this.progressHandlers[hash].remove();
-      delete this.progressHandlers[hash];
+    if (Pushy.progressHandlers[hash]) {
+      Pushy.progressHandlers[hash].remove();
+      delete Pushy.progressHandlers[hash];
    }
    if (__DEV__) {
      return hash;
@@ -417,7 +419,7 @@ export class Pushy {
      description,
      metaInfo,
    });
-    this.downloadedHash = hash;
+    Pushy.downloadedHash = hash;
    return hash;
  };
  downloadAndInstallApk = async (
@@ -427,7 +429,14 @@ export class Pushy {
    if (Platform.OS !== 'android') {
      return;
    }
-    this.report({ type: 'downloadingApk' });
+    if (Pushy.apkStatus === 'downloading') {
+      return;
+    }
+    if (Pushy.apkStatus === 'downloaded') {
+      this.report({ type: 'errorInstallApk' });
+      this.throwIfEnabled(new Error('errorInstallApk'));
+      return;
+    }
    if (Platform.Version <= 23) {
      try {
        const granted = await PermissionsAndroid.request(
@@ -444,12 +453,14 @@ export class Pushy {
        return;
      }
    }
+    Pushy.apkStatus = 'downloading';
+    this.report({ type: 'downloadingApk' });
    const progressKey = 'downloadingApk';
    if (onDownloadProgress) {
-      if (this.progressHandlers[progressKey]) {
-        this.progressHandlers[progressKey].remove();
+      if (Pushy.progressHandlers[progressKey]) {
+        Pushy.progressHandlers[progressKey].remove();
      }
-      this.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
        'RCTPushyDownloadProgress',
        (progressData: ProgressData) => {
          if (progressData.hash === progressKey) {
@@ -463,12 +474,14 @@ export class Pushy {
      target: 'update.apk',
      hash: progressKey,
    }).catch(() => {
+      Pushy.apkStatus = null;
      this.report({ type: 'errorDownloadAndInstallApk' });
      this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
    });
-    if (this.progressHandlers[progressKey]) {
-      this.progressHandlers[progressKey].remove();
-      delete this.progressHandlers[progressKey];
+    Pushy.apkStatus = 'downloaded';
+    if (Pushy.progressHandlers[progressKey]) {
+      Pushy.progressHandlers[progressKey].remove();
+      delete Pushy.progressHandlers[progressKey];
    }
  };
 }
--- a/src/context.ts
+++ b/src/context.ts
@@ -25,7 +25,7 @@ export const PushyContext = createContext<{
  switchVersionLater: () => Promise<void>;
  markSuccess: () => void;
  dismissError: () => void;
-  downloadUpdate: () => Promise<void>;
+  downloadUpdate: () => Promise<boolean | void>;
  downloadAndInstallApk: (url: string) => Promise<void>;
  getCurrentVersionInfo: () => Promise<{
    name?: string;
--- a/src/provider.tsx
+++ b/src/provider.tsx
@@ -90,18 +90,20 @@ export const PushyProvider = ({
  const downloadUpdate = useCallback(
    async (info: CheckResult | undefined = updateInfoRef.current) => {
      if (!info || !info.update) {
-        return;
+        return false;
      }
      try {
        const hash = await client.downloadUpdate(info, setProgress);
        if (!hash) {
-          return;
+          return false;
        }
        stateListener.current && stateListener.current.remove();
        if (options.updateStrategy === 'silentAndNow') {
-          return client.switchVersion(hash);
+          client.switchVersion(hash);
+          return true;
        } else if (options.updateStrategy === 'silentAndLater') {
-          return client.switchVersionLater(hash);
+          client.switchVersionLater(hash);
+          return true;
        }
        alertUpdate('提示', '下载完毕，是否立即更新?', [
          {
@@ -119,10 +121,12 @@ export const PushyProvider = ({
            },
          },
        ]);
+        return true;
      } catch (e: any) {
        setLastError(e);
        alertError('更新失败', e.message);
        throwErrorIfEnabled(e);
+        return false;
      }
    },
    [
@@ -202,7 +206,8 @@ export const PushyProvider = ({
          options.updateStrategy === 'silentAndNow' ||
          options.updateStrategy === 'silentAndLater'
        ) {
-          return downloadUpdate(info);
+          downloadUpdate(info);
+          return;
        }
        alertUpdate(
          '提示',
--- a/src/type.ts
+++ b/src/type.ts
@@ -38,7 +38,8 @@ export type EventType =
  | 'downloadingApk'
  | 'rejectStoragePermission'
  | 'errorStoragePermission'
-  | 'errorDownloadAndInstallApk';
+  | 'errorDownloadAndInstallApk'
+  | 'errorInstallApk';

 export interface EventData {
  currentVersion: string;
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -41,12 +41,12 @@ const ping =
        Promise.race([
          fetch(url, {
            method: 'HEAD',
-          }).then(({ status }) => (status === 200 ? url : null)),
+          })
+            .then(({ status }) => (status === 200 ? url : null))
+            .catch(() => null),
          new Promise(r => setTimeout(() => r(null), 2000)),
        ]);

-const canUseGoogle = ping('https://www.google.com');
-
 export function joinUrls(paths: string[], fileName?: string) {
  if (fileName) {
    return paths.map(path => 'https://' + path + '/' + fileName);
@@ -57,8 +57,5 @@ export const testUrls = async (urls?: string[]) => {
  if (!urls?.length) {
    return null;
  }
-  if (await canUseGoogle) {
-    return urls[0];
-  }
  return promiseAny(urls.map(ping)).catch(() => null);
 };
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,6 +1,6 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-# bun ./bun.lockb --hash: F85D92799AFF262A-7ffac79fcf85c731-89BCC22943BFB132-7245a25635ad115c
+# bun ./bun.lockb --hash: 2058EE9308759DAF-113fc986523daaf8-AF755908B492C9F6-6a66f4ed28448ee4


 "@ampproject/remapping@^2.2.0":
@@ -8022,16 +8022,11 @@ prelude-ls@^1.2.1:
  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==

-prettier@>=2:
+prettier@>=2, prettier@^2:
  version "2.8.8"
  resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"
  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==

-prettier@^3:
-  version "3.3.3"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz"
-  integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
-
 prettier-linter-helpers@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"
Author	SHA1	Message	Date
sunny.luo	73e2f72b0f	v10.19.1	2024-12-11 17:23:44 +08:00
CrazyBigTree	e6efa55bd5	fix: check module activity null pointer. (#457 ) Co-authored-by: 黄世城 <huangshicheng@xgd.com>	2024-12-10 20:42:34 +08:00
sunny.luo	d6b1205fb9	v10.19.0	2024-12-10 20:05:52 +08:00
sunny.luo	0382cfaec3	check activity	2024-12-10 20:03:13 +08:00
sunnylqm	6ee34ebd24	support 0.76	2024-12-07 16:43:22 +08:00
sunnylqm	09df53a6ab	update example to 0.76.3	2024-12-06 23:33:04 +08:00
sunny.luo	be93641392	v10.17.1	2024-12-02 16:20:37 +08:00
sunny.luo	946a5db7e9	catch network error	2024-12-02 16:16:18 +08:00
sunnylqm	d4f21a39f5	v10.17.0	2024-11-26 00:53:11 +08:00
sunnylqm	2192000d53	add return value for downloadupdate	2024-11-23 16:09:43 +08:00
sunnylqm	9a49025884	deps	2024-11-16 07:48:03 +08:00