react-native-update 10.28.1 → 10.28.3-beta.0

package/ios/Expo/ExpoPushyReactDelegateHandler.swift

@@ -1,10 +1,40 @@
 import ExpoModulesCore
-import react_native_update
+import React
 
 public final class ExpoPushyReactDelegateHandler: ExpoReactDelegateHandler {
-  private weak var reactDelegate: ExpoReactDelegate?
 
-  public override func bundleURL(reactDelegate: ExpoReactDelegate) -> URL? {
-    return  RCTPushy.bundleURL()
-  }
+    #if EXPO_SUPPORTS_BUNDLEURL
+    // This code block compiles only if EXPO_SUPPORTS_BUNDLEURL is defined
+    // For expo-modules-core >= 1.12.0
+
+    // Override bundleURL, which is the primary mechanism for these versions.
+    // Expo's default createBridge implementation should respect this.
+    override public func bundleURL(reactDelegate: ExpoReactDelegate) -> URL? {
+      let bundleURL = RCTPushy.bundleURL()
+      print("PushyHandler: Using bundleURL: \(bundleURL?.absoluteString ?? "nil")")
+      return bundleURL
+    }
+
+    // No createBridge override needed here, rely on default behavior using the bundleURL override.
+
+    #else
+    // This code block compiles only if EXPO_SUPPORTS_BUNDLEURL is NOT defined
+    // For expo-modules-core < 1.12.0
+
+    // No bundleURL override possible here.
+
+    // createBridge is the mechanism to customize the URL here.
+    // We completely override it and do not call super.
+    override public func createBridge(reactDelegate: ExpoReactDelegate, bridgeDelegate: RCTBridgeDelegate, launchOptions: [AnyHashable: Any]?) -> RCTBridge? {
+      let bundleURL = RCTPushy.bundleURL()
+      // Print the URL being provided to the initializer
+      print("PushyHandler: createBridge bundleURL: \(bundleURL?.absoluteString ?? "nil")")
+
+      // Directly create the bridge using the bundleURL initializer.
+      // Pass nil for moduleProvider, assuming default behavior is sufficient.
+      // WARNING: If bundleURL is nil, this initialization might fail silently or crash.
+      return RCTBridge(bundleURL: bundleURL, moduleProvider: nil, launchOptions: launchOptions)
+    }
+
+    #endif // EXPO_SUPPORTS_BUNDLEURL
 }

package/package.json

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

package/react-native-update.podspec

@@ -1,4 +1,5 @@
 require 'json'
+require 'rubygems' # Required for version comparison
 
 new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
@@ -33,17 +34,45 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
-  project_root = File.expand_path('../../', __dir__)
-  project_package_json = File.join(project_root, 'package.json')
   is_expo_project = false
+  expo_dependency_added = false
+  supports_bundle_url_final = false
 
-  if (File.exist?(project_package_json))
-    package_json = JSON.parse(File.read(project_package_json))
-    has_expo_dependency = package_json['dependencies'] && package_json['dependencies']['expo']
-    has_expo_modules_core = Dir.exist?('node_modules/expo-modules-core')
-    is_expo_project = has_expo_dependency || has_expo_modules_core
-    if is_expo_project
-      s.dependency 'ExpoModulesCore'
+  # Use CocoaPods mechanism to find Podfile
+  begin
+    podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
+    if File.exist?(podfile_path)
+      podfile_content = File.read(podfile_path)
+      is_expo_project = podfile_content.include?('use_expo_modules!')
+    end
+  rescue
+    # Silently skip if CocoaPods config is not available
+  end
+
+  if is_expo_project
+    s.dependency 'ExpoModulesCore'
+    expo_dependency_added = true
+
+    # Current directory is in node_modules/react-native-update, so parent is node_modules
+    expo_core_package_json_path = File.join(__dir__, '..', 'expo-modules-core', 'package.json')
+
+    if File.exist?(expo_core_package_json_path)
+      begin
+        core_package_json = JSON.parse(File.read(expo_core_package_json_path))
+        installed_version_str = core_package_json['version']
+
+        if installed_version_str
+          begin
+            installed_version = Gem::Version.new(installed_version_str)
+            target_version = Gem::Version.new('1.12.0')
+            supports_bundle_url_final = installed_version >= target_version
+          rescue ArgumentError
+            # Silently skip version parsing errors
+          end
+        end
+      rescue JSON::ParserError, StandardError
+        # Silently skip file reading and parsing errors
+      end
     end
   end
 
