@leeguoo/pwtk-network-debugger 1.2.5 → 1.2.7

package/dist/index.esm.js

@@ -6674,6 +6674,7 @@ class NetworkInterceptor {
   constructor() {
     this.requests = /* @__PURE__ */ new Map();
     this.listeners = [];
+    this.wasmCheckInterval = null;
     this.decryptConfig = { enabled: false };
     window.__originalFetch = window.fetch;
     this.interceptXHR();
@@ -6728,6 +6729,11 @@ class NetworkInterceptor {
     if (!this.decryptConfig.enabled || !data) {
       return null;
     }
+    const isDecryptAvailable = typeof window.decrypt === "function";
+    if (!isDecryptAvailable) {
+      console.log("NetworkDebugger: window.decrypt 不可用，跳过解密");
+      return null;
+    }
     try {
       let key = "";
       let slk = "";
@@ -6745,9 +6751,15 @@ class NetworkInterceptor {
           });
           const result = await response.json();
           if (result.success && result.data) {
-            const num = result.data;
-            key = num.slice(2, 3) + num.slice(5, 6) + num.slice(8, 9);
-            console.log("NetworkDebugger: 自动获取密钥成功:", key, "原始值:", num);
+            const num = String(result.data);
+            if (num.length >= 9) {
+              key = num.charAt(2) + num.charAt(5) + num.charAt(8);
+              console.log("NetworkDebugger: 自动获取密钥成功 key:", key, "from num:", num);
+            } else {
+              console.warn("NetworkDebugger: getSK返回数据长度不足:", num);
+            }
+          } else {
+            console.warn("NetworkDebugger: getSK返回失败:", result);
           }
         } catch (e) {
           console.warn("NetworkDebugger: 自动获取密钥失败:", e);
@@ -6756,20 +6768,33 @@ class NetworkInterceptor {
       if (!key && this.decryptConfig.keyExtractor) {
         key = this.decryptConfig.keyExtractor(headers);
       } else if (!key) {
-        key = headers.keys || headers.cid || "";
+        key = headers.decryptKey || headers.keys || headers.cid || "";
       }
       if (this.decryptConfig.slkExtractor) {
         slk = this.decryptConfig.slkExtractor(headers);
       } else {
-        slk = headers.slk || "";
+        slk = headers.decryptSlk || headers.slk || "";
       }
       const fullKey = key + slk;
+      console.log("NetworkDebugger: 尝试解密", { key, slk, fullKey, hasDecryptFunction: typeof window.decrypt === "function" });
       if (fullKey) {
-        const decrypted = decrypt(typeof data === "string" ? data : JSON.stringify(data), fullKey);
-        if (decrypted !== data) {
-          console.log("NetworkDebugger: 解密成功", { key, slk, fullKey });
+        const dataStr = typeof data === "string" ? data : JSON.stringify(data);
+        const decrypted = decrypt(dataStr, fullKey);
+        if (decrypted && decrypted !== dataStr && decrypted !== data) {
+          console.log("NetworkDebugger: 解密成功", {
+            key,
+            slk,
+            fullKey,
+            originalLength: dataStr.length,
+            decryptedType: typeof decrypted,
+            preview: JSON.stringify(decrypted).substring(0, 100) + "..."
+          });
           return decrypted;
+        } else {
+          console.log("NetworkDebugger: 解密未生效", { key, slk, fullKey, dataStr: dataStr.substring(0, 50) });
         }
+      } else {
+        console.log("NetworkDebugger: 没有密钥，跳过解密", { headers });
       }
     } catch (error) {
       console.warn("NetworkDebugger: Decryption failed:", error);
@@ -6817,7 +6842,6 @@ class NetworkInterceptor {
             if (decrypted !== null) {
               requestData.decryptedRequest = decrypted;
               self2.requests.set(requestId, requestData);
-              self2.notifyListeners(requestData);
             }
           }).catch((e) => console.warn("解密请求失败:", e));
         }
@@ -6857,9 +6881,10 @@ class NetworkInterceptor {
                   self2.notifyListeners(requestData);
                 }
               }).catch((e) => console.warn("解密响应失败:", e));
+            } else {
+              self2.requests.set(requestId, requestData);
+              self2.notifyListeners(requestData);
             }
-            self2.requests.set(requestId, requestData);
-            self2.notifyListeners(requestData);
           }
         }
       });
@@ -6919,7 +6944,6 @@ class NetworkInterceptor {
           if (decrypted !== null) {
             requestData.decryptedRequest = decrypted;
             self2.requests.set(requestId, requestData);
-            self2.notifyListeners(requestData);
           }
         }).catch((e) => console.warn("解密请求失败:", e));
       }
@@ -6957,12 +6981,15 @@ class NetworkInterceptor {
                   self2.notifyListeners(updatedRequestData);
                 }
               }).catch((e) => console.warn("解密响应失败:", e));
