react-native-windows 0.70.17 → 0.70.19

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.70.17</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.70.19</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>70</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>17</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>19</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>68b84329ffbe2e097d7385d7bc38386979b7003d</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>c17217ec1dae6533fdc9c1b229d8308a1f61d792</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -18,7 +18,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.70.1</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.70.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/Shared/Networking/IWebSocketResource.h

@@ -5,6 +5,7 @@
 
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 

package/Shared/Networking/OriginPolicyHttpFilter.cpp

@@ -37,22 +37,26 @@ namespace Microsoft::React::Networking {
 
 #pragma region OriginPolicyHttpFilter
 
-#pragma region ConstWcharComparer
+#pragma region CaseInsensitiveComparer
 
-bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, const wchar_t *b) const {
+bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wchar_t *a, const wchar_t *b) const {
   return _wcsicmp(a, b) < 0;
 }
 
-#pragma endregion ConstWcharComparer
+bool OriginPolicyHttpFilter::CaseInsensitiveComparer::operator()(const wstring &a, const wstring &b) const {
+  return _wcsicmp(a.c_str(), b.c_str()) < 0;
+}
+
+#pragma endregion CaseInsensitiveComparer
 
 // https://fetch.spec.whatwg.org/#forbidden-method
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer> OriginPolicyHttpFilter::s_forbiddenMethods =
-    {L"CONNECT", L"TRACE", L"TRACK"};
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
+    OriginPolicyHttpFilter::s_forbiddenMethods = {L"CONNECT", L"TRACE", L"TRACK"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_simpleCorsMethods = {L"GET", L"HEAD", L"POST"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_simpleCorsRequestHeaderNames = {
         L"Accept",
         L"Accept-Language",
@@ -64,11 +68,11 @@ bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, co
         L"Viewport-Width",
         L"Width"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_simpleCorsResponseHeaderNames =
         {L"Cache-Control", L"Content-Language", L"Content-Type", L"Expires", L"Last-Modified", L"Pragma"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_simpleCorsContentTypeValues = {
         L"application/x-www-form-urlencoded",
         L"multipart/form-data",
@@ -76,7 +80,7 @@ bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, co
 
 // https://fetch.spec.whatwg.org/#forbidden-header-name
 // Chromium still bans "User-Agent" due to https://crbug.com/571722
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_corsForbiddenRequestHeaderNames = {
         L"Accept-Charset",
         L"Accept-Encoding",
@@ -99,13 +103,13 @@ bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, co
         L"Upgrade",
         L"Via"};
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_cookieSettingResponseHeaders = {
         L"Set-Cookie",
         L"Set-Cookie2", // Deprecated by the spec, but probably still used
 };
 
-/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::ConstWcharComparer>
+/*static*/ set<const wchar_t *, OriginPolicyHttpFilter::CaseInsensitiveComparer>
     OriginPolicyHttpFilter::s_corsForbiddenRequestHeaderNamePrefixes = {L"Proxy-", L"Sec-"};
 
 /*static*/ Uri OriginPolicyHttpFilter::s_origin{nullptr};
@@ -293,7 +297,7 @@ bool OriginPolicyHttpFilter::ConstWcharComparer::operator()(const wchar_t *a, co
 }
 
 /*static*/ OriginPolicyHttpFilter::AccessControlValues OriginPolicyHttpFilter::ExtractAccessControlValues(
-    winrt::Windows::Foundation::Collections::IMap<hstring, hstring> const &headers) {
+    IMap<hstring, hstring> const &headers) {
   using std::wregex;
   using std::wsregex_token_iterator;
 

package/Shared/Networking/OriginPolicyHttpFilter.h

@@ -22,19 +22,20 @@ class OriginPolicyHttpFilter
     : public winrt::
           implements<OriginPolicyHttpFilter, winrt::Windows::Web::Http::Filters::IHttpFilter, IRedirectEventSource> {
  public:
-  struct ConstWcharComparer {
+  struct CaseInsensitiveComparer {
     bool operator()(const wchar_t *, const wchar_t *) const;
+    bool operator()(const std::wstring &, const std::wstring &) const;
   };
 
  private:
-  static std::set<const wchar_t *, ConstWcharComparer> s_forbiddenMethods;
-  static std::set<const wchar_t *, ConstWcharComparer> s_simpleCorsMethods;
-  static std::set<const wchar_t *, ConstWcharComparer> s_simpleCorsRequestHeaderNames;
-  static std::set<const wchar_t *, ConstWcharComparer> s_simpleCorsResponseHeaderNames;
-  static std::set<const wchar_t *, ConstWcharComparer> s_simpleCorsContentTypeValues;
-  static std::set<const wchar_t *, ConstWcharComparer> s_corsForbiddenRequestHeaderNames;
-  static std::set<const wchar_t *, ConstWcharComparer> s_corsForbiddenRequestHeaderNamePrefixes;
-  static std::set<const wchar_t *, ConstWcharComparer> s_cookieSettingResponseHeaders;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_forbiddenMethods;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_simpleCorsMethods;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_simpleCorsRequestHeaderNames;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_simpleCorsResponseHeaderNames;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_simpleCorsContentTypeValues;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_corsForbiddenRequestHeaderNames;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_corsForbiddenRequestHeaderNamePrefixes;
+  static std::set<const wchar_t *, CaseInsensitiveComparer> s_cookieSettingResponseHeaders;
 
   // NOTE: Assumes static origin through owning client/resource/module/(React) instance's lifetime.
   static winrt::Windows::Foundation::Uri s_origin;
@@ -42,9 +43,9 @@ class OriginPolicyHttpFilter
   struct AccessControlValues {
     winrt::hstring AllowedOrigin;
     winrt::hstring AllowedCredentials;
-    std::set<std::wstring> AllowedHeaders;
+    std::set<std::wstring, CaseInsensitiveComparer> AllowedHeaders;
     std::set<std::wstring> AllowedMethods;
-    std::set<std::wstring> ExposedHeaders;
+    std::set<std::wstring, CaseInsensitiveComparer> ExposedHeaders;
     size_t MaxAge;
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.70.17",
+  "version": "0.70.19",
   "license": "MIT",
   "repository": {
     "type": "git",