For now, reverting back to old behavior of Request Crafter, showing the first response, not the last one; Fixed some todos; Fixed some naming

Author: Daniel Herzog

src/client-en.xml

@@ -522,6 +522,7 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./resource-manager/documentmanager.1.0.events.onabouttoloaddocument.js"/>
 <script src="./resource-manager/resourcemanager.1.2.events.onurlunload.js"/>
 <script src="./resource-manager/resourcemanager.1.2.responses.getresource.js"/>
+<script src="./resource-manager/resourcemanager.1.3.responses.createrequest.js"/>
 
 
 <script src="./network/network_service.js"/>

src/network/network_request_crafting_view.js

@@ -144,12 +144,16 @@ cls.RequestCraftingView = function(id, name, container_class, html, default_hand
 
   this._handle_send_request_bound = function()
   {
+    var CONTEXT_TYPE_CRAFTER = this._service.CONTEXT_TYPE_CRAFTER;
+    // todo: the old contexts will probably be kept for comparing previous requests.
+    this._service.remove_request_context(CONTEXT_TYPE_CRAFTER);
+
     this._prev_url = this._urlfield.get_value();
     var data = this._input.get_value();
     var requestdata = this._parse_request(data);
     if (requestdata)
     {
-      var ctx = this._service.get_request_context(this._service.CONTEXT_TYPE_CRAFTER, true);
+      var ctx = this._service.get_request_context(CONTEXT_TYPE_CRAFTER, true);
       var crafter_request_id = ctx.send_request(this._prev_url, requestdata);
       this._crafter_requests.push(crafter_request_id);
     }
@@ -190,7 +194,7 @@ cls.RequestCraftingView = function(id, name, container_class, html, default_hand
   eh.change["request-crafter-url-change"] = this._handle_url_change_bound;
   eh.keyup["request-crafter-url-change"] = this._handle_url_change_bound;
 
-  this._service.addListener("context-established", this._on_context_established_bound);
+  this._service.addListener("context-added", this._on_context_established_bound);
 
   // for onchange and buffermanager  eh.click["request-crafter-send"] = this._handle_send_request_bound;
 

src/network/network_service.js

@@ -2,7 +2,7 @@
 
 cls.NetworkLoggerService = function()
 {
-  this.CONTEXT_TYPE_LOGGER = this.MAIN_CONTEXT_TYPE = "network-logger";
+  this.CONTEXT_TYPE_LOGGER = this.CONTEXT_TYPE_MAIN = "network-logger";
   this.CONTEXT_TYPE_CRAFTER = "request-crafter";
 
   this._get_matching_context = function(res_id)
@@ -20,19 +20,18 @@ cls.NetworkLoggerService = function()
     var ctx = this.contexts[type];
     if (!ctx && force)
     {
-      var is_main_context = type === this.MAIN_CONTEXT_TYPE;
+      var is_main_context = type === this.CONTEXT_TYPE_MAIN;
       ctx = this.contexts[type] = new cls.RequestContext(this, is_main_context);
-      this.post("context-established", {"context_type": type});
+      this.post("context-added", {"context_type": type});
     }
     return ctx;
   };
 
-  this.clear_request_context = function(type)
+  this.remove_request_context = function(type)
   {
-    // Todo: Maybe this should be called with the context gotten from get_request_context instead.
-    var type = this.CONTEXT_TYPE_LOGGER;
+    type = (type || this.CONTEXT_TYPE_MAIN);
     this.contexts[type] = null;
-    this.post("context-cleared");
+    this.post("context-removed", {"context_type": type});
   };
 
   this._queue_message = function(listener, msg)
@@ -107,9 +106,9 @@ cls.NetworkLoggerService = function()
     if (!ctx)
     {
       var type = this.CONTEXT_TYPE_LOGGER;
-      var is_main_context = type === this.MAIN_CONTEXT_TYPE;
+      var is_main_context = type === this.CONTEXT_TYPE_MAIN;
       ctx = this.contexts[type] = new cls.RequestContext(this, is_main_context);
-      this.post("context-established", {"context_type": type});
+      this.post("context-added", {"context_type": type});
     }
     ctx.update("urlload", data);
   };
@@ -310,7 +309,7 @@ cls.NetworkLoggerService = function()
     this._doc_service = window.services["document-manager"];
     this._doc_service.addListener("abouttoloaddocument", this._on_abouttoloaddocument_bound);
 
-    messages.addListener("debug-context-selected", this.clear_request_context.bind(this, this.CONTEXT_TYPE_LOGGER));
+    messages.addListener("debug-context-selected", this.remove_request_context.bind(this, null));
     messages.addListener("setting-changed", this._on_setting_changed_bound);
 
     this._message_queue = [];
@@ -742,9 +741,8 @@ cls.RequestContextPrototype = function()
     this.is_waiting_for_create_request = false;
     if (status == 0)
     {
-      var RESOURCEID = 0;
-      // todo: use the message class instead
-      this.allocated_res_ids[msg[RESOURCEID]] = id;
+      var data = new cls.ResourceManager["1.3"].ResourceID(msg);
+      this.allocated_res_ids[data.resourceID] = id;
     }
     else
     {

src/network/network_templates.js

@@ -76,7 +76,23 @@ templates.options_override_presets = function(overrides)
 
 templates.request_crafter_main = function(url, request, entries)
 {
-  var entry = entries.last; // todo: will deal with multiple entries later.
+  var entry = entries[0]; // todo: will deal with multiple entries later.
+  var response = ui_strings.M_NETWORK_CRAFTER_SEND;
+  if (entry && entry.is_finished)
+  {
+    var helpers = window.helpers;
+    var first_response = entry.requests_responses.filter(helpers.eq("is_response", true))[0];
+    if (first_response)
+    {
+      response = first_response.response_headers_raw;
+      if (first_response.responsebody && 
+          first_response.responsebody.content &&
+          first_response.responsebody.content.stringData)
+      {
+        response += "\n\n" + first_response.responsebody.content.stringData;
+      }
+    }
+  }
   return (
     ["div",
       ["div",
@@ -102,7 +118,7 @@ templates.request_crafter_main = function(url, request, entries)
         ],
         ["h2", ui_strings.S_NETWORK_REQUEST_DETAIL_RESPONSE_TITLE],
         ["p",
-          ["textarea", (entry && entry.is_finished) ? entry.current_response.response_headers_raw : ui_strings.M_NETWORK_CRAFTER_SEND]
+          ["textarea", response]
         ],
         "class", "padding request-crafter"
       ]

src/network/network_view.js

@@ -517,7 +517,7 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
 
   this._on_clear_log_bound = function(evt, target)
   {
-    this._service.clear_request_context(this._service.CONTEXT_TYPE_LOGGER);
+    this._service.remove_request_context();
     this.needs_instant_update = true;
   }.bind(this);
 
@@ -663,6 +663,14 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
     }
   }.bind(this);
 
+  this._on_context_removed_bound = function(message)
+  {
+    if (message.context_type === this._service.CONTEXT_TYPE_LOGGER)
+    {
+      this.update();
+    }
+  }.bind(this);
+
   this._init = function(id, name, container_class, html, default_handler)
   {
     var eh = window.eventHandlers;
@@ -688,8 +696,8 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
 
     eh.click["close-incomplete-warning"] = this._on_close_incomplete_warning_bound;
 
-    this._service.addListener("context-established", this._on_context_established_bound);
-    this._service.addListener("context-cleared", this.update.bind(this));
+    this._service.addListener("context-added", this._on_context_established_bound);
+    this._service.addListener("context-removed", this._on_context_removed_bound);
     this._service.addListener("resource-update", this.update.bind(this));
 
     ActionHandlerInterface.apply(this);

src/resource-manager/resourcemanager.1.3.responses.createrequest.js

@@ -0,0 +1,10 @@
+// Autogenerated by hob
+window.cls || (window.cls = {});
+cls.ResourceManager || (cls.ResourceManager = {});
+cls.ResourceManager["1.3"] || (cls.ResourceManager["1.3"] = {});
+
+cls.ResourceManager["1.3"].ResourceID = function(arr)
+{
+  this.resourceID = arr[0];
+};
+