[0.61] Drop LazyDevSupportManager (#4984) (#5256)

* Drop LazyDevSupportManager (#4984) * Drop LazySupportManager * Change files * Remove obsolete comment * Remove obsolete comment * Rename buffer0 to buffer * yarn format * Remove unneeded string allocations * Update DevSupportManager.cpp * Change release type to patch * Remove module.g.cpp Item.
microsoft · Jun 18, 2020 · b7cadc5 · b7cadc5
1 parent 11b3cbd
commit b7cadc5
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 207 deletions.
diff --git a/change/react-native-windows-2020-05-21-16-49-04-dsmwinrt.json b/change/react-native-windows-2020-05-21-16-49-04-dsmwinrt.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Drop LazySupportManager",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-05-21T23:49:04.082Z"
+}
diff --git a/vnext/Desktop/DevSupportManager.cpp b/vnext/Desktop/DevSupportManager.cpp
@@ -7,28 +7,32 @@
 
 #include <DevSettings.h>
 #include <InstanceManager.h>
-
-#include <boost/asio/connect.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/beast/core.hpp>
-#include <boost/beast/http.hpp>
-#include <boost/beast/version.hpp>
+#include <unicode.h>
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Networking.h>
+#include <winrt/Windows.Storage.Streams.h>
+#include <winrt/Windows.Web.Http.Filters.h>
+#include <winrt/Windows.Web.Http.Headers.h>
+#include <winrt/Windows.Web.Http.h>
 #include "Executors/WebSocketJSExecutor.h"
 #include "Utils.h"
 
-using namespace boost::asio;
-using namespace boost::asio::ip;
-using namespace boost::beast;
-using namespace boost::beast::http;
 using namespace Concurrency;
-using namespace std;
+using namespace winrt::Windows::Storage::Streams;
+using namespace winrt::Windows::Web::Http;
 
-using Microsoft::React::WebSocketJSExecutor;
+using std::make_unique;
+using std::ostringstream;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using winrt::Windows::Foundation::Uri;
+using winrt::Windows::Networking::HostName;
 
-namespace facebook {
-namespace react {
+namespace Microsoft::React {
 
-DevSupportManager::DevSupportManager() : m_resolver{m_context} {}
+DevSupportManager::DevSupportManager() {}
 
 DevSupportManager::~DevSupportManager() {
   StopPollingLiveReload();
@@ -55,55 +59,49 @@ string DevSupportManager::GetJavaScriptFromServer(
     const string &platform) {
   auto bundleUrl =
       DevServerHelper::get_BundleUrl(debugHost, jsBundleName, platform /*platform*/, "true" /*dev*/, "false" /*hot*/);
+  Uri uri(Common::Unicode::Utf8ToUtf16(bundleUrl));
+  Filters::HttpBaseProtocolFilter filter;
+  filter.CacheControl().ReadBehavior(Filters::HttpCacheReadBehavior::NoCache);
+  HttpClient client(filter);
+  client.DefaultRequestHeaders().Host(HostName(uri.Host().c_str()));
+
+  HttpRequestMessage request(HttpMethod::Get(), uri);
+  HttpResponseMessage response = client.SendRequestAsync(request).get();
+
+  IBuffer buffer = response.Content().ReadAsBufferAsync().get();
+  auto reader = DataReader::FromBuffer(buffer);
+  reader.UnicodeEncoding(UnicodeEncoding::Utf8);
+  auto length = reader.UnconsumedBufferLength();
+  string result;
+  if (length > 0 || response.IsSuccessStatusCode()) {
+    vector<uint8_t> data(length);
+    reader.ReadBytes(data);
+    result = string(reinterpret_cast<char *>(data.data()), data.size());
+  } else {
+    m_exceptionCaught = true;
+    ostringstream stream;
+    stream << R"({"error":")" << static_cast<int>(response.StatusCode()) << " downloading " << bundleUrl << R"("})";
+    result = stream.str();
+  }
 
-  Url url(bundleUrl);
-  auto const resolveResult = m_resolver.resolve(url.host, url.port);
-  tcp::socket socket{m_context};
-  connect(socket, resolveResult);
-
-  request<string_body> request{verb::get, url.Target(), 11};
-  request.set(field::host, url.host);
-  request.set(field::user_agent, BOOST_BEAST_VERSION_STRING);
-
-  write(socket, request);
-
-  flat_buffer buffer;
-  response<string_body> response;
-
-  parser<false, string_body> p{std::move(response)};
-  p.body_limit(25 * 1024 * 1024); // 25MB (boost default of 1MB is too small for dev bundles)
-
-  read(socket, buffer, p.base());
-  response = p.release();
-  std::stringstream jsStringStream;
-  jsStringStream << response.body();
-  // TODO: Check if UTF-8 processing is required.
-
-  return jsStringStream.str();
+  return result;
 }
 
 void DevSupportManager::StartPollingLiveReload(const string &debugHost, std::function<void()> onChangeCallback) {
   auto t = create_task([this, debugHost, onChangeCallback = move(onChangeCallback)] {
     cancellation_token token = m_liveReloadCts.get_token();
     while (!token.is_canceled()) {
       try {
-        Url url(DevServerHelper::get_OnChangeEndpointUrl(debugHost));
-        auto const resolveResult = m_resolver.resolve(url.host, url.port);
-        tcp::socket socket{m_context};
-        connect(socket, resolveResult);
-
-        request<string_body> request{verb::get, url.Target(), 11 /*HTTP 1.1*/};
-        request.set(field::host, url.host);
-        request.set(field::user_agent, BOOST_BEAST_VERSION_STRING);
-        request.set(field::connection, "keep-alive");
-
-        write(socket, request);
-        flat_buffer buffer;
-        response<dynamic_body> response;
-        read(socket, buffer, response);
-
-        if (response.result_int() == 205 /*ResetContent*/ && !token.is_canceled())
+        Uri uri(Common::Unicode::Utf8ToUtf16(DevServerHelper::get_OnChangeEndpointUrl(debugHost)));
+        HttpClient client;
+        client.DefaultRequestHeaders().Host(HostName(uri.Host().c_str()));
+        client.DefaultRequestHeaders().Connection().TryParseAdd(L"keep-alive");
+
+        HttpResponseMessage response = client.GetAsync(uri, HttpCompletionOption::ResponseHeadersRead).get();
+
+        if (response.StatusCode() == HttpStatusCode::ResetContent /*ResetContent*/ && !token.is_canceled())
           onChangeCallback();
+
       } catch (const std::exception & /*e*/) {
         // Just let the live reload stop working when the connection fails,
         // rather than bringing down the app.
@@ -116,23 +114,19 @@ task<void> DevSupportManager::LaunchDevToolsAsync(const string &debugHost, const
   auto t = task_from_result();
 
   return t.then([=]() {
-    Url url(DevServerHelper::get_LaunchDevToolsCommandUrl(debugHost));
-    auto const resolveResult = m_resolver.resolve(url.host, url.port);
-    tcp::socket socket{m_context};
-    connect(socket, resolveResult);
-
-    request<string_body> request{verb::get, url.Target(), 11};
-    request.set(field::host, url.host);
-    request.set(field::user_agent, BOOST_BEAST_VERSION_STRING);
+    Uri uri(Common::Unicode::Utf8ToUtf16(DevServerHelper::get_LaunchDevToolsCommandUrl(debugHost)));
+    HttpClient client;
+    client.DefaultRequestHeaders().Host(HostName(uri.Host().c_str()));
+    HttpResponseMessage response = client.GetAsync(uri, HttpCompletionOption::ResponseHeadersRead).get();
+  });
+}
 
-    write(socket, request);
+} // namespace Microsoft::React
 
-    flat_buffer buffer;
-    response<dynamic_body> response;
+namespace facebook::react {
 
-    read(socket, buffer, response);
-  });
+shared_ptr<IDevSupportManager> CreateDevSupportManager() {
+  return std::make_shared<Microsoft::React::DevSupportManager>();
 }
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
diff --git a/vnext/Desktop/DevSupportManager.h b/vnext/Desktop/DevSupportManager.h
@@ -7,26 +7,20 @@
 #undef U
 
 #include <IDevSupportManager.h>
-
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/beast/core.hpp>
-#include <boost/system/error_code.hpp>
 #include <cxxreact/JSExecutor.h>
 
-namespace facebook {
-namespace react {
-
-using JSECreator =
-    std::function<std::unique_ptr<JSExecutor>(std::shared_ptr<ExecutorDelegate>, std::shared_ptr<MessageQueueThread>)>;
+namespace Microsoft::React {
 
-struct DevSettings;
+using JSECreator = std::function<std::unique_ptr<facebook::react::JSExecutor>(
+    std::shared_ptr<facebook::react::ExecutorDelegate>,
+    std::shared_ptr<facebook::react::MessageQueueThread>)>;
 
-class DevSupportManager : public IDevSupportManager {
+class DevSupportManager : public facebook::react::IDevSupportManager {
  public:
   DevSupportManager();
   ~DevSupportManager();
 
-  virtual JSECreator LoadJavaScriptInProxyMode(const DevSettings &settings) override;
+  virtual facebook::react::JSECreator LoadJavaScriptInProxyMode(const facebook::react::DevSettings &settings) override;
   virtual std::string GetJavaScriptFromServer(
       const std::string &debugHost,
       const std::string &jsBundleName,
@@ -43,10 +37,7 @@ class DevSupportManager : public IDevSupportManager {
       const Concurrency::cancellation_token &token = Concurrency::cancellation_token::none());
 
   bool m_exceptionCaught = false;
-  boost::asio::io_context m_context;
-  boost::asio::ip::tcp::resolver m_resolver;
   Concurrency::cancellation_token_source m_liveReloadCts;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace Microsoft::React
diff --git a/vnext/Desktop/LazyDevSupportManager.cpp b/vnext/Desktop/LazyDevSupportManager.cpp
diff --git a/vnext/Desktop/LazyDevSupportManager.h b/vnext/Desktop/LazyDevSupportManager.h
diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj
@@ -112,7 +112,6 @@
     <ClCompile Include="Executors\WebSocketJSExecutor.cpp" />
     <ClCompile Include="Executors\WebSocketJSExecutorFactory.cpp" />
     <ClCompile Include="JSBigStringResourceDll.cpp" />
-    <ClCompile Include="LazyDevSupportManager.cpp" />
     <ClCompile Include="Modules\NetworkingModule.cpp" />
     <ClCompile Include="Modules\TimingModule.cpp" />
     <ClCompile Include="Modules\WebSocketModule.cpp" />
@@ -139,7 +138,6 @@
     </ClInclude>
     <ClInclude Include="DevSupportManager.h" />
     <ClInclude Include="Executors\WebSocketJSExecutor.h" />
-    <ClInclude Include="LazyDevSupportManager.h" />
     <ClInclude Include="Modules\NetworkingModule.h" />
     <ClInclude Include="JSBigStringResourceDll.h" />
     <ClInclude Include="Modules\TimingModule.h" />

diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj.filters b/vnext/Desktop/React.Windows.Desktop.vcxproj.filters
@@ -65,15 +65,6 @@
     <ClCompile Include="Executors\WebSocketJSExecutorFactory.cpp">
       <Filter>Source Files\Executors</Filter>
     </ClCompile>
-    <ClCompile Include="Modules\NetworkingModule.cpp">
-      <Filter>Source Files\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Modules\TimingModule.cpp">
-      <Filter>Source Files\Modules</Filter>
-    </ClCompile>
-    <ClCompile Include="Modules\WebSocketModule.cpp">
-      <Filter>Source Files\Modules</Filter>
-    </ClCompile>
     <ClCompile Include="DevSupportManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -83,11 +74,14 @@
     <ClCompile Include="JSBigStringResourceDll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LazyDevSupportManager.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Modules\NetworkingModule.cpp">
+      <Filter>Source Files\Modules</Filter>
     </ClCompile>
-    <ClCompile Include="BeastWebSocketResource.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="Modules\TimingModule.cpp">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Modules\WebSocketModule.cpp">
+      <Filter>Source Files\Modules</Filter>
     </ClCompile>
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp">
@@ -131,8 +125,11 @@
     <ClInclude Include="JSBigStringResourceDll.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LazyDevSupportManager.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="Modules\NetworkingModule.h">
+      <Filter>Header Files\Modules</Filter>
+    </ClInclude>
+    <ClInclude Include="Modules\TimingModule.h">
+      <Filter>Header Files\Modules</Filter>
     </ClInclude>
     <ClInclude Include="NativeModuleFactories.h">
       <Filter>Header Files</Filter>