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

package/core/lib/loader/ee_loader.js

@@ -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;
@@ -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/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);
 

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/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/jobs/child/app.js

@@ -0,0 +1,23 @@
+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() {
+    const args = process.argv[2];
+    this.opt = args ? JSON.parse(args) : {};
+  }
+
+  run () {
+    Log.info('[child-process] run');
+    
+    const jobFile = this.opt.jobPath;
+
+    Loader.loadJobFile(jobFile);
+  }
+}
+
+const app = new ChildApp()
+app.run();

package/module/jobs/child/forkProcess.js

@@ -1,20 +1,25 @@
+const path = require('path');
 const { fork } = require('child_process');
 
 class ForkProcess {
   constructor(host, modulePath, processArgs = [], processOptions = {}) {
     this.host = host;
     this.modulePath = modulePath;
-    this.args = processArgs;
+    this.args;
     this.options = processOptions;
     this.sleeping = false;
     this.activitiesCount = 0;
     this.activitiesMap = new Map();
 
-    this.child = fork(
-      this.modulePath,
-      this.args,
-      this.options
-    );
+    // 传递给子进程的参数
+    let scriptArgs = {
+      jobPath: modulePath
+    }
+    processArgs.push(JSON.stringify(scriptArgs));
+    this.args = processArgs;
+    
+    const appPath = path.join(__dirname, 'app.js');
+    this.child = fork(appPath, this.args, this.options);
 
     this.pid = this.child.pid;
     this._init();

package/module/jobs/child/index.js

@@ -13,8 +13,10 @@ class ChildJob {
     * @param  {Object} opt - child process options 
     */
   constructor(name, filepath, opt = {}) {
+    // todo
+    //processArgs: Ps.isDev() ?  [`--inspect=${Constants.jobs.inspectStartIndex}`] : [],
     let options = Object.assign({
-      processArgs: Ps.isDev() ?  [`--inspect=${Constants.jobs.inspectStartIndex}`] : [],
+      processArgs: Ps.isDev() ?  [] : [],
       processOptions: { 
         //cwd: path.dirname(filepath),
         env: Ps.allEnv(), 

package/module/jobs/index.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const fs = require('fs');
-const assert = require('assert');
 const RendererJob = require('./renderer');
 const ChildJob = require('./child');
 const Utils = require('../utils');
@@ -25,12 +24,14 @@ class Jobs  {
 
     const isAbsolute = path.isAbsolute(this.path);
     if (!isAbsolute) {
-      this.path = path.join(Utils.getBaseDir(), 'jobs', this.path);
+      this.path = path.join(Utils.getBaseDir(), this.path);
     }
     const filepath = Loader.resolveModule(this.path);
 
-    assert(fs.existsSync(filepath), `file ${filepath} not exists`);
-
+    if (!fs.existsSync(filepath)) {
+      throw new Error(`[ee-core] [jobs-create] file ${this.path} not exists`);
+    }
+    
     this.path = filepath;
     if (this.type == 'child') {
       this.instance = new ChildJob(name, filepath, this.childOptions);

package/module/loader/index.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const UtilsCore = require('../../core/lib/utils');
 const Ps = require('../utils/ps');
+const Log = require('../log');
 
 module.exports = {
 
@@ -14,10 +15,17 @@ module.exports = {
    * @return {Object} exports
    * @since 1.0.0
    */
-  loadFile (filepath, ...inject) {
+  loadOneFile (filepath, ...inject) {
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), filepath);
+    }
+
     filepath = filepath && this.resolveModule(filepath);
-    if (!filepath) {
-      return null;
+    if (!fs.existsSync(filepath)) {
+      let errorMsg = `[ee-core] [module/loader/index] loadOneFile ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+      throw new Error(errorMsg);
     }
 
     const ret = UtilsCore.loadFile(filepath);
@@ -28,26 +36,51 @@ module.exports = {
   },
 
   /**
-   * 模块的绝对路径
+   * 加载job文件
+   *
+   * @param {String} filepath - fullpath
+   * @param {Array} inject - pass rest arguments into the function when invoke
+   * @return {Object} exports
+   * @since 1.0.0
    */
-  resolveModule(filepath) {
-    const isAbsolute = path.isAbsolute(filepath);
-    if (!isAbsolute) {
-      filepath = path.join(Ps.getBaseDir(), 'jobs', filepath);
+  loadJobFile (filepath, ...inject) {
+    if (!fs.existsSync(filepath)) {
+      let warnMsg = `[ee-core] [module/loader/index] loadJobFile ${filepath} does not exist`;
+      Log.coreLogger.error(warnMsg);
+    }
+
+    const ret = UtilsCore.loadFile(filepath);
+    if (is.function(ret) && !is.class(ret) && !UtilsCore.isBytecodeClass(ret)) {
+      ret = ret(...inject);
     }
+    return ret;
+  },  
 
-    let fullPath;
+  /**
+   * 模块的绝对路径
+   * @param {String} filepath - fullpath
+   */
+  resolveModule(filepath) {
+    let fullpath;
     try {
-      fullPath = require.resolve(filepath);
+      fullpath = require.resolve(filepath);
     } catch (e) {
-      let jscFile = filepath + '.jsc';
-      if (fs.existsSync(jscFile)) {
-        return jscFile;
+
+      // 特殊后缀处理
+      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)) {
+        let files = { filepath, fullpath }
+        Log.coreLogger.warn(`[ee-core] [module-loader-resolveModule] unknow filepath: ${files}`)
+        return undefined;
       }
-      return undefined;
     }
 
-    return fullPath;
+    return fullpath;
   },
 
   /**
@@ -57,16 +90,35 @@ module.exports = {
    * @return {Object} exports
    * @since 1.0.0
    */
-  requireModule (filepath) {
-    filepath = filepath && this.resolveModule(filepath);
-    if (!filepath) {
-      return null;
+  requireModule (filepath, type = '') {
+    let fullpath;
+    const isAbsolute = path.isAbsolute(filepath);
+    if (!isAbsolute) {
+      filepath = path.join(Ps.getBaseDir(), type, filepath);
     }
-    const ret = UtilsCore.loadFile(filepath);
+
+    fullpath = this.resolveModule(filepath);
+    if (!fs.existsSync(fullpath)) {
+      let errorMsg = `[ee-core] [module-loader-index] requireModule filepath: ${filepath} does not exist`;
+      Log.coreLogger.error(errorMsg);
+    }
+    const ret = UtilsCore.loadFile(fullpath);
 
     return ret;
   },  
 
+  /**
+   * 加载jobs模块(子进程中使用)
+   *
+   * @param {String} filepath - fullpath
+   * @return {Object} exports
+   * @since 1.0.0
+   */
+  requireJobsModule (filepath) {
+    const ret = this.requireModule(filepath, 'jobs');
+
+    return ret;
+  }, 
 }
 
 

package/module/storage/index.js

@@ -4,8 +4,12 @@ const DB = {};
 
 DB.connection = function (database, options = {}) {
   let driver = options.driver || 'jsondb';
+  
+  // 兼容之前api
+  driver = driver == 'lowdb' ? 'jsondb' : driver;
+
   let opt = options.default || {};
-  if (!_.includes(['jsondb', 'lowdb', 'sqlite'], driver)) {
+  if (!_.includes(['jsondb', 'sqlite'], driver)) {
     assert(database, `db driver ${driver} is not supported`);
   }
   if (_.isEmpty(database)) {
@@ -21,9 +25,7 @@ DB.connection = function (database, options = {}) {
       const SqliteStorage = require('./sqliteStorage');
       storage = new SqliteStorage(database, opt);
       break;
-    default:  
-      const JsondbStorage = require('./jsondbStorage');
-      storage = new JsondbStorage(database);
+    default:
   }
 
   return storage;

package/module/storage/jsondb/adapters/FileSync.js

@@ -7,7 +7,7 @@ class FileSync extends Base {
     if (fs.existsSync(this.source)) {
       // Read database
       try {
-        const data = fs.readFileSync(this.source, {encoding: 'utf8'})
+        const data = fs.readFileSync(this.source, {encoding: 'utf8'}).trim()
 
         // Handle blank file
         return data ? this.deserialize(data) : this.defaultValue
@@ -19,13 +19,13 @@ class FileSync extends Base {
       }
     } else {
       // Initialize
-      fs.writeFileSync(this.source, this.serialize(this.defaultValue))
+      fs.writeFileSync(this.source, this.serialize(this.defaultValue), {flag:'w+'})
       return this.defaultValue
     }
   }
 
   write(data) {
-    return fs.writeFileSync(this.source, this.serialize(data))
+    return fs.writeFileSync(this.source, this.serialize(data), {flag:'w+'})
   }
 }
 

package/module/storage/jsondbStorage.js

@@ -20,7 +20,6 @@ class JsondbStorage {
     const storageDir = Ps.getStorageDir();
     if (!fs.existsSync(storageDir)) {
       Helper.mkdir(storageDir);
-      Helper.chmodPath(storageDir, '777');
     }
 
     this.db = this.table(name);

package/module/utils/helper.js

@@ -49,8 +49,8 @@ exports.getRandomString = function() {
 /**
  * 创建文件夹
  */
-exports.mkdir = function(filepath) {
-  mkdirp.sync(path.dirname(filepath));
+exports.mkdir = function(filepath, opt = {}) {
+  mkdirp.sync(filepath, opt);
   return
 }
 

package/module/utils/ps.js

@@ -112,12 +112,19 @@ exports.getRootDir = function () {
 }
 
 /**
- * 获取 base目录
+ * 获取base目录
  */
 exports.getBaseDir = function() {
   return process.env.EE_BASE_DIR;
 }
 
+/**
+ * 获取electron目录
+ */
+exports.getElectronDir = function() {
+  return process.env.EE_BASE_DIR;
+}
+
 /**
  * 获取 appUserData目录
  */
@@ -171,5 +178,19 @@ exports.getHttpPort = function () {
  * 是否打包
  */
 exports.isPackaged = function () {
-  return process.env.EE_IS_PACKAGED;
+  return process.env.EE_IS_PACKAGED === 'true';
+}
+
+/**
+ * 是否加密
+ */
+exports.isEncrypted = function () {
+  return process.env.EE_IS_ENCRYPTED === 'true';
+}
+
+/**
+ * 是否热重启
+ */
+exports.isHotReload = function () {
+  return process.env.HOT_RELOAD === 'true';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {