rezo 1.0.18 → 1.0.20

package/dist/adapters/http2.js

@@ -200,6 +200,30 @@ class Http2SessionPool {
     this.closeAllSessions();
   }
 }
+function updateTiming(config, timing, contentLengthCounter) {
+  const now = performance.now();
+  config.timing.domainLookupStart = timing.dnsStart || config.timing.startTime;
+  config.timing.domainLookupEnd = timing.dnsEnd || timing.dnsStart || config.timing.startTime;
+  config.timing.connectStart = timing.tcpStart || timing.dnsEnd || config.timing.startTime;
+  config.timing.secureConnectionStart = timing.tlsStart || 0;
+  config.timing.connectEnd = timing.tcpEnd || timing.tlsEnd || timing.tcpStart || config.timing.startTime;
+  config.timing.requestStart = timing.tcpEnd || config.timing.startTime;
+  config.timing.responseStart = timing.firstByteTime || config.timing.requestStart;
+  config.timing.responseEnd = now;
+  config.transfer.bodySize = contentLengthCounter;
+  config.transfer.responseSize = contentLengthCounter;
+}
+function getTimingDurations(config) {
+  const t = config.timing;
+  return {
+    total: t.responseEnd - t.startTime,
+    dns: t.domainLookupEnd - t.domainLookupStart,
+    tcp: t.secureConnectionStart > 0 ? t.secureConnectionStart - t.connectStart : t.connectEnd - t.connectStart,
+    tls: t.secureConnectionStart > 0 ? t.connectEnd - t.secureConnectionStart : undefined,
+    firstByte: t.responseStart - t.startTime,
+    download: t.responseEnd - t.responseStart
+  };
+}
 const responseCacheInstances = new Map;
 function getCacheConfigKey(option) {
   if (option === true)
@@ -489,10 +513,11 @@ async function executeHttp2Request(fetchOptions, config, options, perform, fs, s
   const maxRetries = config?.retry?.maxRetries || 0;
   const incrementDelay = config?.retry?.incrementDelay || false;
   const statusCodes = config?.retry?.statusCodes;
+  const startTime = performance.now();
   const timing = {
-    startTime: performance.now(),
-    startTimestamp: Date.now()
+    startTime
   };
+  config.timing.startTime = startTime;
   const ABSOLUTE_MAX_ATTEMPTS = 50;
   const visitedUrls = new Set;
   let totalAttempts = 0;
@@ -662,7 +687,6 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
         config.isSecure = isSecure;
         config.finalUrl = url.href;
         config.network.protocol = "h2";
-        config.timing.startTimestamp = timing.startTimestamp;
       }
       const headers = {
         [http2.constants.HTTP2_HEADER_METHOD]: fetchOptions.method.toUpperCase(),
@@ -739,9 +763,9 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
         responseHeaders = headers;
         status = Number(headers[http2.constants.HTTP2_HEADER_STATUS]) || 200;
         statusText = getStatusText(status);
-        if (!config.timing.ttfbMs) {
+        if (!timing.firstByteTime) {
           timing.firstByteTime = performance.now();
-          config.timing.ttfbMs = timing.firstByteTime - timing.startTime;
+          config.timing.responseStart = timing.firstByteTime;
         }
         const location = headers["location"];
         const isRedirect = status >= 300 && status < 400 && location;
@@ -760,8 +784,8 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
             contentLength: headers["content-length"] ? parseInt(headers["content-length"], 10) : undefined,
             cookies: config.responseCookies?.array || [],
             timing: {
-              firstByte: config.timing.ttfbMs,
-              total: performance.now() - timing.startTime
+              firstByte: config.timing.responseStart - config.timing.startTime,
+              total: performance.now() - config.timing.startTime
             }
           };
           eventEmitter.emit("headers", headersEvent);
@@ -798,9 +822,7 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
         }
       });
       req.on("end", async () => {
-        config.timing.endTimestamp = Date.now();
-        config.timing.durationMs = performance.now() - timing.startTime;
-        config.timing.transferMs = timing.firstByteTime ? performance.now() - timing.firstByteTime : config.timing.durationMs;
+        updateTiming(config, timing, contentLengthCounter);
         if (!config.transfer) {
           config.transfer = { requestSize: 0, responseSize: 0, headerSize: 0, bodySize: 0 };
         }
@@ -820,8 +842,6 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
             config.transfer.requestSize = Buffer.byteLength(JSON.stringify(body), "utf8");
           }
         }
