ee-bin 1.2.0-beta.3 → 1.2.0-beta.4

package/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const program = require('commander');
+const { program } = require('commander');
 
 /**
  * rd - Moves front-end resources to a specified directory
@@ -8,9 +8,9 @@ const program = require('commander');
 program
   .command('rd')
   .description('Move frontend resources to public/dist')
-  .option('--dist-dir <folder>', 'title to use before name', './frontend/dist') // 兼容旧的api
-  .option('--dist <folder>', 'title to use before name', './frontend/dist')
-  .option('--target <folder>', 'title to use before name', './public/dist')
+  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .option('--dist <folder>', 'title to use before name')
+  .option('--target <folder>', 'title to use before name')
   .action(function() {
     const replaceDist = require('./tools/replaceDist');
     replaceDist.run(this.opts());
@@ -57,11 +57,11 @@ program
  */
 program
   .command('dev')
-  .description('create frontend-server and electron-server')
+  .description('create frontend-serve and electron-serve')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
   .action(function() {
-    const frontend = require('./tools/frontend');
-    frontend.serve(this.opts());
+    const serve = require('./tools/serve');
+    serve.dev(this.opts());
   });
 
 /**
@@ -72,8 +72,20 @@ program
   .description('build frontend dist')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
   .action(function() {
-    const frontend = require('./tools/frontend');
-    frontend.build(this.opts());
+    const serve = require('./tools/serve');
+    serve.build(this.opts());
+  });
+
+/**
+ * start
+ */
+program
+  .command('start')
+  .description('preview effect')
+  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .action(function() {
+    const serve = require('./tools/serve');
+    serve.start(this.opts());
   });
 
-program.parse();
+program.parse();

package/lib/utils.js

@@ -52,8 +52,60 @@ function loadEncryptConfig() {
   return ret || {};
 };
 
