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

package/lib/eeApp.js

@@ -1,360 +1,360 @@
-const path = require('path');
-const fs = require('fs');
-const assert = require('assert');
-const getPort = require('get-port');
-const {app, BrowserWindow, BrowserView, Menu} = require('electron');
-const BaseApp = require('./baseApp');
-const is = require('is-type-of');
-const Koa = require('koa');
-const koaServe = require('koa-static');
-const https = require('https');
-const utilsCommon = require('../utils/common');
-
-class EeApp extends BaseApp {
-  constructor(options = {}) {
-    super(options);
-
-    this.electron = {
-      mainWindow: null,
-      tray: null,
-      extra: {
-        closeWindow: false,
-      },
-    };
-  }
-
-  /**
-   * 生成端口
-   */
-  async createPorts () {
-    const mainPort = await getPort({port: this.config.mainServer.port});
-    process.env.EE_MAIN_PORT = mainPort;
-    this.config.mainServer.port = mainPort;
-
-    if (this.config.socketServer.enable) {
-      const socketPort = await getPort({port: this.config.socketServer.port});
-      process.env.EE_SOCKET_PORT = socketPort;
-      this.config.socketServer.port = socketPort;
-    }
-    
-    if (this.config.httpServer.enable) {
-      const httpPort = await getPort({port: this.config.httpServer.port});
-      process.env.EE_HTTP_PORT = httpPort;
-      this.config.httpServer.port = httpPort;
-    }
-    
-    // 更新db配置
-    this.getCoreDB().setItem('config', this.config);
-  }
-
-  /**
-   * 启动通信模块
-   */
-  async startSocket () {
-    const socket = require('./socket/start');
-    socket(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') {
-        self.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
-        self.appQuit();
-      }
-    })
-
-    app.on('before-quit', () => {
-      self.electron.extra.closeWindow = true;
-    })
-
-    if (this.config.hardGpu.enable == false) {
-      app.disableHardwareAcceleration();
-    }
-
-    await this.electronAppReady();
-  }
-    
-  /**
-   * 创建应用主窗口
-   */
-  async createWindow () {
-    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.loadingView(winOptions);
-
-    await this.windowReady();
-  
-    await this._loderAddons();
-
-    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();
-      }
-      this.electron.mainWindow.show()
-    }
-  }
-
-  /**
-   * 加载已经实现的功能
-   */
-  async loadPreference () {
-    const preferences = require('./preferences');
-    return await preferences(this);
-  }
-
-  /**
-   * 加载loading页面
-   */
-  loadingView (winOptions) {
-    let currentV = process.versions.electron;
-    if (utilsCommon.compareVersion(currentV, '12.2.3') == 1) {
-      return;
-    }
-    if (!this.config.loadingPage) {
-      return;
-    }
-    const self = this;
-    const loadingBrowserView = new BrowserView();
-    this.electron.mainWindow.setBrowserView(loadingBrowserView);
-    loadingBrowserView.setBounds({
-      x: 0,
-      y: 0,
-      width: winOptions.width,
-      height: winOptions.height
-    });
-
-    // loading html
-    const loadingHtml = path.join('file://', this.config.homeDir, 'public', 'html', 'loading.html');
-    loadingBrowserView.webContents.loadURL(loadingHtml);
-    this.logger.info('loadingHtml:', loadingHtml);
-    
-    this.electron.mainWindow.webContents.on('dom-ready', async (event) => {
-      self.electron.mainWindow.removeBrowserView(loadingBrowserView);
-    });
-  }
-
-  /**
-   * 应用类型 （远程、html、单页应用）
-   */
-  selectAppType () {
-    let type = '';
-    let url = '';
-
-    // 远程模式
-    const remoteConfig = this.config.remoteUrl;
-    if (remoteConfig.enable == true) {
-      type = 'remote_web';
-      url = remoteConfig.url;
-      this.loadMainUrl(type, url);
-      return;
-    }
-
-    const developmentModeConfig = this.config.developmentMode;
-    const selectMode = developmentModeConfig.default;
-    const modeInfo = developmentModeConfig.mode[selectMode];
-    let staticDir = null;
-
-    // html模式
-    if (selectMode == 'html') {
-      if (this.config.env !== 'prod') {
-        staticDir = path.join(this.config.homeDir, 'frontend', 'dist');
-      }
-      this.loadLocalWeb('html', staticDir, modeInfo);
-      return;
-    }
-
-    // 单页应用
-    const protocol = modeInfo.protocol || 'http://';
-    url = protocol + modeInfo.hostname + ':' + modeInfo.port;
-    if (this.config.env !== 'prod') {
-      this.loadMainUrl('spa', url);
-    } else {
-      this.loadLocalWeb('spa');
-    }
-  }
-
-  /**
-   * 加载本地前端资源
-   */
-  loadLocalWeb (mode, staticDir, hostInfo) {
-    const self = this;
-    if (!staticDir) {
-      staticDir = path.join(this.config.homeDir, 'public', 'dist')
-    }
-
-    const koaApp = new Koa();	
-    koaApp.use(koaServe(staticDir));
-
-    const mainServer = this.config.mainServer;
-    let url = mainServer.protocol + mainServer.host + ':' + mainServer.port;
-    if (mode == 'html') {
-      url += '/' + hostInfo.indexPage;
-    }
-
-    const isHttps = mainServer.protocol == 'https://' ? true : false;
-    if (isHttps) {
-      const keyFile = path.join(this.config.homeDir, mainServer.ssl.key);
-      const certFile = path.join(this.config.homeDir, mainServer.ssl.cert);
-      assert(fs.existsSync(keyFile), 'ssl key file is required');
-      assert(fs.existsSync(certFile), 'ssl cert file is required');
-
-      const sslOpt = {
-        key: fs.readFileSync(keyFile),
-        cert: fs.readFileSync(certFile)
-      };
-      https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
-        if (err) {
-          self.coreLogger.info('[error] ', err);
-          return
-        }
-        self.loadMainUrl(mode, url);
-      });
-    } else {
-      koaApp.listen(mainServer.port, () => {
-        self.loadMainUrl(mode, url);
-      });
-    }
-  }
-
-  /**
-   * 主页面
-   */
-  loadMainUrl (type, url) {
-    const mainServer = this.config.mainServer;
-    this.logger.info('[ee-core:main] Env: %s, Type: %s', this.config.env, type);
-    this.logger.info('[ee-core:main] App running at: %s', url);
-    this.electron.mainWindow.loadURL(url, mainServer.options);
-  }
-
-  /**
-   * electron app退出
-   */  
-  async appQuit () {
-    await this.beforeClose();
-    app.quit();
-  }
-
-  /**
-   * 加载插件
-   */
-  async _loderAddons () {
-    this.loader.loadAddons();
-
-    // 注册主窗口Contents id
-    const addonsCfg = this.config.addons;
-    if (addonsCfg.window.enable) {
-      const win = this.electron.mainWindow;
-      const addonWindow = this.addon.window;
-      addonWindow.registerWCid('main', win.webContents.id);
-    }
-  }
-
-  /**
-   * 预加载模块
-   */
-  async _loderPreload () {
-    let filepath = this.loader.resolveModule(path.join(this.config.baseDir, 'preload', 'index'));
-    if (!filepath) return; 
-    const fileObj = this.loader.loadFile(filepath);
-    if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.asyncFunction(fileObj)) {
-      fileObj();
-    } else if (is.asyncFunction(fileObj)) {
-      await fileObj();
-    }
-  }
-
-  /**
-   * 序列化参数
-   */ 
-  stringify(obj, ignore) {
-    const result = {};
-    Object.keys(obj).forEach(key => {
-      if (!ignore.includes(key)) {
-        result[key] = obj[key];
-      }
-    });
-    return JSON.stringify(result);
-  }
-
-  /**
-   * 捕获异常
-   */
-  async catchLog () {
-    const self = this;
-
-    process.on('uncaughtException', function(err) {
-      self.logger.error(err);
-    });
-  }
-
-  /**
-   * electron app已经准备好，主窗口还未创建
-   */
-  async electronAppReady () {
-    // do some things
-  }
-
-  /**
-   * 主应用窗口已经创建
-   */
-  async windowReady () {
-    // do some things
-  }
-
-  /**
-   * app关闭之前
-   */  
-  async beforeClose () {
-    // do some things
-  }  
-}
-
+const path = require('path');
+const fs = require('fs');
+const assert = require('assert');
+const getPort = require('get-port');
+const {app, BrowserWindow, BrowserView, Menu} = require('electron');
+const BaseApp = require('./baseApp');
+const is = require('is-type-of');
+const Koa = require('koa');
+const koaServe = require('koa-static');
+const https = require('https');
+const utilsCommon = require('../utils/common');
+
+class EeApp extends BaseApp {
+  constructor(options = {}) {
+    super(options);
+
+    this.electron = {
+      mainWindow: null,
+      tray: null,
+      extra: {
+        closeWindow: false,
+      },
+    };
+  }
+
+  /**
+   * 生成端口
+   */
+  async createPorts () {
+    const mainPort = await getPort({port: this.config.mainServer.port});
+    process.env.EE_MAIN_PORT = mainPort;
+    this.config.mainServer.port = mainPort;
+
+    if (this.config.socketServer.enable) {
+      const socketPort = await getPort({port: this.config.socketServer.port});
+      process.env.EE_SOCKET_PORT = socketPort;
+      this.config.socketServer.port = socketPort;
+    }
+    
+    if (this.config.httpServer.enable) {
+      const httpPort = await getPort({port: this.config.httpServer.port});
+      process.env.EE_HTTP_PORT = httpPort;
+      this.config.httpServer.port = httpPort;
+    }
+    
+    // 更新db配置
+    this.getCoreDB().setItem('config', this.config);
+  }
+
+  /**
+   * 启动通信模块
+   */
+  async startSocket () {
+    const socket = require('./socket/start');
+    socket(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') {
+        self.coreLogger.info('[Appliaction] [initialize] window-all-closed quit');
+        self.appQuit();
+      }
+    })
+
+    app.on('before-quit', () => {
+      self.electron.extra.closeWindow = true;
+    })
+
+    if (this.config.hardGpu.enable == false) {
+      app.disableHardwareAcceleration();
+    }
+
+    await this.electronAppReady();
+  }
+    
+  /**
+   * 创建应用主窗口
+   */
+  async createWindow () {
+    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.loadingView(winOptions);
+
+    await this.windowReady();
+  
+    await this._loderAddons();
+
+    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();
+      }
+      this.electron.mainWindow.show()
+    }
+  }
+
+  /**
+   * 加载已经实现的功能
+   */
+  async loadPreference () {
+    const preferences = require('./preferences');
+    return await preferences(this);
+  }
+
+  /**
+   * 加载loading页面
+   */
+  loadingView (winOptions) {
+    let currentV = process.versions.electron;
+    if (utilsCommon.compareVersion(currentV, '12.2.3') == 1) {
+      return;
+    }
+    if (!this.config.loadingPage) {
+      return;
+    }
+    const self = this;
+    const loadingBrowserView = new BrowserView();
+    this.electron.mainWindow.setBrowserView(loadingBrowserView);
+    loadingBrowserView.setBounds({
+      x: 0,
+      y: 0,
+      width: winOptions.width,
+      height: winOptions.height
+    });
+
+    // loading html
+    const loadingHtml = path.join('file://', this.config.homeDir, 'public', 'html', 'loading.html');
+    loadingBrowserView.webContents.loadURL(loadingHtml);
+    this.logger.info('loadingHtml:', loadingHtml);
+    
+    this.electron.mainWindow.webContents.on('dom-ready', async (event) => {
+      self.electron.mainWindow.removeBrowserView(loadingBrowserView);
+    });
+  }
+
+  /**
+   * 应用类型 （远程、html、单页应用）
+   */
+  selectAppType () {
+    let type = '';
+    let url = '';
+
+    // 远程模式
+    const remoteConfig = this.config.remoteUrl;
+    if (remoteConfig.enable == true) {
+      type = 'remote_web';
+      url = remoteConfig.url;
+      this.loadMainUrl(type, url);
+      return;
+    }
+
+    const developmentModeConfig = this.config.developmentMode;
+    const selectMode = developmentModeConfig.default;
+    const modeInfo = developmentModeConfig.mode[selectMode];
+    let staticDir = null;
+
+    // html模式
+    if (selectMode == 'html') {
+      if (this.config.env !== 'prod') {
+        staticDir = path.join(this.config.homeDir, 'frontend', 'dist');
+      }
+      this.loadLocalWeb('html', staticDir, modeInfo);
+      return;
+    }
+
+    // 单页应用
+    const protocol = modeInfo.protocol || 'http://';
+    url = protocol + modeInfo.hostname + ':' + modeInfo.port;
+    if (this.config.env !== 'prod') {
+      this.loadMainUrl('spa', url);
+    } else {
+      this.loadLocalWeb('spa');
+    }
+  }
+
+  /**
+   * 加载本地前端资源
+   */
+  loadLocalWeb (mode, staticDir, hostInfo) {
+    const self = this;
+    if (!staticDir) {
+      staticDir = path.join(this.config.homeDir, 'public', 'dist')
+    }
+
+    const koaApp = new Koa();	
+    koaApp.use(koaServe(staticDir));
+
+    const mainServer = this.config.mainServer;
+    let url = mainServer.protocol + mainServer.host + ':' + mainServer.port;
+    if (mode == 'html') {
+      url += '/' + hostInfo.indexPage;
+    }
+
+    const isHttps = mainServer.protocol == 'https://' ? true : false;
+    if (isHttps) {
+      const keyFile = path.join(this.config.homeDir, mainServer.ssl.key);
+      const certFile = path.join(this.config.homeDir, mainServer.ssl.cert);
+      assert(fs.existsSync(keyFile), 'ssl key file is required');
+      assert(fs.existsSync(certFile), 'ssl cert file is required');
+
+      const sslOpt = {
+        key: fs.readFileSync(keyFile),
+        cert: fs.readFileSync(certFile)
+      };
+      https.createServer(sslOpt, koaApp.callback()).listen(mainServer.port, (err) => {
+        if (err) {
+          self.coreLogger.info('[error] ', err);
+          return
+        }
+        self.loadMainUrl(mode, url);
+      });
+    } else {
+      koaApp.listen(mainServer.port, () => {
+        self.loadMainUrl(mode, url);
+      });
+    }
+  }
+
+  /**
+   * 主页面
+   */
+  loadMainUrl (type, url) {
+    const mainServer = this.config.mainServer;
+    this.logger.info('[ee-core:main] Env: %s, Type: %s', this.config.env, type);
+    this.logger.info('[ee-core:main] App running at: %s', url);
+    this.electron.mainWindow.loadURL(url, mainServer.options);
+  }
+
+  /**
+   * electron app退出
+   */  
+  async appQuit () {
+    await this.beforeClose();
+    app.quit();
+  }
+
+  /**
+   * 加载插件
+   */
+  async _loderAddons () {
+    this.loader.loadAddons();
+
+    // 注册主窗口Contents id
+    const addonsCfg = this.config.addons;
+    if (addonsCfg.window.enable) {
+      const win = this.electron.mainWindow;
+      const addonWindow = this.addon.window;
+      addonWindow.registerWCid('main', win.webContents.id);
+    }
+  }
+
+  /**
+   * 预加载模块
+   */
+  async _loderPreload () {
+    let filepath = this.loader.resolveModule(path.join(this.config.baseDir, 'preload', 'index'));
+    if (!filepath) return; 
+    const fileObj = this.loader.loadFile(filepath);
+    if (is.function(fileObj) && !is.generatorFunction(fileObj) && !is.asyncFunction(fileObj)) {
+      fileObj();
+    } else if (is.asyncFunction(fileObj)) {
+      await fileObj();
+    }
+  }
+
+  /**
+   * 序列化参数
+   */ 
+  stringify(obj, ignore) {
+    const result = {};
+    Object.keys(obj).forEach(key => {
+      if (!ignore.includes(key)) {
+        result[key] = obj[key];
+      }
+    });
+    return JSON.stringify(result);
+  }
+
+  /**
+   * 捕获异常
+   */
+  async catchLog () {
+    const self = this;
+
+    process.on('uncaughtException', function(err) {
+      self.logger.error(err);
+    });
+  }
+
+  /**
+   * electron app已经准备好，主窗口还未创建
+   */
+  async electronAppReady () {
+    // do some things
+  }
+
+  /**
+   * 主应用窗口已经创建
+   */
+  async windowReady () {
+    // do some things
+  }
+
+  /**
+   * app关闭之前
+   */  
+  async beforeClose () {
+    // do some things
+  }  
+}
+
 module.exports = EeApp;