ee-core 2.1.1 → 2.2.0-beta.2

package/addon/index.js

@@ -1,30 +1,35 @@
-const EEAddon = Symbol('Ee#Addon');
+const EE = require('../ee');
 
-/**
- * todo 插件模块
- */ 
 const Addon = {
 
   /**
-   * 设置插件对象
+   * 获取 all addon instances
    */  
-  setAddonObject(name, obj) {
-    if (!this[EEAddon]) {
-      this[EEAddon] = new Map();
+  all() {
+    const { CoreApp } = EE;
+    if (!CoreApp) {
+      throw new Error('An unknown error or Addons cannot be used by the jobs!');
     }
 
-    if (!this[EEAddon].has(name)) {
-      this[EEAddon].set(name, obj);
-    }
+    const instances = CoreApp.addon || null;
+    if (!instances) {
+      throw new Error('Addons not exists or do not call directly at the top!');
+    };
+    return instances;
   },
 
   /**
-   * 获取插件对象
+   * 获取 addon instance
    */  
   get(name) {
-    let addon = this[EEAddon].has(name) ? this[EEAddon].get(name): null;
-    return addon;
-  },  
-}  
+    const instances = this.all();
+    const instance = instances[name] || null;
+    if (!instance) {
+      throw new Error(`Addon class '${name}' not exists or do not call directly at the top!`);
+    };
+    return instance;
+  },
+ 
+};
 
 module.exports = Addon;

package/ee/application.js

@@ -1,10 +1,11 @@
 const Exception = require('../exception');
-const {app} = require('electron');
+const { app } = require('electron');
 const path = require('path');
 const debug = require('debug')('ee-core:Appliaction');
 const EeApp = require('./eeApp');
 const Utils = require('../utils');
 const Ps = require('../ps');
