v10.13.2

V10

.eslintrc

@@ -1,29 +0,0 @@
-{
-  "extends": "eslint-config-airbnb/base",
-  "parser": "babel-eslint",
-  "env": {
-    "browser": true,
-    "node": true,
-    "mocha": true
-  },
-  "rules": {
-    // Disable for console/alert
-    "no-console": 0,
-    "no-alert": 0,
-
-    "indent": [2, 2, {"SwitchCase": 1}]
-  },
-  "plugins": [
-    "import"
-  ],
-  "settings": {
-    "import/parser": "babel-eslint",
-    "import/resolve": {
-      "moduleDirectory": ["node_modules", "src"]
-    }
-  },
-  "globals": {
-    "__DEV__": true,
-    "__OPTION__": true
-  }
-}

.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native',
+};

.github/workflows/e2e_ios.yml

@@ -26,16 +26,16 @@ concurrency:
 jobs:
   ios:
     name: iOS
-    runs-on: macos-12
+    runs-on: macos-14-arm64
     # TODO matrix across APIs, at least 11 and 15 (lowest to highest)
     timeout-minutes: 60
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     steps:
       # Set up tool versions
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Configure JDK 1.11
         uses: actions/setup-java@v3

.github/workflows/scripts/functions/src/testFunctionDefaultRegion.ts

