whistle 2.10.4 → 2.10.6

package/assets/menu.html

@@ -200,7 +200,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

package/assets/modal.html

@@ -23,7 +23,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

package/assets/tab.html

@@ -292,7 +292,6 @@
         whistleBridge.compose = options.compose;
         whistleBridge.composeInterrupt = options.createComposeInterrupt();
         whistleBridge.getWhistleId = options.getWhistleId;
-        whistleBridge.hasWhistleToken = options.hasWhistleToken;
         whistleBridge.decodeBase64 = options.decodeBase64;
         whistleBridge.joinBase64 = options.joinBase64;
         whistleBridge.getReqId = options.getReqId;

package/bin/util.js

@@ -185,15 +185,15 @@ exports.getDefaultPort = function () {
 };
 
 exports.getBody = function (res, callback) {
-  var resBody;
+  var resBody = [];
   res.on('data', function(data) {
-    resBody = resBody ? Buffer.concat([resBody, data]) : data;
+    resBody.push(data);
   });
   res.on('end', function() {
     if (res.statusCode != 200) {
       callback('Bad response (' + res.statusCode + ')');
     } else {
-      callback(null, JSON.parse(resBody + ''));
+      callback(null, JSON.parse(Buffer.concat(resBody).toString()));
     }
   });
 };

package/biz/webui/cgi-bin/get-session.js

@@ -13,7 +13,8 @@ module.exports = function(req, res) {
   var reqList = parseArray(req.query.reqList);
   var resList = parseArray(req.query.resList);
   var result = {};
-  reqList.concat(resList).forEach(function(id) {
+  var isReq;
+  var appendResult = function(id) {
     if (result[id] != null) {
       return;
     }
@@ -22,9 +23,12 @@ module.exports = function(req, res) {
       result[id] = 0;
       return;
     }
-    if ((item.requestTime && reqList.indexOf(id) !== -1) || item.endTime) {
+    if ((item.requestTime && isReq) || item.endTime) {
       result[id] = item;
     }
-  });
+  };
+  resList.forEach(appendResult);
+  isReq = true;
+  reqList.forEach(appendResult);
   res.json(result);
 };

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

@@ -27,7 +27,6 @@ exports.getServerInfo = function(req) {
   var info = {
     whistleId: config.whistleId,
     hasUpdater: config.hasUpdater,
-    hasWhistleToken: config.hasWhistleToken,
     pid: PID,
     pInfo: proc,
     verbatim: config.verbatim,
@@ -72,47 +71,58 @@ exports.getServerInfo = function(req) {
     ipv6: [],
     mac: req.ip + (config.storage ? '\n' + config.storage : '')
   };
-  var ifaces = util.networkInterfaces();
-  Object.keys(ifaces).forEach(function(ifname) {
-    ifaces[ifname].forEach(function (iface) {
-      if (iface.internal) {
-        return;
-      }
-      info[iface.family == 'IPv4' || iface.family === 4 ? 'ipv4' : 'ipv6'].push(iface.address);
-    });
-  });
-
+  var serverInfo = util.getServerInfo();
+  info.ipv4 = serverInfo.ipv4;
+  info.ipv6 = serverInfo.ipv6;
   return info;
 };
 
 var DATA_RE = /[\r\n]\s*(\{[\s\S]*\})[\r\n]/;
 var REPLACE_RE = /[\r\n]1[\r\n]/;
+var EXCEED_SIZE_ERR = new Error('The file size can not exceed 6MB');
+var INVALID_CONTENT_ERR = new Error('The file content is not a JSON object');
+
 exports.getReqData = function(req, callback) {
-  var result = '';
+  var result = [];
+  var len = 0;
+  var done;
+  var handleCb = function(err, data) {
+    if (!done) {
+      done = true;
+      callback(err, data);
+      result = null;
+    }
+  };
   req.on('data', function(chunk) {
-    result = result ? Buffer.concat([result, chunk]) : chunk;
-    if (result.length > MAX_OBJECT_SIZE) {
-      req.removeAllListeners('data');
-      callback(new Error('The file size can not exceed 6MB'));
+    if (done) {
+      return;
+    }
+    len += chunk.length;
+    result.push(chunk);
+    if (len > MAX_OBJECT_SIZE) {
+      handleCb(EXCEED_SIZE_ERR);
     }
   });
-  req.on('error', callback);
+  req.on('error', handleCb);
   req.on('end', function() {
-    result += '';
+    if (done) {
+      return;
+    }
     var data;
+    result = Buffer.concat(result).toString();
     result = result.replace(DATA_RE, function(all, match) {
       data = match;
       return '';
     });
     if (!data) {
-      return callback(new Error('The file content is not a JSON object'));
+      return handleCb(INVALID_CONTENT_ERR);
     }
     try {
       data = JSON.parse(data);
     } catch(err) {
-      return callback(err);
+      return handleCb(err);
     }
-    callback(null, {
+    handleCb(null, {
       data: data,
       replace: REPLACE_RE.test(result)
     });

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body>
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.10.4"></script>
+<script src="js/index.js?v=2.10.6"></script>
 </body>
 </html>