ee-bin 1.3.0-beta.1 → 1.4.0-beta.1

package/index.js

@@ -3,7 +3,20 @@
 const { program } = require('commander');
 
 /**
- * rd - Moves front-end resources to a specified directory
+ * move - Moves resources
+ */
+program
+  .command('move')
+  .description('Move multip resources')
+  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .option('--flag <flag>', 'Custom flag')
+  .action(function() {
+    const moveScript = require('./tools/move');
+    moveScript.run(this.opts());
+  });
+
+/**
+ * (deprecated) rd - Moves front-end resources to a specified directory
  */
 program
   .command('rd')
@@ -70,8 +83,9 @@ program
  */
 program
   .command('build')
-  .description('build frontend dist')
+  .description('building multiple resources')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .option('--cmds <flag>', 'custom commands')
   .action(function() {
     const serve = require('./tools/serve');
     serve.build(this.opts());
@@ -97,7 +111,9 @@ program
   .description('create frontend-serve and electron-serve')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
   .option('--command <command>', 'Custom command')
+  .option('--cmds <flag>', 'custom commands')
   .action(function() {
+    // command 选项是关键字，不再使用，改为 cmds
     const serve = require('./tools/serve');
     serve.exec(this.opts());
   });

package/lib/pargv.js

@@ -0,0 +1,263 @@
+'use strict';
+
+function hasKey(obj, keys) {
+	var o = obj;
+	keys.slice(0, -1).forEach(function (key) {
+		o = o[key] || {};
+	});
+
+	var key = keys[keys.length - 1];
+	return key in o;
+}
+
+function isNumber(x) {
+	if (typeof x === 'number') { return true; }
+	if ((/^0x[0-9a-f]+$/i).test(x)) { return true; }
+	return (/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/).test(x);
+}
+
+function isConstructorOrProto(obj, key) {
+	return (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
+}
+
+module.exports = function (args, opts) {
+	if (!opts) { opts = {}; }
+
+	var flags = {
+		bools: {},
+		strings: {},
+		unknownFn: null,
+	};
+
+	if (typeof opts.unknown === 'function') {
+		flags.unknownFn = opts.unknown;
+	}
+
+	if (typeof opts.boolean === 'boolean' && opts.boolean) {
+		flags.allBools = true;
+	} else {
+		[].concat(opts.boolean).filter(Boolean).forEach(function (key) {
+			flags.bools[key] = true;
+		});
+	}
+
+	var aliases = {};
+
+	function aliasIsBoolean(key) {
+		return aliases[key].some(function (x) {
+			return flags.bools[x];
+		});
+	}
+
+	Object.keys(opts.alias || {}).forEach(function (key) {
+		aliases[key] = [].concat(opts.alias[key]);
+		aliases[key].forEach(function (x) {
+			aliases[x] = [key].concat(aliases[key].filter(function (y) {
+				return x !== y;
+			}));
+		});
+	});
+
+	[].concat(opts.string).filter(Boolean).forEach(function (key) {
+		flags.strings[key] = true;
+		if (aliases[key]) {
+			[].concat(aliases[key]).forEach(function (k) {
+				flags.strings[k] = true;
+			});
+		}
+	});
+
+	var defaults = opts.default || {};
+
+	var argv = { _: [] };
+
+	function argDefined(key, arg) {
+		return (flags.allBools && (/^--[^=]+$/).test(arg))
+			|| flags.strings[key]
+			|| flags.bools[key]
+			|| aliases[key];
+	}
+
+	function setKey(obj, keys, value) {
+		var o = obj;
+		for (var i = 0; i < keys.length - 1; i++) {
+			var key = keys[i];
+			if (isConstructorOrProto(o, key)) { return; }
+			if (o[key] === undefined) { o[key] = {}; }
+			if (
+				o[key] === Object.prototype
+				|| o[key] === Number.prototype
+				|| o[key] === String.prototype
+			) {
+				o[key] = {};
+			}
+			if (o[key] === Array.prototype) { o[key] = []; }
+			o = o[key];
+		}
+
+		var lastKey = keys[keys.length - 1];
+		if (isConstructorOrProto(o, lastKey)) { return; }
+		if (
+			o === Object.prototype
+			|| o === Number.prototype
+			|| o === String.prototype
+		) {
+			o = {};
+		}
+		if (o === Array.prototype) { o = []; }
+		if (o[lastKey] === undefined || flags.bools[lastKey] || typeof o[lastKey] === 'boolean') {
+			o[lastKey] = value;
+		} else if (Array.isArray(o[lastKey])) {
+			o[lastKey].push(value);
+		} else {
+			o[lastKey] = [o[lastKey], value];
+		}
+	}
+
+	function setArg(key, val, arg) {
+		if (arg && flags.unknownFn && !argDefined(key, arg)) {
+			if (flags.unknownFn(arg) === false) { return; }
+		}
+
+		var value = !flags.strings[key] && isNumber(val)
+			? Number(val)
+			: val;
+		setKey(argv, key.split('.'), value);
+
+		(aliases[key] || []).forEach(function (x) {
+			setKey(argv, x.split('.'), value);
+		});
+	}
+
+	Object.keys(flags.bools).forEach(function (key) {
+		setArg(key, defaults[key] === undefined ? false : defaults[key]);
+	});
+
+	var notFlags = [];
+
+	if (args.indexOf('--') !== -1) {
+		notFlags = args.slice(args.indexOf('--') + 1);
+		args = args.slice(0, args.indexOf('--'));
+	}
+
+	for (var i = 0; i < args.length; i++) {
+		var arg = args[i];
+		var key;
+		var next;
+
+		if ((/^--.+=/).test(arg)) {
+			// Using [\s\S] instead of . because js doesn't support the
+			// 'dotall' regex modifier. See:
+			// http://stackoverflow.com/a/1068308/13216
+			var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
+			key = m[1];
+			var value = m[2];
+			if (flags.bools[key]) {
+				value = value !== 'false';
+			}
+			setArg(key, value, arg);
+		} else if ((/^--no-.+/).test(arg)) {
+			key = arg.match(/^--no-(.+)/)[1];
+			setArg(key, false, arg);
+		} else if ((/^--.+/).test(arg)) {
+			key = arg.match(/^--(.+)/)[1];
+			next = args[i + 1];
+			if (
+				next !== undefined
+				&& !(/^(-|--)[^-]/).test(next)
+				&& !flags.bools[key]
+				&& !flags.allBools
+				&& (aliases[key] ? !aliasIsBoolean(key) : true)
+			) {
+				setArg(key, next, arg);
+				i += 1;
+			} else if ((/^(true|false)$/).test(next)) {
+				setArg(key, next === 'true', arg);
+				i += 1;
+			} else {
+				setArg(key, flags.strings[key] ? '' : true, arg);
+			}
+		} else if ((/^-[^-]+/).test(arg)) {
+			var letters = arg.slice(1, -1).split('');
+
+			var broken = false;
+			for (var j = 0; j < letters.length; j++) {
+				next = arg.slice(j + 2);
+
+				if (next === '-') {
+					setArg(letters[j], next, arg);
+					continue;
+				}
+
+				if ((/[A-Za-z]/).test(letters[j]) && next[0] === '=') {
+					setArg(letters[j], next.slice(1), arg);
+					broken = true;
+					break;
+				}
+
+				if (
+					(/[A-Za-z]/).test(letters[j])
+					&& (/-?\d+(\.\d*)?(e-?\d+)?$/).test(next)
+				) {
+					setArg(letters[j], next, arg);
+					broken = true;
+					break;
+				}
+
+				if (letters[j + 1] && letters[j + 1].match(/\W/)) {
+					setArg(letters[j], arg.slice(j + 2), arg);
+					broken = true;
+					break;
+				} else {
+					setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg);
+				}
+			}
+
+			key = arg.slice(-1)[0];
+			if (!broken && key !== '-') {
+				if (
+					args[i + 1]
+					&& !(/^(-|--)[^-]/).test(args[i + 1])
+					&& !flags.bools[key]
+					&& (aliases[key] ? !aliasIsBoolean(key) : true)
+				) {
+					setArg(key, args[i + 1], arg);
+					i += 1;
+				} else if (args[i + 1] && (/^(true|false)$/).test(args[i + 1])) {
+					setArg(key, args[i + 1] === 'true', arg);
+					i += 1;
+				} else {
+					setArg(key, flags.strings[key] ? '' : true, arg);
+				}
+			}
+		} else {
+			if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
+				argv._.push(flags.strings._ || !isNumber(arg) ? arg : Number(arg));
+			}
+			if (opts.stopEarly) {
+				argv._.push.apply(argv._, args.slice(i + 1));
+				break;
+			}
+		}
+	}
+
+	Object.keys(defaults).forEach(function (k) {
+		if (!hasKey(argv, k.split('.'))) {
+			setKey(argv, k.split('.'), defaults[k]);
+
+			(aliases[k] || []).forEach(function (x) {
+				setKey(argv, x.split('.'), defaults[k]);
+			});
+		}
+	});
+
+	if (opts['--']) {
+		argv['--'] = notFlags.slice();
+	} else {
+		notFlags.forEach(function (k) {
+			argv._.push(k);
+		});
+	}
+
+	return argv;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "1.3.0-beta.1",
+  "version": "1.4.0-beta.1",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {

package/tools/iconGen.js

@@ -52,14 +52,14 @@ class IconGen {
         }
       }
     } catch (e) {
-      console.error("[ee-core] [tools/iconGen] args: ", args);
-      console.error("[ee-core] [tools/iconGen] ERROR: ", e);
+      console.error("[ee-bin] [icon-gen] args: ", args);
+      console.error("[ee-bin] [icon-gen] ERROR: ", e);
       throw new Error("参数错误!!");
     }
     this.params = params;
 
     // ---> 组装参数
-    console.log("[ee-core] [tools/iconGen] icon 当前路径: ", process.cwd());
+    console.log("[ee-bin] [icon-gen] icon 当前路径: ", process.cwd());
     this.input = path.join(process.cwd(), params.input);
     this.output = path.join(process.cwd(), params.output);
     this.imagesDir = path.join(process.cwd(), params.imagesDir);
@@ -82,9 +82,9 @@ class IconGen {
    * 生成图标
    */
   generateIcons() {
-    console.log("[ee-core] [tools/iconGen] iconGen 开始处理生成logo图片");
+    console.log("[ee-bin] [icon-gen] iconGen 开始处理生成logo图片");
     if (!fs.existsSync(this.input)) {
-      console.error("[ee-core] [tools/iconGen] input: ", this.input);
+      console.error("[ee-bin] [icon-gen] input: ", this.input);
       throw new Error("输入的图片不存在或路径错误");
     }
     if (!fs.existsSync(this.output)) {
@@ -98,13 +98,13 @@ class IconGen {
     }
     icongen(this.input, this.output, this.iconOptions)
       .then((results) => {
-        console.log("[ee-core] [tools/iconGen] iconGen 已生成下方图片资源");
+        console.log("[ee-bin] [icon-gen] iconGen 已生成下方图片资源");
         console.log(results);
         this._renameForEE(results);
       })
       .catch((err) => {
         console.error(err);
-        throw new Error("[ee-core] [tools/iconGen] iconGen 生成失败!");
+        throw new Error("[ee-bin] [icon-gen] iconGen 生成失败!");
       });
   }
 
@@ -134,7 +134,7 @@ class IconGen {
    * 为生成的资源重命名 (logo-32.png -> 32x32.png)
    */    
   _renameForEE(filesPath) {
-    console.log("[ee-core] [tools/iconGen] iconGen 开始重新命名logo图片资源");
+    console.log("[ee-bin] [icon-gen] iconGen 开始重新命名logo图片资源");
     try {
       const len = filesPath.length;
       for (let i = 0; i < len; i++) {
@@ -165,9 +165,9 @@ class IconGen {
           console.log(`${filename}${extname} --> ${newName} 重命名成功!`);
         }
       }
-      console.log("[ee-core] [tools/iconGen] iconGen 资源处理完成!");
+      console.log("[ee-bin] [icon-gen] iconGen 资源处理完成!");
     } catch (e) {
-      console.error("[ee-core] [tools/iconGen] ERROR: ", e);
+      console.error("[ee-bin] [icon-gen] ERROR: ", e);
       throw new Error("重命名logo图片资源失败!!");
     }
   }

package/tools/move.js

@@ -0,0 +1,85 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const chalk = require('chalk');
+const Utils = require('../lib/utils');
+
+/**
+ * 移动资源
+ */
+
+ module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run(options = {}) {
+    console.log('[ee-bin] [move] Start moving resources');
+    const homeDir = process.cwd();
+    const { config, flag } = options;
+    const binCfg = Utils.loadConfig(config);
+    
+    let flags;
+    const flagString = flag.trim();
+    if (flagString.indexOf(',') !== -1) {
+      flags = flagString.split(',');
+    } else {
+      flags = [flagString];
+    }
+
+    for (let i = 0; i < flags.length; i++) {
+      let f = flags[i];
+      let cfg = binCfg.move[f];
+
+      if (!cfg) {
+        console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
+        return;
+      }
+  
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
+
+      const distResource = path.join(homeDir, cfg.dist);
+      if (!fs.existsSync(distResource)) {
+        const errorTips = chalk.bgRed('Error') + ` ${cfg.dist} resource does not exist !`;
+        console.error(errorTips);
+        return
+      }
+
+      // clear the historical resource and copy it to the ee resource directory
+      const targetResource = path.join(homeDir, cfg.target);
+      if (fs.statSync(distResource).isDirectory() && !fs.existsSync(targetResource)) {
+        fs.mkdirSync(targetResource, {recursive: true, mode: 0o777});
+      } else {
+        this._rm(targetResource);
+        console.log('[ee-bin] [move] Clear history resources:', targetResource);
+      }
+
+      fsPro.copySync(distResource, targetResource);
+
+      // [todo] go project, special treatment of package.json, reserved only necessary
+      console.log(`[ee-bin] [move] Copy ${distResource} to ${targetResource}`);
+    }
+
+    console.log('[ee-bin] [move] End');
+  },
+
+  /**
+   * Delete a file or folder
+   */
+  _rm(name) {
+    // check
+    if (!fs.existsSync(name)) {
+      return
+    }
+
+    const nodeVersion = (process.versions && process.versions.node) || null;
+    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
+      fs.rmSync(name, {recursive: true});
+    } else {
+      fs.rmdirSync(name, {recursive: true});
+    }
+  },
+}

package/tools/replaceDist.js

@@ -16,6 +16,9 @@ const Utils = require('../lib/utils');
    * 执行
    */  
   run(options = {}) {
+    const warnTips = chalk.bgYellow('Warning') + ': This command is deprecated. Use move instead !';
+    console.log(warnTips);
+
     console.log('[ee-bin] [rd] Start moving resources');
     const homeDir = process.cwd();
     let { dist, target, config } = options;

package/tools/serve.js

@@ -8,10 +8,6 @@ const crossSpawn = require('cross-spawn');
 
 module.exports = {
 
-  frontendProcess: undefined,
-
-  electronProcess: undefined,
-
   execProcess: {},
 
   /**
@@ -19,21 +15,21 @@ module.exports = {
    */  
   dev(options = {}) {
     const { config, serve } = options;
+    const binCmd = 'dev';
     const binCfg = Utils.loadConfig(config);
-    const { frontend, electron } = binCfg.dev;
+    const binCmdConfig = binCfg[binCmd];
 
-    if (serve == 'frontend') {
-      this.frontendServe(frontend);
-      return;
+    let command = serve;
+    if (!command) {
+      command = Object.keys(binCmdConfig).join();
     }
 
-    if (serve == 'electron') {
-      this.electronServe(electron);
-      return;
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command,
     }
-
-    this.frontendServe(frontend);
-    this.electronServe(electron);
+    this.multiExec(opt);
   },
 
   /**
@@ -41,93 +37,82 @@ module.exports = {
    */  
   start(options = {}) {
     const { config } = options;
+    const binCmd = 'start';
     const binCfg = Utils.loadConfig(config);
-
-    this.electronServe(binCfg.start);
+    const binCmdConfig = {
+      start: binCfg[binCmd]
+    };
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: binCmd,
+    }
+    this.multiExec(opt);
   },
 
   sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
-  },
+  }, 
 
   /**
-   * start frontend serve
+   * 构建
    */  
-  frontendServe(cfg) {
-    // 如果是 file:// 协议，则不启动
-    if (cfg.protocol == 'file://') {
+  build(options = {}) {
+    const { config, cmds } = options;
+    const binCmd = 'build';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = binCfg[binCmd];
+
+    if (!cmds || cmds == "") {
+      // [todo]
+      let tip = chalk.bgYellow('Warning') + ' Please modify the ' + chalk.blue('build') + ' config, See: ';
+      tip += chalk.underline('https://www.kaka996.com/pages/e1816f/');
+      console.log(tip);
       return
     }
-    // 模拟前端启动慢
-    // await this.sleep(5 * 1000);
-    console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('Start the frontend serve...'));
-    console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('config:'), JSON.stringify(cfg));
-
-    const frontendDir = path.join(process.cwd(), cfg.directory);
-    const frontendArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
-    this.frontendProcess = crossSpawn(
-      cfg.cmd, 
-      frontendArgs,
-      { stdio: 'inherit', cwd: frontendDir, maxBuffer: 1024 * 1024 * 1024 },
-    );
-    this.frontendProcess.on('exit', () => {
-      console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('frontend serve exit'));
-    });
+
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: cmds,
+    }
+    this.multiExec(opt);
   },
 
   /**
-   * start electron serve
+   * 执行自定义命令
    */  