-        config.transfer.bodySize = contentLengthCounter;
-        config.transfer.responseSize = contentLengthCounter;
         (sessionPool || Http2SessionPool.getInstance()).releaseSession(url);
         if (_stats.statusOnNext === "redirect") {
           const partialResponse = {
@@ -920,14 +940,10 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
               fileName: config.fileName,
               fileSize: responseBody.length,
               timing: {
-                total: config.timing.durationMs || 0,
-                dns: config.timing.dnsMs,
-                tcp: config.timing.tcpMs,
-                tls: config.timing.tlsMs,
-                firstByte: config.timing.ttfbMs,
-                download: config.timing.transferMs || 0
+                ...getTimingDurations(config),
+                download: getTimingDurations(config).download || 0
               },
-              averageSpeed: config.timing.transferMs ? responseBody.length / config.timing.transferMs * 1000 : 0,
+              averageSpeed: getTimingDurations(config).download ? responseBody.length / getTimingDurations(config).download * 1000 : 0,
               config: sanitizeConfig(config)
             };
             downloadResult.emit("finish", downloadFinishEvent);
@@ -962,14 +978,7 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
             finalUrl: url.href,
             cookies: config.responseCookies || { array: [], serialized: [], netscape: "", string: "", setCookiesString: [] },
             urls: buildUrlTree(config, url.href),
-            timing: {
-              total: config.timing.durationMs || 0,
-              dns: config.timing.dnsMs,
-              tcp: config.timing.tcpMs,
-              tls: config.timing.tlsMs,
-              firstByte: config.timing.ttfbMs,
-              download: config.timing.transferMs
-            },
+            timing: getTimingDurations(config),
             config: sanitizeConfig(config)
           };
           streamResult.emit("finish", streamFinishEvent);
@@ -992,16 +1001,12 @@ async function executeHttp2Stream(config, fetchOptions, requestCount, timing, _s
             urls: buildUrlTree(config, url.href),
             uploadSize: config.transfer.requestSize || 0,
             timing: {
-              total: config.timing.durationMs || 0,
-              dns: config.timing.dnsMs,
-              tcp: config.timing.tcpMs,
-              tls: config.timing.tlsMs,
-              upload: config.timing.transferMs || 0,
-              waiting: config.timing.ttfbMs || 0,
-              download: config.timing.transferMs
+              ...getTimingDurations(config),
+              upload: getTimingDurations(config).firstByte || 0,
+              waiting: getTimingDurations(config).download > 0 && getTimingDurations(config).firstByte > 0 ? getTimingDurations(config).download - getTimingDurations(config).firstByte : 0
             },
-            averageUploadSpeed: config.timing.transferMs ? (config.transfer.requestSize || 0) / config.timing.transferMs * 1000 : 0,
-            averageDownloadSpeed: config.timing.transferMs ? contentLengthCounter / config.timing.transferMs * 1000 : 0,
+            averageUploadSpeed: getTimingDurations(config).firstByte && config.transfer.requestSize ? config.transfer.requestSize / getTimingDurations(config).firstByte * 1000 : 0,
+            averageDownloadSpeed: getTimingDurations(config).download ? contentLengthCounter / getTimingDurations(config).download * 1000 : 0,
             config: sanitizeConfig(config)
           };
           uploadResult.emit("finish", uploadFinishEvent);

package/dist/adapters/index.cjs

