react-native-ota-hot-update 2.3.5 → 2.4.0-rc.1

package/android/generated/java/com/otahotupdate/NativeOtaHotUpdateSpec.java

@@ -19,6 +19,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public abstract class NativeOtaHotUpdateSpec extends ReactContextBaseJavaModule implements TurboModule {
   public static final String NAME = "OtaHotUpdate";
@@ -34,7 +35,7 @@ public abstract class NativeOtaHotUpdateSpec extends ReactContextBaseJavaModule
 
   @ReactMethod
   @DoNotStrip
-  public abstract void setupBundlePath(String path, String extension, Promise promise);
+  public abstract void setupBundlePath(String path, String extension, @Nullable Double version, @Nullable Double maxVersions, @Nullable String metadata, Promise promise);
 
   @ReactMethod
   @DoNotStrip
@@ -67,4 +68,16 @@ public abstract class NativeOtaHotUpdateSpec extends ReactContextBaseJavaModule
   @ReactMethod
   @DoNotStrip
   public abstract void rollbackToPreviousBundle(double a, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getBundleList(double a, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void deleteBundleById(String id, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clearAllBundles(double a, Promise promise);
 }

package/android/generated/jni/RNOtaHotUpdateSpec-generated.cpp

@@ -14,7 +14,7 @@ namespace facebook::react {
 
 static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_setupBundlePath(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "setupBundlePath", "(Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "setupBundlePath", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_setExactBundlePath(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
@@ -57,9 +57,24 @@ static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_rollbackToP
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "rollbackToPreviousBundle", "(DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
+static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_getBundleList(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "getBundleList", "(DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_deleteBundleById(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "deleteBundleById", "(Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
+static facebook::jsi::Value __hostFunction_NativeOtaHotUpdateSpecJSI_clearAllBundles(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "clearAllBundles", "(DLcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
+}
+
 NativeOtaHotUpdateSpecJSI::NativeOtaHotUpdateSpecJSI(const JavaTurboModule::InitParams &params)
   : JavaTurboModule(params) {
-  methodMap_["setupBundlePath"] = MethodMetadata {2, __hostFunction_NativeOtaHotUpdateSpecJSI_setupBundlePath};
+  methodMap_["setupBundlePath"] = MethodMetadata {5, __hostFunction_NativeOtaHotUpdateSpecJSI_setupBundlePath};
   methodMap_["setExactBundlePath"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_setExactBundlePath};
   methodMap_["deleteBundle"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_deleteBundle};
   methodMap_["restart"] = MethodMetadata {0, __hostFunction_NativeOtaHotUpdateSpecJSI_restart};
@@ -68,6 +83,9 @@ NativeOtaHotUpdateSpecJSI::NativeOtaHotUpdateSpecJSI(const JavaTurboModule::Init
   methodMap_["setCurrentVersion"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_setCurrentVersion};
   methodMap_["setUpdateMetadata"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_setUpdateMetadata};
   methodMap_["rollbackToPreviousBundle"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_rollbackToPreviousBundle};
+  methodMap_["getBundleList"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_getBundleList};
+  methodMap_["deleteBundleById"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_deleteBundleById};
+  methodMap_["clearAllBundles"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateSpecJSI_clearAllBundles};
 }
 
 std::shared_ptr<TurboModule> RNOtaHotUpdateSpec_ModuleProvider(const std::string &moduleName, const JavaTurboModule::InitParams &params) {

package/android/generated/jni/react/renderer/components/RNOtaHotUpdateSpec/RNOtaHotUpdateSpecJSI-generated.cpp

@@ -15,7 +15,10 @@ static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setupBundlePath(js
   return static_cast<NativeOtaHotUpdateCxxSpecJSI *>(&turboModule)->setupBundlePath(
     rt,
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
-    count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt)
+    count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
+    count <= 2 || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asNumber()),
+    count <= 3 || args[3].isUndefined() ? std::nullopt : std::make_optional(args[3].asNumber()),
+    count <= 4 || args[4].isUndefined() ? std::nullopt : std::make_optional(args[4].asString(rt))
   );
 }
 static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setExactBundlePath(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
@@ -66,10 +69,28 @@ static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_rollbackToPrevious
     count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber()
   );
 }
+static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_getBundleList(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeOtaHotUpdateCxxSpecJSI *>(&turboModule)->getBundleList(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber()
+  );
+}
+static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_deleteBundleById(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeOtaHotUpdateCxxSpecJSI *>(&turboModule)->deleteBundleById(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt)
+  );
+}
+static jsi::Value __hostFunction_NativeOtaHotUpdateCxxSpecJSI_clearAllBundles(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeOtaHotUpdateCxxSpecJSI *>(&turboModule)->clearAllBundles(
+    rt,
+    count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asNumber()
+  );
+}
 
 NativeOtaHotUpdateCxxSpecJSI::NativeOtaHotUpdateCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("OtaHotUpdate", jsInvoker) {
-  methodMap_["setupBundlePath"] = MethodMetadata {2, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setupBundlePath};
+  methodMap_["setupBundlePath"] = MethodMetadata {5, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setupBundlePath};
   methodMap_["setExactBundlePath"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setExactBundlePath};
   methodMap_["deleteBundle"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_deleteBundle};
   methodMap_["restart"] = MethodMetadata {0, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_restart};
@@ -78,6 +99,9 @@ NativeOtaHotUpdateCxxSpecJSI::NativeOtaHotUpdateCxxSpecJSI(std::shared_ptr<CallI
   methodMap_["setCurrentVersion"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setCurrentVersion};
   methodMap_["setUpdateMetadata"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_setUpdateMetadata};
   methodMap_["rollbackToPreviousBundle"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_rollbackToPreviousBundle};
+  methodMap_["getBundleList"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_getBundleList};
+  methodMap_["deleteBundleById"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_deleteBundleById};
+  methodMap_["clearAllBundles"] = MethodMetadata {1, __hostFunction_NativeOtaHotUpdateCxxSpecJSI_clearAllBundles};
 }
 
 

package/android/generated/jni/react/renderer/components/RNOtaHotUpdateSpec/RNOtaHotUpdateSpecJSI.h

@@ -20,7 +20,7 @@ protected:
   NativeOtaHotUpdateCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
 public:
-  virtual jsi::Value setupBundlePath(jsi::Runtime &rt, jsi::String path, jsi::String extension) = 0;
+  virtual jsi::Value setupBundlePath(jsi::Runtime &rt, jsi::String path, jsi::String extension, std::optional<double> version, std::optional<double> maxVersions, std::optional<jsi::String> metadata) = 0;
   virtual jsi::Value setExactBundlePath(jsi::Runtime &rt, jsi::String path) = 0;
   virtual jsi::Value deleteBundle(jsi::Runtime &rt, double i) = 0;
   virtual void restart(jsi::Runtime &rt) = 0;
@@ -29,6 +29,9 @@ public:
   virtual jsi::Value setCurrentVersion(jsi::Runtime &rt, jsi::String version) = 0;
   virtual jsi::Value setUpdateMetadata(jsi::Runtime &rt, jsi::String metadata) = 0;
   virtual jsi::Value rollbackToPreviousBundle(jsi::Runtime &rt, double a) = 0;
+  virtual jsi::Value getBundleList(jsi::Runtime &rt, double a) = 0;
+  virtual jsi::Value deleteBundleById(jsi::Runtime &rt, jsi::String id) = 0;
+  virtual jsi::Value clearAllBundles(jsi::Runtime &rt, double a) = 0;
 
 };
 
@@ -55,13 +58,13 @@ private:
 
     }
 
-    jsi::Value setupBundlePath(jsi::Runtime &rt, jsi::String path, jsi::String extension) override {
+    jsi::Value setupBundlePath(jsi::Runtime &rt, jsi::String path, jsi::String extension, std::optional<double> version, std::optional<double> maxVersions, std::optional<jsi::String> metadata) override {
       static_assert(
-          bridging::getParameterCount(&T::setupBundlePath) == 3,
-          "Expected setupBundlePath(...) to have 3 parameters");
+          bridging::getParameterCount(&T::setupBundlePath) == 6,
+          "Expected setupBundlePath(...) to have 6 parameters");
 
       return bridging::callFromJs<jsi::Value>(
-          rt, &T::setupBundlePath, jsInvoker_, instance_, std::move(path), std::move(extension));
+          rt, &T::setupBundlePath, jsInvoker_, instance_, std::move(path), std::move(extension), std::move(version), std::move(maxVersions), std::move(metadata));
     }
     jsi::Value setExactBundlePath(jsi::Runtime &rt, jsi::String path) override {
       static_assert(
@@ -127,6 +130,30 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::rollbackToPreviousBundle, jsInvoker_, instance_, std::move(a));
     }
+    jsi::Value getBundleList(jsi::Runtime &rt, double a) override {
+      static_assert(
+          bridging::getParameterCount(&T::getBundleList) == 2,
+          "Expected getBundleList(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getBundleList, jsInvoker_, instance_, std::move(a));
+    }
+    jsi::Value deleteBundleById(jsi::Runtime &rt, jsi::String id) override {
+      static_assert(
+          bridging::getParameterCount(&T::deleteBundleById) == 2,
+          "Expected deleteBundleById(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::deleteBundleById, jsInvoker_, instance_, std::move(id));
+    }
+    jsi::Value clearAllBundles(jsi::Runtime &rt, double a) override {
+      static_assert(
+          bridging::getParameterCount(&T::clearAllBundles) == 2,
+          "Expected clearAllBundles(...) to have 2 parameters");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::clearAllBundles, jsInvoker_, instance_, std::move(a));
+    }
 
   private:
     friend class NativeOtaHotUpdateCxxSpec;

package/android/gradle.properties

@@ -3,3 +3,7 @@ OtaHotUpdate_minSdkVersion=21
 OtaHotUpdate_targetSdkVersion=31
 OtaHotUpdate_compileSdkVersion=31
 OtaHotUpdate_ndkversion=21.4.7075529
+
+# Kotlin daemon configuration
+kotlin.daemon.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+kotlin.incremental=false

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

@@ -3,6 +3,7 @@ package com.otahotupdate
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
+import java.io.File
 import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
@@ -66,7 +67,11 @@ class OtaHotUpdate : BaseReactPackage() {
       val pathBundle = sharedPrefs.getString(PATH)
       val version = sharedPrefs.getString(VERSION)
       val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_CODE)
-      if (pathBundle == "" || (currentVersionName != context.getVersionCode())) {
+      val hasBundlePath = !pathBundle.isNullOrBlank()
+      val isSameAppVersion = currentVersionName == context.getVersionCode()
+      val bundleFileExists = hasBundlePath && File(pathBundle!!).isFile
+
+      if (!hasBundlePath || !isSameAppVersion || !bundleFileExists) {
         if (pathBundle != "") {
           sharedPrefs.putString(PATH, "")
         }