chore: wip

Author: tjzel

packages/react-native-worklets/Common/cpp/worklets/NativeModules/JSIWorkletsModuleProxy.cpp

@@ -158,7 +158,8 @@ JSIWorkletsModuleProxy::JSIWorkletsModuleProxy(
     const std::shared_ptr<RuntimeManager> &runtimeManager,
     const std::weak_ptr<WorkletRuntime> &uiWorkletRuntime,
     const std::shared_ptr<RuntimeBindings> &runtimeBindings,
-    const BundleModeConfig &bundleModeConfig)
+    const BundleModeConfig &bundleModeConfig,
+    const std::shared_ptr<UnpackerLoader> &unpackerLoader)
     : jsi::HostObject(),
       isDevBundle_(isDevBundle),
       bundleModeConfig_(bundleModeConfig),
@@ -168,13 +169,16 @@ JSIWorkletsModuleProxy::JSIWorkletsModuleProxy(
       memoryManager_(memoryManager),
       runtimeManager_(runtimeManager),
       uiWorkletRuntime_(uiWorkletRuntime),
-      runtimeBindings_(runtimeBindings) {}
+      runtimeBindings_(runtimeBindings),
+      unpackerLoader_(unpackerLoader) {}
 
 JSIWorkletsModuleProxy::~JSIWorkletsModuleProxy() = default;
 
 std::vector<jsi::PropNameID> JSIWorkletsModuleProxy::getPropertyNames(jsi::Runtime &rt) {
   std::vector<jsi::PropNameID> propertyNames;
 
+  propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "loadUnpackers"));
+
   propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "createSerializable"));
   propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "createSerializableBigInt"));
   propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "createSerializableBoolean"));
@@ -221,12 +225,66 @@ std::vector<jsi::PropNameID> JSIWorkletsModuleProxy::getPropertyNames(jsi::Runti
   propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "getUIRuntimeHolder"));
   propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "getUISchedulerHolder"));
 
