@pisell/core 1.0.63 → 1.0.64

package/es/request/index.js

@@ -27,6 +27,101 @@ axiosInstance.interceptors.response.use(interceptorsResponse, interceptorsRespon
 
 // 请求计数
 var requestCount = 0;
+var DEFAULT_REQUEST_TIMING_METRICS = {
+  duration: 0,
+  dnsLookupDuration: 0,
+  tcpHandshakeDuration: 0,
+  redirectDuration: 0,
+  stalledDuration: 0,
+  ttfbDuration: 0,
+  requestDuration: 0,
+  tlsHandshakeDuration: 0
+};
+var requestTimingStore = new Map();
+var hasInitializedRequestObserver = false;
+function getRequestTimingKey(requestUrl) {
+  if (typeof window === "undefined") return requestUrl;
+  try {
+    return new URL(requestUrl, window.location.href).href.split("#")[0];
+  } catch (_unused) {
+    return requestUrl;
+  }
+}
+function pushRequestTimingEntry(entry) {
+  var timingKey = getRequestTimingKey(entry.name);
+  var existingEntries = requestTimingStore.get(timingKey) || [];
+  existingEntries.push(entry);
+  if (existingEntries.length > 30) existingEntries.shift();
+  requestTimingStore.set(timingKey, existingEntries);
+}
+function initializeRequestPerformanceObserver() {
+  if (hasInitializedRequestObserver) return;
+  if (typeof window === "undefined") return;
+  if (typeof PerformanceObserver === "undefined") return;
+  hasInitializedRequestObserver = true;
+  try {
+    var observer = new PerformanceObserver(function (list) {
+      list.getEntries().forEach(function (entry) {
+        if (entry.entryType !== "resource") return;
+        var resourceEntry = entry;
+        if (!["fetch", "xmlhttprequest"].includes(resourceEntry.initiatorType)) return;
+        pushRequestTimingEntry(resourceEntry);
+      });
+    });
+    observer.observe({
+      entryTypes: ["resource"]
+    });
+  } catch (error) {
+    hasInitializedRequestObserver = false;
+  }
+}
+function readAndConsumeRequestTimingEntry(requestUrl) {
+  var timingKey = getRequestTimingKey(requestUrl);
+  var cachedEntries = requestTimingStore.get(timingKey);
+  if (cachedEntries !== null && cachedEntries !== void 0 && cachedEntries.length) {
+    var matchedEntry = cachedEntries.shift();
+    if (!cachedEntries.length) requestTimingStore.delete(timingKey);
+    return matchedEntry;
+  }
+  if (typeof performance === "undefined") return undefined;
+  var fallbackEntries = performance.getEntriesByName(timingKey, "resource");
+  for (var index = fallbackEntries.length - 1; index >= 0; index--) {
+    var entry = fallbackEntries[index];
+    if (["fetch", "xmlhttprequest"].includes(entry.initiatorType)) return entry;
+  }
+  return undefined;
+}
+function getSafeDuration(start, end) {
+  if (start <= 0) return 0;
+  if (end <= 0) return 0;
+  if (end < start) return 0;
+  return end - start;
+}
+function calculateRequestTimingMetrics(entry) {
+  if (!entry) return DEFAULT_REQUEST_TIMING_METRICS;
+  var redirectDuration = getSafeDuration(entry.redirectStart, entry.redirectEnd);
+  var dnsLookupDuration = getSafeDuration(entry.domainLookupStart, entry.domainLookupEnd);
+  var tcpHandshakeDuration = getSafeDuration(entry.connectStart, entry.connectEnd);
+  var stalledDuration = getSafeDuration(entry.fetchStart, entry.requestStart);
+  var ttfbDuration = getSafeDuration(entry.requestStart, entry.responseStart);
+  var requestDuration = getSafeDuration(entry.requestStart, entry.responseEnd);
+  var tlsHandshakeDuration = entry.secureConnectionStart > 0 ? getSafeDuration(entry.secureConnectionStart, entry.connectEnd) : 0;
+  var duration = entry.duration > 0 ? entry.duration : requestDuration;
+  return {
+    duration: duration,
+    dnsLookupDuration: dnsLookupDuration,
+    tcpHandshakeDuration: tcpHandshakeDuration,
+    redirectDuration: redirectDuration,
+    stalledDuration: stalledDuration,
+    ttfbDuration: ttfbDuration,
+    requestDuration: requestDuration,
+    tlsHandshakeDuration: tlsHandshakeDuration
+  };
+}
+function formatDurationInMs(duration) {
+  return "".concat(duration.toFixed(2), "ms");
+}
+initializeRequestPerformanceObserver();
 var isFilterUrl = function isFilterUrl(url) {
   var _logger$filterUrls;
   var _getConfig = getConfig(),
@@ -43,7 +138,7 @@ export var createRequest = function createRequest(props) {
   var _getConfig2 = getConfig(),
     getUrl = _getConfig2.getUrl,
     logger = _getConfig2.logger;
-  var startTime = Date.now(); // 记录请求开始时间
+  var requestStartTime = typeof performance !== "undefined" ? performance.now() : Date.now();
   var app = getApp();
   var requestId = getUniqueId();
 
@@ -80,8 +175,10 @@ export var createRequest = function createRequest(props) {
       var isError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var requestId = arguments.length > 3 ? arguments[3] : undefined;
       try {
-        var endTime = Date.now();
-        var duration = endTime - startTime;
+        var performanceEntry = readAndConsumeRequestTimingEntry(url);
+        var timingMetrics = calculateRequestTimingMetrics(performanceEntry);
+        var fallbackDuration = (typeof performance !== "undefined" ? performance.now() : Date.now()) - requestStartTime;
+        var duration = timingMetrics.duration > 0 ? timingMetrics.duration : fallbackDuration;
         var maxRequestTime = (logger === null || logger === void 0 ? void 0 : logger.maxRequestTime) || 5000;
 
         // 如果请求URL在过滤列表中，则不判断超时时间
@@ -98,11 +195,18 @@ export var createRequest = function createRequest(props) {
         }
         app.logger.addLog({
           type: type,
-          title: "[ Request ]: Complete - ".concat(requestId, "  \u8D85\u8FC75s"),
+          title: "[ Request ]: Complete - ".concat(requestId).concat(duration > maxRequestTime ? " 超过5s" : ""),
           metadata: {
             error: isError ? JSON.stringify(result) : '',
             duration: "".concat((duration / 1000).toFixed(2), "s"),
-            url: url
+            url: url,
+            dnsLookupDuration: formatDurationInMs(timingMetrics.dnsLookupDuration),
+            tcpHandshakeDuration: formatDurationInMs(timingMetrics.tcpHandshakeDuration),
+            redirectDuration: formatDurationInMs(timingMetrics.redirectDuration),
+            stalledDuration: formatDurationInMs(timingMetrics.stalledDuration),
+            ttfbDuration: formatDurationInMs(timingMetrics.ttfbDuration),
+            requestDuration: formatDurationInMs(timingMetrics.requestDuration),
+            tlsHandshakeDuration: formatDurationInMs(timingMetrics.tlsHandshakeDuration)
           }
         });
       } catch (error) {}

package/lib/request/index.js

@@ -53,6 +53,99 @@ var axiosInstance = import_axios.default.create(import_constants.axiosConfig);
 axiosInstance.interceptors.request.use(import_utils.interceptorsRequest, import_utils.interceptorsRequestError);
 axiosInstance.interceptors.response.use(import_utils.interceptorsResponse, import_utils.interceptorsResponseError);
 var requestCount = 0;
+var DEFAULT_REQUEST_TIMING_METRICS = {
+  duration: 0,
+  dnsLookupDuration: 0,
+  tcpHandshakeDuration: 0,
+  redirectDuration: 0,
+  stalledDuration: 0,
+  ttfbDuration: 0,
+  requestDuration: 0,
+  tlsHandshakeDuration: 0
+};
+var requestTimingStore = /* @__PURE__ */ new Map();
+var hasInitializedRequestObserver = false;
+function getRequestTimingKey(requestUrl) {
+  if (typeof window === "undefined") return requestUrl;
+  try {
+    return new URL(requestUrl, window.location.href).href.split("#")[0];
+  } catch {
+    return requestUrl;
+  }
+}
+function pushRequestTimingEntry(entry) {
+  const timingKey = getRequestTimingKey(entry.name);
+  const existingEntries = requestTimingStore.get(timingKey) || [];
+  existingEntries.push(entry);
+  if (existingEntries.length > 30) existingEntries.shift();
+  requestTimingStore.set(timingKey, existingEntries);
+}
+function initializeRequestPerformanceObserver() {
+  if (hasInitializedRequestObserver) return;
+  if (typeof window === "undefined") return;
+  if (typeof PerformanceObserver === "undefined") return;
+  hasInitializedRequestObserver = true;
+  try {
+    const observer = new PerformanceObserver((list) => {
+      list.getEntries().forEach((entry) => {
+        if (entry.entryType !== "resource") return;
+        const resourceEntry = entry;
+        if (!["fetch", "xmlhttprequest"].includes(resourceEntry.initiatorType)) return;
+        pushRequestTimingEntry(resourceEntry);
+      });
+    });
+    observer.observe({ entryTypes: ["resource"] });
+  } catch (error) {
+    hasInitializedRequestObserver = false;
+  }
+}
+function readAndConsumeRequestTimingEntry(requestUrl) {
+  const timingKey = getRequestTimingKey(requestUrl);
+  const cachedEntries = requestTimingStore.get(timingKey);
+  if (cachedEntries == null ? void 0 : cachedEntries.length) {
+    const matchedEntry = cachedEntries.shift();
+    if (!cachedEntries.length) requestTimingStore.delete(timingKey);
+    return matchedEntry;
+  }
+  if (typeof performance === "undefined") return void 0;
+  const fallbackEntries = performance.getEntriesByName(timingKey, "resource");
+  for (let index = fallbackEntries.length - 1; index >= 0; index--) {
+    const entry = fallbackEntries[index];
+    if (["fetch", "xmlhttprequest"].includes(entry.initiatorType)) return entry;
+  }
+  return void 0;
+}
+function getSafeDuration(start, end) {
+  if (start <= 0) return 0;
+  if (end <= 0) return 0;
+  if (end < start) return 0;
+  return end - start;
+}
+function calculateRequestTimingMetrics(entry) {
+  if (!entry) return DEFAULT_REQUEST_TIMING_METRICS;
+  const redirectDuration = getSafeDuration(entry.redirectStart, entry.redirectEnd);
+  const dnsLookupDuration = getSafeDuration(entry.domainLookupStart, entry.domainLookupEnd);
+  const tcpHandshakeDuration = getSafeDuration(entry.connectStart, entry.connectEnd);
+  const stalledDuration = getSafeDuration(entry.fetchStart, entry.requestStart);
+  const ttfbDuration = getSafeDuration(entry.requestStart, entry.responseStart);
+  const requestDuration = getSafeDuration(entry.requestStart, entry.responseEnd);
+  const tlsHandshakeDuration = entry.secureConnectionStart > 0 ? getSafeDuration(entry.secureConnectionStart, entry.connectEnd) : 0;
+  const duration = entry.duration > 0 ? entry.duration : requestDuration;
+  return {
+    duration,
+    dnsLookupDuration,
+    tcpHandshakeDuration,
+    redirectDuration,
+    stalledDuration,
+    ttfbDuration,
+    requestDuration,
+    tlsHandshakeDuration
+  };
+}
+function formatDurationInMs(duration) {
+  return `${duration.toFixed(2)}ms`;
+}
+initializeRequestPerformanceObserver();
 var isFilterUrl = (url) => {
   var _a;
   const { logger } = (0, import_config.getConfig)();
@@ -61,7 +154,7 @@ var isFilterUrl = (url) => {
 var createRequest = (props) => {
   const { data, config, method, url } = props;
   const { getUrl, logger } = (0, import_config.getConfig)();
-  const startTime = Date.now();
+  const requestStartTime = typeof performance !== "undefined" ? performance.now() : Date.now();
   const app = (0, import_app.getApp)();
   const requestId = (0, import_utils2.getUniqueId)();
   requestCount++;
@@ -88,8 +181,10 @@ var createRequest = (props) => {
     let _url = (getUrl == null ? void 0 : getUrl(props)) || "";
     const handleRequestComplete = (url2, result, isError = false, requestId2) => {
       try {
-        const endTime = Date.now();
-        const duration = endTime - startTime;
+        const performanceEntry = readAndConsumeRequestTimingEntry(url2);
+        const timingMetrics = calculateRequestTimingMetrics(performanceEntry);
+        const fallbackDuration = (typeof performance !== "undefined" ? performance.now() : Date.now()) - requestStartTime;
+        const duration = timingMetrics.duration > 0 ? timingMetrics.duration : fallbackDuration;
         let maxRequestTime = (logger == null ? void 0 : logger.maxRequestTime) || 5e3;
         if (isFilterUrl(url2)) {
           maxRequestTime = 99999999;
@@ -100,11 +195,18 @@ var createRequest = (props) => {
         }
         app.logger.addLog({
           type,
-          title: `[ Request ]: Complete - ${requestId2}  超过5s`,
+          title: `[ Request ]: Complete - ${requestId2}${duration > maxRequestTime ? " 超过5s" : ""}`,
           metadata: {
             error: isError ? JSON.stringify(result) : "",
             duration: `${(duration / 1e3).toFixed(2)}s`,
-            url: url2
+            url: url2,
+            dnsLookupDuration: formatDurationInMs(timingMetrics.dnsLookupDuration),
+            tcpHandshakeDuration: formatDurationInMs(timingMetrics.tcpHandshakeDuration),
+            redirectDuration: formatDurationInMs(timingMetrics.redirectDuration),
+            stalledDuration: formatDurationInMs(timingMetrics.stalledDuration),
+            ttfbDuration: formatDurationInMs(timingMetrics.ttfbDuration),
+            requestDuration: formatDurationInMs(timingMetrics.requestDuration),
+            tlsHandshakeDuration: formatDurationInMs(timingMetrics.tlsHandshakeDuration)
           }
         });
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/core",
-  "version": "1.0.63",
+  "version": "1.0.64",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",