whistle 2.9.100 → 2.9.101

package/README-en_US.md

@@ -9,7 +9,7 @@
 [![node version](https://img.shields.io/badge/node.js-%3E=_8-green.svg?style=flat-square)](http://nodejs.org/download/)
 [![npm download](https://img.shields.io/npm/dm/whistle.svg?style=flat-square)](https://npmjs.org/package/whistle)
 [![NPM count](https://img.shields.io/npm/dt/whistle.svg?style=flat-square)](https://www.npmjs.com/package/whistle)
-[![License](https://img.shields.io/aur/license/whistle?style=flat-square)](https://www.npmjs.com/package/whistle)
+[![License](https://img.shields.io/github/license/avwo/whistle?style=flat-square)](https://www.npmjs.com/package/whistle)
 
 [中文](./README.md) · English
 

package/README.md

@@ -10,7 +10,7 @@
 [![node version](https://img.shields.io/badge/node.js->=_8-green.svg?style=flat-square)](http://nodejs.org/download/)
 [![npm download](https://img.shields.io/npm/dm/whistle.svg?style=flat-square)](https://npmjs.org/package/whistle)
 [![NPM count](https://img.shields.io/npm/dt/whistle.svg?style=flat-square)](https://www.npmjs.com/package/whistle)
-[![License](https://img.shields.io/aur/license/whistle?style=flat-square)](https://www.npmjs.com/package/whistle)
+[![License](https://img.shields.io/github/license/avwo/whistle?style=flat-square)](https://www.npmjs.com/package/whistle)
 
 中文 · [English](./README-en_US.md)
 

package/assets/menu.html

@@ -195,7 +195,12 @@
         whistleBridge.copyText = options.copyText;
         whistleBridge.pageId = options.pageId;
         whistleBridge.compose = options.compose;
+        whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.joinBase64 = options.joinBase64;
+        whistleBridge.getReqId = options.getReqId;
+        whistleBridge.onComposeData = options.onComposeData;
+        whistleBridge.offComposeData = options.offComposeData;
         whistleBridge.importSessions = options.importSessions;
         whistleBridge.exportSessions = options.exportSessions;
         whistleBridge.importMockData = options.importMockData;

package/assets/modal.html

@@ -18,7 +18,12 @@
         whistleBridge.copyText = options.copyText;
         whistleBridge.pageId = options.pageId;
         whistleBridge.compose = options.compose;
+        whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.joinBase64 = options.joinBase64;
+        whistleBridge.getReqId = options.getReqId;
+        whistleBridge.onComposeData = options.onComposeData;
+        whistleBridge.offComposeData = options.offComposeData;
         whistleBridge.importSessions = options.importSessions;
         whistleBridge.exportSessions = options.exportSessions;
         whistleBridge.importMockData = options.importMockData;

package/assets/tab.html

@@ -288,7 +288,12 @@
         whistleBridge.copyText = options.copyText;
         whistleBridge.pageId = options.pageId;
         whistleBridge.compose = options.compose;
+        whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.decodeBase64 = options.decodeBase64;
+        whistleBridge.joinBase64 = options.joinBase64;
+        whistleBridge.getReqId = options.getReqId;
+        whistleBridge.onComposeData = options.onComposeData;
+        whistleBridge.offComposeData = options.offComposeData;
         whistleBridge.importSessions = options.importSessions;
         whistleBridge.exportSessions = options.exportSessions;
         whistleBridge.importMockData = options.importMockData;

package/biz/webui/cgi-bin/compose-data.js

@@ -0,0 +1,50 @@
+var LRU = require('lru-cache');
+
+var cache = new LRU({ max: 100, maxAge: 1000 * 60 });
+var MAX_SIZE = 1024 * 1280;
+
+function getData(reqId) {
+  return cache.get(reqId);
+}
+
+exports = module.exports = function(req, res) {
+  var ids = req.query.ids;
+  var result = {};
+  ids = ids && typeof ids === 'string' ? ids.split(',') : ids;
+  if (!ids) {
+    return res.json(result);
+  }
+  ids.forEach(function(reqId) {
+    var curBuf = getData(reqId);
+    if (curBuf) {
+      if (curBuf._hasW2End) {
+        cache.del(reqId);
+      } else {
+        cache.set(reqId, '');
+      }
+    }
+    result[reqId] = curBuf ? curBuf.toString('base64') : curBuf;
+  });
+  res.json(result);
+};
+
+exports.setData = function(reqId, buffer, init) {
+  var curBuf = cache.get(reqId);
+  if (!init && curBuf == null) {
+    return false;
+  }
+  if (curBuf) {
+    if (buffer && curBuf.length < MAX_SIZE) {
+      cache.set(reqId, Buffer.concat([curBuf, buffer]));
+    }
+  } else {
+    cache.set(reqId, buffer || '');
+  }
+  return true;
+};
+
+exports.getData = getData;
+
+exports.removeData = function(reqId) {
+  cache.del(reqId);
+};

package/biz/webui/cgi-bin/composer.js

@@ -7,17 +7,17 @@ var extend = require('extend');
 var common = require('../../../lib/util/common');
 var config = require('../../../lib/config');
 var util = require('../../../lib/util');
-var zlib = require('../../../lib/util/zlib');
 var properties = require('../../../lib/rules/util').properties;
 var getSender = require('ws-parser').getSender;
 var hparser = require('hparser');
+var composeData = require('./compose-data');
 var sendGzip = require('./util').sendGzip;
 
 var formatHeaders = hparser.formatHeaders;
 var getRawHeaders = hparser.getRawHeaders;
 var getRawHeaderNames = hparser.getRawHeaderNames;
 var parseReq = hparser.parse;
-var MAX_LENGTH = 1024 * 512;
+var MAX_LENGTH = 1024 * 2048;
 var MAX_REQ_COUNT = 100;
 var TLS_PROTOS = 'https:,wss:,tls:'.split(',');
 var PROXY_OPTS = {
@@ -155,8 +155,7 @@ function handleWebSocket(options, cb, count) {
           }
           execCb && execCb(null, {
             statusCode: statusCode,
-            headers: socket.headers || {},
-            body: socket.body || ''
+            headers: socket.headers || {}
           });
         }, true);
       }
@@ -164,7 +163,7 @@ function handleWebSocket(options, cb, count) {
   }
 }
 
-function handleHttp(options, cb, count) {
+function handleHttp(options, cb, count, reqId) {
   count = getReqCount(count);
   if (options.protocol === 'https:') {
     options.headers[config.HTTPS_FIELD] = 1;
@@ -182,42 +181,77 @@ function handleHttp(options, cb, count) {
     } else {
       options = extend({}, origOpts);
     }
-    var client = http.request(options, function(res) {
-      if (execCb) {
-        res.on('error', execCb);
-        var buffer;
-        res.on('data', function(data) {
-          if (buffer !== null) {
-            buffer = buffer ? Buffer.concat([buffer, data]) : data;
-            if (buffer.length > MAX_LENGTH) {
-              buffer = null;
-            }
+    var client = http.request(options, function(svrRes) {
+      if (!execCb) {
+        return drain(svrRes);
+      }
+      svrRes.on('error', execCb);
+      var buffer;
+      var enableStream;
+      var unzipStream = util.getUnzipStream(svrRes.headers);
+      var timer = reqId && setTimeout(function() {
+        composeData.setData(reqId, buffer, true);
+        enableStream = true;
+        timer = buffer = undefined;
+        handleResponse();
+        util.onResEnd(svrRes, function() {
+          var buf = composeData.getData(reqId);
+          if (buf) {
+            buf._hasW2End = true;
+          } else {
+            composeData.removeData(reqId);
           }
         });
-        res.on('end', function() {
-          zlib.unzip(res.headers['content-encoding'], buffer, function(err, body) {
-            var headers = res.headers;
-            if (typeof headers.trailer === 'string' && headers.trailer.indexOf(',') !== -1) {
-              headers.trailer = headers.trailer.split(',');
-            }
-            var result = {
-              statusCode: res.statusCode,
-              headers: headers,
-              trailers: res.trailers,
-              rawHeaderNames: getRawHeaderNames(res.rawHeaders),
-              rawTrailerNames: getRawHeaderNames(res.rawTrailers)
-            };
-            if (err) {
-              result.body = err.stack;
-            } else if (body) {
-              result.base64 = body.toString('base64');
-            }
-            execCb(null, result);
-          });
+      }, 3000);
+      var handleResponse = function() {
+        if (buffer === null) {
+          return;
+        }
+        timer && clearTimeout(timer);
+        var headers = svrRes.headers;
+        if (typeof headers.trailer === 'string' && headers.trailer.indexOf(',') !== -1) {
+          headers.trailer = headers.trailer.split(',');
+        }
+        var result = {
+          statusCode: svrRes.statusCode,
+          headers: headers,
+          trailers: svrRes.trailers,
+          rawHeaderNames: getRawHeaderNames(svrRes.rawHeaders),
+          rawTrailerNames: getRawHeaderNames(svrRes.rawTrailers),
+          reqId: timer ? undefined : reqId
+        };
+        result.base64 = buffer && buffer.toString('base64');
+        execCb(null, result);
+        buffer = null;
+      };
+      if (unzipStream) {
+        unzipStream.on('error', function(err) {
+          drain(svrRes);
+          execCb(err);
         });
+        svrRes.pipe(unzipStream);
       } else {
-        drain(res);
+        unzipStream = svrRes;
       }
+      unzipStream.on('data', function(data) {
+        if (enableStream) {
+          if (!composeData.setData(reqId, data)) {
+            enableStream = false;
+            drain(svrRes);
+            svrRes.unpipe(unzipStream);
+          }
+        } else if (buffer !== null) {
+          buffer = buffer ? Buffer.concat([buffer, data]) : data;
+          if (buffer.length > MAX_LENGTH) {
+            handleResponse();
+            if (unzipStream !== svrRes) {
+              drain(svrRes);
+              svrRes.unpipe(unzipStream);
+            }
+          }
+        }
+      });
+      unzipStream.on('end', handleResponse);
     });
     client.on('error', execCb || util.noop);
     client.end(options.body);
@@ -356,7 +390,7 @@ module.exports = function(req, res) {
     } else if (isConn) {
       handleConnect(options, handleResponse, count);
     } else  {
-      handleHttp(options, handleResponse, count);
+      handleHttp(options, handleResponse, count, req.body.reqId);
     }
     if (!handleResponse) {
       res.json({ec: 0, em: 'success'});

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.9.100"></script>
+<script src="js/index.js?v=2.9.101"></script>
 </body>
 </html>