@@ -1,6 +1,6 @@
-const _mod_vl2qhv = require('./picker.cjs');
-exports.detectRuntime = _mod_vl2qhv.detectRuntime;
-exports.getAdapterCapabilities = _mod_vl2qhv.getAdapterCapabilities;
-exports.buildAdapterContext = _mod_vl2qhv.buildAdapterContext;
-exports.getAvailableAdapters = _mod_vl2qhv.getAvailableAdapters;
-exports.selectAdapter = _mod_vl2qhv.selectAdapter;;
+const _mod_dy07ge = require('./picker.cjs');
+exports.detectRuntime = _mod_dy07ge.detectRuntime;
+exports.getAdapterCapabilities = _mod_dy07ge.getAdapterCapabilities;
+exports.buildAdapterContext = _mod_dy07ge.buildAdapterContext;
+exports.getAvailableAdapters = _mod_dy07ge.getAvailableAdapters;
+exports.selectAdapter = _mod_dy07ge.selectAdapter;;

package/dist/adapters/react-native.cjs

@@ -17,6 +17,30 @@ const Environment = {
   hasFormData: typeof FormData !== "undefined",
   hasAbortController: typeof AbortController !== "undefined"
 };
+function updateTiming(config, timing, bodySize) {
+  const now = performance.now();
+  config.timing.domainLookupStart = config.timing.startTime;
+  config.timing.domainLookupEnd = config.timing.startTime;
+  config.timing.connectStart = config.timing.startTime;
+  config.timing.secureConnectionStart = 0;
+  config.timing.connectEnd = config.timing.startTime;
+  config.timing.requestStart = config.timing.startTime;
+  config.timing.responseStart = timing.firstByteTime || config.timing.startTime;
+  config.timing.responseEnd = now;
+  config.transfer.bodySize = bodySize;
+  config.transfer.responseSize = bodySize;
+}
+function getTimingDurations(config) {
+  const t = config.timing;
+  return {
+    total: t.responseEnd - t.startTime,
+    dns: t.domainLookupEnd - t.domainLookupStart,
+    tcp: t.secureConnectionStart > 0 ? t.secureConnectionStart - t.connectStart : t.connectEnd - t.connectStart,
+    tls: t.secureConnectionStart > 0 ? t.connectEnd - t.secureConnectionStart : undefined,
+    firstByte: t.responseStart - t.startTime,
+    download: t.responseEnd - t.responseStart
+  };
+}
 const responseCacheInstances = new Map;
 function getCacheConfigKey(option) {
   if (option === true)
@@ -227,10 +251,11 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
   const maxRetries = config?.retry?.maxRetries || 0;
   const incrementDelay = config?.retry?.incrementDelay || false;
   const statusCodes = config?.retry?.statusCodes;
+  const startTime = performance.now();
   const timing = {
-    startTime: performance.now(),
-    startTimestamp: Date.now()
+    startTime
   };
+  config.timing.startTime = startTime;
   const ABSOLUTE_MAX_ATTEMPTS = 50;
   let totalAttempts = 0;
   config.setSignal();
@@ -294,7 +319,6 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
     config.isSecure = isSecure;
     config.finalUrl = url;
     config.network.protocol = isSecure ? "https" : "http";
-    config.timing.startTimestamp = timing.startTimestamp;
     const reqHeaders = fetchOptions.headers instanceof RezoHeaders ? fetchOptions.headers.toObject() : fetchOptions.headers || {};
     const headers = toFetchHeaders(reqHeaders);
     const eventEmitter = streamResult || downloadResult || uploadResult;
@@ -347,9 +371,9 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
       if (timeoutId)
         clearTimeout(timeoutId);
     }
-    if (!config.timing.ttfbMs) {
+    if (!timing.firstByteTime) {
       timing.firstByteTime = performance.now();
-      config.timing.ttfbMs = timing.firstByteTime - timing.startTime;
+      config.timing.responseStart = timing.firstByteTime;
     }
     const status = response.status;
     const statusText = response.statusText;
@@ -373,8 +397,8 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         contentLength: contentLength ? parseInt(contentLength, 10) : undefined,
         cookies: cookies.array,
         timing: {
-          firstByte: config.timing.ttfbMs,
-          total: performance.now() - timing.startTime
+          firstByte: config.timing.responseStart - config.timing.startTime,
+          total: performance.now() - config.timing.startTime
         }
       };
       eventEmitter.emit("headers", headersEvent);
