@leeguoo/pwtk-network-debugger 1.2.10 → 1.2.11

package/dist/index.esm.js

@@ -6628,19 +6628,24 @@ function decrypt(encryptedData, keyStr) {
     }
   }
   if (window.decrypt && keyStr) {
-    console.log("[PWTK Decrypt] Trying WebAssembly decrypt with key:", keyStr);
+    console.log("[PWTK Decrypt] Trying WebAssembly decrypt");
+    console.log("[PWTK Decrypt] Input to window.decrypt:", {
+      data: encryptedData.substring(0, 100) + "...",
+      key: keyStr
+    });
     try {
       const decrypted = window.decrypt(encryptedData, keyStr);
-      console.log("[PWTK Decrypt] WebAssembly decrypt result:", {
-        success: decrypted && decrypted !== encryptedData,
-        resultLength: decrypted?.length,
-        resultPreview: decrypted?.substring(0, 100),
+      console.log("[PWTK Decrypt] window.decrypt returned:", {
+        type: typeof decrypted,
+        length: decrypted?.length,
+        preview: decrypted ? decrypted.substring(0, 200) + (decrypted.length > 200 ? "..." : "") : null,
+        sameAsInput: decrypted === encryptedData,
         hasInvalidChars: decrypted?.includes("�")
       });
       if (decrypted && decrypted !== encryptedData && !decrypted.includes("�")) {
         try {
           const parsed = JSON.parse(decrypted);
-          console.log("[PWTK Decrypt] ✅ WebAssembly decryption successful, parsed as JSON");
+          console.log("[PWTK Decrypt] ✅ WebAssembly decryption successful, parsed as JSON:", parsed);
           return parsed;
         } catch {
           if (decrypted.length > 0) {
@@ -6648,6 +6653,8 @@ function decrypt(encryptedData, keyStr) {
             return decrypted;
           }
         }
+      } else {
+        console.log("[PWTK Decrypt] window.decrypt did not change the data or returned invalid result");
       }
     } catch (e) {
       console.log("[PWTK Decrypt] WebAssembly decrypt error:", e);
@@ -6655,7 +6662,8 @@ function decrypt(encryptedData, keyStr) {
   } else {
     console.log("[PWTK Decrypt] WebAssembly not available:", {
       hasWindowDecrypt: !!window.decrypt,
-      hasKey: !!keyStr
+      hasKey: !!keyStr,
+      windowDecryptType: typeof window.decrypt
     });
   }
   const keys = [
@@ -6816,18 +6824,46 @@ class NetworkInterceptor {
       const fullKey = key + slk;
       console.log("[PWTK Debug] Full decrypt key:", fullKey ? `"${fullKey}" (length: ${fullKey.length})` : "empty");
       if (fullKey) {
-        const dataStr = typeof data === "string" ? data : JSON.stringify(data);
-        console.log("[PWTK Debug] Calling decrypt with data length:", dataStr.length, "key:", fullKey);
+        let dataToDecrypt = data;
+        let isWrappedData = false;
+        if (typeof data === "object" && data !== null && data.data && typeof data.data === "string") {
+          console.log('[PWTK Debug] Data is wrapped in {"data": "..."} format, extracting inner data');
+          dataToDecrypt = data.data;
+          isWrappedData = true;
+        } else if (typeof data === "string") {
+          try {
+            const parsed = JSON.parse(data);
+            if (parsed.data && typeof parsed.data === "string") {
+              console.log("[PWTK Debug] Data is JSON string with data field, extracting");
+              dataToDecrypt = parsed.data;
+              isWrappedData = true;
+            }
+          } catch {
+          }
+        }
+        const dataStr = typeof dataToDecrypt === "string" ? dataToDecrypt : JSON.stringify(dataToDecrypt);
+        console.log("[PWTK Debug] Calling decrypt with:", {
+          dataLength: dataStr.length,
+          dataPreview: dataStr.substring(0, 50),
+          key: fullKey,
+          isWrapped: isWrappedData
+        });
         const decrypted = decrypt(dataStr, fullKey);
         console.log("[PWTK Debug] Decrypt result:", {
-          success: decrypted && decrypted !== dataStr && decrypted !== data,
+          success: decrypted && decrypted !== dataStr,
           decryptedType: typeof decrypted,
           decryptedLength: decrypted ? typeof decrypted === "string" ? decrypted.length : JSON.stringify(decrypted).length : 0,
-          preview: decrypted ? JSON.stringify(decrypted).substring(0, 100) : null
+          preview: decrypted ? typeof decrypted === "string" ? decrypted.substring(0, 100) : JSON.stringify(decrypted).substring(0, 100) : null
         });
-        if (decrypted && decrypted !== dataStr && decrypted !== data) {
-          console.log("[PWTK Debug] ✅ Decryption successful!");
-          return decrypted;
+        if (decrypted && decrypted !== dataStr) {
+          if (isWrappedData) {
+            const result = { data: decrypted };
+            console.log("[PWTK Debug] ✅ Decryption successful! Returning wrapped result");
+            return result;
+          } else {
+            console.log("[PWTK Debug] ✅ Decryption successful!");
+            return decrypted;
+          }
         } else {
           console.log("[PWTK Debug] ❌ Decryption failed or returned same data");
         }
@@ -7951,7 +7987,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.10</p>
+              <p style="margin: 10px 0;">Version: 1.2.11</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>
@@ -8560,7 +8596,7 @@ class NetworkDebugger {
       this.initialized = true;
       console.log(`
 ╔════════════════════════════════════════╗
-║  🔓 PWTK 解密小工具 v1.2.10           ║
+║  🔓 PWTK 解密小工具 v1.2.11           ║
 ║  Created by Leo (@leeguoo)             ║
 ║  技术支持: 请联系 Leo                 ║  
 ║  分享服务: curl.bwg.leeguoo.com       ║