@@ -41,14 +41,17 @@ export const testFunctionDefaultRegion = functions.https.onCall(data => {
 
   const { type, asError, inputData } = data;
   if (!Object.hasOwnProperty.call(SAMPLE_DATA, type)) {
-    throw new functions.https.HttpsError('invalid-argument', 'Invalid test requested.');
+    throw new functions.https.HttpsError(
+      'invalid-argument',
+      'Invalid test requested.',
+    );
   }
 
   const outputData = SAMPLE_DATA[type];
 
   try {
     assert.deepEqual(outputData, inputData);
-  } catch (e) {
+  } catch (e: any) {
     console.error(e);
     throw new functions.https.HttpsError(
       'invalid-argument',

.npmignore

@@ -47,4 +47,6 @@ Example
 yarn.lock
 
 domains.json
-endpoints.json
+endpoints.json
+
+tea.yaml

.prettierrc.js

@@ -1,4 +1,6 @@
 module.exports = {
-  trailingComma: 'all',
+  arrowParens: 'avoid',
+  bracketSameLine: true,
   singleQuote: true,
+  trailingComma: 'all',
 };

Example/testHotUpdate/android/app/build.gradle

@@ -94,7 +94,7 @@ apply from: "../../node_modules/react-native/react.gradle"
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = false
+def enableSeparateBuildPerCPUArchitecture = true
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
@@ -141,7 +141,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "2.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
@@ -237,6 +237,7 @@ android {
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
+            crunchPngs false
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"

Example/testHotUpdate/android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
   package="com.awesomeproject">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
       android:name=".MainApplication"
@@ -19,8 +21,14 @@
         android:windowSoftInputMode="adjustResize"
         android:exported="true">
         <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
+          <action android:name="android.intent.action.MAIN" />
+          <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+        <intent-filter>
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
+          <data android:scheme="testhotupdate" />
         </intent-filter>
       </activity>
     </application>

Example/testHotUpdate/android/build.gradle

@@ -5,10 +5,11 @@ import org.apache.tools.ant.taskdefs.condition.Os
 buildscript {
     ext {
         buildToolsVersion = "31.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 23
         compileSdkVersion = 31
         targetSdkVersion = 31
-        kotlinVersion = '1.6.10'
+        kotlinVersion = '1.7.20'
+        kotlin_version = '1.7.20'
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64

Example/testHotUpdate/babel.config.js

@@ -1,3 +1,8 @@
 module.exports = {
   presets: ['module:metro-react-native-babel-preset'],
+  env: {
+    production: {
+      plugins: ['react-native-paper/babel'],
+    },
+  },
 };

Example/testHotUpdate/e2e/NativeModule.test.ts

@@ -28,14 +28,7 @@ describe('测试Native模块的方法', () => {
     await element(by.id('done')).longPress();
     await expect(element(by.id('done'))).toBeNotVisible();
   });
-
-  it('setBlockUpdate', async () => {
-    await element(by.id('setBlockUpdate')).longPress();
-    await element(by.id('submit')).longPress();
-    await expect(element(by.text('done'))).toBeVisible();
-    await element(by.id('done')).longPress();
-    await expect(element(by.id('done'))).toBeNotVisible();
-  });
+  
   if (device.getPlatform() === 'android') {
     it('reloadUpdate', async () => {
       await element(by.id('reloadUpdate')).longPress();

Example/testHotUpdate/ios/AwesomeProject.xcodeproj/project.pbxproj

@@ -7,29 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00E356F31AD99517003FC87E /* AwesomeProjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AwesomeProjectTests.m */; };
 		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 */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		7699B88040F8A987B510C191 /* libPods-AwesomeProject-AwesomeProjectTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-AwesomeProject-AwesomeProjectTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		00E356F41AD99517003FC87E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 13B07F861A680F5B00A75B9A;
-			remoteInfo = AwesomeProject;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
-		00E356EE1AD99517003FC87E /* AwesomeProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AwesomeProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		00E356F21AD99517003FC87E /* AwesomeProjectTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AwesomeProjectTests.m; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* AwesomeProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AwesomeProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = AwesomeProject/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = AwesomeProject/AppDelegate.mm; sourceTree = "<group>"; };
@@ -47,14 +32,6 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		00E356EB1AD99517003FC87E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7699B88040F8A987B510C191 /* libPods-AwesomeProject-AwesomeProjectTests.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -66,23 +43,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		00E356EF1AD99517003FC87E /* AwesomeProjectTests */ = {
-			isa = PBXGroup;
-			children = (
-				00E356F21AD99517003FC87E /* AwesomeProjectTests.m */,
-				00E356F01AD99517003FC87E /* Supporting Files */,
-			);
-			path = AwesomeProjectTests;
-			sourceTree = "<group>";
-		};
-		00E356F01AD99517003FC87E /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				00E356F11AD99517003FC87E /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		13B07FAE1A68108700A75B9A /* AwesomeProject */ = {
 			isa = PBXGroup;
 			children = (
@@ -118,7 +78,6 @@
 			children = (
 				13B07FAE1A68108700A75B9A /* AwesomeProject */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
-				00E356EF1AD99517003FC87E /* AwesomeProjectTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				BBD78D7AC51CEA395F1C20DB /* Pods */,
@@ -132,7 +91,6 @@
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* AwesomeProject.app */,
-				00E356EE1AD99517003FC87E /* AwesomeProjectTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -151,27 +109,6 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		00E356ED1AD99517003FC87E /* AwesomeProjectTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "AwesomeProjectTests" */;
-			buildPhases = (
-				A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */,
-				00E356EA1AD99517003FC87E /* Sources */,
-				00E356EB1AD99517003FC87E /* Frameworks */,
-				00E356EC1AD99517003FC87E /* Resources */,
-				C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */,
-				F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				00E356F51AD99517003FC87E /* PBXTargetDependency */,
-			);
-			name = AwesomeProjectTests;
-			productName = AwesomeProjectTests;
-			productReference = 00E356EE1AD99517003FC87E /* AwesomeProjectTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 		13B07F861A680F5B00A75B9A /* AwesomeProject */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AwesomeProject" */;
@@ -182,7 +119,6 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */,
 				E235C05ADACE081382539298 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
@@ -202,10 +138,6 @@
 			attributes = {
 				LastUpgradeCheck = 1210;
 				TargetAttributes = {
-					00E356ED1AD99517003FC87E = {
-						CreatedOnToolsVersion = 6.2;
-						TestTargetID = 13B07F861A680F5B00A75B9A;
-					};
 					13B07F861A680F5B00A75B9A = {
 						LastSwiftMigration = 1120;
 					};
@@ -225,19 +157,11 @@
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* AwesomeProject */,
-				00E356ED1AD99517003FC87E /* AwesomeProjectTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		00E356EC1AD99517003FC87E /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		13B07F8E1A680F5B00A75B9A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -266,45 +190,6 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
-		00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-AwesomeProject-AwesomeProjectTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -327,23 +212,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -361,23 +229,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AwesomeProject-AwesomeProjectTests/Pods-AwesomeProject-AwesomeProjectTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -400,14 +251,6 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		00E356EA1AD99517003FC87E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				00E356F31AD99517003FC87E /* AwesomeProjectTests.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		13B07F871A680F5B00A75B9A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -419,66 +262,7 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		00E356F51AD99517003FC87E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 13B07F861A680F5B00A75B9A /* AwesomeProject */;
-			targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
-		00E356F61AD99517003FC87E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-AwesomeProject-AwesomeProjectTests.debug.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = AwesomeProjectTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-					"$(inherited)",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AwesomeProject.app/AwesomeProject";
-			};
-			name = Debug;
-		};
-		00E356F71AD99517003FC87E /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-AwesomeProject-AwesomeProjectTests.release.xcconfig */;
-			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
-				COPY_PHASE_STRIP = NO;
-				INFOPLIST_FILE = AwesomeProjectTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-lc++",
-					"$(inherited)",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AwesomeProject.app/AwesomeProject";
-			};
-			name = Release;
-		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-AwesomeProject.debug.xcconfig */;
@@ -669,15 +453,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "AwesomeProjectTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				00E356F61AD99517003FC87E /* Debug */,
-				00E356F71AD99517003FC87E /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AwesomeProject" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Example/testHotUpdate/ios/AwesomeProject/AppDelegate.mm

@@ -1,5 +1,5 @@
 #import "AppDelegate.h"
-
+#import "RCTPushy.h"
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
@@ -87,7 +87,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
-  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+  return [RCTPushy bundleURL];
 #endif
 }
 

Example/testHotUpdate/ios/AwesomeProject/Info.plist

@@ -24,6 +24,19 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>UILaunchStoryboardName</key>
@@ -40,18 +53,10 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>For taking photos</string>
+
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>For saving photos</string>		
 </dict>
 </plist>

Example/testHotUpdate/ios/AwesomeProjectTests/AwesomeProjectTests.m

@@ -1,66 +0,0 @@
-#import <UIKit/UIKit.h>
-#import <XCTest/XCTest.h>
-
-#import <React/RCTLog.h>
-#import <React/RCTRootView.h>
-
-#define TIMEOUT_SECONDS 600
-#define TEXT_TO_LOOK_FOR @"Welcome to React"
-
-@interface AwesomeProjectTests : XCTestCase
-
-@end
-
-@implementation AwesomeProjectTests
-
-- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test
-{
-  if (test(view)) {
-    return YES;
-  }
-  for (UIView *subview in [view subviews]) {
-    if ([self findSubviewInView:subview matching:test]) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-- (void)testRendersWelcomeScreen
-{
-  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
-  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
-  BOOL foundElement = NO;
-
-  __block NSString *redboxError = nil;
-#ifdef DEBUG
-  RCTSetLogFunction(
-      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-        if (level >= RCTLogLevelError) {
-          redboxError = message;
-        }
-      });
-#endif
-
-  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
-    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-
-    foundElement = [self findSubviewInView:vc.view
-                                  matching:^BOOL(UIView *view) {
-                                    if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
-                                      return YES;
-                                    }
-                                    return NO;
-                                  }];
-  }
-
-#ifdef DEBUG
-  RCTSetLogFunction(RCTDefaultLogFunction);
-#endif
-
-  XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
-  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
-}
-
-@end

Example/testHotUpdate/ios/AwesomeProjectTests/Info.plist

@@ -1,24 +0,0 @@
-<?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>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>

Example/testHotUpdate/ios/Podfile

@@ -18,16 +18,11 @@ target 'AwesomeProject' do
     :production => production,
     :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
-    :flipper_configuration => FlipperConfiguration.enabled,
+    :flipper_configuration => false,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  target 'AwesomeProjectTests' do
-    inherit! :complete
-    # Pods for testing
-  end
-
   post_install do |installer|
     react_native_post_install(installer)
     __apply_Xcode_12_5_M1_post_install_workaround(installer)

Example/testHotUpdate/ios/Podfile.lock

@@ -1,6 +1,5 @@
 PODS:
   - boost (1.76.0)
-  - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.69.8)
   - FBReactNativeSpec (0.69.8):
@@ -10,71 +9,8 @@ PODS:
     - React-Core (= 0.69.8)
     - React-jsi (= 0.69.8)
     - ReactCommon/turbomodule/core (= 0.69.8)
-  - Flipper (0.125.0):
-    - Flipper-Folly (~> 2.6)
-    - Flipper-RSocket (~> 1.4)
-  - Flipper-Boost-iOSX (1.76.0.1.11)
-  - Flipper-DoubleConversion (3.2.0.1)
-  - Flipper-Fmt (7.1.7)
-  - Flipper-Folly (2.6.10):
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt (= 7.1.7)
-    - Flipper-Glog
-    - libevent (~> 2.1.12)
-    - OpenSSL-Universal (= 1.1.1100)
-  - Flipper-Glog (0.5.0.5)
-  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.4.3):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit (0.125.0):
-    - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/Core (0.125.0):
-    - Flipper (~> 0.125.0)
-    - FlipperKit/CppBridge
-    - FlipperKit/FBCxxFollyDynamicConvert
-    - FlipperKit/FBDefines
-    - FlipperKit/FKPortForwarding
-    - SocketRocket (~> 0.6.0)
-  - FlipperKit/CppBridge (0.125.0):
-    - Flipper (~> 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit/FBDefines (0.125.0)
-  - FlipperKit/FKPortForwarding (0.125.0):
-    - CocoaAsyncSocket (~> 7.6)
-    - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
-  - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutTextSearchable
-  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - FlipperKit/FlipperKitLayoutIOSDescriptors
-    - FlipperKit/FlipperKitLayoutTextSearchable
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - libevent (2.1.12)
-  - OpenSSL-Universal (1.1.1100)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -284,17 +220,19 @@ PODS:
   - React-jsinspector (0.69.8)
   - React-logger (0.69.8):
     - glog
-  - react-native-update (9.0.0):
+  - react-native-safe-area-context (4.8.2):
+    - React-Core
+  - react-native-update (10.10.0):
     - React
     - React-Core
-    - react-native-update/HDiffPatch (= 9.0.0)
-    - react-native-update/RCTPushy (= 9.0.0)
+    - react-native-update/HDiffPatch (= 10.10.0)
+    - react-native-update/RCTPushy (= 10.10.0)
     - SSZipArchive
-  - react-native-update/HDiffPatch (9.0.0):
+  - react-native-update/HDiffPatch (10.10.0):
     - React
     - React-Core
     - SSZipArchive
-  - react-native-update/RCTPushy (9.0.0):
+  - react-native-update/RCTPushy (10.10.0):
     - React
     - React-Core
     - SSZipArchive
@@ -364,40 +302,19 @@ PODS:
     - React-jsi (= 0.69.8)
     - React-logger (= 0.69.8)
     - React-perflogger (= 0.69.8)
-  - SocketRocket (0.6.0)
+  - ReactNativeCameraKit (14.0.0-beta9):
+    - React-Core
+  - RNVectorIcons (10.0.3):
+    - React-Core
   - SSZipArchive (2.4.3)
   - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
-  - Flipper (= 0.125.0)
-  - Flipper-Boost-iOSX (= 1.76.0.1.11)
-  - Flipper-DoubleConversion (= 3.2.0.1)
-  - Flipper-Fmt (= 7.1.7)
-  - Flipper-Folly (= 2.6.10)
-  - Flipper-Glog (= 0.5.0.5)
-  - Flipper-PeerTalk (= 0.0.4)
-  - Flipper-RSocket (= 1.4.3)
-  - FlipperKit (= 0.125.0)
-  - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/CppBridge (= 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
-  - FlipperKit/FBDefines (= 0.125.0)
-  - FlipperKit/FKPortForwarding (= 0.125.0)
-  - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
-  - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - OpenSSL-Universal (= 1.1.1100)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -406,7 +323,6 @@ DEPENDENCIES:
   - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
   - React-Codegen (from `build/generated/ios`)
   - React-Core (from `../node_modules/react-native/`)
-  - React-Core/DevSupport (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
@@ -414,6 +330,7 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-update (from `../node_modules/react-native-update`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -427,26 +344,14 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - ReactNativeCameraKit (from `../node_modules/react-native-camera-kit`)
+  - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
   trunk:
-    - CocoaAsyncSocket
-    - Flipper
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt
-    - Flipper-Folly
-    - Flipper-Glog
-    - Flipper-PeerTalk
-    - Flipper-RSocket
-    - FlipperKit
     - fmt
-    - libevent
-    - OpenSSL-Universal
-    - SocketRocket
     - SSZipArchive
-    - YogaKit
 
 EXTERNAL SOURCES:
   boost:
@@ -487,6 +392,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
   react-native-update:
     :path: "../node_modules/react-native-update"
   React-perflogger:
@@ -513,28 +420,20 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  ReactNativeCameraKit:
+    :path: "../node_modules/react-native-camera-kit"
+  RNVectorIcons:
+    :path: "../node_modules/react-native-vector-icons"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: c7b6997d41fffaaaf4d18c82bc93885df731e2d0
   FBReactNativeSpec: b1217c558a3ae84c2057d9c2ddce88af21379a68
-  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
-  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
-  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
-  Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
-  Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
-  Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
-  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
-  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
-  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
   RCTRequired: 344fd6fb3c669da87e91294be7ee0199bf35c701
   RCTTypeSafety: ca608cc1d3a81229632bc0c1136b698b9337c1d8
@@ -549,7 +448,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 2cf8ea3753afb81dfcc386613dbbb0b5d155fb34
   React-jsinspector: 0eda09e9cf22bbb5dbb1d23143b03a31acf37d67
   React-logger: 5997ab008583826c10ffe4e1ff990363e975639d
-  react-native-update: 2b5ef06bfeaa668614c8deb7ec4d20dcf56f9278
+  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
+  react-native-update: a7f136a3c87183b13c7ff5c4f9d2b614930968ad
   React-perflogger: ad1416a715d86b32f456e5d0aed99c3b52f1de37
   React-RCTActionSheet: cbf7c6a953982562418ee72a1084ff7b9447b558
   React-RCTAnimation: 33df3e25824dd7313edec28dded2745542f9352b
@@ -562,11 +462,11 @@ SPEC CHECKSUMS:
   React-RCTVibration: 5462287ee85304ba1a00474665ab292e63a41663
   React-runtimeexecutor: 9df680f18497367bcf5c15b6b6406c0f2dfa2b6a
   ReactCommon: c10f046f3ef8561e7c8e7e9b9dae2ecc9ffc48ef
-  SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
+  ReactNativeCameraKit: 4bec78d688adcd68772af2834d5c30a6a8e2a384
+  RNVectorIcons: bc7ee28cadf39c77a49232a14738dfce690f66cd
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   Yoga: d3820731e0ca3a4933f061ad29defaf7726e3251
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 618d17df10f335f1d113daac849a7997894646b2
+PODFILE CHECKSUM: d91298a06dc138c1778443a87db930ad51725939
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2

Example/testHotUpdate/metro.config.js

@@ -1,12 +1,12 @@
-const path = require('path');
+// const path = require('path');
 
-const extraNodeModules = {
-  react: path.resolve(__dirname, 'node_modules/react'),
-  'react-native': path.resolve(__dirname, 'node_modules/react-native'),
-  'react-native-update': path.resolve(__dirname, '../..'),
-  '@babel/runtime': path.resolve(__dirname, 'node_modules/@babel/runtime'),
-};
-const watchFolders = [path.resolve(__dirname, '../..')];
+// const extraNodeModules = {
+//   react: path.resolve(__dirname, 'node_modules/react'),
+//   'react-native': path.resolve(__dirname, 'node_modules/react-native'),
+//   'react-native-update': path.resolve(__dirname, '../..'),
+//   '@babel/runtime': path.resolve(__dirname, 'node_modules/@babel/runtime'),
+// };
+// const watchFolders = [path.resolve(__dirname, '../..')];
 
 module.exports = {
   transformer: {
@@ -17,8 +17,8 @@ module.exports = {
       },
     }),
   },
-  resolver: {
-    extraNodeModules,
-  },
-  watchFolders,
+  // resolver: {
+  //   extraNodeModules,
+  // },
+  // watchFolders,
 };

Example/testHotUpdate/package.json

@@ -9,14 +9,19 @@
     "test": "jest",
     "test:e2e": "detox test --configuration android.emu.debug",
     "lint": "eslint .",
-    "postinstall": "patch-package"
+    "postinstall": "patch-package",
+    "apk": "cd android && ./gradlew assembleRelease"
   },
   "dependencies": {
     "patch-package": "^6.5.1",
     "postinstall-postinstall": "^2.1.0",
     "react": "18.0.0",
     "react-native": "0.69.8",
-    "react-native-update": "link:../.."
+    "react-native-camera-kit": "^14.0.0-beta15",
+    "react-native-paper": "^5.12.1",
+    "react-native-safe-area-context": "^4.8.2",
+    "react-native-update": "^10.11.3",
+    "react-native-vector-icons": "^10.0.3"
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",

Example/testHotUpdate/src/TestConsole.js

@@ -19,23 +19,25 @@ 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;
+  }
 
-  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>
+  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}) {
   const [text, setText] = useState('');
   const [running, setRunning] = useState(false);
@@ -64,13 +66,6 @@ export default function TestConsole({visible}) {
           setText(`setUuid\n${UUID}`);
         },
       },
-      {
-        name: 'setBlockUpdate',
-        invoke: () => {
-          setText('setBlockUpdate');
-          setOptions({reason: 'application has been block', until: 1673082950});
-        },
-      },
       {
         name: 'reloadUpdate',
         invoke: () => {
@@ -132,9 +127,8 @@ export default function TestConsole({visible}) {
           testID={NativeTestMethod[i].name}
           onLongPress={() => {
             NativeTestMethod[i].invoke();
-          }}
-        >
-        <Text>{NativeTestMethod[i].name}</Text>
+          }}>
+          <Text>{NativeTestMethod[i].name}</Text>
         </TouchableOpacity>,
       );
     }
@@ -164,8 +158,14 @@ export default function TestConsole({visible}) {
         />
         {running && <ActivityIndicator />}
         <TouchableOpacity
-        style={{backgroundColor:'rgb(0,140,237)', justifyContent: 'center',
-        alignItems: 'center',paddingTop:10,paddingBottom:10,marginBottom:5}}
+          style={{
+            backgroundColor: 'rgb(0,140,237)',
+            justifyContent: 'center',
+            alignItems: 'center',
+            paddingTop: 10,
+            paddingBottom: 10,
+            marginBottom: 5,
+          }}
           testID="submit"
           onLongPress={async () => {
             setRunning(true);
@@ -195,17 +195,18 @@ export default function TestConsole({visible}) {
               setAlertMsg(e.message);
             }
             setRunning(false);
-          }}
-        >
-          <Text style={{color:'white'}}>执行</Text>
+          }}>
+          <Text style={{color: 'white'}}>执行</Text>
         </TouchableOpacity>
-         <Button title="重置" onPress={() => setText('')} />
-          {renderTestView()}
-          <CustomDialog
-            title={alertMsg}
-            visible={alertVisible}
-            onConfirm={()=>{setAlertVisible(false)}}
-      />
+        <Button title="重置" onPress={() => setText('')} />
+        {renderTestView()}
+        <CustomDialog
+          title={alertMsg}
+          visible={alertVisible}
+          onConfirm={() => {
+            setAlertVisible(false);
+          }}
+        />
       </SafeAreaView>
     </Modal>
   );

Example/testHotUpdate/src/index.js

@@ -1,206 +0,0 @@
-import React, {Component} from 'react';
-import {
-  StyleSheet,
-  Platform,
-  Text,
-  View,
-  Alert,
-  TouchableOpacity,
-  Linking,
-  Image,
-} from 'react-native';
-
-import {
-  isFirstTime,
-  isRolledBack,
-  packageVersion,
-  currentVersion,
-  checkUpdate,
-  downloadUpdate,
-  switchVersion,
-  switchVersionLater,
-  markSuccess,
-  downloadAndInstallApk,
-  cInfo,
-} from 'react-native-update';
-
-import TestConsole from './TestConsole';
-
-import _updateConfig from '../update.json';
-const {appKey} = _updateConfig[Platform.OS];
-export default class App extends Component {
-  state = {
-    received: 0,
-    total: 0,
-    showTestConsole: false,
-  };
-  componentDidMount() {
-    if (isRolledBack) {
-      Alert.alert('提示', '刚刚更新失败了,版本被回滚.');
-    } else if (isFirstTime) {
-      Alert.alert(
-        '提示',
-        '这是当前版本第一次启动,是否要模拟启动失败?将回滚到上一版本',
-        [
-          {
-            text: '是',
-            onPress: () => {
-              throw new Error('模拟启动失败,请重启应用');
-            },
-          },
-          {
-            text: '否',
-            onPress: () => {
-              markSuccess();
-            },
-          },
-        ],
-      );
-    }
-  }
-  doUpdate = async info => {
-    try {
-      const hash = await downloadUpdate(info, {
-        onDownloadProgress: ({received, total}) => {
-          this.setState({
-            received,
-            total,
-          });
-        },
-      });
-      if (!hash) {
-        return;
-      }
-      Alert.alert('提示', '下载完毕,是否重启应用?', [
-        {
-          text: '是',
-          onPress: () => {
-            switchVersion(hash);
-          },
-        },
-        {text: '否'},
-        {
-          text: '下次启动时',
-          onPress: () => {
-            switchVersionLater(hash);
-          },
-        },
-      ]);
-    } catch (err) {
-      Alert.alert('更新失败', err.message);
-    }
-  };
-
-  checkUpdate = async () => {
-    let info;
-    try {
-      info = await checkUpdate(appKey);
-    } catch (err) {
-      Alert.alert('更新检查失败', err.message);
-      return;
-    }
-    if (info.expired) {
-      Alert.alert('提示', '您的应用版本已更新，点击确定下载安装新版本', [
-        {
-          text: '确定',
-          onPress: () => {
-            if (info.downloadUrl) {
-              // apk可直接下载安装
-              if (
-                Platform.OS === 'android' &&
-                info.downloadUrl.endsWith('.apk')
-              ) {
-                downloadAndInstallApk({
-                  url: info.downloadUrl,
-                  onDownloadProgress: ({received, total}) => {
-                    this.setState({
-                      received,
-                      total,
-                    });
-                  },
-                });
-              } else {
-                Linking.openURL(info.downloadUrl);
-              }
-            }
-          },
-        },
-      ]);
-    } else if (info.upToDate) {
-      Alert.alert('提示', '您的应用版本已是最新.');
-    } else {
-      Alert.alert(
-        '提示',
-        '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
-        [
-          {
-            text: '是',
-            onPress: () => {
-              this.doUpdate(info);
-            },
-          },
-          {text: '否'},
-        ],
-      );
-    }
-  };
-
-  render() {
-    const {received, total, showTestConsole} = this.state;
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>欢迎使用热更新服务</Text>
-        <Image
-          resizeMode={'contain'}
-          source={require('./assets/shezhi.png')}
-          style={styles.image}
-        />
-        <Text style={styles.instructions}>
-          这是版本一 {'\n'}
-          当前原生包版本号: {packageVersion}
-          {'\n'}
-          当前热更新版本Hash: {currentVersion || '(空)'}
-          {'\n'}
-        </Text>
-        <Text>
-          下载进度：{received} / {total}
-        </Text>
-        <TouchableOpacity onPress={this.checkUpdate}>
-          <Text style={styles.instructions}>点击这里检查更新</Text>
-        </TouchableOpacity>
-
-        <TouchableOpacity
-          testID="testcase"
-          style={{marginTop: 15}}
-          onLongPress={() => {
-            this.setState({showTestConsole: true});
-          }}>
-          <Text style={styles.instructions}>
-            react-native-update版本：{cInfo.pushy}
-          </Text>
-        </TouchableOpacity>
-        <TestConsole visible={showTestConsole} />
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
-  image: {},
-});

Example/testHotUpdate/src/index.tsx

@@ -0,0 +1,204 @@
+/* eslint-disable react/no-unstable-nested-components */
+/* eslint-disable react-native/no-inline-styles */
+import React, {useRef, useState} from 'react';
+import {
+  StyleSheet,
+  Platform,
+  Text,
+  View,
+  TouchableOpacity,
+  Image,
+  Switch,
+} from 'react-native';
+import {
+  Icon,
+  PaperProvider,
+  Snackbar,
+  Banner,
+  Button,
+  Modal,
+  Portal,
+} from 'react-native-paper';
+import {Camera} from 'react-native-camera-kit';
+
+import TestConsole from './TestConsole';
+
+import _updateConfig from '../update.json';
+import {PushyProvider, Pushy, usePushy} from 'react-native-update';
+const {appKey} = _updateConfig[Platform.OS];
+
+function App() {
+  const {
+    client,
+    checkUpdate,
+    downloadUpdate,
+    switchVersionLater,
+    switchVersion,
+    updateInfo,
+    packageVersion,
+    currentHash,
+    parseTestQrCode,
+    progress: {received, total} = {},
+  } = usePushy();
+  const [useDefaultAlert, setUseDefaultAlert] = useState(true);
+  const [showTestConsole, setShowTestConsole] = useState(false);
+  const [showUpdateBanner, setShowUpdateBanner] = useState(false);
+  const [showUpdateSnackbar, setShowUpdateSnackbar] = useState(false);
+  const snackbarVisible =
+    !useDefaultAlert && showUpdateSnackbar && updateInfo?.update;
+  const [showCamera, setShowCamera] = useState(false);
+  const lastParsedCode = useRef('');
+
+  return (
+    <View style={styles.container}>
+      <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      <View style={{flexDirection: 'row'}}>
+        <Text>
+          {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示
+        </Text>
+        <Switch
+          value={useDefaultAlert}
+          onValueChange={v => {
+            setUseDefaultAlert(v);
+            client?.setOptions({
+              updateStrategy: v ? null : 'alwaysAlert',
+            });
+            setShowUpdateSnackbar(!v);
+          }}
+        />
+      </View>
+      <Button onPress={() => setShowCamera(true)}>打开相机</Button>
+      <Portal>
+        <Modal visible={showCamera} onDismiss={() => setShowCamera(false)}>
+          <Camera
+            style={{minHeight: 320}}
+            scanBarcode={true}
+            onReadCode={({nativeEvent: {codeStringValue}}) => {
+              // 防止重复扫码
+              if (lastParsedCode.current === codeStringValue) {
+                return;
+              }
+              lastParsedCode.current = codeStringValue;
+              setTimeout(() => {
+                lastParsedCode.current = '';
+              }, 1000);
+              setShowCamera(false);
+              parseTestQrCode(codeStringValue);
+            }} // optional
+            showFrame={true} // (default false) optional, show frame with transparent layer (qr code or barcode will be read on this area ONLY), start animation for scanner, that stops when a code has been found. Frame always at center of the screen
+            laserColor="red" // (default red) optional, color of laser in scanner frame
+            frameColor="white" // (default white) optional, color of border of scanner frame
+          />
+        </Modal>
+      </Portal>
+      <Image
+        resizeMode={'contain'}
+        source={require('./assets/shezhi.png')}
+        style={styles.image}
+      />
+      <Text style={styles.instructions}>
+        这是版本一 {'\n'}
+        当前原生包版本号: {packageVersion}
+        {'\n'}
+        当前热更新版本Hash: {currentHash || '(空)'}
+        {'\n'}
+      </Text>
+      <Text>
+        下载进度：{received} / {total}
+      </Text>
+      <TouchableOpacity
+        onPress={() => {
+          checkUpdate();
+          setShowUpdateSnackbar(true);
+        }}>
+        <Text style={styles.instructions}>点击这里检查更新</Text>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        testID="testcase"
+        style={{marginTop: 15}}
+        onLongPress={() => {
+          setShowTestConsole(true);
+        }}>
+        <Text style={styles.instructions}>
+          react-native-update版本：{client?.version}
+        </Text>
+      </TouchableOpacity>
+      <TestConsole visible={showTestConsole} />
+      {snackbarVisible && (
+        <Snackbar
+          visible={snackbarVisible}
+          onDismiss={() => {
+            setShowUpdateSnackbar(false);
+          }}
+          action={{
+            label: '更新',
+            onPress: async () => {
+              setShowUpdateSnackbar(false);
+              await downloadUpdate();
+              setShowUpdateBanner(true);
+            },
+          }}>
+          <Text style={{color: 'white'}}>
+            有新版本({updateInfo.name})可用，是否更新？
+          </Text>
+        </Snackbar>
+      )}
+      <Banner
+        style={{width: '100%', position: 'absolute', top: 0}}
+        visible={showUpdateBanner}
+        actions={[
+          {
+            label: '立即重启',
+            onPress: switchVersion,
+          },
+          {
+            label: '下次再说',
+            onPress: () => {
+              switchVersionLater();
+              setShowUpdateBanner(false);
+            },
+          },
+        ]}
+        icon={({size}) => (
+          <Icon name="checkcircleo" size={size} color="#00f" />
+        )}>
+        更新已完成，是否立即重启？
+      </Banner>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#F5FCFF',
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
+  image: {},
+});
+
+const pushyClient = new Pushy({
+  appKey,
+});
+
+export default function Root() {
+  return (
+    <PushyProvider client={pushyClient}>
+      <PaperProvider>
+        <App />
+      </PaperProvider>
+    </PushyProvider>
+  );
+}

Example/testHotUpdate/update.json

@@ -1,10 +1,10 @@
 {
-    "ios": {
-        "appId": 10976,
-        "appKey": "p5q_rPYNOE0WdCf-i9ZCGPw-DUGUCMvY"
-    },
-    "android": {
-        "appId": 10977,
-        "appKey": "bUYKfZgtC9VirZsQbAt8qken2Gq2uxe3"
-    }
-}
+  "ios": {
+    "appId": 24794,
+    "appKey": "SqShg4Klnj2hG6LAFMW2PdcgSSuniz0T"
+  },
+  "android": {
+    "appId": 27509,
+    "appKey": "aQz3Uc2pA7gt_prDaQ4rbWRY"
+  }
+}

README.md

@@ -8,9 +8,9 @@
 
 ### 优势
 
-1. 基于阿里云高速 CDN 分发，对比其他服务器在国外的热更新服务，分发更稳定，更新成功率极高。
+1. 对中国用户使用阿里云高速 CDN 分发，对比其他服务器在国外的热更新服务，分发更稳定，更新成功率极高。对国外用户则智能分流至 cloudflare，同样享受高速更新服务。
 2. 基于 bsdiff/hdiff 算法创建的**超小更新包**，通常版本迭代后在几十 KB 级别（其他全量热更新服务所需流量通常在几十 MB 级别）。
-3. 始终跟进 RN 最新正式版本，第一时间提供支持。支持 hermes 字节码格式。（暂不支持新架构，会待其相对稳定后跟进）
+3. 始终跟进 RN 最新正式版本，第一时间提供支持。支持 hermes 字节码格式。支持新架构。
 4. 跨越多个版本进行更新时，只需要下载**一个更新包**，不需要逐版本依次更新。
 5. 命令行工具 & 网页双端管理，版本发布过程简单便捷，完全可以集成 CI。
 6. 支持崩溃回滚，安全可靠。
@@ -33,4 +33,3 @@ $ yarn start
 本组件由[React Native 中文网](https://reactnative.cn/)独家发布，如有定制需求可以[联系我们](https://reactnative.cn/about.html#content)。
 
 关于此插件发现任何问题，可以前往[Issues](https://github.com/reactnativecn/react-native-pushy/issues)发帖提问。
-

android/build.gradle

@@ -9,6 +9,19 @@ def isNewArchitectureEnabled() {
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
+
+  return major >= 8
+}
+
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
@@ -16,6 +29,16 @@ if (isNewArchitectureEnabled()) {
 
 
 android {
+
+    if (supportsNamespace()) {
+        namespace "cn.reactnative.modules.update"
+
+        sourceSets {
+            main {
+                manifest.srcFile "src/main/AndroidManifestNew.xml"
+            }
+        }
+    }
     compileSdkVersion safeExtGet('compileSdkVersion', 28)
     buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
 

android/proguard.pro

@@ -1,2 +1,3 @@
 -keepnames class cn.reactnative.modules.update.DownloadTask { *; }
+-keepnames class cn.reactnative.modules.update.UpdateModuleImpl { *; }
 -keepnames class com.facebook.react.ReactInstanceManager { *; }

android/src/main/AndroidManifest.xml

@@ -1,9 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cn.reactnative.modules.update">
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application>
         <meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
         <provider

android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <meta-data android:name="pushy_build_time" android:value="@string/pushy_build_time" />
+        <provider
+            android:name=".PushyFileProvider"
+            android:authorities="${applicationId}.pushy.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/pushy_file_paths" />
+        </provider>
+    </application>
+</manifest>

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

@@ -75,7 +75,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 .build();
         Response response = client.newCall(request).execute();
         if (response.code() > 299) {
-            throw new Error("Server return code " + response.code());
+            throw new Error("Server error:" + response.code() + " " + response.message());
         }
         ResponseBody body = response.body();
         long contentLength = body.contentLength();
@@ -237,19 +237,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         while (entries.hasMoreElements()) {
             ZipEntry ze = entries.nextElement();
 
-            String fn = ze.getName();
-            File fmd = new File(param.unzipDirectory, fn);
-
-            if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Unzipping " + fn);
-            }
-
-            if (ze.isDirectory()) {
-                fmd.mkdirs();
-                continue;
-            }
-
-            zipFile.unzipToFile(ze, fmd);
+            zipFile.unzipToPath(ze, param.unzipDirectory);
         }
 
         zipFile.close();
@@ -324,8 +312,15 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                     } else {
                         target = copyList.get((from));
                     }
-                    target.add(new File(param.unzipDirectory, to));
-                    //copyFromResource(from, new File(param.unzipDirectory, to));
+                    File toFile = new File(param.unzipDirectory, to);
+
+                    // Fixing a Zip Path Traversal Vulnerability
+                    // https://support.google.com/faqs/answer/9294009
+                    String canonicalPath = toFile.getCanonicalPath();
+                    if (!canonicalPath.startsWith(param.unzipDirectory.getCanonicalPath() + File.separator)) {
+                        throw new SecurityException("Illegal name: " + to);
+                    }
+                    target.add(toFile);
                 }
                 continue;
             }
@@ -339,18 +334,9 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 fout.close();
                 continue;
             }
-            File fmd = new File(param.unzipDirectory, fn);
 
-            if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Unzipping " + fn);
-            }
 
-            if (ze.isDirectory()) {
-                fmd.mkdirs();
-                continue;
-            }
-
-            zipFile.unzipToFile(ze, fmd);
+            zipFile.unzipToPath(ze, param.unzipDirectory);
         }
 
         zipFile.close();
