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

package/addon/index.js

@@ -0,0 +1,30 @@
+const EEAddon = Symbol('Ee#Addon');
+
+/**
+ * todo 插件模块
+ */ 
+const Addon = {
+
+  /**
+   * 设置插件对象
+   */  
+  setAddonObject(name, obj) {
+    if (!this[EEAddon]) {
+      this[EEAddon] = new Map();
+    }
+
+    if (!this[EEAddon].has(name)) {
+      this[EEAddon][name] = obj;
+    }
+  },
+
+  /**
+   * 获取插件对象
+   */  
+  get(name) {
+    let addon = this[EEAddon].has(name) ? this[EEAddon][name]: null;
+    return addon;
+  },  
+}  
+
+module.exports = Addon;

package/config/config.default.js

@@ -1,4 +1,3 @@
-'use strict';
 const path = require('path');
 
 /**
@@ -222,7 +221,7 @@ module.exports = appInfo => {
       cert: ''
     },
     protocol: 'http://',
-    host: '127.0.0.1',
+    host: 'localhost',
     port: 7071, // 默认端口（如果端口被使用，则随机获取一个）
     cors: {
       origin: "*"
@@ -239,7 +238,7 @@ module.exports = appInfo => {
   /* 主进程加载的地址 */
   config.mainServer = {
     protocol: 'http://',
-    host: '127.0.0.1',
+    host: 'localhost',
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
     options: {},
     ssl: {

package/config/index.js

@@ -0,0 +1,54 @@
+const Storage = require('../storage');
+
+const Cfg = {
+
+  /**
+   * 获取 coredb
+   */
+  _getCoreDB() {
+    const coreDB = Storage.connection('system');
+    return coreDB;
+  },
+
+  /**
+   * all
+   */
+  all() {
+    const cdb = this._getCoreDB();
+    const config = cdb.getItem('config');
+  
+    return config;
+  },
+
+  /**
+   * setAll
+   */
+  setAll(value) {
+    const cdb = this._getCoreDB();
+    cdb.setItem('config', value);
+  
+    return;
+  },
+
+  /**
+   * setValue
+   */
+  setValue(key, value) {
+    const cdb = this._getCoreDB();
+    cdb.setConfigItem(key, value);
+  
+    return;
+  },
+
+  /**
+   * getValue
+   */
+  getValue(key) {
+    const cdb = this._getCoreDB();
+    let v = cdb.getConfigItem(key);
+  
+    return v;
+  },  
+};
+
+module.exports = Cfg;

package/const/channel.js

@@ -0,0 +1,9 @@
+module.exports = {
+  process: {
+    showException: 'ee#showException',
+    sendToMain: 'ee#sendToMain'
+  },
+  socketIo: {
+    partySoftware: 'c1',
+  },  
+};

package/{module/const → const}/index.js

@@ -1,11 +1,7 @@
 module.exports = {
   storageKey: {
     cache: 'cache',
-  },
-  socketIo: {
-    channel: {
-      partySoftware: 'c1',
-    }
+    cacheConfig: 'cache.config',
   },
   jobs: {
     inspectStartIndex: 5858

package/controller/index.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/**
+ * BaseContextClass is a base class that can be extended,
+ * it's instantiated in context level,
+ * {@link Helper}, {@link Service} is extending it.
+ */
+class BaseContextClass {
+
+  /**
+   * @class
+   * @param {Context} ctx - context instance
+   * @since 1.0.0
+   */
+  constructor(ctx) {
+    /**
+     * @member {Application} BaseContextClass#app
+     * @since 1.0.0
+     */
+    this.app = ctx;
+    /**
+     * @member {Config} BaseContextClass#config
+     * @since 1.0.0
+     */
+    this.config = ctx.config;
+    /**
+     * @member {Service} BaseContextClass#service
+     * @since 1.0.0
+     */
+    this.service = ctx.service;
+  }
+}
+
+module.exports = BaseContextClass;

package/core/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const EeCore = require('./lib/ee');
 const EeLoader = require('./lib/loader/ee_loader');
 const BaseContextClass = require('./lib/utils/base_context_class');

package/core/lib/ee.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const assert = require('assert');
 const fs = require('fs');
 const KoaApplication = require('koa');

package/core/lib/loader/ee_loader.js

@@ -9,7 +9,7 @@ const FileLoader = require('./file_loader');
 const ContextLoader = require('./context_loader');
 const Utils = require('../utils');
 const Timing = require('../utils/timing');
-const Ps = require('../../../module/utils/ps');
+const Ps = require('../../../ps');
 
 const REQUIRE_COUNT = Symbol('EeLoader#requireCount');
 
@@ -397,7 +397,7 @@ class EeLoader {
       }
       
       if (!fs.existsSync(filepath) && !fs.existsSync(fullpath)) {
-        this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
+        //this.options.logger.warn(`[ee-core] [core/lib/loader/ee_loader] resolveModule unknow filepath: ${filepath}`)
         return undefined;
       }
     }

package/core/lib/loader/file_loader.js

@@ -10,6 +10,7 @@ const deprecate = require('depd')('ee');
 const Utils = require('../utils');
 const FULLPATH = Symbol('EE_LOADER_ITEM_FULLPATH');
 const EXPORTS = Symbol('EE_LOADER_ITEM_EXPORTS');
+const Addon = require('../../../addon');
 
 const defaults = {
   directory: null,

package/{lib → ee}/application.js

@@ -1,3 +1,4 @@
+const Exception = require('../exception');
 const {app} = require('electron');
 const path = require('path');
 const debug = require('debug')('ee-core:Appliaction');
@@ -6,6 +7,7 @@ const EeApp = require('./eeApp');
 
 class Appliaction extends EeApp {
   constructor() {
+    Exception.start();
     const { env } = process;
     let options = {
       env: 'prod',
@@ -80,8 +82,6 @@ class Appliaction extends EeApp {
     await this.ready();
 
     await this.createElectronApp();
-
-    await this.catchLog();
   } 
 }
 

package/{lib → ee}/baseApp.js

@@ -3,11 +3,12 @@ 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 = require('../httpclient');
 const HTTPCLIENT = Symbol('EeApplication#httpclient');
 const LOGGERS = Symbol('EeApplication#loggers');
-const Log = require('../module/log');
-const Storage = require('../module/storage');
+const Log = require('../log');
+const Storage = require('../storage');
+const Conf = require('../config');
 
 class BaseApp extends EeAppCore {
   constructor (options = {}) {
@@ -17,7 +18,7 @@ class BaseApp extends EeAppCore {
     this.loader.loadConfig();
     
     // 缓存配置
-    this.getCoreDB().setItem('config', this.config);
+    Conf.setAll(this.config);
 
     this.loader.load();
 

package/{lib → ee}/eeApp.js

@@ -2,25 +2,24 @@ const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
 const getPort = require('get-port');
-const {app, BrowserWindow, Menu, protocol} = require('electron');
+const { app } = require('electron');
 const is = require('is-type-of');
 const Koa = require('koa');
 const koaServe = require('koa-static');
 const https = require('https');
 const BaseApp = require('./baseApp');
-const Log = require('../module/log');
+const Log = require('../log');
+const Electron = require('../electron');
+const Conf = require('../config');
+const Ps = require('../ps');
+const Socket = require('../socket')
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
     super(options);
 
-    this.electron = {
-      mainWindow: null,
-      tray: null,
-      extra: {
-        closeWindow: false,
-      },
-    };
+    this.electron = Electron;
+    this.mainWindow;
   }
 
   /**
@@ -44,15 +43,14 @@ class EeApp extends BaseApp {
     }
     
     // 更新db配置
-    this.getCoreDB().setItem('config', this.config);
+    Conf.setAll(this.config);
   }
 
   /**
    * 启动通信模块
    */
   async startSocket () {
-    const socket = require('../module/socket/start');
-    socket(this);
+    Socket.startAll(this);
   }
   
   /**
@@ -86,7 +84,7 @@ class EeApp extends BaseApp {
     })
 
     app.on('before-quit', () => {
-      self.electron.extra.closeWindow = true;
+      Electron.extra.closeWindow = true;
     })
 
     if (this.config.hardGpu.enable == false) {
@@ -101,27 +99,8 @@ class EeApp extends BaseApp {
    */
   async createWindow () {
 
-    // todo
-    const protocolName = 'eefile';
-    protocol.registerFileProtocol(protocolName, (request, callback) => {
-      const url = request.url.substring(protocolName.length + 3);
-      console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
-      callback({ path: path.normalize(decodeURIComponent(url)) })
-    });
-
-    const winOptions = this.config.windowsOption;
-    this.electron.mainWindow = new BrowserWindow(winOptions);
-    let win = this.electron.mainWindow;
-
-    // 菜单显示/隐藏
-    if (this.config.openAppMenu === 'dev-show'
-      && this.config.env == 'prod') {
-      Menu.setApplicationMenu(null);
-    } else if (this.config.openAppMenu === false) {
-      Menu.setApplicationMenu(null);
-    } else {
-      // nothing 
-    }
+    // 初始化一个主窗口
+    this.mainWindow = Electron.getMainWindow();
 
     await this.windowReady();
   
@@ -130,22 +109,17 @@ class EeApp extends BaseApp {
     await this._loderPreload();
 
     this.selectAppType();
-
-    // DevTools
-    if (!app.isPackaged && this.config.openDevTools) {
-      win.webContents.openDevTools();
-    }
   }
 
   /**
    * 还原窗口
    */
   restoreMainWindow () {
-    if (this.electron.mainWindow) {
-      if (this.electron.mainWindow.isMinimized()) {
-        this.electron.mainWindow.restore();
+    if (this.mainWindow) {
+      if (this.mainWindow.isMinimized()) {
+        this.mainWindow.restore();
       }
-      this.electron.mainWindow.show()
+      this.mainWindow.show()
     }
   }
 
@@ -172,7 +146,7 @@ class EeApp extends BaseApp {
 
     // html模式
     if (selectMode == 'html') {
-      if (this.config.env !== 'prod') {
+      if (Ps.isDev()) {
         staticDir = path.join(this.config.homeDir, 'frontend', 'dist');
       }
       this.loadLocalWeb('html', staticDir, modeInfo);
@@ -182,7 +156,7 @@ class EeApp extends BaseApp {
     // 单页应用
     const protocol = modeInfo.protocol || 'http://';
     url = protocol + modeInfo.hostname + ':' + modeInfo.port;
-    if (this.config.env !== 'prod') {
+    if (Ps.isDev()) {
       this.loadMainUrl('spa', url);
     } else {
       this.loadLocalWeb('spa');
@@ -239,7 +213,7 @@ class EeApp extends BaseApp {
     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);
-    this.electron.mainWindow.loadURL(url, mainServer.options);
+    this.mainWindow.loadURL(url, mainServer.options);
   }
 
   /**
@@ -259,7 +233,7 @@ class EeApp extends BaseApp {
     // 注册主窗口Contents id
     const addonsCfg = this.config.addons;
     if (addonsCfg.window.enable) {
-      const win = this.electron.mainWindow;
+      const win = this.mainWindow;
       const addonWindow = this.addon.window;
       addonWindow.registerWCid('main', win.webContents.id);
     }

package/ee/index.js

@@ -0,0 +1,30 @@
+const EEApplication = Symbol('Ee#Application');
+
+const EE = {
+
+  /**
+   * 兼容1.x版本api
+   */
+  get Appliaction() {
+    const appClass = require('./application');
+    return appClass;
+  },
+
+  /**
+   * 设置app对象
+   */  
+  set app(appObject) {
+    if (!this[EEApplication]) {
+      this[EEApplication] = appObject;
+    }
+  },
+
+  /**
+   * 获取app对象
+   */  
+  get app() {
+    return this[EEApplication] || null;
+  },  
+}  
+
+module.exports = EE;

package/electron/index.js

@@ -0,0 +1,32 @@
+const Window = require('./window');
+const EEMainWindow = Symbol('Ee#electron#mainWindow');
+
+const Electron = {
+
+  /**
+   * 获取 mainWindow
+   */
+  getMainWindow() {
+    if (!this[EEMainWindow]) {
+      this[EEMainWindow] = Window.createWindow();
+    }
+
+    return this[EEMainWindow] || null;
+  },
+
+  /**
+   * 兼容1.x版本api
+   */
+  get mainWindow() {
+    return this.getMainWindow();
+  },
+
+  /**
+   * extra
+   */
+  extra: {
+    closeWindow: false,
+  },  
+};
+
+module.exports = Electron;

package/electron/window.js

@@ -0,0 +1,45 @@
+const {app, BrowserWindow, Menu} = require('electron');
+const Conf = require('../config');
+const Ps = require('../ps');
+
+const Window = {
+
+  /**
+   * 创建应用主窗口
+   */
+  createWindow () {
+
+    // todo
+    // const protocolName = 'eefile';
+    // protocol.registerFileProtocol(protocolName, (request, callback) => {
+    //   const url = request.url.substring(protocolName.length + 3);
+    //   console.log('[ee-core] [lib/eeApp] registerFileProtocol ----url: ', url);
+    //   callback({ path: path.normalize(decodeURIComponent(url)) })
+    // });
+
+    const config = Conf.all();
+    let win = new BrowserWindow(config.windowsOption);
+
+    // 菜单显示/隐藏
+    if (config.openAppMenu === 'dev-show' && Ps.isProd()) {
+      Menu.setApplicationMenu(null);
+    } else if (config.openAppMenu === false) {
+      Menu.setApplicationMenu(null);
+    } else {
+      // nothing 
+    }
+
+    // DevTools
+    if (!app.isPackaged && config.openDevTools) {
+      win.webContents.openDevTools({
+        mode: 'undocked'
+      });
+    }
+
+    return win;
+  }
+
+
+};
+
+module.exports = Window;

package/exception/index.js

@@ -0,0 +1,85 @@
+const Log = require('../log');
+const Ps = require('../ps');
+const Channel = require('../const/channel');
+
+/**
+ * 捕获异常
+ */
+exports.start = function() {
+  this.uncaughtExceptionHandler();
+  this.unhandledRejectionHandler();
+}
+
+/**
+ * 当进程上抛出异常而没有被捕获时触发该事件，并且使异常静默。
+ */
+exports.uncaughtExceptionHandler = function() {
+  process.on('uncaughtException', function(err) {
+    if (!(err instanceof Error)) {
+      err = new Error(String(err));
+    }
+
+    if (err.name === 'Error') {
+      err.name = 'unhandledExceptionError';
+    }
+
+    Log.coreLogger.error(err);
+
+    devError(err);
+  });
+}
+
+/**
+ * 当进程上抛出异常而没有被捕获时触发该事件。
+ */
+exports.uncaughtExceptionMonitorHandler = function() {
+  // process.on('uncaughtExceptionMonitor', function(err, origin) {
+  //   if (!(err instanceof Error)) {
+  //     err = new Error(String(err));
+  //   }
+   
+  //   Log.coreLogger.error('uncaughtExceptionMonitor:',err);
+  // });
+}
+
+/**
+ * 当promise中reject的异常在同步任务中没有使用catch捕获就会触发该事件，
+ * 即便是在异步情况下使用了catch也会触发该事件
+ */
+exports.unhandledRejectionHandler = function() {
+  process.on('unhandledRejection', function(err) {
+    if (!(err instanceof Error)) {
+      const newError = new Error(String(err));
+      // err maybe an object, try to copy the name, message and stack to the new error instance
+      if (err) {
+        if (err.name) newError.name = err.name;
+        if (err.message) newError.message = err.message;
+        if (err.stack) newError.stack = err.stack;
+      }
+      err = newError;
+    }
+    if (err.name === 'Error') {
+      err.name = 'unhandledRejectionError';
+    }
+
+    Log.coreLogger.error(err);
+
+    devError(err);
+  });
+}
+
+/**
+ * 如果是子进程，发送错误到主进程控制台
+ */
+function devError (err) {
+  if (Ps.isForkedChild() && Ps.isDev()) {
+    let msgChannel = Channel.process.showException;
+    let errTips = (err && typeof err == 'object') ? err.toString() : '';
+    errTips += ' Error !!! Please See file ee-core.log or ee-error-xxx.log for details !'
+    let message = {
+      channel: msgChannel,
+      data: errTips
+    }
+    process.send(message);
+  }
+}

package/{module/httpclient → httpclient}/index.js

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

package/index.js

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