react-native-tvos 0.81.4-0 → 0.82.0-0

package/ReactCommon/jsinspector-modern/TracingAgent.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "HostTarget.h"
 #include "InspectorInterfaces.h"
-#include "InstanceAgent.h"
 
 #include <jsinspector-modern/cdp/CdpJson.h>
 #include <jsinspector-modern/tracing/Timing.h>
@@ -24,9 +24,20 @@ class TracingAgent {
   /**
    * \param frontendChannel A channel used to send responses to the
    * frontend.
+   * \param sessionState The state of the session that created this agent.
+   * \param hostTargetController An interface to the HostTarget that this agent
+   * is attached to. The caller is responsible for ensuring that the
+   * HostTargetDelegate and underlying HostTarget both outlive the agent.
+   * \param traceRecordingToEmit If set, this is the trace that Host has
+   * requested to display in the Frontend.
    */
-  explicit TracingAgent(FrontendChannel frontendChannel)
-      : frontendChannel_(std::move(frontendChannel)) {}
+  TracingAgent(
+      FrontendChannel frontendChannel,
+      SessionState& sessionState,
+      HostTargetController& hostTargetController,
+      std::optional<tracing::TraceRecordingState> traceRecordingToEmit);
+
+  ~TracingAgent();
 
   /**
    * Handle a CDP request. The response will be sent over the provided
@@ -35,31 +46,21 @@ class TracingAgent {
    */
   bool handleRequest(const cdp::PreparsedRequest& req);
 
-  /**
-   * Replace the current InstanceAgent with the given one.
-   * \param agent The new InstanceAgent. May be null to signify that there is
-   * currently no active instance.
-   */
-  void setCurrentInstanceAgent(std::shared_ptr<InstanceAgent> agent);
-
  private:
   /**
    * A channel used to send responses and events to the frontend.
    */
   FrontendChannel frontendChannel_;
 
-  /**
-   * Current InstanceAgent. May be null to signify that there is
-   * currently no active instance.
-   */
-  std::shared_ptr<InstanceAgent> instanceAgent_;
+  SessionState& sessionState_;
+
+  HostTargetController& hostTargetController_;
 
   /**
-   * Timestamp of when we started tracing of an Instance, will be used as a
-   * a start of JavaScript samples recording and as a time origin for the events
-   * in this trace.
+   * Emits the captured Trace Recording state in a series of
+   * Tracing.dataCollected events, followed by a Tracing.tracingComplete event.
    */
-  HighResTimeStamp instanceTracingStartTimestamp_;
+  void emitTraceRecording(tracing::TraceRecordingState state) const;
 };
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/Utf8.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <stdexcept>
 #include <vector>
 
 namespace facebook::react::jsinspector_modern {

package/ReactCommon/jsinspector-modern/network/HttpUtils.cpp

@@ -7,6 +7,8 @@
 
 #include "HttpUtils.h"
 
+#include <algorithm>
+
 namespace facebook::react::jsinspector_modern {
 
 std::string httpReasonPhrase(uint16_t status) {
@@ -147,8 +149,22 @@ std::string httpReasonPhrase(uint16_t status) {
 std::string mimeTypeFromHeaders(const Headers& headers) {
   std::string mimeType = "application/octet-stream";
 
-  if (headers.find("Content-Type") != headers.end()) {
-    mimeType = headers.at("Content-Type");
+  for (const auto& [name, value] : headers) {
+    std::string lowerName = name;
+    std::transform(
+        lowerName.begin(), lowerName.end(), lowerName.begin(), ::tolower);
+    if (lowerName == "content-type") {
+      // Parse MIME type (discarding any parameters after ";") from the
+      // Content-Type header
+      // https://datatracker.ietf.org/doc/html/rfc7231#section-3.1.1.1
+      size_t pos = value.find(';');
+      if (pos != std::string::npos) {
+        mimeType = value.substr(0, pos);
+      } else {
+        mimeType = value;
+      }
+      break;
+    }
   }
 
   return mimeType;

package/ReactCommon/jsinspector-modern/network/NetworkReporter.cpp

@@ -79,7 +79,7 @@ void NetworkReporter::reportRequestStart(
     int encodedDataLength,
     const std::optional<ResponseInfo>& redirectResponse) {
   if (ReactNativeFeatureFlags::enableResourceTimingAPI()) {
-    auto now = PerformanceEntryReporter::getInstance()->getCurrentTimeStamp();
+    auto now = HighResTimeStamp::now();
 
     // All builds: Annotate PerformanceResourceTiming metadata
     {
@@ -130,7 +130,7 @@ void NetworkReporter::reportConnectionTiming(
     const std::string& requestId,
     const std::optional<Headers>& headers) {
   if (ReactNativeFeatureFlags::enableResourceTimingAPI()) {
-    auto now = PerformanceEntryReporter::getInstance()->getCurrentTimeStamp();
+    auto now = HighResTimeStamp::now();
 
     // All builds: Annotate PerformanceResourceTiming metadata
     {
@@ -164,7 +164,7 @@ void NetworkReporter::reportResponseStart(
     const ResponseInfo& responseInfo,
     int encodedDataLength) {
   if (ReactNativeFeatureFlags::enableResourceTimingAPI()) {
-    auto now = PerformanceEntryReporter::getInstance()->getCurrentTimeStamp();
+    auto now = HighResTimeStamp::now();
 
     // All builds: Annotate PerformanceResourceTiming metadata
     {
@@ -229,7 +229,7 @@ void NetworkReporter::reportResponseEnd(
     const std::string& requestId,
     int encodedDataLength) {
   if (ReactNativeFeatureFlags::enableResourceTimingAPI()) {
-    auto now = PerformanceEntryReporter::getInstance()->getCurrentTimeStamp();
+    auto now = HighResTimeStamp::now();
 
     // All builds: Report PerformanceResourceTiming event
     {

package/ReactCommon/jsinspector-modern/tests/ConsoleApiTest.cpp

@@ -58,7 +58,7 @@ class ConsoleApiTest : public JsiIntegrationPortableTestBase<
         onMessage(
             JsonParsed(AllOf(AtJsonPtr("/method", "Debugger.scriptParsed")))))
         .Times(AnyNumber())
-        .WillRepeatedly(Invoke<>([this](std::string message) {
+        .WillRepeatedly(Invoke<>([this](const std::string& message) {
           auto params = folly::parseJson(message);
           // Store the script ID and URL for later use.
           scriptUrlsById_.emplace(
@@ -114,7 +114,8 @@ class ConsoleApiTest : public JsiIntegrationPortableTestBase<
    * paramsMatcher, only if the Runtime domain is currently disabled ( = the
    * call will be buffered and reported later upon enabling the domain).
    */
-  void expectConsoleApiCallBuffered(Matcher<folly::dynamic> paramsMatcher) {
+  void expectConsoleApiCallBuffered(
+      const Matcher<folly::dynamic>& paramsMatcher) {
     if (!runtimeEnabled_) {
       expectedConsoleApiCalls_.emplace_back(paramsMatcher);
     }
@@ -136,7 +137,7 @@ class ConsoleApiTest : public JsiIntegrationPortableTestBase<
   }
 
  private:
-  std::optional<std::string> getScriptUrlById(std::string scriptId) {
+  std::optional<std::string> getScriptUrlById(const std::string& scriptId) {
     auto it = scriptUrlsById_.find(scriptId);
     if (it == scriptUrlsById_.end()) {
       return std::nullopt;

package/ReactCommon/jsinspector-modern/tests/ConsoleTimeStampTest.cpp

@@ -24,16 +24,13 @@ class ConsoleTimeStampTest : public JsiIntegrationPortableTestBase<
                                  folly::QueuedImmediateExecutor> {
  protected:
   size_t countNumberOfTimeStampEvents(
-      tracing::PerformanceTracer& performanceTracer) {
+      const std::vector<tracing::TraceEvent>& events) {
     size_t count = 0;
-    performanceTracer.collectEvents(
-        [&count](const folly::dynamic& chunk) {
-          auto event = chunk[0];
-          if (event["name"] == "TimeStamp") {
-            count++;
-          }
-        },
-        1);
+    for (const auto& event : events) {
+      if (event.name == "TimeStamp") {
+        count++;
+      }
+    }
     return count;
   }
 };
@@ -50,8 +47,8 @@ TEST_F(ConsoleTimeStampTest, RecordsEntriesWithJustLabel) {
 
   eval("console.timeStamp('test-label')");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, RecordsEntriesWithSpecifiedTimestamps) {
@@ -60,8 +57,8 @@ TEST_F(ConsoleTimeStampTest, RecordsEntriesWithSpecifiedTimestamps) {
 
   eval("console.timeStamp('test-range', 100, 200)");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, RecordsEntriesWithMarkNames) {
@@ -71,8 +68,8 @@ TEST_F(ConsoleTimeStampTest, RecordsEntriesWithMarkNames) {
   eval(
       "console.timeStamp('test-string-timestamps', 'start-marker', 'end-marker')");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, KeepsEntriesWithUnknownMarkNames) {
@@ -82,8 +79,8 @@ TEST_F(ConsoleTimeStampTest, KeepsEntriesWithUnknownMarkNames) {
   eval(
       "console.timeStamp('test-string-timestamps', 'start-marker', 'end-marker')");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, DoesNotThrowIfNotTracing) {
@@ -109,8 +106,8 @@ TEST_F(ConsoleTimeStampTest, SurvivesInvalidArguments) {
   // Will be logged - start will default to an empty string.
   eval("console.timeStamp('label', {})");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 4);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 4);
 }
 
 TEST_F(ConsoleTimeStampTest, InvalidTrackNameIsIgnored) {
@@ -119,8 +116,8 @@ TEST_F(ConsoleTimeStampTest, InvalidTrackNameIsIgnored) {
 
   eval("console.timeStamp('label', 0, 1, {})");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, InvalidTrackGroupIsIgnored) {
@@ -129,8 +126,8 @@ TEST_F(ConsoleTimeStampTest, InvalidTrackGroupIsIgnored) {
 
   eval("console.timeStamp('label', 0, 1, 'trackName', {})");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 TEST_F(ConsoleTimeStampTest, InvalidColorIsIgnored) {
@@ -139,8 +136,8 @@ TEST_F(ConsoleTimeStampTest, InvalidColorIsIgnored) {
 
   eval("console.timeStamp('test', 100, 200, 'FooTrack', 'BarGroup', 'red')");
 
-  EXPECT_TRUE(tracer.stopTracing());
-  EXPECT_EQ(countNumberOfTimeStampEvents(tracer), 1);
+  auto events = tracer.stopTracing();
+  EXPECT_EQ(countNumberOfTimeStampEvents(*events), 1);
 }
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.cpp

@@ -17,7 +17,7 @@ namespace facebook::folly_dynamic_matchers_utils {
 std::string as_string(std::string value) {
   return value;
 }
-std::string as_string(folly::dynamic value) {
+std::string as_string(const folly::dynamic& value) {
   return value.asString();
 }
 

package/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h

@@ -17,7 +17,7 @@ namespace facebook {
 namespace folly_dynamic_matchers_utils {
 
 std::string as_string(std::string value);
-std::string as_string(folly::dynamic value);
+std::string as_string(const folly::dynamic& value);
 std::string explain_error(
     folly::dynamic::json_pointer_resolution_error<const folly::dynamic> error);
 

package/ReactCommon/jsinspector-modern/tests/HostTargetTest.cpp

@@ -642,7 +642,7 @@ TEST_F(HostTargetTest, HostCommands) {
                     std::unique_ptr<RuntimeAgentDelegate::ExportedState>
                         exportedState,
                     const ExecutionContextDescription& context,
-                    RuntimeExecutor runtimeExecutor) {
+                    const RuntimeExecutor& runtimeExecutor) {
         auto delegate = runtimeAgentDelegates_.make_unique(
             std::move(frontendChannel),
             sessionState,
@@ -1417,7 +1417,7 @@ TEST_F(HostTargetTest, NetworkLoadNetworkResourceNotImplementedByDelegate) {
           Field(&LoadNetworkResourceRequest::url, "http://example.com"), _))
       .Times(1)
       .WillOnce([](const LoadNetworkResourceRequest& /*params*/,
-                   ScopedExecutor<NetworkRequestListener> /*executor*/) {
+                   const ScopedExecutor<NetworkRequestListener>& /*executor*/) {
         throw NotImplementedException(
             "This delegate does not implement loadNetworkResource.");
       })
@@ -1501,4 +1501,26 @@ TEST_F(HostTargetTest, NetworkLoadNetworkResource3xx) {
   });
 }
 
+TEST_F(HostTargetTest, IOReadSizeValidation) {
+  connect();
+
+  InSequence s;
+
+  EXPECT_CALL(fromPage(), onMessage(JsonEq(R"({
+                                            "id": 1,
+                                            "error": {
+                                              "message": "Invalid params: size cannot be greater than 10MB.",
+                                              "code": -32602
+                                            }
+                                          })")));
+  toPage_->sendMessage(R"({
+        "id": 1,
+        "method": "IO.read",
+        "params": {
+          "handle": "0",
+          "size": 134217728
+        }
+      })");
+}
+
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/InspectorPackagerConnectionTest.cpp

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <folly/Format.h>
+#include <fmt/format.h>
 #include <folly/dynamic.h>
 #include <folly/executors/ManualExecutor.h>
 #include <folly/executors/QueuedImmediateExecutor.h>
@@ -16,7 +16,6 @@
 #include <jsinspector-modern/InspectorInterfaces.h>
 #include <jsinspector-modern/InspectorPackagerConnection.h>
 
-#include <format>
 #include <memory>
 
 #include "FollyDynamicMatchers.h"
@@ -282,7 +281,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEvents) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -322,7 +321,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEvents) {
           AtJsonPtr("/params", ElementsAre("arg1", "arg2"))))))
       .RetiresOnSaturation();
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -374,7 +373,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEventsToMultiplePages) {
 
   for (int i = 0; i < kNumPages; ++i) {
     // Connect to the i-th page.
-    webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+    webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
         R"({{
         "event": "connect",
         "payload": {{
@@ -416,7 +415,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEventsToMultiplePages) {
         *localConnections_[i],
         sendMessage(JsonParsed(AtJsonPtr("/method", Eq(method)))))
         .RetiresOnSaturation();
-    webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+    webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
         R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -446,7 +445,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendEventToAllConnections) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -487,7 +486,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenDisconnect) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -499,7 +498,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenDisconnect) {
 
   // Disconnect from the page.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -522,7 +521,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenCloseSocket) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -550,7 +549,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenSocketFailure) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -580,7 +579,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -626,7 +625,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -638,7 +637,7 @@ TEST_F(
 
   // Try connecting to the same page again. This results in a disconnection.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -661,7 +660,7 @@ TEST_F(InspectorPackagerConnectionTest, TestMultipleDisconnect) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -673,7 +672,7 @@ TEST_F(InspectorPackagerConnectionTest, TestMultipleDisconnect) {
 
   // Disconnect from the page.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -684,7 +683,7 @@ TEST_F(InspectorPackagerConnectionTest, TestMultipleDisconnect) {
   EXPECT_FALSE(localConnections_[0]);
 
   // Disconnect again. This is a noop.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -707,7 +706,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDisconnectThenSendEvent) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -719,7 +718,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDisconnectThenSendEvent) {
 
   // Disconnect from the page.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -731,7 +730,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDisconnectThenSendEvent) {
 
   // Send an event from the frontend (remote) to the backend (local). This
   // is a noop.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -755,7 +754,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendEventToUnknownPage) {
 
   // Send an event from the frontend (remote) to the backend (local). This
   // is a noop (except for logging).
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -922,7 +921,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  retainedWebSocketDelegate->didReceiveMessage(std::format(
+  retainedWebSocketDelegate->didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -942,7 +941,7 @@ TEST_F(
           AtJsonPtr("/params", ElementsAre("arg1", "arg2"))))))
       .RetiresOnSaturation();
 
-  retainedWebSocketDelegate->didReceiveMessage(std::format(
+  retainedWebSocketDelegate->didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -976,7 +975,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDestroyConnectionOnPageRemoved) {
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1006,7 +1005,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1046,7 +1045,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1065,7 +1064,7 @@ TEST_F(
 
   // Disconnect from the page.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -1076,7 +1075,7 @@ TEST_F(
   EXPECT_FALSE(localConnections_[0]);
 
   // Connect to the same page again.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1128,7 +1127,7 @@ TEST_F(
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
 
   // Connect to the page.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1152,7 +1151,7 @@ TEST_F(
 
   // Disconnect from the page.
   EXPECT_CALL(*localConnections_[0], disconnect()).RetiresOnSaturation();
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "disconnect",
           "payload": {{
@@ -1163,7 +1162,7 @@ TEST_F(
   EXPECT_FALSE(localConnections_[0]);
 
   // Connect to the same page again.
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1257,7 +1256,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
           AtJsonPtr("/payload/pageId", Eq(std::to_string(pageId)))))))
       .RetiresOnSaturation();
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1266,7 +1265,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
         }})",
       toJson(std::to_string(pageId))));
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -1292,7 +1291,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
           AtJsonPtr("/payload/pageId", Eq(std::to_string(pageId)))))))
       .RetiresOnSaturation();
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1301,7 +1300,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
         }})",
       toJson(std::to_string(pageId))));
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{
@@ -1320,7 +1319,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
   // page.
   mockNextConnectionBehavior = Accept;
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "connect",
           "payload": {{
@@ -1337,7 +1336,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
           AtJsonPtr("/params", ElementsAre("arg1", "arg2"))))))
       .RetiresOnSaturation();
 
-  webSockets_[0]->getDelegate().didReceiveMessage(std::format(
+  webSockets_[0]->getDelegate().didReceiveMessage(fmt::format(
       R"({{
           "event": "wrappedEvent",
           "payload": {{