@kush_hemant/react-api-monitor 1.0.16 → 1.0.18

package/dist/index.js

@@ -33,42 +33,73 @@ function getMetadata() {
 }
 
 // src/network/fetchMonitor.js
-var alreadyPatched = false;
+var isPatched = false;
 function monitorFetch() {
-  if (alreadyPatched) return;
-  alreadyPatched = true;
-  const originalFetch = globalThis.fetch || window.fetch;
-  const patchedFetch = async (input, init = {}) => {
-    const request = input instanceof Request ? input : new Request(input, init);
-    const url = request.url;
-    console.log("SDK FETCH INTERCEPTED:", url);
-    const method = request.method || "GET";
-    if (LOG_ENDPOINT && url.startsWith(LOG_ENDPOINT)) {
-      return originalFetch(input, init);
+  if (isPatched) return;
+  isPatched = true;
+  const originalFetch = window.fetch;
+  window.fetch = async function(...args) {
+    const input = args[0];
+    const init = args[1] || {};
+    const url = typeof input === "string" ? input : (input == null ? void 0 : input.url) || "";
+    const method = init.method || input instanceof Request && input.method || "GET";
+    if (LOG_ENDPOINT && url.includes(LOG_ENDPOINT)) {
+      return originalFetch.apply(this, args);
     }
     const start = Date.now();
+    let requestHeaders = {};
+    try {
+      const headers = init.headers || input instanceof Request && input.headers;
+      if (headers instanceof Headers) {
+        headers.forEach((v, k) => {
+          requestHeaders[k] = v;
+        });
+      } else if (headers) {
+        requestHeaders = { ...headers };
+      }
+    } catch {
+    }
     let requestBody = null;
     try {
-      requestBody = await request.clone().text();
+      if (init.body) {
+        requestBody = typeof init.body === "string" ? init.body : JSON.stringify(init.body);
+      }
     } catch {
     }
-    const requestHeaders = {};
-    request.headers.forEach((v, k) => {
-      requestHeaders[k] = v;
-    });
+    const signal = init.signal || input instanceof Request && input.signal;
+    if (signal) {
+      signal.addEventListener(
+        "abort",
+        () => {
+          sendLog({
+            type: "api_abort",
+            transport: "fetch",
+            url,
+            method,
+            duration: Date.now() - start,
+            ...getMetadata()
+          });
+        },
+        { once: true }
+      );
+    }
     try {
-      const response = await originalFetch(
-        request
+      const response = await originalFetch.apply(
+        this,
+        args
       );
+      const responseHeaders = {};
+      try {
+        response.headers.forEach((v, k) => {
+          responseHeaders[k] = v;
+        });
+      } catch {
+      }
       let responseBody = null;
       try {
         responseBody = await response.clone().text();
       } catch {
       }
-      const responseHeaders = {};
-      response.headers.forEach((v, k) => {
-        responseHeaders[k] = v;
-      });
       sendLog({
         type: "api_call",
         transport: "fetch",
@@ -89,17 +120,13 @@ function monitorFetch() {
         transport: "fetch",
         url,
         method,
-        error: err.message,
+        error: (err == null ? void 0 : err.message) || "Fetch failed",
         duration: Date.now() - start,
         ...getMetadata()
       });
       throw err;
     }
   };
-  globalThis.fetch = patchedFetch;
-  if (typeof window !== "undefined") {
-    window.fetch = patchedFetch;
-  }
 }
 
 // src/network/xhrMonitor.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kush_hemant/react-api-monitor",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Automatic API monitoring SDK for React apps",
   "type": "module",
   "main": "./dist/index.js",