@hot-updater/react-native 0.35.4 → 0.35.6

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

@@ -429,7 +429,9 @@ class BundleFileStorageService(
                     if (!HashUtils.verifyHash(patchDownloadResult.file, patch.patchFileHash)) {
                         false
                     } else {
-                        BsdiffPatch.apply(sourceFile, patchDownloadResult.file, targetFile)
+                        withContext(Dispatchers.IO) {
+                            BsdiffPatch.apply(sourceFile, patchDownloadResult.file, targetFile)
+                        }
                         HashUtils.verifyHash(targetFile, expectedHash).also { patched ->
                             if (patched) {
                                 Log.d(
@@ -1209,15 +1211,17 @@ class BundleFileStorageService(
 
         if (hasManifestDrivenArtifacts && canUseManifestDrivenInstall()) {
             try {
-                updateBundleFromManifest(
-                    bundleId = bundleId,
-                    manifestUrl = manifestUrl!!,
-                    manifestFileHash = manifestFileHash!!,
-                    changedAssets = changedAssets!!,
-                    bundleStoreDir = bundleStoreDir,
-                    finalBundleDir = finalBundleDir,
-                    progressCallback = progressCallback,
-                )
+                withContext(Dispatchers.IO) {
+                    updateBundleFromManifest(
+                        bundleId = bundleId,
+                        manifestUrl = manifestUrl!!,
+                        manifestFileHash = manifestFileHash!!,
+                        changedAssets = changedAssets!!,
+                        bundleStoreDir = bundleStoreDir,
+                        finalBundleDir = finalBundleDir,
+                        progressCallback = progressCallback,
+                    )
+                }
                 return
             } catch (e: Exception) {
                 if (fileUrl.isNullOrEmpty()) {

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

@@ -1,6 +1,8 @@
 package com.hotupdater
 
 import android.content.ContextWrapper
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.runBlocking
 import org.json.JSONObject
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -12,6 +14,8 @@ import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import java.io.File
 import java.net.URL
+import java.util.concurrent.CopyOnWriteArrayList
+import java.util.concurrent.Executors
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
@@ -269,6 +273,47 @@ class BundleFileStorageServiceTest {
         assertFalse(invokeCanUseManifestDrivenInstall(service))
     }
 
+    @Test
+    fun `manifest driven install moves blocking work off caller dispatcher`() {
+        val rootDir = temporaryFolder.newFolder("manifest-install-dispatcher")
+        val preferences = InMemoryPreferencesService()
+        val downloadService = RecordingFailedDownloadService()
+        val service = createService(rootDir, preferences, downloadService)
+        val activeDir = createBundleDir(rootDir, "active-bundle")
+        val activeBundleFile = writeFile(activeDir, "index.android.bundle")
+        writeManifest(activeDir, listOf("index.android.bundle"))
+
+        preferences.setItem("HotUpdaterBundleURL", activeBundleFile.absolutePath)
+
+        Executors
+            .newSingleThreadExecutor { runnable -> Thread(runnable, "manifest-caller") }
+            .asCoroutineDispatcher()
+            .use { callerDispatcher ->
+                runBlocking(callerDispatcher) {
+                    val result =
+                        runCatching {
+                            service.updateBundle(
+                                bundleId = "target-bundle",
+                                fileUrl = "https://example.com/bundle.zip",
+                                fileHash = null,
+                                manifestUrl = "https://example.com/manifest.json",
+                                manifestFileHash = "manifest-hash",
+                                changedAssets = emptyMap(),
+                                progressCallback = {},
+                            )
+                        }
+                    assertTrue(result.exceptionOrNull() is HotUpdaterException)
+                }
+            }
+
+        val manifestCall = downloadService.calls.first()
+        assertEquals("https://example.com/manifest.json", manifestCall.first)
+        assertFalse(
+            "Manifest install ran on the caller dispatcher: ${manifestCall.second}",
+            manifestCall.second.contains("manifest-caller"),
+        )
+    }
+
     @Test
     fun `zip decompression does not write sibling prefix traversal entries`() {
         val rootDir = temporaryFolder.newFolder("zip-sibling-prefix")
@@ -293,11 +338,12 @@ class BundleFileStorageServiceTest {
     private fun createService(
         rootDir: File,
         preferences: InMemoryPreferencesService = InMemoryPreferencesService(),
+        downloadService: DownloadService = UnusedDownloadService,
     ): BundleFileStorageService =
         BundleFileStorageService(
             ContextWrapper(null),
             TestFileSystemService(rootDir),
-            UnusedDownloadService,
+            downloadService,
             DecompressService(),
             preferences,
             TEST_ISOLATION_KEY,
@@ -447,6 +493,20 @@ class BundleFileStorageServiceTest {
         ): DownloadResult = error("downloadFile should not be called in these tests")
     }
 
+    private class RecordingFailedDownloadService : DownloadService {
+        val calls = CopyOnWriteArrayList<Pair<String, String>>()
+
+        override suspend fun downloadFile(
+            fileUrl: URL,
+            destination: File,
+            fileSizeCallback: ((Long) -> Unit)?,
+            progressCallback: (DownloadProgress) -> Unit,
+        ): DownloadResult {
+            calls += fileUrl.toString() to Thread.currentThread().name
+            return DownloadResult.Error(IllegalStateException("expected download failure"))
+        }
+    }
+
     companion object {
         private const val TEST_ISOLATION_KEY = "test-isolation-key"
     }

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

package/lib/module/sdkVersion.js

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.35.4",
+  "version": "0.35.6",
   "description": "React Native OTA solution for self-hosted",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -130,14 +130,14 @@
     "react-native": "0.79.1",
     "react-native-builder-bob": "0.41.0",
     "typescript": "^6.0.2",
-    "hot-updater": "0.35.4"
+    "hot-updater": "0.35.6"
   },
   "dependencies": {
     "use-sync-external-store": "1.5.0",
-    "@hot-updater/cli-tools": "0.35.4",
-    "@hot-updater/core": "0.35.4",
-    "@hot-updater/js": "0.35.4",
-    "@hot-updater/plugin-core": "0.35.4"
+    "@hot-updater/core": "0.35.6",
+    "@hot-updater/cli-tools": "0.35.6",
+    "@hot-updater/js": "0.35.6",
+    "@hot-updater/plugin-core": "0.35.6"
   },
   "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.35.4";
+export const HOT_UPDATER_SDK_VERSION = "0.35.6";