+  propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "getUIRuntimeHolder"));
+  propertyNames.emplace_back(jsi::PropNameID::forAscii(rt, "getUISchedulerHolder"));
+
   return propertyNames;
 }
 
 jsi::Value JSIWorkletsModuleProxy::get(jsi::Runtime &rt, const jsi::PropNameID &propName) {
   const auto name = propName.utf8(rt);
 
+  if (name == "loadUnpackers") {
+    return jsi::Function::createFromHostFunction(
+        rt,
+        propName,
+        9,
+        [unpackerLoader = unpackerLoader_](
+            jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
+          const auto valueUnpackerCode = args[0].asString(rt).utf8(rt);
+          const auto valueUnpackerLocation = args[1].asString(rt).utf8(rt);
+          const auto valueUnpackerSourceMap = args[2].asString(rt).utf8(rt);
+
+          const auto synchronizableUnpackerCode = args[3].asString(rt).utf8(rt);
+          const auto synchronizableUnpackerLocation = args[4].asString(rt).utf8(rt);
+          const auto synchronizableUnpackerSourceMap = args[5].asString(rt).utf8(rt);
+
+          const auto customSerializableUnpackerCode = args[6].asString(rt).utf8(rt);
+          const auto customSerializableUnpackerLocation = args[7].asString(rt).utf8(rt);
+          const auto customSerializableUnpackerSourceMap = args[8].asString(rt).utf8(rt);
+
+          const auto shareableHostUnpackerCode = args[9].asString(rt).utf8(rt);
+          const auto shareableHostUnpackerLocation = args[10].asString(rt).utf8(rt);
+          const auto shareableHostUnpackerSourceMap = args[11].asString(rt).utf8(rt);
+
+          const auto shareableGuestUnpackerCode = args[12].asString(rt).utf8(rt);
+          const auto shareableGuestUnpackerLocation = args[13].asString(rt).utf8(rt);
+          const auto shareableGuestUnpackerSourceMap = args[14].asString(rt).utf8(rt);
+
+          unpackerLoader->loadUnpackers(ShareableUnpackers{
+              .valueUnpacker =
+                  {.code = valueUnpackerCode, .location = valueUnpackerLocation, .sourceMap = valueUnpackerSourceMap},
+              .synchronizableUnpacker =
+                  {.code = synchronizableUnpackerCode,
+                   .location = synchronizableUnpackerLocation,
+                   .sourceMap = synchronizableUnpackerSourceMap},
+              .customSerializableUnpacker =
+                  {.code = customSerializableUnpackerCode,
+                   .location = customSerializableUnpackerLocation,
+                   .sourceMap = customSerializableUnpackerSourceMap},
+              .shareableHostUnpacker =
+                  {.code = shareableHostUnpackerCode,
+                   .location = shareableHostUnpackerLocation,
+                   .sourceMap = shareableHostUnpackerSourceMap},
+              .shareableGuestUnpacker =
+                  {.code = shareableGuestUnpackerCode,
+                   .location = shareableGuestUnpackerLocation,
+                   .sourceMap = shareableGuestUnpackerSourceMap},
+          });
+          return jsi::Value::undefined();
+        });
+  }
+
   if (name == "createSerializable") {
     return jsi::Function::createFromHostFunction(
         rt, propName, 3, [](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {

packages/react-native-worklets/Common/cpp/worklets/NativeModules/JSIWorkletsModuleProxy.h

@@ -6,6 +6,7 @@
 #include <react/renderer/uimanager/primitives.h>
 #include <worklets/SharedItems/MemoryManager.h>
 #include <worklets/SharedItems/Serializable.h>
+#include <worklets/SharedItems/UnpackerLoader.h>
 #include <worklets/Tools/Defs.h>
 #include <worklets/Tools/ScriptBuffer.h>
 #include <worklets/WorkletRuntime/BundleModeConfig.h>
@@ -34,7 +35,8 @@ class JSIWorkletsModuleProxy : public jsi::HostObject {
       const std::shared_ptr<RuntimeManager> &runtimeManager,
       const std::weak_ptr<WorkletRuntime> &uiWorkletRuntime,
       const std::shared_ptr<RuntimeBindings> &runtimeBindings,
-      const BundleModeConfig &bundleModeConfig);
+      const BundleModeConfig &bundleModeConfig,
+      const std::shared_ptr<UnpackerLoader> &unpackerLoader);
 
   JSIWorkletsModuleProxy(const JSIWorkletsModuleProxy &other) = default;
 
@@ -84,6 +86,10 @@ class JSIWorkletsModuleProxy : public jsi::HostObject {
     return runtimeBindings_;
   }
 
+  [[nodiscard]] std::shared_ptr<UnpackerLoader> getUnpackerLoader() const {
+    return unpackerLoader_;
+  }
+
  private:
   const bool isDevBundle_;
   const BundleModeConfig bundleModeConfig_;
@@ -94,6 +100,7 @@ class JSIWorkletsModuleProxy : public jsi::HostObject {
   const std::shared_ptr<RuntimeManager> runtimeManager_;
   const std::weak_ptr<WorkletRuntime> uiWorkletRuntime_;
   const std::shared_ptr<RuntimeBindings> runtimeBindings_;
+  const std::shared_ptr<UnpackerLoader> unpackerLoader_;
 };
 
 } // namespace worklets

packages/react-native-worklets/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp

@@ -22,6 +22,12 @@ bool isDevBundleFromRNRuntime(jsi::Runtime &rnRuntime) {
   return rtDev.isBool() && rtDev.asBool();
 }
 
+/**
+* This method is required outside of Bundle Mode to make sure we start creating
+* Worklet Runtimes only after unpackers code was loaded from the RN Runtime.
+*
+* In Bundle Mode unpackers are installed during bundle evaluation instead.
+ */
 void WorkletsModuleProxy::start() {
   /**
    * We call additional `init` method here because
@@ -53,6 +59,7 @@ WorkletsModuleProxy::WorkletsModuleProxy(
       bundleModeConfig_(bundleModeConfig),
       memoryManager_(std::make_shared<MemoryManager>()),
       runtimeManager_(std::make_shared<RuntimeManager>()),
+      unpackerLoader_(std::make_shared<UnpackerLoader>()),
       uiWorkletRuntime_(
           runtimeManager_->createUninitializedUIRuntime(jsQueue_, std::make_shared<AsyncQueueUI>(uiScheduler_))),
       rnRuntimeProxy_(std::make_shared<JSIWorkletsModuleProxy>(
@@ -64,7 +71,8 @@ WorkletsModuleProxy::WorkletsModuleProxy(
           runtimeManager_,
           uiWorkletRuntime_,
           runtimeBindings_,
-          bundleModeConfig_)) {
+          bundleModeConfig_,
+          unpackerLoader_)) {
   auto optimizedJsiWorkletsModuleProxy =
       jsi_utils::optimizedFromHostObject(rnRuntime, std::static_pointer_cast<jsi::HostObject>(rnRuntimeProxy_));
   RNRuntimeWorkletDecorator::decorate(rnRuntime, std::move(optimizedJsiWorkletsModuleProxy), jsLogger_);

packages/react-native-worklets/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.h

@@ -6,6 +6,7 @@
 #include <worklets/AnimationFrameQueue/AnimationFrameBatchinator.h>
 #include <worklets/NativeModules/JSIWorkletsModuleProxy.h>
 #include <worklets/SharedItems/MemoryManager.h>
+#include <worklets/SharedItems/UnpackerLoader.h>
 #include <worklets/Tools/Defs.h>
 #include <worklets/Tools/JSLogger.h>
 #include <worklets/Tools/JSScheduler.h>
@@ -71,6 +72,7 @@ class WorkletsModuleProxy : public std::enable_shared_from_this<WorkletsModulePr
   const BundleModeConfig bundleModeConfig_;
   const std::shared_ptr<MemoryManager> memoryManager_;
   const std::shared_ptr<RuntimeManager> runtimeManager_;
+  const std::shared_ptr<UnpackerLoader> unpackerLoader_;
   std::shared_ptr<WorkletRuntime> uiWorkletRuntime_;
   const std::shared_ptr<JSIWorkletsModuleProxy> rnRuntimeProxy_;
   std::shared_ptr<AnimationFrameBatchinator> animationFrameBatchinator_;