whistle.pastekitlab 1.3.1 → 1.3.3

package/back.js

@@ -1,11 +1,8 @@
 /**
- * Whistle Plugin for PasteKit Lab
- * 
- * 功能：拦截匹配的域名请求，通过 WebSocket 发送到 Chrome 插件
+ * Whistle Plugin for PasteKit Lab（最终版 - 只监听）
  */
 
 const WebSocket = require('ws');
-const http = require('http');
 const fs = require('fs');
 const path = require('path');
 
@@ -13,297 +10,178 @@ const path = require('path');
 const CONFIG = {
     wsPort: 8889,
     logEnabled: true,
-    logFile: path.join(__dirname, 'plugin.log')  // 日志文件路径
+    logFile: path.join(__dirname, 'plugin.log')
 };
 
 // ==================== 全局状态 ====================
 let wss = null;
-let httpServer = null;
 let clients = new Map();
 let clientIdCounter = 0;
-let domainConfig = []; // 存储从 Chrome 插件接收的域名配置
+let domainConfig = [];
 
-// ==================== 工具函数 ====================
+// ==================== 日志 ====================
 function log(message) {
-    if (CONFIG.logEnabled) {
-        const timestamp = new Date().toISOString();
-        const logMessage = `[${timestamp}] [Whistle.pastekitlab] ${message}\n`;
-        
-        // 输出到控制台
-        console.log('[Whistle.pastekitlab]', message);
-        
-        // 追加到日志文件
-        try {
-            fs.appendFileSync(CONFIG.logFile, logMessage, 'utf8');
-        } catch (e) {
-            // 忽略文件写入错误
-        }
-    }
+    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;
-        }
+        if (/[^\x20-\x7E\r\n\t]/.test(result)) return null;
         return result;
-    } catch (e) {
+    } catch {
         return null;
     }
 }
 
 function bufferToBase64(buffer) {
     try {
-        if (!buffer) return null;
-        return buffer.toString('base64');
-    } catch (e) {
+        return buffer ? buffer.toString('base64') : null;
+    } catch {
         return null;
     }
 }
 
 function generateId() {
-    return 'req_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9);
+    return 'req_' + Date.now() + '_' + Math.random().toString(36).slice(2);
 }
 
-// ==================== 检查 URL 是否匹配配置的域名 ====================
+// ==================== 域名过滤 ====================
 function shouldIntercept(url) {
-    if (!domainConfig || domainConfig.length === 0) {
-        return false;
-    }
-    
+    if (!domainConfig.length) return true;
+
     try {
-        const urlObj = new URL(url);
-        const hostname = urlObj.hostname;
-        
+        const { hostname } = new URL(url);
+
         return domainConfig.some(domain => {
-            // 精确匹配
             if (hostname === domain) return true;
-            // 通配符匹配 *.example.com
             if (domain.startsWith('*.')) {
-                const baseDomain = domain.substring(2);
-                return hostname.endsWith('.' + baseDomain) || hostname === baseDomain;
+                const base = domain.slice(2);
+                return hostname.endsWith('.' + base) || hostname === base;
             }
             return false;
         });
-    } catch (e) {
+    } catch {
         return false;
     }
 }
 
