From 7e4297d9bf260063543f5e1ef6b952d0366a9621 Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Thu, 28 Jan 2021 13:09:31 +0530
Subject: [PATCH] Accurate response time and size (#1441)

Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
---
 assets/scss/styles.scss                       |  2 +-
 components/http/http-response-meta.vue        | 47 ++++++++++++++++++
 components/http/http-response.vue             | 23 +++++++++
 .../lenses/renderers/HTMLLensRenderer.vue     |  2 +-
 .../lenses/renderers/ImageLensRenderer.vue    |  2 +-
 .../lenses/renderers/JSONLensRenderer.vue     |  2 +-
 .../lenses/renderers/RawLensRenderer.vue      |  2 +-
 .../lenses/renderers/XMLLensRenderer.vue      |  2 +-
 components/ui/tabs.vue                        |  4 +-
 helpers/strategies/AxiosStrategy.js           | 20 ++++++++
 helpers/strategies/ExtensionStrategy.js       | 32 ++++++++++++-
 lang/en-US.json                               |  4 +-
 pages/graphql.vue                             |  2 +-
 pages/index.vue                               | 48 +++++--------------
 14 files changed, 144 insertions(+), 48 deletions(-)
 create mode 100644 components/http/http-response-meta.vue
 create mode 100644 components/http/http-response.vue

diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss
index 3d5278c88..eb71d9d97 100644
--- a/assets/scss/styles.scss
+++ b/assets/scss/styles.scss
@@ -672,7 +672,7 @@ ol li {
 }
 
 .missing-data-response {
-  @apply bg-errColor;
+  @apply text-fgLightColor;
 }
 
 #response-details-wrapper {
diff --git a/components/http/http-response-meta.vue b/components/http/http-response-meta.vue
new file mode 100644
index 000000000..0a7391262
--- /dev/null
+++ b/components/http/http-response-meta.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="flex flex-col">
+    <div class="flex items-center justify-between">
+      <label>{{ $t("response") }}</label>
+      <label v-if="active"><i class="animate-spin material-icons">refresh</i></label>
+      <label v-else :class="statusCategory ? statusCategory.className : ''">
+        <i class="material-icons">fiber_manual_record</i>
+      </label>
+    </div>
+    <div class="flex flex-col lg:flex-row">
+      <label class="flex-1">
+        {{ $t("status") + `: \xA0 ` }}
+        <span :class="statusCategory ? statusCategory.className : ''">
+          {{ response.status || $t("waiting_send_req") }}
+        </span>
+      </label>
+      <label>
+        {{ $t("duration") + `: \xA0 ${response.duration} ms` }}
+      </label>
+      <label>
+        {{ $t("size") + `: \xA0 ${response.size} B` }}
+      </label>
+    </div>
+  </div>
+</template>
+
+<script>
+import findStatusGroup from "~/helpers/findStatusGroup"
+
+export default {
+  props: {
+    response: {
+      type: Object,
+      default: {},
+    },
+    active: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    statusCategory() {
+      return findStatusGroup(this.response.status)
+    },
+  },
+}
+</script>
diff --git a/components/http/http-response.vue b/components/http/http-response.vue
new file mode 100644
index 000000000..1059ffd56
--- /dev/null
+++ b/components/http/http-response.vue
@@ -0,0 +1,23 @@
+<template>
+  <pw-section class="purple" id="response" :label="$t('response')" ref="response" no-legend>
+    <http-response-meta :response="response" :active="active" />
+    <div v-if="response.body && response.body !== $t('loading')">
+      <response-body-renderer :response="response" />
+    </div>
+  </pw-section>
+</template>
+
+<script>
+export default {
+  props: {
+    response: {
+      type: Object,
+      default: {},
+    },
+    active: {
+      type: Boolean,
+      default: false,
+    },
+  },
+}
+</script>
diff --git a/components/lenses/renderers/HTMLLensRenderer.vue b/components/lenses/renderers/HTMLLensRenderer.vue
index 0e362561b..b35cbbf93 100644
--- a/components/lenses/renderers/HTMLLensRenderer.vue
+++ b/components/lenses/renderers/HTMLLensRenderer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="row-wrapper">
-      <label for="body">{{ $t("response") }}</label>
+      <label for="body">{{ $t("response_body") }}</label>
       <div>
         <button
           class="icon"
diff --git a/components/lenses/renderers/ImageLensRenderer.vue b/components/lenses/renderers/ImageLensRenderer.vue
index 02e0bbf58..bf424226a 100644
--- a/components/lenses/renderers/ImageLensRenderer.vue
+++ b/components/lenses/renderers/ImageLensRenderer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="row-wrapper">
-      <label for="body">{{ $t("response") }}</label>
+      <label for="body">{{ $t("response_body") }}</label>
       <div>
         <button
           class="icon"
diff --git a/components/lenses/renderers/JSONLensRenderer.vue b/components/lenses/renderers/JSONLensRenderer.vue
index 6bfc55011..8273d3c42 100644
--- a/components/lenses/renderers/JSONLensRenderer.vue
+++ b/components/lenses/renderers/JSONLensRenderer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="row-wrapper">
-      <label for="body">{{ $t("response") }}</label>
+      <label for="body">{{ $t("response_body") }}</label>
       <div>
         <button
           class="icon"
diff --git a/components/lenses/renderers/RawLensRenderer.vue b/components/lenses/renderers/RawLensRenderer.vue
index d739b37a8..d62666a07 100644
--- a/components/lenses/renderers/RawLensRenderer.vue
+++ b/components/lenses/renderers/RawLensRenderer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="row-wrapper">
-      <label for="body">{{ $t("response") }}</label>
+      <label for="body">{{ $t("response_body") }}</label>
       <div>
         <button
           class="icon"
diff --git a/components/lenses/renderers/XMLLensRenderer.vue b/components/lenses/renderers/XMLLensRenderer.vue
index 7c5346344..ed6f8bd1b 100644
--- a/components/lenses/renderers/XMLLensRenderer.vue
+++ b/components/lenses/renderers/XMLLensRenderer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="row-wrapper">
-      <label for="body">{{ $t("response") }}</label>
+      <label for="body">{{ $t("response_body") }}</label>
       <div>
         <button
           class="icon"
diff --git a/components/ui/tabs.vue b/components/ui/tabs.vue
index 0964efad7..432382bcd 100644
--- a/components/ui/tabs.vue
+++ b/components/ui/tabs.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tabs-wrapper">
-    <div class="tabs">
-      <ul :class="styles">
+    <div class="tabs" :class="styles">
+      <ul>
         <li
           v-for="(tab, index) in tabs"
           :class="{ 'is-active': tab.isActive }"
diff --git a/helpers/strategies/AxiosStrategy.js b/helpers/strategies/AxiosStrategy.js
index 42f30c25a..694d8e8e8 100644
--- a/helpers/strategies/AxiosStrategy.js
+++ b/helpers/strategies/AxiosStrategy.js
@@ -1,6 +1,26 @@
 import axios from "axios"
 import { decodeB64StringToArrayBuffer } from "../utils/b64"
 
+axios.interceptors.request.use(
+  (config) => {
+    config.timeData = { startTime: new Date().getTime() }
+    return config
+  },
+  (error) => {
+    return Promise.reject(error)
+  }
+)
+
+axios.interceptors.response.use(
+  (response) => {
+    response.config.timeData.endTime = new Date().getTime()
+    return response
+  },
+  (error) => {
+    return Promise.reject(error)
+  }
+)
+
 let cancelSource = axios.CancelToken.source()
 
 export const cancelRunningAxiosRequest = () => {
diff --git a/helpers/strategies/ExtensionStrategy.js b/helpers/strategies/ExtensionStrategy.js
index 1a8ed676e..40cbc6f59 100644
--- a/helpers/strategies/ExtensionStrategy.js
+++ b/helpers/strategies/ExtensionStrategy.js
@@ -16,7 +16,9 @@ export const cancelRunningExtensionRequest = () => {
 }
 
 const extensionWithProxy = async (req, { state }) => {
-  const { data } = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
+  const backupTimeDataStart = new Date().getTime();
+
+  const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
     method: "post",
     url: state.postwoman.settings.PROXY_URL || "https://hoppscotch.apollosoftware.xyz/",
     data: {
@@ -25,7 +27,9 @@ const extensionWithProxy = async (req, { state }) => {
     },
   })
 
-  const parsedData = JSON.parse(data)
+  const backupTimeDataEnd = new Date().getTime();
+
+  const parsedData = JSON.parse(res.data)
 
   if (!parsedData.success) {
     throw new Error(parsedData.data.message || "Proxy Error")
@@ -35,14 +39,38 @@ const extensionWithProxy = async (req, { state }) => {
     parsedData.data = decodeB64StringToArrayBuffer(parsedData.data)
   }
 
+  if (!(res && res.config && res.config.timeData)) {
+    res.config = { 
+      timeData: {
+        startTime: backupTimeDataStart,
+        endTime: backupTimeDataEnd
+      }
+    }
+  }
+
+  parsedData.config = res.config
+
   return parsedData
 }
 
 const extensionWithoutProxy = async (req, _store) => {
+  const backupTimeDataStart = new Date().getTime();
+
   const res = await window.__POSTWOMAN_EXTENSION_HOOK__.sendRequest({
     ...req,
     wantsBinary: true,
   })
+
+  const backupTimeDataEnd = new Date().getTime();
+
+  if (!(res && res.config && res.config.timeData)) {
+    res.config = {
+      timeData: {
+        startTime: backupTimeDataStart,
+        endTime: backupTimeDataEnd
+      }
+    }
+  }
   return res
 }
 
diff --git a/lang/en-US.json b/lang/en-US.json
index f4e957941..e18fc8fc8 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -29,6 +29,7 @@
   "parameter_list": "Parameter List",
   "request_body": "Request Body",
   "raw_request_body": "Raw Request Body",
+  "response_body": "Response Body",
   "show_code": "Show Code",
   "show_prerequest_script": "Show Pre-Request Script",
   "hide_prerequest_script": "Hide Pre-Request Script",
@@ -301,5 +302,6 @@
   "enter_gist_url": "Enter Gist URL",
   "account_exists": "Account exists with different credential - Login to link both accounts",
   "confirm": "Confirm",
-  "new_version_found": "New version found. Refresh to update."
+  "new_version_found": "New version found. Refresh to update.",
+  "size": "Size"
 }
diff --git a/pages/graphql.vue b/pages/graphql.vue
index 9a3ffe5c3..d26a8414d 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -266,7 +266,7 @@
           <div class="flex flex-col">
             <label>{{ $t("response") }}</label>
             <div class="row-wrapper">
-              <label for="responseField">{{ $t("response") }}</label>
+              <label for="responseField">{{ $t("response_body") }}</label>
               <div>
                 <button
                   class="icon"
diff --git a/pages/index.vue b/pages/index.vue
index 1828e6659..d11b68d77 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -590,28 +590,7 @@
           </tabs>
         </section>
 
-        <pw-section class="purple" id="response" :label="$t('response')" ref="response">
-          <ul>
-            <li>
-              <label for="status">{{ $t("status") }}</label>
-              <input
-                :class="[
-                  statusCategory ? statusCategory.className : '',
-                  response.status ? '' : 'rounded-b-lg',
-                ]"
-                :value="response.status || $t('waiting_send_req')"
-                ref="status"
-                id="status"
-                name="status"
-                readonly
-                type="text"
-              />
-            </li>
-          </ul>
-          <div v-if="response.body && response.body !== $t('loading')">
-            <response-body-renderer :response="response" />
-          </div>
-        </pw-section>
+        <http-response :response="response" :active="runningRequest" ref="response" />
       </div>
 
       <aside v-if="activeSidebar" class="sticky-inner inner-right lg:max-w-md">
