whistle 2.9.2-beta → 2.9.4

package/bin/plugin.d.ts

@@ -0,0 +1,6 @@
+
+export function getWhistlePath(): string;
+
+export function install(cmd: string, argv: string[]): void;
+
+export  function uninstall(argv: string[]): void;

package/bin/plugin.js

@@ -3,9 +3,10 @@ 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 CMD_SUFFIX = process.platform === 'win32' ? '.cmd' : '';
-var WHISLTE_PLUGIN_RE = /^(@[\w\-]+\/)?whistle\.[a-z\d_\-]+$/;
+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"}';
@@ -16,19 +17,9 @@ function getInstallPath(name, dir) {
   return path.join(dir || CUSTOM_PLUGIN_PATH, name);
 }
 
-function getHomedir() {
-  //默认设置为`~`，防止Linux在开机启动时Node无法获取homedir
-  return (typeof os.homedir == 'function' ? os.homedir() :
-  process.env[process.platform == 'win32' ? 'USERPROFILE' : 'HOME']) || '~';
-}
-
-function getWhistlePath() {
-  return process.env.WHISTLE_PATH || path.join(getHomedir(), '.WhistleAppData');
-}
-
 function getPlugins(argv) {
   return argv.filter(function(name) {
-    return WHISLTE_PLUGIN_RE.test(name);
+    return WHISTLE_PLUGIN_RE.test(name);
   });
 }
 
@@ -54,6 +45,7 @@ function getTempName(name) {
 }
 
 function getInstallDir(argv) {
+  argv = argv.slice();
   var result = { argv: argv };
   for (var i = 0, len = argv.length; i < len; i++) {
     var option = argv[i];
@@ -67,23 +59,29 @@ function getInstallDir(argv) {
   return result;
 }
 
-function install(cmd, name, argv) {
+function install(cmd, name, argv, ver, pluginsCache, callback) {
   argv = argv.slice();
   var result = getInstallDir(argv);
   argv = result.argv;
   var installPath = getInstallPath(getTempName(name), result.dir);
   fse.ensureDirSync(installPath);
   fse.emptyDirSync(installPath);
-  fs.writeFileSync(path.join(installPath, 'package.json'), PACKAGE_JSON);
+  var pkgJson = PACKAGE_JSON;
+  if (ver) {
+    pkgJson = pkgJson.replace(',', ',"dependencies":{"' + name + '":"' + ver + '"},');
+  }
+  fs.writeFileSync(path.join(installPath, 'package.json'), pkgJson);
   fs.writeFileSync(path.join(installPath, 'LICENSE'), LICENSE);
   fs.writeFileSync(path.join(installPath, 'README.md'), RESP_URL);
   argv.unshift('install', name);
+  pluginsCache[name] = 1;
   cp.spawn(cmd, argv, {
     stdio: 'inherit',
     cwd: installPath
-  }).on('exit', function(code) {
+  }).once('exit', function(code) {
     if (code) {
       removeDir(installPath);
+      callback();
     } else {
       var realPath = getInstallPath(name, result.dir);
       removeDir(realPath);
@@ -95,17 +93,67 @@ function install(cmd, name, argv) {
           removeDir(installPath);
         } catch (e) {}
       }
+      var pkgPath = path.join(realPath, 'node_modules', name, 'package.json');
       try {
-        var pkgPath = path.join(realPath, 'node_modules', name, 'package.json');
         if (fs.statSync(pkgPath).mtime.getFullYear() < 2010) {
           var now = new Date();
           fs.utimesSync(pkgPath, now, now);
         }
       } catch (e) {}
+      callback(pkgPath);
+    }
+  });
+}
+
+function readJson(pkgPath) {
+  try {
+    return fse.readJsonSync(pkgPath);
+  } catch (e) {
+    try {
+      return fse.readJsonSync(pkgPath);
+    } catch (e) {}
+  }
+}
+
+function installPlugins(cmd, plugins, argv, pluginsCache, deep) {
+  deep = deep || 0;
+  var count = 0;
+  var peerPlugins = [];
+  var callback = function(pkgPath) {
+    if (pkgPath) {
+      var pkg = readJson(pkgPath) || {};
+      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 = RegExp.$1;
+            if (peerPlugins.indexOf(name) === -1) {
+              peerPlugins.push(name);
+            }
+          }
+        });
+      }
+    }
+    if (--count <= 0 && deep < 16) {
+      peerPlugins = peerPlugins.filter(function(name) {
+        return !pluginsCache[name];
+      });
+      peerPlugins.length && installPlugins(cmd, peerPlugins, argv, pluginsCache, ++deep);
+    }
+  };
+  plugins.forEach(function(name) {
+    if (WHISTLE_PLUGIN_RE.test(name)) {
+      ++count;
+      name = RegExp.$1;
+      var ver = RegExp.$2;
+      removeOldPlugin(name);
+      install(cmd, name, argv, ver, pluginsCache, callback);
     }
   });
 }
 
+exports.getWhistlePath = getWhistlePath;
+
 exports.install = function(cmd, argv) {
   var plugins = getPlugins(argv);
   if (!plugins.length) {
@@ -117,18 +165,18 @@ exports.install = function(cmd, argv) {
   
   cmd += CMD_SUFFIX;
   argv.push('--no-package-lock');
-  plugins.forEach(function(name) {
-    removeOldPlugin(name);
-    install(cmd, name, argv);
-  });
+  installPlugins(cmd, plugins, argv, {});
 };
 
 exports.uninstall = function(plugins) {
   var result = getInstallDir(plugins);
   plugins = result.argv;
   getPlugins(plugins).forEach(function(name) {
-    !result.dir && removeOldPlugin(name);
-    removeDir(getInstallPath(name, result.dir));
+    if (WHISTLE_PLUGIN_RE.test(name)) {
+      name = RegExp.$1;
+      !result.dir && removeOldPlugin(name);
+      removeDir(getInstallPath(name, result.dir));
+    }
   });
 };
 

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