whistle.pastekitlab 1.9.2 → 1.9.3

package/index.js

@@ -41,10 +41,19 @@ function bufferToString(buffer) {
     try {
         if (!buffer) return null;
         const result = buffer.toString('utf8');
-        if (/[\uFFFD]/.test(result)) return null; // 检查是否有替换字符
+        if (/[\uFFFD]/.test(result)) {
+            // 包含替换字符，尝试 latin1 编码
+            log(`[bufferToString] UTF-8 包含替换字符，尝试 latin1 编码`);
+            return buffer.toString('latin1');
+        }
         return result;
-    } catch {
-        return null;
+    } catch (e) {
+        log(`[bufferToString] 转换失败: ${e.message}，尝试 latin1`);
+        try {
+            return buffer.toString('latin1');
+        } catch {
+            return null;
+        }
     }
 }
 
@@ -404,13 +413,30 @@ module.exports = (server, options) => {
 
                 proxyRes.on('end', () => {
                     const duration = Date.now() - startTime;
+                    
                     // 构建响应数据
+                    let responseBodyStr = bufferToString(responseDataBuffer);
+                    const responseBodyBase64 = responseDataBuffer.toString('base64');
+                    
+                    // 如果字符串转换失败但 base64 成功，记录日志
+                    if (!responseBodyStr && responseBodyBase64) {
+                        log(`[mainHandler] responseBody 为 null，但 responseBodyBase64 有数据 (${responseDataBuffer.length} bytes)`);
+                        log(`[mainHandler] Content-Type: ${proxyRes.headers['content-type'] || 'N/A'}`);
+                        // 尝试使用 latin1 编码作为备选
+                        try {
+                            responseBodyStr = responseDataBuffer.toString('latin1');
+                            log(`[mainHandler] 使用 latin1 编码恢复 responseBody (${responseBodyStr.length} chars)`);
+                        } catch (e) {
+                            log(`[mainHandler] latin1 编码也失败: ${e.message}`);
+                        }
+                    }
+                    
                     const responseData = {
                         ...requestData,
                         statusCode: proxyRes.statusCode,
                         responseHeaders: {...proxyRes.headers},
-                        responseBody: truncateString(bufferToString(responseDataBuffer)),
-                        responseBodyBase64: responseDataBuffer.toString('base64'),
+                        responseBody: truncateString(responseBodyStr),
+                        responseBodyBase64: responseBodyBase64,
                         duration
                     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.pastekitlab",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Whistle plugin for PasteKit Lab - Intercepts requests and sends them to requestlistviewer via WebSocket",
   "main": "index.js",
   "scripts": {