whistle.pastekitlab 1.6.2 → 1.6.4

package/index.js

@@ -137,77 +137,76 @@ function broadcast(type, data) {
 
 // ==================== Whistle 插件主逻辑 ====================
 module.exports = (server, options) => {
-    log('插件已启动（使用 request/response 钩子）');
+    log('插件已启动（request/response 钩子）');
     startWebSocketServer();
-    // server.on('request', (req, res) => {
-    //     console.log('>>> [GLOBAL]', req.fullUrl);
-    // });
 
     return {
-        // ✅ 监听请求
         request: (req, res, next) => {
             try {
-                console.info("req:" + JSON.stringify(req))
                 const url = req.fullUrl || req.url;
-                // if (!shouldIntercept(url)) {
-                //     return next(); // 不处理，直接放行
-                // }
-
-                const data = {
-                    eventId: generateId(),
-                    url,
-                    method: req.method,
-                    headers: {...req.headers},
-                    body: bufferToString(req._reqBody),
-                    bodyBase64: bufferToBase64(req._reqBody)
-                };
-
-                log(`REQ ${req.method} ${url}`);
-                broadcast('REQUEST', data);
+                log(`🟡 REQ ${req.method} ${url}`);
+
+                // ⚠️ 必须优先调用 next，避免阻塞代理链
+                next();
+
+                // 异步获取 Body，不阻塞请求转发
+                req.getBody().then(body => {
+                    const data = {
+                        eventId: generateId(),
+                        url,
+                        method: req.method,
+                        headers: { ...req.headers },
+                        body: bufferToString(body),
+                        bodyBase64: bufferToBase64(body)
+                    };
+                    broadcast('REQUEST', data);
+                }).catch(e => log('❌ request body error: ' + e.message));
 
             } catch (e) {
-                log('request error: ' + e.message);
+                log('❌ request hook error: ' + e.message);
+                next(); // 异常时也必须放行
             }
-            next(); // ⚠️ 必须调用，让 whistle 继续代理
         },
 
-        // ✅ 监听响应
         response: (req, res, next) => {
             try {
-                console.info("rsp:" + JSON.stringify(req))
-
                 const url = req.fullUrl || req.url;
+
+                // 按需拦截（确保该函数对测试 URL 返回 true）
                 if (!shouldIntercept(url)) {
                     return next();
                 }
 
-                const data = {
-                    eventId: generateId(),
-                    url,
-                    method: req.method,
-                    statusCode: res.statusCode,
-                    headers: {...res.headers},
-                    body: bufferToString(res._resBody),
-                    bodyBase64: bufferToBase64(res._resBody)
-                };
-
-                log(`RES ${res.statusCode} ${url}`);
-                broadcast('RESPONSE', data);
+                log(`🟢 RES ${res.statusCode} ${url}`);
+                next(); // 先放行响应给客户端
+
+                res.getBody().then(body => {
+                    const data = {
+                        eventId: generateId(),
+                        url,
+                        method: req.method,
+                        statusCode: res.statusCode,
+                        headers: { ...res.headers },
+                        body: bufferToString(body),
+                        bodyBase64: bufferToBase64(body)
+                    };
+                    broadcast('RESPONSE', data);
+                }).catch(e => log('❌ response body error: ' + e.message));
 
             } catch (e) {
-                log('response error: ' + e.message);
+                log('❌ response hook error: ' + e.message);
+                next();
             }
-            next(); // ⚠️ 必须调用，继续后续处理
         }
     };
 };
 
-// ==================== 可选：暴露 Web UI ====================
+// UI 接口保持不变
 module.exports.ui = (uiServer, options) => {
-    // 如果你需要提供 /plugin/pastekitlab/... 接口，可以在这里用 uiServer
     uiServer.on('request', (req, res) => {
         if (req.url === '/plugin/pastekitlab/config') {
-            res.end(JSON.stringify({status: 'ok', wsPort: CONFIG.wsPort}));
+            res.setHeader('Content-Type', 'application/json');
+            res.end(JSON.stringify({ status: 'ok', wsPort: CONFIG.wsPort }));
         }
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.pastekitlab",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Whistle plugin for PasteKit Lab - Intercepts requests and sends them to requestlistviewer via WebSocket",
   "main": "index.js",
   "scripts": {
@@ -18,12 +18,10 @@
   "dependencies": {
     "ws": "^8.19.0"
   },
-  "whistleMetadata": {
-    "type": "reqScript"
-  },
   "whistlePlugin": true,
   "whistleConfig": {
     "name": "pastekitlab",
+    "type": "plugin",
     "description": "PasteKit Lab 请求拦截插件，通过 WebSocket 将请求发送到 requestlistviewer 展示"
   }
 }