whistle.pastekitlab 1.7.6 → 1.7.8

package/index.js

@@ -162,14 +162,23 @@ async function forwardRequest(req, res, url) {
 
         // 转换响应数据
         let responseBody;
-        if (typeof response.data === 'string') {
+        if (Buffer.isBuffer(response.data)) {
             responseBody = response.data;
-        } else if (Buffer.isBuffer(response.data)) {
+        } else if (typeof response.data === 'string') {
             responseBody = response.data;
         } else if (typeof response.data === 'object') {
-            responseBody = JSON.stringify(response.data);
+            try {
+                responseBody = JSON.stringify(response.data);
+            } catch (e) {
+                responseBody = String(response.data);
+            }
         } else {
-            responseBody = String(response.data);
+            responseBody = String(response.data || '');
+        }
+
+        // 确保 responseBody 是有效的字符串或 Buffer
+        if (typeof responseBody !== 'string' && !Buffer.isBuffer(responseBody)) {
+            responseBody = String(responseBody || '');
         }
 
         res.end(responseBody);
@@ -239,14 +248,33 @@ module.exports = (server, options) => {
 
             // 转换响应数据为 Buffer 或字符串
             let responseBody;
-            if (typeof response.data === 'string') {
+            let responseBodyForNotification = null;
+            
+            if (Buffer.isBuffer(response.data)) {
                 responseBody = response.data;
-            } else if (Buffer.isBuffer(response.data)) {
+                responseBodyForNotification = bufferToString(response.data);
+            } else if (typeof response.data === 'string') {
                 responseBody = response.data;
+                responseBodyForNotification = response.data;
             } else if (typeof response.data === 'object') {
-                responseBody = JSON.stringify(response.data);
+                try {
+                    const jsonStr = JSON.stringify(response.data);
+                    responseBody = jsonStr;
+                    responseBodyForNotification = jsonStr;
+                } catch (e) {
+                    const str = String(response.data);
+                    responseBody = str;
+                    responseBodyForNotification = str;
+                }
             } else {
-                responseBody = String(response.data);
+                const str = String(response.data || '');
+                responseBody = str;
+                responseBodyForNotification = str;
+            }
+
+            // 确保 responseBody 是有效的字符串或 Buffer
+            if (typeof responseBody !== 'string' && !Buffer.isBuffer(responseBody)) {
+                responseBody = String(responseBody || '');
             }
 
             // 返回响应体
@@ -257,15 +285,9 @@ module.exports = (server, options) => {
                 ...requestData,
                 statusCode: response.status,
                 responseHeaders: {...response.headers},
-                responseBody: bufferToString(
-                    typeof response.data === 'string' 
-                        ? Buffer.from(response.data) 
-                        : Buffer.from(JSON.stringify(response.data))
-                ),
-                responseBodyBase64: (
-                    typeof response.data === 'string' 
-                        ? Buffer.from(response.data) 
-                        : Buffer.from(JSON.stringify(response.data))
+                responseBody: responseBodyForNotification,
+                responseBodyBase64: Buffer.from(
+                    typeof responseBody === 'string' ? responseBody : responseBody.toString()
                 ).toString('base64'),
                 duration
             };

package/package.json

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