ee-core 1.3.3 → 1.3.4-beta.2

package/addon/window/index.js

@@ -0,0 +1,92 @@
+const { BrowserWindow } = require('electron');
+
+/**
+ * 窗口插件
+ * @class
+ */
+class WinAddon {
+
+  constructor(app) {
+    this.app = app;
+    this.windowContentsIdMap = {};
+  }
+
+  /**
+   * create window
+   *
+   * @function 
+   * @since 1.0.0
+   */
+  create(name, opt) {
+    const options = Object.assign({
+      x: 10,
+      y: 10,
+      width: 980, 
+      height: 650,
+      webPreferences: {
+        contextIsolation: false,
+        nodeIntegration: true,
+      },
+    }, opt);
+    const win = new BrowserWindow(options)
+    
+    const winContentsId = win.webContents.id;
+    win.webContents.on('did-finish-load', () => {
+      this.registerWCid(name, winContentsId);
+    })
+ 
+    win.webContents.on('destroyed', () => {
+      this.removeWCid(name);
+    })
+
+    win.webContents.on('render-process-gone', (event, details) => {
+      this.removeWCid(name);
+    })
+
+    return win;
+  }
+
+  /**
+   * 获取窗口Contents id
+   *
+   * @function 
+   * @since 1.0.0
+   */
+  getWCid(name) {
+    const id = this.windowContentsIdMap[name] || null;
+    return id;
+  }
+
+  /**
+   * 获取主窗口Contents id
+   *
+   * @function 
+   * @since 1.0.0
+   */
+  getMWCid() {
+    const id = this.windowContentsIdMap['main'] || null;
+    return id;
+  }
+
+  /**
+   * 注册窗口Contents id
+   *
+   * @function 
+   * @since 1.0.0
+   */
+  registerWCid (name, id) {
+    this.windowContentsIdMap[name] = id;
+  }
+
+  /**
+   * 销毁窗口Contents id
+   *
+   * @function 
+   * @since 1.0.0
+   */
+   removeWCid (name) {
+    delete this.windowContentsIdMap[name];
+  }  
+}
+
+module.exports = WinAddon;

package/bin/tools.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-const codeCompress = require('../tools/codeCompress');
 const replaceDist = require('../tools/replaceDist');
 const encrypt = require('../tools/encrypt');
 
@@ -14,14 +13,6 @@ if (cmd == 'rd') {
   replaceDist.run();
 }
 
-if (cmd == 'compress') {
-  codeCompress.compress();
-}
-
-if (cmd == 'restore') {
-  codeCompress.restore();
-}
-
 if (cmd == 'encrypt') {
   encrypt.run();
 }

package/config/config.default.js

@@ -261,7 +261,16 @@ module.exports = appInfo => {
   /**
    * loading页（废弃）
    */
-  config.loadingPage = false;  
+  config.loadingPage = false;
+
+  /**
+   * addons
+   */
+  config.addons = {
+    window: {
+      enable: true,
+    }
+  }; 
 
   return config;
 };

package/core/lib/ee.js

@@ -157,6 +157,15 @@ class EeCore extends KoaApplication {
     return this.loader ? this.loader.config : {};
   }
 
+  /**
+   * The addon of application
+   * @member {Addon}
+   * @since 1.0.0
+   */
+  get addon() {
+    return this.loader ? this.loader.addon : {};
+  }  
+
   get [EE_LOADER]() {
     return require('./loader/ee_loader');
   }

package/core/lib/loader/ee_loader.js

@@ -373,10 +373,16 @@ class EeLoader {
       directory,
       property,
       inject: this.app,
+      loader: this
     }, opt);
     const timingKey = `Load "${String(property)}" to Context`;
     this.timing.start(timingKey);
-    new ContextLoader(opt).load();
+    if (['addon'].includes(property)) {
+      new ContextLoader(opt).loadAddons();
+    } else {
+      new ContextLoader(opt).load();
+    }
+    
     this.timing.end(timingKey);
   }
 
