react-native-update 10.57.1 → 10.58.1

package/cpp/patch_core/state_core.cpp

@@ -76,6 +76,15 @@ State Rollback(const State& state) {
   return next;
 }
 
+State ForgetPurgedVersions(const State& state) {
+  State next = state;
+  next.current_version.clear();
+  next.last_version.clear();
+  next.first_time = false;
+  next.first_time_ok = true;
+  return next;
+}
+
 bool ShouldRollbackForBrokenFirstLoad(const State& state) {
   return !state.first_time && !state.first_time_ok;
 }

package/cpp/patch_core/state_core.h

@@ -47,6 +47,12 @@ State ClearRollbackMark(const State& state);
 
 State Rollback(const State& state);
 
+// The OS deleted the installed versions' files (tvOS purges Caches while the
+// app is not running): they were not rejected, so unlike Rollback this leaves
+// no rolled-back mark that would make the next check skip reinstalling them.
+// An existing mark (a rollback earlier in this launch) is kept.
+State ForgetPurgedVersions(const State& state);
+
 bool ShouldRollbackForBrokenFirstLoad(const State& state);
 
 LaunchDecision ResolveLaunchState(

package/ios/RCTPushy/RCTPushy.mm

@@ -98,6 +98,14 @@ static NSString *PushyCode(const char *code) {
     return [NSString stringWithUTF8String:code];
 }
 
+// cInfo.os label prefix; must match the JS side (core.ts) so the server
+// buckets tvOS devices apart from iOS ones.
+#if TARGET_OS_TV
+static NSString * const PushyOsName = @"tvos";
+#else
+static NSString * const PushyOsName = @"ios";
+#endif
+
 // event def
 static NSString * const EVENT_PROGRESS_DOWNLOAD = @"RCTPushyDownloadProgress";
 static NSString * const PARAM_PROGRESS_HASH = @"hash";
@@ -732,6 +740,10 @@ static void PushySwitchVersionLocked(NSString *hash) {
 + (BOOL)hasRunnableConfig;
 + (NSDictionary *)checkAndUpdate;
 + (void)scheduleFromColdStart:(NSString *)launchRolledBackVersion;
+#if TARGET_OS_TV && !DEBUG
++ (BOOL)restorePurgedLaunch:(NSString *)purgedVersion
+                 rolledBack:(NSString *)launchRolledBackVersion;
+#endif
 + (void)markJsCheckCompleted:(NSString *)config;
 + (void)startRoundWithDeadline:(NSTimeInterval)deadlineUptime;
 + (void)runOnce:(NSString *)launchRolledBackVersion deadline:(NSTimeInterval)deadlineUptime;
@@ -742,7 +754,8 @@ static void PushySwitchVersionLocked(NSString *hash) {
                      responseText:(NSString *)responseText
                           request:(NSString *)requestBody
                            config:(NSString *)configJson
-                       responseAt:(long long)responseAtSeconds;
+                       responseAt:(long long)responseAtSeconds
+                        activated:(BOOL *)activatedOut;
 @end
 
 // One round per process, whoever starts it first — the delayed cold-start
@@ -755,6 +768,15 @@ static std::atomic<bool> pushyRoundCompleted{false};
 // it downloads (§11.3).
 static std::atomic<bool> pushyCrashRescueActive{false};
 static std::atomic<bool> pushyRescueAttempted{false};
+// Set when this process's round is the tvOS purged-version restore.
+static std::atomic<bool> pushyPurgeRestoreActive{false};
+// True while +bundleURL waits for that restore. Only then may the round
+// activate what it downloads on its own (JS has not started to decide), since
+// the launch resolves the bundle again afterwards. Closed once the wait ends,
+// timeout or not; guarded by the state lock that every activation commits
+// under, so a commit lands either before the close (and launches) or after it
+// (and is left to JS) — never selected behind the packaged bundle's back.
+static bool pushyPurgeRestoreWindowOpen = false;
 static dispatch_semaphore_t pushyRoundDone;
 static NSString *pushyLaunchRolledBackForRescue = nil;
 // A version this process downloaded but left for JS to activate. If the
@@ -785,6 +807,9 @@ static const NSTimeInterval kPushyRescueTriggerUptime = 60;
 static const NSTimeInterval kPushyRescueBudgetBackgroundThread = 10;
 // A held main thread freezes UI teardown; stay well under the watchdog.
 static const NSTimeInterval kPushyRescueBudgetMainThread = 3.5;
+// The purged-version restore blocks +bundleURL, usually inside
+// application:didFinishLaunching: — stay clear of the launch watchdog.
+static const NSTimeInterval kPushyPurgeRestoreBudget = 12;
 
 static void PushyMaybeHoldForRescue(void) {
     // Once per process; a second crashing thread passes straight through
@@ -935,8 +960,42 @@ RCT_EXPORT_MODULE(RCTPushy);
 + (NSURL *)bundleURL
 {
     pushyIsUsingBundleUrl = true;
+    NSString *launchRolledBackVersion = nil;
+    @try {
+        NSString *purgedVersion = nil;
+        NSURL *resolvedURL = [RCTPushy resolveLaunchBundleURL:&launchRolledBackVersion
+                                                purgedVersion:&purgedVersion];
+#if TARGET_OS_TV && !DEBUG
+        // tvOS deleted the installed version while the app was not running.
+        // The app is expected to be online: block the launch on a native
+        // round that reinstalls the latest version, instead of showing the
+        // packaged bundle and jumping forward again on a later launch.
+        if (purgedVersion != nil &&
+            [RCTPushyOrchestrator restorePurgedLaunch:purgedVersion
+                                           rolledBack:launchRolledBackVersion]) {
+            resolvedURL = [RCTPushy resolveLaunchBundleURL:&launchRolledBackVersion
+                                             purgedVersion:&purgedVersion];
+        }
+#endif
+        return resolvedURL ?: [RCTPushy binaryBundleURL];
+    } @finally {
+        // State corruption is exactly when the rescue path matters most. If
+        // resolution throws before a snapshot exists, nil safely omits only
+        // this launch's rollback guard instead of disabling the check.
+        [RCTPushyOrchestrator scheduleFromColdStart:launchRolledBackVersion];
+    }
+}
+
+// Resolves the bundle to launch from the persisted state; nil means the
+// packaged bundle. Consumes the launch's one-shot state (first_time), so a
+// second call is only valid after something re-armed it (a switchVersion).
+// purgedVersion is set on tvOS when the installed version's files are gone.
++ (NSURL *)resolveLaunchBundleURL:(NSString **)launchRolledBackVersionOut
+                    purgedVersion:(NSString **)purgedVersionOut
+{
     __block NSURL *resolvedURL = nil;
     __block NSString *launchRolledBackVersion = nil;
+    __block NSString *purgedVersion = nil;
     @try {
         PushyWithStateLock(^{
             NSUserDefaults *defaults = PushyDefaults();
@@ -995,10 +1054,29 @@ RCT_EXPORT_MODULE(RCTPushy);
                     resolvedURL = [NSURL fileURLWithPath:bundlePath];
                     break;
                 } else {
+#if TARGET_OS_TV
+                    // Caches is purgeable on tvOS: a missing bundle is the OS
+                    // reclaiming space, not a bad release. Everything under
+                    // rctpushy went with it, so walking back to last_version
+                    // is pointless, and a rollback mark would make this
+                    // launch's check refuse to reinstall the version.
+                    RCTLogWarn(@"RCTPushy -- bundle version %@ was purged by the system", loadVersion);
+                    purgedVersion = loadVersion;
+                    state = pushy::state::ForgetPurgedVersions(state);
+                    PushyApplyStateToDefaults(defaults, state);
+                    if (decision.consumed_first_time) {
+                        // The first load being consumed never happens: the
+                        // packaged bundle must not report isFirstTime.
+                        ignoreRollback = false;
+                        [defaults removeObjectForKey:keyFirstLoadMarked];
+                    }
+                    break;
+#else
                     RCTLogError(@"RCTPushy -- bundle version %@ not found, rolling back", loadVersion);
                     state = pushy::state::Rollback(state);
                     PushyApplyStateToDefaults(defaults, state);
                     loadVersion = PushyFromStdString(state.current_version);
+#endif
                 }
             }
         }
@@ -1007,13 +1085,11 @@ RCT_EXPORT_MODULE(RCTPushy);
         // launch just rolled back.
             launchRolledBackVersion = PushyFromStdString(state.rolled_back_version);
         });
-        return resolvedURL ?: [RCTPushy binaryBundleURL];
     } @finally {
-        // State corruption is exactly when the rescue path matters most. If
-        // resolution throws before a snapshot exists, nil safely omits only
-        // this launch's rollback guard instead of disabling the check.
-        [RCTPushyOrchestrator scheduleFromColdStart:launchRolledBackVersion];
+        *launchRolledBackVersionOut = launchRolledBackVersion;
+        *purgedVersionOut = purgedVersion;
     }
+    return resolvedURL;
 }
 
 + (NSString *) rollback {
@@ -1919,6 +1995,7 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
 // excluded from backups.
 + (void)excludeFromBackup:(NSString *)path
 {
+#if !TARGET_OS_TV  // tvOS stores under Caches, which is never backed up.
     NSURL *url = [NSURL fileURLWithPath:path isDirectory:YES];
     NSError *error = nil;
     if (![url setResourceValue:@YES
@@ -1926,6 +2003,7 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
                          error:&error]) {
         RCTLogWarn(@"Pushy exclude from backup error: %@", error.localizedDescription);
     }
+#endif
 }
 
 - (void)unzipFileAtPath:(NSString *)path
@@ -2047,7 +2125,15 @@ RCT_EXPORT_METHOD(resetToPackagedBundle:(RCTPromiseResolveBlock)resolve
 
 + (NSString *)downloadDir
 {
-    NSString *directory = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) firstObject];
+#if TARGET_OS_TV
+    // tvOS apps cannot write Application Support; Caches is the only
+    // writable, non-temporary location, and the system may purge it while
+    // the app is not running (see the purged-version path in +bundleURL).
+    NSSearchPathDirectory base = NSCachesDirectory;
+#else
+    NSSearchPathDirectory base = NSApplicationSupportDirectory;
+#endif
+    NSString *directory = [NSSearchPathForDirectoriesInDomains(base, NSUserDomainMask, YES) firstObject];
     return [directory stringByAppendingPathComponent:@"rctpushy"];
 }
 
@@ -2248,12 +2334,9 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
         && !config.Get("appKey").AsString().empty();
 }
 
-+ (void)scheduleFromColdStart:(NSString *)launchRolledBackVersion {
-#if !DEBUG
-    // Once per process; a few seconds of delay keeps the check away from the
-    // cold-start critical path (§7 R5) — its result targets the NEXT launch.
-    // Unless the previous process died mid-round (residual incomplete
-    // marker), in which case every launch second counts (§11.4).
+// Process-wide round state, set up by whichever launch path needs a round
+// first: the delayed cold-start check or the tvOS purged-version restore.
++ (void)prepareProcess:(NSString *)launchRolledBackVersion {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         pushyRoundDone = dispatch_semaphore_create(0);
@@ -2262,12 +2345,24 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
         pushyProcessAnchorUptime = PushyMonotonicNow();
         pushyLaunchRolledBackForRescue = [launchRolledBackVersion copy];
         pushyNativeCheckReady.store(true);
-        NSUserDefaults *defaults = PushyDefaults();
         // The crash-hold rescue shares the orchestrator's rollout gate: no
         // persisted config, no handler (§11.3).
-        if ([defaults stringForKey:keyNativeConfig].length > 0) {
+        if ([PushyDefaults() stringForKey:keyNativeConfig].length > 0) {
             PushyInstallCrashRescueHandler();
         }
+    });
+}
+
++ (void)scheduleFromColdStart:(NSString *)launchRolledBackVersion {
+#if !DEBUG
+    // Once per process; a few seconds of delay keeps the check away from the
+    // cold-start critical path (§7 R5) — its result targets the NEXT launch.
+    // Unless the previous process died mid-round (residual incomplete
+    // marker), in which case every launch second counts (§11.4).
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self prepareProcess:launchRolledBackVersion];
+        NSUserDefaults *defaults = PushyDefaults();
         int64_t delaySeconds =
             [defaults objectForKey:keyNativeCheckIncomplete] != nil ? 0 : 5;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, delaySeconds * NSEC_PER_SEC),