+/**
+ * get electron program
+ */   
+function getElectronProgram() {
+  let electronPath
+  const electronModulePath = path.dirname(require.resolve('electron'))
+  const pathFile = path.join(electronModulePath, 'path.txt')
+  const executablePath = fs.readFileSync(pathFile, 'utf-8')
+  if (executablePath) {
+    electronPath = path.join(electronModulePath, 'dist', executablePath)
+  } else {
+    throw new Error('Check that electron is installed!')
+  }
+  return electronPath;
+};
+
+/**
+ * 版本号比较
+ */
+function compareVersion(v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+
+function isWindows(prop) {
+  return process.platform === 'win32'
+}
+
 module.exports = {
   loadConfig,
   checkConfig,
-  loadEncryptConfig
+  loadEncryptConfig,
+  getElectronProgram,
+  compareVersion,
+  isWindows
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "1.2.0-beta.3",
+  "version": "1.2.0-beta.4",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "commander": "^11.0.0",
     "fs-extra": "^10.0.0",
     "globby": "^10.0.0",
+    "iconv-lite": "^0.6.3",
     "is-type-of": "^1.2.1",
     "javascript-obfuscator": "^4.0.2"
   }

package/tools/replaceDist.js

@@ -4,6 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const fsPro = require('fs-extra');
 const chalk = require('chalk');
+const Utils = require('../lib/utils');
 
 /**
  * 资源替换
@@ -17,11 +18,34 @@ const chalk = require('chalk');
   run(options = {}) {
     console.log('[ee-bin] [rd] Start moving resources');
     const homeDir = process.cwd();
-    const { distDir, dist, target } = options;
+    let { dist, target, config } = options;
 
-    // argv
-    const distFolder = dist ? dist : distDir;
-    const sourceDir = path.join(homeDir, distFolder);
+    let distDir = './frontend/dist';
+    let targetDir = './public/dist';
+
+    // 命令行优先
+    if (dist) {
+      distDir = dist;
+    }
+    if (target) {
+      targetDir = target;
+    }
+
+    // 如果命令行没参数，从bin config 获取
+    if (!dist && !target) {
+      const hasConfig = Utils.checkConfig(config);
+      if (hasConfig) {
+        const cfg = Utils.loadConfig(config);
+        if (cfg.rd && cfg.rd.dist) {
+          distDir = cfg.rd.dist;
+        }
+        if (cfg.rd && cfg.rd.target) {
+          targetDir = cfg.rd.target;
+        }
+      }   
+    }
+
+    const sourceDir = path.join(homeDir, distDir);
     if (!fs.existsSync(sourceDir)) {
       const errorTips = chalk.bgRed('Error') + ' Frontend resource does not exist, please build !';
       console.error(errorTips);
@@ -29,7 +53,7 @@ const chalk = require('chalk');
     }
     
     // 清空历史资源 并 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, target);
+    const eeResourceDir = path.join(homeDir, targetDir);
     if (!fs.existsSync(eeResourceDir)) {
       fs.mkdirSync(eeResourceDir, {recursive: true, mode: 0o777});
     } else {
@@ -47,39 +71,10 @@ const chalk = require('chalk');
    */
   _rmFolder(folder) {
     const nodeVersion = (process.versions && process.versions.node) || null;
-    if (nodeVersion && this._compareVersion(nodeVersion, '14.14.0') == 1) {
+    if (nodeVersion && Utils.compareVersion(nodeVersion, '14.14.0') == 1) {
       fs.rmSync(folder, {recursive: true});
     } else {
       fs.rmdirSync(folder, {recursive: true});
     }
   },
-
-  /**
-   * 版本号比较
-   */
-  _compareVersion(v1, v2) {
-    v1 = v1.split('.')
-    v2 = v2.split('.')
-    const len = Math.max(v1.length, v2.length)
-
-    while (v1.length < len) {
-      v1.push('0')
-    }
-    while (v2.length < len) {
-      v2.push('0')
-    }
-    
-    for (let i = 0; i < len; i++) {
-      const num1 = parseInt(v1[i])
-      const num2 = parseInt(v2[i])
-
-      if (num1 > num2) {
-        return 1
-      } else if (num1 < num2) {
-        return -1
-      }
-    }
-
-    return 0
-  }
 }

package/tools/serve.js

@@ -0,0 +1,156 @@
+'use strict';
+
+const path = require('path');
+const { spawn, exec } = require('child_process');
+const Utils = require('../lib/utils');
+const is = require('is-type-of');
+const chalk = require('chalk');
+const iconv = require('iconv-lite');
+const { Buffer } = require('buffer');
+
+module.exports = {
+
+  frontendProcess: undefined,
+
+  electronProcess: undefined,
+
+  /**
+   * 启动前端、主进程服务
+   */  
+  dev(options = {}) {
+    const { config } = options;
+    const cfg = Utils.loadConfig(config);
+    const { frontend, electron } = cfg.dev;
+    this.frontendServe(frontend);
+    this.electronServe(electron);
+  },
+
+  /**
+   * 启动主进程服务
+   */  
+  start(options = {}) {
+    const { config } = options;
+    const cfg = Utils.loadConfig(config);
+
+    this.electronServe(cfg.start);
+  },
+
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+
+  /**
+   * 前端服务
+   */  
+  async frontendServe(cfg) {
+    // 如果是 file:// 协议，则不启动
+    if (cfg.protocol == 'file://') {
+      return
+    }
+
+    // start frontend serve
+    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 isWindows = Utils.isWindows();
+    const cmdEncoding = isWindows ? 'binary' : 'utf8';
+    const msgEncoding = isWindows ? 'cp936' : 'utf8';
+    this.frontendProcess = exec(
+      cfg.cmd, 
+      { stdio: 'inherit', cwd: frontendDir, encoding: cmdEncoding},
+      (err) => {
+        if (err) {
+          const errMsg = iconv.decode(new Buffer.from(err.message, cmdEncoding), msgEncoding);
+          console.log(chalk.blue('[ee-bin] [dev] ') + chalk.red(`Error: ${errMsg}`))
+          process.exit();
+        }
+      }
+    );
+    
+    this.frontendProcess.stdout.on('data', (data) => {
+      let out = data;
+      if (isWindows) {
+        out = iconv.decode(new Buffer.from(data, cmdEncoding), 'utf8');
+      }
+      console.log(chalk.blue('[ee-bin] [dev] ') + `frontend ${out}`);
+    });
+    this.frontendProcess.stderr.on('data', (data) => {
+      let out = data;
+      if (isWindows) {
+        out = iconv.decode(new Buffer.from(data, cmdEncoding), 'utf8');
+      }
+      console.error(chalk.blue('[ee-bin] [dev] ') + `frontend ${out}`);
+    });
+  },
+
+  /**
+   * 主进程服务
+   */  
+  electronServe(cfg) {
+    // start electron serve
+    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));
+
+    const electronDir = path.join(process.cwd(), cfg.directory);
+    const electronArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
+    
+    // 疑问，为什么直接使用 electron，spawn会报错(或许是衍生shell问题，衍生的shell有系统环境变量)
+    let electronProgram 
+    if (cfg.cmd == 'electron') {
+      electronProgram = Utils.getElectronProgram();
+    }
+
+    this.electronProcess = spawn(
+      electronProgram, 
+      electronArgs, 
+      {stdio: 'inherit', cwd: electronDir,}
+    );
+
+    this.electronProcess.on('exit', () => {
+      setTimeout(() => {
+        process.exit();
+      }, 500)
+    });
+  },  
+
+  /**
+   * 构建前端 dist 
+   */  
+  build(options = {}) {
+    const { config } = options;
+    const cfg = Utils.loadConfig(config);
+    const buildCfg = cfg.build;
+
+    // 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:'), buildCfg);
+    
+    let i = 1;
+    let buildProgress = setInterval(() => {
+      console.log(chalk.blue('[ee-bin] [build] ') + `${i}s`);
+      i++;
+    }, 1000)
+
+    const frontendDir = path.join(process.cwd(), buildCfg.directory);
+    const buildProcess = exec(
+      buildCfg.cmd, 
+      { stdio: 'inherit', cwd: frontendDir, },  // maxBuffer: 1024 * 1024 * 1024
+      (err) => {
+        if (err) {
+          console.log(chalk.blue('[ee-bin] [build] ') + chalk.red(`Error: ${err.message}`))
+          process.exit();
+        }
+        clearInterval(buildProgress);
+        console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('End'));
+      }
+    );
+    
+    buildProcess.stdout.on('data', (data) => {
+      console.log(chalk.blue('[ee-bin] [build] ') + `frontend ${data}`);
+    });
+    buildProcess.stderr.on('data', (data) => {
+      console.error(chalk.blue('[ee-bin] [build] ') + chalk.yellow(`Warning: ${data}`));
+    });    
+  },
+}

