react-native-update 10.38.0-beta.1 → 10.38.0-beta.3

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

@@ -26,12 +26,14 @@ public class UpdateContext {
     public static boolean DEBUG = true;
     private static ReactInstanceManager mReactInstanceManager;
     private static boolean isUsingBundleUrl = false;
+    private static boolean ignoreRollback = false;
     private static final int STATE_OP_SWITCH_VERSION = 1;
     private static final int STATE_OP_MARK_SUCCESS = 2;
     private static final int STATE_OP_ROLLBACK = 3;
     private static final int STATE_OP_CLEAR_FIRST_TIME = 4;
     private static final int STATE_OP_CLEAR_ROLLBACK_MARK = 5;
     private static final int STATE_OP_RESOLVE_LAUNCH = 6;
+    private static final String KEY_FIRST_LOAD_MARKED = "firstLoadMarked";
     
     // Singleton instance
     private static UpdateContext sInstance;
@@ -77,7 +79,7 @@ public class UpdateContext {
             SharedPreferences.Editor editor = this.sp.edit();
             editor.clear();
             applyState(editor, nextState);
-            editor.apply();
+            persistEditor(editor, "sync state with binary version");
         }
     }
 
@@ -199,6 +201,12 @@ public class UpdateContext {
         putNullableString(editor, "rolledBackVersion", state.rolledBackVersion);
     }
 
+    private void persistEditor(SharedPreferences.Editor editor, String reason) {
+        if (!editor.commit() && DEBUG) {
+            Log.w("react-native-update", "Failed to persist update state for " + reason);
+        }
+    }
+
     public void switchVersion(String hash) {
         if (!new File(rootDir, hash+"/index.bundlejs").exists()) {
             throw new Error("Bundle version " + hash + " not found.");
@@ -214,13 +222,14 @@ public class UpdateContext {
         );
         SharedPreferences.Editor editor = sp.edit();
         applyState(editor, nextState);
-        editor.apply();
+        persistEditor(editor, "switch version");
+        ignoreRollback = false;
     }
 
     public void setKv(String key, String value) {
         SharedPreferences.Editor editor = sp.edit();
         editor.putString(key, value);
-        editor.apply();
+        persistEditor(editor, "set key " + key);
     }
 
     public String getKv(String key) {
@@ -235,6 +244,16 @@ public class UpdateContext {
         return sp.getBoolean("firstTime", false);
     }
 
+    public boolean consumeFirstLoadMarker() {
+        boolean isFirstLoadMarked = sp.getBoolean(KEY_FIRST_LOAD_MARKED, false);
+        if (isFirstLoadMarked) {
+            SharedPreferences.Editor editor = sp.edit();
+            editor.remove(KEY_FIRST_LOAD_MARKED);
+            persistEditor(editor, "clear first load marker");
+        }
+        return isFirstLoadMarked;
+    }
+
     public String rolledBackVersion() {
         return sp.getString("rolledBackVersion", null);
     }
@@ -254,7 +273,7 @@ public class UpdateContext {
             if (nextState.staleVersionToDelete != null) {
                 editor.remove("hash_" + nextState.staleVersionToDelete);
             }
-            editor.apply();
+            persistEditor(editor, "mark success");
 
             this.cleanUp();
         }
@@ -271,7 +290,8 @@ public class UpdateContext {
         );
         SharedPreferences.Editor editor = sp.edit();
         applyState(editor, nextState);
-        editor.apply();
+        editor.remove(KEY_FIRST_LOAD_MARKED);
+        persistEditor(editor, "clear first time");
 
         this.cleanUp();
     }
@@ -287,7 +307,7 @@ public class UpdateContext {
         );
         SharedPreferences.Editor editor = sp.edit();
         applyState(editor, nextState);
-        editor.apply();
+        persistEditor(editor, "clear rollback mark");
 
         this.cleanUp();
     }
@@ -334,13 +354,20 @@ public class UpdateContext {
             STATE_OP_RESOLVE_LAUNCH,
             currentState,
             null,
-            false,
-            false
+            ignoreRollback,
+            true
         );
         if (launchState.didRollback || launchState.consumedFirstTime) {
             SharedPreferences.Editor editor = sp.edit();
             applyState(editor, launchState);
-            editor.apply();
+            if (launchState.consumedFirstTime) {
+                editor.putBoolean(KEY_FIRST_LOAD_MARKED, true);
+            }
+            persistEditor(editor, "resolve launch");
+        }
+        if (launchState.consumedFirstTime) {
+            // bundleURL may be resolved multiple times in one process.
+            ignoreRollback = true;
         }
 
         String currentVersion = launchState.loadVersion;
@@ -372,7 +399,7 @@ public class UpdateContext {
         );
         SharedPreferences.Editor editor = sp.edit();
         applyState(editor, nextState);
-        editor.apply();
+        persistEditor(editor, "rollback");
         return nextState.currentVersion;
     }
 

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

@@ -4,8 +4,6 @@ import static androidx.core.content.FileProvider.getUriForFile;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -19,7 +17,6 @@ import java.util.Map;
 public class UpdateModule extends NativePushySpec {
     UpdateContext updateContext;
     public static ReactApplicationContext mContext;
-    private final Handler handler = new Handler(Looper.getMainLooper());
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
         super(reactContext);
         this.updateContext = updateContext;
@@ -40,25 +37,12 @@ public class UpdateModule extends NativePushySpec {
         constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
-        boolean isFirstTime = updateContext.isFirstTime();
+        boolean isFirstTime = updateContext.consumeFirstLoadMarker();
         constants.put("isFirstTime", isFirstTime);
-        if (isFirstTime) {
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.clearFirstTime();
-                }
-            }, 2000);
-        }
         String rolledBackVersion = updateContext.rolledBackVersion();
         constants.put("rolledBackVersion", rolledBackVersion);
         if (rolledBackVersion != null) {
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.clearRollbackMark();
-                }
-            }, 2000);
+            updateContext.clearRollbackMark();
         }
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;

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

