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

package/index.js

@@ -59,6 +59,7 @@ program
   .command('dev')
   .description('create frontend-serve and electron-serve')
   .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .option('--serve <mode>', 'serve mode')
   .action(function() {
     const serve = require('./tools/serve');
     serve.dev(this.opts());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "1.2.0-beta.4",
+  "version": "1.2.0-beta.5",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {
@@ -15,9 +15,9 @@
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
+    "cross-spawn": "^7.0.3",
     "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/serve.js

@@ -1,12 +1,10 @@
 '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');
+const crossSpawn = require('cross-spawn');
 
 module.exports = {
 
@@ -18,9 +16,20 @@ module.exports = {
    * 启动前端、主进程服务
    */  
   dev(options = {}) {
-    const { config } = options;
-    const cfg = Utils.loadConfig(config);
-    const { frontend, electron } = cfg.dev;
+    const { config, serve } = options;
+    const binCfg = Utils.loadConfig(config);
+    const { frontend, electron } = binCfg.dev;
+
+    if (serve == 'frontend') {
+      this.frontendServe(frontend);
+      return;
+    }
+
+    if (serve == 'electron') {
+      this.electronServe(electron);
+      return;
+    }
+
     this.frontendServe(frontend);
     this.electronServe(electron);
   },
@@ -30,9 +39,9 @@ module.exports = {
    */  
   start(options = {}) {
     const { config } = options;
-    const cfg = Utils.loadConfig(config);
+    const binCfg = Utils.loadConfig(config);
 
-    this.electronServe(cfg.start);
+    this.electronServe(binCfg.start);
   },
 
   sleep(ms) {
@@ -40,77 +49,48 @@ module.exports = {
   },
 
   /**
-   * 前端服务
+   * start frontend serve
    */  
-  async frontendServe(cfg) {
+  frontendServe(cfg) {
     // 如果是 file:// 协议，则不启动
     if (cfg.protocol == 'file://') {
       return
     }
-
-    // start frontend serve
+    // 模拟前端启动慢
+    // 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 isWindows = Utils.isWindows();
-    const cmdEncoding = isWindows ? 'binary' : 'utf8';
-    const msgEncoding = isWindows ? 'cp936' : 'utf8';
-    this.frontendProcess = exec(
+    const frontendArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
+    this.frontendProcess = crossSpawn(
       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();
-        }
-      }
+      frontendArgs,
+      { stdio: 'inherit', cwd: frontendDir, maxBuffer: 1024 * 1024 * 1024 },
     );
-    
-    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}`);
+    this.frontendProcess.on('exit', () => {
+      console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('frontend serve exit'));
     });
   },
 
   /**
-   * 主进程服务
+   * start electron serve
    */  
   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, 
+    this.electronProcess = crossSpawn(
+      cfg.cmd, 
       electronArgs, 
-      {stdio: 'inherit', cwd: electronDir,}
+      {stdio: 'inherit', cwd: electronDir, maxBuffer: 1024 * 1024 * 1024 }
     );
 
     this.electronProcess.on('exit', () => {
-      setTimeout(() => {
-        process.exit();
-      }, 500)
+      console.log(chalk.blue('[ee-bin] [dev] ') + chalk.green('Press "CTRL+C" to exit'));
     });
   },  
 
@@ -119,38 +99,23 @@ module.exports = {
    */  
   build(options = {}) {
     const { config } = options;
-    const cfg = Utils.loadConfig(config);
-    const buildCfg = cfg.build;
+    const binCfg = Utils.loadConfig(config);
+    const cfg = binCfg.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);
+    console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('config:'), cfg);
     
-    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'));
-      }
+    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.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}`));
-    });    
+    buildProcess.on('exit', () => {
+      console.log(chalk.blue('[ee-bin] [build] ') + chalk.green('End'));
+    }); 
   },
 }