Revert "Bug 1830230 - [devtools] Start sending multiple events as the response data is arrives r=webdriver-reviewers,devtools-reviewers,jdescottes" for causing multiple failures

This reverts commit e2cabf4.

Author: chorotan

devtools/client/netmonitor/src/components/StatusCode.js

@@ -24,7 +24,6 @@ const UPDATED_STATUS_PROPS = [
   "fromServiceWorker",
   "status",
   "statusText",
-  "blockedReason",
 ];
 
 /**

devtools/client/netmonitor/src/components/request-list/RequestListColumnTransferredSize.js

@@ -29,8 +29,6 @@ const UPDATED_TRANSFERRED_PROPS = [
   "fromCache",
   "isRacing",
   "fromServiceWorker",
-  "blockedReason",
-  "blockingExtension",
 ];
 
 class RequestListColumnTransferredSize extends Component {

devtools/client/netmonitor/src/components/request-list/RequestListItem.js

@@ -173,8 +173,6 @@ const UPDATED_REQ_ITEM_PROPS = [
   "waitingTime",
   "isEventStream",
   "priority",
-  "blockedReason",
-  "blockingExtension",
 ];
 
 const UPDATED_REQ_PROPS = [

devtools/client/netmonitor/src/utils/request-utils.js

@@ -112,23 +112,13 @@ function fetchNetworkUpdatePacket(requestData, request, updateTypes) {
   const promises = [];
   if (request) {
     updateTypes.forEach(updateType => {
-      // stackTrace needs to be handled specially as the property to lookup
-      // on the request object follows a slightly different convention.
-      // i.e `stacktrace` not `stackTrace`
+      // Only stackTrace will be handled differently
       if (updateType === "stackTrace") {
         if (request.cause.stacktraceAvailable && !request.stacktrace) {
           promises.push(requestData(request.id, updateType));
         }
         return;
       }
-      // responseContent only checks the availiability flag as there can
-      // be multiple response content events
-      if (updateType === "responseContent") {
-        if (request.responseContentAvailable) {
-          promises.push(requestData(request.id, updateType));
-        }
-        return;
-      }
 
       if (request[`${updateType}Available`] && !request[updateType]) {
         promises.push(requestData(request.id, updateType));

devtools/client/netmonitor/test/browser_net_chunked-response.js

@@ -44,6 +44,11 @@ function setupTestServer() {
 }
 
 add_task(async function () {
+  // TODO: Enable test when Bug 1557795 gets fixed.
+  // eslint-disable-next-line no-constant-condition
+  if (true) {
+    return;
+  }
   const { httpServer, completeResponse } = setupTestServer();
   const port = httpServer.identity.primaryPort;
 
@@ -67,7 +72,7 @@ add_task(async function () {
   });
   await SpecialPowers.spawn(
     tab.linkedBrowser,
-    [`http://localhost:${port}/chunked-data`],
+    `http://localhost:${port}/chunked-data`,
     async url => {
       await content.wrappedJSObject.fetch(url);
     }

devtools/client/netmonitor/test/browser_net_domain-not-found.js

@@ -7,7 +7,6 @@
  * Tests that the request for a domain that is not found shows
  * correctly.
  */
