whistle 2.9.7 → 2.9.10

package/assets/menu.html

@@ -170,6 +170,9 @@
         whistleBridge.getServerInfo = options.getServerInfo;
         whistleBridge.alert = options.alert;
         whistleBridge.confirm = options.confirm;
+        whistleBridge.syncData = options.syncData;
+        whistleBridge.syncRules = options.syncRules;
+        whistleBridge.syncValues = options.syncValues;
       };
       window.parent.onPluginContextMenuReady(window);
     } catch (e) {}

package/assets/tab.html

@@ -296,7 +296,10 @@
         whistleBridge.getServerInfo = options.getServerInfo;
         whistleBridge.alert = options.alert;
         whistleBridge.confirm = options.confirm;
-      });
+        whistleBridge.syncData = options.syncData;
+        whistleBridge.syncRules = options.syncRules;
+        whistleBridge.syncValues = options.syncValues;
+      }, window);
     } catch (e) {}
     window.whistleBridge = whistleBridge;
   })();

package/bin/plugin.js

@@ -3,23 +3,31 @@ var cp = require('child_process');
 var fs = require('fs');
 var path = require('path');
 var fse = require('fs-extra2');
-var getWhistlePath = require('../lib/util/common').getWhistlePath;
+var getHash = require('./util').getHash;
+var commonUtil = require('../lib/util/common');
 
+var getWhistlePath = commonUtil.getWhistlePath;
+var REMOTE_URL_RE = commonUtil.REMOTE_URL_RE;
 var CMD_SUFFIX = process.platform === 'win32' ? '.cmd' : '';
-var WHISTLE_PLUGIN_RE = /^((?:@[\w-]+\/)?whistle\.[a-z\d_-]+)(?:\@([\w.^~*-]*))?$/;
-var PLUGIN_PATH = path.join(getWhistlePath(), 'plugins');
 var CUSTOM_PLUGIN_PATH = path.join(getWhistlePath(), 'custom_plugins');
 var PACKAGE_JSON = '{"repository":"https://github.com/avwo/whistle","license":"MIT"}';
 var LICENSE = 'Copyright (c) 2019 avwo';
 var RESP_URL = 'https://github.com/avwo/whistle';
+var WHISTLE_PLUGIN_RE = /^((?:@[\w-]+\/)?whistle\.[a-z\d_-]+)(?:\@([\w.^~*-]*))?$/;
 
 function getInstallPath(name, dir) {
   return path.join(dir || CUSTOM_PLUGIN_PATH, name);
 }
 