package/tools/frontend.js

@@ -1,82 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const { spawn, exec } = require('child_process');
-const Utils = require('../lib/utils');
-const is = require('is-type-of');
-const chalk = require('chalk');
-
-module.exports = {
-
-  /**
-   * 启动前端、主进程服务
-   */  
-  serve(options = {}) {
-    const { config } = options;
-    const cfg = Utils.loadConfig(config);
-    const { frontend, main } = cfg;
-
-    // start frontend serve
-    console.log(chalk.blue('[ee-bin] [serve] ') + chalk.green('Start the frontend serve...'));
-    const frontendDir = path.join(process.cwd(), frontend.directory);
-    exec(frontend.devCommond, { stdio: 'inherit', cwd: frontendDir});
-
-    // start electron serve
-    console.log(chalk.blue('[ee-bin] [serve] ') + chalk.green('Start the electron serve...'));
-    const mainDir = path.join(process.cwd(), main.directory);
-    const mainArgs = is.string(main.args) ? [main.args] : main.args;
-    const electronPath = this._getElectronPath();
-    spawn(electronPath, mainArgs, {
-      stdio: 'inherit', 
-      cwd: mainDir,
-    });
-  },
-
-  /**
-   * 构建前端 dist 
-   */  
-  build(options = {}) {
-    const { config } = options;
-    const cfg = Utils.loadConfig(config);
-    const { frontend } = cfg;
-
-    // start build frontend dist
-    console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('Build frontend dist'));
-    let i = 1;
-    let buildProgress = setInterval(() => {
-      console.log(chalk.blue('[ee-bin] [build] ') + chalk.magenta(`${i}s`));
-      i++;
-    }, 1000)
-
-    const frontendDir = path.join(process.cwd(), frontend.directory);
-    exec(
-      frontend.buildCommond, 
-      { stdio: 'inherit', cwd: frontendDir, maxBuffer: 1024 * 1024 * 1024}, 
-      (error, stdout, stderr) => {
-        if (error) {
-          console.log(chalk.red('build error:') + error);
-          return;
-        }
-        console.log(stdout);
-        console.log(stderr);
-        clearInterval(buildProgress);
-        console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('End'));
-      }
-    );
-  },
-
-  _getElectronPath() {
-    let electronExecPath = ''
-    const electronModulePath = path.dirname(require.resolve('electron'))
-    const pathFile = path.join(electronModulePath, 'path.txt')
-    const executablePath = fs.readFileSync(pathFile, 'utf-8')
-    if (executablePath) {
-      electronExecPath = path.join(electronModulePath, 'dist', executablePath)
-    } else {
-      throw new Error('Electron uninstall')
-    }
-    return electronExecPath
-  },
-  
-}