whistle 2.9.5 → 2.9.8

package/bin/plugin.js

@@ -7,19 +7,22 @@ var getWhistlePath = require('../lib/util/common').getWhistlePath;
 
 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 REMOTE_URL_RE = /^\s*((?:git[+@]|github:|https?:\/\/)[^\s]+\/whistle\.[a-z\d_-]+(?:\.git)?)\s*$/i;
 
 function getInstallPath(name, dir) {
   return path.join(dir || CUSTOM_PLUGIN_PATH, name);
 }
 
-function getPlugins(argv) {
+function getPlugins(argv, isInstall) {
   return argv.filter(function(name) {
-    return WHISTLE_PLUGIN_RE.test(name);
+    if (WHISTLE_PLUGIN_RE.test(name)) {
+      return true;
+    }
+    return isInstall && REMOTE_URL_RE.test(name);
   });
 }
 
@@ -29,11 +32,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 +57,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 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 +89,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 +98,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 +151,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 +169,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 +182,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 +201,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/use.js

@@ -10,7 +10,7 @@ var error = util.error;
 var warn = util.warn;
 var info = util.info;
 var readConfig = util.readConfig;
-var MAX_RULES_LEN = 1024 * 16;
+var MAX_RULES_LEN = 1024 * 256;
 var DEFAULT_OPTIONS = { host: '127.0.0.1', port: 8899 };
 var options;
 
@@ -142,7 +142,7 @@ module.exports = function(filepath, storage, force) {
         }
         var rules = getString(result.rules);
         if (rules.length > MAX_RULES_LEN) {
-          error('The rules cannot be empty and the size cannot exceed 16k.');
+          error('The rules cannot be empty and the size cannot exceed 256k.');
           return;
         }
         var setRules = function() {

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