react-native-windows 0.83.0-preview.2 → 0.84.0-preview.2

package/Shared/Modules/WebSocketModule.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 
 #include <Modules/WebSocketModule.h>
-#include <Modules/WebSocketTurboModule.h>
 
 #include <CreateModules.h>
 #include <Modules/CxxModuleUtilities.h>

package/Shared/Modules/WebSocketModule.h

@@ -3,10 +3,69 @@
 
 #pragma once
 
+#include <codegen/NativeWebSocketModuleSpec.g.h>
 #include <Modules/IWebSocketModuleProxy.h>
+#include <NativeModules.h>
 #include <Networking/IWebSocketResource.h>
 
-// Windows API
-#include <winrt/Windows.Foundation.h>
+namespace Microsoft::React {
 
-namespace Microsoft::React {} // namespace Microsoft::React
+class WebSocketTurboModuleProxy final : public IWebSocketModuleProxy {
+  std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> &m_resourceMap;
+
+ public:
+  WebSocketTurboModuleProxy(
+      std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> &resourceMap) noexcept;
+
+#pragma region IWebSocketModuleProxy
+
+  void SendBinary(std::string &&base64String, int64_t id) noexcept override;
+
+#pragma endregion
+};
+
+REACT_MODULE(WebSocketTurboModule, L"WebSocketModule")
+struct WebSocketTurboModule {
+  using ModuleSpec = ReactNativeSpecs::WebSocketModuleSpec;
+
+  REACT_INIT(Initialize)
+  void Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept;
+
+  REACT_METHOD(Connect, L"connect")
+  void Connect(
+      std::string &&url,
+      std::optional<std::vector<std::string>> protocols,
+      ReactNativeSpecs::WebSocketModuleSpec_connect_options &&options,
+      double socketID) noexcept;
+
+  REACT_METHOD(Close, L"close")
+  void Close(double code, std::string &&reason, double socketID) noexcept;
+
+  REACT_METHOD(Send, L"send")
+  void Send(std::string &&message, double forSocketID) noexcept;
+
+  REACT_METHOD(SendBinary, L"sendBinary")
+  void SendBinary(std::string &&base64String, double forSocketID) noexcept;
+
+  REACT_METHOD(Ping, L"ping")
+  void Ping(double socketID) noexcept;
+
+  REACT_METHOD(AddListener, L"addListener")
+  void AddListener(std::string &&eventName) noexcept;
+
+  REACT_METHOD(RemoveListeners, L"removeListeners")
+  void RemoveListeners(double count) noexcept;
+
+ private:
+  std::shared_ptr<Networking::IWebSocketResource> CreateResource(int64_t id, std::string &&url) noexcept;
+
+  winrt::Microsoft::ReactNative::ReactContext m_context;
+  std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> m_resourceMap;
+
+  /// <summary>
+  /// Exposes a subset of the module's methods.
+  /// </summary>
+  std::shared_ptr<IWebSocketModuleProxy> m_proxy;
+};
+
+} // namespace Microsoft::React

package/Shared/OInstance.cpp

@@ -19,6 +19,11 @@
 #include <Utils/LocalBundleReader.h>
 #endif
 
+#if _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // deprecated APIs
+#endif
+
 #include <CppRuntimeOptions.h>
 #include <CreateModules.h>
 #include <DevSettings.h>

package/Shared/Shared.vcxitems

@@ -325,7 +325,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\IWebSocketModuleContentHandler.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\IWebSocketModuleProxy.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\HttpModule.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)Modules\WebSocketTurboModule.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Networking\DefaultBlobResource.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Networking\IBlobResource.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Networking\IHttpResource.h" />
@@ -434,7 +433,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\TraceEventSerializer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\ConsoleTimeStamp.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\HostTargetTraceRecording.cpp " />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\tracing\TraceRecordingStateSerializer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\HostTargetTracing.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\utils\jsi-utils.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\ReactPerfettoLogger.cpp" />
@@ -447,15 +445,15 @@
   </ItemGroup>
   <ItemGroup Condition="'$(UseFabric)' == 'true'">
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\defaults\DefaultTurboModules.cpp" />
+    <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\intersectionobserver\NativeIntersectionObserver.cpp" />
+    <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserver.cpp" DisableSpecificWarnings="4996;%(DisableSpecificWarnings)" />
+    <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserverManager.cpp" DisableSpecificWarnings="4996;%(DisableSpecificWarnings)" />
+    <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserverState.cpp" DisableSpecificWarnings="4996;%(DisableSpecificWarnings)" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\microtasks\NativeMicrotasks.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\featureflags\NativeReactNativeFeatureFlags.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\dom\NativeDOM.cpp" DisableSpecificWarnings="4715;%(DisableSpecificWarnings)" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\idlecallbacks\NativeIdleCallbacks.cpp" />
-    <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\intersectionobserver\NativeIntersectionObserver.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\webperformance\NativePerformance.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserver.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserverManager.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\observers\intersection\IntersectionObserverState.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\attributedstring\AttributedString.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\attributedstring\AttributedStringBox.cpp" DisableSpecificWarnings="4715;%(DisableSpecificWarnings)" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\components\view\BaseViewProps.cpp" DisableSpecificWarnings="4459;4715;%(DisableSpecificWarnings)" />