Page load and parsing durations in HTTP header

interfacer/src/browsh/comms.go

@@ -22,7 +22,7 @@ var (
 
 type incomingRawText struct {
 	RequestID string `json:"request_id"`
-	RawText   string `json:"body"`
+	RawJSON   string `json:"json"`
 }
 
 func startWebSocketServer() {
@@ -96,7 +96,7 @@ func handleRawFrameTextCommands(parts []string) {
 		}
 		if incoming.RequestID != "" {
 			Log("Raw text for " + incoming.RequestID)
-			rawTextRequests[incoming.RequestID] = incoming.RawText
+			rawTextRequests[incoming.RequestID] = incoming.RawJSON
 		} else {
 			Log("Raw text but no associated request ID")
 		}

interfacer/src/browsh/raw_text_server.go

@@ -2,6 +2,7 @@ package browsh
 
 import (
 	"crypto/rand"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -21,6 +22,12 @@ import (
 // real browser to render the webpage, we keep track of requests in a map.
 var rawTextRequests = make(map[string]string)
 
+type rawTextResponse struct {
+	PageloadDuration int    `json:"page_load_duration"`
+	ParsingDuration  int    `json:"parsing_duration"`
+	Text             string `json:"body"`
+}
+
 // HTTPServerStart starts the HTTP server is a seperate service from the usual interactive TTY
 // app. It accepts normal HTTP requests and uses the path portion of the URL as the entry to the
 // Browsh URL bar. It then returns a simple line-broken text version of whatever the browser
@@ -81,6 +88,7 @@ func (h *slashFix) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func handleHTTPServerRequest(w http.ResponseWriter, r *http.Request) {
 	var message string
 	var isErrored bool
+	var start = time.Now().Format(time.RFC3339)
 	urlForBrowsh, _ := url.PathUnescape(strings.TrimPrefix(r.URL.Path, "/"))
 	urlForBrowsh, isErrored = deRecurseURL(urlForBrowsh)
 	if isErrored {
@@ -128,6 +136,7 @@ func handleHTTPServerRequest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	rawTextRequestID := pseudoUUID()
+	rawTextRequests[rawTextRequestID+"-start"] = start
 	mode := getRawTextMode(r)
 	sendMessageToWebExtension(
 		"/raw_text_request," + rawTextRequestID + "," +
@@ -198,13 +207,36 @@ func getRawTextMode(r *http.Request) string {
 
 func waitForResponse(rawTextRequestID string, w http.ResponseWriter) {
 	var rawTextRequestResponse string
+	var jsonResponse rawTextResponse
+	var totalTime, pageLoad, parsing string
 	var ok bool
 	for {
 		if rawTextRequestResponse, ok = rawTextRequests[rawTextRequestID]; ok {
-			io.WriteString(w, rawTextRequestResponse)
+			jsonResponse = unpackResponse(rawTextRequestResponse)
+			totalTime = getTotalTiming(rawTextRequests[rawTextRequestID+"-start"])
+			pageLoad = fmt.Sprintf("%dms", jsonResponse.PageloadDuration)
+			parsing = fmt.Sprintf("%dms", jsonResponse.ParsingDuration)
+			w.Header().Set("X-Browsh-Duration-Total", totalTime+"ms")
+			w.Header().Set("X-Browsh-Duration-Pageload", pageLoad)
+			w.Header().Set("X-Browsh-Duration-Parsing", parsing)
+			io.WriteString(w, jsonResponse.Text)
 			delete(rawTextRequests, rawTextRequestID)
 			break
 		}
-		time.Sleep(10 * time.Millisecond)
+		time.Sleep(1 * time.Millisecond)
 	}
 }
+
+func unpackResponse(jsonString string) rawTextResponse {
+	var response rawTextResponse
+	jsonBytes := []byte(jsonString)
+	if err := json.Unmarshal(jsonBytes, &response); err != nil {
+	}
+	return response
+}
+
+func getTotalTiming(startString string) string {
+	start, _ := time.Parse(time.RFC3339, startString)
+	elapsed := time.Since(start) / time.Millisecond
+	return fmt.Sprintf("%d", elapsed)
+}

webext/src/background/manager.js

@@ -158,14 +158,22 @@ export default class extends utils.mixins(CommonMixin, TTYCommandsMixin) {
   }
 
   _applyUpdates(tabish_object) {
-    let tab = this._maybeNewTab({ id: tabish_object.id });
+    let tab = this._maybeNewTab({
-    ["id", "title", "url", "active", "request_id", "raw_text_mode_type"].map(
+      id: tabish_object.id
-      key => {
+    });
-        if (tabish_object.hasOwnProperty(key)) {
+    [
-          tab[key] = tabish_object[key];
+      "id",
-        }
+      "title",
+      "url",
+      "active",
+      "request_id",
+      "raw_text_mode_type",
+      "start_time"
+    ].map(key => {
+      if (tabish_object.hasOwnProperty(key)) {
+        tab[key] = tabish_object[key];
       }
-    );
+    });
     if (tabish_object.active) {
       this.active_tab_id = tab.id;
     }
@@ -289,7 +297,9 @@ export default class extends utils.mixins(CommonMixin, TTYCommandsMixin) {
           }
         }
       },
-      { urls: ["*://*/*"] },
+      {
+        urls: ["*://*/*"]
+      },
       ["blocking"]
     );
   }

webext/src/background/tab.js

@@ -120,6 +120,7 @@ export default class extends utils.mixins(CommonMixin, TabCommandsMixin) {
 
   sendGlobalConfig(config) {
     config.http_server_mode_type = this._calculateMode();
+    config.start_time = this.start_time;
     this.channel.postMessage(`/config,${JSON.stringify(config)}`);
   }
 

webext/src/background/tab_commands_mixin.js

@@ -47,8 +47,11 @@ export default MixinBase =>
     }
 
     _rawTextRequest(incoming) {
-      incoming.request_id = this.request_id;
+      let payload = {
-      this.sendToTerminal(`/raw_text,${JSON.stringify(incoming)}`);
+        json: JSON.stringify(incoming),
+        request_id: this.request_id
+      };
+      this.sendToTerminal(`/raw_text,${JSON.stringify(payload)}`);
       this._tabCount(count => {
         if (count > 1) {
           this.remove();

webext/src/background/tty_commands_mixin.js

@@ -190,7 +190,8 @@ export default MixinBase =>
         this._acknowledgeNewTab({
           id: native_tab.id,
           request_id: request_id,
-          raw_text_mode_type: mode.toLowerCase()
+          raw_text_mode_type: mode.toLowerCase(),
+          start_time: Date.now()
         });
         // Sometimes tabs fail to load for whatever reason. Make sure they get
         // removed to save RAM in long-lived Browsh HTTP servers

webext/src/dom/manager.js

@@ -37,7 +37,6 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) {
       this.graphics_builder,
       this.config
     );
-    this.text_builder._raw_text_start = performance.now();
   }
 
   _willHideText() {
@@ -204,6 +203,8 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) {
     });
     window.addEventListener("load", () => {
       this.is_page_finished_loading = true;
+      this.config.page_load_duration = Date.now() - this.config.start_time;
+      this.text_builder.config = this.config;
       this.log("PAGE LOADED");
     });
     window.addEventListener("unload", () => {

webext/src/dom/serialise_mixin.js

@@ -85,8 +85,9 @@ export default MixinBase =>
 
     _getMetaData() {
       let metadata = "";
+      this._markParsingDuration();
       const date_time = this._getCurrentDataTime();
-      const elapsed = `${performance.now() - this._raw_text_start}ms`;
+      const elapsed = `${this._parsing_duration}ms`;
       metadata +=
         "\n\n" + `Built ` + this._byBrowsh() + `on ${date_time} in ${elapsed}.`;
       if (this.dimensions.is_page_truncated) {
@@ -189,6 +190,10 @@ export default MixinBase =>
       }
     }
 
+    _markParsingDuration() {
+      this._parsing_duration = performance.now() - this._parse_start_time;
+    }
+
     _getCurrentDataTime() {
       let current_date = new Date();
       const offset = -(new Date().getTimezoneOffset() / 60);
@@ -293,7 +298,9 @@ export default MixinBase =>
 
     _sendRawText() {
       let payload = {
-        body: this._serialiseRawText()
+        body: this._serialiseRawText(),
+        page_load_duration: this.config.page_load_duration,
+        parsing_duration: this._parsing_duration
       };
       this.sendMessage(`/raw_text,${JSON.stringify(payload)}`);
     }

webext/src/dom/text_builder.js

@@ -29,6 +29,7 @@ export default class extends utils.mixins(CommonMixin, SerialiseMixin) {
 
   sendRawText(type) {
     this._raw_mode_type = type;
+    this._parse_start_time = performance.now();
     this.buildFormattedText(this._sendRawText.bind(this));
   }