@leeguoo/pwtk-network-debugger 1.2.2 → 1.2.4

package/dist/index.esm.js

@@ -6675,6 +6675,7 @@ class NetworkInterceptor {
     this.requests = /* @__PURE__ */ new Map();
     this.listeners = [];
     this.decryptConfig = { enabled: false };
+    window.__originalFetch = window.fetch;
     this.interceptXHR();
     this.interceptFetch();
   }
@@ -6711,6 +6712,9 @@ class NetworkInterceptor {
   generateRequestId() {
     return Math.random().toString(36).substr(2, 9);
   }
+  isInternalUrl(url) {
+    return url.includes("/ip/getSK") || url.includes("/api/dokv/storage") || url.includes("/api/share");
+  }
   notifyListeners(request) {
     this.listeners.forEach((listener) => {
       try {
@@ -6730,7 +6734,8 @@ class NetworkInterceptor {
       if (headers.cid && this.decryptConfig.autoFetchKeys !== false) {
         try {
           const apiUrl = this.decryptConfig.keyApiUrl || "https://gw-card-pay.buyacard.cc/ip/getSK";
-          const response = await fetch(apiUrl, {
+          const originalFetch = window.__originalFetch || window.fetch;
+          const response = await originalFetch(apiUrl, {
             headers: {
               cid: headers.cid,
               client: headers.client || "S_WEB",
@@ -6781,10 +6786,12 @@ class NetworkInterceptor {
       let url = "";
       let requestHeaders = {};
       const startTime = Date.now();
+      let isInternalRequest = false;
       const originalOpen = xhr.open;
       xhr.open = function(methodArg, urlArg, ...rest) {
         method = methodArg.toUpperCase();
         url = urlArg;
+        isInternalRequest = self2.isInternalUrl(url);
         return originalOpen.apply(this, [methodArg, urlArg, ...rest]);
       };
       const originalSetRequestHeader = xhr.setRequestHeader;
@@ -6794,6 +6801,9 @@ class NetworkInterceptor {
       };
       const originalSend = xhr.send;
       xhr.send = function(body) {
+        if (isInternalRequest) {
+          return originalSend.call(this, body);
+        }
         const requestData = {
           id: requestId,
           url,
@@ -6816,7 +6826,7 @@ class NetworkInterceptor {
         return originalSend.call(this, body);
       };
       xhr.addEventListener("readystatechange", function() {
-        if (xhr.readyState === XMLHttpRequest.DONE) {
+        if (xhr.readyState === XMLHttpRequest.DONE && !isInternalRequest) {
           const endTime = Date.now();
           const requestData = self2.requests.get(requestId);
           if (requestData) {
@@ -6858,13 +6868,16 @@ class NetworkInterceptor {
     window.XMLHttpRequest.prototype = originalXHR.prototype;
   }
   interceptFetch() {
-    const originalFetch = window.fetch;
+    const originalFetch = window.__originalFetch || window.fetch;
     const self2 = this;
     window.fetch = async function(input, init) {
       const requestId = self2.generateRequestId();
       const startTime = Date.now();
       const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
       const method = (init?.method || "GET").toUpperCase();
+      if (self2.isInternalUrl(url)) {
+        return originalFetch.call(this, input, init);
+      }
       const requestHeaders = {};
       if (init?.headers) {
         if (init.headers instanceof Headers) {
@@ -7364,6 +7377,19 @@ const styles = `
   display: none;
 }
 
+/* 默认折叠headers */
+.request-details .detail-section.collapsible {
+  /* 默认折叠状态 */
+}
+
+.request-details .detail-section.collapsible:not(.expanded) .detail-content {
+  display: none;
+}
+
+.request-details .detail-section.collapsible:not(.expanded) .collapse-icon {
+  transform: rotate(-90deg);
+}
+
 .request-item.expanded .request-details {
   display: block;
 }
@@ -7382,6 +7408,45 @@ const styles = `
   padding-bottom: 4px;
 }
 
+.detail-title.highlight {
+  color: #FFD700;
+  font-size: 12px;
+  background: rgba(255, 215, 0, 0.1);
+  padding: 6px 8px;
+  border-radius: 4px;
+  border-bottom: 2px solid #FFD700;
+}
+
+.detail-title.clickable {
+  cursor: pointer;
+  user-select: none;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.detail-title.clickable:hover {
+  background: rgba(76, 175, 80, 0.1);
+}
+
+.collapse-icon {
+  display: inline-block;
+  transition: transform 0.2s;
+  font-size: 10px;
+}
+
+.detail-section.collapsible {
+  position: relative;
+}
+
+.detail-section.collapsible.collapsed .detail-content {
+  display: none;
+}
+
+.detail-section.collapsible.collapsed .collapse-icon {
+  transform: rotate(-90deg);
+}
+
 .detail-content {
   background: #222;
   padding: 8px;
@@ -7655,41 +7720,29 @@ async function createShareLink(requestData) {
         version: "1.2.0"
       }
     };
-    const response = await fetch("https://gw-card-pay.buyacard.cc/api/dokv/storage", {
+    const originalFetch = window.__originalFetch || window.fetch;
+    const response = await originalFetch("https://curl.bwg.leeguoo.com/api/share", {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        projectId: "curl-tool",
-        // 使用与原项目相同的项目ID
-        key: `share:${generateShareId()}`,
-        // 使用相同的key格式
-        data: shareData,
-        expireIn: 7 * 24 * 60 * 60 * 1e3
-        // 7天过期
+        data: shareData
       })
     });
     const result = await response.json();
-    if (result.success && (result.id || result.key)) {
-      let shareId = result.id;
-      if (!shareId && result.key) {
-        shareId = result.key.replace("share:", "");
-      }
-      const shareUrl = `https://curl.bwg.leeguoo.com/share/${shareId}`;
+    if (result.shareId) {
+      const shareUrl = `https://curl.bwg.leeguoo.com/share/${result.shareId}`;
       console.log(`🔗 分享链接创建成功 (by Leo): ${shareUrl}`);
       return shareUrl;
     } else {
-      throw new Error(result.message || "创建分享失败");
+      throw new Error(result.error || "创建分享失败");
     }
   } catch (error) {
     console.error("NetworkDebugger: 创建分享链接失败:", error);
     throw error;
   }
 }
-function generateShareId() {
-  return Math.random().toString(36).substr(2, 10);
-}
 function extractKeys(headers) {
   if (!headers) return "";
   return headers.keys || headers.cid || headers["x-api-key"] || "";
@@ -7808,7 +7861,7 @@ class DebugPanel {
           <div class="about-panel" data-panel="about" style="display: none;">
             <div style="padding: 20px; color: #fff; text-align: center;">
               <h2 style="margin: 0 0 20px 0;">🔓 PWTK 解密小工具</h2>
-              <p style="margin: 10px 0;">Version: 1.2.2</p>
+              <p style="margin: 10px 0;">Version: 1.2.4</p>
               <p style="margin: 10px 0;">👨‍💻 Created by <strong>Leo (@leeguoo)</strong></p>
               <p style="margin: 10px 0;">📧 技术支持：请联系 Leo</p>
               <p style="margin: 10px 0;">🌐 分享服务：curl.bwg.leeguoo.com</p>
@@ -7961,44 +8014,49 @@ class DebugPanel {
   }
   renderRequestDetails(request) {
     let html = "";
-    if (Object.keys(request.headers).length > 0) {
+    request.id.replace(/[^a-zA-Z0-9]/g, "");
+    if (request.decryptedRequest) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">请求头</div>
+          <div class="detail-title highlight">🔓 解密请求数据</div>
           <div class="detail-content">
-            <table class="headers-table">
-              ${Object.entries(request.headers).map(
-        ([key, value]) => `<tr><td>${key}</td><td>${value}</td></tr>`
-      ).join("")}
-            </table>
+            <div class="json-content">${this.formatData(request.decryptedRequest)}</div>
           </div>
         </div>
       `;
     }
-    if (request.requestBody) {
+    if (request.decryptedResponse) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">请求数据</div>
+          <div class="detail-title highlight">🔓 解密响应数据</div>
           <div class="detail-content">
-            <div class="json-content">${this.formatData(request.requestBody)}</div>
+            <div class="json-content">${this.formatData(request.decryptedResponse)}</div>
           </div>
         </div>
       `;
     }
-    if (request.decryptedRequest) {
+    if (Object.keys(request.headers).length > 0) {
       html += `
-        <div class="detail-section">
-          <div class="detail-title">解密请求数据 🔓</div>
+        <div class="detail-section collapsible collapsed">
+          <div class="detail-title clickable" onclick="this.parentElement.classList.toggle('collapsed')">
+            <span class="collapse-icon">▼</span> 请求头 (${Object.keys(request.headers).length})
+          </div>
           <div class="detail-content">
-            <div class="json-content">${this.formatData(request.decryptedRequest)}</div>
+            <table class="headers-table">
+              ${Object.entries(request.headers).map(
+        ([key, value]) => `<tr><td>${key}</td><td>${value}</td></tr>`
+      ).join("")}
+            </table>
           </div>
         </div>
       `;
     }
     if (request.responseHeaders && Object.keys(request.responseHeaders).length > 0) {
       html += `
-        <div class="detail-section">
-          <div class="detail-title">响应头</div>
+        <div class="detail-section collapsible collapsed">
+          <div class="detail-title clickable" onclick="this.parentElement.classList.toggle('collapsed')">
+            <span class="collapse-icon">▼</span> 响应头 (${Object.keys(request.responseHeaders).length})
+          </div>
           <div class="detail-content">
             <table class="headers-table">
               ${Object.entries(request.responseHeaders).map(
@@ -8009,22 +8067,22 @@ class DebugPanel {
         </div>
       `;
     }
-    if (request.responseBody) {
+    if (request.requestBody && !request.decryptedRequest) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">响应数据</div>
+          <div class="detail-title">请求数据</div>
           <div class="detail-content">
-            <div class="json-content">${this.formatData(request.responseBody)}</div>
+            <div class="json-content">${this.formatData(request.requestBody)}</div>
           </div>
         </div>
       `;
     }
-    if (request.decryptedResponse) {
+    if (request.responseBody && !request.decryptedResponse) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">解密响应数据 🔓</div>
+          <div class="detail-title">响应数据</div>
           <div class="detail-content">
-            <div class="json-content">${this.formatData(request.decryptedResponse)}</div>
+            <div class="json-content">${this.formatData(request.responseBody)}</div>
           </div>
         </div>
       `;
@@ -8405,7 +8463,7 @@ class NetworkDebugger {
       this.initialized = true;
       console.log(`
 ╔════════════════════════════════════════╗
-║  🔓 PWTK 解密小工具 v1.2.2            ║
+║  🔓 PWTK 解密小工具 v1.2.4            ║
 ║  Created by Leo (@leeguoo)             ║
 ║  技术支持: 请联系 Leo                 ║  
 ║  分享服务: curl.bwg.leeguoo.com       ║