-// ==================== 启动 WebSocket 服务器 ====================
+// ==================== WebSocket ====================
 function startWebSocketServer() {
     if (wss) return;
 
-    try {
-        wss = new WebSocket.Server({ 
-            port: CONFIG.wsPort,
-            path: '/ws',
-            maxPayload: 10 * 1024 * 1024
-        });
+    wss = new WebSocket.Server({
+        port: CONFIG.wsPort,
+        path: '/ws'
+    });
 
-        wss.on('connection', (ws, req) => {
-            const clientId = ++clientIdCounter;
-            const clientIp = req.socket.remoteAddress;
-            
-            log(`客户端 ${clientId} 已连接 (${clientIp})`);
-            
-            clients.set(clientId, {
-                id: clientId,
-                ws: ws,
-                ip: clientIp,
-                connectedAt: Date.now()
-            });
-
-            // 发送欢迎消息
-            ws.send(JSON.stringify({
-                msgType: 'connected',
-                clientId: clientId,
-                timestamp: Date.now()
-            }));
-
-            // 设置心跳
-            ws.isAlive = true;
-            ws.on('pong', () => {
-                ws.isAlive = true;
-            });
-
-            // 处理客户端消息（接收 domain 配置）
-            ws.on('message', (data) => {
-                try {
-                    const message = JSON.parse(data.toString());
-                    
-                    if (message.msgType === 'domain') {
-                        // 更新域名配置
-                        domainConfig = message.domain || [];
-                        log(`收到域名配置: ${domainConfig.length} 个域名`);
-                        
-                        // 确认配置已接收
-                        ws.send(JSON.stringify({
-                            msgType: 'domainConfigReceived',
-                            domainCount: domainConfig.length,
-                            timestamp: Date.now()
-                        }));
-                    }
-                } catch (error) {
-                    log(`消息解析失败: ${error.message}`);
-                }
-            });
+    wss.on('connection', (ws, req) => {
+        const id = ++clientIdCounter;
 
-            ws.on('close', (code, reason) => {
-                log(`客户端 ${clientId} 已断开 (code: ${code})`);
-                clients.delete(clientId);
-            });
+        clients.set(id, ws);
+        log(`客户端连接: ${id}`);
 
-            ws.on('error', (error) => {
-                log(`客户端 ${clientId} 错误: ${error.message}`);
-                clients.delete(clientId);
-            });
-        });
+        ws.send(JSON.stringify({
+            msgType: 'connected',
+            clientId: id
+        }));
 
-        // 定期心跳检测
-        // const heartbeat = setInterval(() => {
-        //     wss.clients.forEach((ws) => {
-        //         if (ws.isAlive === false) {
-        //             return ws.terminate();
-        //         }
-        //         ws.isAlive = false;
-        //         ws.ping();
-        //     });
-        // }, 30000);
-
-        wss.on('close', () => {
-            clearInterval(heartbeat);
-        });
+        ws.on('message', (data) => {
+            try {
+                const msg = JSON.parse(data.toString());
 
-        wss.on('error', (error) => {
-            log(`WebSocket 服务器错误: ${error.message}`);
+                if (msg.msgType === 'domain') {
+                    domainConfig = msg.domain || [];
+                    log(`更新域名配置: ${domainConfig.join(',')}`);
+                }
+            } catch {}
         });
 
-        log(`WebSocket 服务器已启动: ws://127.0.0.1:${CONFIG.wsPort}/ws`);
+        ws.on('close', () => {
+            clients.delete(id);
+            log(`客户端断开: ${id}`);
+        });
+    });
 
-    } catch (error) {
-        log(`启动 WebSocket 服务器失败: ${error.message}`);
-    }
+    log(`WebSocket 启动: ws://127.0.0.1:${CONFIG.wsPort}/ws`);
 }
 
-// ==================== 广播消息给所有客户端 ====================
-function broadcastToClients(msgType, data) {
-    if (clients.size === 0) return;
+function broadcast(type, data) {
+    if (!clients.size) return;
 
-    const message = JSON.stringify({
-        msgType: msgType,
+    const msg = JSON.stringify({
+        msgType: type,
         ...data,
         timestamp: Date.now()
     });
 
-    clients.forEach((client, clientId) => {
-        if (client.ws.readyState === WebSocket.OPEN) {
-            try {
-                client.ws.send(message);
-            } catch (error) {
-                log(`向客户端 ${clientId} 发送失败`);
-            }
+    clients.forEach(ws => {
+        if (ws.readyState === WebSocket.OPEN) {
+            ws.send(msg);
         }
     });
 }
 
-// ==================== Whistle 插件导出 ====================
-module.exports = {
-    /**
-     * 处理请求阶段 - beforeRequest
-     */
-    '*': async function(req, res, next) {
-        // 确保 WebSocket 服务器已启动
-        if (!wss) {
-            startWebSocketServer();
-        }
+// ==================== Whistle 插件 ====================
+module.exports = (server, options) => {
+    log('插件已启动（server.on 模式）');
+    startWebSocketServer();
 
-        log(`接收到请求${req}`)
-        const url = req.fullUrl || req.url;
-        
-        // 检查是否匹配配置的域名
-        // if (!shouldIntercept(url)) {
-        //     return next();
-        // }
-
-        const method = req.method;
-        const headers = req.headers;
+    // ==================== 请求监听 ====================
+    server.on('request', (req, res) => {
+        try {
+            const url = req.fullUrl || req.url;
+            if (!shouldIntercept(url)) return;
 
-        // 获取请求体
-        let requestBody = null;
-        let requestBodyBase64 = null;
+            const data = {
+                eventId: generateId(),
+                url,
+                method: req.method,
+                headers: req.headers,
+                body: bufferToString(req._reqBody),
+                bodyBase64: bufferToBase64(req._reqBody)
+            };
 
-        if (req._reqBody) {
-            requestBody = bufferToString(req._reqBody);
-            requestBodyBase64 = bufferToBase64(req._reqBody);
-        }
+            log(`REQ ${req.method} ${url}`);
+            broadcast('REQUEST', data);
 
-        // 构建请求数据
-        const requestData = {
-            eventId: generateId(),
-            url: url,
-            method: method,
-            requestHeaders: headers,
-            requestBody: requestBody,
-            requestBodyBase64: requestBodyBase64,
-            timestamp: Date.now()
-        };
-
-        log(`拦截请求: ${method} ${url}`);
-
-        // 发送请求数据给 Chrome 插件
-        broadcastToClients('MOCK', requestData);
-
-        next();
-    },
-
-    /**
-     * 处理响应阶段 - afterResponse  
-     */
-    '* response': async function(req, res, next) {
-        const url = req.fullUrl || req.url;
-        log(`接收到响应${req}`)
-
-        // // 检查是否匹配配置的域名
-        // if (!shouldIntercept(url)) {
-        //     return next();
-        // }
-
-        const statusCode = res.statusCode;
-        const headers = res.headers;
-
-        // 获取响应体
-        let responseBody = null;
-        let responseBodyBase64 = null;
-
-        if (res._resBody) {
-            responseBody = bufferToString(res._resBody);
-            responseBodyBase64 = bufferToBase64(res._resBody);
+        } catch (e) {
+            log('request error: ' + e.message);
         }
+    });
 
-        // 构建响应数据
-        const responseData = {
-            eventId: generateId(),
-            url: url,
-            method: req.method,
-            statusCode: statusCode,
-            responseHeaders: headers,
-            responseBody: responseBody,
-            responseBodyBase64: responseBodyBase64,
-            timestamp: Date.now()
-        };
-
-        log(`拦截响应: ${statusCode} ${url}`);
-
-        // 发送响应数据给 Chrome 插件
-        broadcastToClients('RESPONSE', responseData);
-        next();
-    }
-
-};
+    // ==================== 响应监听 ====================
+    server.on('response', (req, res) => {
+        try {
+            const url = req.fullUrl || req.url;
+            if (!shouldIntercept(url)) return;
+
+            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('插件已加载');
-startWebSocketServer();
+        } catch (e) {
+            log('response error: ' + e.message);
+        }
+    });
+};

package/index.js

@@ -1,187 +1,13 @@
-/**
- * Whistle Plugin for PasteKit Lab（最终版 - 只监听）
- */
-
-const WebSocket = require('ws');
-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;
-    }
-}
-
-function bufferToBase64(buffer) {
-    try {
-        return buffer ? buffer.toString('base64') : null;
-    } catch {
-        return null;
-    }
-}
-
-function generateId() {
-    return 'req_' + Date.now() + '_' + Math.random().toString(36).slice(2);
-}
-
-// ==================== 域名过滤 ====================
-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;
-
-        clients.set(id, ws);
-        log(`客户端连接: ${id}`);
-
-        ws.send(JSON.stringify({
-            msgType: 'connected',
-            clientId: id
-        }));
-
-        ws.on('message', (data) => {
-            try {
-                const msg = JSON.parse(data.toString());
-
-                if (msg.msgType === 'domain') {
-                    domainConfig = msg.domain || [];
-                    log(`更新域名配置: ${domainConfig.join(',')}`);
-                }
-            } catch {}
-        });
-
-        ws.on('close', () => {
-            clients.delete(id);
-            log(`客户端断开: ${id}`);
-        });
-    });
-
-    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('插件已启动（server.on 模式）');
-    startWebSocketServer();
-
-    // ==================== 请求监听 ====================
-    server.on('request', (req, res) => {
-        try {
-            const url = req.fullUrl || req.url;
-            if (!shouldIntercept(url)) return;
-
-            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);
-
-        } catch (e) {
-            log('request error: ' + e.message);
-        }
-    });
-
-    // ==================== 响应监听 ====================
-    server.on('response', (req, res) => {
-        try {
-            const url = req.fullUrl || req.url;
-            if (!shouldIntercept(url)) return;
-
-            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);
-
-        } catch (e) {
-            log('response error: ' + e.message);
+    console.log('>>> plugin loaded');
+    // server.on('request', (req, res) => {
+    //     console.log('>>> takeover:', req.fullUrl);
+    //     // 直接用
+    // });
+    return {
+        request: (req, res,next) => {
+            console.log('>>> takeover:', req.fullUrl);
+            return next();
         }
-    });
+    };
 };

package/package.json

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