@hot-updater/react-native 0.9.0 → 0.10.0

package/android/build.gradle

@@ -11,6 +11,7 @@ buildscript {
     classpath "com.android.tools.build:gradle:7.2.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
   }
 }
 
@@ -122,6 +123,9 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
   }
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -12,6 +12,8 @@ import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ReactShadowNode
 import com.facebook.react.uimanager.ViewManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.net.HttpURLConnection
 import java.net.URL
@@ -28,9 +30,9 @@ class HotUpdater : ReactPackage {
             context: Context,
             basePath: String,
         ): String {
-            val documentsDir = context.getExternalFilesDir(null)?.absolutePath ?: context.filesDir.absolutePath
+            val documentsDir =
+                context.getExternalFilesDir(null)?.absolutePath ?: context.filesDir.absolutePath
             val separator = if (basePath.startsWith("/")) "" else "/"
-
             return "$documentsDir$separator$basePath"
         }
 
@@ -65,12 +67,11 @@ class HotUpdater : ReactPackage {
             }
 
             val reactIntegrationManager = ReactIntegrationManager(context)
-
             val activity: Activity? = getCurrentActivity(context)
-            val reactApplication: ReactApplication = reactIntegrationManager.getReactApplication(activity?.application)
-            val bundleURL = getJSBundleFile(context)
-
-            reactIntegrationManager.setJSBundle(reactApplication, bundleURL)
+            val reactApplication: ReactApplication =
+                reactIntegrationManager.getReactApplication(activity?.application)
+            val newBundleURL = getJSBundleFile(context)
+            reactIntegrationManager.setJSBundle(reactApplication, newBundleURL)
         }
 
         private fun extractZipFileAtPath(
@@ -106,19 +107,17 @@ class HotUpdater : ReactPackage {
 
         fun reload(context: Context) {
             val reactIntegrationManager = ReactIntegrationManager(context)
-
             val activity: Activity? = getCurrentActivity(context)
-            val reactApplication: ReactApplication = reactIntegrationManager.getReactApplication(activity?.application)
+            val reactApplication: ReactApplication =
+                reactIntegrationManager.getReactApplication(activity?.application)
             val bundleURL = getJSBundleFile(context)
-
             reactIntegrationManager.setJSBundle(reactApplication, bundleURL)
-
             Handler(Looper.getMainLooper()).post {
                 reactIntegrationManager.reload(reactApplication)
             }
         }
 
-        public fun getJSBundleFile(context: Context): String {
+        fun getJSBundleFile(context: Context): String {
             val sharedPreferences =
                 context.getSharedPreferences("HotUpdaterPrefs", Context.MODE_PRIVATE)
             val urlString = sharedPreferences.getString("HotUpdaterBundleURL", null)
@@ -135,7 +134,7 @@ class HotUpdater : ReactPackage {
             return urlString
         }
 
-        fun updateBundle(
+        suspend fun updateBundle(
             context: Context,
             bundleId: String,
             zipUrl: String?,
@@ -148,66 +147,81 @@ class HotUpdater : ReactPackage {
             }
 
             val downloadUrl = URL(zipUrl)
-
             val basePath = stripPrefixFromPath(bundleId, downloadUrl.path)
             val path = convertFileSystemPathFromBasePath(context, basePath)
 
-            var connection: HttpURLConnection? = null
-            try {
-                connection = downloadUrl.openConnection() as HttpURLConnection
-                connection.connect()
-
-                val totalSize = connection.contentLength
-                if (totalSize <= 0) {
-                    Log.d("HotUpdater", "Invalid content length: $totalSize")
-                    return false
-                }
-
-                val file = File(path)
-                file.parentFile?.mkdirs()
+            val isSuccess =
+                withContext(Dispatchers.IO) {
+                    val conn =
+                        try {
+                            downloadUrl.openConnection() as HttpURLConnection
+                        } catch (e: Exception) {
+                            Log.d("HotUpdater", "Failed to open connection: ${e.message}")
+                            return@withContext false
+                        }
 
-                connection.inputStream.use { input ->
-                    file.outputStream().use { output ->
-                        val buffer = ByteArray(8 * 1024)
-                        var bytesRead: Int
-                        var totalRead = 0L
+                    try {
+                        conn.connect()
+                        val totalSize = conn.contentLength
+                        if (totalSize <= 0) {
+                            Log.d("HotUpdater", "Invalid content length: $totalSize")
+                            return@withContext false
+                        }
 
-                        while (input.read(buffer).also { bytesRead = it } != -1) {
-                            output.write(buffer, 0, bytesRead)
-                            totalRead += bytesRead
-                            val progress = (totalRead.toDouble() / totalSize)
-                            progressCallback.invoke(progress)
+                        val file = File(path)
+                        file.parentFile?.mkdirs()
+
+                        conn.inputStream.use { input ->
+                            file.outputStream().use { output ->
+                                val buffer = ByteArray(8 * 1024)
+                                var bytesRead: Int
+                                var totalRead = 0L
+                                var lastProgressTime = System.currentTimeMillis()
+
+                                while (input.read(buffer).also { bytesRead = it } != -1) {
+                                    output.write(buffer, 0, bytesRead)
+                                    totalRead += bytesRead
+                                    val currentTime = System.currentTimeMillis()
+                                    if (currentTime - lastProgressTime >= 100) { // Check every 100ms
+                                        val progress = totalRead.toDouble() / totalSize
+                                        progressCallback.invoke(progress)
+                                        lastProgressTime = currentTime
+                                    }
+                                }
+                                // Send final progress (100%) after download completes
+                                progressCallback.invoke(1.0)
+                            }
                         }
+                    } catch (e: Exception) {
+                        Log.d("HotUpdater", "Failed to download data from URL: $zipUrl, Error: ${e.message}")
+                        return@withContext false
+                    } finally {
+                        conn.disconnect()
                     }
-                }
-            } catch (e: Exception) {
-                Log.d("HotUpdater", "Failed to download data from URL: $zipUrl, Error: ${e.message}")
-                return false
-            } finally {
-                connection?.disconnect()
-            }
 
-            val extractedPath = File(path).parentFile?.path ?: return false
+                    val extractedPath = File(path).parentFile?.path ?: return@withContext false
 
-            if (!extractZipFileAtPath(path, extractedPath)) {
-                Log.d("HotUpdater", "Failed to extract zip file.")
-                return false
-            }
+                    if (!extractZipFileAtPath(path, extractedPath)) {
+                        Log.d("HotUpdater", "Failed to extract zip file.")
+                        return@withContext false
+                    }
 
-            val extractedDirectory = File(extractedPath)
-            val indexFile = extractedDirectory.walk().find { it.name == "index.android.bundle" }
+                    val extractedDirectory = File(extractedPath)
+                    val indexFile = extractedDirectory.walk().find { it.name == "index.android.bundle" }
 
-            if (indexFile != null) {
-                val bundlePath = indexFile.path
-                Log.d("HotUpdater", "Setting bundle URL: $bundlePath")
-                setBundleURL(context, bundlePath)
-            } else {
-                Log.d("HotUpdater", "index.android.bundle not found.")
-                return false
-            }
+                    if (indexFile != null) {
+                        val bundlePath = indexFile.path
+                        Log.d("HotUpdater", "Setting bundle URL: $bundlePath")
+                        setBundleURL(context, bundlePath)
+                    } else {
+                        Log.d("HotUpdater", "index.android.bundle not found.")
+                        return@withContext false
+                    }
 
-            Log.d("HotUpdater", "Downloaded and extracted file successfully.")
-            return true
+                    Log.d("HotUpdater", "Downloaded and extracted file successfully.")
+                    true
+                }
+            return isSuccess
         }
     }
 }

package/android/src/newarch/HotUpdaterModule.kt

@@ -1,10 +1,13 @@
 package com.hotupdater
 
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import kotlinx.coroutines.launch
 
 class HotUpdaterModule internal constructor(
     context: ReactApplicationContext,
@@ -29,18 +32,26 @@ class HotUpdaterModule internal constructor(
         zipUrl: String?,
         promise: Promise,
     ) {
-        val isSuccess =
-            HotUpdater.updateBundle(mReactApplicationContext, bundleId, zipUrl) { progress ->
-                val params =
-                    WritableNativeMap().apply {
-                        putDouble("progress", progress)
-                    }
-
-                this.mReactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("onProgress", params)
-            }
-        promise.resolve(isSuccess)
+        // Use lifecycleScope when currentActivity is FragmentActivity
+        (currentActivity as? FragmentActivity)?.lifecycleScope?.launch {
+            val isSuccess =
+                HotUpdater.updateBundle(
+                    mReactApplicationContext,
+                    bundleId,
+                    zipUrl,
+                ) { progress ->
+                    val params =
+                        WritableNativeMap().apply {
+                            putDouble("progress", progress)
+                        }
+
+                    this@HotUpdaterModule
+                        .mReactApplicationContext
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                        .emit("onProgress", params)
+                }
+            promise.resolve(isSuccess)
+        }
     }
 
     override fun addListener(eventName: String?) {

package/android/src/oldarch/HotUpdaterModule.kt

@@ -1,10 +1,13 @@
 package com.hotupdater
 
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import kotlinx.coroutines.launch
 
 class HotUpdaterModule internal constructor(
     context: ReactApplicationContext,
@@ -29,18 +32,26 @@ class HotUpdaterModule internal constructor(
         zipUrl: String?,
         promise: Promise,
     ) {
-        val isSuccess =
-            HotUpdater.updateBundle(mReactApplicationContext, bundleId, zipUrl) { progress ->
-                val params =
-                    WritableNativeMap().apply {
-                        putDouble("progress", progress)
-                    }
-
-                this.mReactApplicationContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                    .emit("onProgress", params)
-            }
-        promise.resolve(isSuccess)
+        // Use lifecycleScope when currentActivity is FragmentActivity
+        (currentActivity as? FragmentActivity)?.lifecycleScope?.launch {
+            val isSuccess =
+                HotUpdater.updateBundle(
+                    mReactApplicationContext,
+                    bundleId,
+                    zipUrl,
+                ) { progress ->
+                    val params =
+                        WritableNativeMap().apply {
+                            putDouble("progress", progress)
+                        }
+
+                    this@HotUpdaterModule
+                        .mReactApplicationContext
+                        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                        .emit("onProgress", params)
+                }
+            promise.resolve(isSuccess)
+        }
     }
 
     companion object {

package/ios/HotUpdater/HotUpdater.mm

@@ -252,6 +252,7 @@ RCT_EXPORT_MODULE();
 RCT_EXPORT_METHOD(reload) {
     NSLog(@"HotUpdater requested a reload");
     dispatch_async(dispatch_get_main_queue(), ^{
+        [super.bridge setValue:[HotUpdater bundleURL] forKey:@"bundleURL"];
         RCTTriggerReloadCommandListeners(@"HotUpdater requested a reload");
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/react-native",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "React Native OTA solution for self-hosted",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -78,8 +78,8 @@
     "react-native-builder-bob": "^0.33.1"
   },
   "dependencies": {
-    "@hot-updater/js": "0.9.0",
-    "@hot-updater/core": "0.9.0"
+    "@hot-updater/js": "0.10.0",
+    "@hot-updater/core": "0.10.0"
   },
   "scripts": {
     "build": "rslib build",