@hot-updater/react-native 1.1.2 → 1.1.4

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

@@ -1183,6 +1183,14 @@ class BundleFileStorageService(
     private fun rollbackPendingBundle(
         stagingBundleId: String,
         unfinishedLaunch: Boolean = false,
+    ): Boolean =
+        synchronized(releaseStateLock) {
+            rollbackPendingBundleLocked(stagingBundleId, unfinishedLaunch)
+        }
+
+    private fun rollbackPendingBundleLocked(
+        stagingBundleId: String,
+        unfinishedLaunch: Boolean,
     ): Boolean {
         val metadata = loadMetadataOrNull() ?: return false
         if (metadata.stagingBundleId != stagingBundleId) {
@@ -1231,18 +1239,22 @@ class BundleFileStorageService(
     }
 
     private fun applyPendingRecoveryIfNeeded(pendingRecovery: PendingCrashRecovery?) {
-        val metadata = loadMetadataOrNull() ?: return
-        val stagingBundleId = metadata.stagingBundleId ?: return
+        synchronized(releaseStateLock) {
+            val metadata = loadMetadataOrNull() ?: return
+            val stagingBundleId = metadata.stagingBundleId ?: return
 
-        if (pendingRecovery?.shouldRollback == true &&
-            pendingRecovery.launchedBundleId == stagingBundleId &&
-            isVerificationPending(metadata)
-        ) {
-            rollbackPendingBundle(stagingBundleId)
+            if (pendingRecovery?.shouldRollback == true &&
+                pendingRecovery.launchedBundleId == stagingBundleId &&
+                isVerificationPending(metadata)
+            ) {
+                rollbackPendingBundle(stagingBundleId)
+            }
         }
     }
 
-    private fun selectLaunch(): LaunchSelection {
+    private fun selectLaunch(): LaunchSelection = synchronized(releaseStateLock) { selectLaunchLocked() }
+
+    private fun selectLaunchLocked(): LaunchSelection {
         val metadata = loadMetadataOrNull()
         if (metadata == null) {
             return LaunchSelection(
@@ -1263,7 +1275,7 @@ class BundleFileStorageService(
             }
 
             if (metadata.verificationPending && rollbackPendingBundle(stagingBundleId)) {
-                return selectLaunch()
+                return selectLaunchLocked()
             }
         }
 
@@ -1583,35 +1595,39 @@ class BundleFileStorageService(
 
     override fun markLaunchCompleted(currentBundleId: String?) {
         readyInterruptedLaunchRetry(currentBundleId)
-        val metadata = loadMetadataOrNull() ?: return
-        val stagingBundleId = metadata.stagingBundleId ?: return
-        if (!metadata.verificationPending || stagingBundleId != currentBundleId) {
-            return
-        }
+        // A Release selection can commit at the same time, from a native update
+        // check or JS; neither may save over the other's read.
+        synchronized(releaseStateLock) {
+            val metadata = loadMetadataOrNull() ?: return
+            val stagingBundleId = metadata.stagingBundleId ?: return
+            if (!metadata.verificationPending || stagingBundleId != currentBundleId) {
+                return
+            }
 
-        val transition = metadata.pendingTransition
-        val fromBundleId = transition?.fromBundleId ?: getKnownLaunchBundleId(metadata)
-        saveMetadata(
-            metadata.copy(
-                stableBundleId = null,
-                stableSelection = null,
-                pendingUpdateStrategy = null,
-                pendingTransition = null,
-                verificationPending = false,
-                launchInProgress = false,
-                updatedAt = System.currentTimeMillis(),
-            ),
-        )
-        saveLaunchReport(
-            LaunchReport(
-                status = "UPDATE_APPLIED",
-                fromReleaseId = transition?.fromReleaseId,
-                fromBundleId = fromBundleId,
-                toReleaseId = transition?.toReleaseId,
-                toBundleId = stagingBundleId,
-                updateStrategy = metadata.pendingUpdateStrategy ?: resolveUpdateStrategy(),
-            ),
-        )
+            val transition = metadata.pendingTransition
+            val fromBundleId = transition?.fromBundleId ?: getKnownLaunchBundleId(metadata)
+            saveMetadata(
+                metadata.copy(
+                    stableBundleId = null,
+                    stableSelection = null,
+                    pendingUpdateStrategy = null,
+                    pendingTransition = null,
+                    verificationPending = false,
+                    launchInProgress = false,
+                    updatedAt = System.currentTimeMillis(),
+                ),
+            )
+            saveLaunchReport(
+                LaunchReport(
+                    status = "UPDATE_APPLIED",
+                    fromReleaseId = transition?.fromReleaseId,
+                    fromBundleId = fromBundleId,
+                    toReleaseId = transition?.toReleaseId,
+                    toBundleId = stagingBundleId,
+                    updateStrategy = metadata.pendingUpdateStrategy ?: resolveUpdateStrategy(),
+                ),
+            )
+        }
     }
 
     // MARK: - notifyAppReady
@@ -1688,17 +1704,19 @@ class BundleFileStorageService(
             // Cleared before the rollbacks below, so the launch reports their RECOVERED.
             saveLaunchReport(null)
             applyPendingRecoveryIfNeeded(pendingRecovery())
-            // Only a new storage instance consumes an unfinished launch. Repeated bundle
-            // lookups or bridge reloads in this process must not reject its own launch.
-            val metadata = loadMetadataOrNull()
-            if (metadata?.verificationPending == true && metadata.launchInProgress) {
-                metadata.stagingBundleId?.let { rollbackPendingBundle(it, unfinishedLaunch = true) }
-            }
-            // A pending bundle whose file is gone rolls back, as selectLaunch does.
-            val settled = loadMetadataOrNull()
-            settled?.stagingBundleId?.let { stagingBundleId ->
-                if (settled.verificationPending && getBundleUrlForId(stagingBundleId) == null) {
-                    rollbackPendingBundle(stagingBundleId)
+            synchronized(releaseStateLock) {
+                // Only a new storage instance consumes an unfinished launch. Repeated bundle
+                // lookups or bridge reloads in this process must not reject its own launch.
+                val metadata = loadMetadataOrNull()
+                if (metadata?.verificationPending == true && metadata.launchInProgress) {
+                    metadata.stagingBundleId?.let { rollbackPendingBundle(it, unfinishedLaunch = true) }
+                }
+                // A pending bundle whose file is gone rolls back, as selectLaunch does.
+                val settled = loadMetadataOrNull()
+                settled?.stagingBundleId?.let { stagingBundleId ->
+                    if (settled.verificationPending && getBundleUrlForId(stagingBundleId) == null) {
+                        rollbackPendingBundle(stagingBundleId)
+                    }
                 }
             }
         }
@@ -2708,47 +2726,51 @@ class BundleFileStorageService(
 
     override suspend fun resetChannel(): Boolean =
         withContext(Dispatchers.IO) {
-            if (!setBundleURL(null)) {
-                return@withContext false
-            }
+            synchronized(releaseStateLock) { resetChannelLocked() }
+        }
 
-            val clearedMetadata =
-                (loadMetadataOrNull() ?: BundleMetadata()).copy(
-                    isolationKey = isolationKey,
-                    stableBundleId = null,
-                    stagingBundleId = null,
-                    stableSelection = null,
-                    stagingSelection = null,
-                    pendingUpdateStrategy = null,
-                    pendingTransition = null,
-                    verificationPending = false,
-                    launchInProgress = false,
-                    // Selections made before the reset no longer stage; the
-                    // high-water marks stay, so an older catalog is still refused.
-                    currentSelectionContexts = emptyMap(),
-                    updatedAt = System.currentTimeMillis(),
-                )
+    private fun resetChannelLocked(): Boolean {
+        if (!setBundleURL(null)) {
+            return false
+        }
 
-            if (!saveMetadata(clearedMetadata)) {
-                return@withContext false
-            }
+        val clearedMetadata =
+            (loadMetadataOrNull() ?: BundleMetadata()).copy(
+                isolationKey = isolationKey,
+                stableBundleId = null,
+                stagingBundleId = null,
+                stableSelection = null,
+                stagingSelection = null,
+                pendingUpdateStrategy = null,
+                pendingTransition = null,
+                verificationPending = false,
+                launchInProgress = false,
+                // Selections made before the reset no longer stage; the
+                // high-water marks stay, so an older catalog is still refused.
+                currentSelectionContexts = emptyMap(),
+                updatedAt = System.currentTimeMillis(),
+            )
 
-            saveLaunchReport(null)
+        if (!saveMetadata(clearedMetadata)) {
+            return false
+        }
 
-            getBundleStoreDir().listFiles()?.forEach { file ->
-                if (
-                    file.name == BundleMetadata.METADATA_FILENAME ||
-                    file.name == CrashedHistory.CRASHED_HISTORY_FILENAME ||
-                    file.name == LaunchReport.LAUNCH_REPORT_FILENAME
-                ) {
-                    return@forEach
-                }
+        saveLaunchReport(null)
 
-                if (file.isDirectory) {
-                    file.deleteRecursively()
-                }
+        getBundleStoreDir().listFiles()?.forEach { file ->
+            if (
+                file.name == BundleMetadata.METADATA_FILENAME ||
+                file.name == CrashedHistory.CRASHED_HISTORY_FILENAME ||
+                file.name == LaunchReport.LAUNCH_REPORT_FILENAME
+            ) {
+                return@forEach
             }
 
-            true
+            if (file.isDirectory) {
+                file.deleteRecursively()
+            }
         }
+
+        return true
+    }
 }

package/ios/HotUpdater/Internal/BundleFileStorageService.swift

@@ -421,6 +421,7 @@ class BundleFileStorageService: BundleStorageService {
     private let builtInBundleIdProvider: () -> String
     private let builtInAssetResolver: BuiltInAssetResolver
     private let updateStrategyProvider: () -> UpdateStrategy
+    private let metadataWriter: (BundleMetadata, URL) -> Bool
     private let releaseStateLock = NSRecursiveLock()
 
     /// App-wide: every instance's storage reads the same install identity
@@ -787,7 +788,10 @@ class BundleFileStorageService: BundleStorageService {
                 builtInBundleIdProvider: @escaping () -> String = { "" },
                 builtInAssetResolver: BuiltInAssetResolver? = nil,
                 updateStrategyProvider: (() -> UpdateStrategy)? = nil,
-                downloadRetryDelay: TimeInterval = 1) {
+                downloadRetryDelay: TimeInterval = 1,
+                metadataWriter: @escaping (BundleMetadata, URL) -> Bool = { metadata, file in
+                    metadata.save(to: file)
+                }) {
 
         self.fileSystem = fileSystem
         self.downloadRetryDelay = downloadRetryDelay
@@ -802,6 +806,7 @@ class BundleFileStorageService: BundleStorageService {
             defaultBundle: { instance.bundle }
         )
         self.updateStrategyProvider = updateStrategyProvider ?? { instance.updateStrategy() }
+        self.metadataWriter = metadataWriter
 
         // Create queue for file operations
         self.fileOperationQueue = DispatchQueue(label: "com.hotupdater.fileoperations",
@@ -859,7 +864,7 @@ class BundleFileStorageService: BundleStorageService {
         }
         var updatedMetadata = metadata
         updatedMetadata.isolationKey = isolationKey
-        return updatedMetadata.save(to: file)
+        return metadataWriter(updatedMetadata, file)
     }
 
     private func loadLaunchReport() -> LaunchReport? {
@@ -1368,6 +1373,8 @@ class BundleFileStorageService: BundleStorageService {
     /// ended before first content without a crash marker.
     @discardableResult
     private func rollbackPendingBundle(_ stagingId: String, unfinishedLaunch: Bool = false) -> Bool {
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         guard var metadata = loadMetadataOrNull(), metadata.stagingBundleId == stagingId else {
             return false
         }
@@ -1443,6 +1450,8 @@ class BundleFileStorageService: BundleStorageService {
     }
 
     private func applyPendingRecoveryIfNeeded(_ pendingRecovery: PendingCrashRecovery?) {
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         guard let metadata = loadMetadataOrNull(),
               let stagingBundleId = metadata.stagingBundleId,
               pendingRecovery?.shouldRollback == true,
@@ -2001,6 +2010,8 @@ class BundleFileStorageService: BundleStorageService {
     }
 
     private func selectLaunch(bundle: Bundle) -> LaunchSelection {
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         guard let metadata = loadMetadataOrNull() else {
             return LaunchSelection(
                 bundleURL: getFallbackBundleURL(bundle: bundle),
@@ -2081,6 +2092,8 @@ class BundleFileStorageService: BundleStorageService {
         // Cleared before the rollbacks below, so the launch reports their RECOVERED.
         saveLaunchReport(nil)
         applyPendingRecoveryIfNeeded(pendingRecovery())
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         // Only a new storage instance consumes an unfinished launch. Repeated bundle
         // lookups or bridge reloads in this process must not reject its own launch.
         if let metadata = loadMetadataOrNull(),
@@ -3019,6 +3032,10 @@ class BundleFileStorageService: BundleStorageService {
     func markLaunchCompleted(bundleId: String?) {
         // Before the guard: content from the built-in bundle (nil) also counts.
         readyInterruptedLaunchRetry(bundleId)
+        // A Release selection can commit at the same time, from a native update
+        // check or JavaScript; neither may save over the other's read.
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         guard let bundleId,
               var metadata = loadMetadataOrNull(),
               metadata.verificationPending,
@@ -3200,6 +3217,8 @@ class BundleFileStorageService: BundleStorageService {
     }
 
     func resetChannel() -> Result<Bool, Error> {
+        releaseStateLock.lock()
+        defer { releaseStateLock.unlock() }
         guard case .success = setBundleURL(localPath: nil) else {
             return .failure(BundleStorageError.unknown(nil))
         }

package/lib/commonjs/sdkVersion.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HOT_UPDATER_SDK_VERSION = void 0;
-const HOT_UPDATER_SDK_VERSION = exports.HOT_UPDATER_SDK_VERSION = "1.1.2";
+const HOT_UPDATER_SDK_VERSION = exports.HOT_UPDATER_SDK_VERSION = "1.1.4";
 //# sourceMappingURL=sdkVersion.js.map

package/lib/module/sdkVersion.js

@@ -1,4 +1,4 @@
 "use strict";
 
-export const HOT_UPDATER_SDK_VERSION = "1.1.2";
+export const HOT_UPDATER_SDK_VERSION = "1.1.4";
 //# sourceMappingURL=sdkVersion.js.map

package/lib/typescript/commonjs/sdkVersion.d.ts

@@ -1,2 +1,2 @@
-export declare const HOT_UPDATER_SDK_VERSION = "1.1.2";
+export declare const HOT_UPDATER_SDK_VERSION = "1.1.4";
 //# sourceMappingURL=sdkVersion.d.ts.map

package/lib/typescript/module/sdkVersion.d.ts

@@ -1,2 +1,2 @@
-export declare const HOT_UPDATER_SDK_VERSION = "1.1.2";
+export declare const HOT_UPDATER_SDK_VERSION = "1.1.4";
 //# sourceMappingURL=sdkVersion.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "React Native OTA solution for self-hosted",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -124,9 +124,9 @@
   },
   "dependencies": {
     "use-sync-external-store": "1.5.0",
-    "@hot-updater/protocol": "1.1.2",
-    "@hot-updater/plugin-remote-config": "1.1.2",
-    "@hot-updater/plugin-insights": "1.1.2"
+    "@hot-updater/plugin-insights": "1.1.4",
+    "@hot-updater/plugin-remote-config": "1.1.4",
+    "@hot-updater/protocol": "1.1.4"
   },
   "scripts": {
     "build": "node ./scripts/sync-sdk-version.mjs run -- bob build",

package/src/sdkVersion.ts

@@ -1 +1 @@
-export const HOT_UPDATER_SDK_VERSION = "1.1.2";
+export const HOT_UPDATER_SDK_VERSION = "1.1.4";