@@ -428,11 +452,7 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         bodySize = text.length;
       }
     }
-    config.timing.endTimestamp = Date.now();
-    config.timing.durationMs = performance.now() - timing.startTime;
-    config.timing.transferMs = timing.firstByteTime ? performance.now() - timing.firstByteTime : config.timing.durationMs;
-    config.transfer.bodySize = bodySize;
-    config.transfer.responseSize = bodySize;
+    updateTiming(config, timing, bodySize);
     if (status >= 400) {
       const error = builErrorFromResponse(`HTTP Error ${status}: ${statusText}`, {
         status,
@@ -466,11 +486,7 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         finalUrl: url,
         cookies,
         urls: buildUrlTree(config, url),
-        timing: {
-          total: config.timing.durationMs || 0,
-          firstByte: config.timing.ttfbMs,
-          download: config.timing.transferMs
-        },
+        timing: getTimingDurations(config),
         config: sanitizeConfig(config)
       };
       streamResult.emit("finish", streamFinishEvent);
@@ -491,11 +507,10 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         fileName: config.fileName || "",
         fileSize: bodySize,
         timing: {
-          total: config.timing.durationMs || 0,
-          firstByte: config.timing.ttfbMs,
-          download: config.timing.transferMs || 0
+          ...getTimingDurations(config),
+          download: getTimingDurations(config).download || 0
         },
-        averageSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+        averageSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
         config: sanitizeConfig(config)
       };
       downloadResult.emit("finish", downloadFinishEvent);
@@ -517,13 +532,12 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         urls: buildUrlTree(config, url),
         uploadSize: config.transfer.requestSize || 0,
         timing: {
-          total: config.timing.durationMs || 0,
-          upload: config.timing.transferMs || 0,
-          waiting: config.timing.ttfbMs || 0,
-          download: config.timing.transferMs
+          ...getTimingDurations(config),
+          upload: getTimingDurations(config).firstByte || 0,
+          waiting: getTimingDurations(config).download > 0 && getTimingDurations(config).firstByte > 0 ? getTimingDurations(config).download - getTimingDurations(config).firstByte : 0
         },
-        averageUploadSpeed: config.timing.transferMs ? (config.transfer.requestSize || 0) / config.timing.transferMs * 1000 : 0,
-        averageDownloadSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+        averageUploadSpeed: getTimingDurations(config).firstByte && config.transfer.requestSize ? config.transfer.requestSize / getTimingDurations(config).firstByte * 1000 : 0,
+        averageDownloadSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
         config: sanitizeConfig(config)
       };
       uploadResult.emit("finish", uploadFinishEvent);

package/dist/adapters/react-native.js

@@ -17,6 +17,30 @@ const Environment = {
   hasFormData: typeof FormData !== "undefined",
   hasAbortController: typeof AbortController !== "undefined"
 };
