ee-core 1.2.10-beta.2 → 1.2.10

package/config/config.default.js

@@ -230,6 +230,7 @@ module.exports = appInfo => {
     protocol: 'http://',
     host: '127.0.0.1',
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
+    options: {}
   }; 
 
   /**

package/core/lib/loader/context_loader.js

@@ -5,6 +5,7 @@ const is = require('is-type-of');
 const FileLoader = require('./file_loader');
 const CLASSLOADER = Symbol('classLoader');
 const EXPORTS = FileLoader.EXPORTS;
+const utils = require('../utils');
 
 class ClassLoader {
 
@@ -88,7 +89,7 @@ function getInstance(values, ctx) {
   const Class = values[EXPORTS] ? values : null;
   let instance;
   if (Class) {
-    if (is.class(Class)) {
+    if (is.class(Class) || utils.isBytecodeClass(Class)) {
       instance = new Class(ctx);
     } else {
       // it's just an object

package/core/lib/loader/ee_loader.js

@@ -272,7 +272,7 @@ class EeLoader {
     if (inject.length === 0) inject = [ this.app ];
 
     let ret = this.requireFile(filepath);
-    if (is.function(ret) && !is.class(ret)) {
+    if (is.function(ret) && !is.class(ret) && !utils.isBytecodeClass(ret)) {
       ret = ret(...inject);
     }
     return ret;
@@ -358,7 +358,6 @@ class EeLoader {
     const timingKey = `Load "${String(property)}" to Application`;
     this.timing.start(timingKey);
     new FileLoader(opt).load();
-    //console.log('app property:', this.app[property]);
     this.timing.end(timingKey);
   }
 
@@ -412,6 +411,10 @@ class EeLoader {
     try {
       fullPath = require.resolve(filepath);
     } catch (e) {
+      let jscFile = filepath + '.jsc';
+      if (fs.existsSync(jscFile)) {
+        return jscFile;
+      }
       return undefined;
     }
 

package/core/lib/loader/file_loader.js

@@ -65,7 +65,6 @@ class FileLoader {
    */
   load() {
     const items = this.parse();
-    //console.log('FileLoader load items:', items);
     const target = this.options.target;
     for (const item of items) {
       // item { properties: [ 'a', 'b', 'c'], exports }
@@ -123,11 +122,10 @@ class FileLoader {
    */
   parse() {
     let files = this.options.match;
-    
     if (!files) {
       files = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
         ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
-        : [ '**/*.js' ];
+        : [ '**/*.js', '**/*.jsc'];
     } else {
       files = Array.isArray(files) ? files : [ files ];
     }
@@ -150,7 +148,6 @@ class FileLoader {
 
     for (const directory of directories) {
       const filepaths = globby.sync(files, { cwd: directory });
-
       for (const filepath of filepaths) {
         const fullpath = path.join(directory, filepath);
         if (!fs.statSync(fullpath).isFile()) continue;
@@ -160,17 +157,16 @@ class FileLoader {
         // app/service/foo/bar.js => service.foo.bar
         const pathName = directory.split(/[/\\]/).slice(-1) + '.' + properties.join('.');
         // get exports from the file
-        const exports = getExports(fullpath, this.options, pathName);
-
+        let exports = getExports(fullpath, this.options, pathName);
         // ignore exports when it's null or false returned by filter function
         if (exports == null || (filter && filter(exports) === false)) continue;
 
         // set properties of class
-        if (is.class(exports)) {
+        if (is.class(exports) || utils.isBytecodeClass(exports)) {
           exports.prototype.pathName = pathName;
           exports.prototype.fullPath = fullpath;
         }
-        //console.log('lll---------------pathName:', pathName);
+
         items.push({ fullpath, properties, exports });
         debug('parse %s, properties %j, export %O', fullpath, properties, exports);
       }
@@ -202,6 +198,7 @@ function getProperties(filepath, { caseStyle }) {
 // If exports is null/undefined, it will be ignored
 function getExports(fullpath, { initializer, call, inject }, pathName) {
   let exports = utils.loadFile(fullpath);
+
   // process exports as you like
   if (initializer) {
     exports = initializer(exports, { path: fullpath, pathName });
@@ -212,7 +209,9 @@ function getExports(fullpath, { initializer, call, inject }, pathName) {
   // module.exports = class Service {};
   // or
   // module.exports = function*() {}
-  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports)) {
+  //new exports;
+
+  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports) || utils.isBytecodeClass(exports)) {
     return exports;
   }
 

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

@@ -75,11 +75,8 @@ module.exports = {
   _loadConfig(dirpath, filename, extraInject, type) {
     const isPlugin = type === 'plugin';
     const isApp = type === 'app';
-
     let filepath = this.resolveModule(path.join(dirpath, 'config', filename));
 
-    //console.log("_loadConfig filepath:", filepath);
-
     // let config.js compatible
     if (filename === 'config.default' && !filepath) {
       filepath = this.resolveModule(path.join(dirpath, 'config/config'));

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

@@ -6,7 +6,6 @@ const utility = require('utility');
 const utils = require('../../utils');
 const FULLPATH = require('../file_loader').FULLPATH;
 
-
 module.exports = {
 
   /**
@@ -26,10 +25,11 @@ module.exports = {
         //   return class HomeController extends app.Controller {};
         // }
         // ```
-        if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj)) {
+        
+        if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj) && !utils.isBytecodeClass(obj)) {
           obj = obj(this.app);
         }
-        if (is.class(obj)) {
+        if (is.class(obj) || utils.isBytecodeClass(obj)) {
           obj.prototype.pathName = opt.pathName;
           obj.prototype.fullPath = opt.path;
           return wrapClass(obj);
@@ -76,6 +76,7 @@ function wrapClass(Controller) {
     }
     proto = Object.getPrototypeOf(proto);
   }
+
   return ret;
 
   function methodToMiddleware(Controller, key) {

package/core/lib/utils/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+require('bytenode');
 const convert = require('koa-convert');
 const is = require('is-type-of');
 const path = require('path');
@@ -23,6 +24,7 @@ module.exports = {
       if (extname && !Module._extensions[extname]) {
         return fs.readFileSync(filepath);
       }
+
       // require js module
       const obj = require(filepath);
       if (!obj) return obj;
@@ -87,6 +89,21 @@ module.exports = {
     const reg = /[/\\]/g;
     return filepath.replace(baseDir + path.sep, '').replace(reg, '/');
   },
+
+  /**
+   * 字节码类
+   */
+  isBytecodeClass (exports) {
+    let isClass = false;
+
+    // 标识
+    if (exports.toString().indexOf('[class') != -1) {
+      isClass = true;
+    }
+    // TODO 更严谨的判断，应该加上文件名和路径
+    
+    return isClass;
+  },
 };
 
 

package/lib/application.js

@@ -6,12 +6,7 @@ const fs = require('fs');
 
 class Appliaction extends EeApp {
   constructor() {
-
-    // 初始化环境变量
-    // const opt = this.initEnv();
     const { env } = process;
-
-    // 路径不能使用绝对，打包前后有问题
     let options = {
       env: 'prod',
       serverScope: '',

package/lib/eeApp.js

@@ -70,12 +70,12 @@ class EeApp extends BaseApp {
   
     app.whenReady().then(() => {
       self.createWindow();
-      app.on('activate', function () {
+      app.on('activate', () => {
         self.restoreMainWindow();
       })
     })
     
-    app.on('window-all-closed', function () {
+    app.on('window-all-closed', () => {
       if (process.platform !== 'darwin') {
         self.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
         self.appQuit();
@@ -243,8 +243,9 @@ class EeApp extends BaseApp {
    * 主页面
    */
   loadMainUrl (type, url) {
+    const mainServer = this.config.mainServer;
     this.logger.info('main page is env: %s, type: %s, App running at: %s', this.config.env, type, url);
-    this.electron.mainWindow.loadURL(url);
+    this.electron.mainWindow.loadURL(url, mainServer.options);
   }
 
   /**
@@ -252,7 +253,6 @@ class EeApp extends BaseApp {
    */  
   async appQuit () {
     await this.beforeClose();
-
     app.quit();
   }
 
@@ -299,7 +299,6 @@ class EeApp extends BaseApp {
    */
   async electronAppReady () {
     // do some things
-
   }
 
   /**
@@ -307,7 +306,6 @@ class EeApp extends BaseApp {
    */
   async windowReady () {
     // do some things
-
   }
 
   /**
@@ -315,7 +313,6 @@ class EeApp extends BaseApp {
    */  
   async beforeClose () {
     // do some things
-
   }  
 }
 

package/lib/socket/ipcServer.js

@@ -9,7 +9,6 @@ const fs = require('fs');
 const globby = require('globby');
 const utils = require('../../core/lib/utils');
 const wrap = require('../../utils/wrap');
-const utility = require('utility');
 
 class IpcServer {
   constructor (app) {
@@ -27,23 +26,23 @@ class IpcServer {
     // 遍历方法
     const files = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
     ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
-    : [ '**/*.js' ];
+    : [ '**/*.js','**/*.jsc' ];
     const directory = path.join(this.app.config.baseDir, 'controller');
     const filepaths = globby.sync(files, { cwd: directory });
+
     for (const filepath of filepaths) {
       const fullpath = path.join(directory, filepath);
       if (!fs.statSync(fullpath).isFile()) continue;
 
       const properties = wrap.getProperties(filepath, {caseStyle: 'lower'});
       const pathName = directory.split(/[/\\]/).slice(-1) + '.' + properties.join('.');
-    
+
       let fileObj = utils.loadFile(fullpath);
       const fns = {};
-      if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.class(fileObj) && !is.asyncFunction(fileObj)) {
-        //obj = obj(this.app);
-      }
-      if (is.class(fileObj)) {
+      // 为了统一，仅支持class文件
+      if (is.class(fileObj) || utils.isBytecodeClass(fileObj)) {
         let proto = fileObj.prototype;
+        // 不遍历父类的方法
         //while (proto !== Object.prototype) {
           const keys = Object.getOwnPropertyNames(proto);
           for (const key of keys) {
@@ -58,23 +57,6 @@ class IpcServer {
           //proto = Object.getPrototypeOf(proto);
         //}
       }
-      if (is.object(fileObj)) {
-        const keys = Object.keys(fileObj);
-        for (const key of keys) {
-          if (is.function(fileObj[key])) {
-            const names = utility.getParamNames(fileObj[key]);
-            if (names[0] === 'next') {
-              throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
-            }
-            fns[key] = 1;
-          }
-          // else if (is.object(fileObj[key])) {
-          //   ret[key] = wrapObject(obj[key], path, `${prefix || ''}${key}.`);
-          // }
-        }
-      }
-      // if (is.generatorFunction(obj) || is.asyncFunction(obj)) {      
-      // }
 
       debug('register class %s fns %j', pathName, fns);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.10-beta.2",
+  "version": "1.2.10",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -14,6 +14,7 @@
   "dependencies": {
     "agentkeepalive": "^4.2.0",
     "better-sqlite3": "^7.6.0",
+    "bytenode": "^1.3.6",
     "co": "^4.6.0",
     "debug": "^4.3.3",
     "depd": "^2.0.0",

package/tools/encrypt.js

@@ -3,32 +3,36 @@
 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');
 
 class Encrypt {
   constructor() {
+    this.basePath = process.cwd();
+    const directory = [
+      'electron',
+    ];
+    this.dirs = [];
+    this.type = '';
+    this.configPath = '';
+    this.config = null;
+    this.filesExt = ['.js', '.json', '.node'];
+    this.encryptCodeDir = path.join(this.basePath, 'public');
 
     // argv
-    this.type = '';
     for (let i = 0; i < process.argv.length; i++) {
       let tmpArgv = process.argv[i];
       if (tmpArgv.indexOf('--type=') !== -1) {
         this.type = tmpArgv.substring(7);
       }
+      if (tmpArgv.indexOf('--config=') !== -1) {
+        let configPathStr = tmpArgv.substring(9);
+        this.configPath = path.join(this.basePath, configPathStr);
+        this.config = fs.existsSync(this.configPath) ? require(this.configPath) : null;
+      }
     }
 
-    const directory = [
-      'electron',
-    ];
-    this.dirs = [];
-
-    this.basePath = process.cwd();
-    // if (this.type == 'uglify') {
-    //   this.encryptCodeDir = path.join(this.basePath, 'public');
-    // }
-    this.encryptCodeDir = path.join(this.basePath, 'public');
-
     // 检查存在的目录
     for (let i = 0; i < directory.length; i++) {
       let codeDirPath = path.join(this.basePath, directory[i]);
@@ -36,7 +40,18 @@ class Encrypt {
         this.dirs.push(directory[i]);
       }
     }
-    console.log('dirs:', this.dirs);
+    console.log('[ee-core] [encrypt] dirs:', this.dirs);
+  }
+
+  /**
+   * 检查
+   */
+  check () {
+    if (this.configPath.length > 0 && !is.object(this.config)) {
+      console.log('[ee-core] [encrypt] ERROR: config file is invalid');
+      return false;
+    }
+    return true;
   }
 
   /**
@@ -49,7 +64,7 @@ class Encrypt {
       // check code dir
       let codeDirPath = path.join(this.basePath, this.dirs[i]);
       if (!fs.existsSync(codeDirPath)) {
-        console.log('[ee-core] [encrypt] backup ERROR: %s is not exist', codeDirPath);
+        console.log('[ee-core] [encrypt] ERROR: backup %s is not exist', codeDirPath);
         return
       }
 
@@ -67,7 +82,8 @@ class Encrypt {
 
       fsPro.copySync(codeDirPath, targetDir);
     }
-    console.log('[ee-core] [encrypt] backup success');
+    console.log('[ee-core] [encrypt] backup end');
+    return true;
   }
 
   /**
@@ -77,7 +93,7 @@ class Encrypt {
     console.log('[ee-core] [encrypt] start ciphering');
     for (let i = 0; i < this.dirs.length; i++) {
       let codeDirPath = path.join(this.encryptCodeDir, this.dirs[i]);
-      this.compressLoop(codeDirPath);
+      this.loop(codeDirPath);
     }
 
     console.log('[ee-core] [encrypt] end ciphering');
@@ -86,16 +102,17 @@ class Encrypt {
   /**
    * 递归
    */
-  compressLoop (dirPath) {
+  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.compressLoop(curPath);
+          this.loop(curPath);
         } else {
-          if (path.extname(curPath) === '.js') {
+          const extname = path.extname(curPath);
+          if (this.filesExt.indexOf(extname) !== -1) {
             this.generate(curPath);
           }
         }
@@ -110,7 +127,7 @@ class Encrypt {
     if (this.type == 'bytecode') {
       this.generateBytecodeFile(curPath);
     } else {
-      this.generateBytecodeFile(curPath);
+      this.generateConfuseFile(curPath);
     }
   }
 
@@ -118,13 +135,24 @@ class Encrypt {
    * 生成压缩/混淆文件
    */  
   generateConfuseFile (file) {
-    let code = fs.readFileSync(file, "utf8");
-    const options = {
+    let defaultOpt = {
       mangle: {
         toplevel: false,
       },
-    };
-    
+      compress: {
+        drop_console: true,
+        passes: 2
+      },
+      output: {
+        beautify: false
+      },
+    }
+    let options = defaultOpt;
+    if (is.object(this.config)) {
+      options = Object.assign(defaultOpt, this.config);
+    }
+
+    let code = fs.readFileSync(file, "utf8");
     let result = UglifyJS.minify(code, options);
     fs.writeFileSync(file, result.code, "utf8"); 
   }
@@ -141,9 +169,9 @@ class Encrypt {
     bytenode.compileFile({
       filename: curPath,
       output: jscFile,
+      electron: true
     });
     fs.rmSync(curPath, {force: true});
-    console.log('[ee-core] [encrypt] generate ', jscFile);
   }
 
   /**
@@ -209,7 +237,8 @@ class Encrypt {
 
 const run = () => {
   const e = new Encrypt();
-  e.backup();
+  if (!e.check()) return;
+  if (!e.backup()) return;
   e.encrypt();
 }