@@ -419,18 +405,8 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 fout.close();
                 continue;
             }
-            File fmd = new File(param.unzipDirectory, fn);
 
-            if (UpdateContext.DEBUG) {
-                Log.d("RNUpdate", "Unzipping " + fn);
-            }
-
-            if (ze.isDirectory()) {
-                fmd.mkdirs();
-                continue;
-            }
-
-            zipFile.unzipToFile(ze, fmd);
+            zipFile.unzipToPath(ze, param.unzipDirectory);
         }
 
         zipFile.close();

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

@@ -1,5 +1,7 @@
 package cn.reactnative.modules.update;
 
+import android.util.Log;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -10,12 +12,15 @@ import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+
 public class SafeZipFile extends ZipFile {
 
     public SafeZipFile(File file) throws IOException {
         super(file);
     }
 
+    private static final int BUFFER_SIZE = 8192;
+
     @Override
     public Enumeration<? extends ZipEntry> entries() {
         return new SafeZipEntryIterator(super.entries());
@@ -43,40 +48,46 @@ public class SafeZipFile extends ZipFile {
                  * avoid ZipperDown
                  */
                 if (null != name && (name.contains("../") || name.contains("..\\"))) {
-                    throw new SecurityException("illegal entry: " + entry.getName());
+                    throw new SecurityException("illegal entry: " + name);
                 }
             }
             return entry;
         }
     }
 