+            } else {
+              self2.requests.set(requestId, updatedRequestData);
+              self2.notifyListeners(updatedRequestData);
             }
           } catch (error) {
             updatedRequestData.error = `Failed to read response: ${error}`;
+            self2.requests.set(requestId, updatedRequestData);
+            self2.notifyListeners(updatedRequestData);
           }
-          self2.requests.set(requestId, updatedRequestData);
-          self2.notifyListeners(updatedRequestData);
         }
         return response;
       } catch (error) {
@@ -6985,6 +7012,11 @@ class WasmLoader {
     this.loading = false;
   }
   async loadWasm(wasmUrl, jsUrl) {
+    if (typeof window.decrypt === "function") {
+      console.log("NetworkDebugger: window.decrypt 已存在，跳过 WASM 加载");
+      this.loaded = true;
+      return true;
+    }
     if (this.loaded) return true;
     if (this.loading) {
       return new Promise((resolve) => {
@@ -7068,9 +7100,15 @@ class WasmLoader {
         throw new Error("Unable to load WebAssembly from any path");
       }
       go.run(wasmModule.instance);
-      this.loaded = true;
-      console.log("NetworkDebugger: WebAssembly 加密模块已加载");
-      return true;
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      if (typeof window.decrypt === "function") {
+        this.loaded = true;
+        console.log("NetworkDebugger: WebAssembly 加密模块已加载，decrypt 函数可用");
+        return true;
+      } else {
+        console.warn("NetworkDebugger: WebAssembly 已加载但 decrypt 函数不可用");
+        return false;
+      }
     } catch (error) {
       console.warn("NetworkDebugger: WebAssembly 加载失败:", error);
       return false;
@@ -7987,7 +8025,7 @@ class DebugPanel {
       <div class="request-header">
         <span class="request-method ${methodClass}">${request.method}</span>
         <span class="request-url" title="${request.url}">${this.truncateUrl(request.url)}</span>
-        <span class="request-status ${statusClass}">${request.status || "ERR"}</span>
+        <span class="request-status ${statusClass}">${request.status ? request.status : request.duration !== void 0 ? "ERR" : "Pending"}</span>
         ${hasError ? '<span class="error-badge">⚠️</span>' : ""}
         <button class="share-btn" title="分享此请求 (by Leo)" onclick="event.stopPropagation()">🔗</button>
       </div>
@@ -8066,20 +8104,20 @@ class DebugPanel {
         </div>
       `;
     }
-    if (request.requestBody && !request.decryptedRequest) {
+    if (request.requestBody) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">请求数据</div>
+          <div class="detail-title">${request.decryptedRequest ? "原始请求数据" : "请求数据"}</div>
           <div class="detail-content">
             <div class="json-content">${this.formatData(request.requestBody)}</div>
           </div>
         </div>
       `;
     }
-    if (request.responseBody && !request.decryptedResponse) {
+    if (request.responseBody) {
       html += `
         <div class="detail-section">
-          <div class="detail-title">响应数据</div>
+          <div class="detail-title">${request.decryptedResponse ? "原始响应数据" : "响应数据"}</div>
           <div class="detail-content">
             <div class="json-content">${this.formatData(request.responseBody)}</div>
           </div>
@@ -8118,12 +8156,7 @@ class DebugPanel {
     return "status-error";
   }
   truncateUrl(url) {
-    if (url.length <= 50) return url;
-    const parts = url.split("/");
-    const domain = parts.slice(0, 3).join("/");
-    const path = parts.slice(3).join("/");
-    if (path.length <= 20) return url;
-    return `${domain}/...${path.slice(-20)}`;
+    return url;
   }
   switchTab(tabName) {
     this.container.querySelectorAll(".debugger-tab").forEach((tab) => {
@@ -8443,9 +8476,14 @@ class NetworkDebugger {
       ...config
     };
     try {
-      if (this.config.wasm?.enabled) {
+      if (this.config.wasm?.enabled !== false) {
         this.wasmLoader = new WasmLoader();
-        await this.wasmLoader.loadWasm(this.config.wasm.wasmUrl, this.config.wasm.jsUrl);
+        const wasmLoaded = await this.wasmLoader.loadWasm(this.config.wasm?.wasmUrl, this.config.wasm?.jsUrl);
+        if (wasmLoaded) {
+          console.log("NetworkDebugger: WASM decrypt 函数已就绪");
+        } else {
+          console.log("NetworkDebugger: WASM 加载失败或 decrypt 函数不可用，将依赖页面自带的解密功能");
+        }
       }
       this.interceptor = new NetworkInterceptor();
       if (this.config.decrypt?.enabled) {
@@ -8462,7 +8500,7 @@ class NetworkDebugger {
       this.initialized = true;
       console.log(`
 ╔════════════════════════════════════════╗
-║  🔓 PWTK 解密小工具 v1.2.5            ║
+║  🔓 PWTK 解密小工具 v1.2.7            ║
 ║  Created by Leo (@leeguoo)             ║
 ║  技术支持: 请联系 Leo                 ║  
 ║  分享服务: curl.bwg.leeguoo.com       ║