-  electronServe(cfg) {
-    console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('Start the electron serve...'));
-    console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('config:'), JSON.stringify(cfg));
+  exec(options = {}) {
+    let { config, command, cmds } = options;
+    const binCmd = 'exec';
+    const binCfg = Utils.loadConfig(config);
+    const binCmdConfig = binCfg[binCmd];
 
-    const electronDir = path.join(process.cwd(), cfg.directory);
-    const electronArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
-    
-    this.electronProcess = crossSpawn(
-      cfg.cmd, 
-      electronArgs, 
-      {stdio: 'inherit', cwd: electronDir, maxBuffer: 1024 * 1024 * 1024 }
-    );
-
-    this.electronProcess.on('exit', () => {
-      console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('Press "CTRL+C" to exit'));
-    });
-  },  
+    // if (typeof command !== "string" || !cmds) {
+    //   console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: Please specify parameters for --cmds` ));
+    //   return
+    // }
 
-  /**
-   * 构建前端 dist 
-   */  
-  build(options = {}) {
-    const { config } = options;
-    const binCfg = Utils.loadConfig(config);
-    const cfg = binCfg.build;
+    // 兼容
+    if (typeof command === "string") {
+      cmds = command;
+    }
 
-    // start build frontend dist
-    console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('Build frontend dist'));
-    console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('config:'), cfg);
-    
-    const frontendDir = path.join(process.cwd(), cfg.directory);
-    const buildArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
-
-    const buildProcess = crossSpawn(
-      cfg.cmd, 
-      buildArgs,
-      { stdio: 'inherit', cwd: frontendDir, maxBuffer: 1024 * 1024 * 1024 },
-    );
-    buildProcess.on('exit', () => {
-      console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('End'));
-    }); 
+    const opt = {
+      binCmd,
+      binCmdConfig,
+      command: cmds,
+    }
+    this.multiExec(opt);
   },
 
   /**
-   * 执行自定义命令
    * 支持多个命令
    */  
