ee-bin 4.0.0-beta.1 → 4.0.1

package/config/bin_default.js

@@ -16,12 +16,17 @@ module.exports = {
       hostname: 'localhost',
       port: 8080,
       indexPath: 'index.html',
+      force: false,
+      sync: false,
     },
     electron: {
       directory: './',
       cmd: 'electron',
       args: ['.', '--env=local'],
       loadingPage: '/public/html/loading.html',
+      watch: false,
+      sync: false,
+      delay: 1000,
     },
   },
 
@@ -36,8 +41,9 @@ module.exports = {
       args: ['run', 'build'],
     },
     electron: {
+      type: 'javascript',
       bundler: 'esbuild',
-      language: 'javascript',
+      bundleType: 'bundle', // copy | bundle
       javascript: {
         entryPoints: ['./electron/**/*.js'],
         platform: 'node',
@@ -60,7 +66,47 @@ module.exports = {
         sourcemap:false,
         sourcesContent: false
       }
-    }
+    },
+    win32: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder.json', '-w=nsis', '--ia32'],
+    },
+    win64: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder.json', '-w=nsis', '--x64'],
+    },
+    win_e: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder.json', '-w=portable', '--x64'],
+    },
+    win_7z: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder.json', '-w=7z', '--x64'],
+    },
+    mac: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder-mac.json', '-m'],
+    },
+    mac_arm64: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder-mac-arm64.json', '-m', '--arm64'],
+    },
+    linux: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder-linux.json', '-l=deb', '--x64'],
+    },
+    linux_arm64: {
+      cmd: 'electron-builder',
+      directory: './',
+      args: ['--config=./cmd/builder-linux.json', '-l=deb', '--arm64'],
+    },
   },
 
   /**
@@ -88,19 +134,43 @@ module.exports = {
    * 加密
    */  
   encrypt: {
-    type: 'none',
-    files: [
-      './public/electron/**/*.(js|json)',
-    ],
-    fileExt: ['.js'],
-    cleanFiles: ['./public/electron'],
-    specificFiles: ['./public/electron/preload/bridge.js'],
-    encryptDir: './',
-    confusionOptions: {
-      compact: true,      
-      stringArray: true,
-      stringArrayEncoding: ['none'],
-      deadCodeInjection: false,
+    frontend: {
+      type: 'none',
+      files: [
+        './public/dist/**/*.(js|json)',
+      ],
+      fileExt: ['.js'],
+      cleanFiles: ['./public/dist'],
+      specificFiles: [],
+      encryptDir: './',
+      confusionOptions: {
+        compact: true,      
+        stringArray: true,
+        stringArrayEncoding: ['none'],
+        deadCodeInjection: false,
+        stringArrayCallsTransform: true,
+        numbersToExpressions: true,
+        target: 'browser',
+      }
+    },
+    electron: {
+      type: 'none',
+      files: [
+        './public/electron/**/*.(js|json)',
+      ],
+      fileExt: ['.js'],
+      cleanFiles: ['./public/electron'],
+      specificFiles: ['./public/electron/preload/bridge.js'],
+      encryptDir: './',
+      confusionOptions: {
+        compact: true,      
+        stringArray: true,
+        stringArrayEncoding: ['rc4'],
+        deadCodeInjection: false,
+        stringArrayCallsTransform: true,
+        numbersToExpressions: true,
+        target: 'node',
+      }
     }
   },
 

package/index.js

@@ -26,6 +26,7 @@ program
   .description('building multiple resources')
   .option('--config <folder>', 'config file')
   .option('--cmds <flag>', 'custom commands')
+  .option('--env <env>', 'environment')
   .action(function() {
     serveProcess.build(this.opts());
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.1",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "adm-zip": "^0.4.11",
     "bytenode": "^1.3.6",
     "chalk": "^4.1.2",
+    "chokidar": "^4.0.3",
     "commander": "^11.0.0",
     "config-file-ts": "^0.2.8-rc1",
     "cross-spawn": "^7.0.3",
@@ -25,6 +26,7 @@
     "is-type-of": "^1.2.1",
     "javascript-obfuscator": "^4.0.2",
     "json5": "^2.2.3",
-    "mkdirp": "^2.1.3"
+    "mkdirp": "^2.1.3",
+    "tree-kill": "^1.2.2"
   }
 }

package/tools/encrypt.js

@@ -9,17 +9,19 @@ const JavaScriptObfuscator = require('javascript-obfuscator');
 const globby = require('globby');
 const chalk = require('chalk');
 const { loadConfig } = require('../lib/utils');
+const { extend } = require('../lib/extend');
 
 const EncryptTypes = ['bytecode', 'confusion', 'strict'];
 
 class Encrypt {
   constructor(options = {}) {
     // cli args
-    const { config, out } = options;
+    const { config, out, target } = options;
     this.basePath = process.cwd();
+    this.target = target;
     
-    const cfg = loadConfig(config);
-    this.config = cfg.encrypt;
+    const conf = loadConfig(config).encrypt;
+    this.config = conf[target];
     const outputFolder = out || this.config.encryptDir;
     this.encryptDir = path.join(this.basePath, outputFolder);
     this.filesExt = this.config.fileExt;
@@ -43,45 +45,16 @@ class Encrypt {
     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);
+    if (EncryptTypes.indexOf(this.type) == -1) return;
+    if (this.target == 'frontend' && (this.type == 'bytecode' || this.type == 'strict')) return;
+
+    console.log(chalk.blue('[ee-bin] [encrypt] ') + `start ciphering ${this.target}`);
     for (const file of this.codefiles) {
-      const fullpath = path.join(this.encryptCodeDir, file);
+      const fullpath = path.join(this.encryptDir, file);
       if (!fs.statSync(fullpath).isFile()) continue;
 
       // 特殊文件处理
@@ -172,13 +145,22 @@ class Encrypt {
 }
 
 function encrypt(options = {}) {
-  const enc = new Encrypt(options);
-  if (EncryptTypes.indexOf(enc.type) == -1) return;
-  //if (!enc.backup()) return;
-  enc.encrypt();
+  const electronOpt = extend(true, {
+    target: 'electron',
+  }, options);
+  const electronEpt = new Encrypt(electronOpt);
+  electronEpt.encrypt();
+
+  const frontendOpt = extend(true, {
+    target: 'frontend',
+  }, options);
+  const frontendEpt = new Encrypt(frontendOpt);
+  frontendEpt.encrypt();
 }
 
 function cleanEncrypt(options = {}) {
+  // [todo] 删除前端和主进程代码
+  return;
   let files = options.dir !== undefined ? options.dir : ['./public/electron'];
   files = is.string(files) ? [files] : files;
 

package/tools/serve.js

@@ -2,22 +2,30 @@
 
 const debug = require('debug')('ee-bin:serve');
 const path = require('path');
+const fsPro = require('fs-extra');
 const { loadConfig } = require('../lib/utils');
 const is = require('is-type-of');
 const chalk = require('chalk');
 const crossSpawn = require('cross-spawn');
 const { buildSync } = require('esbuild');
+const chokidar = require('chokidar');
+const kill = require('tree-kill');
 
 class ServeProcess {
 
   constructor() {
+    process.env.NODE_ENV = 'prod'; // dev / prod
     this.execProcess = {};
+    this.electronDir = './electron';
+    this.defaultBundleDir = './public/electron';
   }
 
   /**
    * 启动前端、主进程服务
    */
   dev(options = {}) {
+    // 设置一个环境变量
+    process.env.NODE_ENV = 'dev';
     const { config, serve } = options;
     const binCfg = loadConfig(config);
     const binCmd = 'dev';
@@ -27,18 +35,53 @@ class ServeProcess {
     if (!command) {
       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,
     }
+
+    // build electron main code 
+    const cmds = this._formatCmds(command);
+    if (cmds.indexOf("electron") !== -1) {
+      // watche electron main code
+      const electronConfig = binCmdConfig.electron;
+      if (electronConfig.watch) {
+        const cmd = 'electron';
+        const watcher = chokidar.watch([this.electronDir], {
+          persistent: true
+        });
+        watcher.on('change', async (f) => {
+          console.log(chalk.blue('[ee-bin] [dev] ') + `File ${f} has been changed`);
+          console.log(chalk.blue('[ee-bin] [dev] ') + `Restart ${cmd}`);
+
+          // rebuild code
+          this.bundle(binCfg.build.electron);
+          let subPorcess = this.execProcess[cmd];
+          kill(subPorcess.pid, 'SIGKILL', (err) => {
+            if (err) {
+              console.log(chalk.red('[ee-bin] [dev] ') + `Restart failed, error: ${err}`);
+              process.exit(-1);
+            }
+          })
+          delete this.execProcess[cmd];
+  
+          // restart electron command
+          setTimeout(() => {
+            let onlyElectronOpt = {
+              binCmd,
+              binCmdConfig,
+              command: cmd,
+            }
+            this.multiExec(onlyElectronOpt);
+          }, electronConfig.delay);
+        });
+      }
+
+      // When starting for the first time, build the code for the electron directory
+      this.bundle(binCfg.build.electron);
+    }
+
     this.multiExec(opt);
   }
 
@@ -69,7 +112,8 @@ class ServeProcess {
    * 构建
    */
   build(options = {}) {
-    const { config, cmds } = options;
+    const { config, cmds, env } = options;
+    process.env.NODE_ENV = env;
     const binCfg = loadConfig(config);
     const binCmd = 'build';
     const binCmdConfig = binCfg[binCmd];
@@ -81,7 +125,7 @@ class ServeProcess {
     }
 
     if (cmds.indexOf("electron") !== -1) {
-      this.bundle(false, binCfg.build.electron);
+      this.bundle(binCmdConfig.electron);
       return;
     }
 
@@ -161,13 +205,22 @@ class ServeProcess {
   } 
   
   // esbuild
-  bundle(isDev = false, bundleConfig) {
-    const esbuildOptions = bundleConfig[bundleConfig.language];
-    if (isDev) {
-      // [todo]
+  bundle(bundleConfig) {
+    const { bundleType } = bundleConfig;
+    if (bundleType == 'copy') {
+      const srcResource = path.join(process.cwd(), this.electronDir);
+      const destResource = path.join(process.cwd(), this.defaultBundleDir);
+      fsPro.removeSync(destResource);
+      fsPro.copySync(srcResource, destResource);
+    } else {
+      const esbuildOptions = bundleConfig[bundleConfig.type];
+      // todo 不压缩
+      // if (this.isDev()) {
+      //   esbuildOptions.minify = false;
+      // }
+      debug('esbuild options:%O', esbuildOptions);
+      buildSync(esbuildOptions);
     }
-    debug('esbuild options:%O', esbuildOptions);
-    buildSync(esbuildOptions);
   }
 
   // format commands
@@ -181,7 +234,12 @@ class ServeProcess {
     }
 
     return cmds;
-  }  
+  }
+  
+  // env
+  isDev() {
+    return process.env.NODE_ENV === 'dev';
+  }
 }
 
 module.exports = {