ee-bin 2.0.0-beta.1 → 4.0.0-beta.1

package/tools/encrypt.js

@@ -0,0 +1,197 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const is = require('is-type-of');
+const bytenode = require('bytenode');
+const JavaScriptObfuscator = require('javascript-obfuscator');
+const globby = require('globby');
+const chalk = require('chalk');
+const { loadConfig } = require('../lib/utils');
+
+const EncryptTypes = ['bytecode', 'confusion', 'strict'];
+
+class Encrypt {
+  constructor(options = {}) {
+    // cli args
+    const { config, out } = options;
+    this.basePath = process.cwd();
+    
+    const cfg = loadConfig(config);
+    this.config = cfg.encrypt;
+    const outputFolder = out || this.config.encryptDir;
+    this.encryptDir = path.join(this.basePath, outputFolder);
+    this.filesExt = this.config.fileExt;
+    this.type = this.config.type;
+    this.bOpt = this.config.bytecodeOptions;
+    this.cOpt = this.config.confusionOptions;
+    this.cleanFiles = this.config.cleanFiles;
+    this.patterns = this.config.files || null;
+    this.specFiles = this.config.specificFiles;
+
+    this.codefiles = this._initCodeFiles();
+  }
+
+  /**
+   * 初始化需要加密的文件列表
+   */
+  _initCodeFiles() {
+    if (!this.patterns) return;
+
+    const files = globby.sync(this.patterns, { cwd: this.basePath });
+    return files;
+  }
+
+  /**
+   * 备份代码
+   */
+  backup() {
+    // clean
+    this.cleanCode();
+
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'backup start');
+    this.codefiles.forEach((filepath) => {
+      let source = path.join(this.basePath, filepath);
+      if (fs.existsSync(source)) {
+        let target = path.join(this.encryptCodeDir, filepath);
+        fsPro.copySync(source, target);
+      }
+    })
+
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'backup end');
+    return true;
+  }
+  
+  /**
+   * 清除加密代码
+   */
+  cleanCode() {
+    this.cleanFiles.forEach((file) => {
+      let tmpFile = path.join(this.basePath, file);
+      fsPro.removeSync(tmpFile);
+      console.log(chalk.blue('[ee-bin] [encrypt] ') + 'clean up tmp files:' + chalk.magenta(`${tmpFile}`));
+    })
+  }
+
+  /**
+   * 加密代码
+   */
+  encrypt() {
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'start ciphering');
+    console.log(this.codefiles);
+    for (const file of this.codefiles) {
+      const fullpath = path.join(this.encryptCodeDir, file);
+      if (!fs.statSync(fullpath).isFile()) continue;
+
+      // 特殊文件处理
+      if (this.specFiles.includes(file)) {
+        this.generate(fullpath, 'confusion');
+        continue;
+      }
+
+      this.generate(fullpath);
+    } 
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + 'end ciphering');
+  };
+
+  /**
+   * 递归
+   */
+  loop(dirPath) {
+    let files = [];
+    if (fs.existsSync(dirPath)) {
+      files = fs.readdirSync(dirPath);
+      files.forEach((file, index) => {
+        let curPath = dirPath + '/' + file;        
+        if (fs.statSync(curPath).isDirectory()) {
+          this.loop(curPath);
+        } else {
+          const extname = path.extname(curPath);
+          if (this.filesExt.indexOf(extname) !== -1) {
+            this.generate(curPath);
+          }
+        }
+      });
+    }
+  }
+
+  /**
+   * 生成文件
+   */  
+  generate(curPath, type) {
+    let encryptType = type ? type : this.type;
+
+    let tips = chalk.blue('[ee-bin] [encrypt] ') + 'file: ' + chalk.green(`${curPath}`) + ' ' + chalk.cyan(`(${encryptType})`);
+    console.log(tips);
+    if (encryptType == 'strict') {
+      this.generateJSConfuseFile(curPath);
+      this.generateBytecodeFile(curPath);
+    } else if (encryptType == 'bytecode') {
+      this.generateBytecodeFile(curPath);
+    } else if (encryptType == 'confusion') {
+      this.generateJSConfuseFile(curPath);
+    } else {
+      // none
+    }
+  }
+
+  /**
+   * 使用 javascript-obfuscator 生成压缩/混淆文件
+   */  
+  generateJSConfuseFile(file) {
+    let opt = Object.assign({
+      compact: true,
+      stringArray: true,
+      stringArrayThreshold: 1,
+    }, this.cOpt);
+    
+    let code = fs.readFileSync(file, "utf8");
+    let result = JavaScriptObfuscator.obfuscate(code, opt);
+    fs.writeFileSync(file, result.getObfuscatedCode(), "utf8"); 
+  }
+
+  /**
+   * 生成字节码文件
+   */
+  generateBytecodeFile(curPath) {
+    if (path.extname(curPath) !== '.js') {
+      return
+    }
+    //let jscFile = curPath.replace(/.js/g, '.jsc');
+    let jscFile = curPath + 'c';
+    let opt = Object.assign({
+      filename: curPath,
+      output: jscFile,
+      electron: true
+    }, this.bOpt);
+
+    bytenode.compileFile(opt);
+	  fsPro.removeSync(curPath);
+  }
+}
+
+function encrypt(options = {}) {
+  const enc = new Encrypt(options);
+  if (EncryptTypes.indexOf(enc.type) == -1) return;
+  //if (!enc.backup()) return;
+  enc.encrypt();
+}
+
+function cleanEncrypt(options = {}) {
+  let files = options.dir !== undefined ? options.dir : ['./public/electron'];
+  files = is.string(files) ? [files] : files;
+
+  files.forEach((file) => {
+    const tmpFile = path.join(process.cwd(), file);
+    if (fs.existsSync(tmpFile)) {
+      fsPro.removeSync(tmpFile);
+      console.log(chalk.blue('[ee-bin] [encrypt] ') + 'clean up tmp files: ' + chalk.magenta(`${tmpFile}`));
+    }
+  })
+}
+
+module.exports = {
+  encrypt,
+  cleanEncrypt,
+};

