ee-core 2.3.1 → 2.4.0-beta.2

package/bin/tools.js

@@ -1,27 +1,8 @@
 #!/usr/bin/env node
 
-const replaceDist = require('../tools/replaceDist');
-const encrypt = require('../tools/encrypt');
-//const iconGen = require('../tools/iconGen');
+const chalk = require('chalk');
 
-// argv
-const args = process.argv;
-// console.log('[ee-core] args:', args);
-const cmd = args[2];
-console.log('[ee-core] [bin/tools] cmd:', cmd);
+let tip = chalk.bgYellow('Warning') + ' please use ' + chalk.blue('ee-bin') + ', See: ';
+tip += chalk.underline('https://www.kaka996.com/pages/85c531/');
 
-if (cmd == 'rd') {
-  replaceDist.run();
-}
-
-if (cmd == 'encrypt') {
-  encrypt.run();
-}
-
-if (cmd == 'clean') {
-  encrypt.clean();
-}
-
-// if (cmd == 'icon') {
-//   iconGen.run();
-// }
+console.log(tip);

package/electron/window/index.js

@@ -43,7 +43,7 @@ const Window = {
     }
 
     // DevTools
-    if (!app.isPackaged && config.openDevTools) {
+    if (config.openDevTools) {
       win.webContents.openDevTools({
         mode: 'undocked'
       });

package/jobs/child/forkProcess.js

@@ -17,6 +17,7 @@ class ForkProcess {
       cwd = path.join(Ps.getHomeDir(), '..');
     }
 
+    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
     let options = Object.assign({
       processArgs: {},
       processOptions: { 

package/jobs/renderer/index.js

@@ -1,7 +1,7 @@
-//require('bytenode');
 const { BrowserWindow } = require('electron');
 const fs = require('fs');
 const LoadView = require('./loadView');
+const Loader = require('../../loader');
 
 class RendererJob {
 
@@ -12,6 +12,7 @@ class RendererJob {
     * @param  {Object} options - options to create BrowserWindow
     */
   constructor(name, filepath, opt = {}) {
+    // TODO Object.assign 只能单层对象结构，多层的对象会直接覆盖
     let options = Object.assign({
       show: false,
       webPreferences: {
@@ -25,7 +26,7 @@ class RendererJob {
     this.subWin = new BrowserWindow(options);
 
     this.jobReady = false;
-    this.exec = filepath;
+    this.exec = Loader.getFullpath(filepath);;
     this.name = name;
     this.listeners = [];
     this.callbacks = [];

package/jobs/renderer/loadView.js

@@ -1,3 +1,4 @@
+//require('bytenode');
 const Ps = require('../../ps');
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.3.1",
+  "version": "2.4.0-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -14,14 +14,13 @@
   "dependencies": {
     "agentkeepalive": "^4.2.0",
     "bytenode": "^1.3.6",
+    "chalk": "^4.1.2",
     "dayjs": "^1.11.7",
     "debug": "^4.3.3",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
-    "fs-extra": "^10.0.0",
     "globby": "^10.0.0",
     "is-type-of": "^1.2.1",
-    "javascript-obfuscator": "^4.0.2",
     "koa": "^2.13.4",
     "koa-body": "^5.0.0",
     "koa-convert": "^2.0.0",

package/tools/encrypt.js

@@ -1,335 +0,0 @@
-'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 crypto = require('crypto');
-const JavaScriptObfuscator = require('javascript-obfuscator');
-const globby = require('globby');
-const UtilsJson = require('../utils/json');
-
-class Encrypt {
-  constructor() {
-    this.basePath = process.cwd();
-    this.dirs = [];
-    this.encryptCodeDir = path.join(this.basePath, 'public');
-    this.config = this.loadConfig('encrypt.js');
-    this.filesExt = this.config.fileExt || ['.js'];
-    this.type = this.config.type || 'confusion';
-    this.bOpt = this.config.bytecodeOptions || {};
-    this.cOpt = this.config.confusionOptions || {};
-    this.cleanFiles = this.config.cleanFiles || ['electron'];
-
-    const directory = this.config.directory || ['electron'];
-    this.patterns = this.config.files || null;
-    this.specificFiles = [ 'electron/preload/bridge.js' ];
-    this.tmpFile = ''; // todo
-    this.mapFile = ''; // todo
-
-    // cli
-    if (Object.keys(this.config).length == 0) {
-      for (let i = 0; i < process.argv.length; i++) {
-        let tmpArgv = process.argv[i];
-        if (tmpArgv.indexOf('--type=') !== -1) {
-          this.type = tmpArgv.substring(7);
-        }
-      }
-    }
-
-    for (let i = 0; i < directory.length; i++) {
-      let codeDirPath = path.join(this.basePath, directory[i]);
-      if (fs.existsSync(codeDirPath)) {
-        this.dirs.push(directory[i]);
-      }
-    }
-
-    this.codefiles = this._initCodeFiles();
-    //console.log('[ee-core] [tools/encrypt] codefiles:', this.codefiles);
-  }
-
-  /**
-   * 初始化需要加密的文件列表
-   */
-  _initCodeFiles() {
-    if (!this.patterns) return;
-
-    const files = globby.sync(this.patterns, { cwd: this.basePath });
-    return files;
-  }
-
-  /**
-   * 备份代码
-   */
-  backup() {
-    // clean
-    this.cleanCode();
-
-    console.log('[ee-core] [tools/encrypt] backup start');
-    if (this.patterns) {
-      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);
-        }
-      })
-    } else {
-      for (let i = 0; i < this.dirs.length; i++) {
-        // check code dir
-        let codeDirPath = path.join(this.basePath, this.dirs[i]);
-        if (!fs.existsSync(codeDirPath)) {
-          console.log('[ee-core] [tools/encrypt] ERROR: backup %s is not exist', codeDirPath);
-          return
-        }
-  
-        // copy
-        let targetDir = path.join(this.encryptCodeDir, this.dirs[i]);
-        console.log('[ee-core] [tools/encrypt] backup target Dir:', targetDir);
-        if (!fs.existsSync(targetDir)) {
-          this.mkdir(targetDir);
-          this.chmodPath(targetDir, '777');
-        }
-  
-        fsPro.copySync(codeDirPath, targetDir);
-      }
-    }
-
-    console.log('[ee-core] [tools/encrypt] backup end');
-    return true;
-  }
-  
-  /**
-   * 清除加密代码
-   */
-  cleanCode() {
-    this.cleanFiles.forEach((file) => {
-      let tmpFile = path.join(this.encryptCodeDir, file);
-      this.rmBackup(tmpFile);
-      console.log('[ee-core] [tools/encrypt] clean up tmp files:', tmpFile);
-    })
-  }
-
-  prepare() {
-    if (this.type == 'bytecode') {
-      let filename = this.config.mangle || this.config.mangle.file || null;
-      if (filename) {
-        this.tmpFile = path.join(this.encryptCodeDir, 'electron', 'tmp.json');
-        this.mapFile = path.join(this.encryptCodeDir, 'electron', filename);
-        fs.writeFileSync(this.mapFile, '');
-        const content = {
-          nameMap: {}
-        };
-        UtilsJson.writeSync(this.tmpFile, content);
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * 加密代码
-   */
-  encrypt() {
-    console.log('[ee-core] [tools/encrypt] start ciphering');
-    if (this.patterns) {
-      for (const file of this.codefiles) {
-        const fullpath = path.join(this.encryptCodeDir, file);
-        if (!fs.statSync(fullpath).isFile()) continue;
-
-        // 特殊文件处理
-        if (this.specificFiles.includes(file)) {
-          this.generate(fullpath, 'confusion');
-          continue;
-        }
-
-        this.generate(fullpath);
-      }  
-    } else {
-      console.log('[ee-core] [tools/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] [tools/encrypt] !!!!!! please use the new encryption method !!!!!!');
-    }
-
-    console.log('[ee-core] [tools/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;
-    console.log(`[ee-core] [tools/encrypt] file: ${curPath} (${encryptType})`);
-
-    if (encryptType == 'bytecode') {
-      this.generateBytecodeFile(curPath);
-    } else if (encryptType == 'confusion') {
-      this.generateJSConfuseFile(curPath);
-    } else {
-      this.generateJSConfuseFile(curPath);
-      this.generateBytecodeFile(curPath);
-    }
-  }
-
-  /**
-   * 使用 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);
-
-    //fs.writeFileSync(curPath, 'require("bytenode");module.exports = require("./'+path.basename(jscFile)+'");', 'utf8');
-
-	  fsPro.removeSync(curPath);
-  }
-
-  /**
-   * 移除备份
-   */
-  rmBackup(file) {
-    if (fs.existsSync(file)) {
-      fsPro.removeSync(file);
-    }
-    return;
-  }
-
-  /**
-   * 检查文件是否存在
-   */
-  fileExist(filePath) {
-    try {
-      return fs.statSync(filePath).isFile();
-    } catch (err) {
-      return false;
-    }
-  };
-
-  mkdir(dirpath, dirname) {
-    // 判断是否是第一次调用
-    if (typeof dirname === 'undefined') {
-      if (fs.existsSync(dirpath)) {
-        return;
-      }
-      this.mkdir(dirpath, path.dirname(dirpath));
-    } else {
-      // 判断第二个参数是否正常，避免调用时传入错误参数
-      if (dirname !== path.dirname(dirpath)) {
-        this.mkdir(dirpath);
-        return;
-      }
-      if (fs.existsSync(dirname)) {
-        fs.mkdirSync(dirpath);
-      } else {
-        this.mkdir(dirname, path.dirname(dirname));
-        fs.mkdirSync(dirpath);
-      }
-    }
-  };
-
-  chmodPath(path, mode) {
-    let files = [];
-    if (fs.existsSync(path)) {
-      files = fs.readdirSync(path);
-      files.forEach((file, index) => {
-        const curPath = path + '/' + file;
-        if (fs.statSync(curPath).isDirectory()) {
-          this.chmodPath(curPath, mode); // 递归删除文件夹
-        } else {
-          fs.chmodSync(curPath, mode);
-        }
-      });
-      fs.chmodSync(path, mode);
-    }
-  };
-
-  loadConfig(prop) {
-    const filepath = path.join(this.basePath, 'electron', 'config', prop);
-    if (!fs.existsSync(filepath)) {
-      return {};
-    }
-    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');
-    hash.update(buffer, 'utf8');
-    const str = hash.digest('hex');
-    return str;
-  }
-}
-
-const run = () => {
-  const e = new Encrypt();
-  if (!e.backup()) return;
-  //if (!e.prepare()) return;
-  e.encrypt();
-}
-
-const clean = () => {
-  const e = new Encrypt();
-  e.cleanCode();
-}
-
-module.exports = {
-  run,
-  clean,
-};

package/tools/iconGen.js

@@ -1,183 +0,0 @@
-'use strict';
-
-const fs = require("fs");
-const path = require("path");
-const icongen = require("icon-gen");
-
-class IconGen {
-  constructor() {
-    this._init();
-  }
-
-  /**
-   * _init
-   */
-  _init() {
-    // ---> 处理参数
-    const args = process.argv.splice(3);
-    let params = {
-      input: "/public/images/logo.png",
-      output: "/build/icons/",
-      size: "16,32,64,256,512",
-      clear: false,
-      imagesDir: "/public/images/",
-    };
-    try {
-      const len = args.length;
-      for (let i = 0; i < len; i++) {
-        const arg = args[i];
-        if (arg.match(/^-i/) || arg.match(/^-input/)) {
-          params["input"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-o/) || arg.match(/^-output/)) {
-          params["output"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-s/) || arg.match(/^-size/)) {
-          params["size"] = args[i + 1];
-          i++;
-          continue;
-        }
-        if (arg.match(/^-c/) || arg.match(/^-clear/)) {
-          params["clear"] = true;
-          continue;
-        }
-        if (arg.match(/^-img/) || arg.match(/^-images/)) {
-          params["imagesDir"] = args[i + 1];
-          i++;
-          continue;
-        }
-      }
-    } catch (e) {
-      console.error("[ee-core] [tools/iconGen] args: ", args);
-      console.error("[ee-core] [tools/iconGen] ERROR: ", e);
-      throw new Error("参数错误!!");
-    }
-    this.params = params;
-
-    // ---> 组装参数
-    console.log("[ee-core] [tools/iconGen] icon 当前路径: ", process.cwd());
-    this.input = path.join(process.cwd(), params.input);
-    this.output = path.join(process.cwd(), params.output);
-    this.imagesDir = path.join(process.cwd(), params.imagesDir);
-
-    const sizeList = params.size.split(",").map((item) => parseInt(item));
-    this.iconOptions = {
-      report: false,
-      ico: {
-        name: "icon",
-        sizes: [256],
-      },
-      favicon: {
-        name: "logo-",
-        pngSizes: sizeList,
-      },
-    };
-  }
-
-  /**
-   * 生成图标
-   */
-  generateIcons() {
-    console.log("[ee-core] [tools/iconGen] iconGen 开始处理生成logo图片");
-    if (!fs.existsSync(this.input)) {
-      console.error("[ee-core] [tools/iconGen] input: ", this.input);
-      throw new Error("输入的图片不存在或路径错误");
-    }
-    if (!fs.existsSync(this.output)) {
-      fs.mkdirSync(this.output, { recursive: true });
-    } else {
-      // 清空目录
-      this.params.clear && this.deleteGenFile(this.output);
-    }
-    if (!fs.existsSync(this.imagesDir)) {
-      fs.mkdirSync(this.imagesDir, { recursive: true });
-    }
-    icongen(this.input, this.output, this.iconOptions)
-      .then((results) => {
-        console.log("[ee-core] [tools/iconGen] iconGen 已生成下方图片资源");
-        console.log(results);
-        this._renameForEE(results);
-      })
-      .catch((err) => {
-        console.error(err);
-        throw new Error("[ee-core] [tools/iconGen] iconGen 生成失败!");
-      });
-  }
-
-  /**
-   * 删除生成的文件(.ico .png)
-   */  
-  deleteGenFile(dirPath) {
-    if (fs.existsSync(dirPath)) {
-      // 读取文件夹下的文件目录
-      const files = fs.readdirSync(dirPath);
-      files.forEach((file) => {
-        const curPath = path.join(dirPath, file);
-        // 判断是不是文件夹，如果是，继续递归
-        if (fs.lstatSync(curPath).isDirectory()) {
-          this.deleteGenFile(curPath);
-        } else {
-          // 删除文件
-          if ([".ico", ".png"].includes(path.extname(curPath))) {
-            fs.unlinkSync(curPath);
-          }
-        }
-      });
-    }
-  }
-
-  /**
-   * 为生成的资源重命名 (logo-32.png -> 32x32.png)
-   */    
-  _renameForEE(filesPath) {
-    console.log("[ee-core] [tools/iconGen] iconGen 开始重新命名logo图片资源");
-    try {
-      const len = filesPath.length;
-      for (let i = 0; i < len; i++) {
-        const filePath = filesPath[i];
-        const extname = path.extname(filePath);
-        if ([".png"].includes(extname)) {
-          const filename = path.basename(filePath, extname);
-          const basename = filename.split("-")[1];
-          const dirname = path.dirname(filePath);
-          // 处理 tray 图标 --> 复制到 public/images 目录下
-          if ("16" === basename) {
-            const newName = "tray" + extname;
-            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
-            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
-            fs.unlinkSync(filePath);
-            continue;
-          }
-          // 处理 win 窗口图标 --> 复制到 public/images 目录下
-          if ("32" === basename) {
-            const newName = filename + extname;
-            fs.copyFileSync(filePath, path.join(this.imagesDir, newName));
-            console.log(`${filename}${extname} --> ${this.params.imagesDir}/${newName} 复制成功!`);
-          }
-          // 重命名 --> 32x32.png
-          const newName = basename + "x" + basename + extname;
-          const newPath = path.join(dirname, newName);
-          fs.renameSync(filePath, newPath);
-          console.log(`${filename}${extname} --> ${newName} 重命名成功!`);
-        }
-      }
-      console.log("[ee-core] [tools/iconGen] iconGen 资源处理完成!");
-    } catch (e) {
-      console.error("[ee-core] [tools/iconGen] ERROR: ", e);
-      throw new Error("重命名logo图片资源失败!!");
-    }
-  }
-}
-
-const run = () => {
-  const i = new IconGen();
-  i.generateIcons();
-}
-
-module.exports = {
-  run,
-};

package/tools/replaceDist.js

@@ -1,99 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-
-/**
- * 资源替换
- */
-
- module.exports = {
-  
-  /**
-   * 执行
-   */  
-  run() {
-    console.log('[ee-core] [tools/rd] 开始移动资源');
-    const homeDir = process.cwd();
-
-    // argv
-    let distDir = '';
-    for (let i = 0; i < process.argv.length; i++) {
-      let tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--dist_dir=') !== -1) {
-        distDir = tmpArgv.substring(11)
-      }
-    }
- 
-    const fileExist = (filePath) => {
-      try {
-        return fs.statSync(filePath).isFile();
-      } catch (err) {
-        console.error('[ee-core] [tools/rd] ERROR ', err);
-        return false;
-      }
-    };
-    
-    const sourceDir = path.join(homeDir, distDir);
-    const sourceIndexFile = path.join(sourceDir, 'index.html');
-    
-    if (!fileExist(sourceIndexFile)) {
-      console.error('[ee-core] [tools/rd] ERROR 前端资源不存在，请构建!!!');
-      return
-    }
-    
-    // 清空历史资源 并 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, 'public', 'dist');
-    if (!fs.existsSync(eeResourceDir)) {
-      fs.mkdirSync(eeResourceDir, {recursive: true, mode: 0o777});
-    }
-    this._rmFolder(eeResourceDir);
-    console.log('[ee-core] [tools/rd] 清空历史资源:', eeResourceDir);
-
-    fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-core] [tools/rd] 复制资源到:', eeResourceDir);
-    console.log('[ee-core] [tools/rd] 结束');
-  },
-
-  /**
-   * 删除文件夹
-   */
-  _rmFolder(folder) {
-    const nodeVersion = (process.versions && process.versions.node) || null;
-    if (nodeVersion && this._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
-  }
-}