react-native-update 10.7.3 → 10.8.0

package/.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

package/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();

package/package.json

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

package/src/client.ts

@@ -37,6 +37,7 @@ export class Pushy {
     checkStrategy: 'both',
     logger: noop,
     debug: false,
+    throwError: false,
   };
 
   lastChecking?: number;
@@ -289,6 +290,7 @@ export class Pushy {
     }
     let succeeded = false;
     this.report({ type: 'downloading' });
+    let lastError: any;
     const diffUrl = (await testUrls(diffUrls)) || _diffUrl;
     if (diffUrl) {
       log('downloading diff');
@@ -300,6 +302,7 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
+        lastError = e;
         if (__DEV__) {
           succeeded = true;
         } else {
@@ -317,6 +320,7 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
+        lastError = e;
         if (__DEV__) {
           succeeded = true;
         } else {
@@ -334,6 +338,7 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
+        lastError = e;
         if (__DEV__) {
           succeeded = true;
         } else {
@@ -349,10 +354,14 @@ export class Pushy {
       return hash;
     }
     if (!succeeded) {
-      return this.report({
+      this.report({
         type: 'errorUpdate',
         data: { newVersion: hash },
       });
+      if (lastError) {
+        throw lastError;
+      }
+      return;
     }
     log('downloaded hash:', hash);
     setLocalHashInfo(hash, {

package/src/provider.tsx

@@ -37,6 +37,15 @@ export const PushyProvider = ({
   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);
   }, []);
@@ -115,9 +124,16 @@ export const PushyProvider = ({
       } catch (e: any) {
         setLastError(e);
         alertError('更新失败', e.message);
+        throwErrorIfEnabled(e);
       }
     },
-    [alertError, client, options.updateStrategy, alertUpdate],
+    [
+      client,
+      options.updateStrategy,
+      alertUpdate,
+      alertError,
+      throwErrorIfEnabled,
+    ],
   );
 
   const downloadAndInstallApk = useCallback(
@@ -141,6 +157,7 @@ export const PushyProvider = ({
     } catch (e: any) {
       setLastError(e);
       alertError('更新检查失败', e.message);
+      throwErrorIfEnabled(e);
       return;
     }
     if (!info) {
@@ -195,12 +212,13 @@ export const PushyProvider = ({
       );
     }
   }, [
-    alertError,
     client,
-    downloadAndInstallApk,
-    downloadUpdate,
+    alertError,
+    throwErrorIfEnabled,
     options.updateStrategy,
     alertUpdate,
+    downloadAndInstallApk,
+    downloadUpdate,
   ]);
 
   const markSuccess = client.markSuccess;

package/src/type.ts

@@ -79,4 +79,5 @@ export interface PushyOptions {
   autoMarkSuccess?: boolean;
   dismissErrorAfter?: number;
   debug?: boolean;
+  throwError?: boolean;
 }