@hot-updater/react-native 1.0.0-rc.14 → 1.0.0-rc.16

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

@@ -21,6 +21,7 @@ data class BundleMetadata(
     val pendingUpdateStrategy: String? = null,
     val pendingTransition: PendingSelectionTransition? = null,
     val verificationPending: Boolean = false,
+    val launchInProgress: Boolean = false,
     val highestSeenCatalogs: Map<String, CatalogHighWater> = emptyMap(),
     val currentSelectionContexts: Map<String, String> = emptyMap(),
     val updatedAt: Long = System.currentTimeMillis(),
@@ -71,6 +72,7 @@ data class BundleMetadata(
                 pendingTransition =
                     json.optJSONObject("pendingTransition")?.let(PendingSelectionTransition::fromJson),
                 verificationPending = json.optBoolean("verificationPending", false),
+                launchInProgress = json.optBoolean("launchInProgress", false),
                 highestSeenCatalogs = highestSeenCatalogs,
                 currentSelectionContexts = currentSelectionContexts,
                 updatedAt = json.optLong("updatedAt", System.currentTimeMillis()),
@@ -121,6 +123,7 @@ data class BundleMetadata(
             put("pendingUpdateStrategy", pendingUpdateStrategy ?: JSONObject.NULL)
             put("pendingTransition", pendingTransition?.toJson() ?: JSONObject.NULL)
             put("verificationPending", verificationPending)
+            put("launchInProgress", launchInProgress)
             put(
                 "highestSeenCatalogs",
                 JSONObject().apply {

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

@@ -17,12 +17,6 @@ class HotUpdaterException(
                 "Missing or empty 'bundleId'",
             )
 
-        fun invalidFileUrl() =
-            HotUpdaterException(
-                "INVALID_FILE_URL",
-                "Invalid 'fileUrl' provided",
-            )
-
         // Bundle storage errors
         fun directoryCreationFailed() =
             HotUpdaterException(
@@ -45,13 +39,6 @@ class HotUpdaterException(
             "Download incomplete: received $actualSize bytes, expected $expectedSize bytes",
         )
 
-        fun extractionFormatError(cause: Throwable? = null) =
-            HotUpdaterException(
-                "EXTRACTION_FORMAT_ERROR",
-                "The downloaded bundle file is not a valid compressed archive",
-                cause,
-            )
-
         fun invalidBundle() =
             HotUpdaterException(
                 "INVALID_BUNDLE",

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

@@ -83,14 +83,12 @@ class HotUpdaterImpl {
             val fileSystem = FileManagerService(appContext)
             val preferences = createPreferences(appContext)
             val downloadService = OkHttpDownloadService()
-            val decompressService = DecompressService()
             val isolationKey = getIsolationKey(appContext)
 
             return BundleFileStorageService(
                 appContext,
                 fileSystem,
                 downloadService,
-                decompressService,
                 preferences,
                 isolationKey,
             )
@@ -268,22 +266,22 @@ class HotUpdaterImpl {
     fun getJSBundleFile(): String = prepareLaunchIfNeeded().bundleUrl
 
     /**
-     * Updates the bundle from the specified URL
+     * Updates the bundle from its manifest and complete asset descriptors.
      * @param bundleId ID of the bundle to update
-     * @param fileUrl URL of the bundle file to download (or null to reset)
-     * @param fileHash Combined hash string for verification (sig:<signature> or <hex_hash>)
+     * @param manifestUrl URL of the target manifest
+     * @param manifestFileHash Hash or signature used to verify the target manifest
+     * @param assets Complete target asset descriptor map
      * @param progressCallback Callback for download progress updates
      * @throws HotUpdaterException if the update fails
      */
     suspend fun updateBundle(
         bundleId: String,
-        fileUrl: String?,
-        fileHash: String?,
-        manifestUrl: String?,
-        manifestFileHash: String?,
-        changedAssets: Map<String, ChangedAssetDescriptor>?,
+        manifestUrl: String,
+        manifestFileHash: String,
+        assets: Map<String, ChangedAssetDescriptor>,
         channel: String?,
         selection: PersistedSelection? = null,
+        archiveUrl: String? = null,
         progressCallback: (UpdateProgressPayload) -> Unit,
     ) {
         if (selection != null && !bundleStorage.stageReleaseSelection(selection)) {
@@ -291,11 +289,10 @@ class HotUpdaterImpl {
         }
         bundleStorage.updateBundle(
             bundleId,
-            fileUrl,
-            fileHash,
             manifestUrl,
             manifestFileHash,
-            changedAssets,
+            assets,
+            archiveUrl,
             progressCallback,
         )
 
@@ -467,7 +464,6 @@ class HotUpdaterImpl {
 
     /**
      * Gets the current launched bundle ID.
-     * Reads manifest.json first and falls back to the legacy BUNDLE_ID file.
      * Built-in bundle fallback is handled in JS.
      */
     fun getBundleId(): String? {

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

@@ -65,6 +65,13 @@ interface DownloadService {
         fileSizeCallback: ((Long) -> Unit)? = null,
         progressCallback: (DownloadProgress) -> Unit,
     ): DownloadResult
+
+    suspend fun downloadFileOnce(
+        fileUrl: URL,
+        destination: File,
+        fileSizeCallback: ((Long) -> Unit)? = null,
+        progressCallback: (DownloadProgress) -> Unit,
+    ): DownloadResult = downloadFile(fileUrl, destination, fileSizeCallback, progressCallback)
 }
 
 /**
@@ -185,6 +192,18 @@ class OkHttpDownloadService : DownloadService {
             DownloadResult.Error(lastException ?: Exception("Download failed after $MAX_RETRIES attempts"))
         }
 
+    override suspend fun downloadFileOnce(
+        fileUrl: URL,
+        destination: File,
+        fileSizeCallback: ((Long) -> Unit)?,
+        progressCallback: (DownloadProgress) -> Unit,
+    ): DownloadResult =
+        try {
+            attemptDownload(fileUrl, destination, fileSizeCallback, progressCallback)
+        } catch (error: Exception) {
+            DownloadResult.Error(error)
+        }
+
     private suspend fun attemptDownload(
         fileUrl: URL,
         destination: File,