-
 add_task(async function () {
   const URL = "https://not-existed.com/";
   const { monitor } = await initNetMonitor(URL, {
@@ -32,7 +31,10 @@ add_task(async function () {
     const value = firstItem.querySelector(
       ".requests-list-transferred"
     ).innerText;
-    return value.includes("NS_ERROR") ? value : false;
+    if (value == "") {
+      return false;
+    }
+    return value;
   });
 
   is(

devtools/client/netmonitor/test/browser_net_sse-basic.js

@@ -213,6 +213,11 @@ add_task(async function testBasicServerSentEvents() {
  * 3) Assert that the close connection message is displayed when the connection is closed.
  */
 add_task(async function testServerSentEventsDetails() {
+  // TODO: Should enable this test when Bug 1557795 gets fixed.
+  // eslint-disable-next-line no-constant-condition
+  if (true) {
+    return null;
+  }
   const { httpServer, sendResponseMessages, completeResponse } =
     setupTestServer();
   const port = httpServer.identity.primaryPort;
@@ -274,7 +279,7 @@ add_task(async function testServerSentEventsDetails() {
   const waitForMoreMessages = waitForDOM(
     document,
     "#messages-view .message-list-table .message-list-item",
-    4
+    3
   );
   info("Send a couple of more messages");
   sendResponseMessages();

devtools/server/actors/network-monitor/network-event-actor.js

@@ -638,33 +638,14 @@ class NetworkEventActor extends Actor {
     });
   }
 
-  /**
-   * Add network response content end.
-   *
-   * @param object
-   */
-  addResponseContentComplete({ blockedReason, blockingExtension }) {
-    // Ignore calls when this actor is already destroyed
-    if (this.isDestroyed()) {
-      return;
-    }
-
-    this._onEventUpdate(
-      lazy.NetworkUtils.NETWORK_EVENT_TYPES.RESPONSE_CONTENT_COMPLETE,
-      {
-        blockedReason,
-        blockingExtension,
-      }
-    );
-  }
-
   /**
    * Add network response content.
    *
    * @param object content
    *        The response content.
+   * @param object
    */
-  addResponseContent(content) {
+  addResponseContent(content, { blockedReason, blockingExtension }) {
     // Ignore calls when this actor is already destroyed
     if (this.isDestroyed()) {
       return;
@@ -683,6 +664,8 @@ class NetworkEventActor extends Actor {
         mimeType: content.mimeType,
         contentSize: content.size,
         transferredSize: content.transferredSize,
+        blockedReason,
+        blockingExtension,
       }
     );
   }

devtools/server/actors/resources/network-events-content.js

@@ -231,13 +231,15 @@ class NetworkEventContentWatcher {
         {} /* offsets */
       );
       networkEventActor.addServerTimings({});
-      networkEventActor.addResponseContent({
-        mimeType: channel.contentType,
-        size: channel.contentLength,
-        text: "",
-        transferredSize: 0,
-      });
-      networkEventActor.addResponseContentComplete({});
+      networkEventActor.addResponseContent(
+        {
+          mimeType: channel.contentType,
+          size: channel.contentLength,
+          text: "",
+          transferredSize: 0,
+        },
+        {}
+      );
     } else if (type == RESOURCE_TYPES.DATA_CHANNEL) {
       lazy.NetworkUtils.handleDataChannel(channel, networkEventActor);
     }

devtools/server/actors/resources/network-events.js

@@ -403,8 +403,6 @@ class NetworkEventWatcher {
         resourceUpdates.contentSize = updateResource.contentSize;
         resourceUpdates.transferredSize = updateResource.transferredSize;
         resourceUpdates.mimeType = updateResource.mimeType;
-        break;
-      case NETWORK_EVENT_TYPES.RESPONSE_CONTENT_COMPLETE:
         resourceUpdates.blockingExtension = updateResource.blockingExtension;
         resourceUpdates.blockedReason = updateResource.blockedReason;
         break;
@@ -425,7 +423,7 @@ class NetworkEventWatcher {
 
     const isResponseComplete =
       receivedUpdates.includes(NETWORK_EVENT_TYPES.EVENT_TIMINGS) &&
-      receivedUpdates.includes(NETWORK_EVENT_TYPES.RESPONSE_CONTENT_COMPLETE) &&
+      receivedUpdates.includes(NETWORK_EVENT_TYPES.RESPONSE_CONTENT) &&
       receivedUpdates.includes(NETWORK_EVENT_TYPES.SECURITY_INFO);
 
     if (isResponseComplete) {
@@ -438,7 +436,6 @@ class NetworkEventWatcher {
 
     if (
       updateResource.updateType == NETWORK_EVENT_TYPES.RESPONSE_START ||
-      updateResource.updateType == NETWORK_EVENT_TYPES.RESPONSE_CONTENT ||
       isResponseComplete
     ) {
       this._emitUpdate(networkEvent);