whistle.pastekitlab 1.6.9 → 1.7.2

package/index.js

@@ -1,43 +1,236 @@
-// index.js
-module.exports = (server, options) => {
-    console.log('✅ 插件已加载，等待规则匹配...');
+/**
+ * Whistle Plugin for PasteKit Lab（最终版 - 只监听）
+ */
 
-    return {
-        // 🔑 必须这样返回，Whistle 才会注入 next
-        request(req, res, next) {
-            try {
-                const url = req.fullUrl || req.url;
-                console.log(`🟡 [REQUEST HOOK] ${req.method} ${url}`);
+const WebSocket = require('ws');
+const axios = require('axios');
+const fs = require('fs');
+const path = require('path');
+
+// ==================== 配置 ====================
+const CONFIG = {
+    wsPort: 8889,
+    logEnabled: true,
+    logFile: path.join(__dirname, 'plugin.log')
+};
+
+// ==================== 全局状态 ====================
+let wss = null;
+let clients = new Map();
+let clientIdCounter = 0;
+let domainConfig = [];
+
+// ==================== 日志 ====================
+function log(message) {
+    if (!CONFIG.logEnabled) return;
+
+    const timestamp = new Date().toISOString();
+    const logMessage = `[${timestamp}] ${message}\n`;
+
+    console.log('[pastekitlab]', message);
+
+    try {
+        fs.appendFileSync(CONFIG.logFile, logMessage, 'utf8');
+    } catch (e) {
+    }
+}
+
+// ==================== 工具 ====================
+function bufferToString(buffer) {
+    try {
+        if (!buffer) return null;
+        const result = buffer.toString('utf8');
+        if (/[^\x20-\x7E\r\n\t]/.test(result)) return null;
+        return result;
+    } catch {
+        return null;
+    }
+}
 
-                // ⚠️ 必须先同步调用 next，否则 Whistle 代理链会阻塞超时
-                next();
+function bufferToBase64(buffer) {
+    try {
+        return buffer ? buffer.toString('base64') : null;
+    } catch {
+        return null;
+    }
+}
 
-                // 异步获取 Body（不阻塞 next）
-                req.getBody({ maxLength: 512 * 1024 }).then(buf => {
-                    console.log(`📦 REQ Body 长度: ${buf ? buf.length : 0}`);
-                    // 这里再调用 broadcast(...)
-                }).catch(e => console.error('❌ getBody error:', e.message));
+function generateId() {
+    return 'req_' + Date.now() + '_' + Math.random().toString(36).slice(2);
+}
 
-            } catch (e) {
-                console.error('❌ request 钩子异常:', e.message);
-                next(); // 异常也必须放行
+// ==================== 域名过滤 ====================
+function shouldIntercept(url) {
+    if (!domainConfig.length) return true;
+
+    try {
+        const {hostname} = new URL(url);
+
+        return domainConfig.some(domain => {
+            if (hostname === domain) return true;
+            if (domain.startsWith('*.')) {
+                const base = domain.slice(2);
+                return hostname.endsWith('.' + base) || hostname === base;
             }
-        },
+            return false;
+        });
+    } catch {
+        return false;
+    }
+}
+
+// ==================== WebSocket ====================
+function startWebSocketServer() {
+    if (wss) return;
+
+    wss = new WebSocket.Server({
+        port: CONFIG.wsPort,
+        path: '/ws'
+    });
+
+    wss.on('connection', (ws, req) => {
+        const id = ++clientIdCounter;
 
-        response(req, res, next) {
+        clients.set(id, ws);
+        log(`客户端连接: ${id}`);
+
+        ws.send(JSON.stringify({
+            msgType: 'connected',
+            clientId: id
+        }));
+
+        ws.on('message', (data) => {
             try {
-                const url = req.fullUrl || req.url;
-                console.log(`🟢 [RESPONSE HOOK] ${res.statusCode} ${url}`);
-                next();
+                const msg = JSON.parse(data.toString());
+
+                if (msg.msgType === 'domain') {
+                    domainConfig = msg.domain || [];
+                    log(`更新域名配置: ${domainConfig.join(',')}`);
+                }
+            } catch {
+            }
+        });
 
-                res.getBody({ maxLength: 512 * 1024 }).then(buf => {
-                    console.log(`📦 RES Body 长度: ${buf ? buf.length : 0}`);
-                }).catch(e => console.error('❌ getBody error:', e.message));
+        ws.on('close', () => {
+            clients.delete(id);
+            log(`客户端断开: ${id}`);
+        });
+    });
 
-            } catch (e) {
-                console.error('❌ response 钩子异常:', e.message);
-                next();
+    log(`WebSocket 启动: ws://127.0.0.1:${CONFIG.wsPort}/ws`);
+}
+
+function broadcast(type, data) {
+    if (!clients.size) return;
+
+    const msg = JSON.stringify({
+        msgType: type,
+        ...data,
+        timestamp: Date.now()
+    });
+
+    clients.forEach(ws => {
+        if (ws.readyState === WebSocket.OPEN) {
+            ws.send(msg);
+        }
+    });
+}
+
+// ==================== Whistle 插件主逻辑 ====================
+module.exports = (server, options) => {
+    log('插件已启动（使用 axios 转发请求）');
+    startWebSocketServer();
+
+    server.on('request', async (req, res) => {
+        try {
+            const url = req.fullUrl || req.url;
+            console.log('>>> [GLOBAL]', url);
+
+            // 收集请求体
+            let reqBody = '';
+            for await (const chunk of req) {
+                reqBody += chunk;
             }
+
+            // 构建请求数据
+            const requestData = {
+                eventId: generateId(),
+                url,
+                method: req.method,
+                headers: {...req.headers},
+                body: bufferToString(Buffer.from(reqBody)),
+                bodyBase64: Buffer.from(reqBody).toString('base64'),
+                timestamp: Date.now()
+            };
+
+            // 通知 Chrome 插件：请求开始
+            broadcast('REQUEST', requestData);
+            log(`REQ ${req.method} ${url}`);
+
+            // 通过 axios 转发请求
+            const startTime = Date.now();
+            const response = await axios({
+                method: req.method.toLowerCase(),
+                url: url,
+                headers: req.headers,
+                data: reqBody || undefined,
+                validateStatus: () => true // 不抛出 HTTP 错误
+            });
+            const duration = Date.now() - startTime;
+
+            // 设置响应状态码和头
+            res.statusCode = response.status;
+            Object.keys(response.headers).forEach(key => {
+                res.setHeader(key, response.headers[key]);
+            });
+
+            // 返回响应体
+            res.end(response.data);
+
+            // 构建响应数据
+            const responseData = {
+                ...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))
+                ).toString('base64'),
+                duration
+            };
+
+            // 通知 Chrome 插件：响应完成
+            broadcast('RESPONSE', responseData);
+            log(`转发成功: ${req.method} ${url} -> ${response.status} (${duration}ms)`);
+
+        } catch (error) {
+            log(`转发失败: ${error.message}`);
+            res.statusCode = 500;
+            res.end(JSON.stringify({ error: error.message }));
+
+            // 通知 Chrome 插件：请求失败
+            broadcast('ERROR', {
+                url: req.fullUrl || req.url,
+                method: req.method,
+                error: error.message,
+                timestamp: Date.now()
+            });
         }
-    };
+    });
 };
+
+// UI 接口保持不变
+module.exports.ui = (uiServer, options) => {
+    uiServer.on('request', (req, res) => {
+        if (req.url === '/plugin/pastekitlab/config') {
+            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.9",
+  "version": "1.7.2",
   "description": "Whistle plugin for PasteKit Lab - Intercepts requests and sends them to requestlistviewer via WebSocket",
   "main": "index.js",
   "scripts": {
@@ -16,6 +16,7 @@
   "author": "PasteKit Lab",
   "license": "MIT",
   "dependencies": {
+    "axios": "^1.6.0",
     "ws": "^8.19.0"
   },
   "whistlePlugin": true,