@leeguoo/pwtk-network-debugger 1.2.28 → 1.2.30

package/dist/index.esm.js

@@ -6850,6 +6850,25 @@ class NetworkInterceptor {
       }
     });
   }
+  extractUrlParams(url) {
+    try {
+      const urlObj = new URL(url);
+      const params = {};
+      urlObj.searchParams.forEach((value, key) => {
+        params[key] = value;
+      });
+      if (Object.keys(params).length > 0) {
+        if (Object.keys(params).length === 1 && params.data) {
+          return params.data;
+        } else {
+          return params;
+        }
+      }
+      return null;
+    } catch (e) {
+      return null;
+    }
+  }
   async tryDecrypt(data, headers) {
     logger.debug("[PWTK Debug] tryDecrypt called:", {
       dataType: typeof data,
@@ -6998,8 +7017,15 @@ class NetworkInterceptor {
           requestBody: body,
           timestamp: startTime
         };
-        if (body) {
-          self2.tryDecrypt(body, requestHeaders).then((decrypted) => {
+        let dataToDecrypt = body;
+        if (method === "GET" && !body) {
+          dataToDecrypt = self2.extractUrlParams(url);
+          if (dataToDecrypt) {
+            requestData.requestBody = dataToDecrypt;
+          }
+        }
+        if (dataToDecrypt) {
+          self2.tryDecrypt(dataToDecrypt, requestHeaders).then((decrypted) => {
             if (decrypted !== null) {
               requestData.decryptedRequest = decrypted;
               self2.requests.set(requestId, requestData);
@@ -7136,8 +7162,15 @@ class NetworkInterceptor {
         requestBody,
         timestamp: startTime
       };
-      if (requestBody) {
-        self2.tryDecrypt(requestBody, requestHeaders).then((decrypted) => {
+      let dataToDecrypt = requestBody;
+      if (method === "GET" && !requestBody) {
+        dataToDecrypt = self2.extractUrlParams(url);
+        if (dataToDecrypt) {
+          requestData.requestBody = dataToDecrypt;
+        }
+      }
+      if (dataToDecrypt) {
+        self2.tryDecrypt(dataToDecrypt, requestHeaders).then((decrypted) => {
           if (decrypted !== null) {
             requestData.decryptedRequest = decrypted;
             self2.requests.set(requestId, requestData);
@@ -7368,7 +7401,7 @@ function parseCurl(curlCommand) {
   const lines = curlCommand.split("\\\n").map((line) => line.trim());
   const fullCommand = lines.join(" ");
   const urlMatch = fullCommand.match(/c?curl\s+['"]?([^'"\s]+)['"]?/);
-  const url = urlMatch ? urlMatch[1] : "";
+  let url = urlMatch ? urlMatch[1] : "";
   const headers = {};
   const headerMatches = fullCommand.matchAll(/-H\s+['"]([^:]+):\s*([^'"]*)['"]/g);
   for (const match of headerMatches) {
@@ -7384,8 +7417,25 @@ function parseCurl(curlCommand) {
       data = rawData;
     }
   }
+  if (!dataMatch && url.includes("?")) {
+    try {
+      const urlObj = new URL(url, "http://example.com");
+      const params = {};
+      urlObj.searchParams.forEach((value, key) => {
+        params[key] = value;
+      });
+      if (Object.keys(params).length > 0) {
+        if (Object.keys(params).length === 1 && params.data) {
+          data = params.data;
+        } else {
+          data = params;
+        }
+      }
+    } catch (e) {
+    }
+  }
   const methodMatch = fullCommand.match(/-X\s+(['"]?)([A-Z]+)\1/);
-  let method = methodMatch ? methodMatch[2] : data ? "POST" : "GET";
+  let method = methodMatch ? methodMatch[2] : dataMatch ? "POST" : "GET";
   return {
     url,
     method,
@@ -8127,12 +8177,11 @@ const _DebugPanel = class _DebugPanel {
     this.container.className = `${this.config.position} ${this.config.minimized ? "minimized" : ""}`;
     this.container.innerHTML = `
       <div class="debugger-header">
-        <div class="debugger-title">🔓 ${this.config.minimized ? "PWTK" : "PWTK 解密小工具"} <span style="font-size: 10px; opacity: 0.7;">by Leo</span></div>
+        <div class="debugger-title">🔓 PWTK 解密小工具 <span style="font-size: 10px; opacity: 0.7;">by Leo</span></div>
         <div class="debugger-controls">
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="clear" title="清空"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/></svg></button>' : ""}
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="export" title="导出"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/></svg></button>' : ""}
-          <button class="debugger-btn" data-action="minimize" title="${this.config.minimized ? "展开" : "最小化"}"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="${this.config.minimized ? "M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" : "M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"}"/></svg></button>
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="fullscreen" title="全屏"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg></button>' : ""}
+          <button class="debugger-btn" data-action="clear" title="清空"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/></svg></button>
+          <button class="debugger-btn" data-action="export" title="导出"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/></svg></button>
+          <button class="debugger-btn" data-action="fullscreen" title="全屏"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg></button>
           <button class="debugger-btn" data-action="close" title="关闭"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg></button>
         </div>
       </div>
@@ -8226,9 +8275,6 @@ const _DebugPanel = class _DebugPanel {
         case "export":
           this.exportData();
           break;
-        case "minimize":
-          this.toggleMinimize();
-          break;
         case "fullscreen":
           this.toggleFullscreen();
           break;
@@ -8340,6 +8386,17 @@ const _DebugPanel = class _DebugPanel {
         await this.shareRequest(request);
       });
     }
+    item.addEventListener("click", (e) => {
+      const target = e.target;
+      if (target.closest('.detail-title[data-toggle="collapse"]')) {
+        e.stopPropagation();
+        const detailTitle = target.closest(".detail-title");
+        const detailSection = detailTitle.parentElement;
+        if (detailSection && detailSection.classList.contains("collapsible")) {
+          detailSection.classList.toggle("collapsed");
+        }
+      }
+    });
     return item;
   }
   renderRequestDetails(request) {
@@ -8368,7 +8425,7 @@ const _DebugPanel = class _DebugPanel {
     if (Object.keys(request.headers).length > 0) {
       html += `
         <div class="detail-section collapsible collapsed">
-          <div class="detail-title clickable" onclick="this.parentElement.classList.toggle('collapsed')">
+          <div class="detail-title clickable" data-toggle="collapse">
             <span class="collapse-icon">▼</span> 请求头 (${Object.keys(request.headers).length})
           </div>
           <div class="detail-content">
@@ -8384,7 +8441,7 @@ const _DebugPanel = class _DebugPanel {
     if (request.responseHeaders && Object.keys(request.responseHeaders).length > 0) {
       html += `
         <div class="detail-section collapsible collapsed">
-          <div class="detail-title clickable" onclick="this.parentElement.classList.toggle('collapsed')">
+          <div class="detail-title clickable" data-toggle="collapse">
             <span class="collapse-icon">▼</span> 响应头 (${Object.keys(request.responseHeaders).length})
           </div>
           <div class="detail-content">
@@ -8513,54 +8570,23 @@ Created by Leo (@leeguoo)`);
       alert("分享失败，请稍后重试");
     }
   }
-  toggleMinimize() {
-    this.config.minimized = !this.config.minimized;
-    this.container.classList.toggle("minimized", this.config.minimized);
-    const header = this.container.querySelector(".debugger-header");
-    if (header) {
-      header.innerHTML = `
-        <div class="debugger-title">🔓 ${this.config.minimized ? "PWTK" : "PWTK 解密小工具"} <span style="font-size: 10px; opacity: 0.7;">by Leo</span></div>
-        <div class="debugger-controls">
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="clear" title="清空"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/></svg></button>' : ""}
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="export" title="导出"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"/></svg></button>' : ""}
-          <button class="debugger-btn" data-action="minimize" title="${this.config.minimized ? "展开" : "最小化"}"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="${this.config.minimized ? "M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z" : "M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"}"/></svg></button>
-          ${!this.config.minimized ? '<button class="debugger-btn" data-action="fullscreen" title="全屏"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg></button>' : ""}
-          <button class="debugger-btn" data-action="close" title="关闭"><svg class="debugger-icon" viewBox="0 0 24 24"><path fill="currentColor" d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg></button>
-        </div>
-      `;
-      const controls = header.querySelector(".debugger-controls");
-      controls.addEventListener("click", (e) => {
-        e.stopPropagation();
-        let target = e.target;
-        while (target && target !== controls) {
-          if (target.dataset?.action) break;
-          target = target.parentElement;
-        }
-        const action = target?.dataset?.action;
-        if (!action) return;
-        switch (action) {
-          case "clear":
-            this.clearRequests();
-            break;
-          case "export":
-            this.exportData();
-            break;
-          case "minimize":
-            this.toggleMinimize();
-            break;
-          case "fullscreen":
-            this.toggleFullscreen();
-            break;
-          case "close":
-            this.hide();
-            break;
-        }
-      });
-    }
-    this.saveConfig();
-  }
   toggleFullscreen() {
-    this.container.classList.toggle("fullscreen");
+    if (this.container.classList.contains("fullscreen")) {
+      this.container.classList.remove("fullscreen");
+      this.container.style.top = "";
+      this.container.style.left = "";
+      this.container.style.width = "";
+      this.container.style.height = "";
+      this.loadPosition();
+    } else {
+      this.container.classList.add("fullscreen");
+      this.container.style.top = "0";
+      this.container.style.left = "0";
+      this.container.style.width = "100vw";
+      this.container.style.height = "100vh";
+      this.container.style.right = "auto";
+      this.container.style.bottom = "auto";
+    }
   }
   handleToolAction(tool) {
     const textarea = this.container.querySelector(".tools-content textarea");
@@ -9032,7 +9058,7 @@ class NetworkDebugger {
       this.initialized = true;
       logger.consoleDirect(`
 ╔════════════════════════════════════════╗
-║  🔓 PWTK 解密小工具 v1.2.28           ║
+║  🔓 PWTK 解密小工具 v1.2.30           ║
 ║  Created by Leo (@leeguoo)             ║
 ║  技术支持: 请联系 Leo                 ║  
 ║  分享服务: curl.bwg.leeguoo.com       ║