-    public void unzipToFile(ZipEntry entry, File output) throws IOException {
-        InputStream inputStream = null;
-        try {
-            inputStream = getInputStream(entry);
-            writeOutInputStream(output, inputStream);
-        } finally {
-            if (inputStream != null) {
-                inputStream.close();
+    public void unzipToPath(ZipEntry ze, File targetPath) throws IOException {
+        String name = ze.getName();
+        File target = new File(targetPath, name);
+
+        // Fixing a Zip Path Traversal Vulnerability
+        // https://support.google.com/faqs/answer/9294009
+        String canonicalPath = target.getCanonicalPath();
+        if (!canonicalPath.startsWith(targetPath.getCanonicalPath() + File.separator)) {
+            throw new SecurityException("Illegal name: " + name);
+        }
+
+        if (UpdateContext.DEBUG) {
+            Log.d("RNUpdate", "Unzipping " + name);
+        }
+
+        if (ze.isDirectory()) {
+            target.mkdirs();
+            return;
+        }
+        unzipToFile(ze, target);
+    }
+
+    public void unzipToFile(ZipEntry ze, File target) throws IOException {
+        try (InputStream inputStream = getInputStream(ze)) {
+            try (BufferedOutputStream output = new BufferedOutputStream(new FileOutputStream(target));
+                 BufferedInputStream input = new BufferedInputStream(inputStream)) {
+                byte[] buffer = new byte[BUFFER_SIZE];
+                int n;
+                while ((n = input.read(buffer, 0, BUFFER_SIZE)) >= 0) {
+                    output.write(buffer, 0, n);
+                }
             }
         }
     }
 
-    private void writeOutInputStream(File file, InputStream inputStream) throws IOException {
-        BufferedOutputStream output = null;
-        try {
-            output = new BufferedOutputStream(
-                    new FileOutputStream(file));
-            BufferedInputStream input = new BufferedInputStream(inputStream);
-            byte b[] = new byte[8192];
-            int n;
-            while ((n = input.read(b, 0, 8192)) >= 0) {
-                output.write(b, 0, n);
-            }
-        } finally {
-            if (output != null) {
-                output.close();
-            }
-        }
-    }
 }

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

@@ -69,13 +69,6 @@ public class UpdateContext {
         return context.getString(R.string.pushy_build_time);
     }
 
-    public Map getBlockUpdate() {
-        return new HashMap<String, Object>() {{
-            put("until", sp.getInt("blockUntil", 0));
-            put("reason", sp.getString("blockReason", null));
-        }};
-    }
-
     public boolean getIsUsingBundleUrl() {
         return isUsingBundleUrl;
     }
@@ -166,13 +159,6 @@ public class UpdateContext {
         return sp.getString(key, null);
     }
 
-    public void setBlockUpdate(int until, String reason) {
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putInt("blockUntil", until);
-        editor.putString("blockReason", reason);
-        editor.apply();
-    }
-
     public String getCurrentVersion() {
         return sp.getString("currentVersion", null);
     }

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

@@ -192,23 +192,6 @@ public class UpdateModuleImpl {
         }
     }
 
-    public static void setBlockUpdate(UpdateContext updateContext, ReadableMap options,Promise promise) {
-        try {
-            final int until = options.getInt("until");
-            final String reason = options.getString("reason");
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.setBlockUpdate(until, reason);
-                }
-            });
-            promise.resolve(true);
-        }catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
-
-    }
-
     public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
         try {
             UiThreadUtil.runOnUiThread(new Runnable() {

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

@@ -14,7 +14,7 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-public class UpdateModule extends NativeUpdateSpec {
+public class UpdateModule extends NativePushySpec {
     UpdateContext updateContext;
     public static ReactApplicationContext mContext;
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
@@ -45,7 +45,6 @@ public class UpdateModule extends NativeUpdateSpec {
         if (rolledBackVersion != null) {
             updateContext.clearRollbackMark();
         }
-        constants.put("blockUpdate", updateContext.getBlockUpdate());
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
     }
@@ -57,7 +56,7 @@ public class UpdateModule extends NativeUpdateSpec {
 
     @Override
     public void downloadFullUpdate(ReadableMap options, final Promise promise) {
-    UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
+        UpdateModuleImpl.downloadFullUpdate(this.updateContext,options,promise);
     }
 
     @Override
@@ -108,11 +107,6 @@ public class UpdateModule extends NativeUpdateSpec {
         UpdateModuleImpl.markSuccess(updateContext,promise);
     }
 
-    @Override
-    public void setBlockUpdate(ReadableMap options,Promise promise) {
-        UpdateModuleImpl.setBlockUpdate(updateContext,options,promise);
-    }
-
     @Override
     public void setUuid(final String uuid, Promise promise) {
         UpdateModuleImpl.setUuid(updateContext,uuid,promise);

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

@@ -59,7 +59,6 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         if (rolledBackVersion != null) {
             updateContext.clearRollbackMark();
         }
-        constants.put("blockUpdate", updateContext.getBlockUpdate());
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
     }
@@ -239,18 +238,6 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
-    public void setBlockUpdate(ReadableMap options) {
-        final int until = options.getInt("until");
-        final String reason = options.getString("reason");
-        UiThreadUtil.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                updateContext.setBlockUpdate(until, reason);
-            }
-        });
-    }
-
     @ReactMethod
     public void setUuid(final String uuid) {
         UiThreadUtil.runOnUiThread(new Runnable() {

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:@react-native/babel-preset'],
+};

domains.json

@@ -1 +1 @@
-["update.react-native.cn", "update.reactnative.cn"]
+["update.react-native.cn", "update.reactnative.cn", "p.reactnative.cn"]

endpoints.json

@@ -1 +1 @@
-["https://update.react-native.cn/api", "https://update.reactnative.cn/api"]
+["https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run", "https://p.reactnative.cn/api"]

ios/RCTPushy.xcodeproj/project.pbxproj

@@ -14,11 +14,8 @@
 		249F2F64261C58C700A1E60E /* Lzma2Dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 249F2F60261C58C700A1E60E /* Lzma2Dec.c */; };
 		249F2F65261C58C700A1E60E /* LzmaDec.c in Sources */ = {isa = PBXBuildFile; fileRef = 249F2F62261C58C700A1E60E /* LzmaDec.c */; };
 		91C5F0031C76ECA90037E727 /* RCTPushy.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 91C5F0021C76ECA90037E727 /* RCTPushy.h */; };
-		91C5F0051C76ECA90037E727 /* RCTPushy.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C5F0041C76ECA90037E727 /* RCTPushy.m */; };
-		9F1BCB1D1CAE5937000EF2CB /* RCTPushyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1BCB1C1CAE5937000EF2CB /* RCTPushyManager.m */; };
 		9F1BCB461CAF6B3E000EF2CB /* bspatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F1BCB3B1CAF6B3E000EF2CB /* bspatch.c */; };
 		9F1BCB4F1CAF6B68000EF2CB /* BSDiff.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F1BCB4E1CAF6B68000EF2CB /* BSDiff.m */; };
-		9F292F7D1C7C44290095945D /* RCTPushyDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F292F7C1C7C44290095945D /* RCTPushyDownloader.m */; };
 		9F394D7D1C7C25DC00C794C0 /* aescrypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D5B1C7C25DC00C794C0 /* aescrypt.c */; };
 		9F394D7E1C7C25DC00C794C0 /* aeskey.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D5C1C7C25DC00C794C0 /* aeskey.c */; };
 		9F394D7F1C7C25DC00C794C0 /* aestab.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D5E1C7C25DC00C794C0 /* aestab.c */; };
@@ -33,6 +30,9 @@
 		9F394D881C7C25DC00C794C0 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D761C7C25DC00C794C0 /* unzip.c */; };
 		9F394D891C7C25DC00C794C0 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D781C7C25DC00C794C0 /* zip.c */; };
 		9F394D8A1C7C25DC00C794C0 /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F394D7B1C7C25DC00C794C0 /* SSZipArchive.m */; };
+		A3FD91A62C3C01600022D27F /* RCTPushy.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3FD91A52C3C01600022D27F /* RCTPushy.mm */; };
+		A3FD91A82C3C01640022D27F /* RCTPushyDownloader.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3FD91A72C3C01640022D27F /* RCTPushyDownloader.mm */; };
+		A3FD91AA2C3C01680022D27F /* RCTPushyManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3FD91A92C3C01680022D27F /* RCTPushyManager.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -64,15 +64,12 @@
 		249F2F63261C58C700A1E60E /* LzmaDec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LzmaDec.h; path = ../../../android/jni/lzma/C/LzmaDec.h; sourceTree = "<group>"; };
 		91C5EFFF1C76ECA90037E727 /* libRCTPushy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTPushy.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		91C5F0021C76ECA90037E727 /* RCTPushy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTPushy.h; sourceTree = "<group>"; };
-		91C5F0041C76ECA90037E727 /* RCTPushy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTPushy.m; sourceTree = "<group>"; };
 		9F1BCB1B1CAE5937000EF2CB /* RCTPushyManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPushyManager.h; sourceTree = "<group>"; };
-		9F1BCB1C1CAE5937000EF2CB /* RCTPushyManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPushyManager.m; sourceTree = "<group>"; };
 		9F1BCB3B1CAF6B3E000EF2CB /* bspatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bspatch.c; sourceTree = "<group>"; };
 		9F1BCB3C1CAF6B3E000EF2CB /* bspatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bspatch.h; sourceTree = "<group>"; };
 		9F1BCB4D1CAF6B68000EF2CB /* BSDiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSDiff.h; sourceTree = "<group>"; };
 		9F1BCB4E1CAF6B68000EF2CB /* BSDiff.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSDiff.m; sourceTree = "<group>"; };
 		9F292F7B1C7C44290095945D /* RCTPushyDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPushyDownloader.h; sourceTree = "<group>"; };
-		9F292F7C1C7C44290095945D /* RCTPushyDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPushyDownloader.m; sourceTree = "<group>"; };
 		9F394D591C7C25DC00C794C0 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
 		9F394D5A1C7C25DC00C794C0 /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = "<group>"; };
 		9F394D5B1C7C25DC00C794C0 /* aescrypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aescrypt.c; sourceTree = "<group>"; };
@@ -108,6 +105,9 @@
 		9F394D7A1C7C25DC00C794C0 /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipArchive.h; sourceTree = "<group>"; };
 		9F394D7B1C7C25DC00C794C0 /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchive.m; sourceTree = "<group>"; };
 		9F394D7C1C7C25DC00C794C0 /* ZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipArchive.h; sourceTree = "<group>"; };
+		A3FD91A52C3C01600022D27F /* RCTPushy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTPushy.mm; sourceTree = "<group>"; };
+		A3FD91A72C3C01640022D27F /* RCTPushyDownloader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTPushyDownloader.mm; sourceTree = "<group>"; };
+		A3FD91A92C3C01680022D27F /* RCTPushyManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTPushyManager.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -172,11 +172,11 @@
 				9F1BCB381CAF6B3E000EF2CB /* BSDiff */,
 				9F394D571C7C25DC00C794C0 /* SSZipArchive */,
 				91C5F0021C76ECA90037E727 /* RCTPushy.h */,
-				91C5F0041C76ECA90037E727 /* RCTPushy.m */,
 				9F1BCB1B1CAE5937000EF2CB /* RCTPushyManager.h */,
-				9F1BCB1C1CAE5937000EF2CB /* RCTPushyManager.m */,
 				9F292F7B1C7C44290095945D /* RCTPushyDownloader.h */,
-				9F292F7C1C7C44290095945D /* RCTPushyDownloader.m */,
+				A3FD91A52C3C01600022D27F /* RCTPushy.mm */,
+				A3FD91A72C3C01640022D27F /* RCTPushyDownloader.mm */,
+				A3FD91A92C3C01680022D27F /* RCTPushyManager.mm */,
 			);
 			path = RCTPushy;
 			sourceTree = "<group>";
@@ -321,25 +321,25 @@
 				9F394D821C7C25DC00C794C0 /* hmac.c in Sources */,
 				9F394D881C7C25DC00C794C0 /* unzip.c in Sources */,
 				249F2F65261C58C700A1E60E /* LzmaDec.c in Sources */,
-				9F1BCB1D1CAE5937000EF2CB /* RCTPushyManager.m in Sources */,
 				249F2F5E261C589D00A1E60E /* patch.c in Sources */,
 				9F1BCB4F1CAF6B68000EF2CB /* BSDiff.m in Sources */,
 				9F394D7E1C7C25DC00C794C0 /* aeskey.c in Sources */,
 				9F394D7F1C7C25DC00C794C0 /* aestab.c in Sources */,
 				9F394D7D1C7C25DC00C794C0 /* aescrypt.c in Sources */,
 				9F394D801C7C25DC00C794C0 /* entropy.c in Sources */,
-				9F292F7D1C7C44290095945D /* RCTPushyDownloader.m in Sources */,
 				249F2F64261C58C700A1E60E /* Lzma2Dec.c in Sources */,
 				249F2F55261C584900A1E60E /* hpatch.c in Sources */,
 				9F394D831C7C25DC00C794C0 /* prng.c in Sources */,
 				9F394D861C7C25DC00C794C0 /* ioapi.c in Sources */,
+				A3FD91A82C3C01640022D27F /* RCTPushyDownloader.mm in Sources */,
 				9F1BCB461CAF6B3E000EF2CB /* bspatch.c in Sources */,
+				A3FD91A62C3C01600022D27F /* RCTPushy.mm in Sources */,
 				9F394D8A1C7C25DC00C794C0 /* SSZipArchive.m in Sources */,
 				249F2F50261C577300A1E60E /* HDiffPatch.m in Sources */,
+				A3FD91AA2C3C01680022D27F /* RCTPushyManager.mm in Sources */,
 				9F394D891C7C25DC00C794C0 /* zip.c in Sources */,
 				9F394D841C7C25DC00C794C0 /* pwd2key.c in Sources */,
 				249F2F59261C586900A1E60E /* file_for_patch.c in Sources */,
