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

package/index.js

@@ -1,50 +1,50 @@
-'use strict';
-
-/**
- * @namespace EeCore
- */
-
-/**
- * @member {Appliaction} EeCore#Appliaction
- * @since 1.0.0
- */
-const Appliaction = require('./lib/application');
-
-/**
- * @member {Controller} EeCore#Controller
- * @since 1.0.0
- */
-const Controller = require('./core/lib/utils/base_context_class');
-
-/**
- * @member {Service} EeCore#Service
- * @since 1.0.0
- */
-const Service = require('./core/lib/utils/base_context_class');
-
-/**
- * @member {Storage}
- * @since 1.0.0
- */
-const Storage = require('./lib/storage/index');
-
-/**
- * @member {Utils}
- * @since 1.0.0
- */
-const Utils = require('./utils/index');
-
-/**
- * @member {Socket}
- * @since 1.0.0
- */
-const Socket = require('./lib/socket/io');
-
-module.exports = {
-  Appliaction,
-  Controller,
-  Service,
-  Storage,
-  Socket,
-  Utils
+'use strict';
+
+/**
+ * @namespace EeCore
+ */
+
+/**
+ * @member {Appliaction} EeCore#Appliaction
+ * @since 1.0.0
+ */
+const Appliaction = require('./lib/application');
+
+/**
+ * @member {Controller} EeCore#Controller
+ * @since 1.0.0
+ */
+const Controller = require('./core/lib/utils/base_context_class');
+
+/**
+ * @member {Service} EeCore#Service
+ * @since 1.0.0
+ */
+const Service = require('./core/lib/utils/base_context_class');
+
+/**
+ * @member {Storage}
+ * @since 1.0.0
+ */
+const Storage = require('./module/storage/index');
+
+/**
+ * @member {Utils}
+ * @since 1.0.0
+ */
+const Utils = require('./utils/index');
+
+/**
+ * @member {Socket}
+ * @since 1.0.0
+ */
+const Socket = require('./module/socket/io');
+
+module.exports = {
+  Appliaction,
+  Controller,
+  Service,
+  Storage,
+  Socket,
+  Utils
 };

package/lib/appLoader.js

@@ -1,53 +1,48 @@
-'use strict';
-
-const EeLoader = require('../core/index').EeLoader;
-
-/**
- * App Loader
- * @see 
- */
-class AppLoader extends EeLoader {
-
-  /**
-   * loadPlugin first, then loadConfig
-   * @since 1.0.0
-   */
-  loadConfig() {
-    super.loadConfig();
-  }
-
-  /**
-   * Load all directories in convention
-   * @since 1.0.0
-   */
-  load() {
-
-    // app > plugin
-    this.loadService();
-
-    // app
-    this.loadController();
-    
-  }
-
-  /**
-   * load addons
-   * @since 1.0.0
-   */
-  loadAddons() {
-    this.loadAddon();
-  }
-
-  /**
-   * load electron modules
-   * @since 1.0.0
-   */
-  loadElectron() {
-
-    // 预加载功能模块
-    //this.loadPreload();
-    
-  }
-}
-
-module.exports = AppLoader;
+const EeLoader = require('../core/index').EeLoader;
+
+/**
+ * App Loader
+ * @see 
+ */
+class AppLoader extends EeLoader {
+
+  /**
+   * loadPlugin first, then loadConfig
+   * @since 1.0.0
+   */
+  loadConfig() {
+    super.loadConfig();
+  }
+
+  /**
+   * Load all directories in convention
+   * @since 1.0.0
+   */
+  load() {
+
+    // app > plugin
+    this.loadService();
+
+    // app
+    this.loadController();
+    
+  }
+
+  /**
+   * load addons
+   * @since 1.0.0
+   */
+  loadAddons() {
+    this.loadAddon();
+  }
+
+  /**
+   * load electron modules
+   * @since 1.0.0
+   */
+  loadElectron() {
+    
+  }
+}
+
+module.exports = AppLoader;

package/lib/application.js

@@ -1,85 +1,86 @@
-const {app} = require('electron');
-const path = require('path');
-const EeApp = require('./eeApp');
-const debug = require('debug')('ee-core:Appliaction');
-const fs = require('fs');
-
-class Appliaction extends EeApp {
-  constructor() {
-    const { env } = process;
-    let options = {
-      env: 'prod',
-      serverScope: '',
-      type: 'application',
-      baseDir: path.join(app.getAppPath(), 'electron'),
-      homeDir: app.getAppPath(),
-      framework: path.join(app.getAppPath(), 'node_modules', 'ee-core'),
-      appName: app.getName(),
-      userHome: app.getPath('home'),
-      appData: app.getPath('appData'),
-      appUserData: app.getPath('userData'),
-      //logsDir: app.getPath('logs'),
-      appVersion: app.getVersion(),
-      isPackaged: app.isPackaged,
-      execDir: app.getAppPath()
-    }
-
-    // argv
-    let hotReload = false;
-    for (let i = 0; i < process.argv.length; i++) {
-      const tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--env=') !== -1) {
-        options.env = tmpArgv.substring(6);
-      }
-      if (tmpArgv.indexOf('--hot-reload=') !== -1) {
-        hotReload = tmpArgv.substring(13) == 1 ? true : false;
-      }
-    }
-
-    // exec directory (exe dmg dep) for prod
-    if (options.env == 'prod' && app.isPackaged) {
-      options.execDir = path.dirname(app.getPath('exe'));
-    }
-
-    // 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) {
-      options.baseDir = encryptDir;
-    }
-
-    // normalize env
-    env.NODE_ENV = 'production';
-    env.EE_HOME = options.homeDir;
-    env.EE_SERVER_ENV = options.env;
-    env.EE_SERVER_SCOPE = options.serverScope;
-    env.EE_USER_HOME = options.userHome;
-    env.EE_APP_DATA = options.appData;
-    env.EE_APP_USER_DATA = options.appUserData;
-    env.EE_MAIN_PORT = null;
-    env.EE_SOCKET_PORT = null;
-    env.EE_HTTP_PORT = null;
-    env.HOT_RELOAD = hotReload;
-    env.EE_EXEC_DIR = options.execDir;
-    env.EE_DATABASE_DIR = null;
-    debug('options:%j', options)
-
-    super(options);
-    this.initialize();
-  }
-
-  async initialize () {
-
-    await this.createPorts();
-
-    await this.startSocket();
-
-    await this.ready();
-
-    await this.createElectronApp();
-
-    await this.catchLog();
-  } 
-}
-
+const {app} = require('electron');
+const path = require('path');
+const debug = require('debug')('ee-core:Appliaction');
+const fs = require('fs');
+const EeApp = require('./eeApp');
+
+class Appliaction extends EeApp {
+  constructor() {
+    const { env } = process;
+    let options = {
+      env: 'prod',
+      serverScope: '',
+      type: 'application',
+      baseDir: path.join(app.getAppPath(), 'electron'),
+      homeDir: app.getAppPath(),
+      framework: path.join(app.getAppPath(), 'node_modules', 'ee-core'),
+      appName: app.getName(),
+      userHome: app.getPath('home'),
+      appData: app.getPath('appData'),
+      appUserData: app.getPath('userData'),
+      appVersion: app.getVersion(),
+      isPackaged: app.isPackaged,
+      execDir: app.getAppPath()
+    }
+
+    // argv
+    let hotReload = false;
+    for (let i = 0; i < process.argv.length; i++) {
+      const tmpArgv = process.argv[i]
+      if (tmpArgv.indexOf('--env=') !== -1) {
+        options.env = tmpArgv.substring(6);
+      }
+      if (tmpArgv.indexOf('--hot-reload=') !== -1) {
+        hotReload = tmpArgv.substring(13) == 1 ? true : false;
+      }
+    }
+
+    // exec directory (exe dmg dep) for prod
+    if (options.env == 'prod' && app.isPackaged) {
+      options.execDir = path.dirname(app.getPath('exe'));
+    }
+
+    // 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) {
+      options.baseDir = encryptDir;
+    }
+
+    // normalize env
+    env.NODE_ENV = options.env;
+    env.EE_HOME = options.homeDir;
+    env.EE_BASE_DIR = options.baseDir;
+    env.EE_SERVER_ENV = options.env;
+    env.EE_SERVER_SCOPE = options.serverScope;
+    env.EE_USER_HOME = options.userHome;
+    env.EE_APP_DATA = options.appData;
+    env.EE_APP_USER_DATA = options.appUserData;
+    env.HOT_RELOAD = hotReload;
+    env.EE_EXEC_DIR = options.execDir;
+    env.EE_IS_PACKAGED = options.isPackaged;
+    env.EE_DATABASE_DIR = null;
+    env.EE_MAIN_PORT = null;
+    env.EE_SOCKET_PORT = null;
+    env.EE_HTTP_PORT = null;
+    debug('options:%j', options)
+
+    super(options);
+    this.initialize();
+  }
+
+  async initialize () {
+
+    await this.createPorts();
+
+    await this.startSocket();
+
+    await this.ready();
+
+    await this.createElectronApp();
+
+    await this.catchLog();
+  } 
+}
+
 module.exports = Appliaction;

