react-native-worklets 0.8.0-rc.0 → 0.8.1

package/Common/cpp/worklets/WorkletRuntime/HermesProfiling.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+#include <string>
+
+namespace worklets {
+
+void startProfiling(facebook::jsi::Runtime &rt, double meanHzFreq);
+std::string stopProfiling(facebook::jsi::Runtime &rt);
+
+} // namespace worklets

package/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp

@@ -1,10 +1,12 @@
 #include <worklets/Tools/WorkletsJSIUtils.h>
 #include <worklets/Tools/WorkletsVersion.h>
+#include <worklets/WorkletRuntime/HermesProfiling.h>
 #include <worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h>
 #include <worklets/WorkletRuntime/RuntimeKind.h>
 #include <worklets/WorkletRuntime/WorkletRuntimeCollector.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 
 namespace worklets {
@@ -34,6 +36,24 @@ void RNRuntimeWorkletDecorator::decorate(
 #endif // IS_REANIMATED_EXAMPLE_APP
 
   injectWorkletsCppVersion(rnRuntime);
+
+  rnRuntime.global().setProperty(
+      rnRuntime,
+      "_startProfiling",
+      jsi::Function::createFromHostFunction(
+          rnRuntime,
+          jsi::PropNameID::forAscii(rnRuntime, "_startProfiling"),
+          1,
+          [](jsi::Runtime &rt, const jsi::Value &, const jsi::Value *args, size_t count) {
+            const double meanHzFreq = (count > 0 && !args[0].isUndefined()) ? args[0].asNumber() : 100.0;
+            startProfiling(rt, meanHzFreq);
+            return jsi::Value::undefined();
+          }));
+
+  jsi_utils::installJsiFunction(rnRuntime, "_stopProfiling", [](jsi::Runtime &rt) {
+    std::string path = stopProfiling(rt);
+    return jsi::String::createFromUtf8(rt, path);
+  });
 }
 
 #ifdef IS_REANIMATED_EXAMPLE_APP

package/Common/cpp/worklets/WorkletRuntime/RuntimeBindings.h

@@ -13,7 +13,7 @@ struct RuntimeBindings {
 
   const RequestAnimationFrame requestAnimationFrame;
 
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
   using AbortRequest = std::function<void(jsi::Runtime &rt, double requestId)>;
   using ClearCookies = std::function<void(jsi::Runtime &rt, jsi::Function &&responseSender)>;
 #ifdef ANDROID
@@ -35,7 +35,7 @@ struct RuntimeBindings {
   const AbortRequest abortRequest;
   const ClearCookies clearCookies;
   const SendRequest sendRequest;
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
 };
 
 } // namespace worklets

package/Common/cpp/worklets/WorkletRuntime/RuntimeData.h

@@ -16,11 +16,7 @@ constexpr RuntimeId rnRuntimeId{1};
 constexpr RuntimeId uiRuntimeId{2};
 extern const std::string uiRuntimeName;
 
-#if REACT_NATIVE_MINOR_VERSION >= 81
-
 constexpr facebook::jsi::UUID weakRuntimeUUID{0x770c6f2e, 0x1e4d, 0x436a, 0xa2b1, 0x9f322c8d5f5e};
 
-#endif // REACT_NATIVE_MINOR_VERSION >= 81
-
 }; // namespace RuntimeData
 } // namespace worklets

package/Common/cpp/worklets/WorkletRuntime/RuntimeHolder.h

@@ -1,5 +1,4 @@
 #pragma once
-#if REACT_NATIVE_MINOR_VERSION >= 81
 
 #include <memory>
 
@@ -18,5 +17,3 @@ struct WeakRuntimeHolder {
 };
 
 } // namespace worklets
-
-#endif // REACT_NATIVE_MINOR_VERSION >= 81

package/Common/cpp/worklets/WorkletRuntime/WorkletRuntime.cpp