+function updateTiming(config, timing, bodySize) {
+  const now = performance.now();
+  config.timing.domainLookupStart = config.timing.startTime;
+  config.timing.domainLookupEnd = config.timing.startTime;
+  config.timing.connectStart = config.timing.startTime;
+  config.timing.secureConnectionStart = 0;
+  config.timing.connectEnd = config.timing.startTime;
+  config.timing.requestStart = config.timing.startTime;
+  config.timing.responseStart = timing.firstByteTime || config.timing.startTime;
+  config.timing.responseEnd = now;
+  config.transfer.bodySize = bodySize;
+  config.transfer.responseSize = bodySize;
+}
+function getTimingDurations(config) {
+  const t = config.timing;
+  return {
+    total: t.responseEnd - t.startTime,
+    dns: t.domainLookupEnd - t.domainLookupStart,
+    tcp: t.secureConnectionStart > 0 ? t.secureConnectionStart - t.connectStart : t.connectEnd - t.connectStart,
+    tls: t.secureConnectionStart > 0 ? t.connectEnd - t.secureConnectionStart : undefined,
+    firstByte: t.responseStart - t.startTime,
+    download: t.responseEnd - t.responseStart
+  };
+}
 const responseCacheInstances = new Map;
 function getCacheConfigKey(option) {
   if (option === true)
@@ -227,10 +251,11 @@ async function executeFetchRequest(fetchOptions, config, options, perform, strea
   const maxRetries = config?.retry?.maxRetries || 0;
   const incrementDelay = config?.retry?.incrementDelay || false;
   const statusCodes = config?.retry?.statusCodes;
+  const startTime = performance.now();
   const timing = {
-    startTime: performance.now(),
-    startTimestamp: Date.now()
+    startTime
   };
+  config.timing.startTime = startTime;
   const ABSOLUTE_MAX_ATTEMPTS = 50;
   let totalAttempts = 0;
   config.setSignal();
@@ -294,7 +319,6 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
     config.isSecure = isSecure;
     config.finalUrl = url;
     config.network.protocol = isSecure ? "https" : "http";
-    config.timing.startTimestamp = timing.startTimestamp;
     const reqHeaders = fetchOptions.headers instanceof RezoHeaders ? fetchOptions.headers.toObject() : fetchOptions.headers || {};
     const headers = toFetchHeaders(reqHeaders);
     const eventEmitter = streamResult || downloadResult || uploadResult;
@@ -347,9 +371,9 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
       if (timeoutId)
         clearTimeout(timeoutId);
     }
-    if (!config.timing.ttfbMs) {
+    if (!timing.firstByteTime) {
       timing.firstByteTime = performance.now();
-      config.timing.ttfbMs = timing.firstByteTime - timing.startTime;
+      config.timing.responseStart = timing.firstByteTime;
     }
     const status = response.status;
     const statusText = response.statusText;
@@ -373,8 +397,8 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         contentLength: contentLength ? parseInt(contentLength, 10) : undefined,
         cookies: cookies.array,
         timing: {
-          firstByte: config.timing.ttfbMs,
-          total: performance.now() - timing.startTime
+          firstByte: config.timing.responseStart - config.timing.startTime,
+          total: performance.now() - config.timing.startTime
         }
       };
       eventEmitter.emit("headers", headersEvent);
@@ -428,11 +452,7 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         bodySize = text.length;
       }
     }
