react-native-update 10.38.0-beta.0 → 10.38.0-beta.2

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

@@ -191,6 +191,39 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
         return fout.toByteArray();
     }
 
+    private void appendManifestEntries(
+        JSONObject manifest,
+        ArrayList<String> copyFroms,
+        ArrayList<String> copyTos,
+        ArrayList<String> deletes,
+        HashMap<String, String> copiesMap
+    ) throws JSONException {
+        JSONObject copies = manifest.optJSONObject("copies");
+        if (copies != null) {
+            Iterator<?> keys = copies.keys();
+            while (keys.hasNext()) {
+                String to = (String) keys.next();
+                String from = copies.getString(to);
+                if (from.isEmpty()) {
+                    from = to;
+                }
+                copyFroms.add(from);
+                copyTos.add(to);
+                if (copiesMap != null) {
+                    copiesMap.put(to, from);
+                }
+            }
+        }
+
+        JSONObject deleteMap = manifest.optJSONObject("deletes");
+        if (deleteMap != null) {
+            Iterator<?> deleteKeys = deleteMap.keys();
+            while (deleteKeys.hasNext()) {
+                deletes.add((String) deleteKeys.next());
+            }
+        }
+    }
+
     private void copyBundledAssetToFile(String assetName, File destination) throws IOException {
         InputStream in = context.getAssets().open(assetName);
         FileOutputStream fout = new FileOutputStream(destination);
@@ -480,25 +513,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 byte[] bytes = readBytes(zipFile.getInputStream(ze));
                 String json = new String(bytes, "UTF-8");
                 JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();
-
-                JSONObject copies = obj.getJSONObject("copies");
-                Iterator<?> keys = copies.keys();
-                while( keys.hasNext() ) {
-                    String to = (String)keys.next();
-                    String from = copies.getString(to);
-                    if (from.isEmpty()) {
-                        from = to;
-                    }
-                    copyFroms.add(from);
-                    copyTos.add(to);
-                    // 保存 copies 映射关系（to -> from）
-                    copiesMap.put(to, from);
-                }
-                JSONObject blackList = obj.getJSONObject("deletes");
-                Iterator<?> deleteKeys = blackList.keys();
-                while (deleteKeys.hasNext()) {
-                    deletes.add((String)deleteKeys.next());
-                }
+                appendManifestEntries(obj, copyFroms, copyTos, deletes, copiesMap);
                 continue;
             }
             zipFile.unzipToPath(ze, param.unzipDirectory);
@@ -579,23 +594,7 @@ class DownloadTask extends AsyncTask<DownloadTaskParams, long[], Void> {
                 byte[] bytes = readBytes(zipFile.getInputStream(ze));
                 String json = new String(bytes, "UTF-8");
                 JSONObject obj = (JSONObject)new JSONTokener(json).nextValue();
-
-                JSONObject copies = obj.getJSONObject("copies");
-                Iterator<?> keys = copies.keys();
-                while( keys.hasNext() ) {
-                    String to = (String)keys.next();
-                    String from = copies.getString(to);
-                    if (from.isEmpty()) {
-                        from = to;
-                    }
-                    copyFroms.add(from);
-                    copyTos.add(to);
-                }
-                JSONObject blackList = obj.getJSONObject("deletes");
-                Iterator<?> deleteKeys = blackList.keys();
-                while (deleteKeys.hasNext()) {
-                    deletes.add((String)deleteKeys.next());
-                }
+                appendManifestEntries(obj, copyFroms, copyTos, deletes, null);
                 continue;
             }
             zipFile.unzipToPath(ze, param.unzipDirectory);

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;
@@ -43,22 +40,12 @@ public class UpdateModule extends NativePushySpec {
         boolean isFirstTime = updateContext.isFirstTime();
         constants.put("isFirstTime", isFirstTime);
         if (isFirstTime) {
-            handler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.clearFirstTime();
-                }
-            }, 2000);
+            updateContext.clearFirstTime();
         }
         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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.38.0-beta.0",
+  "version": "10.38.0-beta.2",
   "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[];
 }