@hot-updater/react-native 1.0.0-rc.2 → 1.0.0-rc.22

package/ios/HotUpdater/Internal/BundleMetadata.swift

@@ -84,6 +84,7 @@ public struct BundleMetadata: Codable {
     var stableSelection: PersistedSelection?
     var stagingSelection: PersistedSelection?
     var verificationPending: Bool
+    var launchInProgress: Bool
     var pendingTransition: PendingBundleTransition?
     var pendingSelectionTransition: PendingSelectionTransition?
     var highestSeenCatalogs: [String: CatalogHighWater]
@@ -98,6 +99,7 @@ public struct BundleMetadata: Codable {
         case stableSelection = "stable_selection"
         case stagingSelection = "staging_selection"
         case verificationPending = "verification_pending"
+        case launchInProgress = "launch_in_progress"
         case pendingTransition = "pending_transition"
         case pendingSelectionTransition = "pending_selection_transition"
         case highestSeenCatalogs = "highest_seen_catalogs"
@@ -113,6 +115,7 @@ public struct BundleMetadata: Codable {
         stableSelection: PersistedSelection? = nil,
         stagingSelection: PersistedSelection? = nil,
         verificationPending: Bool = false,
+        launchInProgress: Bool = false,
         pendingTransition: PendingBundleTransition? = nil,
         pendingSelectionTransition: PendingSelectionTransition? = nil,
         highestSeenCatalogs: [String: CatalogHighWater] = [:],
@@ -126,6 +129,7 @@ public struct BundleMetadata: Codable {
         self.stableSelection = stableSelection
         self.stagingSelection = stagingSelection
         self.verificationPending = verificationPending
+        self.launchInProgress = launchInProgress
         self.pendingTransition = pendingTransition
         self.pendingSelectionTransition = pendingSelectionTransition
         self.highestSeenCatalogs = highestSeenCatalogs
@@ -144,6 +148,7 @@ public struct BundleMetadata: Codable {
         stagingSelection = try values.decodeIfPresent(PersistedSelection.self, forKey: .stagingSelection)
             ?? stagingBundleId.map(PersistedSelection.legacyBundle)
         verificationPending = try values.decodeIfPresent(Bool.self, forKey: .verificationPending) ?? false
+        launchInProgress = try values.decodeIfPresent(Bool.self, forKey: .launchInProgress) ?? false
         pendingTransition = try values.decodeIfPresent(PendingBundleTransition.self, forKey: .pendingTransition)
         pendingSelectionTransition = try values.decodeIfPresent(PendingSelectionTransition.self, forKey: .pendingSelectionTransition)
         highestSeenCatalogs = try values.decodeIfPresent([String: CatalogHighWater].self, forKey: .highestSeenCatalogs) ?? [:]
@@ -378,6 +383,8 @@ public struct LaunchReport: Codable {
     }
 }
 
+/// The random id created once per app installation. It lives in
+/// `NoBackupStorage`, so a device backup never carries it to another device.
 public struct InstallIdentity: Codable {
     static let installIdentityFilename = "install-identity.json"
 
@@ -407,11 +414,7 @@ public struct InstallIdentity: Codable {
             let encoder = JSONEncoder()
             encoder.outputFormatting = .prettyPrinted
             let data = try encoder.encode(self)
-            let directory = file.deletingLastPathComponent()
-            if !FileManager.default.fileExists(atPath: directory.path) {
-                try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
-            }
-            try data.write(to: file)
+            try NoBackupStorage.write(data, to: file)
             return true
         } catch {
             print("[InstallIdentity] Failed to save install identity: \(error)")
@@ -419,51 +422,3 @@ public struct InstallIdentity: Codable {
         }
     }
 }
-
-public struct UserIdentity: Codable {
-    static let userIdentityFilename = "user-identity.json"
-
-    let userId: String?
-    let username: String?
-
-    init(userId: String?, username: String?) {
-        self.userId = userId
-        self.username = username
-    }
-
-    var isEmpty: Bool {
-        userId == nil && username == nil
-    }
-
-    static func load(from file: URL) -> UserIdentity? {
-        guard FileManager.default.fileExists(atPath: file.path) else {
-            return nil
-        }
-
-        do {
-            let data = try Data(contentsOf: file)
-            let identity = try JSONDecoder().decode(UserIdentity.self, from: data)
-            return identity.isEmpty ? nil : identity
-        } catch {
-            print("[UserIdentity] Failed to load user identity: \(error)")
-            return nil
-        }
-    }
-
-    func save(to file: URL) -> Bool {
-        do {
-            let encoder = JSONEncoder()
-            encoder.outputFormatting = .prettyPrinted
-            let data = try encoder.encode(self)
-            let directory = file.deletingLastPathComponent()
-            if !FileManager.default.fileExists(atPath: directory.path) {
-                try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
-            }
-            try data.write(to: file)
-            return true
-        } catch {
-            print("[UserIdentity] Failed to save user identity: \(error)")
-            return false
-        }
-    }
-}

package/ios/HotUpdater/Internal/FileManagerService.swift

@@ -17,6 +17,45 @@ protocol FileSystemService {
     func contentsOfDirectory(atPath path: String) throws -> [String]
     func attributesOfItem(atPath path: String) throws -> [FileAttributeKey: Any]
     func documentsPath() -> String
+    /// Base directory for data that lives as long as the installation.
+    func applicationSupportPath() -> String
+}
+
+/// `Application Support/HotUpdater`: data the SDK keeps for the life of an
+/// installation, such as the install id and plugin storage. Device backups
+/// skip it, so restoring a backup onto another device never copies it there.
+enum NoBackupStorage {
+    static let directoryName = "HotUpdater"
+
+    static func directory(in fileSystem: FileSystemService) -> URL {
+        URL(fileURLWithPath: fileSystem.applicationSupportPath(), isDirectory: true)
+            .appendingPathComponent(directoryName, isDirectory: true)
+    }
+
+    /// Atomically replaces `file` with `data`, creating its directory when
+    /// needed, and excludes the directory and the file from device backups.
+    static func write(_ data: Data, to file: URL) throws {
+        let directory = file.deletingLastPathComponent()
+        try FileManager.default.createDirectory(
+            at: directory,
+            withIntermediateDirectories: true
+        )
+        excludeFromBackup(directory)
+        try data.write(to: file, options: .atomic)
+        // An atomic write replaces the file, which drops its previous flag.
+        excludeFromBackup(file)
+    }
+
+    static func excludeFromBackup(_ url: URL) {
+        var url = url
+        var values = URLResourceValues()
+        values.isExcludedFromBackup = true
+        do {
+            try url.setResourceValues(values)
+        } catch {
+            NSLog("[NoBackupStorage] Failed to exclude \(url.path) from backups: \(error)")
+        }
+    }
 }
 
 class FileManagerService: FileSystemService {
@@ -89,4 +128,13 @@ class FileManagerService: FileSystemService {
         return NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
         #endif
     }
+
+    func applicationSupportPath() -> String {
+        #if os(tvOS)
+        // tvOS apps can only write purgeable files, so use Caches like documentsPath().
+        return NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0]
+        #else
+        return NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true)[0]
+        #endif
+    }
 }

package/ios/HotUpdater/Internal/FileUtilities.swift

@@ -0,0 +1,64 @@
+import Foundation
+
+enum FileUtilities {
+    static func readUpToCount(from handle: FileHandle, count: Int) throws -> Data? {
+        guard count >= 0 else {
+            throw NSError(
+                domain: "FileUtilities",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "Invalid read size: \(count)"]
+            )
+        }
+
+        if count == 0 {
+            return Data()
+        }
+
+        if #available(macOS 10.15.4, iOS 13.4, watchOS 6.2, tvOS 13.4, *) {
+            return try handle.read(upToCount: count)
+        }
+
+        return handle.readData(ofLength: count)
+    }
+
+    static func normalizedRelativePath(from rawPath: String) -> String? {
+        let candidate = rawPath.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !candidate.isEmpty,
+              !candidate.contains("\0"),
+              !candidate.contains("\\"),
+              !candidate.hasPrefix("/"),
+              candidate.range(of: #"^[A-Za-z]:"#, options: .regularExpression) == nil
+        else {
+            return nil
+        }
+
+        let components = candidate.split(separator: "/").map(String.init)
+        guard !components.isEmpty,
+              components.count == candidate.split(separator: "/", omittingEmptySubsequences: false).count,
+              !components.contains(".."),
+              !components.contains(".")
+        else {
+            return nil
+        }
+
+        return components.joined(separator: "/")
+    }
+
+    static func fileURL(for relativePath: String, destinationRoot: String) throws -> URL {
+        let rootURL = URL(fileURLWithPath: destinationRoot, isDirectory: true)
+        let targetURL = rootURL.appendingPathComponent(relativePath)
+        let standardizedRoot = rootURL.standardizedFileURL.path
+        let standardizedTarget = targetURL.standardizedFileURL.path
+
+        guard standardizedTarget == standardizedRoot ||
+                standardizedTarget.hasPrefix(standardizedRoot + "/") else {
+            throw NSError(
+                domain: "FileUtilities",
+                code: 2,
+                userInfo: [NSLocalizedDescriptionKey: "Path traversal attempt detected: \(relativePath)"]
+            )
+        }
+
+        return targetURL
+    }
+}

package/ios/HotUpdater/Internal/HotUpdater-Bridging-Header.h

@@ -7,7 +7,6 @@
 #import "React/RCTConstants.h"
 #import "React/RCTRootView.h"
 #import "React/RCTUtils.h" // Needed for RCTPromiseResolveBlock/RejectBlock in Swift
-#import <SSZipArchive/SSZipArchive.h>
 #import "BsdiffPatchBridge.h"
 
 @interface HotUpdaterRecoverySignalBridge : NSObject

package/ios/HotUpdater/Internal/HotUpdater.mm

@@ -274,8 +274,6 @@ extern "C" void *HotUpdaterCopyMinBundleId(void)
 
 
 // Define Notification names used for observing Swift Core
-NSNotificationName const HotUpdaterDownloadProgressUpdateNotification = @"HotUpdaterDownloadProgressUpdate";
-NSNotificationName const HotUpdaterDownloadDidFinishNotification = @"HotUpdaterDownloadDidFinish";
 NSNotificationName const HotUpdaterUpdateProgressDidChangeNotification = @"HotUpdaterUpdateProgressDidChange";
 
 @interface HotUpdaterRecoverySignalBridge : NSObject
@@ -300,8 +298,6 @@ NSNotificationName const HotUpdaterUpdateProgressDidChangeNotification = @"HotUp
 
 @implementation HotUpdater {
     bool hasListeners;
-    // Keep track of tasks ONLY for removing observers when this ObjC instance is invalidated
-    NSMutableSet<NSURLSessionTask *> *observedTasks; // Changed to NSURLSessionTask for broader compatibility if needed
 }
 
 @synthesize bridge = _bridge;
@@ -314,16 +310,10 @@ NSNotificationName const HotUpdaterUpdateProgressDidChangeNotification = @"HotUp
 - (instancetype)init {
     self = [super init];
     if (self) {
-        observedTasks = [NSMutableSet set];
-
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(handleDownloadProgress:)
                                                      name:HotUpdaterUpdateProgressDidChangeNotification
                                                    object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                                 selector:@selector(handleDownloadCompletion:)
-                                                     name:HotUpdaterDownloadDidFinishNotification
-                                                   object:nil];
 
         _lastUpdateTime = 0;
     }
@@ -349,7 +339,6 @@ NSNotificationName const HotUpdaterUpdateProgressDidChangeNotification = @"HotUp
     if (gHotUpdaterBridge == self.bridge) {
         gHotUpdaterBridge = nil;
     }
-    // Swift side should handle KVO observer removal for its tasks
     [super invalidate];
 }
 