package/tools/{incrUpdater.cjs → incrUpdater.js}

@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto')
 const chalk = require('chalk');
-const Utils = require('../lib/utils');
+const { loadConfig, rm, getPackage, writeJsonSync } = require('../lib/utils');
 const admZip = require('adm-zip')
 
 /**
@@ -12,15 +12,15 @@ const admZip = require('adm-zip')
  * @class
  */
 
-module.exports = {
-  
+class IncrUpdater {
+
   /**
    * 执行
    */  
   run(options = {}) {
     console.log('[ee-bin] [updater] Start');
     const { config, asarFile, platform } = options;
-    const binCfg = Utils.loadConfig(config);
+    const binCfg = loadConfig(config);
     const cfg = binCfg.updater;
 
     if (!cfg) {
@@ -28,20 +28,21 @@ module.exports = {
       return;
     }
 
-    if (platform) {
-      this.generateFile(cfg, asarFile, platform);
-    } else {
-      this.generateFileOld(cfg, asarFile);
-    }
+    this.generateFile(cfg, asarFile, platform);
 
     console.log('[ee-bin] [updater] End');
-  },
+  }
 
   /**
    * 生成增量升级文件
    */ 
   generateFile(config, asarFile, platform) {
     const cfg = config[platform];
+    if (!cfg) {
+      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${platform} config does not exist`));
+      return;
+    }
+
     let latestVersionInfo = {}
     const homeDir = process.cwd();
     console.log(chalk.blue('[ee-bin] [updater] ') + chalk.green(`${platform} config:`), cfg);
@@ -66,7 +67,7 @@ module.exports = {
       return;
     }
 
-    const packageJson = Utils.getPackage();
+    const packageJson = getPackage();
     const version = packageJson.version;
     let platformForFilename = platform;
     if (platform.indexOf("_") !== -1) {
@@ -79,7 +80,7 @@ module.exports = {
     zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
     const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
     if (fs.existsSync(asarZipPath)) {
-      Utils.rm(asarZipPath);
+      rm(asarZipPath);
     }
     const zip = new admZip();
     // 添加 asar 文件
@@ -114,107 +115,17 @@ module.exports = {
     const jsonName = path.basename(cfg.output.file, '.json') + `-${platformForFilename}.json`;
     latestVersionInfo = item;
     const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, jsonName);
-    Utils.writeJsonSync(updaterJsonFilePath, latestVersionInfo);
+    writeJsonSync(updaterJsonFilePath, latestVersionInfo);
 
     // 删除缓存文件，防止生成的 zip 是旧版本
     if (cfg.cleanCache) {
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'mac'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'mac-arm64'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-ia32-unpacked'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'linux-unpacked'));
+      rm(path.join(homeDir, cfg.output.directory, 'mac'));
+      rm(path.join(homeDir, cfg.output.directory, 'mac-arm64'));
+      rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
+      rm(path.join(homeDir, cfg.output.directory, 'win-ia32-unpacked'));
+      rm(path.join(homeDir, cfg.output.directory, 'linux-unpacked'));
     }  
-  },
-
-  /**
-   * 将废弃
-   */ 
-  generateFileOld(cfg, asarFile) {
-    var latestVersionInfo = {}
-    const homeDir = process.cwd();
-    console.log(chalk.blue('[ee-bin] [updater] ') + chalk.green('config:'), cfg);
-
-    let asarFilePath = "";
-    if (asarFile) {
-      asarFilePath = path.normalize(path.join(homeDir, asarFile));
-    } else if (Array.isArray(cfg.asarFile)) {  
-      // 检查文件列表，如果存在就跳出
-      for (const filep of cfg.asarFile) {
-        asarFilePath = path.normalize(path.join(homeDir, filep));
-        if (fs.existsSync(asarFilePath)) {
-          break;
-        }
-      }
-    } else {
-      asarFilePath = path.normalize(path.join(homeDir, cfg.asarFile));
-    }
-
-    if (!fs.existsSync(asarFilePath)) {
-      console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${asarFilePath} does not exist`));
-      return;
-    }
-
-    const packageJson = Utils.getPackage();
-    const version = packageJson.version;
-    const platformForFilename = Utils.getPlatform("-");
-    const platformForKey = Utils.getPlatform("_");
-
-    // 生成 zip
-    let zipName = "";
-    if (cfg.output.noPlatform === true) {
-      zipName = path.basename(cfg.output.zip, '.zip') + `-${version}.zip`;
-    } else {
-      zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
-    }
-    
-    const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
-    if (fs.existsSync(asarZipPath) && cfg.cleanCache) {
-      Utils.rm(asarZipPath);
-    }
-    const zip = new admZip();
-    zip.addLocalFile(asarFilePath); 
-    zip.writeZip(asarZipPath, (err) => {
-      if (err) {
-        console.log(chalk.blue('[ee-bin] [updater] create zip ') + chalk.red(`Error: ${err}`));
-      }
-    });
-
-    const sha1 = this.generateSha1(asarFilePath);
-    const date = this._getFormattedDate();
-    const fileStat = fs.statSync(asarFilePath);
-
-    const item = {
-      version: version,
-      file: zipName,
-      size: fileStat.size,
-      sha1: sha1,
-      releaseDate: date,
-    };
-    let jsonName = "";
-    if (cfg.output.noPlatform === true) {
-      jsonName = cfg.output.file;
-      latestVersionInfo = item;
-    } else {
-      // 生成与系统有关的文件
-      jsonName = path.basename(cfg.output.file, '.json') + `-${platformForFilename}.json`;
-      if (platformForKey !== "") {
-        latestVersionInfo[platformForKey] = item;
-      } else {
-        console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${platformForFilename} is not supported`));
-      }
-    }
-
-    const updaterJsonFilePath = path.join(homeDir, cfg.output.directory, jsonName);
-    Utils.writeJsonSync(updaterJsonFilePath, latestVersionInfo);
-
-    // 删除缓存文件，防止生成的 zip 是旧版本
-    if (cfg.cleanCache) {
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'mac'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'mac-arm64'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'win-unpacked'));
-      Utils.rm(path.join(homeDir, cfg.output.directory, 'linux-unpacked'));
-    }  
-  },
+  }
   
   generateSha1(filepath = "") {
     let sha1 = '';
@@ -239,7 +150,7 @@ module.exports = {
       console.log(chalk.blue('[ee-bin] [updater] ') + chalk.red(`Error: ${error}`));
     }
     return sha1;
-  },
+  }
 
   _getFormattedDate() {
     const date = new Date(); // 获取当前日期
@@ -248,5 +159,10 @@ module.exports = {
     const day = date.getDate().toString().padStart(2, '0'); // 获取日
   
     return `${year}-${month}-${day}`; 
-  }
+  }  
+}
+
+module.exports = {
+  IncrUpdater,
+  incrUpdater: new IncrUpdater()
 }

package/tools/move.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const chalk = require('chalk');
+const { loadConfig, rm } = require('../lib/utils');
+
+const homeDir = process.cwd();
+
+// 移动资源
+function move(options = {}) {
+  console.log('[ee-bin] [move] Start moving resources');
+  const { config, flag } = options;
+  const binCfg = loadConfig(config);
+  const moveConfig = binCfg.move;
+  
+  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 = moveConfig[f];
+
+    if (!cfg) {
+      console.log(chalk.blue('[ee-bin] [move] ') + chalk.red(`Error: ${f} config does not exist` ));
+      return;
+    }
+
+    const { src, dest, dist, target } = cfg;
+    const source = dist ? dist : src;
+    const destination = target ? target : dest;
+
+    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green(`Move flag: ${f}`));
+    console.log(chalk.blue('[ee-bin] [move] ') + chalk.green('config:'), cfg);
+
+    const srcResource = path.join(homeDir, source);
+    if (!fs.existsSync(srcResource)) {
+      const errorTips = chalk.bgRed('Error') + ` ${source} resource does not exist !`;
+      console.error(errorTips);
+      return
+    }
+
+    // clear the historical resource and copy it to the ee resource directory
+    const destResource = path.join(homeDir, destination);
+    if (fs.statSync(srcResource).isDirectory() && !fs.existsSync(destResource)) {
+      fs.mkdirSync(destResource, {recursive: true, mode: 0o777});
+    } else {
+      rm(destResource);
+      console.log('[ee-bin] [move] Clear history resources:', destResource);
+    }
+
+    fsPro.copySync(srcResource, destResource);
+
+    // [todo] go project, special treatment of package.json, reserved only necessary
+    console.log(`[ee-bin] [move] Copy ${srcResource} to ${destResource}`);
+  }
+
+  console.log('[ee-bin] [move] End');
+}
+
+module.exports = {
+  move
+}

package/tools/{serve.cjs → serve.js}

@@ -1,22 +1,26 @@
 'use strict';
 
+const debug = require('debug')('ee-bin:serve');
 const path = require('path');
-const Utils = require('../lib/utils');
+const { loadConfig } = require('../lib/utils');
 const is = require('is-type-of');
 const chalk = require('chalk');
 const crossSpawn = require('cross-spawn');
+const { buildSync } = require('esbuild');
 
-module.exports = {
+class ServeProcess {
 
-  execProcess: {},
+  constructor() {
+    this.execProcess = {};
+  }
 
   /**
    * 启动前端、主进程服务
    */
   dev(options = {}) {
     const { config, serve } = options;
+    const binCfg = loadConfig(config);
     const binCmd = 'dev';
-    const binCfg = Utils.loadConfig(config);
     const binCmdConfig = binCfg[binCmd];
 
     let command = serve;
@@ -24,21 +28,27 @@ module.exports = {
       command = Object.keys(binCmdConfig).join();
     }
 
+    // build electron code 
+    const cmds = this._formatCmds(command);
+    if (cmds.indexOf("electron") !== -1) {
+      this.bundle(true, binCfg.build.electron);
+    }
+
     const opt = {
       binCmd,
       binCmdConfig,
       command,
     }
     this.multiExec(opt);
-  },
+  }
 
   /**
    * 启动主进程服务
    */
   start(options = {}) {
     const { config } = options;
+    const binCfg = loadConfig(config);
     const binCmd = 'start';
-    const binCfg = Utils.loadConfig(config);
     const binCmdConfig = {
       start: binCfg[binCmd]
     };
@@ -49,63 +59,56 @@ module.exports = {
       command: binCmd,
     }
     this.multiExec(opt);
-  },
+  }
 
   sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
-  },
+  }
 
   /**
    * 构建
    */
   build(options = {}) {
     const { config, cmds } = options;
+    const binCfg = loadConfig(config);
     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/c492f8/');
+      const tip = chalk.bgYellow('Warning') + ' Please modify the ' + chalk.blue('build') + ' property in the bin file';
       console.log(tip);
       return
     }
 
+    if (cmds.indexOf("electron") !== -1) {
+      this.bundle(false, binCfg.build.electron);
+      return;
+    }
+
     const opt = {
       binCmd,
       binCmdConfig,
       command: cmds,
     }
     this.multiExec(opt);
-  },
+  }
 
   /**
    * 执行自定义命令
    */
   exec(options = {}) {
-    let { config, command, cmds } = options;
+    const { config, cmds } = options;
+    const binCfg = loadConfig(config);
     const binCmd = 'exec';
-    const binCfg = Utils.loadConfig(config);
     const binCmdConfig = binCfg[binCmd];
 
-    // if (typeof command !== "string" || !cmds) {
-    //   console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: Please specify parameters for --cmds` ));
-    //   return
-    // }
-
-    // 兼容
-    if (typeof command === "string") {
-      cmds = command;
-    }
-
     const opt = {
       binCmd,
       binCmdConfig,
       command: cmds,
     }
     this.multiExec(opt);
-  },
+  }
 
   /**
    * 支持多个命令
@@ -113,18 +116,11 @@ module.exports = {
   multiExec(opt = {}) {
     //console.log('multiExec opt:', opt)
     const { binCmd, binCmdConfig, command } = opt;
-
-    let cmds;
-    const cmdString = command.trim();
-    if (cmdString.indexOf(',') !== -1) {
-      cmds = cmdString.split(',');
-    } else {
-      cmds = [cmdString];
-    }
+    const cmds = this._formatCmds(command);
 
     for (let i = 0; i < cmds.length; i++) {
       let cmd = cmds[i];
-      let cfg = binCmdConfig[cmd];
+      const cfg = binCmdConfig[cmd];
 
       if (!cfg) {
         console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + chalk.red(`Error: [${binCmd} ${cmd}] config does not exist` ));
@@ -132,16 +128,16 @@ module.exports = {
       }
 
       // frontend 如果是 file:// 协议，则不启动
-      if (cmd == 'frontend' && cfg.protocol == 'file://') {
+      if (binCmd == 'dev' && cmd == 'frontend' && cfg.protocol == 'file://') {
         continue;
       }
 
       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;
-      let stdio = cfg.stdio ? cfg.stdio: 'inherit';
+      const execDir = path.join(process.cwd(), cfg.directory);
+      const execArgs = is.string(cfg.args) ? [cfg.args] : cfg.args;
+      const stdio = cfg.stdio ? cfg.stdio: 'inherit';
 
       const handler = cfg.sync ? crossSpawn.sync : crossSpawn;
 
@@ -158,10 +154,37 @@ module.exports = {
             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');
+          console.log(chalk.blue(`[ee-bin] [${binCmd}] `) + 'The ' + chalk.green(`[${binCmd} ${cmd}]`) + ' command has been executed and exited');
         });
       }
     }
-  },
+  } 
+  
+  // esbuild
+  bundle(isDev = false, bundleConfig) {
+    const esbuildOptions = bundleConfig[bundleConfig.language];
+    if (isDev) {
+      // [todo]
+    }
+    debug('esbuild options:%O', esbuildOptions);
+    buildSync(esbuildOptions);
+  }
 
+  // format commands
+  _formatCmds(command) {
+    let cmds;
+    const cmdString = command.trim();
+    if (cmdString.indexOf(',') !== -1) {
+      cmds = cmdString.split(',');
+    } else {
+      cmds = [cmdString];
+    }
+
+    return cmds;
+  }  
+}
+
+module.exports = {
+  ServeProcess,
+  serveProcess: new ServeProcess()
 }