whistle.pastekitlab 1.8.2 → 1.8.4

package/index.js

@@ -86,6 +86,41 @@ function shouldIntercept(url) {
     }
 }
 
+// ==================== 资源类型过滤 ====================
+function isResourceRequest(url, headers = {}) {
+    // 检查文件扩展名
+    const resourceExtensions = [
+        '.jpg', '.jpeg', '.png', '.gif', '.svg', '.webp', '.ico', // 图片
+        '.css', '.scss', '.less', // 样式
+        '.js', '.mjs', '.ts', // 脚本
+        '.woff', '.woff2', '.ttf', '.eot', '.otf', // 字体
+        '.mp3', '.mp4', '.avi', '.mov', '.wmv', '.flv', // 视频
+        '.pdf', '.zip', '.rar', '.7z', '.tar', '.gz' // 文档和压缩
+    ];
+    
+    const urlLower = url.toLowerCase();
+    if (resourceExtensions.some(ext => urlLower.includes(ext))) {
+        return true;
+    }
+    
+    // 检查 Content-Type（如果有）
+    const contentType = headers['content-type'] || '';
+    const resourceTypes = [
+        'image/',
+        'text/css',
+        'application/javascript',
+        'font/',
+        'video/',
+        'audio/'
+    ];
+    
+    if (resourceTypes.some(type => contentType.includes(type))) {
+        return true;
+    }
+    
+    return false;
+}
+
 // ==================== WebSocket ====================
 function startWebSocketServer() {
     if (wss) return;
@@ -152,13 +187,13 @@ async function forwardRequest(req, res, url) {
             reqBody += chunk;
         }
 
-        // 通过 axios 转发请求（使用 arraybuffer）
+        // 通过 axios 转发请求（使用 stream）
         const response = await axios({
             method: req.method.toLowerCase(),
             url: url,
             headers: req.headers,
             data: reqBody || undefined,
-            responseType: 'arraybuffer',
+            responseType: 'stream',
             validateStatus: () => true
         });
 
@@ -168,8 +203,9 @@ async function forwardRequest(req, res, url) {
             res.setHeader(key, response.headers[key]);
         });
 
-        // 直接返回完整的 Buffer
-        res.end(Buffer.from(response.data));
+        // 直接 pipe 流到响应
+        response.data.pipe(res);
+        
         log(`直接转发: ${req.method} ${url} -> ${response.status}`);
 
     } catch (error) {
@@ -189,6 +225,12 @@ module.exports = (server, options) => {
             const url = req.fullUrl || req.url;
             console.log('>>> [GLOBAL]', url);
 
+            // 过滤资源类请求（图片、CSS、JS等）
+            if (isResourceRequest(url, req.headers)) {
+                log(`跳过资源请求: ${url}`);
+                return forwardRequest(req, res, url);
+            }
+
             // 域名过滤：如果不匹配则直接放行，不转发也不通知
             if (!shouldIntercept(url)) {
                 log(`跳过未配置的域名: ${url}`);
@@ -217,15 +259,15 @@ module.exports = (server, options) => {
             broadcast('REQUEST', requestData);
             log(`REQ ${req.method} ${url}`);
 
-            // 通过 axios 转发请求（使用 arraybuffer 接收二进制数据）
+            // 通过 axios 转发请求（使用 stream 模式，支持大文件）
             const startTime = Date.now();
             const response = await axios({
                 method: req.method.toLowerCase(),
                 url: url,
                 headers: req.headers,
                 data: reqBody || undefined,
-                responseType: 'arraybuffer', // 关键：以 ArrayBuffer 接收，保留完整数据
-                validateStatus: () => true // 不抛出 HTTP 错误
+                responseType: 'stream', // 使用流式传输，不占用大量内存
+                validateStatus: () => true
             });
             const duration = Date.now() - startTime;
 
@@ -235,25 +277,47 @@ module.exports = (server, options) => {
                 res.setHeader(key, response.headers[key]);
             });
 
-            // 转换响应数据为 Buffer
-            const responseBody = Buffer.from(response.data);
-
-            // 直接返回完整的 Buffer（不会截断）
-            res.end(responseBody);
+            // 直接 pipe 流到响应（不会截断，支持任意大小）
+            response.data.pipe(res);
+
+            // 收集响应数据用于 WebSocket 通知（限制大小）
+            let responseDataBuffer = Buffer.alloc(0);
+            const originalPipe = response.data.pipe.bind(response.data);
+            
+            response.data.on('data', (chunk) => {
+                // 只收集前 1MB 用于通知
+                if (responseDataBuffer.length < 1024 * 1024) {
+                    const remaining = 1024 * 1024 - responseDataBuffer.length;
+                    const toCollect = chunk.slice(0, remaining);
+                    responseDataBuffer = Buffer.concat([responseDataBuffer, toCollect]);
+                }
+            });
 
-            // 构建响应数据
-            const responseData = {
-                ...requestData,
-                statusCode: response.status,
-                responseHeaders: {...response.headers},
-                responseBody: truncateString(bufferToString(responseBody)),
-                responseBodyBase64: responseBody.toString('base64'),
-                duration
-            };
+            response.data.on('end', () => {
+                // 构建响应数据
+                const responseData = {
+                    ...requestData,
+                    statusCode: response.status,
+                    responseHeaders: {...response.headers},
+                    responseBody: truncateString(bufferToString(responseDataBuffer)),
+                    responseBodyBase64: responseDataBuffer.toString('base64'),
+                    duration
+                };
+
+                // 通知 Chrome 插件：响应完成
+                broadcast('RESPONSE', responseData);
+                log(`转发成功: ${req.method} ${url} -> ${response.status} (${duration}ms)`);
+            });
 
-            // 通知 Chrome 插件：响应完成
-            broadcast('RESPONSE', responseData);
-            log(`转发成功: ${req.method} ${url} -> ${response.status} (${duration}ms)`);
+            response.data.on('error', (error) => {
+                log(`流错误: ${error.message}`);
+                broadcast('ERROR', {
+                    url,
+                    method: req.method,
+                    error: error.message,
+                    timestamp: Date.now()
+                });
+            });
 
         } catch (error) {
             log(`转发失败: ${error.message}`);

package/package.json

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