-function getPlugins(argv) {
-  return argv.filter(function(name) {
-    return WHISTLE_PLUGIN_RE.test(name);
+function getPlugins(argv, isInstall) {
+  return argv.filter(function(name, i) {
+    if (WHISTLE_PLUGIN_RE.test(name)) {
+      return true;
+    }
+    if (argv[i - 1] === '--registry') {
+      return false;
+    }
+    return isInstall && REMOTE_URL_RE.test(name);
   });
 }
 
@@ -29,11 +37,6 @@ function removeDir(installPath) {
   }
 }
 
-function removeOldPlugin(name) {
-  removeDir(path.join(PLUGIN_PATH, 'node_modules', name));
-  removeDir(path.join(PLUGIN_PATH, 'node_modules', getTempName(name)));
-}
-
 function getTempName(name) {
   if (name.indexOf('/') === -1) {
     return '.' + name;
@@ -59,11 +62,28 @@ function getInstallDir(argv) {
   return result;
 }
 
+function getPluginNameFormDeps(deps) {
+  var keys = Object.keys(deps);
+  for (var i = 0, len = keys.length; i < len; i++) {
+    if (WHISTLE_PLUGIN_RE.test(keys[i])) {
+      return RegExp.$1;
+    }
+  }
+}
+
+function getPkgName(name) {
+  if (/[/\\](whistle\.[a-z\d_-]+)(?:\.git)?$/.test(name)) {
+    return RegExp.$1;
+  }
+  return getHash(name);
+}
+
 function install(cmd, name, argv, ver, pluginsCache, callback) {
-  argv = argv.slice();
-  var result = getInstallDir(argv);
+  var result = getInstallDir(argv.slice());
+  var isPkg = WHISTLE_PLUGIN_RE.test(name);
+  var pkgName = isPkg ? name : getPkgName(name);
+  var installPath = getInstallPath(getTempName(pkgName), result.dir);
   argv = result.argv;
-  var installPath = getInstallPath(getTempName(name), result.dir);
   fse.ensureDirSync(installPath);
   fse.emptyDirSync(installPath);
   var pkgJson = PACKAGE_JSON;
@@ -74,7 +94,7 @@ function install(cmd, name, argv, ver, pluginsCache, callback) {
   fs.writeFileSync(path.join(installPath, 'LICENSE'), LICENSE);
   fs.writeFileSync(path.join(installPath, 'README.md'), RESP_URL);
   argv.unshift('install', name);
-  pluginsCache[name] = 1;
+  pluginsCache[pkgName] = 1;
   cp.spawn(cmd, argv, {
     stdio: 'inherit',
     cwd: installPath
@@ -83,11 +103,22 @@ function install(cmd, name, argv, ver, pluginsCache, callback) {
       removeDir(installPath);
       callback();
     } else {
+      if (!isPkg) {
+        var deps = fse.readJsonSync(path.join(installPath, 'package.json')).dependencies;
+        name = deps && getPluginNameFormDeps(deps);
+      }
+      if (!name) {
+        try {
+          removeDir(installPath);
+        } catch (e) {}
+        return callback();
+      }
       var realPath = getInstallPath(name, result.dir);
       removeDir(realPath);
       try {
         fs.renameSync(installPath, realPath);
       } catch (e) {
+        fse.ensureDirSync(realPath);
         fse.copySync(installPath, realPath);
         try {
           removeDir(installPath);
@@ -125,7 +156,8 @@ function installPlugins(cmd, plugins, argv, pluginsCache, deep) {
       var list = pkg.whistleConfig && (pkg.whistleConfig.peerPluginList || pkg.whistleConfig.peerPlugins);
       if (Array.isArray(list) && list.length < 16) {
         list.forEach(function(name) {
-          if (typeof name === 'string' && WHISTLE_PLUGIN_RE.test(name.trim())) {
+          name = typeof name === 'string' ? name.trim() : null;
+          if (name && (WHISTLE_PLUGIN_RE.test(name) || REMOTE_URL_RE.test(name))) {
             name = RegExp.$1;
             if (peerPlugins.indexOf(name) === -1) {
               peerPlugins.push(name);
@@ -142,11 +174,11 @@ function installPlugins(cmd, plugins, argv, pluginsCache, deep) {
     }
   };
   plugins.forEach(function(name) {
-    if (WHISTLE_PLUGIN_RE.test(name)) {
+    var isPkg = WHISTLE_PLUGIN_RE.test(name);
+    if (isPkg || REMOTE_URL_RE.test(name)) {
       ++count;
       name = RegExp.$1;
       var ver = RegExp.$2;
-      removeOldPlugin(name);
       install(cmd, name, argv, ver, pluginsCache, callback);
     }
   });
@@ -155,7 +187,7 @@ function installPlugins(cmd, plugins, argv, pluginsCache, deep) {
 exports.getWhistlePath = getWhistlePath;
 
 exports.install = function(cmd, argv) {
-  var plugins = getPlugins(argv);
+  var plugins = getPlugins(argv, true);
   if (!plugins.length) {
     return;
   }
@@ -174,7 +206,6 @@ exports.uninstall = function(plugins) {
   getPlugins(plugins).forEach(function(name) {
     if (WHISTLE_PLUGIN_RE.test(name)) {
       name = RegExp.$1;
-      !result.dir && removeOldPlugin(name);
       removeDir(getInstallPath(name, result.dir));
     }
   });

package/bin/util.js

@@ -6,6 +6,7 @@ var fse = require('fs-extra2');
 var config = require('../lib/config');
 var colors = require('colors/safe');
 var path = require('path');
+var createHmac = require('crypto').createHmac;
 /*eslint no-console: "off"*/
 var CHECK_RUNNING_CMD = process.platform === 'win32' ? 
   'tasklist /fi "PID eq %s" | findstr /i "node.exe"'
@@ -26,7 +27,7 @@ function getIpList() {
   var ifaces = os.networkInterfaces();
   Object.keys(ifaces).forEach(function(ifname) {
     ifaces[ifname].forEach(function (iface) {
-      if (iface.family == 'IPv4') {
+      if (iface.family == 'IPv4' || iface.family === 4) {
         ipList.push(iface.address);
       }
     });
@@ -141,4 +142,8 @@ function readConfigList() {
 }
 
 exports.readConfig = readConfig;
-exports.readConfigList = readConfigList;
+exports.readConfigList = readConfigList;
+exports.getHash = function(str) {
+  var hmac = createHmac('sha256', 'a secret');
+  return hmac.update(str).digest('hex');
+};

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

@@ -65,7 +65,7 @@ exports.getServerInfo = function(req) {
       if (iface.internal) {
         return;
       }
-      info[iface.family == 'IPv4' ? 'ipv4' : 'ipv6'].push(iface.address);
+      info[iface.family == 'IPv4' || iface.family === 4 ? 'ipv4' : 'ipv6'].push(iface.address);
     });
   });
 

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