-				91C5F0051C76ECA90037E727 /* RCTPushy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/RCTPushy/RCTPushy.mm

@@ -16,7 +16,6 @@ static NSString *const paramLastVersion = @"lastVersion";
 static NSString *const paramCurrentVersion = @"currentVersion";
 static NSString *const paramIsFirstTime = @"isFirstTime";
 static NSString *const paramIsFirstLoadOk = @"isFirstLoadOK";
-static NSString *const keyBlockUpdate = @"REACTNATIVECN_PUSHY_BLOCKUPDATE";
 static NSString *const keyUuid = @"REACTNATIVECN_PUSHY_UUID";
 static NSString *const keyHashInfo = @"REACTNATIVECN_PUSHY_HASH_";
 static NSString *const keyFirstLoadMarked = @"REACTNATIVECN_PUSHY_FIRSTLOADMARKED_KEY";
@@ -76,7 +75,7 @@ RCT_EXPORT_MODULE(RCTPushy);
         if (needClearPushyInfo) {
             [defaults setObject:nil forKey:keyPushyInfo];
             [defaults setObject:@(YES) forKey:KeyPackageUpdatedMarked];
-            [defaults synchronize];
+            
             // ...need clear files later
         }
         else {
@@ -98,7 +97,7 @@ RCT_EXPORT_MODULE(RCTPushy);
                 newInfo[paramIsFirstTime] = @(NO);
                 [defaults setObject:newInfo forKey:keyPushyInfo];
                 [defaults setObject:@(YES) forKey:keyFirstLoadMarked];
-                [defaults synchronize];
+                
             }
             
             NSString *downloadDir = [RCTPushy downloadDir];
@@ -138,7 +137,7 @@ RCT_EXPORT_MODULE(RCTPushy);
         [defaults setObject:nil forKey:keyPushyInfo];
     }
     [defaults setObject:curVersion forKey:keyRolledBackMarked];
-    [defaults synchronize];
+    
     return lastVersion;
 }
 
@@ -157,7 +156,6 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"buildTime"] = [RCTPushy buildTime];
     ret[@"rolledBackVersion"] = [defaults objectForKey:keyRolledBackMarked];
     ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
-    ret[@"blockUpdate"] = [defaults objectForKey:keyBlockUpdate];
     ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];
@@ -178,7 +176,7 @@ RCT_EXPORT_MODULE(RCTPushy);
         [defaults setObject:nil forKey:KeyPackageUpdatedMarked];
         [self clearInvalidFiles];
     }
-    [defaults synchronize];
+    
 
     return ret;
 }
@@ -192,31 +190,13 @@ RCT_EXPORT_MODULE(RCTPushy);
     return self;
 }
 
-RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options
-                  resolver:(RCTPromiseResolveBlock)resolve
-                                    rejecter:(RCTPromiseRejectBlock)reject)
-{
-    // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new];
-    // blockUpdateInfo[@"reason"] = options[@"reason"];
-    // blockUpdateInfo[@"until"] = options[@"until"];
-    @try {
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        [defaults setObject:options forKey:keyBlockUpdate];
-        [defaults synchronize];
-        resolve(@true);
-    }
-    @catch (NSException *exception) {
-        reject(@"执行报错", nil, nil);
-    }
-}
-
 RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     @try {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         [defaults setObject:uuid forKey:keyUuid];
-        [defaults synchronize];
+        
         resolve(@true);
     }
     @catch (NSException *exception) {
@@ -234,7 +214,7 @@ RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
     if (object && [object isKindOfClass:[NSDictionary class]]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         [defaults setObject:value forKey:[keyHashInfo stringByAppendingString:hash]];
-        [defaults synchronize];
+        
         resolve(@true);
     } else {
         reject(@"json格式校验报错", nil, nil);
@@ -315,7 +295,7 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
         newInfo[paramPackageVersion] = [RCTPushy packageVersion];
         [defaults setObject:newInfo forKey:keyPushyInfo];
         
-        [defaults synchronize];
+        
         resolve(@true);
     }else{
         reject(@"执行报错", nil, nil);
@@ -349,8 +329,7 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
     }
 }
 
-RCT_EXPORT_METHOD(markSuccess:
-                  resolver:(RCTPromiseResolveBlock)resolve
+RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
                                     rejecter:(RCTPromiseRejectBlock)reject)
 {
     
@@ -367,7 +346,7 @@ RCT_EXPORT_METHOD(markSuccess:
             [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
         }
         [defaults setObject:pushyInfo forKey:keyPushyInfo];
-        [defaults synchronize];
+        
         
         // clear other package dir
         [self clearInvalidFiles];
@@ -630,7 +609,7 @@ RCT_EXPORT_METHOD(markSuccess:
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
-    return std::make_shared<facebook::react::NativeUpdateSpecJSI>(params);
+    return std::make_shared<facebook::react::NativePushySpecJSI>(params);
 }
 #endif
 

lib/NativeUpdate.js

@@ -1,51 +0,0 @@
-/**
- * @format
- * @flow strict-local
- */
-'use strict';
-
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { TurboModuleRegistry } from 'react-native';
-
-export interface Spec extends TurboModule {
-  getConstants: () => {
-    downloadRootDir: string,
-    packageVersion: string,
-    currentVersion: string,
-    isFirstTime: boolean,
-    rolledBackVersion: string,
-    buildTime: string,
-    blockUpdate: Object,
-    uuid: string,
-    isUsingBundleUrl: boolean,
-  };
-  setLocalHashInfo(hash: string, info: string): Promise<void>;
-  getLocalHashInfo(hash: string): Promise<string>;
-  setUuid(uuid: string): Promise<void>;
-  setBlockUpdate(options: { reason: string, until: number }): Promise<void>;
-  reloadUpdate(options: { hash: string }): Promise<void>;
-  setNeedUpdate(options: { hash: string }): Promise<void>;
-  markSuccess(): Promise<void>;
-  downloadPatchFromPpk(options: {
-    updateUrl: string,
-    hash: string,
-    originHash: string,
-  }): Promise<void>;
-  downloadPatchFromPackage(options: {
-    updateUrl: string,
-    hash: string,
-  }): Promise<void>;
-  downloadFullUpdate(options: {
-    updateUrl: string,
-    hash: string,
-  }): Promise<void>;
-  downloadAndInstallApk(options: {
-    url: string,
-    target: string,
-    hash: string,
-  }): Promise<void>;
-  addListener(eventName: string): void;
-  removeListeners(count: number): void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('Pushy'): ?Spec);

lib/endpoint.js

@@ -1,93 +0,0 @@
-let currentEndpoint = 'https://update.react-native.cn/api';
-
-function ping(url, rejectImmediate) {
-  return new Promise((resolve, reject) => {
-    const xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = (e) => {
-      if (xhr.readyState !== 4) {
-        return;
-      }
-      if (xhr.status === 200) {
-        resolve(url);
-      } else {
-        rejectImmediate ? reject() : setTimeout(reject, 5000);
-      }
-    };
-    xhr.open('HEAD', url);
-    xhr.send();
-    xhr.timeout = 5000;
-    xhr.ontimeout = reject;
-  });
-}
-
-function logger(...args) {
-  // console.warn('pushy', ...args);
-}
-
-let backupEndpoints = [];
-let backupEndpointsQueryUrl =
-  'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json';
-
-export async function tryBackupEndpoints() {
-  if (!backupEndpoints.length && !backupEndpointsQueryUrl) {
-    return;
-  }
-  try {
-    await ping(getStatusUrl(), true);
-    logger('current endpoint ok');
-    return;
-  } catch (e) {
-    logger('current endpoint failed');
-  }
-  if (!backupEndpoints.length && backupEndpointsQueryUrl) {
-    try {
-      const resp = await fetch(backupEndpointsQueryUrl);
-      backupEndpoints = await resp.json();
-      logger('get remote endpoints:', backupEndpoints);
-    } catch (e) {
-      logger('get remote endpoints failed');
-      return;
-    }
-  }
-  await pickFatestAvailableEndpoint();
-}
-
-async function pickFatestAvailableEndpoint(endpoints = backupEndpoints) {
-  const fastestEndpoint = await Promise.race(
-    endpoints.map(pingAndReturnEndpoint),
-  );
-  if (typeof fastestEndpoint === 'string') {
-    logger(`pick endpoint: ${fastestEndpoint}`);
-    currentEndpoint = fastestEndpoint;
-  } else {
-    logger('all remote endpoints failed');
-  }
-}
-
-async function pingAndReturnEndpoint(endpoint = currentEndpoint) {
-  return ping(getStatusUrl(endpoint)).then(() => endpoint);
-}
-
-function getStatusUrl(endpoint = currentEndpoint) {
-  return `${endpoint}/status`;
-}
-
-export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
-  return `${endpoint}/checkUpdate/${APPKEY}`;
-}
-
-export function getReportUrl(endpoint = currentEndpoint) {
-  return `${endpoint}/report`;
-}
-
-export function setCustomEndpoints({ main, backups, backupQueryUrl }) {
-  currentEndpoint = main;
-  backupEndpointsQueryUrl = null;
-  if (Array.isArray(backups) && backups.length > 0) {
-    backupEndpoints = backups;
-    pickFatestAvailableEndpoint();
-  }
-  if (typeof backupQueryUrl === 'string') {
-    backupEndpointsQueryUrl = backupQueryUrl;
-  }
-}

lib/index.d.ts

@@ -1,94 +0,0 @@
-export const downloadRootDir: string;
-export const packageVersion: string;
-export const currentVersion: string;
-export const isFirstTime: boolean;
-export const isRolledBack: boolean;
-
-export interface ExpiredResult {
-  upToDate?: false;
-  expired: true;
-  downloadUrl: string;
-}
-
-export interface UpTodateResult {
-  expired?: false;
-  upToDate: true;
-  paused?: 'app' | 'package';
-}
-
-export interface UpdateAvailableResult {
-  expired?: false;
-  upToDate?: false;
-  update: true;
-  name: string; // version name
-  hash: string;
-  description: string;
-  metaInfo: string;
-  pdiffUrl: string;
-  diffUrl?: string;
-}
-
-export type CheckResult =
-  | ExpiredResult
-  | UpTodateResult
-  | UpdateAvailableResult;
-
-export function checkUpdate(appkey: string): Promise<CheckResult>;
-
-export function downloadUpdate(
-  info: UpdateAvailableResult,
-  eventListeners?: {
-    onDownloadProgress?: (data: ProgressData) => void;
-  },
-): Promise<undefined | string>;
-
-export function switchVersion(hash: string): void;
-
-export function switchVersionLater(hash: string): void;
-
-export function markSuccess(): void;
-
-export function downloadAndInstallApk({
-  url,
-  onDownloadProgress,
-}: {
-  url: string;
-  onDownloadProgress?: (data: ProgressData) => void;
-}): Promise<void>;
-
-/**
- * @param {string} main - The main api endpoint
- * @param {string[]} [backups] - The back up endpoints.
- * @param {string} [backupQueryUrl] - An url that return a json file containing an array of endpoint.
- *                                    like: ["https://backup.api/1", "https://backup.api/2"]
- */
-export function setCustomEndpoints({
-  main,
-  backups,
-  backupQueryUrl,
-}: {
-  main: string;
-  backups?: string[];
-  backupQueryUrl?: string;
-}): void;
-
-export function getCurrentVersionInfo(): Promise<{
-  name?: string;
-  description?: string;
-  metaInfo?: string;
-}>;
-
-interface ProgressData {
-  hash: string;
-  received: number;
-  total: number;
-}
-
-interface SimpleUpdateOptions {
-  appKey: string;
-}
-
-export function simpleUpdate(
-  wrappedComponent: any,
-  options: SimpleUpdateOptions,
-): any;

lib/index.js

@@ -1,2 +0,0 @@
-export * from './main';
-export * from './simpleUpdate';

lib/index.web.js

@@ -1,17 +0,0 @@
-export const downloadRootDir = '';
-export const packageVersion = '';
-export const currentVersion = '';
-export const isFirstTime = false;
-export const isRolledBack = false;
-
-const noop = () => {};
-
-export const checkUpdate = noop;
-export const downloadUpdate = noop;
-export const switchVersion = noop;
-export const switchVersionLater = noop;
-export const markSuccess = noop;
-export const downloadAndInstallApk = noop;
-export const setCustomEndpoints = noop;
-export const getCurrentVersionInfo = noop;
-export const simpleUpdate = noop;

lib/main.js

