whistle 2.9.108 → 2.10.0

package/bin/util.js

@@ -121,7 +121,7 @@ function showUsage(isRunning, options, restart) {
 exports.showUsage = showUsage;
 
 function getDataDir() {
-  return path.resolve(config.getHomedir(), '.startingAppData');
+  return path.resolve(common.getHomedir(), '.startingAppData');
 }
 
 function formatOptions(options) {

package/biz/index.js

@@ -4,6 +4,7 @@ var util = require('../lib/util');
 var handleUIReq = require('./webui/lib').handleRequest;
 var handleWeinreReq = require('./weinre');
 var config = require('../lib/config');
+var common = require('../lib/util/common');
 
 var localIpCache = util.localIpCache;
 var WEBUI_PATH = config.WEBUI_PATH;
@@ -31,7 +32,8 @@ module.exports = function(req, res, next) {
   var config = this.config;
   var pluginMgr = this.pluginMgr;
   var fullUrl = req.fullUrl = util.getFullUrl(req); // format request
-  var host = util.parseHost(req.headers.host);
+  var headers = req.headers;
+  var host = util.parseHost(headers.host);
   var port = host[1] || (req.isHttps ? 443 : 80);
   var bypass;
   host = host[0];
@@ -59,12 +61,12 @@ module.exports = function(req, res, next) {
         var realPath = RegExp.$1;
         var realPort = RegExp.$3;
         realHost = RegExp.$2 + (realPort ? ':' + realPort : '');
-        req.headers[config.REAL_HOST_HEADER] = realHost;
+        headers[util.REAL_HOST_HEADER] = realHost;
         req.url = req.url.replace(realPath, '');
       } else {
         req.curUrl = fullUrl;
         if (realHost = rules.resolveInternalHost(req)) {
-          req.headers[config.REAL_HOST_HEADER] = realHost;
+          headers[util.REAL_HOST_HEADER] = realHost;
         }
       }
       if (internalAppRe.test(req.path)) {
@@ -79,7 +81,7 @@ module.exports = function(req, res, next) {
         isProxyReq = isProxyReq || isOld;
       } else if (pluginRe.test(req.path)) {
         isProxyReq = !pluginMgr.getPlugin(RegExp.$1 + ':');
-      } else if (!req.headers[config.WEBUI_HEAD]) {
+      } else if (!headers[config.WEBUI_HEAD]) {
         isWebUI = false;
       }
       if (!config.proxyServer && isProxyReq && !config.isLocalUIUrl(host)) {
@@ -90,11 +92,11 @@ module.exports = function(req, res, next) {
       if (isWebUI) {
         req.fromInternalPath = true;
         var hostname = (req._fwdHost && util.parseHost(req._fwdHost)[0]) || host;
-        req.headers['x-whistle-origin-host'] = hostname || '*';
+        headers[common.ORIGIN_HOST_HEADER] = hostname || '*';
       }
     }
   } else {
-    isWebUI = req.headers[config.WEBUI_HEAD];
+    isWebUI = headers[config.WEBUI_HEAD];
     if (!isWebUI) {
       if (!(isWebUI = localIpCache.get(host))) {
         isWebUI = config.isLocalUIUrl(host);
@@ -106,7 +108,7 @@ module.exports = function(req, res, next) {
       localIpCache.set(host, 1);
     }
     if (PREVIEW_PATH_RE.test(req.url)) {
-      req.headers[config.INTERNAL_ID_HEADER] = config.INTERNAL_ID;
+      headers[util.INTERNAL_ID_HEADER] = util.INTERNAL_ID;
       req.url = '/preview.html?charset=' + RegExp.$1;
       isWebUI = true;
     } else if (isWebUI) {
@@ -118,7 +120,7 @@ module.exports = function(req, res, next) {
       if (bypass) {
         req.url = req.url.replace(bypass, '/');
       }
-      delete req.headers[config.INTERNAL_ID_HEADER];
+      delete headers[util.INTERNAL_ID_HEADER];
     }
   }
   // 后续有用到
@@ -137,7 +139,7 @@ module.exports = function(req, res, next) {
         var outerPort = RegExp.$2;
         req.url = req.url.replace(RegExp['$&'], '/' + RegExp.$1 + '/');
         if (outerPort > 0 && outerPort < 65536 && outerPort != config.port) {
-          req.headers.host = '127.0.0.1:' + outerPort;
+          headers.host = '127.0.0.1:' + outerPort;
           return util.transformReq(req, res, outerPort);
         }
       }
@@ -151,7 +153,7 @@ module.exports = function(req, res, next) {
   } else if (localRule = rules.resolveLocalRule(req)) {
     req.url = localRule.url;
     if (localRule.realPort) {
-      req.headers.host = '127.0.0.1:' + localRule.realPort;
+      headers.host = '127.0.0.1:' + localRule.realPort;
       util.transformReq(req, res, localRule.realPort);
     } else {
       transformUI(req, res);

package/biz/webui/cgi-bin/certs/active.js

@@ -0,0 +1,6 @@
+var ca = require('../../../../lib/https/ca');
+
+module.exports = function(req, res) {
+  ca.setActiveCert(req.body);
+  res.json(ca.getCustomCertsFiles());
+};

package/biz/webui/cgi-bin/certs/remove.js

@@ -1,6 +1,5 @@
 var ca = require('../../../../lib/https/ca');
 
-
 module.exports = function(req, res) {
   ca.removeCert(req.body);
   var isparsed = req.query.dataType === 'parsed';

package/biz/webui/cgi-bin/certs/upload.js

@@ -1,6 +1,5 @@
 var ca = require('../../../../lib/https/ca');
 
-
 module.exports = function(req, res) {
   ca.uploadCerts(req.body);
   var isparsed = req.query.dataType === 'parsed';

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

@@ -2,6 +2,7 @@ var util = require('../../../lib/util');
 var config = require('../../../lib/config');
 var proc = require('../../../lib/util/process');
 var rulesUtil = require('../../../lib/rules/util');
+var padLeft = require('../../../lib/util/common').padLeft;
 
 var properties = rulesUtil.properties;
 var rules = rulesUtil.rules;
@@ -118,30 +119,16 @@ exports.getReqData = function(req, callback) {
   });
 };
 
-function padding(num) {
-  return num < 10 ? '0' + num : num;
-}
-
-function paddingMS(ms) {
-  if (ms > 99) {
-    return ms;
-  }
-  if (ms > 9) {
-    return '0' + ms;
-  }
-  return '00' + ms;
-}
-
 function formatDate() {
   var date = new Date();
   var result = [];
   result.push(date.getFullYear());
-  result.push(padding(date.getMonth() + 1));
-  result.push(padding(date.getDate()));
-  result.push(padding(date.getHours()));
-  result.push(padding(date.getMinutes()));
-  result.push(padding(date.getSeconds()));
-  result.push(paddingMS(date.getMilliseconds()));
+  result.push(padLeft(date.getMonth() + 1));
+  result.push(padLeft(date.getDate()));
+  result.push(padLeft(date.getHours()));
+  result.push(padLeft(date.getMinutes()));
+  result.push(padLeft(date.getSeconds()));
+  result.push(padLeft(date.getMilliseconds(), 3));
   return result.join('');
 }
 

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.108"></script>
+<script src="js/index.js?v=2.10.0"></script>
 </body>
 </html>