@@ -752,7 +731,6 @@ import { parseUrlAndPath } from "~/helpers/utils/uri"
 import { httpValid } from "~/helpers/utils/valid"
 import { knownContentTypes, isJSONContentType } from "~/helpers/utils/contenttypes"
 import { generateCodeWithGenerator } from "~/helpers/codegen/codegen"
-import findStatusGroup from "~/helpers/findStatusGroup"
 
 export default {
   data() {
@@ -771,6 +749,8 @@ export default {
         status: "",
         headers: "",
         body: "",
+        duration: 0,
+        size: 0,
       },
       validContentTypes: knownContentTypes,
       paramsWatchEnabled: true,
@@ -1174,9 +1154,6 @@ export default {
     requestName() {
       return this.name
     },
-    statusCategory() {
-      return findStatusGroup(this.response.status)
-    },
     isValidURL() {
       // if showPreRequestScript, we cannot determine if a URL is valid because the full string is not known ahead of time
       return this.showPreRequestScript || httpValid(this.url)
@@ -1365,9 +1342,12 @@ export default {
       // Start showing the loading bar as soon as possible.
       // The nuxt axios module will hide it when the request is made.
       this.$nuxt.$loading.start()
-      this.previewEnabled = false
-      this.response.status = this.$t("fetching")
-      this.response.body = this.$t("loading")
+      this.response = {
+        duration: 0,
+        size: 0,
+        status: this.$t("fetching"),
+        body: this.$t("loading"),
+      }
       const auth =
         this.auth === "Basic Auth"
           ? {
@@ -1421,8 +1401,6 @@ export default {
       })
       headers = headersObject
       try {
-        const startTime = Date.now()
-
         this.runningRequest = true
         const payload = await this.makeRequest(
           auth,
@@ -1431,11 +1409,9 @@ export default {
           this.showPreRequestScript && this.preRequestScript
         )
         this.runningRequest = false
-
-        const duration = Date.now() - startTime
-        this.$toast.info(this.$t("finished_in", { duration }), {
-          icon: "done",
-        })
+        const duration = payload.config.timeData.endTime - payload.config.timeData.startTime
+        this.response.duration = duration
+        this.response.size = payload.headers["content-length"]
         ;(() => {
           this.response.status = payload.status
           this.response.headers = payload.headers