@@ -2284,6 +2379,52 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
 #endif
 }
 
+#if TARGET_OS_TV && !DEBUG
+// Runs this process's round before the first bundle loads, blocking the
+// caller for at most kPushyPurgeRestoreBudget. The state no longer has a
+// current version, so the server answers with the latest version for the
+// packaged bundle, and the round activates it while the restore window is
+// open. Returns NO when no round can run; otherwise the caller must resolve
+// the launch bundle again: it launches whatever was activated before the
+// window closed, or the packaged bundle. The round stops at the same
+// deadline, keeping a partial download for the next check to resume.
++ (BOOL)restorePurgedLaunch:(NSString *)purgedVersion
+                 rolledBack:(NSString *)launchRolledBackVersion {
+    [self prepareProcess:launchRolledBackVersion];
+    if (![self hasRunnableConfig]) {
+        RCTLogWarn(@"RCTPushy -- version %@ was purged and no native check is "
+                   @"configured; launching the packaged bundle", purgedVersion);
+        return NO;
+    }
+    PushyWithStateLock(^{
+        pushyPurgeRestoreWindowOpen = true;
+    });
+    pushyPurgeRestoreActive.store(true);
+    NSTimeInterval deadline = PushyMonotonicNow() + kPushyPurgeRestoreBudget;
+    dispatch_semaphore_t done = dispatch_semaphore_create(0);
+    dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
+        [self startRoundWithDeadline:deadline];
+        dispatch_semaphore_signal(done);
+    });
+    BOOL timedOut = dispatch_semaphore_wait(done, dispatch_time(DISPATCH_TIME_NOW,
+        (int64_t)(kPushyPurgeRestoreBudget * NSEC_PER_SEC))) != 0;
+    // The round's deadline does not bound a slow response (the request
+    // timeout is an idle timeout) nor a version already on disk, so the close
+    // is what stops a late activation — not the deadline.
+    PushyWithStateLock(^{
+        pushyPurgeRestoreWindowOpen = false;
+    });
+    if (timedOut) {
+        RCTLogWarn(@"RCTPushy -- purged version %@ restore timed out", purgedVersion);
+    } else {
+        NSDictionary *result = pushyHostRoundResult;
+        RCTLogInfo(@"RCTPushy -- purged version %@ restore: %@ %@ %@", purgedVersion,
+                   result[@"status"], result[@"reason"], result[@"hash"]);
+    }
+    return YES;
+}
+#endif
+
 + (NSDictionary *)checkAndUpdate {
 #if DEBUG
     return PushyHostResult(@"skipped", @"debug", nil, NO);
@@ -2430,7 +2571,8 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
                                         responseText:nil
                                              request:nil
                                               config:nil
-                                          responseAt:0];
+                                          responseAt:0
+                                           activated:NULL];
     if (committed) {
         @synchronized (self) {
             pushyUnactivatedHash = nil;
@@ -2532,7 +2674,7 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
     cInfo.Set("rnu", config.Get("rnu"));
     cInfo.Set("rn", config.Get("rn"));
     cInfo.Set("os", flowjson::Value::String(PushyToStdString([NSString
-        stringWithFormat:@"ios %@", [[UIDevice currentDevice] systemVersion]])));
+        stringWithFormat:@"%@ %@", PushyOsName, [[UIDevice currentDevice] systemVersion]])));
     cInfo.Set("uuid", flowjson::Value::String(PushyToStdString(uuid)));
 
     flowjson::Value input = flowjson::Value::Object();
