Capture makeScheduler/makeErrorHandler

Author: mrousavy

cpp/RNMultithreadingInstaller.cpp

@@ -17,14 +17,17 @@ static std::unique_ptr<reanimated::RuntimeManager> manager;
 
 //reanimated::RuntimeManager manager;
 
-void install(jsi::Runtime& runtime) {
+void install(jsi::Runtime& runtime,
+             std::function<reanimated::Scheduler()> makeScheduler,
+             std::function<reanimated::ErrorHandler(std::shared_ptr<reanimated::Scheduler>)> makeErrorHandler) {
   // Quickly setup the runtime - this is executed in parallel, and _might_ introduce race conditions if spawnThread is called before this finishes.
-  pool.enqueue([]() {
+  pool.enqueue([makeScheduler, makeErrorHandler]() {
     auto runtime = makeJSIRuntime();
     reanimated::RuntimeDecorator::decorateRuntime(*runtime, "CUSTOM_THREAD");
+    auto scheduler = makeScheduler();
     manager = std::make_unique<reanimated::RuntimeManager>(std::move(runtime),
-                                                           std::shared_ptr<reanimated::ErrorHandler>(),
-                                                           std::shared_ptr<reanimated::Scheduler>());
+                                                           makeErrorHandler(scheduler),
+                                                           scheduler);
   });
 
   // spawnThread(run: () => T): Promise<T>

cpp/RNMultithreadingInstaller.h

@@ -2,13 +2,17 @@
 
 #pragma once
 #include <jsi/jsi.h>
+#include <RNReanimated/Scheduler.h>
+#include <RNReanimated/ErrorHandler.h>
 
 using namespace facebook;
 
 namespace mrousavy {
 namespace multithreading {
 
-void install(jsi::Runtime& runtime);
+void install(jsi::Runtime& runtime,
+             std::function<reanimated::Scheduler()> makeScheduler,
+             std::function<reanimated::ErrorHandler(std::shared_ptr<reanimated::Scheduler>)> makeErrorHandler);
 
 }
 }

example/ios/Podfile.lock

@@ -269,6 +269,8 @@ PODS:
     - React-perflogger (= 0.64.0)
   - React-jsinspector (0.64.0)
   - react-native-multithreading (0.1.0):
+    - React
+    - React-callinvoker
     - React-Core
   - React-perflogger (0.64.0)
   - React-RCTActionSheet (0.64.0):
@@ -529,7 +531,7 @@ SPEC CHECKSUMS:
   React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1
   React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b
   React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301
-  react-native-multithreading: c3f34452f0e947efa807e631656c468b8151eb41
+  react-native-multithreading: 875bf964b7e5a173d98cd4eba3bda837fda76079
   React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
   React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
   React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f

ios/RNMultithreading.mm

@@ -3,7 +3,12 @@
 
 #import <React/RCTBridge+Private.h>
 #import <React/RCTUtils.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
 #import <jsi/jsi.h>
+#import <memory>
+
+#import <RNReanimated/REAIOSScheduler.h>
+#import <RNReanimated/REAIOSErrorHandler.h>
 
 using namespace facebook;
 
@@ -26,7 +31,11 @@ - (void)setBridge:(RCTBridge *)bridge
     return;
   }
 
-  mrousavy::multithreading::install(*(jsi::Runtime *)cxxBridge.runtime);
+  mrousavy::multithreading::install(*(jsi::Runtime *)cxxBridge.runtime, ^{
+    return std::make_shared<reanimated::REAIOSScheduler>(bridge.jsCallInvoker);
+  }, ^ (reanimated::Scheduler scheduler) {
+    return reanimated::REAIOSErrorHandler(scheduler);
+  });
 }
 
 @end

react-native-multithreading.podspec

@@ -13,7 +13,16 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "10.0" }
   s.source       = { :git => "https://github.com/mrousavy/react-native-multithreading.git", :tag => "#{s.version}" }
 
+  s.pod_target_xcconfig = {
+    "DEFINES_MODULE" => "YES",
+    "USE_HEADERMAP" => "YES",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+  }
+  s.requires_arc = true
+
   s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{h,cpp}"
 
+  s.dependency "React-callinvoker"
+  s.dependency "React"
   s.dependency "React-Core"
 end