react-native-update 10.58.1 → 10.59.1

package/android/src/main/java/cn/reactnative/modules/update/{NativeUpdateConfig.java → PushyConfiguration.java}

@@ -9,22 +9,27 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/** Internal normalizer for the JSONObject accepted by PushyNativeUpdate.configure. */
-final class NativeUpdateConfig {
+/** Internal normalizer for the JSONObject accepted by PushyRuntime.configure. */
+final class PushyConfiguration {
     private static final Set<String> KEYS = new HashSet<>(Arrays.asList(
         "appKey", "endpoints", "queryUrls", "afterDownload", "disabled",
         "packageVersion", "rnu", "rn"));
     private static final Pattern URL = Pattern.compile(
         "^https?://(\\[[0-9a-fA-F:]+\\]|[a-zA-Z0-9.-]+)(:[0-9]+)?([/?#]|$)");
+    // Default service addresses, encoded by scripts/encode-native-text.ts.
     private static final String[] ENDPOINTS = {
-        "https://update.react-native.cn/api", "https://update.reactnative.cn/api"
+        Texts.reveal("3203e0c1bdd1270a372f18f8c2b6de7f4f2607f5b3d5b9817b592947e5cdefbc8a7e"),
+        Texts.reveal("3203e0c1bdd1270a372f18f8c2b6de7f4f2607f5f0daac9c644a620ae88ca1ad93")
     };
     private static final String[] QUERY_URLS = {
-        "https://gitee.com/sunnylqm/react-native-pushy/raw/master/endpoints.json",
-        "https://cdn.jsdelivr.net/gh/reactnativecn/react-native-update@master/endpoints.json"
+        Texts.reveal("3203e0c1bdd1270a253608fcd3fd9362476817f4f0d5a1996342631be3c2a3a9d779552507fdcde8928a6f512f5ce2ccbdc869404d2f1de79daa826d562c0913eec4fa9b7d4426"),
+        Texts.reveal("3203e0c1bdd1270a213b12b7dca09468462e12f3b0d5bd813d482446f4c6a1be8e79552507fdcda68cd06e5c3710e480a4867048483e55e0c2ab8d7d43030d1ce9c3b183214e2601f2f0d5b782601e2719e8ca")
     };
 
-    private NativeUpdateConfig() {}
+    // afterDownload value that selects the bundle for the next launch, encoded.
+    static final String POLICY_NEXT_LAUNCH = Texts.reveal("2912e0ffab8e6c70323b1dedd3");
+
+    private PushyConfiguration() {}
 
     static String normalize(String json) throws JSONException {
         JSONObject options = new JSONObject(json);
@@ -43,8 +48,8 @@ final class NativeUpdateConfig {
             "queryUrls", false);
         String afterDownload = options.has("afterDownload")
             ? string(options.get("afterDownload"), "afterDownload", false) : "none";
-        if (!"none".equals(afterDownload) && !"setNeedUpdate".equals(afterDownload)) {
-            throw invalid("afterDownload must be none or setNeedUpdate");
+        if (!"none".equals(afterDownload) && !POLICY_NEXT_LAUNCH.equals(afterDownload)) {
+            throw invalid("afterDownload must be none or " + POLICY_NEXT_LAUNCH);
         }
         Object disabled = options.has("disabled") ? options.get("disabled") : Boolean.FALSE;
         if (!(disabled instanceof Boolean)) {

package/android/src/main/java/cn/reactnative/modules/update/{PushyNativeUpdate.java → PushyRuntime.java}

@@ -11,18 +11,18 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
 /** Bridge-free native configuration and update APIs. */
-public final class PushyNativeUpdate {
+public final class PushyRuntime {
     public interface Callback {
         /** Always called on the main thread, including skipped and failed checks. */
-        void onComplete(NativeUpdateResult result);
+        void onComplete(BundlePreparationResult result);
     }
 
     // A single waiting worker, not one thread per caller. The actual round is
-    // shared with cold start and crash rescue by NativeCheckOrchestrator.
+    // shared with cold start and crash rescue by SyncCoordinator.
     private static final Executor WORKER = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
         public Thread newThread(Runnable runnable) {
-            Thread thread = new Thread(runnable, "pushy-host-check");
+            Thread thread = new Thread(runnable, "pushy-host-sync");
             thread.setDaemon(true);
             return thread;
         }
@@ -46,7 +46,7 @@ public final class PushyNativeUpdate {
     /**
      * Validate and persist a complete configuration, even before JS or bundle
      * resolution. This starts no network work and never resolves a bundle.
-     * Await the callback before continuing startup/checkAndUpdate. Unless JS
+     * Await the callback before continuing startup/prepareBundle. Unless JS
      * uses nativeConfigSource: 'native', later JS config writes can replace it.
      */
     public static void configure(Context context, JSONObject options, final ConfigurationCallback callback) {
@@ -61,7 +61,7 @@ public final class PushyNativeUpdate {
             public void run() {
                 Exception failure = null;
                 try {
-                    String config = NativeUpdateConfig.normalize(snapshot);
+                    String config = PushyConfiguration.normalize(snapshot);
                     UpdateContext.getInstance(applicationContext).setNativeConfig(config);
                 } catch (Exception e) {
                     failure = e;
@@ -79,7 +79,7 @@ public final class PushyNativeUpdate {
         });
     }
 
-    private PushyNativeUpdate() {
+    private PushyRuntime() {
     }
 
     /**
@@ -91,7 +91,7 @@ public final class PushyNativeUpdate {
      * this method: bundle resolution consumes first-load/rollback markers.
      * Missing persisted configuration and debug builds are reported as skipped.
      */
-    public static void checkAndUpdate(Context context, final Callback callback) {
+    public static void prepareBundle(Context context, final Callback callback) {
         if (context == null || callback == null) {
             throw new IllegalArgumentException("context and callback are required");
         }
@@ -99,22 +99,22 @@ public final class PushyNativeUpdate {
         WORKER.execute(new Runnable() {
             @Override
             public void run() {
-                NativeUpdateResult outcome;
+                BundlePreparationResult outcome;
                 try {
                     if (BuildConfig.DEBUG) {
-                        outcome = NativeUpdateResult.of(NativeUpdateResult.SKIPPED, "debug");
+                        outcome = BundlePreparationResult.of(BundlePreparationResult.SKIPPED, "debug");
                     } else {
-                        outcome = NativeCheckOrchestrator.checkAndUpdate(
+                        outcome = SyncCoordinator.prepareBundle(
                             UpdateContext.getInstance(applicationContext));
                     }
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
-                    outcome = NativeUpdateResult.of(NativeUpdateResult.CANCELLED, "interrupted");
+                    outcome = BundlePreparationResult.of(BundlePreparationResult.CANCELLED, "interrupted");
                 } catch (Exception | LinkageError e) {
-                    Log.w("react-native-update", "native host check failed", e);
-                    outcome = NativeUpdateResult.of(NativeUpdateResult.FAILED, "internal_error");
+                    Log.w(Texts.LOG_TAG, "native host sync failed", e);
+                    outcome = BundlePreparationResult.of(BundlePreparationResult.FAILED, "internal_error");
                 }
-                final NativeUpdateResult result = outcome;
+                final BundlePreparationResult result = outcome;
                 new Handler(Looper.getMainLooper()).post(new Runnable() {
                     @Override
                     public void run() {

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

@@ -55,8 +55,8 @@ final class ReactReloadManager {
                 reloadReactHost(reactHost, createBundleLoader(application, updateBundlePath, true));
                 return;
             } catch (Throwable err) {
-                Log.e(UpdateContext.TAG,
-                    "Failed to reload via ReactHost, trying ReactInstanceManager", err);
+                Log.e(Texts.LOG_TAG,
+                    "Failed to restart via ReactHost, trying ReactInstanceManager", err);
             }
         }
 
@@ -123,7 +123,7 @@ final class ReactReloadManager {
                 return (String) resolvedBundleAssetName;
             }
         } catch (Exception e) {
-            Log.e(UpdateContext.TAG, "Failed to get default asset name from ReactNativeHost", e);
+            Log.e(Texts.LOG_TAG, "Failed to get default asset name from ReactNativeHost", e);
         }
 
         return bundleAssetName;
@@ -170,7 +170,7 @@ final class ReactReloadManager {
                     }
                 }
             } catch (Throwable ignored) {
-                Log.w(UpdateContext.TAG, "getReactHost via ReactDelegate reflection failed", ignored);
+                Log.w(Texts.LOG_TAG, "getReactHost via ReactDelegate reflection failed", ignored);
             }
         }
 
@@ -178,7 +178,7 @@ final class ReactReloadManager {
             Method getReactHostMethod = application.getClass().getMethod("getReactHost");
             return getReactHostMethod.invoke(application);
         } catch (Throwable ignored) {
-            Log.w(UpdateContext.TAG, "getReactHost via Application.getReactHost() failed", ignored);
+            Log.w(Texts.LOG_TAG, "getReactHost via Application.getReactHost() failed", ignored);
         }
 
         return null;
@@ -252,8 +252,8 @@ final class ReactReloadManager {
         jsBundleLoaderField.setAccessible(true);
         jsBundleLoaderField.set(reactHostDelegate, loader);
 
-        Method reloadMethod = reactHost.getClass().getMethod("reload", String.class);
-        reloadMethod.invoke(reactHost, "react-native-update");
+        Method reloadMethod = reactHost.getClass().getMethod(Texts.reveal("2812f8deaf8f"), String.class);
+        reloadMethod.invoke(reactHost, Texts.LOG_TAG);
     }
 
     private static ReactInstanceManager resolveReactInstanceManager(

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

@@ -56,7 +56,7 @@ final class StateSerialRunner {
                     if (promise != null) {
                         promise.reject(errorCode, operationName + " failed", error);
                     } else {
-                        Log.e(UpdateContext.TAG, operationName + " failed", error);
+                        Log.e(Texts.LOG_TAG, operationName + " failed", error);
                     }
                 }
             }