Fix for DFL-3324: An item with "Sequence terminated, retry" has two entries in the detail view

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -52,7 +52,7 @@ templates.details = function(entry, left_val, do_raw)
 
 templates._details_content = function(entry, do_raw)
 {  
-  var responsecode = entry.current_responsecode;
+  var responsecode = entry.last_responsecode;
   if (responsecode && responsecode in cls.ResourceUtil.http_status_codes)
      responsecode = responsecode + " " + cls.ResourceUtil.http_status_codes[responsecode];
 
@@ -83,7 +83,7 @@ templates._details_content = function(entry, do_raw)
           ["td",
             entry.touched_network && responsecode ? String(responsecode) : ui_strings.S_RESOURCE_ALL_NOT_APPLICABLE
           ],
-         "data-spec", "http#" + entry.current_responsecode
+         "data-spec", "http#" + entry.last_responsecode
         ]
       ],
       entry.touched_network ? [] : this.did_not_touch_network(entry),
@@ -105,23 +105,48 @@ templates.did_not_touch_network = function(entry)
 
 templates.requests_responses = function(do_raw, request_response, index, requests_responses)
 {
-  var is_last = index == requests_responses.length - 1;
-  var template_func = this._response;
+  var is_last_of_type = true;
+  var template_func;
+
+  // todo: ugly.
   if (request_response instanceof cls.NetworkLoggerRequest)
+  {
+    for (var i = index + 1, req_res; req_res = requests_responses[i]; i++)
+      if (req_res instanceof cls.NetworkLoggerRequest)
+        is_last_of_type = false;
+
     template_func = this._request;
+  }
+  else
+  {
+    for (var i = index + 1, req_res; req_res = requests_responses[i]; i++)
+      if (req_res instanceof cls.NetworkLoggerResponse)
+        is_last_of_type = false;
+
+    template_func = this._response;
+  }
 
-  return template_func.call(this, request_response, is_last, do_raw);
+  return template_func.call(this, request_response, is_last_of_type, do_raw);
 };
 
-templates._request = function(request, is_last, do_raw)
+templates._request = function(request, is_last_request, do_raw)
 {
+  // A request that's followed by another one, without a response in between,
+  // is not shown in network-details. It will mostly mean it was retried internally
+  // and didn't go on the network.
+  // That can't be determined only by looking at RequestRetry events, because a
+  // request with for example a 401 Authorization Required response should still 
+  // be shown.
+  if (!is_last_request && !request.was_responded)
+    return [];
+
   return [
     templates._request_headers(request, do_raw),
     templates._request_body(request, do_raw)
   ]
 };
 
-templates._response = function(response, is_last, do_raw)
+templates._response = function(response, is_last, do_raw) // todo: is_last_response?
 {
   return [
     this._response_headers(response, do_raw),

src/network/network_service.js

@@ -405,7 +405,7 @@ cls.RequestContextPrototype = function()
       the last entry we saw with the event's resourceID.
     */
     return event.requestID &&
-           (last_entry.requestID !== event.requestID);
+           (last_entry.last_requestID !== event.requestID);
   };
 
   this.update = function(eventname, event)
@@ -429,7 +429,7 @@ cls.RequestContextPrototype = function()
     else
     {
       var logger_entry = logger_entries.last;
-      if (logger_entry && logger_entry.requestID)
+      if (logger_entry && logger_entry.last_requestID)
       {
         /*
           The same resource id can be loaded several times, but then the request id changes.
@@ -443,7 +443,7 @@ cls.RequestContextPrototype = function()
         {
           opera.postError(ui_strings.S_DRAGONFLY_INFO_MESSAGE +
                           " Unexpected change in requestID on " + eventname +
-                          ": Change from " + logger_entry.requestID + " to " + 
+                          ": Change from " + logger_entry.last_requestID + " to " + 
                           event.requestID + ", URL: " + logger_entry.human_url);
         }
       }
@@ -454,7 +454,7 @@ cls.RequestContextPrototype = function()
         logger_entry = new cls.NetworkLoggerEntry(id, event.resourceID, event.documentID, this.get_starttime());
         this._logger_entries.push(logger_entry);
       }
-      logger_entry.requestID = event.requestID;
+      logger_entry.last_requestID = event.requestID;
       logger_entry.update(eventname, event);
     }
 
@@ -503,7 +503,7 @@ cls.NetworkLoggerEntry = function(id, resource_id, document_id, context_starttim
   this.starttime_relative = null;
   this.endtime = null;
   this.requests_responses = [];
-  this.current_responsecode = null;
+  this.last_responsecode = null;
   this.last_method = null;
   this.is_unloaded = false;
   this.is_finished = false;
@@ -756,13 +756,19 @@ cls.NetworkLoggerEntryPrototype = function()
 
   this._update_event_requestretry = function(event)
   {
-    this.requestID = event.toRequestID;
+    // This means on the next request with event.toRequestID, we won't 
+    // make a new entry, but a new NetworkLoggerRequest on the same entry.
+    this.last_requestID = event.toRequestID;
   };
 
   this._update_event_response = function(event)
   {
-    this.current_responsecode = event.responseCode;
-    this.error_in_current_response = /^[45]/.test(this.current_responsecode);
+    if (this._current_request)
+    {
+      this._current_request.was_responded = true;
+    }
+    this.last_responsecode = event.responseCode;
+    this.error_in_last_response = /^[45]/.test(this.last_responsecode);
     this._current_response = new cls.NetworkLoggerResponse(this);
     this.requests_responses.push(this._current_response);
     this._current_response._update_event_response(event);
@@ -774,6 +780,10 @@ cls.NetworkLoggerEntryPrototype = function()
     // therefore have to init NetworkLoggerResponse here. See CORE-43935.
     if (!this._current_response)
     {
+      if (this._current_request)
+      {
+        this._current_request.was_responded = true;
+      }
       this._current_response = new cls.NetworkLoggerResponse(this);
       this.requests_responses.push(this._current_response);
     }
@@ -918,7 +928,11 @@ cls.NetworkLoggerRequest = function(entry)
   this.firstline = null;
   this.requestbody = null;
   this.boundary = "";
-  this.header_tokens = null; // This is set from template code, when it's first needed.
+  this.was_responded = false;
+  // Set from template code, when first needed:
+  this.header_tokens = null;
+  // Belongs here, unused though:
+  this.requestID = entry.requestID;
 };
 
 cls.NetworkLoggerRequestPrototype = function()