@@ -1,338 +0,0 @@
-import {
-  tryBackupEndpoints,
-  getCheckUrl,
-  setCustomEndpoints,
-  getReportUrl,
-} from './endpoint';
-import {
-  NativeEventEmitter,
-  NativeModules,
-  Platform,
-  PermissionsAndroid,
-} from 'react-native';
-export { setCustomEndpoints };
-const {
-  version: v,
-} = require('react-native/Libraries/Core/ReactNativeVersion');
-const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
-const isTurboModuleEnabled = global.__turboModuleProxy != null;
-
-export const PushyModule = isTurboModuleEnabled
-  ? require('./NativeUpdate').default
-  : NativeModules.Pushy;
-
-if (!PushyModule) {
-  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
-}
-const PushyConstants = isTurboModuleEnabled
-  ? PushyModule.getConstants()
-  : PushyModule;
-
-export const downloadRootDir = PushyConstants.downloadRootDir;
-export const packageVersion = PushyConstants.packageVersion;
-export const currentVersion = PushyConstants.currentVersion;
-export const isFirstTime = PushyConstants.isFirstTime;
-const rolledBackVersion = PushyConstants.rolledBackVersion;
-export const isRolledBack = typeof rolledBackVersion === 'string';
-
-export const buildTime = PushyConstants.buildTime;
-let blockUpdate = PushyConstants.blockUpdate;
-let uuid = PushyConstants.uuid;
-
-if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
-  throw new Error(
-    'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
-  );
-}
-
-function setLocalHashInfo(hash, info) {
-  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
-}
-
-async function getLocalHashInfo(hash) {
-  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
-}
-
-export async function getCurrentVersionInfo() {
-  return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
-}
-
-const eventEmitter = new NativeEventEmitter(PushyModule);
-
-if (!uuid) {
-  uuid = require('nanoid/non-secure').nanoid();
-  PushyModule.setUuid(uuid);
-}
-
-function logger(text) {
-  console.log(`Pushy: ${text}`);
-}
-
-function report(hash, type) {
-  logger(type);
-  fetch(getReportUrl(), {
-    method: 'POST',
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      hash,
-      type,
-      cInfo,
-      packageVersion,
-      buildTime,
-    }),
-  }).catch((_e) => {});
-}
-
-logger('uuid: ' + uuid);
-
-if (isRolledBack) {
-  report(rolledBackVersion, 'rollback');
-}
-
-export const cInfo = {
-  pushy: require('../package.json').version,
-  rn: RNVersion,
-  os: Platform.OS + ' ' + Platform.Version,
-  uuid,
-};
-
-function assertRelease() {
-  if (__DEV__) {
-    throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
-  }
-}
-
-let checkingThrottling = false;
-export async function checkUpdate(APPKEY, isRetry) {
-  assertRelease();
-  if (checkingThrottling) {
-    logger('repeated checking, ignored');
-    return;
-  }
-  checkingThrottling = true;
-  setTimeout(() => {
-    checkingThrottling = false;
-  }, 3000);
-  if (blockUpdate && blockUpdate.until > Date.now() / 1000) {
-    throw new Error(
-      `热更新已暂停，原因：${blockUpdate.reason}。请在"${new Date(
-        blockUpdate.until * 1000,
-      ).toLocaleString()}"之后重试。`,
-    );
-  }
-  if (typeof APPKEY !== 'string') {
-    throw new Error('未检查到合法的APPKEY，请查看update.json文件是否正确生成');
-  }
-  logger('checking update');
-  let resp;
-  try {
-    resp = await fetch(getCheckUrl(APPKEY), {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        packageVersion,
-        hash: currentVersion,
-        buildTime,
-        cInfo,
-      }),
-    });
-  } catch (e) {
-    if (isRetry) {
-      throw new Error('无法连接更新服务器，请检查网络连接后重试');
-    }
-    await tryBackupEndpoints();
-    return checkUpdate(APPKEY, true);
-  }
-  const result = await resp.json();
-  checkOperation(result.op);
-
-  if (resp.status !== 200) {
-    throw new Error(result.message);
-  }
-
-  return result;
-}
-
-function checkOperation(op) {
-  if (!Array.isArray(op)) {
-    return;
-  }
-  op.forEach((action) => {
-    if (action.type === 'block') {
-      blockUpdate = {
-        reason: action.reason,
-        until: Math.round((Date.now() + action.duration) / 1000),
-      };
-      PushyModule.setBlockUpdate(blockUpdate);
-    }
-  });
-}
-
-let downloadingThrottling = false;
-let downloadedHash;
-export async function downloadUpdate(options, eventListeners) {
-  assertRelease();
-  if (!options.update) {
-    return;
-  }
-  if (rolledBackVersion === options.hash) {
-    logger(`rolledback hash ${rolledBackVersion}, ignored`);
-    return;
-  }
-  if (downloadedHash === options.hash) {
-    logger(`duplicated downloaded hash ${downloadedHash}, ignored`);
-    return downloadedHash;
-  }
-  if (downloadingThrottling) {
-    logger('repeated downloading, ignored');
-    return;
-  }
-  downloadingThrottling = true;
-  setTimeout(() => {
-    downloadingThrottling = false;
-  }, 3000);
-  let progressHandler;
-  if (eventListeners) {
-    if (eventListeners.onDownloadProgress) {
-      const downloadCallback = eventListeners.onDownloadProgress;
-      progressHandler = eventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        (progressData) => {
-          if (progressData.hash === options.hash) {
-            downloadCallback(progressData);
-          }
-        },
-      );
-    }
-  }
-  let succeeded = false;
-  if (options.diffUrl) {
-    logger('downloading diff');
-    try {
-      await PushyModule.downloadPatchFromPpk({
-        updateUrl: options.diffUrl,
-        hash: options.hash,
-        originHash: currentVersion,
-      });
-      succeeded = true;
-    } catch (e) {
-      logger(`diff error: ${e.message}, try pdiff`);
-    }
-  }
-  if (!succeeded && options.pdiffUrl) {
-    logger('downloading pdiff');
-    try {
-      await PushyModule.downloadPatchFromPackage({
-        updateUrl: options.pdiffUrl,
-        hash: options.hash,
-      });
-      succeeded = true;
-    } catch (e) {
-      logger(`pdiff error: ${e.message}, try full patch`);
-    }
-  }
-  if (!succeeded && options.updateUrl) {
-    logger('downloading full patch');
-    try {
-      await PushyModule.downloadFullUpdate({
-        updateUrl: options.updateUrl,
-        hash: options.hash,
-      });
-      succeeded = true;
-    } catch (e) {
-      logger(`full patch error: ${e.message}`);
-    }
-  }
-  progressHandler && progressHandler.remove();
-  if (!succeeded) {
-    report(options.hash, 'error');
-    throw new Error('all update attempts failed');
-  }
-  setLocalHashInfo(options.hash, {
-    name: options.name,
-    description: options.description,
-    metaInfo: options.metaInfo,
-  });
-  downloadedHash = options.hash;
-  return options.hash;
-}
-
-function assertHash(hash) {
-  if (!downloadedHash) {
-    logger(`no downloaded hash`);
-    return;
-  }
-  if (hash !== downloadedHash) {
-    logger(`use downloaded hash ${downloadedHash} first`);
-    return;
-  }
-  return true;
-}
-
-export function switchVersion(hash) {
-  assertRelease();
-  if (assertHash(hash)) {
-    logger('switchVersion: ' + hash);
-    PushyModule.reloadUpdate({ hash });
-  }
-}
-
-export function switchVersionLater(hash) {
-  assertRelease();
-  if (assertHash(hash)) {
-    logger('switchVersionLater: ' + hash);
-    PushyModule.setNeedUpdate({ hash });
-  }
-}
-
-let marked = false;
-export function markSuccess() {
-  assertRelease();
-  if (marked) {
-    logger('repeated markSuccess, ignored');
-    return;
-  }
-  marked = true;
-  PushyModule.markSuccess();
-  report(currentVersion, 'success');
-}
-
-export async function downloadAndInstallApk({ url, onDownloadProgress }) {
-  logger('downloadAndInstallApk');
-  if (Platform.OS === 'android' && Platform.Version <= 23) {
-    try {
-      const granted = await PermissionsAndroid.request(
-        PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
-      );
-      if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
-        return;
-      }
-    } catch (err) {
-      console.warn(err);
-    }
-  }
-  let hash = Date.now().toString();
-  let progressHandler;
-  if (onDownloadProgress) {
-    progressHandler = eventEmitter.addListener(
-      'RCTPushyDownloadProgress',
-      (progressData) => {
-        if (progressData.hash === hash) {
-          onDownloadProgress(progressData);
-        }
-      },
-    );
-  }
-  await PushyModule.downloadAndInstallApk({
-    url,
-    target: 'update.apk',
-    hash,
-  });
-  progressHandler && progressHandler.remove();
-}

lib/simpleUpdate.js

@@ -1,120 +0,0 @@
-import React, { Component } from 'react';
-import { Platform, Alert, Linking, AppState } from 'react-native';
-
-import {
-  isFirstTime,
-  isRolledBack,
-  checkUpdate,
-  downloadUpdate,
-  switchVersion,
-  switchVersionLater,
-  markSuccess,
-  downloadAndInstallApk,
-} from './main';
-
-export function simpleUpdate(WrappedComponent, options = {}) {
-  const { appKey } = options;
-  if (!appKey) {
-    throw new Error('appKey is required for simpleUpdate()');
-  }
-  return __DEV__
-    ? WrappedComponent
-    : class AppUpdate extends Component {
-        componentDidMount() {
-          if (isRolledBack) {
-            Alert.alert('抱歉', '刚刚更新遭遇错误，已为您恢复到更新前版本');
-          } else if (isFirstTime) {
-            markSuccess();
-          }
-          this.stateListener = AppState.addEventListener(
-            'change',
-            (nextAppState) => {
-              if (nextAppState === 'active') {
-                this.checkUpdate();
-              }
-            },
-          );
-          this.checkUpdate();
-        }
-        componentWillUnmount() {
-          this.stateListener && this.stateListener.remove();
-        }
-        doUpdate = async (info) => {
-          try {
-            const hash = await downloadUpdate(info);
-            if (!hash) {
-              return;
-            }
-            this.stateListener && this.stateListener.remove();
-            Alert.alert('提示', '下载完毕，是否立即更新?', [
-              {
-                text: '以后再说',
-                style: 'cancel',
-                onPress: () => {
-                  switchVersionLater(hash);
-                },
-              },
-              {
-                text: '立即更新',
-                style: 'default',
-                onPress: () => {
-                  switchVersion(hash);
-                },
-              },
-            ]);
-          } catch (err) {
-            Alert.alert('更新失败', err.message);
-          }
-        };
-
-        checkUpdate = async () => {
-          let info;
-          try {
-            info = await checkUpdate(appKey);
-          } catch (err) {
-            Alert.alert('更新检查失败', err.message);
-            return;
-          }
-          if (info.expired) {
-            Alert.alert('提示', '您的应用版本已更新，点击确定下载安装新版本', [
-              {
-                text: '确定',
-                onPress: () => {
-                  if (info.downloadUrl) {
-                    if (
-                      Platform.OS === 'android' &&
-                      info.downloadUrl.endsWith('.apk')
-                    ) {
-                      downloadAndInstallApk({
-                        url: info.downloadUrl,
-                      });
-                    } else {
-                      Linking.openURL(info.downloadUrl);
-                    }
-                  }
-                },
-              },
-            ]);
-          } else if (info.update) {
-            Alert.alert(
-              '提示',
-              '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
-              [
-                { text: '否', style: 'cancel' },
-                {
-                  text: '是',
-                  style: 'default',
-                  onPress: () => {
-                    this.doUpdate(info);
-                  },
-                },
-              ],
-            );
-          }
-        };
-
-        render() {
-          return <WrappedComponent {...this.props} />;
-        }
-      };
-}

package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-update",
-  "version": "9.0.0-beta.0",
+  "version": "10.13.2",
   "description": "react-native hot update",
-  "main": "lib/index.js",
+  "main": "src/index",
   "scripts": {
-    "prepublish": "yarn submodule",
+    "prepack": "yarn submodule && yarn lint",
+    "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
@@ -39,30 +40,39 @@
     "url": "https://github.com/reactnativecn/react-native-pushy/issues"
   },
   "peerDependencies": {
-    "react-native": ">=0.27.0"
+    "react": ">=16.8.0",
+    "react-native": ">=0.59.0"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
-    "nanoid": "^3.3.3"
+    "nanoid": "^3.3.3",
+    "react-native-url-polyfill": "^2.0.0"
   },
   "codegenConfig": {
-    "libraries": [
-      {
-        "name": "RCTPushySpec",
-        "type": "modules",
-        "jsSrcsDir": "lib"
-      }
-    ]
+    "name": "RCTPushySpec",
+    "type": "modules",
+    "jsSrcsDir": "src"
   },
   "devDependencies": {
+    "@babel/core": "^7.24.0",
+    "@react-native/babel-preset": "^0.73.21",
+    "@react-native/eslint-config": "^0.73.2",
+    "@react-native/typescript-config": "^0.74.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.1",
+    "@types/node": "^20.8.9",
+    "@types/react": "^18.2.46",
     "detox": "^20.5.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-ft-flow": "^3.0.7",
     "firebase-tools": "^11.24.1",
     "fs-extra": "^9.1.0",
-    "jest": "^29.2.1",
+    "jest": "^29.7.0",
     "pod-install": "^0.1.37",
+    "prettier": "^2",
+    "react": "18.2.0",
+    "react-native": "0.73",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.1.3"
+    "typescript": "^5.3.3"
   }
 }

react-native-update.podspec

@@ -1,8 +1,9 @@
 require 'json'
 
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-folly_version = '2021.06.28.00-v2'
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
 Pod::Spec.new do |s|
   s.name         = package['name']
   s.version      = package['version']
