@hot-updater/react-native 0.18.1 → 0.18.3

package/android/src/main/java/com/hotupdater/BundleFileStorageService.kt

@@ -88,6 +88,7 @@ class BundleFileStorageService(
     ): Boolean {
         Log.d("BundleStorage", "updateBundle bundleId $bundleId fileUrl $fileUrl")
 
+        // If no URL is provided, reset to fallback
         if (fileUrl.isNullOrEmpty()) {
             setBundleURL(null)
             return true
@@ -104,11 +105,13 @@ class BundleFileStorageService(
             Log.d("BundleStorage", "Bundle for bundleId $bundleId already exists. Using cached bundle.")
             val existingIndexFile = finalBundleDir.walk().find { it.name == "index.android.bundle" }
             if (existingIndexFile != null) {
+                // Update last modified time and set the cached bundle URL
                 finalBundleDir.setLastModified(System.currentTimeMillis())
                 setBundleURL(existingIndexFile.absolutePath)
                 cleanupOldBundles(bundleStoreDir)
                 return true
             } else {
+                // If index.android.bundle is missing, delete and re-download
                 finalBundleDir.deleteRecursively()
             }
         }
@@ -120,8 +123,6 @@ class BundleFileStorageService(
         tempDir.mkdirs()
 
         val tempZipFile = File(tempDir, "bundle.zip")
-        val extractedDir = File(tempDir, "extracted")
-        extractedDir.mkdirs()
 
         return withContext(Dispatchers.IO) {
             val downloadUrl = URL(fileUrl)
@@ -141,60 +142,96 @@ class BundleFileStorageService(
                     return@withContext false
                 }
                 is DownloadResult.Success -> {
-                    // Extract the zip file
-                    if (!unzipService.extractZipFile(tempZipFile.absolutePath, extractedDir.absolutePath)) {
-                        Log.d("BundleStorage", "Failed to extract zip file.")
+                    // 1) Create a .tmp directory under bundle-store (to avoid colliding with an existing bundleId folder)
+                    val tmpDir = File(bundleStoreDir, "$bundleId.tmp")
+                    if (tmpDir.exists()) {
+                        tmpDir.deleteRecursively()
+                    }
+                    tmpDir.mkdirs()
+
+                    // 2) Unzip into tmpDir
+                    Log.d("BundleStorage", "Unzipping $tempZipFile → $tmpDir")
+                    if (!unzipService.extractZipFile(tempZipFile.absolutePath, tmpDir.absolutePath)) {
+                        Log.d("BundleStorage", "Failed to extract zip into tmpDir.")
                         tempDir.deleteRecursively()
+                        tmpDir.deleteRecursively()
                         return@withContext false
                     }
 
-                    // Find the bundle file
-                    val indexFileExtracted = extractedDir.walk().find { it.name == "index.android.bundle" }
-                    if (indexFileExtracted == null) {
-                        Log.d("BundleStorage", "index.android.bundle not found in extracted files.")
+                    // 3) Find index.android.bundle inside tmpDir
+                    val extractedIndex = tmpDir.walk().find { it.name == "index.android.bundle" }
+                    if (extractedIndex == null) {
+                        Log.d("BundleStorage", "index.android.bundle not found in tmpDir.")
                         tempDir.deleteRecursively()
+                        tmpDir.deleteRecursively()
                         return@withContext false
                     }
 
-                    // Move to final location
+                    // 4) If the realDir (bundle-store/<bundleId>) exists, delete it
                     if (finalBundleDir.exists()) {
                         finalBundleDir.deleteRecursively()
                     }
 
-                    if (!fileSystem.moveItem(extractedDir.absolutePath, finalBundleDir.absolutePath)) {
-                        fileSystem.copyItem(extractedDir.absolutePath, finalBundleDir.absolutePath)
-                        extractedDir.deleteRecursively()
+                    // 5) Attempt to rename tmpDir → finalBundleDir (atomic within the same parent folder)
+                    val renamed = tmpDir.renameTo(finalBundleDir)
+                    if (!renamed) {
+                        // If rename fails, use moveItem or copyItem
+                        if (!fileSystem.moveItem(tmpDir.absolutePath, finalBundleDir.absolutePath)) {
+                            fileSystem.copyItem(tmpDir.absolutePath, finalBundleDir.absolutePath)
+                            tmpDir.deleteRecursively()
+                        }
                     }
 
+                    // 6) Verify index.android.bundle exists inside finalBundleDir
                     val finalIndexFile = finalBundleDir.walk().find { it.name == "index.android.bundle" }
                     if (finalIndexFile == null) {
-                        Log.d("BundleStorage", "index.android.bundle not found in final directory.")
+                        Log.d("BundleStorage", "index.android.bundle not found in realDir.")
                         tempDir.deleteRecursively()
+                        finalBundleDir.deleteRecursively()
                         return@withContext false
                     }
 
+                    // 7) Update finalBundleDir's last modified time
                     finalBundleDir.setLastModified(System.currentTimeMillis())
+
+                    // 8) Save the new bundle path in Preferences
                     val bundlePath = finalIndexFile.absolutePath
                     Log.d("BundleStorage", "Setting bundle URL: $bundlePath")
                     setBundleURL(bundlePath)
-                    cleanupOldBundles(bundleStoreDir)
+
+                    // 9) Clean up temporary and download folders
                     tempDir.deleteRecursively()
 
-                    Log.d("BundleStorage", "Downloaded and extracted file successfully.")
+                    // 10) Remove old bundles
+                    cleanupOldBundles(bundleStoreDir)
+
+                    Log.d("BundleStorage", "Downloaded and activated bundle successfully.")
                     return@withContext true
                 }
             }
         }
     }
 
+    /**
+     * Removes older bundles and any leftover .tmp directories
+     */
     private fun cleanupOldBundles(bundleStoreDir: File) {
-        val bundles = bundleStoreDir.listFiles { file -> file.isDirectory }?.toList() ?: return
+        // List only directories that are not .tmp
+        val bundles = bundleStoreDir.listFiles { file -> file.isDirectory && !file.name.endsWith(".tmp") }?.toList() ?: return
+        // Sort bundles by last modified (newest first)
         val sortedBundles = bundles.sortedByDescending { it.lastModified() }
         if (sortedBundles.size > 1) {
+            // Keep the most recent bundle, delete the rest
             sortedBundles.drop(1).forEach { oldBundle ->
                 Log.d("BundleStorage", "Removing old bundle: ${oldBundle.name}")
                 oldBundle.deleteRecursively()
             }
         }
+
+        // Remove any leftover .tmp directories
+        bundleStoreDir.listFiles { file -> file.isDirectory && file.name.endsWith(".tmp") }?.forEach { staleTmp ->
+            Log.d("BundleStorage", "Removing stale tmp directory: ${staleTmp.name}")
+            staleTmp.deleteRecursively()
+        }
     }
 }

package/android/src/main/java/com/hotupdater/HotUpdaterFactory.kt

@@ -27,10 +27,11 @@ object HotUpdaterFactory {
     private fun createHotUpdaterImpl(context: Context): HotUpdaterImpl {
         val appContext = context.applicationContext
         val appVersion = HotUpdaterImpl.getAppVersion(appContext) ?: "unknown"
+        val appChannel = HotUpdaterImpl.getChannel(appContext)
 
         // Create services
         val fileSystem = FileManagerService(appContext)
-        val preferences = VersionedPreferencesService(appContext, appVersion)
+        val preferences = VersionedPreferencesService(appContext, appVersion, appChannel)
         val downloadService = HttpDownloadService()
         val unzipService = ZipFileUnzipService()
 

package/android/src/main/java/com/hotupdater/HotUpdaterImpl.kt

@@ -57,6 +57,15 @@ class HotUpdaterImpl(
             } catch (e: Exception) {
                 null
             }
+
+        fun getChannel(context: Context): String {
+            val id = context.resources.getIdentifier("hot_updater_channel", "string", context.packageName)
+            return if (id != 0) {
+                context.getString(id).takeIf { it.isNotEmpty() } ?: DEFAULT_CHANNEL
+            } else {
+                DEFAULT_CHANNEL
+            }
+        }
     }
 
     /**

package/android/src/main/java/com/hotupdater/VersionedPreferencesService.kt

@@ -33,11 +33,12 @@ interface PreferencesService {
 class VersionedPreferencesService(
     private val context: Context,
     private val appVersion: String,
+    private val appChannel: String,
 ) : PreferencesService {
     private val prefs: SharedPreferences
 
     init {
-        val prefsName = "HotUpdaterPrefs_$appVersion"
+        val prefsName = "HotUpdaterPrefs_${appVersion}_$appChannel"
 
         val sharedPrefsDir = File(context.applicationInfo.dataDir, "shared_prefs")
         if (sharedPrefsDir.exists() && sharedPrefsDir.isDirectory) {

package/ios/HotUpdater/Internal/BundleFileStorageService.swift

@@ -196,7 +196,12 @@ class BundleFileStorageService: BundleStorageService {
             for item in contents {
                 let fullPath = (storeDir as NSString).appendingPathComponent(item)
                 
-                if fullPath == currentBundlePath {
+                // Skip .tmp directories
+                if item.hasSuffix(".tmp") {
+                    continue
+                }
+                
+                if let currentPath = currentBundlePath, fullPath == currentPath {
                     continue
                 }
                 
@@ -230,6 +235,18 @@ class BundleFileStorageService: BundleStorageService {
             var removedCount = 0
             for item in contents {
                 let fullPath = (storeDir as NSString).appendingPathComponent(item)
+                // Skip .tmp directories as well
+                if item.hasSuffix(".tmp") {
+                    // Clean up any stale .tmp directories
+                    do {
+                        try self.fileSystem.removeItem(atPath: fullPath)
+                        NSLog("[BundleStorage] Removed stale tmp directory: \(fullPath)")
+                    } catch {
+                        NSLog("[BundleStorage] Failed to remove stale tmp directory \(fullPath): \(error)")
+                    }
+                    continue
+                }
+                
                 if !bundlesToKeep.contains(fullPath) {
                     do {
                         try self.fileSystem.removeItem(atPath: fullPath)
@@ -237,7 +254,6 @@ class BundleFileStorageService: BundleStorageService {
                         NSLog("[BundleStorage] Removed old bundle: \(item)")
                     } catch {
                         NSLog("[BundleStorage] Failed to remove old bundle at \(fullPath): \(error)")
-                        // Optionally, collect errors and return a multiple error type or first error
                     }
                 }
             }
@@ -332,7 +348,7 @@ class BundleFileStorageService: BundleStorageService {
             return
         }
         
-        // Start the bundle update process, dispatching the main logic to fileOperationQueue
+        // Start the bundle update process on a background queue
         fileOperationQueue.async {
             let storeDirResult = self.bundleStoreDir()
             guard case .success(let storeDir) = storeDirResult else {
@@ -349,8 +365,6 @@ class BundleFileStorageService: BundleStorageService {
                     if let bundlePath = existingBundlePath {
                         NSLog("[BundleStorage] Using cached bundle at path: \(bundlePath)")
                         do {
-                            try self.fileSystem.setAttributes([.modificationDate: Date()], ofItemAtPath: finalBundleDir)
-                            
                             let setResult = self.setBundleURL(localPath: bundlePath)
                             switch setResult {
                             case .success:
@@ -360,7 +374,7 @@ class BundleFileStorageService: BundleStorageService {
                                     completion(.success(true))
                                 case .failure(let error):
                                     NSLog("[BundleStorage] Warning: Cleanup failed but bundle is set: \(error)")
-                                    completion(.failure(error)) // Or consider .success(true) if main operation succeeded
+                                    completion(.failure(error))
                                 }
                             case .failure(let error):
                                 completion(.failure(error))
@@ -373,9 +387,8 @@ class BundleFileStorageService: BundleStorageService {
                         NSLog("[BundleStorage] Cached directory exists but invalid, removing: \(finalBundleDir)")
                         do {
                             try self.fileSystem.removeItem(atPath: finalBundleDir)
-                            // Continue with download process on success (must be called on a thread that can continue,
-                            // but prepareAndDownloadBundle will manage its own threading for download)
-                            self.prepareAndDownloadBundle(bundleId: bundleId, fileUrl: validFileUrl, finalBundleDir: finalBundleDir, completion: completion)
+                            // Continue with download process on success
+                            self.prepareAndDownloadBundle(bundleId: bundleId, fileUrl: validFileUrl, storeDir: storeDir, completion: completion)
                         } catch let error {
                             NSLog("[BundleStorage] Failed to remove invalid bundle dir: \(error.localizedDescription)")
                             completion(.failure(BundleStorageError.fileSystemError(error)))
@@ -385,7 +398,7 @@ class BundleFileStorageService: BundleStorageService {
                     completion(.failure(error))
                 }
             } else {
-                self.prepareAndDownloadBundle(bundleId: bundleId, fileUrl: validFileUrl, finalBundleDir: finalBundleDir, completion: completion)
+                self.prepareAndDownloadBundle(bundleId: bundleId, fileUrl: validFileUrl, storeDir: storeDir, completion: completion)
             }
         }
     }
@@ -395,46 +408,44 @@ class BundleFileStorageService: BundleStorageService {
      * This method is part of the asynchronous `updateBundle` flow.
      * @param bundleId ID of the bundle to update
      * @param fileUrl URL of the bundle file to download
-     * @param finalBundleDir Final directory for the bundle
+     * @param storeDir Path to the bundle-store directory
      * @param completion Callback with result of the operation
      */
-    private func prepareAndDownloadBundle(bundleId: String, fileUrl: URL, finalBundleDir: String, completion: @escaping (Result<Bool, Error>) -> Void) {
-        // tempDir() is now synchronous. The rest of this function manages async download.
+    private func prepareAndDownloadBundle(
+        bundleId: String,
+        fileUrl: URL,
+        storeDir: String,
+        completion: @escaping (Result<Bool, Error>) -> Void
+    ) {
+        // 1) Prepare temp directory for download
         let tempDirResult = tempDir()
         guard case .success(let tempDirectory) = tempDirResult else {
             completion(.failure(tempDirResult.failureError ?? BundleStorageError.unknown(nil)))
             return
         }
         
-        // The rest of the operations (cleanup, dir creation, download) should still be on a background thread
-        // This is already within a fileOperationQueue.async block from updateBundle or needs to be if called directly.
-        // For safety, ensure this block runs on the fileOperationQueue if it's not already.
-        // However, prepareAndDownloadBundle is called from an existing fileOperationQueue.async block in updateBundle.
-
-        // Clean up any previous temp dir (sync operation)
+        // 2) Clean up any previous temp dir
         try? self.fileSystem.removeItem(atPath: tempDirectory)
         
-        // Create necessary directories (sync operation)
+        // 3) Create temp dir
         if !self.fileSystem.createDirectory(atPath: tempDirectory) {
             completion(.failure(BundleStorageError.directoryCreationFailed))
             return
         }
         
+        // 4) Define paths for ZIP file
         let tempZipFile = (tempDirectory as NSString).appendingPathComponent("bundle.zip")
-        let extractedDir = (tempDirectory as NSString).appendingPathComponent("extracted")
-        
-        if !self.fileSystem.createDirectory(atPath: extractedDir) {
-            completion(.failure(BundleStorageError.directoryCreationFailed))
-            return
-        }
         
         NSLog("[BundleStorage] Starting download from \(fileUrl)")
         
-        // DownloadService handles its own threading for the download task.
+        // 5) DownloadService handles its own threading for the download task.
         // The completion handler for downloadService.downloadFile is then dispatched to fileOperationQueue.
-        let task = self.downloadService.downloadFile(from: fileUrl, to: tempZipFile, progressHandler: { progress in
-            // Progress updates handled by notification system
-        }, completion: { [weak self] result in
+        let task = self.downloadService.downloadFile(from: fileUrl,
+                                                     to: tempZipFile,
+                                                     progressHandler: { _ in
+                                                         // Progress updates handled by notification system
+                                                     },
+                                                     completion: { [weak self] result in
             guard let self = self else {
                 let error = NSError(domain: "HotUpdaterError", code: 998,
                                     userInfo: [NSLocalizedDescriptionKey: "Self deallocated during download"])
@@ -446,16 +457,12 @@ class BundleFileStorageService: BundleStorageService {
             let workItem = DispatchWorkItem {
                 switch result {
                 case .success(let location):
-                    self.processDownloadedFile(
-                        location: location,
-                        tempZipFile: tempZipFile,
-                        extractedDir: extractedDir,
-                        finalBundleDir: finalBundleDir,
-                        bundleId: bundleId,
-                        tempDirectory: tempDirectory,
-                        completion: completion
-                    )
-                    
+                    self.processDownloadedFileWithTmp(location: location,
+                                                      tempZipFile: tempZipFile,
+                                                      storeDir: storeDir,
+                                                      bundleId: bundleId,
+                                                      tempDirectory: tempDirectory,
+                                                      completion: completion)
                 case .failure(let error):
                     NSLog("[BundleStorage] Download failed: \(error.localizedDescription)")
                     self.cleanupTemporaryFiles([tempDirectory]) // Sync cleanup
@@ -471,30 +478,27 @@ class BundleFileStorageService: BundleStorageService {
     }
     
     /**
-     * Processes a downloaded bundle file.
+     * Processes a downloaded bundle file using the “.tmp” rename approach.
      * This method is part of the asynchronous `updateBundle` flow and is expected to run on a background thread.
      * @param location URL of the downloaded file
      * @param tempZipFile Path to store the downloaded zip file
-     * @param extractedDir Directory to extract contents to
-     * @param finalBundleDir Final directory for the bundle
+     * @param storeDir Path to the bundle-store directory
      * @param bundleId ID of the bundle being processed
      * @param tempDirectory Temporary directory for processing
      * @param completion Callback with result of the operation
      */
-    private func processDownloadedFile(
+    private func processDownloadedFileWithTmp(
         location: URL,
         tempZipFile: String,
-        extractedDir: String,
-        finalBundleDir: String,
+        storeDir: String,
         bundleId: String,
         tempDirectory: String,
         completion: @escaping (Result<Bool, Error>) -> Void
     ) {
         NSLog("[BundleStorage] Processing downloaded file atPath: \(location.path)")
         
-        // 1. Check if source file exists
+        // 1) Ensure the ZIP file exists
         guard self.fileSystem.fileExists(atPath: location.path) else {
-            NSLog("[BundleStorage] Source file does not exist atPath: \(location.path)")
             self.cleanupTemporaryFiles([tempDirectory])
             completion(.failure(BundleStorageError.fileSystemError(NSError(
                 domain: "HotUpdaterError",
@@ -504,80 +508,80 @@ class BundleFileStorageService: BundleStorageService {
             return
         }
         
-        // 2. Create target directory
+        // 2) Define tmpDir and realDir
+        let tmpDir = (storeDir as NSString).appendingPathComponent("\(bundleId).tmp")
+        let realDir = (storeDir as NSString).appendingPathComponent(bundleId)
+        
         do {
-            let tempZipFileURL = URL(fileURLWithPath: tempZipFile)
-            let tempZipFileDirectory = tempZipFileURL.deletingLastPathComponent()
-            
-            if !self.fileSystem.fileExists(atPath: tempZipFileDirectory.path) {
-                try self.fileSystem.createDirectory(atPath: tempZipFileDirectory.path)
-                NSLog("[BundleStorage] Created directory atPath: \(tempZipFileDirectory.path)")
+            // 3) Remove any existing tmpDir
+            if self.fileSystem.fileExists(atPath: tmpDir) {
+                try self.fileSystem.removeItem(atPath: tmpDir)
+                NSLog("[BundleStorage] Removed existing tmpDir: \(tmpDir)")
             }
             
-            try self.fileSystem.moveItem(atPath: location.path, toPath: tempZipFile)
-            NSLog("[BundleStorage] Successfully moved file to: \(tempZipFile)")
+            // 4) Create tmpDir
+            try self.fileSystem.createDirectory(atPath: tmpDir)
+            NSLog("[BundleStorage] Created tmpDir: \(tmpDir)")
             
-            try self.unzipService.unzip(file: tempZipFile, to: extractedDir)
-            NSLog("[BundleStorage] Successfully extracted to: \(extractedDir)")
+            // 5) Unzip directly into tmpDir
+            NSLog("[BundleStorage] Unzipping \(tempZipFile) → \(tmpDir)")
+            try self.unzipService.unzip(file: tempZipFile, to: tmpDir)
+            NSLog("[BundleStorage] Unzip complete at \(tmpDir)")
             
-            // 6. Remove temporary zip file
+            // 6) Remove the downloaded ZIP file
             try? self.fileSystem.removeItem(atPath: tempZipFile)
             
-            // 7. Search for bundle file
-            switch self.findBundleFile(in: extractedDir) {
-            case .success(let bundlePath):
-                if let bundlePath = bundlePath {
-                    NSLog("[BundleStorage] Found bundle atPath: \(bundlePath)")
-                    
-                    // 8. Create final bundle directory
-                    if !self.fileSystem.fileExists(atPath: finalBundleDir) {
-                        try self.fileSystem.createDirectory(atPath: finalBundleDir)
-                        NSLog("[BundleStorage] Created final bundle directory atPath: \(finalBundleDir)")
+            // 7) Verify that a valid bundle file exists inside tmpDir
+            switch self.findBundleFile(in: tmpDir) {
+            case .success(let maybeBundlePath):
+                if let bundlePathInTmp = maybeBundlePath {
+                    // 8) Remove any existing realDir
+                    if self.fileSystem.fileExists(atPath: realDir) {
+                        try self.fileSystem.removeItem(atPath: realDir)
+                        NSLog("[BundleStorage] Removed existing realDir: \(realDir)")
                     }
                     
-                    // 9. Move entire extracted directory to final location
-                    if self.fileSystem.fileExists(atPath: finalBundleDir) {
-                        try self.fileSystem.removeItem(atPath: finalBundleDir)
-                    }
-                    try self.fileSystem.moveItem(atPath: extractedDir, toPath: finalBundleDir)
-                    NSLog("[BundleStorage] Successfully moved entire bundle directory to: \(finalBundleDir)")
+                    // 9) Rename (move) tmpDir → realDir
+                    try self.fileSystem.moveItem(atPath: tmpDir, toPath: realDir)
+                    NSLog("[BundleStorage] Renamed tmpDir to realDir: \(realDir)")
                     
-                    let findResult = self.findBundleFile(in: finalBundleDir)
-                    switch findResult {
-                    case .success(let finalBundlePath):
-                        if let finalBundlePath = finalBundlePath {
-                            let setResult = self.setBundleURL(localPath: finalBundlePath)
-                            switch setResult {
-                            case .success:
-                                // 10. Cleanup
-                                self.cleanupTemporaryFiles([tempDirectory])
-                                completion(.success(true))
-                            case .failure(let error):
-                                self.cleanupTemporaryFiles([tempDirectory])
-                                completion(.failure(error))
-                            }
-                        } else {
-                            NSLog("[BundleStorage] No bundle file found in final directory")
-                            self.cleanupTemporaryFiles([tempDirectory])
-                            completion(.failure(BundleStorageError.invalidBundle))
-                        }
-                    case .failure(let error):
-                        NSLog("[BundleStorage] Error finding bundle file: \(error.localizedDescription)")
+                    // 10) Construct final bundlePath for preferences
+                    let finalBundlePath = (realDir as NSString).appendingPathComponent((bundlePathInTmp as NSString).lastPathComponent)
+                    
+                    // 11) Set the bundle URL in preferences
+                    let setResult = self.setBundleURL(localPath: finalBundlePath)
+                    switch setResult {
+                    case .success:
+                        // 12) Clean up the temporary directory
                         self.cleanupTemporaryFiles([tempDirectory])
-                        completion(.failure(error))
+                        
+                        // 13) Clean up old bundles, preserving current and latest
+                        let _ = self.cleanupOldBundles(currentBundleId: bundleId)
+                        
+                        // 14) Complete with success
+                        completion(.success(true))
+                    case .failure(let err):
+                        // Preferences save failed → remove realDir and clean up
+                        try? self.fileSystem.removeItem(atPath: realDir)
+                        self.cleanupTemporaryFiles([tempDirectory])
+                        completion(.failure(err))
                     }
                 } else {
-                    NSLog("[BundleStorage] No bundle file found in extracted directory")
+                    // No valid .jsbundle found → delete tmpDir and fail
+                    try? self.fileSystem.removeItem(atPath: tmpDir)
                     self.cleanupTemporaryFiles([tempDirectory])
                     completion(.failure(BundleStorageError.invalidBundle))
                 }
-            case .failure(let error):
-                NSLog("[BundleStorage] Error finding bundle file: \(error.localizedDescription)")
+            case .failure(let findError):
+                // Error scanning tmpDir → delete tmpDir and fail
+                try? self.fileSystem.removeItem(atPath: tmpDir)
                 self.cleanupTemporaryFiles([tempDirectory])
-                completion(.failure(error))
+                completion(.failure(findError))
             }
         } catch let error {
-            NSLog("[BundleStorage] Error processing downloaded file: \(error.localizedDescription)")
+            // Any failure during unzip or rename → clean tmpDir and fail
+            NSLog("[BundleStorage] Error during tmpDir processing: \(error)")
+            try? self.fileSystem.removeItem(atPath: tmpDir)
             self.cleanupTemporaryFiles([tempDirectory])
             completion(.failure(BundleStorageError.fileSystemError(error)))
         }
@@ -590,4 +594,4 @@ extension Result {
         guard case .failure(let error) = self else { return nil }
         return error
     }
-}
+}

package/ios/HotUpdater/Internal/FileManagerService.swift

@@ -15,7 +15,6 @@ protocol FileSystemService {
     func moveItem(atPath srcPath: String, toPath dstPath: String) throws
     func copyItem(atPath srcPath: String, toPath dstPath: String) throws
     func contentsOfDirectory(atPath path: String) throws -> [String]
-    func setAttributes(_ attributes: [FileAttributeKey: Any], ofItemAtPath path: String) throws
     func attributesOfItem(atPath path: String) throws -> [FileAttributeKey: Any]
     func documentsPath() -> String
 }
@@ -72,15 +71,6 @@ class FileManagerService: FileSystemService {
             throw FileSystemError.fileOperationFailed(path, error)
         }
     }
-    
-    func setAttributes(_ attributes: [FileAttributeKey: Any], ofItemAtPath path: String) throws {
-        do {
-            try fileManager.setAttributes(attributes, ofItemAtPath: path)
-        } catch let error {
-            NSLog("[FileSystemService] Failed to set attributes for \(path): \(error)")
-            throw FileSystemError.fileOperationFailed(path, error)
-        }
-    }
 
     func attributesOfItem(atPath path: String) throws -> [FileAttributeKey: Any] {
         do {

package/ios/HotUpdater/Internal/HotUpdaterImpl.swift

@@ -4,7 +4,9 @@ import React
 @objcMembers public class HotUpdaterImpl: NSObject {
     private let bundleStorage: BundleStorageService
     private let preferences: PreferencesService
-    
+
+    private static let DEFAULT_CHANNEL = "production"
+
     // MARK: - Initialization
     
     /**
@@ -35,10 +37,13 @@ import React
         self.bundleStorage = bundleStorage
         self.preferences = preferences
         super.init()
-        
+
         // Configure preferences with app version
         if let appVersion = HotUpdaterImpl.appVersion {
-            (preferences as? VersionedPreferencesService)?.configure(appVersion: appVersion)
+            (preferences as? VersionedPreferencesService)?.configure(
+                appVersion: appVersion,
+                appChannel: HotUpdaterImpl.appChannel
+            )
         }
     }
     
@@ -50,15 +55,21 @@ import React
     public static var appVersion: String? {
         return Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
     }
-    
+
+    /**
+     * Returns the app version from main bundle info.
+     */
+    public static var appChannel: String {
+        return Bundle.main.object(forInfoDictionaryKey: "HOT_UPDATER_CHANNEL") as? String ?? Self.DEFAULT_CHANNEL
+    }
+
     // MARK: - Channel Management
     
     /**
      * Gets the current update channel.
      * @return The channel name or nil if not set
      */
-    private static let DEFAULT_CHANNEL = "production"
-    
+
     public func getChannel() -> String {
         return Bundle.main.object(forInfoDictionaryKey: "HOT_UPDATER_CHANNEL") as? String ?? Self.DEFAULT_CHANNEL
     }

package/ios/HotUpdater/Internal/VersionedPreferencesService.swift

@@ -23,8 +23,8 @@ class VersionedPreferencesService: PreferencesService {
      * Configures the service with app version for key prefixing.
      * @param appVersion The app version to use for key prefixing
      */
-    func configure(appVersion: String?) {
-        self.keyPrefix = "hotupdater_\(appVersion ?? "unknown")_"
+    func configure(appVersion: String?, appChannel: String) {
+        self.keyPrefix = "hotupdater_\(appVersion ?? "unknown")_\(appChannel)_"
         NSLog("[PreferencesService] Configured with appVersion: \(appVersion ?? "nil"). Key prefix: \(self.keyPrefix)")
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "React Native OTA solution for self-hosted",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -118,8 +118,8 @@
   },
   "dependencies": {
     "use-sync-external-store": "1.5.0",
-    "@hot-updater/core": "0.18.1",
-    "@hot-updater/js": "0.18.1"
+    "@hot-updater/core": "0.18.3",
+    "@hot-updater/js": "0.18.3"
   },
   "scripts": {
     "build": "bob build && tsc -p plugin/tsconfig.json",