@@ -91,27 +91,43 @@ WorkletRuntime::WorkletRuntime(
 void WorkletRuntime::init(std::shared_ptr<JSIWorkletsModuleProxy> jsiWorkletsModuleProxy) {
   jsi::Runtime &rt = *runtime_;
 
-#if REACT_NATIVE_MINOR_VERSION >= 81
   rt.setRuntimeData(
       RuntimeData::weakRuntimeUUID,
       std::make_shared<WeakRuntimeHolder>(WeakRuntimeHolder{.weakRuntime = weak_from_this()}));
-#endif // REACT_NATIVE_MINOR_VERSION >= 81
 
   const auto jsScheduler = jsiWorkletsModuleProxy->getJSScheduler();
   const auto isDevBundle = jsiWorkletsModuleProxy->isDevBundle();
   const auto memoryManager_ = jsiWorkletsModuleProxy->getMemoryManager();
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
-  auto script = jsiWorkletsModuleProxy->getScript();
+  const auto script = jsiWorkletsModuleProxy->getScript();
   const auto &sourceUrl = jsiWorkletsModuleProxy->getSourceUrl();
-  auto runtimeBindings = jsiWorkletsModuleProxy->getRuntimeBindings();
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
+  const auto runtimeBindings = jsiWorkletsModuleProxy->getRuntimeBindings();
+  const auto bundleModeEnabled = jsiWorkletsModuleProxy->isBundleModeEnabled();
 
   auto optimizedJsiWorkletsModuleProxy = jsi_utils::optimizedFromHostObject(rt, std::move(jsiWorkletsModuleProxy));
 
   WorkletRuntimeDecorator::decorate(
       rt, name_, jsScheduler, isDevBundle, std::move(optimizedJsiWorkletsModuleProxy), eventLoop_);
 
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
+  if (bundleModeEnabled) {
+    bundleModeInit(jsScheduler, script, sourceUrl, runtimeBindings);
+  } else {
+    legacyModeInit();
+  }
+
+  try {
+    memoryManager_->loadAllCustomSerializables(shared_from_this());
+  } catch (jsi::JSError &e) {
+    throw std::runtime_error(std::string("[Worklets] Failed to load custom serializables. Reason: ") + e.getMessage());
+  }
+}
+
+void WorkletRuntime::bundleModeInit(
+    const std::shared_ptr<JSScheduler> &jsScheduler,
+    const std::shared_ptr<const ScriptBuffer> &script,
+    const std::string &sourceUrl,
+    const std::shared_ptr<RuntimeBindings> &runtimeBindings) {
+  jsi::Runtime &rt = *runtime_;
+
   if (!script) {
     throw std::runtime_error("[Worklets] Expected to receive the bundle, but got nullptr instead.");
   }
@@ -130,9 +146,11 @@ void WorkletRuntime::init(std::shared_ptr<JSIWorkletsModuleProxy> jsiWorkletsMod
   }
 
   WorkletRuntimeDecorator::postEvaluateScript(rt, runtimeBindings);
+}
+
+void WorkletRuntime::legacyModeInit() {
+  jsi::Runtime &rt = *runtime_;
 
-#else
-  // Legacy behavior
   auto valueUnpackerBuffer = std::make_shared<const jsi::StringBuffer>(ValueUnpackerCode);
   rt.evaluateJavaScript(valueUnpackerBuffer, "valueUnpacker");
 
@@ -146,12 +164,6 @@ void WorkletRuntime::init(std::shared_ptr<JSIWorkletsModuleProxy> jsiWorkletsMod
 
   auto customSerializableUnpackerBuffer = std::make_shared<const jsi::StringBuffer>(CustomSerializableUnpackerCode);
   rt.evaluateJavaScript(customSerializableUnpackerBuffer, "customSerializableUnpacker");
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
-  try {
-    memoryManager_->loadAllCustomSerializables(shared_from_this());
-  } catch (jsi::JSError &e) {
-    throw std::runtime_error(std::string("[Worklets] Failed to load custom serializables. Reason: ") + e.getMessage());
-  }
 }
 
 /* #region schedule */
@@ -265,7 +277,6 @@ void scheduleOnRuntime(
   workletRuntime->schedule(serializableWorklet);
 }
 
-#if REACT_NATIVE_MINOR_VERSION >= 81
 std::weak_ptr<WorkletRuntime> WorkletRuntime::getWeakRuntimeFromJSIRuntime(jsi::Runtime &rt) {
   auto runtimeData = rt.getRuntimeData(RuntimeData::weakRuntimeUUID);
   if (!runtimeData) [[unlikely]] {
@@ -276,7 +287,6 @@ std::weak_ptr<WorkletRuntime> WorkletRuntime::getWeakRuntimeFromJSIRuntime(jsi::
   auto weakHolder = std::static_pointer_cast<WeakRuntimeHolder>(runtimeData);
   return weakHolder->weakRuntime;
 }
-#endif // REACT_NATIVE_MINOR_VERSION >= 81
 
 /* #region deprecated */
 

package/Common/cpp/worklets/WorkletRuntime/WorkletRuntime.h

@@ -4,12 +4,13 @@
 #include <jsi/jsi.h>
 #include <jsireact/JSIExecutor.h>
 #include <react/debug/react_native_assert.h>
-
 #include <worklets/RunLoop/AsyncQueue.h>
 #include <worklets/RunLoop/AsyncQueueImpl.h>
 #include <worklets/RunLoop/EventLoop.h>
 #include <worklets/SharedItems/Serializable.h>
 #include <worklets/Tools/JSScheduler.h>
+#include <worklets/Tools/ScriptBuffer.h>
+#include <worklets/WorkletRuntime/RuntimeBindings.h>
 #include <worklets/WorkletRuntime/RuntimeData.h>
 
 #include <memory>
@@ -158,21 +159,29 @@ class WorkletRuntime : public jsi::HostObject, public std::enable_shared_from_th
 
   /* #endregion */
 
-#if REACT_NATIVE_MINOR_VERSION >= 81
   /**
    * Retrieves a weak reference to the WorkletRuntime associated with the
    * provided jsi::Runtime.
    *
    * Throws when invoked with a non-worklet runtime.
+   *
+   * Available only on React Native 0.81 and higher.
    */
   static std::weak_ptr<WorkletRuntime> getWeakRuntimeFromJSIRuntime(jsi::Runtime &rt);
-#endif // REACT_NATIVE_MINOR_VERSION >= 81
 
 #ifndef NDEBUG
   static jsi::Function getCallGuard(jsi::Runtime &rt);
 #endif // NDEBUG
 
  private:
+  void bundleModeInit(
+      const std::shared_ptr<JSScheduler> &jsScheduler,
+      const std::shared_ptr<const ScriptBuffer> &script,
+      const std::string &sourceUrl,
+      const std::shared_ptr<RuntimeBindings> &runtimeBindings);
+
+  void legacyModeInit();
+
   const RuntimeData::RuntimeId runtimeId_;
   const std::shared_ptr<std::recursive_mutex> runtimeMutex_;
   const std::shared_ptr<jsi::Runtime> runtime_;

package/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp

@@ -1,17 +1,45 @@
 #include <worklets/SharedItems/Serializable.h>
 #include <worklets/SharedItems/SerializableFactory.h>
+#include <worklets/Tools/Defs.h>
 #include <worklets/Tools/JSISerializer.h>
 #include <worklets/Tools/PlatformLogger.h>
 #include <worklets/Tools/WorkletsJSIUtils.h>
+#include <worklets/WorkletRuntime/HermesProfiling.h>
 #include <worklets/WorkletRuntime/RuntimeKind.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 #include <worklets/WorkletRuntime/WorkletRuntimeDecorator.h>
 
+#ifdef ANDROID
+#include <android/trace.h>
+#endif
+
+#if defined(__APPLE__)
+#include <os/trace_base.h>
+#if OS_LOG_TARGET_HAS_10_15_FEATURES
+#include <os/log.h>
+#include <os/signpost.h>
+#endif
+#endif
+
+#include <chrono>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#if defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES
+static os_log_t workletsInstrumentsLogHandle = nullptr;
+static thread_local os_signpost_id_t tls_signpostId = OS_SIGNPOST_ID_INVALID;
+static thread_local std::string tls_signpostName;
+
+static os_log_t getWorkletsInstrumentsLogHandle() {
+  if (!workletsInstrumentsLogHandle) {
+    workletsInstrumentsLogHandle = os_log_create("dev.worklets.instruments", OS_LOG_CATEGORY_POINTS_OF_INTEREST);
+  }
+  return workletsInstrumentsLogHandle;
+}
+#endif
+
 namespace worklets {
 
 static inline double performanceNow() {
@@ -87,6 +115,33 @@ void WorkletRuntimeDecorator::decorate(
     return jsi::String::createFromUtf8(rt, stringifyJSIValue(rt, value));
   });
 
+  jsi_utils::installJsiFunction(rt, "_beginSection", [](jsi::Runtime &rt, const jsi::Value &nameValue) {
+#ifdef ANDROID
+    ATrace_beginSection(nameValue.asString(rt).utf8(rt).c_str());
+#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES
+    os_log_t logHandle = getWorkletsInstrumentsLogHandle();
+    if (os_signpost_enabled(logHandle)) {
+      tls_signpostName = nameValue.asString(rt).utf8(rt);
+      tls_signpostId = os_signpost_id_make_with_pointer(logHandle, &tls_signpostId);
+      os_signpost_interval_begin(logHandle, tls_signpostId, "Worklets", "%s", tls_signpostName.c_str());
+    }
+#endif
+    return jsi::Value::undefined();
+  });
+
+  jsi_utils::installJsiFunction(rt, "_endSection", [](jsi::Runtime &rt) {
+#ifdef ANDROID
+    ATrace_endSection();
+#elif defined(__APPLE__) && OS_LOG_TARGET_HAS_10_15_FEATURES
+    os_log_t logHandle = getWorkletsInstrumentsLogHandle();
+    if (os_signpost_enabled(logHandle) && tls_signpostId != OS_SIGNPOST_ID_INVALID) {
+      os_signpost_interval_end(logHandle, tls_signpostId, "Worklets", "%s end", tls_signpostName.c_str());
+      tls_signpostId = OS_SIGNPOST_ID_INVALID;
+    }
+#endif
+    return jsi::Value::undefined();
+  });
+
   jsi_utils::installJsiFunction(
       rt, "_createSerializable", [](jsi::Runtime &rt, const jsi::Value &value, const jsi::Value &nativeStateSource) {
         auto shouldRetainRemote = jsi::Value::undefined();
@@ -210,6 +265,25 @@ void WorkletRuntimeDecorator::decorate(
           }));
   rt.global().setProperty(rt, "performance", performance);
 
+#if JS_RUNTIME_HERMES
+  rt.global().setProperty(
+      rt,
+      "_startProfiling",
+      jsi::Function::createFromHostFunction(
+          rt,
+          jsi::PropNameID::forAscii(rt, "_startProfiling"),
+          1,
+          [](jsi::Runtime &rt, const jsi::Value &, const jsi::Value *args, size_t count) {
+            const double meanHzFreq = (count > 0 && !args[0].isUndefined()) ? args[0].asNumber() : 100.0;
+            startProfiling(rt, meanHzFreq);
+            return jsi::Value::undefined();
+          }));
+  jsi_utils::installJsiFunction(rt, "_stopProfiling", [](jsi::Runtime &rt) {
+    std::string path = stopProfiling(rt);
+    return jsi::String::createFromUtf8(rt, path);
+  });
+#endif // JS_RUNTIME_HERMES
+
   jsi_utils::installJsiFunction(
       rt,
       "_scheduleTimeoutCallback",
@@ -227,7 +301,6 @@ void WorkletRuntimeDecorator::decorate(
       });
 }
 
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
 void WorkletRuntimeDecorator::postEvaluateScript(
     jsi::Runtime &rt,
     const std::shared_ptr<RuntimeBindings> &runtimeBindings) {
@@ -307,6 +380,5 @@ void WorkletRuntimeDecorator::installNetworking(
   Networking.asObject(rt).setProperty(rt, "clearCookies", std::move(jsiClearCookies));
 }
 #endif // WORKLETS_FETCH_PREVIEW_ENABLED
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
 
 } // namespace worklets

package/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.h

@@ -2,9 +2,7 @@
 
 #include <worklets/RunLoop/EventLoop.h>
 #include <worklets/Tools/JSScheduler.h>
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
 #include <worklets/WorkletRuntime/RuntimeBindings.h>
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
 
 #include <jsi/jsi.h>
 
@@ -25,14 +23,12 @@ class WorkletRuntimeDecorator {
       jsi::Object &&jsiWorkletsModuleProxy,
       const std::shared_ptr<EventLoop> &eventLoop);
 
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
   static void postEvaluateScript(jsi::Runtime &rt, const std::shared_ptr<RuntimeBindings> &runtimeBindings);
 
  private:
 #ifdef WORKLETS_FETCH_PREVIEW_ENABLED
   static void installNetworking(jsi::Runtime &rt, const std::shared_ptr<RuntimeBindings> &runtimeBindings);
 #endif // WORKLETS_FETCH_PREVIEW_ENABLED
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
 };
 
 } // namespace worklets

package/RNWorklets.podspec

@@ -13,7 +13,6 @@ ios_min_version = '13.4'
 feature_flags = $worklets_config[:feature_flags_flag]
 version_flags = "-DWORKLETS_VERSION=#{package['version']} -DREACT_NATIVE_MINOR_VERSION=#{$worklets_config[:react_native_minor_version]}"
 worklets_profiling_flag = ENV['IS_WORKLETS_PROFILING'] ? '-DWORKLETS_PROFILING' : ''
-bundle_mode_flag = $worklets_config[:bundle_mode_flag]
 fetch_preview_flag = $worklets_config[:fetch_preview_flag]
 hermes_v1_flag = ENV['RCT_HERMES_V1_ENABLED'] == '1' ? '-DHERMES_V1_ENABLED' : ''
 
@@ -76,7 +75,7 @@ Pod::Spec.new do |s|
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     "GCC_PREPROCESSOR_DEFINITIONS[config=*Debug*]" => "$(inherited) #{hermes_debug_hidden_flags}",
     "GCC_PREPROCESSOR_DEFINITIONS[config=*Release*]" => "$(inherited)",
-    "OTHER_CFLAGS" => "$(inherited) #{feature_flags} #{version_flags} #{worklets_profiling_flag} #{bundle_mode_flag} #{fetch_preview_flag} #{hermes_v1_flag}",
+    "OTHER_CFLAGS" => "$(inherited) #{feature_flags} #{version_flags} #{worklets_profiling_flag} #{fetch_preview_flag} #{hermes_v1_flag}",
   }
   s.xcconfig = {
     "HEADER_SEARCH_PATHS" => [

package/android/CMakeLists.txt

@@ -32,9 +32,6 @@ endif()
 if(${IS_REANIMATED_EXAMPLE_APP})
   string(APPEND CMAKE_CXX_FLAGS " -DIS_REANIMATED_EXAMPLE_APP -Wpedantic")
 endif()
-if(${WORKLETS_BUNDLE_MODE_ENABLED})
-  string(APPEND CMAKE_CXX_FLAGS " -DWORKLETS_BUNDLE_MODE_ENABLED")
-endif()
 if(${WORKLETS_FETCH_PREVIEW_ENABLED})
   string(APPEND CMAKE_CXX_FLAGS " -DWORKLETS_FETCH_PREVIEW_ENABLED")
 endif()
@@ -99,7 +96,7 @@ target_include_directories(
 # build shared lib
 set_target_properties(worklets PROPERTIES LINKER_LANGUAGE CXX)
 
-target_link_libraries(worklets log ReactAndroid::reactnative ReactAndroid::jsi
+target_link_libraries(worklets android log ReactAndroid::reactnative ReactAndroid::jsi
                       fbjni::fbjni)
 
 if(${JS_RUNTIME} STREQUAL "hermes")

package/android/build.gradle

@@ -122,7 +122,6 @@ def REACT_NATIVE_VERSION = getReactNativeVersion()
 def WORKLETS_VERSION = getWorkletsVersion()
 def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
 def IS_REANIMATED_EXAMPLE_APP = safeAppExtGet("isReanimatedExampleApp", false)
-def BUNDLE_MODE_ENABLED = isFlagEnabled(featureFlags, "BUNDLE_MODE_ENABLED");
 def FETCH_PREVIEW_ENABLED = isFlagEnabled(featureFlags, "FETCH_PREVIEW_ENABLED");
 def WORKLETS_FEATURE_FLAGS = getStaticFeatureFlagsString(featureFlags)
 def HERMES_V1_ENABLED = getHermesV1Enabled()
@@ -213,7 +212,6 @@ android {
         buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
         buildConfigField("int", "EXOPACKAGE_FLAGS", "0")
         buildConfigField("int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString())
-        buildConfigField("boolean", "BUNDLE_MODE_ENABLED", BUNDLE_MODE_ENABLED.toString())
 
         externalNativeBuild {
             cmake {
@@ -223,7 +221,6 @@ android {
                         "-DREACT_NATIVE_DIR=${toPlatformFileString(reactNativeRootDir.path)}",
                         "-DJS_RUNTIME=${JS_RUNTIME}",
                         "-DIS_REANIMATED_EXAMPLE_APP=${IS_REANIMATED_EXAMPLE_APP}",
-                        "-DWORKLETS_BUNDLE_MODE_ENABLED=${BUNDLE_MODE_ENABLED}",
                         "-DWORKLETS_FETCH_PREVIEW_ENABLED=${FETCH_PREVIEW_ENABLED}",
                         "-DWORKLETS_PROFILING=${WORKLETS_PROFILING}",
                         "-DWORKLETS_VERSION=${WORKLETS_VERSION}",

package/android/src/main/cpp/worklets/android/JScriptBufferWrapper.cpp

@@ -3,8 +3,8 @@
  * https://github.com/facebook/react-native/blob/main/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp
  */
 
-#include <cxxreact/JSBigString.h>
 #include <cxxreact/RecoverableError.h>
+#include <worklets/Tools/Defs.h>
 #include <worklets/Tools/ScriptBuffer.h>
 #include <worklets/android/JScriptBufferWrapper.h>
 

package/android/src/main/cpp/worklets/android/JWorkletRuntimeWrapper.cpp

@@ -1,4 +1,4 @@
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
 
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
@@ -49,4 +49,4 @@ void JWorkletRuntimeWrapper::registerNatives() {
 }
 } // namespace worklets
 
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED

package/android/src/main/cpp/worklets/android/JWorkletRuntimeWrapper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
 
 #include <fbjni/fbjni.h>
 #include <react/jni/ReadableNativeArray.h>
@@ -40,4 +40,4 @@ class JWorkletRuntimeWrapper : public jni::HybridClass<JWorkletRuntimeWrapper> {
 
 } // namespace worklets
 
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED

package/android/src/main/cpp/worklets/android/WorkletsModule.cpp

@@ -1,12 +1,13 @@
 #include <worklets/NativeModules/JSIWorkletsModuleProxy.h>
 #include <worklets/Tools/ScriptBuffer.h>
 #include <worklets/Tools/WorkletsJSIUtils.h>
+#include <worklets/WorkletRuntime/BundleModeConfig.h>
 #include <worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h>
 #include <worklets/WorkletRuntime/RuntimeBindings.h>
 #include <worklets/android/AnimationFrameCallback.h>
 #include <worklets/android/WorkletsModule.h>
 
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
 #include <folly/json/dynamic.h>
 #include <jni.h>
 #include <jsi/JSIDynamic.h>
@@ -15,7 +16,7 @@
 #include <react/jni/ReadableNativeMap.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 #include <worklets/android/JWorkletRuntimeWrapper.h>
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
 
 #include <memory>
 #include <string>
@@ -29,13 +30,12 @@ using namespace react;
 
 WorkletsModule::WorkletsModule(
     jni::alias_ref<jhybridobject> jThis, // NOLINT //(performance-unnecessary-value-param)
+    const BundleModeConfig &bundleModeConfig,
     jsi::Runtime *rnRuntime,
     jni::alias_ref<JavaMessageQueueThread::javaobject>
         messageQueueThread, // NOLINT //(performance-unnecessary-value-param)
     const std::shared_ptr<facebook::react::CallInvoker> &jsCallInvoker,
-    const std::shared_ptr<UIScheduler> &uiScheduler,
-    const std::shared_ptr<const ScriptBuffer> &script,
-    const std::string &sourceURL)
+    const std::shared_ptr<UIScheduler> &uiScheduler)
     : javaPart_(jni::make_global(jThis)),
       rnRuntime_(rnRuntime),
       workletsModuleProxy_(std::make_shared<WorkletsModuleProxy>(
@@ -46,15 +46,14 @@ WorkletsModule::WorkletsModule(
           getIsOnJSQueueThread(),
           std::make_shared<RuntimeBindings>(RuntimeBindings{
               .requestAnimationFrame = getRequestAnimationFrame()
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
                   ,
               .abortRequest = getAbortRequest(),
               .clearCookies = getClearCookies(),
               .sendRequest = getSendRequest()
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
           }),
-          script,
-          sourceURL)) {
+          bundleModeConfig)) {
   auto jsiWorkletsModuleProxy = workletsModuleProxy_->createJSIWorkletsModuleProxy();
   auto optimizedJsiWorkletsModuleProxy = jsi_utils::optimizedFromHostObject(
       *rnRuntime_, std::static_pointer_cast<jsi::HostObject>(std::move(jsiWorkletsModuleProxy)));
@@ -64,6 +63,7 @@ WorkletsModule::WorkletsModule(
 
 jni::local_ref<WorkletsModule::jhybriddata> WorkletsModule::initHybrid(
     jni::alias_ref<jhybridobject> jThis, // NOLINT //(performance-unnecessary-value-param)
+    jboolean bundleModeEnabled,
     jlong jsContext,
     jni::alias_ref<JavaMessageQueueThread::javaobject>
         messageQueueThread, // NOLINT //(performance-unnecessary-value-param)
@@ -78,13 +78,23 @@ jni::local_ref<WorkletsModule::jhybriddata> WorkletsModule::initHybrid(
 
   std::shared_ptr<const ScriptBuffer> script = nullptr;
   std::string sourceURL;
-#ifdef WORKLETS_BUNDLE_MODE_ENABLED
-  auto cxxWrapper = jScriptBufferWrapper->cthis();
-  script = cxxWrapper->getScript();
-  sourceURL = cxxWrapper->getSourceUrl();
-#endif // WORKLETS_BUNDLE_MODE_ENABLED
-
-  return makeCxxInstance(jThis, rnRuntime, messageQueueThread, jsCallInvoker, uiScheduler, script, sourceURL);
+  if (bundleModeEnabled) {
+    auto cxxWrapper = jScriptBufferWrapper->cthis();
+    script = cxxWrapper->getScript();
+    sourceURL = cxxWrapper->getSourceUrl();
+  }
+
+  return makeCxxInstance(
+      jThis,
+      BundleModeConfig{
+          .enabled = static_cast<bool>(bundleModeEnabled),
+          .script = script,
+          .sourceURL = sourceURL,
+      },
+      rnRuntime,
+      messageQueueThread,
+      jsCallInvoker,
+      uiScheduler);
 }
 
 RuntimeBindings::RequestAnimationFrame WorkletsModule::getRequestAnimationFrame() {
@@ -95,7 +105,7 @@ RuntimeBindings::RequestAnimationFrame WorkletsModule::getRequestAnimationFrame(
   };
 }
 
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
 RuntimeBindings::AbortRequest WorkletsModule::getAbortRequest() {
   return [javaPart = javaPart_](jsi::Runtime &rt, double requestId) -> void {
     static const auto jAbortRequest = javaPart->getClass()->getMethod<void(int, double)>("abortRequest");
@@ -167,7 +177,7 @@ RuntimeBindings::SendRequest WorkletsModule::getSendRequest() {
         withCredentials);
   };
 }
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
 
 std::function<bool()> WorkletsModule::getIsOnJSQueueThread() {
   return [javaPart = javaPart_]() -> bool {

package/android/src/main/cpp/worklets/android/WorkletsModule.h

@@ -7,6 +7,7 @@
 #include <worklets/NativeModules/WorkletsModuleProxy.h>
 #include <worklets/Tools/Defs.h>
 #include <worklets/Tools/ScriptBuffer.h>
+#include <worklets/WorkletRuntime/BundleModeConfig.h>
 #include <worklets/WorkletRuntime/RuntimeBindings.h>
 #include <worklets/android/AndroidUIScheduler.h>
 #include <worklets/android/JScriptBufferWrapper.h>
@@ -25,6 +26,7 @@ class WorkletsModule : public jni::HybridClass<WorkletsModule> {
 
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jhybridobject> jThis,
+      jboolean bundleModeEnabled,
       jlong jsContext,
       jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread,
       jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder,
@@ -40,12 +42,11 @@ class WorkletsModule : public jni::HybridClass<WorkletsModule> {
  private:
   explicit WorkletsModule(
       jni::alias_ref<jhybridobject> jThis,
+      const BundleModeConfig &bundleModeConfig,
       jsi::Runtime *rnRuntime,
       jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread,
       const std::shared_ptr<facebook::react::CallInvoker> &jsCallInvoker,
-      const std::shared_ptr<UIScheduler> &uiScheduler,
-      const std::shared_ptr<const ScriptBuffer> &script,
-      const std::string &sourceURL);
+      const std::shared_ptr<UIScheduler> &uiScheduler);
 
   void invalidateCpp();
 
@@ -55,11 +56,11 @@ class WorkletsModule : public jni::HybridClass<WorkletsModule> {
   }
 
   RuntimeBindings::RequestAnimationFrame getRequestAnimationFrame();
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
   RuntimeBindings::AbortRequest getAbortRequest();
   RuntimeBindings::ClearCookies getClearCookies();
   RuntimeBindings::SendRequest getSendRequest();
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
 
   std::function<bool()> getIsOnJSQueueThread();
 

package/android/src/main/cpp/worklets/android/WorkletsOnLoad.cpp

@@ -12,8 +12,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
     worklets::AndroidUIScheduler::registerNatives();
     worklets::AnimationFrameCallback::registerNatives();
     worklets::JScriptBufferWrapper::registerNatives();
-#if defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#ifdef WORKLETS_FETCH_PREVIEW_ENABLED
     worklets::JWorkletRuntimeWrapper::registerNatives();
-#endif // defined(WORKLETS_BUNDLE_MODE_ENABLED) && defined(WORKLETS_FETCH_PREVIEW_ENABLED)
+#endif // WORKLETS_FETCH_PREVIEW_ENABLED
   });
 }