@@ -41,18 +42,25 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.private_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
-if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-  s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-  s.pod_target_xcconfig    = {
-      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-  }
+  
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s);
+  else
+    if new_arch_enabled
+      folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
-  s.dependency "React-Codegen"
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "RCTRequired"
-  s.dependency "RCTTypeSafety"
-  s.dependency "ReactCommon/turbomodule/core"
-end
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+
+      s.pod_target_xcconfig = {
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  end
 end

src/NativePushy.ts

@@ -0,0 +1,42 @@
+import { TurboModule, TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  getConstants: () => {
+    downloadRootDir: string;
+    packageVersion: string;
+    currentVersion: string;
+    isFirstTime: boolean;
+    rolledBackVersion: string;
+    buildTime: string;
+    uuid: string;
+    isUsingBundleUrl: boolean;
+  };
+  setLocalHashInfo(hash: string, info: string): Promise<void>;
+  getLocalHashInfo(hash: string): Promise<string>;
+  setUuid(uuid: string): Promise<void>;
+  reloadUpdate(options: { hash: string }): Promise<void>;
+  setNeedUpdate(options: { hash: string }): Promise<void>;
+  markSuccess(): Promise<void>;
+  downloadPatchFromPpk(options: {
+    updateUrl: string;
+    hash: string;
+    originHash: string;
+  }): Promise<void>;
+  downloadPatchFromPackage(options: {
+    updateUrl: string;
+    hash: string;
+  }): Promise<void>;
+  downloadFullUpdate(options: {
+    updateUrl: string;
+    hash: string;
+  }): Promise<void>;
+  downloadAndInstallApk(options: {
+    url: string;
+    target: string;
+    hash: string;
+  }): Promise<void>;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default TurboModuleRegistry.get<Spec>('Pushy') as Spec | null;

src/client.ts

@@ -0,0 +1,445 @@
+import { CheckResult, PushyOptions, ProgressData, EventType } from './type';
+import { joinUrls, log, testUrls } from './utils';
+import { EmitterSubscription, Platform } from 'react-native';
+import { PermissionsAndroid } from './permissions';
+import {
+  PushyModule,
+  buildTime,
+  cInfo,
+  pushyNativeEventEmitter,
+  currentVersion,
+  packageVersion,
+  rolledBackVersion,
+  setLocalHashInfo,
+  isRolledBack,
+} from './core';
+
+const defaultServer = {
+  main: 'https://update.react-native.cn/api',
+  backups: ['https://update.reactnative.cn/api'],
+  queryUrls: [
+    'https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json',
+    'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json',
+  ],
+};
+
+const empty = {};
+const noop = () => {};
+
+if (Platform.OS === 'web') {
+  console.warn('react-native-update 不支持 web 端热更，不会执行操作');
+}
+
+export class Pushy {
+  options: PushyOptions = {
+    appKey: '',
+    server: defaultServer,
+    autoMarkSuccess: true,
+    updateStrategy: __DEV__ ? 'alwaysAlert' : 'alertUpdateAndIgnoreError',
+    checkStrategy: 'both',
+    logger: noop,
+    debug: false,
+    throwError: false,
+  };
+
+  lastChecking?: number;
+  lastRespJson?: Promise<any>;
+
+  progressHandlers: Record<string, EmitterSubscription> = {};
+  downloadedHash?: string;
+
+  marked = false;
+  applyingUpdate = false;
+  version = cInfo.pushy;
+
+  constructor(options: PushyOptions) {
+    if (Platform.OS === 'ios' || Platform.OS === 'android') {
+      if (!options.appKey) {
+        throw new Error('appKey is required');
+      }
+    }
+    this.setOptions(options);
+  }
+
+  setOptions = (options: Partial<PushyOptions>) => {
+    for (const [key, value] of Object.entries(options)) {
+      if (value !== undefined) {
+        (this.options as any)[key] = value;
+        if (key === 'logger') {
+          if (isRolledBack) {
+            this.report({
+              type: 'rollback',
+              data: {
+                rolledBackVersion,
+              },
+            });
+          }
+        }
+      }
+    }
+  };
+
+  report = ({
+    type,
+    message = '',
+    data = {},
+  }: {
+    type: EventType;
+    message?: string;
+    data?: Record<string, string | number>;
+  }) => {
+    log(type + ' ' + message);
+    const { logger = noop, appKey } = this.options;
+    logger({
+      type,
+      data: {
+        appKey,
+        currentVersion,
+        cInfo,
+        packageVersion,
+        buildTime,
+        message,
+        ...data,
+      },
+    });
+  };
+
+  getCheckUrl = (endpoint: string = this.options.server!.main) => {
+    return `${endpoint}/checkUpdate/${this.options.appKey}`;
+  };
+  assertHash = (hash: string) => {
+    if (!this.downloadedHash) {
+      return;
+    }
+    if (hash !== this.downloadedHash) {
+      log(`use downloaded hash ${this.downloadedHash} first`);
+      return;
+    }
+    return true;
+  };
+  markSuccess = () => {
+    if (this.marked || __DEV__) {
+      return;
+    }
+    this.marked = true;
+    PushyModule.markSuccess();
+    this.report({ type: 'markSuccess' });
+  };
+  switchVersion = async (hash: string) => {
+    if (__DEV__) {
+      console.warn(
+        '您调用了switchVersion方法，但是当前是开发环境，不会进行任何操作。',
+      );
+      return;
+    }
+    if (this.assertHash(hash) && !this.applyingUpdate) {
+      log('switchVersion: ' + hash);
+      this.applyingUpdate = true;
+      return PushyModule.reloadUpdate({ hash });
+    }
+  };
+
+  switchVersionLater = async (hash: string) => {
+    if (__DEV__) {
+      console.warn(
+        '您调用了switchVersionLater方法，但是当前是开发环境，不会进行任何操作。',
+      );
+      return;
+    }
+    if (this.assertHash(hash)) {
+      log('switchVersionLater: ' + hash);
+      return PushyModule.setNeedUpdate({ hash });
+    }
+  };
+  checkUpdate = async (extra?: Record<string, any>) => {
+    if (__DEV__ && !this.options.debug) {
+      console.info(
+        '您当前处于开发环境且未启用 debug，不会进行热更检查。如需在开发环境中调试热更，请在 client 中设置 debug 为 true',
+      );
+      return;
+    }
+    if (Platform.OS === 'web') {
+      console.warn('web 端不支持热更新检查');
+      return;
+    }
+    if (
+      this.options.beforeCheckUpdate &&
+      (await this.options.beforeCheckUpdate()) === false
+    ) {
+      log('beforeCheckUpdate 返回 false, 忽略检查');
+      return;
+    }
+    const now = Date.now();
+    if (
+      this.lastRespJson &&
+      this.lastChecking &&
+      now - this.lastChecking < 1000 * 5
+    ) {
+      return await this.lastRespJson;
+    }
+    this.lastChecking = now;
+    const fetchBody = {
+      packageVersion,
+      hash: currentVersion,
+      buildTime,
+      cInfo,
+      ...extra,
+    };
+    if (__DEV__) {
+      delete fetchBody.buildTime;
+    }
+    const body = JSON.stringify(fetchBody);
+    const fetchPayload = {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body,
+    };
+    let resp;
+    try {
+      this.report({
+        type: 'checking',
+        message: this.options.appKey + ': ' + body,
+      });
+      resp = await fetch(this.getCheckUrl(), fetchPayload);
+    } catch (e: any) {
+      this.report({
+        type: 'errorChecking',
+        message: 'Can not connect to update server. Trying backup endpoints.',
+      });
+      const backupEndpoints = await this.getBackupEndpoints();
+      if (backupEndpoints) {
+        try {
+          resp = await Promise.race(
+            backupEndpoints.map(endpoint =>
+              fetch(this.getCheckUrl(endpoint), fetchPayload),
+            ),
+          );
+        } catch {}
+      }
+    }
+    if (!resp) {
+      this.report({
+        type: 'errorChecking',
+        message: 'Can not connect to update server. Please check your network.',
+      });
+      return this.lastRespJson ? await this.lastRespJson : empty;
+    }
+    this.lastRespJson = resp.json();
+
+    const result: CheckResult = await this.lastRespJson;
+
+    log('checking result:', result);
+
+    if (resp.status !== 200) {
+      this.report({
+        type: 'errorChecking',
+        message: result.message,
+      });
+    }
+
+    return result;
+  };
+  getBackupEndpoints = async () => {
+    const { server } = this.options;
+    if (!server) {
+      return [];
+    }
+    if (server.queryUrls) {
+      try {
+        const resp = await Promise.race(
+          server.queryUrls.map(queryUrl => fetch(queryUrl)),
+        );
+        const remoteEndpoints = await resp.json();
+        log('fetch endpoints:', remoteEndpoints);
+        if (Array.isArray(remoteEndpoints)) {
+          server.backups = Array.from(
+            new Set([...(server.backups || []), ...remoteEndpoints]),
+          );
+        }
+      } catch (e: any) {
+        log('failed to fetch endpoints from: ', server.queryUrls);
+      }
+    }
+    return server.backups;
+  };
+  downloadUpdate = async (
+    info: CheckResult,
+    onDownloadProgress?: (data: ProgressData) => void,
+  ) => {
+    const {
+      hash,
+      diff,
+      pdiff,
+      full,
+      paths = [],
+      name,
+      description = '',
+      metaInfo = '',
+    } = info;
+    if (
+      this.options.beforeDownloadUpdate &&
+      (await this.options.beforeDownloadUpdate(info)) === false
+    ) {
+      log('beforeDownloadUpdate 返回 false, 忽略下载');
+      return;
+    }
+    if (!info.update || !hash) {
+      return;
+    }
+    if (rolledBackVersion === hash) {
+      log(`rolledback hash ${rolledBackVersion}, ignored`);
+      return;
+    }
+    if (this.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${this.downloadedHash}, ignored`);
+      return this.downloadedHash;
+    }
+    if (this.progressHandlers[hash]) {
+      return;
+    }
+    if (onDownloadProgress) {
+      this.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        progressData => {
+          if (progressData.hash === hash) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
+    }
+    let succeeded = '';
+    this.report({ type: 'downloading' });
+    let lastError: any;
+    const diffUrl = await testUrls(joinUrls(paths, diff));
+    if (diffUrl) {
+      log('downloading diff');
+      try {
+        await PushyModule.downloadPatchFromPpk({
+          updateUrl: diffUrl,
+          hash,
+          originHash: currentVersion,
+        });
+        succeeded = 'diff';
+      } catch (e: any) {
+        lastError = e;
+        if (__DEV__) {
+          succeeded = 'diff';
+        } else {
+          log(`diff error: ${e.message}, try pdiff`);
+        }
+      }
+    }
+    const pdiffUrl = await testUrls(joinUrls(paths, pdiff));
+    if (!succeeded && pdiffUrl) {
+      log('downloading pdiff');
+      try {
+        await PushyModule.downloadPatchFromPackage({
+          updateUrl: pdiffUrl,
+          hash,
+        });
+        succeeded = 'pdiff';
+      } catch (e: any) {
+        lastError = e;
+        if (__DEV__) {
+          succeeded = 'pdiff';
+        } else {
+          log(`pdiff error: ${e.message}, try full patch`);
+        }
+      }
+    }
+    const fullUrl = await testUrls(joinUrls(paths, full));
+    if (!succeeded && fullUrl) {
+      log('downloading full patch');
+      try {
+        await PushyModule.downloadFullUpdate({
+          updateUrl: fullUrl,
+          hash,
+        });
+        succeeded = 'full';
+      } catch (e: any) {
+        lastError = e;
+        if (__DEV__) {
+          succeeded = 'full';
+        } else {
+          log(`full patch error: ${e.message}`);
+        }
+      }
+    }
+    if (this.progressHandlers[hash]) {
+      this.progressHandlers[hash].remove();
+      delete this.progressHandlers[hash];
+    }
+    if (__DEV__) {
+      return hash;
+    }
+    if (!succeeded) {
+      this.report({
+        type: 'errorUpdate',
+        data: { newVersion: hash },
+      });
+      if (lastError) {
+        throw lastError;
+      }
+      return;
+    } else {
+      this.report({
+        type: 'downloadSuccess',
+        data: { newVersion: hash, diff: succeeded },
+      });
+    }
+    log(`downloaded ${succeeded} hash:`, hash);
+    setLocalHashInfo(hash, {
+      name,
+      description,
+      metaInfo,
+    });
+    this.downloadedHash = hash;
+    return hash;
+  };
+  downloadAndInstallApk = async (
+    url: string,
+    onDownloadProgress?: (data: ProgressData) => void,
+  ) => {
+    if (Platform.OS !== 'android') {
+      return;
+    }
+    this.report({ type: 'downloadingApk' });
+    if (Platform.Version <= 23) {
+      try {
+        const granted = await PermissionsAndroid.request(
+          PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+        );
+        if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
+          return this.report({ type: 'rejectStoragePermission' });
+        }
+      } catch (e: any) {
+        return this.report({ type: 'errorStoragePermission' });
+      }
+    }
+    const progressKey = 'downloadingApk';
+    if (onDownloadProgress) {
+      this.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
+        'RCTPushyDownloadProgress',
+        (progressData: ProgressData) => {
+          if (progressData.hash === progressKey) {
+            onDownloadProgress(progressData);
+          }
+        },
+      );
+    }
+    await PushyModule.downloadAndInstallApk({
+      url,
+      target: 'update.apk',
+      hash: progressKey,
+    }).catch(() => {
+      this.report({ type: 'errorDownloadAndInstallApk' });
+    });
+    if (this.progressHandlers[progressKey]) {
+      this.progressHandlers[progressKey].remove();
+      delete this.progressHandlers[progressKey];
+    }
+  };
+}

src/context.ts

@@ -0,0 +1,44 @@
+import { createContext, useContext } from 'react';
+import { CheckResult, ProgressData } from './type';
+import { Pushy } from './client';
+
+const noop = () => {};
+const asyncNoop = () => Promise.resolve();
+
+export const defaultContext = {
+  checkUpdate: asyncNoop,
+  switchVersion: asyncNoop,
+  switchVersionLater: asyncNoop,
+  markSuccess: noop,
+  dismissError: noop,
+  downloadUpdate: asyncNoop,
+  downloadAndInstallApk: asyncNoop,
+  getCurrentVersionInfo: () => Promise.resolve({}),
+  parseTestQrCode: () => false,
+  currentHash: '',
+  packageVersion: '',
+};
+
+export const PushyContext = createContext<{
+  checkUpdate: () => Promise<void>;
+  switchVersion: () => Promise<void>;
+  switchVersionLater: () => Promise<void>;
+  markSuccess: () => void;
+  dismissError: () => void;
+  downloadUpdate: () => Promise<void>;
+  downloadAndInstallApk: (url: string) => Promise<void>;
+  getCurrentVersionInfo: () => Promise<{
+    name?: string;
+    description?: string;
+    metaInfo?: string;
+  }>;
+  parseTestQrCode: (code: string) => boolean;
+  currentHash: string;
+  packageVersion: string;
+  client?: Pushy;
+  progress?: ProgressData;
+  updateInfo?: CheckResult;
+  lastError?: Error;
+}>(defaultContext);
+
+export const usePushy = () => useContext(PushyContext);

src/core.ts

@@ -0,0 +1,70 @@
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+import { emptyModule, log } from './utils';
+const {
+  version: v,
+} = require('react-native/Libraries/Core/ReactNativeVersion');
+const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
+const isTurboModuleEnabled = (global as any).__turboModuleProxy != null;
+
+export const PushyModule =
+  Platform.OS === 'web'
+    ? emptyModule
+    : isTurboModuleEnabled
+    ? require('./NativePushy').default
+    : NativeModules.Pushy;
+
+if (!PushyModule) {
+  throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
+}
+
+const PushyConstants = isTurboModuleEnabled
+  ? PushyModule.getConstants()
+  : PushyModule;
+
+export const downloadRootDir = PushyConstants.downloadRootDir;
+export const packageVersion = PushyConstants.packageVersion;
+export const currentVersion = PushyConstants.currentVersion;
+export const isFirstTime = PushyConstants.isFirstTime;
+export const rolledBackVersion = PushyConstants.rolledBackVersion;
+export const isRolledBack = typeof rolledBackVersion === 'string';
+
+export const buildTime = PushyConstants.buildTime;
+let uuid = PushyConstants.uuid;
+
+if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
+  throw new Error(
+    'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
+  );
+}
+
+export function setLocalHashInfo(hash: string, info: Record<string, any>) {
+  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
+}
+
+async function getLocalHashInfo(hash: string) {
+  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
+}
+
+export async function getCurrentVersionInfo(): Promise<{
+  name?: string;
+  description?: string;
+  metaInfo?: string;
+}> {
+  return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
+}
+
+export const pushyNativeEventEmitter = new NativeEventEmitter(PushyModule);
+
+if (!uuid) {
+  uuid = require('nanoid/non-secure').nanoid();
+  PushyModule.setUuid(uuid);
+}
+
+log('uuid: ' + uuid);
+
+export const cInfo = {
+  pushy: require('../package.json').version,
+  rn: RNVersion,
+  os: Platform.OS + ' ' + Platform.Version,
+  uuid,
+};

src/index.ts

@@ -0,0 +1,3 @@
+export { Pushy } from './client';
+export { PushyContext, usePushy } from './context';
+export { PushyProvider } from './provider';

src/permissions.native.ts

@@ -0,0 +1 @@
+export { PermissionsAndroid } from 'react-native';

src/permissions.ts

@@ -0,0 +1,4 @@
+import type { PermissionsAndroidStatic } from 'react-native';
+import { emptyModule } from './utils';
+
+export const PermissionsAndroid = emptyModule as PermissionsAndroidStatic;

src/provider.tsx

@@ -0,0 +1,348 @@
+import React, {
+  ReactNode,
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
+import {
+  Alert,
+  NativeEventSubscription,
+  AppState,
+  Platform,
+  Linking,
+} from 'react-native';
+import { Pushy } from './client';
+import {
+  currentVersion,
+  isFirstTime,
+  packageVersion,
+  getCurrentVersionInfo,
+} from './core';
+import { CheckResult, ProgressData, PushyTestPayload } from './type';
+import { PushyContext } from './context';
+import { URL } from 'react-native-url-polyfill';
+
+export const PushyProvider = ({
+  client,
+  children,
+}: {
+  client: Pushy;
+  children: ReactNode;
+}) => {
+  const { options } = client;
+  const stateListener = useRef<NativeEventSubscription>();
+  const [updateInfo, setUpdateInfo] = useState<CheckResult>();
+  const updateInfoRef = useRef(updateInfo);
+  const [progress, setProgress] = useState<ProgressData>();
+  const [lastError, setLastError] = useState<Error>();
+  const lastChecking = useRef(0);
+
+  const throwErrorIfEnabled = useCallback(
+    (e: Error) => {
+      if (options.throwError) {
+        throw e;
+      }
+    },
+    [options.throwError],
+  );
+
+  const dismissError = useCallback(() => {
+    setLastError(undefined);
+  }, []);
+
+  const alertUpdate = useCallback(
+    (...args: Parameters<typeof Alert.alert>) => {
+      if (
+        options.updateStrategy === 'alwaysAlert' ||
+        options.updateStrategy === 'alertUpdateAndIgnoreError'
+      ) {
+        Alert.alert(...args);
+      }
+    },
+    [options.updateStrategy],
+  );
+
+  const alertError = useCallback(
+    (...args: Parameters<typeof Alert.alert>) => {
+      if (options.updateStrategy === 'alwaysAlert') {
+        Alert.alert(...args);
+      }
+    },
+    [options.updateStrategy],
+  );
+
+  const switchVersion = useCallback(
+    async (info: CheckResult | undefined = updateInfoRef.current) => {
+      if (info && info.hash) {
+        return client.switchVersion(info.hash);
+      }
+    },
+    [client],
+  );
+
+  const switchVersionLater = useCallback(
+    async (info: CheckResult | undefined = updateInfoRef.current) => {
+      if (info && info.hash) {
+        return client.switchVersionLater(info.hash);
+      }
+    },
+    [client],
+  );
+
+  const downloadUpdate = useCallback(
+    async (info: CheckResult | undefined = updateInfoRef.current) => {
+      if (!info || !info.update) {
+        return;
+      }
+      try {
+        const hash = await client.downloadUpdate(info, setProgress);
+        if (!hash) {
+          return;
+        }
+        stateListener.current && stateListener.current.remove();
+        if (options.updateStrategy === 'silentAndNow') {
+          return client.switchVersion(hash);
+        } else if (options.updateStrategy === 'silentAndLater') {
+          return client.switchVersionLater(hash);
+        }
+        alertUpdate('提示', '下载完毕，是否立即更新?', [
+          {
+            text: '下次再说',
+            style: 'cancel',
+            onPress: () => {
+              client.switchVersionLater(hash);
+            },
+          },
+          {
+            text: '立即更新',
+            style: 'default',
+            onPress: () => {
+              client.switchVersion(hash);
+            },
+          },
+        ]);
+      } catch (e: any) {
+        setLastError(e);
+        alertError('更新失败', e.message);
+        throwErrorIfEnabled(e);
+      }
+    },
+    [
+      client,
+      options.updateStrategy,
+      alertUpdate,
+      alertError,
+      throwErrorIfEnabled,
+    ],
+  );
+
+  const downloadAndInstallApk = useCallback(
+    async (downloadUrl: string) => {
+      if (Platform.OS === 'android' && downloadUrl) {
+        await client.downloadAndInstallApk(downloadUrl, setProgress);
+      }
+    },
+    [client],
+  );
+
+  const checkUpdate = useCallback(
+    async ({ extra }: { extra?: Record<string, any> } | undefined = {}) => {
+      const now = Date.now();
+      if (lastChecking.current && now - lastChecking.current < 1000) {
+        return;
+      }
+      lastChecking.current = now;
+      let info: CheckResult;
+      try {
+        info = await client.checkUpdate(extra);
+      } catch (e: any) {
+        setLastError(e);
+        alertError('更新检查失败', e.message);
+        throwErrorIfEnabled(e);
+        return;
+      }
+      if (!info) {
+        return;
+      }
+      updateInfoRef.current = info;
+      setUpdateInfo(info);
+      if (info.expired) {
+        const { downloadUrl } = info;
+        if (downloadUrl) {
+          if (options.updateStrategy === 'silentAndNow') {
+            if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+              downloadAndInstallApk(downloadUrl);
+            } else {
+              Linking.openURL(downloadUrl);
+            }
+            return;
+          }
+          alertUpdate('提示', '您的应用版本已更新，点击更新下载安装新版本', [
+            {
+              text: '更新',
+              onPress: () => {
+                if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
+                  downloadAndInstallApk(downloadUrl);
+                } else {
+                  Linking.openURL(downloadUrl);
+                }
+              },
+            },
+          ]);
+        }
+      } else if (info.update) {
+        if (
+          options.updateStrategy === 'silentAndNow' ||
+          options.updateStrategy === 'silentAndLater'
+        ) {
+          return downloadUpdate(info);
+        }
+        alertUpdate(
+          '提示',
+          '检查到新的版本' + info.name + ',是否下载?\n' + info.description,
+          [
+            { text: '取消', style: 'cancel' },
+            {
+              text: '确定',
+              style: 'default',
+              onPress: () => {
+                downloadUpdate();
+              },
+            },
+          ],
+        );
+      }
+    },
+    [
+      client,
+      alertError,
+      throwErrorIfEnabled,
+      options.updateStrategy,
+      alertUpdate,
+      downloadAndInstallApk,
+      downloadUpdate,
+    ],
+  );
+
+  const markSuccess = client.markSuccess;
+
+  useEffect(() => {
+    if (__DEV__ && !options.debug) {
+      console.info(
+        '您当前处于开发环境且未启用debug，不会进行热更检查。如需在开发环境中调试热更，请在client中设置debug为true',
+      );
+      return;
+    }
+    const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
+    if (isFirstTime && autoMarkSuccess) {
+      markSuccess();
+    }
+    if (checkStrategy === 'both' || checkStrategy === 'onAppResume') {
+      stateListener.current = AppState.addEventListener(
+        'change',
+        nextAppState => {
+          if (nextAppState === 'active') {
+            checkUpdate();
+          }
+        },
+      );
+    }
+    if (checkStrategy === 'both' || checkStrategy === 'onAppStart') {
+      checkUpdate();
+    }
+    let dismissErrorTimer: ReturnType<typeof setTimeout>;
+    if (typeof dismissErrorAfter === 'number' && dismissErrorAfter > 0) {
+      dismissErrorTimer = setTimeout(() => {
+        dismissError();
+      }, dismissErrorAfter);
+    }
+    return () => {
+      stateListener.current && stateListener.current.remove();
+      clearTimeout(dismissErrorTimer);
+    };
+  }, [checkUpdate, options, dismissError, markSuccess]);
+
+  const parseTestPayload = useCallback(
+    (payload: PushyTestPayload) => {
+      if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
+        const logger = options.logger || (() => {});
+        options.logger = ({ type, data }) => {
+          logger({ type, data });
+          Alert.alert(type, JSON.stringify(data));
+        };
+        if (payload.type === '__rnPushyVersionHash') {
+          checkUpdate({ extra: { toHash: payload.data } }).then(() => {
+            if (updateInfoRef.current && updateInfoRef.current.upToDate) {
+              Alert.alert(
+                '提示',
+                '当前尚未检测到更新版本，如果是首次扫码，请等待服务器端生成补丁包后再试（约10秒）',
+              );
+            }
+            options.logger = logger;
+          });
+        }
+        return true;
+      }
+      return false;
+    },
+    [checkUpdate, options],
+  );
+
+  const parseTestQrCode = useCallback(
+    (code: string | PushyTestPayload) => {
+      try {
+        const payload = typeof code === 'string' ? JSON.parse(code) : code;
+        return parseTestPayload(payload);
+      } catch {
+        return false;
+      }
+    },
+    [parseTestPayload],
+  );
+
+  useEffect(() => {
+    const parseLinking = (url: string | null) => {
+      if (!url) {
+        return;
+      }
+      const params = new URL(url).searchParams;
+      const payload = {
+        type: params.get('type'),
+        data: params.get('data'),
+      };
+      parseTestPayload(payload);
+    };
+
+    Linking.getInitialURL().then(parseLinking);
+    const linkingListener = Linking.addEventListener('url', ({ url }) =>
+      parseLinking(url),
+    );
+    return () => {
+      linkingListener.remove();
+    };
+  }, [parseTestPayload]);
+
+  return (
+    <PushyContext.Provider
+      value={{
+        checkUpdate,
+        switchVersion,
+        switchVersionLater,
+        dismissError,
+        updateInfo,
+        lastError,
+        markSuccess,
+        client,
+        downloadUpdate,
+        packageVersion,
+        currentHash: currentVersion,
+        progress,
+        downloadAndInstallApk,
+        getCurrentVersionInfo,
+        parseTestQrCode,
+      }}>
+      {children}
+    </PushyContext.Provider>
+  );
+};

src/type.ts

@@ -0,0 +1,89 @@
+export interface CheckResult {
+  upToDate?: true;
+  expired?: true;
+  downloadUrl?: string;
+  update?: true;
+  name?: string; // version name
+  hash?: string;
+  description?: string;
+  metaInfo?: string;
+  pdiff?: string;
+  diff?: string;
+  full?: string;
+  paths?: string[];
+  paused?: 'app' | 'package';
+  message?: string;
+}
+
+export interface ProgressData {
+  hash: string;
+  received: number;
+  total: number;
+}
+
+export type EventType =
+  | 'rollback'
+  | 'errorChecking'
+  | 'checking'
+  | 'downloading'
+  | 'downloadSuccess'
+  | 'errorUpdate'
+  | 'markSuccess'
+  | 'downloadingApk'
+  | 'rejectStoragePermission'
+  | 'errorStoragePermission'
+  | 'errorDownloadAndInstallApk';
+
+export interface EventData {
+  currentVersion: string;
+  cInfo: {
+    pushy: string;
+    rn: string;
+    os: string;
+    uuid: string;
+  };
+  packageVersion: string;
+  buildTime: number;
+  message?: string;
+  rolledBackVersion?: string;
+  newVersion?: string;
+  [key: string]: any;
+}
+
+export type UpdateEventsLogger = ({
+  type,
+  data,
+}: {
+  type: EventType;
+  data: EventData;
+}) => void;
+
+export interface PushyServerConfig {
+  main: string;
+  backups?: string[];
+  queryUrls?: string[];
+}
+
+export interface PushyOptions {
+  appKey: string;
+  server?: PushyServerConfig;
+  logger?: UpdateEventsLogger;
+  updateStrategy?:
+    | 'alwaysAlert'
+    | 'alertUpdateAndIgnoreError'
+    | 'silentAndNow'
+    | 'silentAndLater'
+    | null;
+  checkStrategy?: 'onAppStart' | 'onAppResume' | 'both' | null;
+  autoMarkSuccess?: boolean;
+  dismissErrorAfter?: number;
+  debug?: boolean;
+  throwError?: boolean;
+  beforeCheckUpdate?: () => Promise<boolean>;
+  beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+}
+
+export interface PushyTestPayload {
+  type: '__rnPushyVersionHash' | string | null;
+  data: any;
+}

src/utils.ts

@@ -0,0 +1,48 @@
+import { Platform } from 'react-native';
+
+export function log(...args: any[]) {
+  console.log('pushy: ', ...args);
+}
+
+const noop = () => {};
+class EmptyModule {
+  constructor() {
+    return new Proxy(this, {
+      get() {
+        return noop;
+      },
+    });
+  }
+}
+export const emptyModule = new EmptyModule();
+
+const ping =
+  Platform.OS === 'web'
+    ? Promise.resolve
+    : async (url: string) =>
+        Promise.race([
+          fetch(url, {
+            method: 'HEAD',
+          })
+            .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);
+  }
+}
+
+export const testUrls = async (urls?: string[]) => {
+  if (!urls?.length) {
+    return null;
+  }
+  if (await canUseGoogle) {
+    return urls[0];
+  }
+  return Promise.race(urls.map(ping)).catch(() => null);
+};

tea.yaml

@@ -0,0 +1,6 @@
+# https://tea.xyz/what-is-this-file
+---
+version: 1.0.0
+codeOwners:
+  - '0x10D90dC0034E2e82F0AC55954B3ed4EC0550ECe7'
+quorum: 1

tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "@react-native/typescript-config/tsconfig.json",
+  "include": ["src/**/*"]
+}