react-native-ota-hot-update 2.2.53 → 2.2.71

package/android/build.gradle

@@ -116,6 +116,8 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'com.jakewharton:process-phoenix:3.0.0'
+  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/otahotupdate/OtaHotUpdate.kt

@@ -3,7 +3,7 @@ package com.otahotupdate
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import com.facebook.react.BaseReactPackage
+import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
@@ -15,7 +15,7 @@ import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.SharedPrefs
 
 
-class OtaHotUpdate : BaseReactPackage() {
+class OtaHotUpdate : TurboReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
     return if (name == OtaHotUpdateModule.NAME) {
       OtaHotUpdateModule(reactContext)
@@ -33,6 +33,7 @@ class OtaHotUpdate : BaseReactPackage() {
         OtaHotUpdateModule.NAME,
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
+        true,  // hasConstants
         false,  // isCxxModule
         isTurboModule // isTurboModule
       )

package/android/src/main/java/com/otahotupdate/OtaHotUpdateModule.kt

@@ -13,18 +13,29 @@ import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.Common.PREVIOUS_VERSION
 import com.rnhotupdate.Common.METADATA
 import com.rnhotupdate.SharedPrefs
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 
 class OtaHotUpdateModule internal constructor(context: ReactApplicationContext) :
   OtaHotUpdateSpec(context) {
   private val utils: Utils = Utils(context)
+  private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
   override fun getName(): String {
     return NAME
   }
 
+  override fun invalidate() {
+    super.invalidate()
+    scope.cancel()
+  }
 
-  @ReactMethod
-  override fun setupBundlePath(path: String?, extension: String?, promise: Promise) {
+  private fun processBundleFile(path: String?, extension: String?): Boolean {
     if (path != null) {
       val file = File(path)
       if (file.exists() && file.isFile) {
@@ -34,7 +45,7 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
           utils.deleteOldBundleIfneeded(null)
           val sharedPrefs = SharedPrefs(reactApplicationContext)
           val oldPath = sharedPrefs.getString(PATH)
-          if (!oldPath.equals("")) {
+          if (!oldPath.isNullOrEmpty()) {
             sharedPrefs.putString(PREVIOUS_PATH, oldPath)
           }
           sharedPrefs.putString(PATH, fileUnzip)
@@ -42,16 +53,31 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
             CURRENT_VERSION_CODE,
             reactApplicationContext.getVersionCode()
           )
-          promise.resolve(true)
+          return true
         } else {
           file.delete()
-          promise.reject("E_UNZIP_FAIL", "File unzip failed or path is invalid file: $file")
+          throw Exception("File unzip failed or path is invalid: $file")
         }
       } else {
-        promise.reject("E_INVALID_PATH", "File not exist: $file")
+        throw Exception("File not exist: $file")
       }
     } else {
-      promise.reject("E_INVALID_PATH", "File not exist: $path")
+      throw Exception("Invalid path: $path")
+    }
+  }
+  @ReactMethod
+  override fun setupBundlePath(path: String?, extension: String?, promise: Promise) {
+    scope.launch {
+      try {
+        val result = processBundleFile(path, extension)
+        withContext(Dispatchers.Main) {
+          promise.resolve(result)
+        }
+      } catch (e: Exception) {
+        withContext(Dispatchers.Main) {
+          promise.reject("SET_ERROR", e)
+        }
+      }
     }
   }
 
@@ -87,7 +113,7 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
 
     val currentVersion = sharedPrefs.getString(VERSION)
     if (currentVersion != "" && currentVersion != version) {
-        sharedPrefs.putString(PREVIOUS_VERSION, currentVersion)
+      sharedPrefs.putString(PREVIOUS_VERSION, currentVersion)
     }
 
     sharedPrefs.putString(VERSION, version)
@@ -99,9 +125,9 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
     val sharedPrefs = SharedPrefs(reactApplicationContext)
     val metadata = sharedPrefs.getString(METADATA)
     if (metadata != "") {
-        promise.resolve(metadata);
+      promise.resolve(metadata);
     } else {
-        promise.resolve(null);
+      promise.resolve(null);
     }
   }
 
@@ -137,10 +163,10 @@ class OtaHotUpdateModule internal constructor(context: ReactApplicationContext)
         sharedPrefs.putString(PREVIOUS_PATH, "")
 
         if (previousVersion != "") {
-            sharedPrefs.putString(VERSION, previousVersion)
-            sharedPrefs.putString(PREVIOUS_VERSION, "")
+          sharedPrefs.putString(VERSION, previousVersion)
+          sharedPrefs.putString(PREVIOUS_VERSION, "")
         } else {
-            sharedPrefs.putString(VERSION, "")
+          sharedPrefs.putString(VERSION, "")
         }
 
         promise.resolve(true)

package/android/src/main/java/com/otahotupdate/Utils.kt

@@ -28,15 +28,19 @@ class Utils internal constructor(private val context: Context) {
     return directory.delete()
   }
   fun deleteOldBundleIfneeded(pathKey: String?): Boolean {
-    val pathName = if (pathKey != null) pathKey else PREVIOUS_PATH
+    val pathName = pathKey ?: PREVIOUS_PATH
     val sharedPrefs = SharedPrefs(context)
-    val path = sharedPrefs.getString(pathName)
-    if (!path.isNullOrEmpty()) {
-      val file = File(path)
-      if (file.exists() && file.isFile) {
-        val isDeleted = deleteDirectory(file.parentFile)
-        sharedPrefs.putString(pathName, "")
-        return isDeleted
+    val bundlePath = sharedPrefs.getString(pathName)
+
+    if (!bundlePath.isNullOrEmpty()) {
+      val bundleFile = File(bundlePath)
+      if (bundleFile.exists() && bundleFile.isFile) {
+        val outputFolder = bundleFile.parentFile
+        if (outputFolder != null && outputFolder.exists() && outputFolder.isDirectory) {
+          val isDeleted = deleteDirectory(outputFolder)
+          sharedPrefs.putString(pathName, "")
+          return isDeleted
+        }
       }
     }
     return false

package/ios/OtaHotUpdate.modulemap

@@ -0,0 +1,6 @@
+framework module OtaHotUpdate {
+  umbrella header "OtaHotUpdate.h"
+
+  export *
+  module * { export * }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "2.2.53",
+  "version": "2.2.71",
   "description": "Hot update for react native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package/react-native-ota-hot-update.podspec

@@ -13,7 +13,12 @@ Pod::Spec.new do |s|
 
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/vantuan88291/react-native-ota-hot-update.git", :tag => "#{s.version}" }
+  s.pod_target_xcconfig = {
+    'SWIFT_VERSION' => '5.0',
+    'DEFINES_MODULE' => 'YES'
+  }
 
+  s.module_map = 'ios/OtaHotUpdate.modulemap'
   s.source_files = "ios/**/*.{h,m,mm,cpp}"
   s.dependency 'SSZipArchive', '~> 2.4.3'
   if ENV['RCT_NEW_ARCH_ENABLED'] == '0'