ee-bin 1.2.0-beta.1 → 1.2.0-beta.2

package/index.js

@@ -8,7 +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')
+  .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')
   .action(function() {
     const replaceDist = require('./tools/replaceDist');
     replaceDist.run(this.opts());
@@ -20,7 +22,7 @@ program
 program
   .command('encrypt')
   .description('Code encryption')
-  .option('--config <folder>', 'config file', './electron/config/encrypt.js')
+  .option('--config <folder>', 'config file')
   .option('--out <folder>', 'output directory', './public')
   .action(function() {
     const encrypt = require('./tools/encrypt');
@@ -62,4 +64,16 @@ program
     frontend.serve(this.opts());
   });
 
+/**
+ * build
+ */
+program
+  .command('build')
+  .description('build frontend dist')
+  .option('--config <folder>', 'config file', './electron/config/bin.js')
+  .action(function() {
+    const frontend = require('./tools/frontend');
+    frontend.build(this.opts());
+  });
+
 program.parse();

package/lib/utils.js

@@ -7,8 +7,35 @@ const is = require('is-type-of');
 
 const _basePath = process.cwd();
 
+function checkConfig(prop) {
+  const filepath = path.join(_basePath, prop);
+  if (fs.existsSync(filepath)) {
+    return true;
+  }
+  
+  return false;
+}
+
 function loadConfig(prop) {
-  const configFile = prop || './electron/config/bin.js';
+  const configFile = prop;
+  const filepath = path.join(_basePath, configFile);
+  if (!fs.existsSync(filepath)) {
+    const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
+    throw new Error(errorTips)
+  }
+  const obj = require(filepath);
+  if (!obj) return obj;
+
+  let ret = obj;
+  if (is.function(obj) && !is.class(obj)) {
+    ret = obj();
+  }
+
+  return ret || {};
+};
+
+function loadEncryptConfig() {
+  const configFile = './electron/config/encrypt.js';
   const filepath = path.join(_basePath, configFile);
   if (!fs.existsSync(filepath)) {
     const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
@@ -26,5 +53,7 @@ function loadConfig(prop) {
 };
 
 module.exports = {
-  loadConfig
+  loadConfig,
+  checkConfig,
+  loadEncryptConfig
 }

package/package.json

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

package/tools/encrypt.js

@@ -9,16 +9,26 @@ const crypto = require('crypto');
 const JavaScriptObfuscator = require('javascript-obfuscator');
 const globby = require('globby');
 const chalk = require('chalk');
+const Utils = require('../lib/utils');
 
 class Encrypt {
   constructor(options = {}) {
     // cli args
     const outputFolder = options.out || './public';
-    const configFile = options.config || './electron/config/encrypt.js';
+    const configFile = options.config || './electron/config/bin.js';
 
     this.basePath = process.cwd();
     this.encryptCodeDir = path.join(this.basePath, outputFolder);
-    this.config = this.loadConfig(configFile);
+
+    // 先从 bin config获取，没有的话从 config/encrypt.js
+    const hasConfig = Utils.checkConfig(configFile);
+    if (hasConfig) {
+      const cfg = Utils.loadConfig(configFile);
+      this.config = cfg.encrypt;
+    } else {
+      this.config = Utils.loadEncryptConfig();
+    }
+    
     this.filesExt = this.config.fileExt || ['.js'];
     this.type = this.config.type || 'confusion';
     this.bOpt = this.config.bytecodeOptions || {};
@@ -38,8 +48,7 @@ class Encrypt {
     }
 
     this.codefiles = this._initCodeFiles();
-    //console.log('[ee-core] [encrypt] codefiles:', this.codefiles);
-    console.log('[ee-core] [encrypt] cleanFiles:', this.cleanFiles);
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'cleanFiles:' + this.cleanFiles);
   }
 
   /**
@@ -59,7 +68,7 @@ class Encrypt {
     // clean
     this.cleanCode();
 
-    console.log('[ee-core] [encrypt] backup start');
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'backup start');
     if (this.patterns) {
       this.codefiles.forEach((filepath) => {
         let source = path.join(this.basePath, filepath);
@@ -74,13 +83,13 @@ class Encrypt {
         // check code dir
         let codeDirPath = path.join(this.basePath, this.dirs[i]);
         if (!fs.existsSync(codeDirPath)) {
-          console.log('[ee-core] [encrypt] ERROR: backup %s is not exist', codeDirPath);
+          console.log('[ee-bin] [encrypt] ERROR: backup %s is not exist', codeDirPath);
           return
         }
   
         // copy
         let targetDir = path.join(this.encryptCodeDir, this.dirs[i]);
-        console.log('[ee-core] [encrypt] backup target Dir:', targetDir);
+        console.log('[ee-bin] [encrypt] backup target Dir:', targetDir);
         if (!fs.existsSync(targetDir)) {
           this.mkdir(targetDir);
           this.chmodPath(targetDir, '777');
@@ -90,7 +99,7 @@ class Encrypt {
       }
     }
 
-    console.log('[ee-core] [encrypt] backup end');
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'backup end');
     return true;
   }
   
@@ -101,7 +110,7 @@ class Encrypt {
     this.cleanFiles.forEach((file) => {
       let tmpFile = path.join(this.basePath, file);
       this.rmBackup(tmpFile);
-      console.log('[ee-core] [encrypt] clean up tmp files:', tmpFile);
+      console.log(chalk.blue('[ee-bin] [encrypt] ') + 'clean up tmp files:' + chalk.magenta(`${tmpFile}`));
     })
   }
 
@@ -109,7 +118,7 @@ class Encrypt {
    * 加密代码
    */
   encrypt() {
-    console.log('[ee-core] [encrypt] start ciphering');
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'start ciphering');
     if (this.patterns) {
       for (const file of this.codefiles) {
         const fullpath = path.join(this.encryptCodeDir, file);
@@ -125,15 +134,15 @@ class Encrypt {
       }  
     } else {
       // 旧逻辑，将废弃
-      console.log('[ee-core] [encrypt] !!!!!! please use the new encryption method !!!!!!');
+      console.log('[ee-bin] [encrypt] !!!!!! please use the new encryption method !!!!!!');
       for (let i = 0; i < this.dirs.length; i++) {
         let codeDirPath = path.join(this.encryptCodeDir, this.dirs[i]);
         this.loop(codeDirPath);
       }
-      console.log('[ee-core] [encrypt] !!!!!! please use the new encryption method !!!!!!');
+      console.log('[ee-bin] [encrypt] !!!!!! please use the new encryption method !!!!!!');
     }
 
-    console.log('[ee-core] [encrypt] end ciphering');
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'end ciphering');
   };
 
   /**
@@ -163,7 +172,7 @@ class Encrypt {
   generate(curPath, type) {
     let encryptType = type ? type : this.type;
 
-    let tips = '[ee-core] [encrypt] file: ' + chalk.green(`${curPath}`) + ' ' + chalk.blue(`(${encryptType})`);
+    let tips = chalk.blue('[ee-bin] [encrypt] ') + 'file: ' + chalk.green(`${curPath}`) + ' ' + chalk.cyan(`(${encryptType})`);
     console.log(tips);
 
     if (encryptType == 'bytecode') {
@@ -272,23 +281,6 @@ class Encrypt {
     }
   };
 
-  loadConfig(prop) {
-    const filepath = path.join(this.basePath, prop);
-    if (!fs.existsSync(filepath)) {
-      const errorTips = 'config file ' + chalk.blue(`${filepath}`) + ' does not exist !';
-      throw new Error(errorTips)
-    }
-    const obj = require(filepath);
-    if (!obj) return obj;
-
-    let ret = obj;
-    if (is.function(obj) && !is.class(obj)) {
-      ret = obj();
-    }
-
-    return ret || {};
-  };
-
   md5(file) {
     const buffer = fs.readFileSync(file);
     const hash = crypto.createHash('md5');
@@ -312,7 +304,7 @@ const clean = (options = {}) => {
     const tmpFile = path.join(process.cwd(), file);
     if (fs.existsSync(tmpFile)) {
       fsPro.removeSync(tmpFile);
-      console.log('[ee-core] [encrypt] clean up tmp files:', tmpFile);
+      console.log(chalk.blue('[ee-bin] [encrypt] ') + 'clean up tmp files: ' + chalk.magenta(`${tmpFile}`));
     }
   })
 }

package/tools/frontend.js

@@ -2,70 +2,75 @@
 
 const path = require('path');
 const fs = require('fs');
-const { spawn, spawnSync, exec, execFile } = require('child_process');
+const { spawn, exec } = require('child_process');
 const Utils = require('../lib/utils');
 const is = require('is-type-of');
+const chalk = require('chalk');
 
 module.exports = {
 
-  electronServer: undefined,
-
-  frontendServer: undefined,
-
   /**
    * 启动前端、主进程服务
    */  
   serve(options = {}) {
     const { config } = options;
     const cfg = Utils.loadConfig(config);
-
     const { frontend, main } = cfg;
-    console.log('frontend:', frontend);
-    console.log('main:', main);
 
-    // const frontendDir = path.join(process.cwd(), frontend.directory);
-    // const frontendArgs = is.string(frontend.args) ? [frontend.args] : frontend.args;
-    // console.log('frontendDir:', frontendDir);
-    // console.log('frontendArgs:', frontendArgs);
+    // 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});
 
-    //['--host --port 8080'], ['--host', '--port 8080'],
-    this.frontendServer = spawnSync(
-      'vite',
-      ['--host', '--port=8080'],
-      {
-        stdio: 'inherit', 
-        cwd: path.join(process.cwd(), 'frontend'),
-        shell: true,
-      }
-    );
-    console.log('this.frontendServer:', this.frontendServer);
-    // todo execSync衍生了shell无法找到cmd
-    // this.frontendServer = execSync(frontend.exec, {stdio: 'inherit', cwd: frontendDir});
-    // spawnSync(
-    //   frontend.cmd,
-    //   frontendArgs,
-    //   {
-    //     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();
-    this.electronServer = spawn(electronPath, mainArgs, { stdio: 'inherit' });
-    
-    this._init();
+    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')
-    let executablePath
-    if (fs.existsSync(pathFile)) {
-      executablePath = fs.readFileSync(pathFile, 'utf-8')
-    }
+    const executablePath = fs.readFileSync(pathFile, 'utf-8')
     if (executablePath) {
       electronExecPath = path.join(electronModulePath, 'dist', executablePath)
     } else {
@@ -73,28 +78,5 @@ module.exports = {
     }
     return electronExecPath
   },
-
-  /**
-   * 事件监听
-   */
-  _init() {
-    // this.frontendServer.on('data', (data) => {
-    //   console.log(`[ee-bin] [serve] frontend-server data:${data}`);
-    // });
-    // this.frontendServer.on('exit', (code, signal) => {
-    //   console.log(`[ee-bin] [serve] frontend-server code:${code}, signal:${signal}`);
-    // });
-
-    // this.frontendServer.on('error', (err) => {
-    //   console.log(`[ee-bin] [serve] frontendServer error: ${err}`);
-    // });
-
-    // this.electronServer.on('exit', (code, signal) => {
-    //   console.log(`[ee-bin] [serve] electronServer code:${code}, signal:${signal}`);
-    // });
-
-    // this.electronServer.on('error', (err) => {
-    //   console.log(`[ee-bin] [serve] electronServer error: ${err}`);
-    // });
-  }  
+  
 }

package/tools/replaceDist.js

@@ -17,42 +17,31 @@ const chalk = require('chalk');
   run(options = {}) {
     console.log('[ee-bin] [rd] Start moving resources');
     const homeDir = process.cwd();
+    const { distDir, dist, target } = options;
 
     // argv
-    const distDir = options.distDir;
-    const sourceDir = path.join(homeDir, distDir);
-    const sourceIndexFile = path.join(sourceDir, 'index.html');
-    
-    if (!this._fileExist(sourceIndexFile)) {
-      console.info(sourceIndexFile);
+    const distFolder = dist ? dist : distDir;
+    const sourceDir = path.join(homeDir, distFolder);
+    if (!fs.existsSync(sourceDir)) {
       const errorTips = chalk.bgRed('Error') + ' Frontend resource does not exist, please build !';
       console.error(errorTips);
       return
     }
     
     // 清空历史资源 并 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, 'public', 'dist');
+    const eeResourceDir = path.join(homeDir, target);
     if (!fs.existsSync(eeResourceDir)) {
       fs.mkdirSync(eeResourceDir, {recursive: true, mode: 0o777});
+    } else {
+      this._rmFolder(eeResourceDir);
+      console.log('[ee-bin] [rd] Clear history resources:', eeResourceDir);
     }
-    this._rmFolder(eeResourceDir);
-    console.log('[ee-bin] [rd] Clear history resources:', eeResourceDir);
 
     fsPro.copySync(sourceDir, eeResourceDir);
     console.log('[ee-bin] [rd] Copy a resource to:', eeResourceDir);
     console.log('[ee-bin] [rd] End');
   },
 
-  _fileExist(filePath) {
-    try {
-      return fs.statSync(filePath).isFile();
-    } catch (err) {
-      // const errorTips = chalk.bgRed('Error') + ' [ee-bin] [rd] ';
-      // console.error(errorTips, err);
-      return false;
-    }
-  },
-
   /**
    * 删除文件夹
    */