react-native-update 10.19.0 → 10.19.2

package/.github/workflows/publish.yml

@@ -0,0 +1,21 @@
+name: Publish Package to npmjs
+on:
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm ci
+      - run: npm publish --provenance --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

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

@@ -1,7 +1,7 @@
 package cn.reactnative.modules.update;
 
 import android.app.Activity;
-import android.app.Application;
+import android.content.Context;
 import android.util.Log;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
@@ -117,7 +117,7 @@ public class UpdateModuleImpl {
             public void run() {
                 try {
                     updateContext.switchVersion(hash);
-                    final Application application = (Application) getReactApplicationContext().getApplicationContext();
+                    final Context application = mContext.getApplicationContext();
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -141,6 +141,7 @@ public class UpdateModuleImpl {
                         promise.resolve(true);
                     } catch (Throwable err) {
                         promise.reject("pushy:"+err.getMessage());
+                        final Activity activity = mContext.getCurrentActivity();
                         if (activity != null) {
                             activity.recreate();
                         }

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

@@ -1,7 +1,7 @@
 package cn.reactnative.modules.update;
 
 import android.app.Activity;
-import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -176,7 +176,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
             public void run() {
                 try {
                     updateContext.switchVersion(hash);
-                    final Application application = (Application) getReactApplicationContext().getApplicationContext();
+                    final Context application = getReactApplicationContext().getApplicationContext();
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -199,6 +199,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
                         instanceManager.recreateReactContextInBackground();
                         promise.resolve(null);
                     } catch (Throwable err) {
+                        final Activity activity = getCurrentActivity();
                         if (activity != null) {
                             activity.recreate();
                         }

package/ios/RCTPushy/RCTPushy.mm

@@ -315,17 +315,18 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
         if (hash.length) {
             [self setNeedUpdate:options resolver:resolve rejecter:reject];
             
+            // reload in earlier version
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+                [self.bridge reload];
+            });
+            
             #if __has_include("RCTReloadCommand.h")
                 // reload 0.62+
                 RCTReloadCommandSetBundleURL([[self class] bundleURL]);
                 RCTTriggerReloadCommandListeners(@"pushy reload");
-            #else
-                // reload in earlier version
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-                    [self.bridge reload];
-                });
             #endif
+
             resolve(@true);
         }else{
             reject(@"执行报错", nil, nil);

package/package.json

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

package/src/utils.ts

@@ -37,15 +37,35 @@ export const emptyModule = new EmptyModule();
 const ping =
   Platform.OS === 'web'
     ? Promise.resolve
-    : async (url: string) =>
-        Promise.race([
+    : async (url: string) => {
+        let pingFinished = false;
+        return Promise.race([
           fetch(url, {
             method: 'HEAD',
           })
-            .then(({ status }) => (status === 200 ? url : null))
-            .catch(() => null),
-          new Promise(r => setTimeout(() => r(null), 2000)),
+            .then(({ status, statusText }) => {
+              pingFinished = true;
+              if (status === 200) {
+                return url;
+              }
+              log('ping failed', url, status, statusText);
+              return null;
+            })
+            .catch(e => {
+              pingFinished = true;
+              log('ping error', url, e);
+              return null;
+            }),
+          new Promise(r =>
+            setTimeout(() => {
+              r(null);
+              if (!pingFinished) {
+                log('ping timeout', url);
+              }
+            }, 2000),
+          ),
         ]);
+      };
 
 export function joinUrls(paths: string[], fileName?: string) {
   if (fileName) {
@@ -57,5 +77,10 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-  return promiseAny(urls.map(ping)).catch(() => null);
+  const ret = await promiseAny(urls.map(ping));
+  if (ret) {
+    return ret;
+  }
+  log('all ping failed, use first url:', urls[0]);
+  return urls[0];
 };