package/lib/baseApp.js

@@ -1,132 +1,115 @@
-'use strict';
-
-const EeAppCore = require('../core/index').EeCore;
-const EE_PATH = Symbol.for('ee#eePath');
-const path = require('path');
-const EE_LOADER = Symbol.for('ee#loader');
-const AppLoader = require('./appLoader');
-const LOGGERS = Symbol('EeApplication#loggers');
-const ELoggers = require('./logger');
-const HttpClient = require('./httpclient');
-const HTTPCLIENT = Symbol('EeApplication#httpclient');
-
-class BaseApp extends EeAppCore {
-  constructor (options = {}) {
-
-    super(options);
-    
-    this.HttpClient = HttpClient;
-
-    this.loader.loadConfig();
-    
-    // todo
-    //this.setDatabaseDir();
-
-    // 缓存配置
-    this.getCoreDB().setItem('config', this.config);
-
-    this.loader.load();
-
-    // TODO 这个不行，要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
-    //this.coreDB = this.getCoreDB();
-
-  }
-
-  get [EE_PATH]() {
-    return path.join(__dirname, '..');
-  }
-
-  get [EE_LOADER]() {
-    return AppLoader;
-  }
-
-  /**
-   *  loggers
-   * @member {Object}
-   * @since 1.0.0
-   */
-  get loggers() {
-    if (!this[LOGGERS]) {
-      this[LOGGERS] = ELoggers.getInstance(this.config);
-    }
-    return this[LOGGERS];
-  }
-
-  /**
-   * Get logger by name, it's equal to app.loggers['name'],
-   * but you can extend it with your own logical.
-   * @param {String} name - logger name
-   * @return {Logger} logger
-   */
-  getLogger(name) {
-    return this.loggers[name] || null;
-  }
-
-  /**
-   * application logger, log file is `$HOME/logs/ee.log`
-   * @member {Logger}
-   * @since 1.0.0
-   */
-  get logger() {
-    return this.getLogger('logger');
-  }
-
-  /**
-   * core logger for framework and plugins, log file is `$HOME/logs/ee-core.log`
-   * @member {Logger}
-   * @since 1.0.0
-   */
-  get coreLogger() {
-    return this.getLogger('coreLogger');
-  }
-
-  /**
-   * @class core存储模块
-   * @since 1.0.0
-   */
-  getCoreDB () {
-    const db = require('./storage/index').JsonDB.connection('system');
-    return db;
-  }
-  
-  /**
-   * @class curl
-   * @since 1.0.0
-   */
-  curl(url, opts) {
-    return this.httpclient.request(url, opts);
-  }
-
-  /**
-   * HttpClient instance
-   * @see https://github.com/node-modules/urllib
-   * @member {HttpClient}
-   */
-  get httpclient() {
-    if (!this[HTTPCLIENT]) {
-      this[HTTPCLIENT] = new this.HttpClient(this);
-    }
-    return this[HTTPCLIENT];
-  }
-
-  /**
-   * todo 设置db存储目录
-   */
-  setDatabaseDir (dirPath) {
-    if (dirPath) {
-      assert(typeof dirPath === 'string', ` ${dirPath} dirPath required, and must be a string`);
-      process.env.EE_DATABASE_DIR = dirPath;
-    } else {
-      process.env.EE_DATABASE_DIR = this.config.database.dir;
-    }
-  }
-
-  /**
-   * core app have been loaded
-   */
-  async ready () {
-    // do some things
-  }
-}
-
+const EeAppCore = require('../core/index').EeCore;
+const EE_PATH = Symbol.for('ee#eePath');
+const path = require('path');
+const EE_LOADER = Symbol.for('ee#loader');
+const AppLoader = require('./appLoader');
+const HttpClient = require('../module/httpclient');
+const HTTPCLIENT = Symbol('EeApplication#httpclient');
+const LOGGERS = Symbol('EeApplication#loggers');
+const Log = require('../module/log');
+const Storage = require('../module/storage');
+
+class BaseApp extends EeAppCore {
+  constructor (options = {}) {
+
+    super(options);
+
+    this.loader.loadConfig();
+    
+    // 缓存配置
+    this.getCoreDB().setItem('config', this.config);
+
+    this.loader.load();
+
+    this.HttpClient = HttpClient;
+
+    // TODO 这个不行，要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
+    //this.coreDB = this.getCoreDB();
+  }
+
+  get [EE_PATH]() {
+    return path.join(__dirname, '..');
+  }
+
+  get [EE_LOADER]() {
+    return AppLoader;
+  }
+
+  /**
+   *  loggers
+   * @member {Object}
+   * @since 1.0.0
+   */
+  get loggers() {
+    if (!this[LOGGERS]) {
+      this[LOGGERS] = Log.create(this.config);
+    }
+    return this[LOGGERS];
+  }
+
+  /**
+   * Get logger by name, it's equal to app.loggers['name'],
+   * but you can extend it with your own logical.
+   * @param {String} name - logger name
+   * @return {Logger} logger
+   */
+  getLogger(name) {
+    return this.loggers[name] || null;
+  }
+
+  /**
+   * application logger, log file is `$HOME/logs/ee.log`
+   * @member {Logger}
+   * @since 1.0.0
+   */
+  get logger() {
+    return this.getLogger('logger');
+  }
+
+  /**
+   * core logger for framework and plugins, log file is `$HOME/logs/ee-core.log`
+   * @member {Logger}
+   * @since 1.0.0
+   */
+  get coreLogger() {
+    return this.getLogger('coreLogger');
+  }
+
+  /**
+   * @class core存储模块
+   * @since 1.0.0
+   */
+  getCoreDB () {
+    const db = Storage.connection('system');
+    return db;
+  }
+  
+  /**
+   * @class curl
+   * @since 1.0.0
+   */
+  curl(url, opts) {
+    return this.httpclient.request(url, opts);
+  }
+
+  /**
+   * HttpClient instance
+   * @see https://github.com/node-modules/urllib
+   * @member {HttpClient}
+   */
+  get httpclient() {
+    if (!this[HTTPCLIENT]) {
+      this[HTTPCLIENT] = new this.HttpClient(this.config.httpclient);
+    }
+    return this[HTTPCLIENT];
+  }
+
+  /**
+   * core app have been loaded
+   */
+  async ready () {
+    // do some things
+  }
+}
+
 module.exports = BaseApp;