@hot-updater/react-native 0.36.13 → 0.36.15

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

@@ -485,6 +485,7 @@ class BundleFileStorageService(
         checkAndCleanupIfIsolationKeyChanged()
     }
 
+    private var hasPreparedLaunch = false
     private var currentLaunchReport: LaunchReport? = null
 
     @Volatile
@@ -930,6 +931,7 @@ class BundleFileStorageService(
             stableBundleId = currentVerifiedBundleId,
             stagingBundleId = bundleId,
             verificationPending = true,
+            launchInProgress = false,
             updatedAt = System.currentTimeMillis(),
         )
     }
@@ -956,6 +958,7 @@ class BundleFileStorageService(
                 stableBundleId = null,
                 stagingBundleId = fallbackBundleId,
                 verificationPending = false,
+                launchInProgress = false,
                 updatedAt = System.currentTimeMillis(),
             )
         saveMetadata(updatedMetadata)
@@ -1052,6 +1055,7 @@ class BundleFileStorageService(
         saveMetadata(
             metadata.copy(
                 verificationPending = false,
+                launchInProgress = false,
                 updatedAt = System.currentTimeMillis(),
             ),
         )
@@ -1106,8 +1110,22 @@ class BundleFileStorageService(
     override fun prepareLaunch(pendingRecovery: PendingCrashRecovery?): LaunchSelection {
         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.
+        if (!hasPreparedLaunch) {
+            val metadata = loadMetadataOrNull()
+            if (metadata?.verificationPending == true && metadata.launchInProgress) {
+                metadata.stagingBundleId?.let { rollbackPendingBundle(it) }
+            }
+        }
+        hasPreparedLaunch = true
 
         val selection = selectLaunch()
+        if (selection.shouldRollbackOnCrash) {
+            loadMetadataOrNull()?.let { metadata ->
+                saveMetadata(metadata.copy(launchInProgress = true))
+            }
+        }
         Log.d(
             TAG,
             "prepareLaunch: bundleId=${selection.launchedBundleId} shouldRollback=${selection.shouldRollbackOnCrash} url=${selection.bundleUrl}",
@@ -1937,6 +1955,7 @@ class BundleFileStorageService(
                     stableBundleId = null,
                     stagingBundleId = null,
                     verificationPending = false,
+                    launchInProgress = false,
                 )
 
             if (!saveMetadata(clearedMetadata)) {

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

@@ -14,6 +14,7 @@ data class BundleMetadata(
     val stableBundleId: String? = null,
     val stagingBundleId: String? = null,
     val verificationPending: Boolean = false,
+    val launchInProgress: Boolean = false,
     val updatedAt: Long = System.currentTimeMillis(),
 ) {
     companion object {
@@ -43,6 +44,7 @@ data class BundleMetadata(
                         null
                     },
                 verificationPending = json.optBoolean("verificationPending", false),
+                launchInProgress = json.optBoolean("launchInProgress", false),
                 updatedAt = json.optLong("updatedAt", System.currentTimeMillis()),
             )
 
@@ -86,6 +88,7 @@ data class BundleMetadata(
             put("stableBundleId", stableBundleId ?: JSONObject.NULL)
             put("stagingBundleId", stagingBundleId ?: JSONObject.NULL)
             put("verificationPending", verificationPending)
+            put("launchInProgress", launchInProgress)
             put("updatedAt", updatedAt)
         }
 

package/android/src/test/java/com/hotupdater/BundleFileStorageServiceTest.kt

@@ -23,6 +23,71 @@ class BundleFileStorageServiceTest {
     @get:Rule
     val temporaryFolder = TemporaryFolder()
 
+    @Test
+    fun `unfinished staging launch rolls back to stable on cold start`() {
+        assertStagingLaunchAcrossColdStart(hasStableBundle = true)
+    }
+
+    @Test
+    fun `unfinished staging launch rolls back to built in on cold start`() {
+        assertStagingLaunchAcrossColdStart(hasStableBundle = false)
+    }
+
+    @Test
+    fun `completed staging launch remains trusted on cold start`() {
+        assertStagingLaunchAcrossColdStart(hasStableBundle = true, completesLaunch = true)
+    }
+
+    @Test
+    fun `completed first OTA launch remains trusted on cold start`() {
+        assertStagingLaunchAcrossColdStart(hasStableBundle = false, completesLaunch = true)
+    }
+
+    private fun assertStagingLaunchAcrossColdStart(
+        hasStableBundle: Boolean,
+        completesLaunch: Boolean = false,
+    ) {
+        val rootDir = temporaryFolder.newFolder()
+        val preferences = InMemoryPreferencesService()
+        val stableBundleId = if (hasStableBundle) "stable-bundle" else null
+        listOfNotNull(stableBundleId, "hung-bundle").forEach { bundleId ->
+            val directory = createBundleDir(rootDir, bundleId)
+            writeFile(directory, "index.android.bundle")
+            writeManifest(directory, listOf("index.android.bundle"))
+        }
+        writeMetadata(
+            rootDir,
+            BundleMetadata(
+                isolationKey = TEST_ISOLATION_KEY,
+                stableBundleId = stableBundleId,
+                stagingBundleId = "hung-bundle",
+                verificationPending = true,
+            ),
+        )
+        val firstProcess = createService(rootDir, preferences)
+        val firstLaunch = firstProcess.prepareLaunch(null)
+        assertEquals("hung-bundle", firstLaunch.launchedBundleId)
+        assertTrue(firstLaunch.shouldRollbackOnCrash)
+
+        assertEquals("hung-bundle", firstProcess.prepareLaunch(null).launchedBundleId)
+        assertFalse(firstProcess.getCrashHistory().contains("hung-bundle"))
+        if (completesLaunch) {
+            firstProcess.markLaunchCompleted("hung-bundle")
+        }
+
+        // Issue #1321: simulate process termination without a crash marker.
+        val secondProcess = createService(rootDir, preferences)
+        val nextLaunch = secondProcess.prepareLaunch(null)
+        assertEquals(if (completesLaunch) "hung-bundle" else stableBundleId, nextLaunch.launchedBundleId)
+        assertFalse(nextLaunch.shouldRollbackOnCrash)
+        assertEquals(!completesLaunch, secondProcess.getCrashHistory().contains("hung-bundle"))
+        if (!completesLaunch) {
+            assertEquals("RECOVERED", secondProcess.notifyAppReady()["status"])
+        }
+        val thirdProcess = createService(rootDir, preferences)
+        assertEquals(nextLaunch.launchedBundleId, thirdProcess.prepareLaunch(null).launchedBundleId)
+    }
+
     @Test
     fun `resolveBundleFile uses single manifest bundle at root`() {
         val rootDir = temporaryFolder.newFolder("root-manifest-bundle")

package/ios/HotUpdater/Internal/BundleFileStorageService.swift

@@ -349,6 +349,7 @@ class BundleFileStorageService: BundleStorageService {
 
     private var activeTasks: [URLSessionTask] = []
 
+    private var hasPreparedLaunch = false
     private var currentLaunchReport: LaunchReport?
     private let activeBundleMetadataLock = NSLock()
     private var activeBundleMetadataSnapshot: ActiveBundleMetadataSnapshot?
@@ -1609,7 +1610,22 @@ class BundleFileStorageService: BundleStorageService {
     func prepareLaunch(bundle: Bundle, pendingRecovery: PendingCrashRecovery?) -> LaunchSelection {
         saveLaunchReport(nil)
         applyPendingRecoveryIfNeeded(pendingRecovery)
-        return selectLaunch(bundle: bundle)
+        // 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 !hasPreparedLaunch,
+           let metadata = loadMetadataOrNull(),
+           metadata.verificationPending,
+           metadata.launchInProgress,
+           let stagingBundleId = metadata.stagingBundleId {
+            rollbackPendingBundle(stagingBundleId)
+        }
+        hasPreparedLaunch = true
+        let selection = selectLaunch(bundle: bundle)
+        if selection.shouldRollbackOnCrash, var metadata = loadMetadataOrNull() {
+            metadata.launchInProgress = true
+            _ = saveMetadata(metadata)
+        }
+        return selection
     }
     
     // MARK: - Bundle Update
@@ -2535,6 +2551,7 @@ class BundleFileStorageService: BundleStorageService {
         }
 
         metadata.verificationPending = false
+        metadata.launchInProgress = false
         metadata.updatedAt = Date().timeIntervalSince1970 * 1000
         let _ = saveMetadata(metadata)
     }

package/ios/HotUpdater/Internal/BundleMetadata.swift

@@ -12,6 +12,7 @@ public struct BundleMetadata: Codable {
     var stableBundleId: String?
     var stagingBundleId: String?
     var verificationPending: Bool
+    var launchInProgress: Bool
     var updatedAt: Double
 
     enum CodingKeys: String, CodingKey {
@@ -20,6 +21,7 @@ public struct BundleMetadata: Codable {
         case stableBundleId = "stable_bundle_id"
         case stagingBundleId = "staging_bundle_id"
         case verificationPending = "verification_pending"
+        case launchInProgress = "launch_in_progress"
         case updatedAt = "updated_at"
     }
 
@@ -29,6 +31,7 @@ public struct BundleMetadata: Codable {
         stableBundleId: String? = nil,
         stagingBundleId: String? = nil,
         verificationPending: Bool = false,
+        launchInProgress: Bool = false,
         updatedAt: Double = Date().timeIntervalSince1970 * 1000
     ) {
         self.schema = schema
@@ -36,9 +39,21 @@ public struct BundleMetadata: Codable {
         self.stableBundleId = stableBundleId
         self.stagingBundleId = stagingBundleId
         self.verificationPending = verificationPending
+        self.launchInProgress = launchInProgress
         self.updatedAt = updatedAt
     }
 
+    public init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        schema = try values.decode(String.self, forKey: .schema)
+        isolationKey = try values.decodeIfPresent(String.self, forKey: .isolationKey)
+        stableBundleId = try values.decodeIfPresent(String.self, forKey: .stableBundleId)
+        stagingBundleId = try values.decodeIfPresent(String.self, forKey: .stagingBundleId)
+        verificationPending = try values.decode(Bool.self, forKey: .verificationPending)
+        launchInProgress = try values.decodeIfPresent(Bool.self, forKey: .launchInProgress) ?? false
+        updatedAt = try values.decode(Double.self, forKey: .updatedAt)
+    }
+
     static func load(from file: URL, expectedIsolationKey: String) -> BundleMetadata? {
         guard FileManager.default.fileExists(atPath: file.path) else {
             print("[BundleMetadata] Metadata file does not exist: \(file.path)")

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 = "0.36.13";
+const HOT_UPDATER_SDK_VERSION = exports.HOT_UPDATER_SDK_VERSION = "0.36.15";
 //# sourceMappingURL=sdkVersion.js.map

package/lib/module/sdkVersion.js

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.36.13",
+  "version": "0.36.15",
   "description": "React Native OTA solution for self-hosted",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -131,14 +131,14 @@
     "react-native-builder-bob": "0.41.0",
     "@typescript/native": "npm:typescript@^7.0.2",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
-    "hot-updater": "0.36.13"
+    "hot-updater": "0.36.15"
   },
   "dependencies": {
     "use-sync-external-store": "1.5.0",
-    "@hot-updater/js": "0.36.13",
-    "@hot-updater/cli-tools": "0.36.13",
-    "@hot-updater/plugin-core": "0.36.13",
-    "@hot-updater/core": "0.36.13"
+    "@hot-updater/cli-tools": "0.36.15",
+    "@hot-updater/core": "0.36.15",
+    "@hot-updater/plugin-core": "0.36.15",
+    "@hot-updater/js": "0.36.15"
   },
   "scripts": {
     "build": "node ./scripts/sync-sdk-version.mjs run -- bob build && tsc -p plugin/tsconfig.build.json",

package/src/sdkVersion.ts

@@ -1 +1 @@
-export const HOT_UPDATER_SDK_VERSION = "0.36.13";
+export const HOT_UPDATER_SDK_VERSION = "0.36.15";