-    config.timing.endTimestamp = Date.now();
-    config.timing.durationMs = performance.now() - timing.startTime;
-    config.timing.transferMs = timing.firstByteTime ? performance.now() - timing.firstByteTime : config.timing.durationMs;
-    config.transfer.bodySize = bodySize;
-    config.transfer.responseSize = bodySize;
+    updateTiming(config, timing, bodySize);
     if (status >= 400) {
       const error = builErrorFromResponse(`HTTP Error ${status}: ${statusText}`, {
         status,
@@ -466,11 +486,7 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         finalUrl: url,
         cookies,
         urls: buildUrlTree(config, url),
-        timing: {
-          total: config.timing.durationMs || 0,
-          firstByte: config.timing.ttfbMs,
-          download: config.timing.transferMs
-        },
+        timing: getTimingDurations(config),
         config: sanitizeConfig(config)
       };
       streamResult.emit("finish", streamFinishEvent);
@@ -491,11 +507,10 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         fileName: config.fileName || "",
         fileSize: bodySize,
         timing: {
-          total: config.timing.durationMs || 0,
-          firstByte: config.timing.ttfbMs,
-          download: config.timing.transferMs || 0
+          ...getTimingDurations(config),
+          download: getTimingDurations(config).download || 0
         },
-        averageSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+        averageSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
         config: sanitizeConfig(config)
       };
       downloadResult.emit("finish", downloadFinishEvent);
@@ -517,13 +532,12 @@ async function executeSingleRequest(config, fetchOptions, timing, streamResult,
         urls: buildUrlTree(config, url),
         uploadSize: config.transfer.requestSize || 0,
         timing: {
-          total: config.timing.durationMs || 0,
-          upload: config.timing.transferMs || 0,
-          waiting: config.timing.ttfbMs || 0,
-          download: config.timing.transferMs
+          ...getTimingDurations(config),
+          upload: getTimingDurations(config).firstByte || 0,
+          waiting: getTimingDurations(config).download > 0 && getTimingDurations(config).firstByte > 0 ? getTimingDurations(config).download - getTimingDurations(config).firstByte : 0
         },
-        averageUploadSpeed: config.timing.transferMs ? (config.transfer.requestSize || 0) / config.timing.transferMs * 1000 : 0,
-        averageDownloadSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+        averageUploadSpeed: getTimingDurations(config).firstByte && config.transfer.requestSize ? config.transfer.requestSize / getTimingDurations(config).firstByte * 1000 : 0,
+        averageDownloadSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
         config: sanitizeConfig(config)
       };
       uploadResult.emit("finish", uploadFinishEvent);

package/dist/adapters/xhr.cjs

@@ -16,6 +16,30 @@ const Environment = {
   hasFormData: typeof FormData !== "undefined",
   hasBlob: typeof Blob !== "undefined"
 };
+function updateTiming(config, timing, bodySize) {
+  const now = performance.now();
+  config.timing.domainLookupStart = config.timing.startTime;
+  config.timing.domainLookupEnd = config.timing.startTime;
+  config.timing.connectStart = config.timing.startTime;
+  config.timing.secureConnectionStart = 0;
+  config.timing.connectEnd = config.timing.startTime;
+  config.timing.requestStart = config.timing.startTime;
+  config.timing.responseStart = timing.firstByteTime || config.timing.startTime;
+  config.timing.responseEnd = now;
+  config.transfer.bodySize = bodySize;
+  config.transfer.responseSize = bodySize;
+}
+function getTimingDurations(config) {
+  const t = config.timing;
+  return {
+    total: t.responseEnd - t.startTime,
+    dns: t.domainLookupEnd - t.domainLookupStart,
+    tcp: t.secureConnectionStart > 0 ? t.secureConnectionStart - t.connectStart : t.connectEnd - t.connectStart,
+    tls: t.secureConnectionStart > 0 ? t.connectEnd - t.secureConnectionStart : undefined,
+    firstByte: t.responseStart - t.startTime,
+    download: t.responseEnd - t.responseStart
+  };
+}
 const responseCacheInstances = new Map;
 function getCacheConfigKey(option) {
   if (option === true)
@@ -258,10 +282,11 @@ async function executeXHRRequest(fetchOptions, config, options, perform, streamR
   const maxRetries = config?.retry?.maxRetries || 0;
   const incrementDelay = config?.retry?.incrementDelay || false;
   const statusCodes = config?.retry?.statusCodes;
+  const startTime = performance.now();
   const timing = {
-    startTime: performance.now(),
-    startTimestamp: Date.now()
+    startTime
   };
+  config.timing.startTime = startTime;
   const ABSOLUTE_MAX_ATTEMPTS = 50;
   let totalAttempts = 0;
   config.setSignal();
@@ -326,7 +351,6 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
       config.isSecure = isSecure;
       config.finalUrl = url;
       config.network.protocol = isSecure ? "https" : "http";
-      config.timing.startTimestamp = timing.startTimestamp;
       const xhr = new XMLHttpRequest;
       xhr.open(fetchOptions.method.toUpperCase(), url, true);
       const headers = toXHRHeaders(fetchOptions.headers);
@@ -370,9 +394,9 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
         });
       }
       xhr.onprogress = (event) => {
-        if (!config.timing.ttfbMs) {
+        if (!timing.firstByteTime) {
           timing.firstByteTime = performance.now();
-          config.timing.ttfbMs = timing.firstByteTime - timing.startTime;
+          config.timing.responseStart = timing.firstByteTime;
         }
         if (eventEmitter) {
           const progressEvent = {
@@ -404,13 +428,10 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
         };
       }
       xhr.onload = () => {
-        if (!config.timing.ttfbMs) {
+        if (!timing.firstByteTime) {
           timing.firstByteTime = performance.now();
-          config.timing.ttfbMs = timing.firstByteTime - timing.startTime;
+          config.timing.responseStart = timing.firstByteTime;
         }
-        config.timing.endTimestamp = Date.now();
-        config.timing.durationMs = performance.now() - timing.startTime;
-        config.timing.transferMs = timing.firstByteTime ? performance.now() - timing.firstByteTime : config.timing.durationMs;
         const status = xhr.status;
         const statusText = xhr.statusText;
         const responseHeaders = parseXHRHeaders(xhr);
@@ -427,8 +448,8 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
             contentLength: contentLength ? parseInt(contentLength, 10) : undefined,
             cookies: cookies.array,
             timing: {
-              firstByte: config.timing.ttfbMs,
-              total: performance.now() - timing.startTime
+              firstByte: config.timing.responseStart - config.timing.startTime,
+              total: performance.now() - config.timing.startTime
             }
           };
           eventEmitter.emit("headers", headersEvent);
@@ -472,8 +493,7 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
             responseData = text;
           }
         }
-        config.transfer.bodySize = bodySize;
-        config.transfer.responseSize = bodySize;
+        updateTiming(config, timing, bodySize);
         if (status >= 400) {
           const error = builErrorFromResponse(`HTTP Error ${status}: ${statusText}`, {
             status,
@@ -509,14 +529,7 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
             finalUrl: xhr.responseURL || url,
             cookies,
             urls: buildUrlTree(config, xhr.responseURL || url),
-            timing: {
-              total: config.timing.durationMs || 0,
-              dns: config.timing.dnsMs,
-              tcp: config.timing.tcpMs,
-              tls: config.timing.tlsMs,
-              firstByte: config.timing.ttfbMs,
-              download: config.timing.transferMs
-            },
+            timing: getTimingDurations(config),
             config: sanitizeConfig(config)
           };
           streamResult.emit("finish", streamFinishEvent);
@@ -537,14 +550,10 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
             fileName: config.fileName || "",
             fileSize: bodySize,
             timing: {
-              total: config.timing.durationMs || 0,
-              dns: config.timing.dnsMs,
-              tcp: config.timing.tcpMs,
-              tls: config.timing.tlsMs,
-              firstByte: config.timing.ttfbMs,
-              download: config.timing.transferMs || 0
+              ...getTimingDurations(config),
+              download: getTimingDurations(config).download || 0
             },
-            averageSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+            averageSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
             config: sanitizeConfig(config)
           };
           downloadResult.emit("finish", downloadFinishEvent);
@@ -566,16 +575,12 @@ function executeSingleXHRRequest(config, fetchOptions, timing, streamResult, dow
             urls: buildUrlTree(config, xhr.responseURL || url),
             uploadSize: config.transfer.requestSize || 0,
             timing: {
-              total: config.timing.durationMs || 0,
-              dns: config.timing.dnsMs,
-              tcp: config.timing.tcpMs,
-              tls: config.timing.tlsMs,
-              upload: config.timing.transferMs || 0,
-              waiting: config.timing.ttfbMs || 0,
-              download: config.timing.transferMs
+              ...getTimingDurations(config),
+              upload: getTimingDurations(config).firstByte || 0,
+              waiting: getTimingDurations(config).download > 0 && getTimingDurations(config).firstByte > 0 ? getTimingDurations(config).download - getTimingDurations(config).firstByte : 0
             },
-            averageUploadSpeed: config.timing.transferMs ? (config.transfer.requestSize || 0) / config.timing.transferMs * 1000 : 0,
-            averageDownloadSpeed: config.timing.transferMs ? bodySize / config.timing.transferMs * 1000 : 0,
+            averageUploadSpeed: getTimingDurations(config).firstByte && config.transfer.requestSize ? config.transfer.requestSize / getTimingDurations(config).firstByte * 1000 : 0,
+            averageDownloadSpeed: getTimingDurations(config).download ? bodySize / getTimingDurations(config).download * 1000 : 0,
             config: sanitizeConfig(config)
           };
           uploadResult.emit("finish", uploadFinishEvent);