ee-core 2.0.0-beta.1 → 2.0.0-beta.3

package/bin/tools.js

@@ -7,7 +7,7 @@ const encrypt = require('../tools/encrypt');
 const args = process.argv;
 // console.log('[ee-core] args:', args);
 const cmd = args[2];
-console.log('[ee-core] cmd:', cmd);
+console.log('[ee-core] [bin/tools] cmd:', cmd);
 
 if (cmd == 'rd') {
   replaceDist.run();

package/core/lib/loader/context_loader.js

@@ -5,7 +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');
+const Utils = require('../utils');
 
 class ClassLoader {
 
@@ -89,7 +89,7 @@ function getInstance(values, ctx) {
   const Class = values[EXPORTS] ? values : null;
   let instance;
   if (Class) {
-    if (is.class(Class) || utils.isBytecodeClass(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

@@ -7,7 +7,7 @@ const is = require('is-type-of');
 const debug = require('debug')('ee-core:EeLoader');
 const FileLoader = require('./file_loader');
 const ContextLoader = require('./context_loader');
-const utils = require('../utils');
+const Utils = require('../utils');
 const Timing = require('../utils/timing');
 const Ps = require('../../../module/utils/ps');
 
@@ -83,25 +83,8 @@ class EeLoader {
   getServerEnv() {
     let serverEnv = this.options.env;
 
-    const envPath = path.join(this.options.baseDir, 'config/env');
-    if (!serverEnv && fs.existsSync(envPath)) {
-      serverEnv = fs.readFileSync(envPath, 'utf8').trim();
-    }
-
-    if (!serverEnv) {
-      serverEnv = process.env.EE_SERVER_ENV;
-    }
-
     if (!serverEnv) {
-      if (process.env.NODE_ENV === 'test') {
-        serverEnv = 'unittest';
-      } else if (process.env.NODE_ENV === 'production') {
-        serverEnv = 'prod';
-      } else {
-        serverEnv = 'local';
-      }
-    } else {
-      serverEnv = serverEnv.trim();
+      throw new Error('[core] [lib] [loader] getServerEnv serverEnv can not be empty!');
     }
 
     return serverEnv;
@@ -272,7 +255,7 @@ class EeLoader {
     if (inject.length === 0) inject = [ this.app ];
 
     let ret = this.requireFile(filepath);
-    if (is.function(ret) && !is.class(ret) && !utils.isBytecodeClass(ret)) {
+    if (is.function(ret) && !is.class(ret) && !Utils.isBytecodeClass(ret)) {
       ret = ret(...inject);
     }
     return ret;
@@ -284,9 +267,9 @@ class EeLoader {
    * @private
    */
   requireFile(filepath) {
-    const timingKey = `Require(${this[REQUIRE_COUNT]++}) ${utils.getResolvedFilename(filepath, this.options.baseDir)}`;
+    const timingKey = `Require(${this[REQUIRE_COUNT]++}) ${Utils.getResolvedFilename(filepath, this.options.baseDir)}`;
     this.timing.start(timingKey);
-    const ret = utils.loadFile(filepath);
+    const ret = Utils.loadFile(filepath);
     this.timing.end(timingKey);
     return ret;
   }
@@ -313,15 +296,6 @@ class EeLoader {
 
     const dirs = this.dirs = [];
 
-    if (this.orderPlugins) {
-      for (const plugin of this.orderPlugins) {
-        dirs.push({
-          path: plugin.path,
-          type: 'plugin',
-        });
-      }
-    }
-
     // framework or Ee path
     for (const EePath of this.EePaths) {
       dirs.push({
@@ -404,31 +378,31 @@ class EeLoader {
 
   getTypeFiles(filename) {
     const files = [ `${filename}.default` ];
-    if (this.serverScope) files.push(`${filename}.${this.serverScope}`);
-    if (this.serverEnv === 'default') return files;
-
     files.push(`${filename}.${this.serverEnv}`);
-    if (this.serverScope) files.push(`${filename}.${this.serverScope}_${this.serverEnv}`);
+
     return files;
   }
 
   resolveModule(filepath) {
-    let fullPath;
+    let fullpath;
     try {
-      fullPath = require.resolve(filepath);
+      fullpath = require.resolve(filepath);
     } catch (e) {
-      let jscFile = filepath + '.jsc';
-      if (fs.existsSync(jscFile)) {
-        return jscFile;
-      }
-      return undefined;
-    }
 
-    if (process.env.Ee_TYPESCRIPT !== 'true' && fullPath.endsWith('.ts')) {
-      return undefined;
+      // 特殊后缀处理
+      if (filepath && (filepath.endsWith('.defalut') || filepath.endsWith('.prod'))) {
+        fullpath = filepath + '.jsc';
+      } else if (filepath && filepath.endsWith('.js')) {
+        fullpath = filepath + 'c';
+      }
+      
+      if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
+        this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
+        return undefined;
+      }
     }
 
-    return fullPath;
+    return fullpath;
   }
 
   getPkg() {

package/core/lib/loader/file_loader.js

@@ -7,7 +7,7 @@ const path = require('path');
 const globby = require('globby');
 const is = require('is-type-of');
 const deprecate = require('depd')('ee');
-const utils = require('../utils');
+const Utils = require('../utils');
 const FULLPATH = Symbol('EE_LOADER_ITEM_FULLPATH');
 const EXPORTS = Symbol('EE_LOADER_ITEM_EXPORTS');
 
@@ -125,7 +125,7 @@ class FileLoader {
   parse() {
     let files = this.options.match;
     if (!files) {
-      files = (process.env.EE_TYPESCRIPT === 'true' && utils.extensions['.ts'])
+      files = (process.env.EE_TYPESCRIPT === 'true' && Utils.extensions['.ts'])
         ? [ '**/*.(js|ts)', '!**/*.d.ts' ]
         : [ '**/*.js', '**/*.jsc'];
     } else {
@@ -164,7 +164,7 @@ class FileLoader {
         if (exports == null || (filter && filter(exports) === false)) continue;
 
         // set properties of class
-        if (is.class(exports) || utils.isBytecodeClass(exports)) {
+        if (is.class(exports) || Utils.isBytecodeClass(exports)) {
           exports.prototype.pathName = pathName;
           exports.prototype.fullPath = fullpath;
         }
@@ -217,7 +217,7 @@ class FileLoader {
         if (exports == null) continue;
   
         const properties = [addonName];
-        if (is.class(exports) || utils.isBytecodeClass(exports)) {
+        if (is.class(exports) || Utils.isBytecodeClass(exports)) {
           exports.prototype.pathName = addonName;
           exports.prototype.fullPath = fullpath;
         }
@@ -261,7 +261,7 @@ function getProperties(filepath, { caseStyle }) {
 // Get exports from filepath
 // If exports is null/undefined, it will be ignored
 function getExports(fullpath, { initializer, call, inject }, pathName) {
-  let exports = utils.loadFile(fullpath);
+  let exports = Utils.loadFile(fullpath);
 
   // process exports as you like
   if (initializer) {
@@ -275,7 +275,7 @@ function getExports(fullpath, { initializer, call, inject }, pathName) {
   // module.exports = function*() {}
   //new exports;
 
-  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports) || utils.isBytecodeClass(exports)) {
+  if (is.class(exports) || is.generatorFunction(exports) || is.asyncFunction(exports) || Utils.isBytecodeClass(exports)) {
     return exports;
   }
 

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

@@ -24,14 +24,7 @@ module.exports = {
 
     // Load Application config first
     const appConfig = this._preloadAppConfig();
-    //console.log('----------------------- appConfig:', appConfig);
-
-    //   plugin config.default
-    //     framework config.default
-    //       app config.default
-    //         plugin config.{env}
-    //           framework config.{env}
-    //             app config.{env}
+
     for (const filename of this.getTypeFiles('config')) {
       for (const unit of this.getLoadUnits()) {
         const isApp = unit.type === 'app';
@@ -64,6 +57,8 @@ module.exports = {
       'config.default',
       `config.${this.serverEnv}`,
     ];
+
+
     const target = {};
     for (const filename of names) {
       const config = this._loadConfig(this.options.baseDir, filename, undefined, 'app');
@@ -78,9 +73,9 @@ module.exports = {
     let filepath = this.resolveModule(path.join(dirpath, 'config', filename));
 
     // let config.js compatible
-    if (filename === 'config.default' && !filepath) {
-      filepath = this.resolveModule(path.join(dirpath, 'config/config'));
-    }
+    // if (filename === 'config.default' && !filepath) {
+    //   filepath = this.resolveModule(path.join(dirpath, 'config/config'));
+    // }
   
     const config = this.loadFile(filepath, this.appInfo, extraInject);
 
@@ -107,7 +102,7 @@ module.exports = {
       this._setConfigMeta(envConfig, '<process.env.EE_APP_CONFIG>');
       return envConfig;
     } catch (err) {
-      this.options.logger.warn('[ee-loader] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
+      this.options.logger.warn('[ee-core] [core/.../config] process.env.EE_APP_CONFIG is not invalid JSON: %s', envConfigStr);
     }
   },
 

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

@@ -2,8 +2,8 @@
 
 const path = require('path');
 const is = require('is-type-of');
-const utilsFn = require('../../utils/function');
-const utils = require('../../utils');
+const UtilsFn = require('../../utils/function');
+const Utils = require('../../utils');
 const FULLPATH = require('../file_loader').FULLPATH;
 
 module.exports = {
@@ -26,10 +26,10 @@ module.exports = {
         // }
         // ```
         
-        if (is.function(obj) && !is.generatorFunction(obj) && !is.class(obj) && !is.asyncFunction(obj) && !utils.isBytecodeClass(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) || utils.isBytecodeClass(obj)) {
+        if (is.class(obj) || Utils.isBytecodeClass(obj)) {
           obj.prototype.pathName = opt.pathName;
           obj.prototype.fullPath = opt.path;
           return wrapClass(obj);
@@ -47,7 +47,7 @@ module.exports = {
     const controllerBase = opt.directory;
 
     this.loadToApp(controllerBase, 'controller', opt);
-    this.options.logger.info('[ee-core:loader] Controller loaded: %s', controllerBase);
+    this.options.logger.info('[ee-core] [core/.../controller] loaded: %s', controllerBase);
     this.timing.end('Load Controller');
   },
 
@@ -86,7 +86,7 @@ function wrapClass(Controller) {
       //   args = [ this ];
       // }
       //args = [ this ];
-      return utils.callFn(controller[key], args, controller);
+      return Utils.callFn(controller[key], args, controller);
     };
   }
 }
@@ -97,7 +97,7 @@ function wrapObject(obj, path, prefix) {
   const ret = {};
   for (const key of keys) {
     if (is.function(obj[key])) {
-      const names = utilsFn.getParamNames(obj[key]);
+      const names = UtilsFn.getParamNames(obj[key]);
       if (names[0] === 'next') {
         throw new Error(`controller \`${prefix || ''}${key}\` should not use next as argument from file ${path}`);
       }
@@ -114,7 +114,7 @@ function wrapObject(obj, path, prefix) {
       // if (!this.app.config.controller || !this.app.config.controller.supportParams) {
       //   args = [ this ];
       // }
-      return await utils.callFn(func, args, this);
+      return await Utils.callFn(func, args, this);
     };
     for (const key in func) {
       objectControllerMiddleware[key] = func[key];

package/core/lib/utils/index.js

@@ -14,6 +14,12 @@ const Module = module.constructor.length > 1
   /* istanbul ignore next */
   : BuiltinModule;
 
+// Module._extensions:
+// '.js': [Function (anonymous)],
+// '.json': [Function (anonymous)],
+// '.node': [Function: func],
+// '.jsc': [Function (anonymous)]
+
 module.exports = {
   extensions: Module._extensions,
 

package/lib/application.js

@@ -20,7 +20,8 @@ class Appliaction extends EeApp {
       appUserData: app.getPath('userData'),
       appVersion: app.getVersion(),
       isPackaged: app.isPackaged,
-      execDir: app.getAppPath()
+      execDir: app.getAppPath(),
+      isEncrypted: false
     }
 
     // argv
@@ -42,9 +43,9 @@ class Appliaction extends EeApp {
 
     // Use encryption, base directory is public/electron
     const encryptDir = path.join(app.getAppPath(), 'public', 'electron');
-    let isEncrypted = fs.existsSync(encryptDir);
-    if (options.env == 'prod' && isEncrypted) {
+    if (options.env == 'prod' && fs.existsSync(encryptDir)) {
       options.baseDir = encryptDir;
+      options.isEncrypted = true;
     }
 
     // normalize env
@@ -59,6 +60,7 @@ class Appliaction extends EeApp {
     env.HOT_RELOAD = hotReload;
     env.EE_EXEC_DIR = options.execDir;
     env.EE_IS_PACKAGED = options.isPackaged;
+    env.EE_IS_ENCRYPTED = options.isEncrypted;
     env.EE_DATABASE_DIR = null;
     env.EE_MAIN_PORT = null;
     env.EE_SOCKET_PORT = null;

package/lib/eeApp.js

@@ -80,7 +80,7 @@ class EeApp extends BaseApp {
     
     app.on('window-all-closed', () => {
       if (process.platform !== 'darwin') {
-        Log.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
+        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
         self.appQuit();
       }
     })
@@ -105,7 +105,7 @@ class EeApp extends BaseApp {
     const protocolName = 'eefile';
     protocol.registerFileProtocol(protocolName, (request, callback) => {
       const url = request.url.substring(protocolName.length + 3);
-      console.log('[ee-core:job] ----url: ', url);
+      console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
       callback({ path: path.normalize(decodeURIComponent(url)) })
     });
 
@@ -220,7 +220,7 @@ class EeApp extends BaseApp {
       };
       https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
         if (err) {
-          Log.coreLogger.info('[error] ', err);
+          Log.coreLogger.info('[ee-core] [lib/eeApp] createServer error: ', err);
           return
         }
         self.loadMainUrl(mode, url);
@@ -237,8 +237,8 @@ class EeApp extends BaseApp {
    */
   loadMainUrl (type, url) {
     const mainServer = this.config.mainServer;
-    Log.coreLogger.info('[ee-core:main] Env: %s, Type: %s', this.config.env, type);
-    Log.coreLogger.info('[ee-core:main] App running at: %s', url);
+    Log.coreLogger.info('[ee-core] [main] Env: %s, Type: %s', this.config.env, type);
+    Log.coreLogger.info('[ee-core] [main] App running at: %s', url);
     this.electron.mainWindow.loadURL(url, mainServer.options);
   }
 

package/module/exception/index.js

@@ -0,0 +1,16 @@
+const Log = require('../log');
+
+/**
+ * 捕获异常
+ */
+exports.start = function() {
+  process.on('uncaughtException', this.uncaughtExceptionHandler);
+}
+
+exports.uncaughtExceptionHandler = function(err) {
+  if (!(err instanceof Error)) {
+    err = new Error(String(err));
+  }
+ 
+  Log.coreLogger.error(err);
+}

package/module/httpclient/index.js

@@ -152,12 +152,12 @@ function normalizeConfig(httpConfig) {
   }
 
   if (config.httpAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee:httpclient] config.httpclient.httpAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
+    Log.coreLogger.warn('[ee-core] [module/httpclient] config.httpclient.httpAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
       config.httpAgent.timeout);
     config.httpAgent.timeout = 30000;
   }
   if (config.httpsAgent.timeout < 30000) {
-    Log.coreLogger.warn('[ee:httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
+    Log.coreLogger.warn('[ee-core] [module/httpclient] config.httpclient.httpsAgent.timeout(%s) can\'t below 30000, auto reset to 30000',
       config.httpsAgent.timeout);
     config.httpsAgent.timeout = 30000;
   }

package/module/jobs/child/app.js

@@ -0,0 +1,43 @@
+
+const Exception = require('ee-core/module/exception');
+Exception.start();
+const Loader = require('ee-core/module/loader');
+const Log = require('ee-core/module/log');
+
+class ChildApp {
+  constructor() {
+    this._initEvents();
+  }
+
+  /**
+   * 初始化事件监听
+   */
+  _initEvents() {
+    Log.info('[ee-core] [child-process] init Events');
+
+    process.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process disconnected:${process.pid} !`);
+    });
+    process.on('exit', () => {
+      Log.coreLogger.info(`[ee-core] [module/message/childMessage] child process exited:${process.pid} !`);
+    });
+    process.on('message', this._handleMessage.bind(this));
+  }
+
+  /**
+   * 监听消息
+   */
+  _handleMessage(message) {
+    Log.coreLogger.info(`[ee-core] [module/message/childMessage] Received a message ${message} from the mainProcess`);
+
+    this.run(message);
+  }
+
+  run(msg = {}) {
+    Log.coreLogger.info('[ee-core] [child-process] run');
+
+    Loader.loadJobFile(msg.jobPath, msg.params);
+  }
+}
+
+new ChildApp();

package/module/jobs/child/forkProcess.js

@@ -1,99 +1,82 @@
+const path = require('path');
 const { fork } = require('child_process');
+const Log = require('../../log');
+const Ps = require('../../utils/ps');
 
 class ForkProcess {
-  constructor(host, modulePath, processArgs = [], processOptions = {}) {
+  constructor(host, opt = {}) {
+
+    let processCWD = Ps.getHomeDir();
+    // if (Ps.isDev()) {
+    //   cwd = path.join(Ps.getHomeDir());
+    // }
+
+    let options = Object.assign({
+      params: {},
+      processOptions: { 
+        cwd: processCWD,
+        env: Ps.allEnv(), 
+        stdio: 'pipe' 
+      }
+    }, opt);
+
     this.host = host;
-    this.modulePath = modulePath;
-    this.args = processArgs;
-    this.options = processOptions;
+    this.args = [];
     this.sleeping = false;
-    this.activitiesCount = 0;
-    this.activitiesMap = new Map();
 
-    this.child = fork(
-      this.modulePath,
-      this.args,
-      this.options
-    );
+    // 传递给子进程的参数
+    this.args.push(JSON.stringify(options.params));
+
+    const appPath = path.join(__dirname, 'app.js');
+    this.child = fork(appPath, this.args, options.processOptions);
 
     this.pid = this.child.pid;
     this._init();
   }
 
-  /**
-   * 进程挂起
-   */
-  sleep() {
-    if (this.activitiesCount) {
-      if (this.sleeping) return;
-      process.kill(this.pid, 'SIGSTOP');
-      this.sleeping = true;
-    }
-  }
-
-  /**
-   * 进程唤醒
-   */
-  wakeup() {
-    if (!this.sleeping) return;
-    process.kill(this.pid, 'SIGCONT');
-    this.sleeping = false;
-  }
-
   /**
    * 进程初始化
    */
   _init() {
     this.child.on('message', (data) => {
-      const id = data.id;
-      this.connectionsCountMinus(id);
-      delete data.id;
-      delete data.action;
-      //this.host.emit('forked_message', {data, id});
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-message ${data}`);
+    });
+
+    this.child.on('disconnect', () => {
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-disconnect !`);
+    });
+
+    this.child.on('close', (code, signal) => {
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-close code:${code}, signal:${signal}`);
     });
+
     this.child.on('exit', (code, signal) => {
-      // if (code !== 0 && code !== null) {
-      //   this.host.emit('forked_error', code, this.pid);
-      // } else {
-      //   this.host.emit('forked_exit', this.pid);
-      // }
+      Log.coreLogger.info(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-exit code:${code}, signal:${signal}`);
     });
+
     this.child.on('error', (err) => {
-      console.log('forked error: ', err);
-      // this.host.emit('forked_error', err, this.pid);
+      Log.coreLogger.error(`[ee-core] [module/jobs/child/forkProcess] from childProcess event-error :${err} !`);
     });
   }
 
   /**
-   * 向进程发消息
+   * 进程挂起
    */
-  send(params) {
-    if (this.sleeping) {
-      this.wakeup();
-    }
-    this.connectionsCountPlus(params.id);
-    this.child.send(params);
+  sleep() {
+    if (this.sleeping) return;
+    process.kill(this.pid, 'SIGSTOP');
+    this.sleeping = true;
   }
 
   /**
-   * 连接数+
+   * 进程唤醒
    */
-  _connectionsCountPlus(id) {
-    this.activitiesMap.set(id, 1);
-    this.activitiesCount += 1;
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
+  wakeup() {
+    if (!this.sleeping) return;
+    process.kill(this.pid, 'SIGCONT');
+    this.sleeping = false;
   }
 
-  /**
-   * 连接数-
-   */
-  _connectionsCountMinus(id) {
-    if (this.activitiesMap.has(id)) {
-      this.activitiesCount = (this.activitiesCount > 0) ? (this.activitiesCount - 1) : 0;
-      this.activitiesMap.delete(id);
-    }
-    this.host.connectionsMap[this.pid] = this.activitiesCount;
-  }
 }
 
 module.exports = ForkProcess;