@@ -62,9 +91,12 @@ Pod::Spec.new do |s|
     ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
 
-  if is_expo_project
+  if expo_dependency_added
     s.subspec 'Expo' do |ss|
       ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
+      if supports_bundle_url_final
+        ss.pod_target_xcconfig = { 'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'EXPO_SUPPORTS_BUNDLEURL' }
+      end
     end
   end
 
@@ -79,7 +111,7 @@ Pod::Spec.new do |s|
       s.pod_target_xcconfig = {
           "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
           "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
+      }.merge(s.pod_target_xcconfig)
       s.dependency "React-Codegen"
       s.dependency "RCT-Folly"
       s.dependency "RCTRequired"

package/src/client.ts

@@ -61,6 +61,31 @@ const defaultClientOptions: ClientOptions = {
   throwError: false,
 };
 
+export const sharedState: {
+  progressHandlers: Record<string, EmitterSubscription>;
+  downloadedHash?: string;
+  apkStatus: 'downloading' | 'downloaded' | null;
+  marked: boolean;
+  applyingUpdate: boolean;
+} = {
+  progressHandlers: {},
+  downloadedHash: undefined,
+  apkStatus: null,
+  marked: false,
+  applyingUpdate: false,
+};
+
+const assertHash = (hash: string) => {
+  if (!sharedState.downloadedHash) {
+    return;
+  }
+  if (hash !== sharedState.downloadedHash) {
+    log(`use downloaded hash ${sharedState.downloadedHash} first`);
+    return;
+  }
+  return true;
+};
+
 // for China users
 export class Pushy {
   options = defaultClientOptions;
@@ -68,13 +93,6 @@ export class Pushy {
   lastChecking?: number;
   lastRespJson?: Promise<any>;
 
-  static progressHandlers: Record<string, EmitterSubscription> = {};
-  static downloadedHash?: string;
-
-  static apkStatus: 'downloading' | 'downloaded' | null = null;
-
-  static marked = false;
-  static applyingUpdate = false;
   version = cInfo.rnu;
   loggerPromise = (() => {
     let resolve: (value?: unknown) => void = () => {};
@@ -152,16 +170,6 @@ export class Pushy {
   getCheckUrl = (endpoint: string = this.options.server!.main) => {
     return `${endpoint}/checkUpdate/${this.options.appKey}`;
   };
-  static assertHash = (hash: string) => {
-    if (!this.downloadedHash) {
-      return;
-    }
-    if (hash !== this.downloadedHash) {
-      log(`use downloaded hash ${Pushy.downloadedHash} first`);
-      return;
-    }
-    return true;
-  };
   assertDebug = () => {
     if (__DEV__ && !this.options.debug) {
       console.info(
@@ -172,10 +180,10 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    if (Pushy.marked || __DEV__ || !isFirstTime) {
+    if (sharedState.marked || __DEV__ || !isFirstTime) {
       return;
     }
-    Pushy.marked = true;
+    sharedState.marked = true;
     PushyModule.markSuccess();
     this.report({ type: 'markSuccess' });
   };
@@ -183,9 +191,9 @@ export class Pushy {
     if (!assertDev('switchVersion()')) {
       return;
     }
-    if (Pushy.assertHash(hash) && !Pushy.applyingUpdate) {
+    if (assertHash(hash) && !sharedState.applyingUpdate) {
       log('switchVersion: ' + hash);
-      Pushy.applyingUpdate = true;
+      sharedState.applyingUpdate = true;
       return PushyModule.reloadUpdate({ hash });
     }
   };
@@ -194,7 +202,7 @@ export class Pushy {
     if (!assertDev('switchVersionLater()')) {
       return;
     }
-    if (Pushy.assertHash(hash)) {
+    if (assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       return PushyModule.setNeedUpdate({ hash });
     }
@@ -349,18 +357,18 @@ export class Pushy {
       log(`rolledback hash ${rolledBackVersion}, ignored`);
       return;
     }
-    if (Pushy.downloadedHash === hash) {
-      log(`duplicated downloaded hash ${Pushy.downloadedHash}, ignored`);
-      return Pushy.downloadedHash;
+    if (sharedState.downloadedHash === hash) {
+      log(`duplicated downloaded hash ${sharedState.downloadedHash}, ignored`);
+      return sharedState.downloadedHash;
     }
-    if (Pushy.progressHandlers[hash]) {
+    if (sharedState.progressHandlers[hash]) {
       return;
     }
     const patchStartTime = Date.now();
     if (onDownloadProgress) {
       // @ts-expect-error harmony not in existing platforms
       if (Platform.OS === 'harmony') {
-        Pushy.progressHandlers[hash] = DeviceEventEmitter.addListener(
+        sharedState.progressHandlers[hash] = DeviceEventEmitter.addListener(
           'RCTPushyDownloadProgress',
           progressData => {
             if (progressData.hash === hash) {
@@ -369,14 +377,15 @@ export class Pushy {
           },
         );
       } else {
-        Pushy.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
-          'RCTPushyDownloadProgress',
-          progressData => {
-            if (progressData.hash === hash) {
-              onDownloadProgress(progressData);
-            }
-          },
-        );
+        sharedState.progressHandlers[hash] =
+          pushyNativeEventEmitter.addListener(
+            'RCTPushyDownloadProgress',
+            progressData => {
+              if (progressData.hash === hash) {
+                onDownloadProgress(progressData);
+              }
+            },
+          );
       }
     }
     let succeeded = '';
@@ -444,9 +453,9 @@ export class Pushy {
         }
       }
     }
-    if (Pushy.progressHandlers[hash]) {
-      Pushy.progressHandlers[hash].remove();
-      delete Pushy.progressHandlers[hash];
+    if (sharedState.progressHandlers[hash]) {
+      sharedState.progressHandlers[hash].remove();
+      delete sharedState.progressHandlers[hash];
     }
     if (__DEV__) {
       return hash;
@@ -482,7 +491,7 @@ export class Pushy {
       description,
       metaInfo,
     });
-    Pushy.downloadedHash = hash;
+    sharedState.downloadedHash = hash;
     return hash;
   };
   downloadAndInstallApk = async (
@@ -492,10 +501,10 @@ export class Pushy {
     if (Platform.OS !== 'android') {
       return;
     }
-    if (Pushy.apkStatus === 'downloading') {
+    if (sharedState.apkStatus === 'downloading') {
       return;
     }
-    if (Pushy.apkStatus === 'downloaded') {
+    if (sharedState.apkStatus === 'downloaded') {
       this.report({ type: 'errorInstallApk' });
       this.throwIfEnabled(new Error('errorInstallApk'));
       return;
@@ -516,35 +525,36 @@ export class Pushy {
         return;
       }
     }
-    Pushy.apkStatus = 'downloading';
+    sharedState.apkStatus = 'downloading';
     this.report({ type: 'downloadingApk' });
     const progressKey = 'downloadingApk';
     if (onDownloadProgress) {
-      if (Pushy.progressHandlers[progressKey]) {
-        Pushy.progressHandlers[progressKey].remove();
+      if (sharedState.progressHandlers[progressKey]) {
+        sharedState.progressHandlers[progressKey].remove();
       }
-      Pushy.progressHandlers[progressKey] = pushyNativeEventEmitter.addListener(
-        'RCTPushyDownloadProgress',
-        (progressData: ProgressData) => {
-          if (progressData.hash === progressKey) {
-            onDownloadProgress(progressData);
-          }
-        },
-      );
+      sharedState.progressHandlers[progressKey] =
+        pushyNativeEventEmitter.addListener(
+          'RCTPushyDownloadProgress',
+          (progressData: ProgressData) => {
+            if (progressData.hash === progressKey) {
+              onDownloadProgress(progressData);
+            }
+          },
+        );
     }
     await PushyModule.downloadAndInstallApk({
       url,
       target: 'update.apk',
       hash: progressKey,
     }).catch(() => {
-      Pushy.apkStatus = null;
+      sharedState.apkStatus = null;
       this.report({ type: 'errorDownloadAndInstallApk' });
       this.throwIfEnabled(new Error('errorDownloadAndInstallApk'));
     });
-    Pushy.apkStatus = 'downloaded';
-    if (Pushy.progressHandlers[progressKey]) {
-      Pushy.progressHandlers[progressKey].remove();
-      delete Pushy.progressHandlers[progressKey];
+    sharedState.apkStatus = 'downloaded';
+    if (sharedState.progressHandlers[progressKey]) {
+      sharedState.progressHandlers[progressKey].remove();
+      delete sharedState.progressHandlers[progressKey];
     }
   };
   restartApp = async () => {

package/src/provider.tsx

@@ -12,7 +12,7 @@ import {
   Platform,
   Linking,
 } from 'react-native';
-import { Pushy, Cresc } from './client';
+import { Pushy, Cresc, sharedState } from './client';
 import { currentVersion, packageVersion, getCurrentVersionInfo } from './core';
 import { CheckResult, ProgressData, UpdateTestPayload } from './type';
 import { UpdateContext } from './context';
@@ -171,7 +171,7 @@ export const UpdateProvider = ({
         return;
       }
       const rollout = info.config?.rollout?.[packageVersion];
-      if (rollout) {
+      if (info.update && rollout) {
         if (!isInRollout(rollout)) {
           log(`not in ${rollout}% rollout, ignored`);
           return;
@@ -182,8 +182,15 @@ export const UpdateProvider = ({
       updateInfoRef.current = info;
       setUpdateInfo(info);
       if (info.expired) {
+        if (
+          options.onPackageExpired &&
+          (await options.onPackageExpired(info)) === false
+        ) {
+          log('onPackageExpired returned false, skipping');
+          return;
+        }
         const { downloadUrl } = info;
-        if (downloadUrl && Pushy.apkStatus === null) {
+        if (downloadUrl && sharedState.apkStatus === null) {
           if (options.updateStrategy === 'silentAndNow') {
             if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
               downloadAndInstallApk(downloadUrl);
@@ -234,7 +241,7 @@ export const UpdateProvider = ({
       client,
       alertError,
       throwErrorIfEnabled,
-      options.updateStrategy,
+      options,
       alertUpdate,
       downloadAndInstallApk,
       downloadUpdate,

package/src/type.ts

@@ -92,6 +92,7 @@ export interface ClientOptions {
   beforeCheckUpdate?: () => Promise<boolean>;
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
   afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
+  onPackageExpired?: (info: CheckResult) => Promise<boolean>;
 }
 
 export interface UpdateTestPayload {

package/src/utils.ts

@@ -62,7 +62,7 @@ const ping =
               if (!pingFinished) {
                 log('ping timeout', url);
               }
-            }, 2000),
+            }, 5000),
           ),
         ]);
       };
@@ -81,6 +81,7 @@ export const testUrls = async (urls?: string[]) => {
   try {
     const ret = await promiseAny(urls.map(ping));
     if (ret) {
+      log('ping success, use url:', ret);
       return ret;
     }
   } catch {}