-  exec(options = {}) {
-    const { config, command } = options;
-    const binCfg = Utils.loadConfig(config);
+  multiExec(opt = {}) {
+    //console.log('multiExec opt:', opt)
+    const { binCmd, binCmdConfig, command } = opt;
     
     let cmds;
     const cmdString = command.trim();
@@ -139,15 +124,20 @@ module.exports = {
 
     for (let i = 0; i < cmds.length; i++) {
       let cmd = cmds[i];
-      let cfg = binCfg.exec[cmd];
+      let cfg = binCmdConfig[cmd];
 
       if (!cfg) {
-        console.log(chalk.blue('[ee-bin] [exec] ') + chalk.red(`Error: ${cmd} config does not exist` ));
-        return;
+        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${binCmd} ${cmd}] config does not exist` ));
+        continue;
+      }
+
+      // frontend 如果是 file:// 协议，则不启动
+      if (cmd == 'frontend' && cfg.protocol == 'file://') {
+        continue;
       }
   
-      console.log(chalk.blue('[ee-bin] [exec] ') + chalk.green('Run custom command'));
-      console.log(chalk.blue('[ee-bin] [exec] ') + chalk.green('config:'), cfg);
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + "Run " + chalk.green(`[${binCmd} ${cmd}]` + " command"));
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('config:'), JSON.stringify(cfg));
       
       let execDir = path.join(process.cwd(), cfg.directory);
       let execArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
@@ -157,9 +147,16 @@ module.exports = {
         execArgs,
         { stdio: 'inherit', cwd: execDir, maxBuffer: 1024 * 1024 * 1024 },
       );
+      console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command is running');
+
       this.execProcess[cmd].on('exit', () => {
-        console.log(chalk.blue('[ee-bin] [exec] ') + 'the ' + chalk.green(`${cmd}`) + ' is execution completed');
+        if (cmd == 'electron') {
+          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.green('Press "CTRL+C" to exit'));
+          return
+        }
+        console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command is executed and exits');
       });
     }
   },  
+
 }