react-native-windows 0.72.0-preview.3 → 0.72.0-preview.4

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.0-preview.3</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.0-preview.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>0783647397c3eb6c2a594b5805c5523ded61743a</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>f2076401425338dec2db2d115b886988ac70e57b</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -24,7 +24,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.71.2</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.71.3</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
   </PropertyGroup>

package/Shared/JSI/NapiJsiV8RuntimeHolder.cpp

@@ -11,57 +11,75 @@ using std::unique_ptr;
 
 namespace Microsoft::JSI {
 
-struct NapiTask {
-  NapiTask(
-      napi_env env,
-      napi_ext_task_callback taskCallback,
-      void *taskData,
-      napi_finalize finalizeCallback,
-      void *finalizeHint) noexcept
-      : m_env{env},
-        m_taskCallback{taskCallback},
-        m_taskData{taskData},
-        m_finalizeCallback{finalizeCallback},
-        m_finalizeHint{finalizeHint} {}
-
-  NapiTask(const NapiTask &) = delete;
-  NapiTask &operator=(const NapiTask &) = delete;
+class NapiTask {
+ public:
+  NapiTask(void *task, v8_task_run_cb onTaskRun, v8_task_release_cb onTaskRelease)
+      : task_(task), onTaskRun_(onTaskRun), onTaskRelease_(onTaskRelease) {}
+
+  NapiTask(NapiTask &&other)
+      : task_(std::exchange(other.task_, nullptr)),
+        onTaskRun_(std::exchange(other.onTaskRun_, nullptr)),
+        onTaskRelease_(std::exchange(other.onTaskRelease_, nullptr)) {}
+
+  NapiTask &operator=(NapiTask &&other) {
+    if (this != &other) {
+      NapiTask taskToDelete(std::move(*this));
+      task_ = std::exchange(other.task_, nullptr);
+      onTaskRun_ = std::exchange(other.onTaskRun_, nullptr);
+      onTaskRelease_ = std::exchange(other.onTaskRelease_, nullptr);
+    }
+    return *this;
+  }
+
+  NapiTask(const NapiTask &other) = delete;
+  NapiTask &operator=(const NapiTask &other) = delete;
 
   ~NapiTask() {
-    if (m_finalizeCallback) {
-      m_finalizeCallback(m_env, m_taskData, m_finalizeHint);
+    if (task_ != nullptr) {
+      onTaskRelease_(task_);
     }
   }
 
-  void operator()() noexcept {
-    m_taskCallback(m_env, m_taskData);
+  void Run() const {
+    if (task_ != nullptr) {
+      onTaskRun_(task_);
+    }
   }
 
  private:
-  napi_env m_env;
-  napi_ext_task_callback m_taskCallback;
-  void *m_taskData;
-  napi_finalize m_finalizeCallback;
-  void *m_finalizeHint;
+  void *task_;
+  v8_task_run_cb onTaskRun_;
+  v8_task_release_cb onTaskRelease_;
 };
 
-// See napi_ext_schedule_task_callback definition.
-/*static*/ void NapiJsiV8RuntimeHolder::ScheduleTaskCallback(
-    napi_env env,
-    napi_ext_task_callback taskCallback,
-    void *taskData,
-    uint32_t /*delayInMsec*/,
-    napi_finalize finalizeCallback,
-    void *finalizeHint) {
-  NapiJsiV8RuntimeHolder *holder;
-  auto result = napi_get_instance_data(env, (void **)&holder);
-  if (result != napi_status::napi_ok) {
-    std::terminate();
+class NapiTaskRunner {
+ public:
+  NapiTaskRunner(std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) : m_jsQueue(std::move(jsQueue)) {}
+
+  static v8_task_runner_t Create(std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) {
+    NapiTaskRunner *taskRunner = new NapiTaskRunner(std::move(jsQueue));
+    return v8_create_task_runner(reinterpret_cast<void *>(taskRunner), &PostTask, &Release);
   }
 
-  auto task = std::make_shared<NapiTask>(env, taskCallback, taskData, finalizeCallback, finalizeHint);
-  holder->m_jsQueue->runOnQueue([task = std::move(task)]() { task->operator()(); });
-}
+ private:
+  static void __cdecl PostTask(
+      void *taskRunner,
+      void *task,
+      v8_task_run_cb onTaskRun,
+      v8_task_release_cb onTaskRelease) {
+    auto napiTask = std::make_shared<NapiTask>(task, onTaskRun, onTaskRelease);
+    reinterpret_cast<NapiTaskRunner *>(taskRunner)->m_jsQueue->runOnQueue([napiTask = std::move(napiTask)] {
+      napiTask->Run();
+    });
+  }
+
+  static void __cdecl Release(void *taskRunner) {
+    delete reinterpret_cast<NapiTaskRunner *>(taskRunner);
+  }
+
+ private:
+  std::shared_ptr<facebook::react::MessageQueueThread> m_jsQueue;
+};
 
 NapiJsiV8RuntimeHolder::NapiJsiV8RuntimeHolder(
     shared_ptr<DevSettings> devSettings,
@@ -85,7 +103,7 @@ void NapiJsiV8RuntimeHolder::InitRuntime() noexcept {
   settings.flags.enable_inspector = m_useDirectDebugger;
   settings.flags.wait_for_debugger = m_debuggerBreakOnNextLine;
   //  TODO: args.debuggerRuntimeName = debuggerRuntimeName_;
-  settings.foreground_scheduler = &NapiJsiV8RuntimeHolder::ScheduleTaskCallback;
+  settings.foreground_task_runner = NapiTaskRunner::Create(m_jsQueue);
 
   napi_ext_script_cache scriptCache = InitScriptCache(std::move(m_preparedScriptStore));
   settings.script_cache = &scriptCache;

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -24,14 +24,6 @@ class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
       std::unique_ptr<facebook::jsi::PreparedScriptStore> &&preparedScriptStore) noexcept;
 
  private:
-  static void __cdecl ScheduleTaskCallback(
-      napi_env env,
-      napi_ext_task_callback taskCb,
-      void *taskData,
-      uint32_t delayMs,
-      napi_finalize finalizeCb,
-      void *finalizeHint);
-
   void InitRuntime() noexcept;
   napi_ext_script_cache InitScriptCache(
       std::unique_ptr<facebook::jsi::PreparedScriptStore> &&preparedScriptStore) noexcept;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.72.0-preview.3",
+  "version": "0.72.0-preview.4",
   "license": "MIT",
   "repository": {
     "type": "git",