@@ -2580,7 +2722,8 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
                            responseText:responseText
                                 request:body
                                  config:configJson
-                             responseAt:responseAtSeconds];
+                             responseAt:responseAtSeconds
+                              activated:NULL];
         pushyHostRoundResult = committed
             ? PushyHostResult(@"noUpdate", PushyFromStdString(decision.Get("reason").AsString()), nil, NO)
             : PushyHostResult(@"cancelled", @"reset", nil, NO);
@@ -2609,7 +2752,8 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
                            responseText:responseText
                                 request:body
                                  config:configJson
-                             responseAt:responseAtSeconds];
+                             responseAt:responseAtSeconds
+                              activated:NULL];
         pushyHostRoundResult = committed
             ? PushyHostResult(@"failed", @"download_failed", nil, NO)
             : PushyHostResult(@"cancelled", @"reset", nil, NO);
@@ -2639,15 +2783,21 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
     // remote override — the brick rescue) activate for the next launch;
     // otherwise activation stays with the JS side (§6/§10.1). Unless a crash
     // is being held: JS is dead, deferring to it would leave the fix on disk
-    // forever (§11.3).
-    BOOL activate = decision.Get("activate").Truthy() || pushyCrashRescueActive.load();
+    // forever (§11.3). Or the launch is blocked on reinstalling a version
+    // tvOS purged: JS has not started, and the whole point is to boot it —
+    // commitRoundWithGeneration drops that one once the restore window closed.
+    BOOL activate = decision.Get("activate").Truthy() || pushyCrashRescueActive.load()
+        || pushyPurgeRestoreActive.load();
+    BOOL activated = NO;
     BOOL committed = [self commitRoundWithGeneration:resetGeneration
                                             hashInfo:@{@"hash": hash, @"info": versionInfo}
                                             activate:activate ? hash : nil
                                         responseText:responseText
                                              request:body
                                               config:configJson
-                                          responseAt:responseAtSeconds];
+                                          responseAt:responseAtSeconds
+                                           activated:&activated];
+    activate = activated;
     if (!committed) {
         RCTLogInfo(@"RCTPushy -- native check: reset during round, dropping result");
     } else if (activate) {
@@ -2680,7 +2830,8 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
                      responseText:(NSString *)responseText
                           request:(NSString *)requestBody
                            config:(NSString *)configJson
-                       responseAt:(long long)responseAtSeconds {
+                       responseAt:(long long)responseAtSeconds
+                        activated:(BOOL *)activatedOut {
     // responseText is nil for the crash handler's activation-only commit
     // (activatePendingVersion): no round ran, so there is no cache to write.
     NSData *cacheData = nil;
@@ -2694,13 +2845,31 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
         cacheData = [NSJSONSerialization dataWithJSONObject:cacheEntry options:0 error:nil];
     }
     __block BOOL committed = NO;
+    __block BOOL activated = NO;
     PushyWithStateLock(^{
         if (pushyResetGeneration.load() != generation) {
             return;
         }
+        NSString *activation = hashToActivate;
+        NSDictionary *info = hashInfoEntry[@"info"];
+        // The tvOS purged-version restore round (a round commit, not the
+        // crash handler's activation-only one): it may take over this launch
+        // only while +bundleURL still waits for it; after that the version is
+        // left to JS unless a crash is being held (JS is dead then).
+        if (responseText != nil && pushyPurgeRestoreActive.load()) {
+            if (pushyPurgeRestoreWindowOpen) {
+                if (activation != nil && info != nil) {
+                    NSMutableDictionary *marked = [info mutableCopy];
+                    marked[@"purgeRestore"] = @YES;
+                    info = marked;
+                }
+            } else if (!pushyCrashRescueActive.load()) {
+                activation = nil;
+            }
+        }
         NSUserDefaults *defaults = PushyDefaults();
         if (hashInfoEntry != nil) {
-            NSData *infoData = [NSJSONSerialization dataWithJSONObject:hashInfoEntry[@"info"]
+            NSData *infoData = [NSJSONSerialization dataWithJSONObject:info
                                                               options:0
                                                                 error:nil];
             if (infoData != nil) {
@@ -2708,8 +2877,9 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
                              forKey:PushyHashInfoKey(hashInfoEntry[@"hash"])];
             }
         }
-        if (hashToActivate != nil) {
-            PushySwitchVersionLocked(hashToActivate);
+        if (activation != nil) {
+            PushySwitchVersionLocked(activation);
+            activated = YES;
         }
         if (cacheData != nil) {
             [defaults setObject:[[NSString alloc] initWithData:cacheData encoding:NSUTF8StringEncoding]
@@ -2717,6 +2887,9 @@ static BOOL PushyIsValidCheckResponse(NSString *responseText) {
         }
         committed = YES;
     });
+    if (activatedOut != NULL) {
+        *activatedOut = activated;
+    }
     return committed;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.57.1",
+  "version": "10.58.1",
   "description": "react-native hot update",
   "main": "src/index",
   "types": "src/index.ts",
@@ -72,7 +72,7 @@
   },
   "peerDependencies": {
     "react": ">=16.8.0",
-    "react-native": ">=0.59.0"
+    "react-native": "*"
   },
   "homepage": "https://github.com/reactnativecn/react-native-update#readme",
   "dependencies": {

package/react-native-update.podspec

@@ -20,6 +20,15 @@ Pod::Spec.new do |s|
      # Silently ignore errors during check
   end
 
+  # expo-modules-core is a dependency of expo, not of the app: resolve it from
+  # expo's own location. A bare require from this podspec's directory misses
+  # it when npm nests it under expo/node_modules (seen with react-native-tvos),
+  # which left EXPO_SUPPORTS_BUNDLEURL unset; the createBridge fallback that
+  # selects no longer exists in ExpoModulesCore (SDK 57), so the build failed.
+  expo_modules_core_package_json_js =
+    "require.resolve('expo-modules-core/package.json', " \
+    "{ paths: [require('path').dirname(require.resolve('expo/package.json'))] })"
+
   # Determine final validity by checking Podfile presence AND Expo version
   valid_expo_project = false # Default
   if is_expo_in_podfile
@@ -55,7 +64,7 @@ Pod::Spec.new do |s|
     # --- Try to find and parse ExpoModulesCore.podspec only if it's an Expo project ---
     parsed_expo_ios_target = nil
     expo_modules_core_podspec_path = begin
-        package_json_path = `node -p "require.resolve('expo-modules-core/package.json')"`.strip
+        package_json_path = `node -p "#{expo_modules_core_package_json_js}"`.strip
         File.join(File.dirname(package_json_path), 'ExpoModulesCore.podspec') if $?.success? && package_json_path && !package_json_path.empty?
     rescue
         nil
@@ -82,7 +91,10 @@ Pod::Spec.new do |s|
     end
   end
 
-  s.platforms = { :ios => final_ios_deployment_target }
+  # tvOS (react-native-tvos) shares the iOS sources; the only platform
+  # differences live behind TARGET_OS_TV in RCTPushy.mm (download directory,
+  # purged-cache recovery).
+  s.platforms = { :ios => final_ios_deployment_target, :tvos => final_ios_deployment_target }
 
   s.name         = package['name']
   s.version      = package['version']
@@ -178,8 +190,7 @@ Pod::Spec.new do |s|
 
     # 1. Try executing node to get the version string
     expo_modules_core_version_str = begin
-      # Use node to directly require expo-modules-core/package.json and get its version
-      `node --print \"require('expo-modules-core/package.json').version\"` # Execute, keep raw output
+      `node --print "require(#{expo_modules_core_package_json_js}).version"` # Execute, keep raw output
     rescue
       # Node command failed (e.g., node not found, package not found). Return empty string.
       ''

package/src/client.ts

@@ -742,8 +742,8 @@ export class Pushy {
       let timer: ReturnType<typeof setTimeout> | undefined;
       await Promise.race([
         this.loggerPromise.promise,
-        new Promise((resolve) => {
-          timer = setTimeout(resolve, 10 * 1000);
+        new Promise<void>((resolve) => {
+          timer = setTimeout(() => resolve(), 10 * 1000);
         }),
       ]);
       clearTimeout(timer);
@@ -977,8 +977,9 @@ export class Pushy {
   ) => {
     const resp = await fetchWithTimeout(
       this.getCheckUrl(endpoint),
-      signal ? { ...fetchPayload, signal } : fetchPayload,
-      DEFAULT_FETCH_TIMEOUT_MS
+      fetchPayload,
+      DEFAULT_FETCH_TIMEOUT_MS,
+      signal
     );
 
     if (!resp.ok) {
@@ -1532,7 +1533,7 @@ export class Pushy {
             (0.75 + Math.random() * 0.5)
         );
         log(`retry attempt ${attempt}/${maxRetries}, waiting ${backoffMs}ms`);
-        await new Promise((r) => setTimeout(r, backoffMs));
+        await new Promise<void>((r) => setTimeout(() => r(), backoffMs));
         errorMessages.length = 0;
         errorMessages.push(...exhaustedStrategies.values());
         lastError = undefined;

package/src/core.ts

@@ -3,6 +3,12 @@ import { UpdateError } from './error';
 import i18n from './i18n';
 import { emptyModule, error, log } from './utils';
 
+// RN's JS global object. Declared locally because RN 0.87's own typings no
+// longer define `global` (only @types/node did), and this source is
+// type-checked in consumer projects; the module-scoped declaration also
+// shadows @types/node's without conflicting.
+declare const global: any;
+
 /* eslint-disable @react-native/no-deep-imports */
 const {
   version: v,
@@ -10,7 +16,7 @@ const {
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
 const isTurboModuleEnabled =
   // https://github.com/facebook/react-native/pull/48362
-  (global as any).__turboModuleProxy || (global as any).RN$Bridgeless;
+  global.__turboModuleProxy || global.RN$Bridgeless;
 
 const isWebPlatform = Platform.OS === 'web';
 
@@ -164,7 +170,9 @@ if (!uuid) {
 export const cInfo = {
   rnu: require('../package.json').version,
   rn: RNVersion,
-  os: `${Platform.OS} ${Platform.Version}`,
+  // tvOS reports Platform.OS 'ios'; label it apart so the server can bucket
+  // tvOS devices separately. Must match PushyOsName in RCTPushy.mm.
+  os: `${Platform.OS === 'ios' && Platform.isTV ? 'tvos' : Platform.OS} ${Platform.Version}`,
   uuid,
 };
 

package/src/metadata.ts

@@ -46,9 +46,12 @@ export interface UpdateMetadata {
   /**
    * How the running version got activated when not by the JS flow:
    * 'forceBoot' — the server's per-version override applied by the native
-   * cold-start check; 'crashRescue' — activated by the crash-time rescue.
+   * cold-start check; 'crashRescue' — activated by the crash-time rescue;
+   * 'purgeRestore' — reinstalled at launch after tvOS purged the cache.
+   * Several can apply to one activation (a purge restore of a forceBoot
+   * version); this reports the highest-priority one, in the order listed.
    */
-  rescueSource: 'forceBoot' | 'crashRescue' | null;
+  rescueSource: 'forceBoot' | 'crashRescue' | 'purgeRestore' | null;
   /** Stable per-install client id (gray-release bucketing key). */
   uuid: string;
   os: string;
@@ -74,7 +77,9 @@ export function getUpdateMetadata(): UpdateMetadata {
       ? 'forceBoot'
       : info.crashRescue
         ? 'crashRescue'
-        : null,
+        : info.purgeRestore
+          ? 'purgeRestore'
+          : null,
     uuid: cInfo.uuid,
     os: cInfo.os,
   };

package/src/utils.ts

@@ -132,7 +132,11 @@ export const computeProgress = (received: number, total: number): number =>
 export const fetchWithTimeout = (
   url: string,
   params: Parameters<typeof fetch>[1],
-  timeoutMs = DEFAULT_FETCH_TIMEOUT_MS
+  timeoutMs = DEFAULT_FETCH_TIMEOUT_MS,
+  // Taken apart from params: merging it into the RequestInit only type-checks
+  // when the global AbortSignal and fetch's RequestInit come from the same
+  // declarations, which RN 0.87 globals mixed with DOM/Node/bun types break.
+  signal?: AbortSignal
 ): Promise<Response> => {
   // AbortController landed in the RN fetch polyfill around 0.60; we support
   // older peers, so fall back to a plain timer race when it is unavailable
@@ -161,7 +165,8 @@ export const fetchWithTimeout = (
   // The timeout controller replaces params.signal on the fetch call, so a
   // caller-provided signal (e.g. the hedged endpoint race cancelling losers)
   // must be chained onto it manually.
-  const externalSignal = (params as any)?.signal as AbortSignal | undefined;
+  const externalSignal =
+    signal ?? ((params as any)?.signal as AbortSignal | undefined);
   const onExternalAbort = () => controller.abort();
   if (externalSignal?.aborted) {
     controller.abort();