@@ -441,6 +447,7 @@ const loaders = [
   require('./mixin/config'),
   require('./mixin/service'),
   require('./mixin/controller'),
+  require('./mixin/addon'),
 ];
 
 for (const loader of loaders) {

package/core/lib/loader/file_loader.js

@@ -23,6 +23,7 @@ const defaults = {
   override: false,
   inject: undefined,
   filter: null,
+  loader: undefined,
 };
 
 /**
@@ -44,6 +45,7 @@ class FileLoader {
    * @param {Object} options.inject - an object that be the argument when invoke the function
    * @param {Function} options.filter - a function that filter the exports which can be loaded
    * @param {String|Function} options.caseStyle - set property's case when converting a filepath to property list.
+   * @param {Object} options.loader - an object that be the argument when invoke the function
    */
   constructor(options) {
     assert(options.directory, 'options.directory is required');
@@ -175,6 +177,68 @@ class FileLoader {
     return items;
   }
 
+  /**
+   * attach items to target object for addons.
+   * `app/addon/group/index.js` => `target.group`
+   * @return {Object} target
+   * @since 1.0.0
+   */
+  loadAddons() {
+    const items = [];
+    const files = '*';
+    const app = this.options.inject;
+    const loader = this.options.loader;
+    const target = this.options.target;
+    let directories = this.options.directory;
+    
+    if (!Array.isArray(directories)) {
+      directories = [ directories ];
+    }
+
+    // check addon 
+    const config = app.config.addons;
+    let filterAddons = [];
+    for (let key of Object.keys(config)) {
+      if (!config[key].enable) {
+        filterAddons.push(key);
+      }
+    }
+
+    for (const directory of directories) {
+      const addonpaths = globby.sync(files, { cwd: directory, deep: 1, onlyDirectories: true});
+      for (const addonName of addonpaths) {
+        if (filterAddons.includes(addonName)) continue;
+
+        let fullpath = path.join(directory, addonName, 'index');
+        fullpath = loader.resolveModule(fullpath);
+        if (!fs.statSync(fullpath).isFile()) continue;
+  
+        let exports = getExports(fullpath, this.options, addonName);
+        if (exports == null) continue;
+  
+        const properties = [addonName];
+        if (is.class(exports) || utils.isBytecodeClass(exports)) {
+          exports.prototype.pathName = addonName;
+          exports.prototype.fullPath = fullpath;
+        }
+  
+        items.push({ fullpath, properties, exports });
+      }
+  
+      for (const item of items) {
+        const property = item.properties[0];
+        let obj = item.exports;
+        if (obj && !is.primitive(obj)) {
+          obj[FULLPATH] = item.fullpath;
+          obj[EXPORTS] = true;
+        }
+        
+        target[property] = obj;
+      }
+    }
+
+    return target;
+  }
 }
 
 module.exports = FileLoader;

package/core/lib/loader/mixin/addon.js

@@ -0,0 +1,32 @@
+const path = require('path');
+
+module.exports = {
+
+  /**
+   * Load app/addon
+   * @param {Object} opt - LoaderOptions
+   * @function 
+   * @since 1.0.0
+   */
+  loadAddon(opt) {
+    this.timing.start('Load Addon');
+
+    // 加载ee-core的插件 和 用户插件
+    const directorys = [
+      path.join(this.options.framework, 'addon'),
+      path.join(this.options.baseDir, 'addon'),
+    ]
+    opt = Object.assign({
+      call: true,
+      caseStyle: 'lower',
+      directory: directorys
+    }, opt);
+
+    const addonPaths = opt.directory;
+    this.loadToContext(addonPaths, 'addon', opt);    
+    
+    this.timing.end('Load Addon');
+  },
+};
+
+

package/core/lib/loader/mixin/service.js

@@ -2,7 +2,6 @@
 
 const path = require('path');
 
-
 module.exports = {
 
   /**

package/core/lib/utils/index.js

@@ -104,6 +104,18 @@ module.exports = {
     
     return isClass;
   },
+
+  /**
+   * 文件类型
+   */
+  filePatterns () {
+    const files = (process.env.EE_TYPESCRIPT === 'true' && Module._extensions['.ts'])
+    ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
+    : [ '**/*.js','**/*.jsc' ];
+
+    return files;
+  }
+
 };
 
 

package/lib/appLoader.js

@@ -30,6 +30,14 @@ class AppLoader extends EeLoader {
     
   }
 
+  /**
+   * load addons
+   * @since 1.0.0
+   */
+  loadAddons() {
+    this.loadAddon();
+  }
+
   /**
    * load electron modules
    * @since 1.0.0

package/lib/eeApp.js

@@ -16,7 +16,7 @@ class EeApp extends BaseApp {
       tray: null,
       extra: {
         closeWindow: false,
-      }
+      },
     };
   }
 
@@ -115,7 +115,9 @@ class EeApp extends BaseApp {
 
     await this.windowReady();
   
-    await this.loderPreload();
+    await this._loderAddons();
+
+    await this._loderPreload();
 
     this.selectAppType();
 
@@ -256,10 +258,25 @@ class EeApp extends BaseApp {
     app.quit();
   }
 
+  /**
+   * 加载插件
+   */
+  async _loderAddons () {
+    this.loader.loadAddons();
+
+    // 注册主窗口Contents id
+    const addonsCfg = this.config.addons;
+    if (addonsCfg.window.enable) {
+      const win = this.electron.mainWindow;
+      const addonWindow = this.addon.window;
+      addonWindow.registerWCid('main', win.webContents.id);
+    }
+  }
+
   /**
    * 预加载模块
    */
-  async loderPreload () {
+  async _loderPreload () {
     let filepath = this.loader.resolveModule(path.join(this.config.baseDir, 'preload', 'index'));
     if (!filepath) return; 
     const fileObj = this.loader.loadFile(filepath);
@@ -268,7 +285,7 @@ class EeApp extends BaseApp {
     } else if (is.asyncFunction(fileObj)) {
       await fileObj();
     }
-  }  
+  }
 
   /**
    * 序列化参数

package/lib/socket/ipcServer.js

@@ -24,9 +24,7 @@ class IpcServer {
 
     const self = this;
     // 遍历方法
-    const files = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
-    ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
-    : [ '**/*.js','**/*.jsc' ];
+    const files = utils.filePatterns();
     const directory = path.join(this.app.config.baseDir, 'controller');
     const filepaths = globby.sync(files, { cwd: directory });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.3.3",
+  "version": "1.3.4-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "path-to-regexp": "^6.2.0",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
-    "uglify-js": "^3.14.5",
+    "javascript-obfuscator": "^4.0.0",
     "urllib": "^2.38.0",
     "utility": "^1.17.0"
   },

package/tools/encrypt.js

@@ -4,10 +4,10 @@ const path = require('path');
 const fs = require('fs');
 const fsPro = require('fs-extra');
 const is = require('is-type-of');
-const UglifyJS = require('uglify-js');
 const bytenode = require('bytenode');
 const utility = require('utility');
 const crypto = require('crypto');
+const JavaScriptObfuscator = require('javascript-obfuscator');
 
 class Encrypt {
   constructor() {
@@ -130,13 +130,33 @@ class Encrypt {
   generate (curPath) {
     if (this.type == 'bytecode') {
       this.generateBytecodeFile(curPath);
+    } else if (this.type == 'confuse') {
+      this.generateJSConfuseFile(curPath);
     } else {
-      this.generateConfuseFile(curPath);
+      this.generateJSConfuseFile(curPath);
+      this.generateBytecodeFile(curPath);
+    }
+  }
+
+  /**
+   * 使用 javascript-obfuscator 生成压缩/混淆文件
+   */  
+  generateJSConfuseFile (file) {
+    let defaultOpt = {
+      compact: true,
+      stringArray: true,
+      rotateStringArray: true,
+      stringArrayEncoding: ['base64'],
+      stringArrayThreshold: 1,
+      disableConsoleOutput: true,
     }
+    let code = fs.readFileSync(file, "utf8");
+    let result = JavaScriptObfuscator.obfuscate(code, defaultOpt);
+    fs.writeFileSync(file, result.getObfuscatedCode(), "utf8"); 
   }
 
   /**
-   * 生成压缩/混淆文件
+   * (废弃) 使用 uglify 生成压缩/混淆文件
    */  
   generateConfuseFile (file) {
     let defaultOpt = {
@@ -175,6 +195,9 @@ class Encrypt {
       output: jscFile,
       electron: true
     });
+
+    //fs.writeFileSync(curPath, 'require("bytenode");module.exports = require("./'+path.basename(jscFile)+'");', 'utf8');
+
 	  fsPro.removeSync(curPath);
   }
 

package/tools/codeCompress.js

@@ -1,204 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-const UglifyJS = require('uglify-js');
-
-class CodeCompress {
-  constructor() {
-    const directory = [
-      'app',
-      'electron',
-      'config'
-    ];
-    this.dirs = [];
-
-    this.basePath = process.cwd();
-    this.backupCodeDir = path.join(this.basePath, 'run', 'backup_code');
-
-    // 检查存在的目录
-    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]);
-      }
-    }
-    console.log('dirs:', this.dirs);
-  }
-
-  /**
-   * 备份 app、electron目录代码
-   */
-  backup () {
-    console.log('[ee-core] [code_compress] [backup] start');
-    this.rmBackup();
-
-    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] [code_compress] [backup] ERROR: %s is not exist', codeDirPath);
-        return
-      }
-
-      // copy
-      let targetDir = path.join(this.backupCodeDir, this.dirs[i]);
-      console.log('[ee-core] [code_compress] [backup] targetDir:', targetDir);
-      if (!fs.existsSync(targetDir)) {
-        this.mkdir(targetDir);
-        this.chmodPath(targetDir, '777');
-      }
-
-      fsPro.copySync(codeDirPath, targetDir);
-    }
-    console.log('[ee-core] [code_compress] [backup] success');
-  }
-
-  /**
-   * 还原代码
-   */
-  restore () {
-    console.log('[ee-core] [code_compress] [restore] start');
-    for (let i = 0; i < this.dirs.length; i++) {
-      let codeDirPath = path.join(this.backupCodeDir, this.dirs[i]);
-      let targetDir = path.join(this.basePath, this.dirs[i]);
-      fsPro.copySync(codeDirPath, targetDir);
-    }
-    console.log('[ee-core] [code_compress] [restore] success');
-  };
-
-  /**
-   * 压缩代码
-   */
-  compress () {
-    console.log('[ee-core] [code_compress] [compress] start');
-    for (let i = 0; i < this.dirs.length; i++) {
-      let codeDirPath = path.join(this.basePath, this.dirs[i]);
-      this.compressLoop(codeDirPath);
-    }
-    console.log('[ee-core] [code_compress] [compress] success');
-  };
-
-  compressLoop (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.compressLoop(curPath);
-        } else {
-          if (path.extname(curPath) === '.js') {
-            this.miniFile(curPath);
-          }
-        }
-      });
-    }
-  }
-
-  miniFile (file) {
-    let code = fs.readFileSync(file, "utf8");
-    const options = {
-      mangle: {
-        toplevel: false,
-      },
-    };
-    
-    let result = UglifyJS.minify(code, options);
-    fs.writeFileSync(file, result.code, "utf8"); 
-  }
-
-  /**
-   * 格式化参数
-   */
-  formatArgvs () {
-    // argv
-    let argvs = [];
-    for (let i = 0; i < process.argv.length; i++) {
-      const tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--') !== -1) {
-        argvs.push(tmpArgv.substring(2))
-      }
-    }
-    return argvs;
-  }
-
-  /**
-   * 移除备份
-   */
-  rmBackup () {
-    if (fs.existsSync(this.backupCodeDir)) {
-      fs.rmSync(this.backupCodeDir, {recursive: true, force: true});
-    }
-    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);
-    }
-  };
-}
-
-const compress = () => {
-  const cc = new CodeCompress();
-  cc.backup();
-  cc.compress();
-}
-
-const restore = () => {
-  const cc = new CodeCompress();
-  cc.restore();
-}
-
-module.exports = {
-  compress,
-  restore
-};
-
-
-