@@ -53,11 +53,8 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         constants.put("currentVersionInfo", updateContext.getKv("hash_" + currentVersion));
         constants.put("buildTime", updateContext.getBuildTime());
         constants.put("isUsingBundleUrl", updateContext.getIsUsingBundleUrl());
-        boolean isFirstTime = updateContext.isFirstTime();
+        boolean isFirstTime = updateContext.consumeFirstLoadMarker();
         constants.put("isFirstTime", isFirstTime);
-        if (isFirstTime) {
-            updateContext.clearFirstTime();
-        }
         String rolledBackVersion = updateContext.rolledBackVersion();
         constants.put("rolledBackVersion", rolledBackVersion);
         if (rolledBackVersion != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.38.0-beta.1",
+  "version": "10.38.0-beta.3",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

package/src/__tests__/setup.ts

@@ -6,6 +6,9 @@ mock.module('react-native', () => {
       OS: 'ios',
       Version: 13,
     },
+    DeviceEventEmitter: {
+      addListener: () => ({ remove: () => {} }),
+    },
     NativeModules: {
       Pushy: {
         currentVersionInfo: '{}',

package/src/client.ts

@@ -42,8 +42,7 @@ import { dedupeEndpoints, executeEndpointFallback } from './endpoint';
 const SERVER_PRESETS = {
   // cn
   Pushy: {
-    main: 'https://update.react-native.cn/api',
-    backups: ['https://update.reactnative.cn/api'],
+    main: ['https://update.react-native.cn/api', '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-update@master/endpoints.json',
@@ -51,14 +50,26 @@ const SERVER_PRESETS = {
   },
   // i18n
   Cresc: {
-    main: 'https://api.cresc.dev',
-    backups: ['https://api.cresc.app'],
+    main: ['https://api.cresc.dev', 'https://api.cresc.app'],
     queryUrls: [
       'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-update@master/endpoints_cresc.json',
     ],
   },
 };
 
+const cloneServerConfig = (server: UpdateServerConfig): UpdateServerConfig => ({
+  main: dedupeEndpoints([...(server.main || [])]),
+  queryUrls: server.queryUrls ? [...server.queryUrls] : undefined,
+});
+
+const excludeConfiguredEndpoints = (
+  endpoints: string[],
+  configuredEndpoints: string[],
+) => {
+  const configured = new Set(configuredEndpoints);
+  return endpoints.filter(endpoint => !configured.has(endpoint));
+};
+
 assertWeb();
 
 const defaultClientOptions: ClientOptions = {
@@ -71,19 +82,6 @@ const defaultClientOptions: ClientOptions = {
   throwError: false,
 };
 
-const cloneServerConfig = (
-  server?: UpdateServerConfig,
-): UpdateServerConfig | undefined => {
-  if (!server) {
-    return undefined;
-  }
-  return {
-    main: server.main,
-    backups: server.backups ? [...server.backups] : undefined,
-    queryUrls: server.queryUrls ? [...server.queryUrls] : undefined,
-  };
-};
-
 export const sharedState: {
   progressHandlers: Record<string, EmitterSubscription>;
   downloadedHash?: string;
@@ -209,7 +207,7 @@ export class Pushy {
       throw e;
     }
   };
-  getCheckUrl = (endpoint: string = this.options.server!.main) => {
+  getCheckUrl = (endpoint: string) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
   getConfiguredCheckEndpoints = () => {
@@ -217,7 +215,7 @@ export class Pushy {
     if (!server) {
       return [];
     }
-    return dedupeEndpoints([server.main, ...(server.backups || [])]);
+    return dedupeEndpoints(server.main);
   };
   getRemoteEndpoints = async () => {
     const { server } = this.options;
@@ -233,16 +231,14 @@ export class Pushy {
       const remoteEndpoints = await resp.json();
       log('fetch endpoints:', remoteEndpoints);
       if (Array.isArray(remoteEndpoints)) {
-        const normalizedRemoteEndpoints = dedupeEndpoints(
+        return excludeConfiguredEndpoints(
+          dedupeEndpoints(
           remoteEndpoints.filter(
             (endpoint): endpoint is string => typeof endpoint === 'string',
           ),
-        ).filter(endpoint => endpoint !== server.main);
-        server.backups = dedupeEndpoints([
-          ...(server.backups || []),
-          ...normalizedRemoteEndpoints,
-        ]).filter(endpoint => endpoint !== server.main);
-        return normalizedRemoteEndpoints;
+          ),
+          this.getConfiguredCheckEndpoints(),
+        );
       }
     } catch (e) {
       log('failed to fetch endpoints from: ', server.queryUrls, e);
@@ -410,8 +406,9 @@ export class Pushy {
       return [];
     }
     const remoteEndpoints = await this.getRemoteEndpoints();
-    return dedupeEndpoints([...(server.backups || []), ...remoteEndpoints]).filter(
-      endpoint => endpoint !== server.main,
+    return excludeConfiguredEndpoints(
+      dedupeEndpoints(remoteEndpoints),
+      this.getConfiguredCheckEndpoints(),
     );
   };
   downloadUpdate = async (

package/src/type.ts

@@ -77,8 +77,7 @@ export type UpdateEventsLogger = ({
 }) => void;
 
 export interface UpdateServerConfig {
-  main: string;
-  backups?: string[];
+  main: string[];
   queryUrls?: string[];
 }