@@ -520,14 +509,6 @@ RCT_EXPORT_MODULE();
      }
  }
 
-- (void)handleDownloadCompletion:(NSNotification *)notification {
-      NSURLSessionTask *task = notification.object; // Task that finished
-      RCTLogInfo(@"[HotUpdater.mm] Received download completion notification for task: %@", task.originalRequest.URL);
-      // Swift side handles KVO observer removal internally now when task finishes.
-      // No specific cleanup needed here based on this notification anymore.
-}
-
-
 #pragma mark - React Native Events (Keep as is)
 
 - (NSArray<NSString *> *)supportedEvents {
@@ -594,20 +575,17 @@ RCT_EXPORT_MODULE();
     if (params.bundleId()) {
         paramDict[@"bundleId"] = params.bundleId();
     }
-    if (params.fileUrl()) {
-        paramDict[@"fileUrl"] = params.fileUrl();
-    }
-    if (params.fileHash()) {
-        paramDict[@"fileHash"] = params.fileHash();
-    }
     if (params.manifestUrl()) {
         paramDict[@"manifestUrl"] = params.manifestUrl();
     }
     if (params.manifestFileHash()) {
         paramDict[@"manifestFileHash"] = params.manifestFileHash();
     }
-    if (params.changedAssets()) {
-        paramDict[@"changedAssets"] = params.changedAssets();
+    if (params.archiveUrl()) {
+        paramDict[@"archiveUrl"] = params.archiveUrl();
+    }
+    if (params.assets()) {
+        paramDict[@"assets"] = params.assets();
     }
     if (params.channel()) {
         paramDict[@"channel"] = params.channel();
@@ -682,19 +660,14 @@ RCT_EXPORT_MODULE();
     return [impl getInstallId];
 }
 
-- (NSString * _Nullable)getUserId {
-    HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    return [impl getUserId];
-}
-
-- (NSString * _Nullable)getUsername {
+- (NSString * _Nullable)getStorageItem:(NSString *)key {
     HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    return [impl getUsername];
+    return [impl getStorageItem:key];
 }
 
-- (void)setUser:(NSString * _Nullable)userId username:(NSString * _Nullable)username {
+- (void)setStorageItem:(NSString *)key value:(NSString * _Nullable)value {
     HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    [impl setUser:userId username:username];
+    [impl setStorageItem:key value:value];
 }
 
 - (NSString * _Nullable)getBaseURL {
@@ -852,19 +825,14 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getInstallId) {
     return [impl getInstallId];
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getUserId) {
-    HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    return [impl getUserId];
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getUsername) {
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getStorageItem:(NSString *)key) {
     HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    return [impl getUsername];
+    return [impl getStorageItem:key];
 }
 
-RCT_EXPORT_METHOD(setUser:(NSString * _Nullable)userId username:(NSString * _Nullable)username) {
+RCT_EXPORT_METHOD(setStorageItem:(NSString *)key value:(NSString * _Nullable)value) {
     HotUpdaterImpl *impl = [HotUpdater sharedImpl];
-    [impl setUser:userId username:username];
+    [impl setStorageItem:key value:value];
 }
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getBaseURL) {