+const EE = require('./index');
 
 class Appliaction extends EeApp {
   constructor() {
@@ -52,7 +53,7 @@ class Appliaction extends EeApp {
     }
 
     // normalize env
-    env.NODE_ENV = options.env;
+    //env.NODE_ENV = options.env;
     env.EE_HOME = options.homeDir;
     env.EE_BASE_DIR = options.baseDir;
     env.EE_SERVER_ENV = options.env;
@@ -71,6 +72,10 @@ class Appliaction extends EeApp {
     debug('options:%j', options)
 
     super(options);
+
+    // 设置全局this
+    EE.CoreApp = this;
+
     this.initialize();
   }
 

package/ee/baseApp.js

@@ -22,9 +22,6 @@ class BaseApp extends EeAppCore {
     this.loader.load();
 
     this.HttpClient = HttpClient;
-
-    // TODO 这个不行，要么每次new对象，要么所有地方都用同一个实例，否则会出现数据无法刷新的情况
-    //this.coreDB = this.getCoreDB();
   }
 
   get [EE_PATH]() {

package/ee/eeApp.js

@@ -1,14 +1,15 @@
 const path = require('path');
 const fs = require('fs');
 const assert = require('assert');
-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('../log');
-const Electron = require('../electron');
+const CoreElectron = require('../electron');
+const CoreElectronApp = require('../electron/app');
+const CoreElectronWindow = require('../electron/window');
 const Conf = require('../config');
 const Ps = require('../ps');
 const Socket = require('../socket');
@@ -18,14 +19,15 @@ class EeApp extends BaseApp {
   constructor(options = {}) {
     super(options);
 
-    this.electron = Electron;
+    // 兼容旧的api
+    this.electron = CoreElectron;
     this.mainWindow;
   }
 
   /**
    * 生成端口
    */
-  async createPorts () {
+  async createPorts() {
     const mainPort = await GetPort({port: this.config.mainServer.port});
     process.env.EE_MAIN_PORT = mainPort;
     this.config.mainServer.port = mainPort;
@@ -49,46 +51,17 @@ class EeApp extends BaseApp {
   /**
    * 启动通信模块
    */
-  async startSocket () {
+  async startSocket() {
     Socket.startAll(this);
   }
   
   /**
    * 创建electron应用
    */
-  async createElectronApp () {
-    const self = this;
-
-    const gotTheLock = app.requestSingleInstanceLock();
-    if (!gotTheLock) {
-      await this.appQuit();
-      return;
-    }
-
-    app.on('second-instance', (event) => {
-      self.restoreMainWindow();
-    })
-  
-    app.whenReady().then(() => {
-      self.createWindow();
-      app.on('activate', () => {
-        self.restoreMainWindow();
-      })
-    })
-    
-    app.on('window-all-closed', () => {
-      if (process.platform !== 'darwin') {
-        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
-        self.appQuit();
-      }
-    })
-
-    app.on('before-quit', () => {
-      Electron.extra.closeWindow = true;
-    })
-
-    if (this.config.hardGpu.enable == false) {
-      app.disableHardwareAcceleration();
+  async createElectronApp() {
+    const newApp = CoreElectronApp.create();
+    if (!newApp) {
+      return
     }
 
     await this.electronAppReady();
@@ -97,10 +70,10 @@ class EeApp extends BaseApp {
   /**
    * 创建应用主窗口
    */
-  async createWindow () {
+  async createWindow() {
 
     // 初始化一个主窗口
-    this.mainWindow = Electron.getMainWindow();
+    this.mainWindow = CoreElectronWindow.getMainWindow();
 
     await this.windowReady();
   
@@ -111,23 +84,10 @@ class EeApp extends BaseApp {
     this.selectAppType();
   }
 
-  /**
-   * 还原窗口
-   */
-  restoreMainWindow () {
-    if (this.mainWindow) {
-      if (this.mainWindow.isMinimized()) {
-        this.mainWindow.restore();
-      }
-      this.mainWindow.show();
-      this.mainWindow.focus();
-    }
-  }
-
   /**
    * 应用类型 （远程、html、单页应用）
    */
-  selectAppType () {
+  selectAppType() {
     let type = '';
     let url = '';
 
@@ -167,7 +127,7 @@ class EeApp extends BaseApp {
   /**
    * 加载本地前端资源
    */
-  loadLocalWeb (mode, staticDir, hostInfo) {
+  loadLocalWeb(mode, staticDir, hostInfo) {
     const self = this;
     if (!staticDir) {
       staticDir = path.join(this.config.homeDir, 'public', 'dist')
@@ -210,25 +170,29 @@ class EeApp extends BaseApp {
   /**
    * 主页面
    */
-  loadMainUrl (type, url) {
+  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);
-    this.mainWindow.loadURL(url, mainServer.options);
+    Log.coreLogger.info('[ee-core] Env: %s, Type: %s', this.config.env, type);
+    Log.coreLogger.info('[ee-core] App running at: %s', url);
+    this.mainWindow.loadURL(url, mainServer.options)
+    .then()
+    .catch((err)=>{
+      Log.coreLogger.error(`[ee-core] Please check the ${url} are running OR modify config file !`);
+    });
   }
 
   /**
    * electron app退出
    */  
-  async appQuit () {
+  async appQuit() {
     await this.beforeClose();
-    app.quit();
+    CoreElectronApp.quit();
   }
 
   /**
    * 加载插件
    */
-  async _loderAddons () {
+  async _loderAddons() {
     this.loader.loadAddons();
 
     // 注册主窗口Contents id
@@ -243,7 +207,7 @@ class EeApp extends BaseApp {
   /**
    * 预加载模块
    */
-  async _loderPreload () {
+  async _loderPreload() {
     let filepath = this.loader.resolveModule(path.join(this.config.baseDir, 'preload', 'index'));
     if (!filepath) return; 
     const fileObj = this.loader.loadFile(filepath);
@@ -254,46 +218,24 @@ class EeApp extends BaseApp {
     }
   }
 
-  /**
-   * 序列化参数
-   */ 
-  stringify(obj, ignore) {
-    const result = {};
-    Object.keys(obj).forEach(key => {
-      if (!ignore.includes(key)) {
-        result[key] = obj[key];
-      }
-    });
-    return JSON.stringify(result);
-  }
-
-  /**
-   * 捕获异常（废弃）
-   */
-  async catchLog () {
-    process.on('uncaughtException', function(err) {
-      Log.coreLogger.error(err);
-    });
-  }
-
   /**
    * electron app已经准备好，主窗口还未创建
    */
-  async electronAppReady () {
+  async electronAppReady() {
     // do some things
   }
 
   /**
    * 主应用窗口已经创建
    */
-  async windowReady () {
+  async windowReady() {
     // do some things
   }
 
   /**
    * app关闭之前
    */  
-  async beforeClose () {
+  async beforeClose() {
     // do some things
   }  
 }

package/ee/index.js

@@ -1,6 +1,10 @@
 const Utils = require('../utils');
 const EEApplication = Symbol('Ee#Application');
+const BuiltInApp = Symbol('Ee#BuiltInApp');
 
+/**
+ * EE
+ */
 const EE = {
 
   /**
@@ -12,7 +16,7 @@ const EE = {
   },
 
   /**
-   * 设置app对象
+   * 设置实例化app对象
    */  
   set app(appObject) {
     if (!this[EEApplication]) {
@@ -21,12 +25,28 @@ const EE = {
   },
 
   /**
-   * 获取app对象
+   * 获取实例化app对象
    */  
   get app() {
     return this[EEApplication] || null;
   },
 
+  /**
+   * 设置全局this到CoreApp (eeApp)
+   */  
+  set CoreApp(obj) {
+    if (!this[BuiltInApp]) {
+      this[BuiltInApp] = obj;
+    }
+  },
+
+  /**
+   * 获取 CoreApp (eeApp)
+   */  
+  get CoreApp() {
+    return this[BuiltInApp] || null;
+  },
+
   /**
    * 是否加密
    */  

package/electron/app/index.js

@@ -0,0 +1,62 @@
+const { app } = require('electron');
+const Window = require('../window');
+const EE = require('../../ee');
+const Log = require('../../log');
+const Electron = require('../index');
+const UtilsIs = require('../../utils/is');
+
+/**
+ * CoreElectronApp (框架封装的electron app对象)
+ */
+const CoreElectronApp = {
+
+  /**
+   * 创建electron应用
+   */
+  async create() {
+    const { CoreApp } = EE;
+
+    const gotTheLock = app.requestSingleInstanceLock();
+    if (!gotTheLock) {
+      app.quit();
+      return;
+    }
+
+    app.on('second-instance', (event) => {
+      Window.restoreMainWindow();
+    })
+  
+    app.whenReady().then(() => {
+      CoreApp.createWindow();
+      app.on('activate', () => {
+        Window.restoreMainWindow();
+      })
+    })
+    
+    app.on('window-all-closed', () => {
+      if (!UtilsIs.macOS) {
+        Log.coreLogger.info('[ee-core] [lib/eeApp] window-all-closed quit');
+        CoreApp.appQuit();
+      }
+    })
+
+    app.on('before-quit', () => {
+      Electron.extra.closeWindow = true;
+    })
+
+    if (CoreApp.config.hardGpu.enable == false) {
+      app.disableHardwareAcceleration();
+    }
+
+    return app;
+  },
+
+  /**
+   * 退出app
+   */
+  quit() {
+    app.quit();
+  }
+}
+
+module.exports = CoreElectronApp;

package/electron/index.js

@@ -1,24 +1,12 @@
 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();
+    return Window.getMainWindow();
   },
 
   /**
@@ -26,7 +14,7 @@ const Electron = {
    */
   extra: {
     closeWindow: false,
-  },  
+  }, 
 };
 
 module.exports = Electron;

package/electron/{window.js → window/index.js}

@@ -1,13 +1,25 @@
-const {app, BrowserWindow, Menu} = require('electron');
-const Conf = require('../config');
-const Ps = require('../ps');
+const { app, BrowserWindow, Menu } = require('electron');
+const Conf = require('../../config');
+const Ps = require('../../ps');
+const EEMainWindow = Symbol('Ee#electron#mainWindow');
 
 const Window = {
 
+  /**
+   * 获取 mainWindow
+   */
+  getMainWindow() {
+    if (!this[EEMainWindow]) {
+      this[EEMainWindow] = this.createMainWindow();
+    }
+
+    return this[EEMainWindow] || null;
+  },
+
   /**
    * 创建应用主窗口
    */
-  createWindow () {
+  createMainWindow() {
 
     // todo
     // const protocolName = 'eefile';
@@ -18,7 +30,8 @@ const Window = {
     // });
 
     const config = Conf.all();
-    let win = new BrowserWindow(config.windowsOption);
+    const win = new BrowserWindow(config.windowsOption);
+    this[EEMainWindow] = win;
 
     // 菜单显示/隐藏
     if (config.openAppMenu === 'dev-show' && Ps.isProd()) {
@@ -37,9 +50,20 @@ const Window = {
     }
 
     return win;
-  }
-
+  },
 
+  /**
+   * 还原窗口
+   */
+  restoreMainWindow() {
+    if (this[EEMainWindow]) {
+      if (this[EEMainWindow].isMinimized()) {
+        this[EEMainWindow].restore();
+      }
+      this[EEMainWindow].show();
+      this[EEMainWindow].focus();
+    }
+  }
 };
 
 module.exports = Window;

package/index.js

@@ -2,6 +2,12 @@
  * @namespace EeCore
  */
 
+/**
+ * @member {ElectronEgg} EeCore#Index
+ * @since 1.0.0
+ */
+const ElectronEgg = require('./main');
+
 /**
  * @member {app} EeCore#app
  * @since 1.0.0
@@ -12,13 +18,13 @@ const EE = require('./ee');
  * @member {Controller} EeCore#Controller
  * @since 1.0.0
  */
-const Controller = require('./controller');
+const Controller = require('./controller/baseContextClass');
 
 /**
  * @member {Service} EeCore#Service
  * @since 1.0.0
  */
-const Service = require('./service');
+const Service = require('./services/baseContextClass');
 
 /**
  * @member {Storage}
@@ -39,6 +45,7 @@ const Utils = require('./old-utils');
 const Socket = require('./socket');
 
 module.exports = {
+  ElectronEgg,
   Application: EE.Application,
   Controller,
   Service,

package/main/index.js

@@ -0,0 +1,42 @@
+const { app } = require('electron');
+const path = require('path');
+const fs = require('fs');
+const Utils = require('../utils');
+const Ps = require('../ps');
+const EE = require('../ee');
+const UtilsCore = require('../core/lib/utils');
+const Loader = require('../loader');
+
+class ElectronEgg {
+
+  constructor(mode) {
+    this.mode = mode || 'framework';
+    this._create();
+  }
+
+  /**
+   * create ElectronEgg app
+   */  
+  _create() {
+    if (!Ps.verifyMode(this.mode)) {
+      throw new Error(`The mode supports only (framework | module) !`);
+    }
+    process.env.EE_MODE = this.mode;
+
+    let baseDir = path.join(app.getAppPath(), 'electron');
+    if (Utils.isEncrypt(app.getAppPath())) {
+      baseDir = Ps.getEncryptDir(app.getAppPath());
+    }
+
+    let indexFile = path.join(baseDir, 'index');
+    indexFile = Loader.resolveModule(indexFile);
+    if (!fs.existsSync(indexFile)) {
+      throw new Error(`The ${indexFile} file does not exist`);
+    }
+
+    const EEApp = UtilsCore.loadFile(indexFile);
+    EE.app = new EEApp(this.env);
+  }
+}
+
+module.exports = ElectronEgg;

package/package.json

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

package/ps/index.js

@@ -1,6 +1,23 @@
 const path = require('path');
 const eis = require('../utils/is');
 
+/**
+ * 当前模式 - framework | module
+ */
+exports.mode = function() {
+  return process.env.EE_MODE;
+}
+
+/**
+ * 校验模式
+ */
+exports.verifyMode = function(mode) {
+  if (['framework', 'module'].includes(mode)) {
+    return true;
+  }
+  return false;
+}
+
 /**
  * 当前进程的所有env
  */

package/services/baseContextClass.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/services/index.js

@@ -0,0 +1,35 @@
+const EE = require('../ee');
+
+const Services = {
+
+  /**
+   * 获取 all addon instances
+   */  
+  all() {
+    const { CoreApp } = EE;
+    if (!CoreApp) {
+      throw new Error('An unknown error or Services cannot be used by the jobs!');
+    }
+
+    const instances = CoreApp.service || null;
+    if (!instances) {
+      throw new Error('Services not exists or do not call directly at the top!');
+    };
+    return instances;
+  },
+
+  /**
+   * 获取 addon instance
+   */  
+  get(name) {
+    const instances = this.all();
+    const instance = instances[name] || null;
+    if (!instance) {
+      throw new Error(`Service class '${name}' not exists or do not call directly at the top!`);
+    };
+    return instance;
+  },
+
+};
+
+module.exports = Services;