ee-core 1.0.0 → 1.1.0

package/lib/eeApp.js

@@ -3,6 +3,8 @@ 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');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -12,13 +14,6 @@ class EeApp extends BaseApp {
       mainWindow: null,
       tray: null
     };
-
-    //this._mainWindow = null;
-    //this.electron.mainWindow = null;
-
-    //this.electron.tray = null;
-    // global.APP_TRAY = null;
-    //this.preferences = {};
   }
 
   /**
@@ -85,11 +80,6 @@ class EeApp extends BaseApp {
   async createWindow () {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
-  
-    // DevTools
-    if (!app.isPackaged && this.config.openDevTools) {
-      this.electron.mainWindow.webContents.openDevTools();
-    }
 
     // 隐藏菜单
     if (this.config.openAppMenu) {
@@ -103,8 +93,15 @@ class EeApp extends BaseApp {
     await this.windowReady();
   
     await this.loderPreload();
+
+    this.loadLocalWeb();
     
-    await this.startEggServer(this.config.egg);
+    await this.startEggServer();
+
+    // DevTools
+    if (!app.isPackaged && this.config.openDevTools) {
+      this.electron.mainWindow.webContents.openDevTools();
+    }
   }
 
   /**
@@ -113,10 +110,36 @@ class EeApp extends BaseApp {
   loadRemoreWeb () {
     const remoteConfig = this.config.remoteUrl;
     if (remoteConfig.enable) {
-      this.loadMainUrl(remoteConfig.url);
+      this.loadMainUrl('remote_web', remoteConfig.url);
     }
   }
 
+  /**
+   * 加载本地前端资源
+   */
+  loadLocalWeb () {
+    // 如果加载了远程，则不能加载本地的
+    const remoteConfig = this.config.remoteUrl;
+    if (remoteConfig.enable) {
+      return;
+    }
+
+    // 如果egg服务开启，则不能加载本地的
+    if (this.config.egg.enable == true) {
+      return;
+    }
+    const self = this;
+    const staticDir = path.join(this.config.homeDir, 'public', 'dist');
+
+    const koaApp = new Koa();	
+    koaApp.use(koaServe(staticDir))
+    const port = process.env.EE_EGG_PORT;
+    koaApp.listen(port, () => {
+      const url = 'http://127.0.0.1:' + port;
+      self.loadMainUrl('local_web', url);
+    });
+  }
+
   /**
    * 加载已经实现的功能
    */
@@ -128,38 +151,29 @@ class EeApp extends BaseApp {
   /**
    * 创建egg服务
    */  
-  async startEggServer (options) {
+  async startEggServer () {
     // egg服务是否开启
     if (this.config.egg.enable == false) {
       return;
     }
-
-    this.coreLogger.info('[ee-core:EeApp] [startServer] options', options);
+    let eggConfig = this.config.egg;
     const protocol = 'http://';
     let startRes = null;
-    let url = null;
-    
-    if (this.config.env === 'prod') {
-      url = protocol + options.hostname + ':' + options.port
-    } else {
-      const developmentModeConfig = this.config.developmentMode;
-      const selectMode = developmentModeConfig.default;
-      const modeInfo = developmentModeConfig.mode[selectMode];
-      url = protocol + modeInfo.hostname + ':' + modeInfo.port;
-    }
-    this.coreLogger.info('[ee-core:EeApp] frontend server :', url)
-    startRes = await this.startEgg(options).then((res) => res, (err) => err);
-    this.coreLogger.info('[ee-core:EeApp] [startServer] egg startRes:', startRes)
+    let url = protocol + eggConfig.hostname + ':' + eggConfig.port;
+
+    startRes = await this.startEgg(eggConfig).then((res) => res, (err) => err);
+    this.coreLogger.info('[ee-core:EeApp] [startEggServer] startRes:', startRes)
     if (startRes === 'success') {
-      // 是否加载远程网址
+      // 如果加载远程网址，则不能重复load
       const remoteConfig = this.config.remoteUrl;
       if (remoteConfig.enable) {
         return;
       }
-      this.loadMainUrl(url);
+      this.loadMainUrl('egg', url);
+    } else {
+      // 失败后重启
+      app.relaunch();
     }
-    
-    app.relaunch();
   }
 
   /**
@@ -170,6 +184,11 @@ class EeApp extends BaseApp {
     if (remoteConfig.enable) {
       return;
     }
+
+    if (!this.config.loadingPage) {
+      return;
+    }
+
     const self = this;
     const loadingBrowserView = new BrowserView();
     this.electron.mainWindow.setBrowserView(loadingBrowserView);
@@ -193,7 +212,21 @@ class EeApp extends BaseApp {
   /**
    * 加载主页面
    */
-  loadMainUrl (url) {
+  loadMainUrl (type, url) {
+
+    // 环境模式 (远程模式，不加载dev)
+    const remoteConfig = this.config.remoteUrl;
+    if (this.config.env !== 'prod' && remoteConfig.enable == false) {
+      const protocol = 'http://';
+      const developmentModeConfig = this.config.developmentMode;
+      const selectMode = developmentModeConfig.default;
+      const modeInfo = developmentModeConfig.mode[selectMode];
+      url = protocol + modeInfo.hostname + ':' + modeInfo.port;
+      
+      this.coreLogger.info('[ee-core:EeApp] frontend server :', url)
+    }
+
+    this.logger.info('main page is env: %s, type: %s, url: %s', this.config.env, type, url);
     this.electron.mainWindow.loadURL(url);
   }
 
@@ -222,6 +255,7 @@ class EeApp extends BaseApp {
     const ignoreKeys = [ '_', '$0', 'env', 'daemon', 'stdout', 'stderr', 'timeout', 'ignore-stderr', 'node' ];
     const clusterOptions = this.stringify(argv, ignoreKeys);
     const options = JSON.parse(clusterOptions);
+    this.coreLogger.info('[ee-core:EeApp] [startEgg] options', options);
 
     return new Promise((resolve, reject) => {
       startCluster(options, function(){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "electron-egg core",
   "main": "index.js",
   "scripts": {
@@ -17,23 +17,24 @@
     "egg-logger": "^2.7.1",
     "electron-is": "^3.0.0",
     "electron-updater": "^4.6.1",
+    "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "globby": "^10.0.0",
     "humanize-ms": "^1.2.1",
     "is-type-of": "^1.2.1",
     "koa": "^2.13.4",
     "koa-convert": "^2.0.0",
+    "koa-static": "^5.0.0",
     "lodash": "^4.17.21",
     "lowdb": "^1.0.0",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
+    "uglify-js": "^3.14.5",
     "unzip-crx-3": "^0.2.0",
     "urllib": "^2.38.0",
     "utility": "^1.17.0"
   },
   "devDependencies": {
-    "debug": "^4.3.3",
-    "fs-extra": "^10.0.0",
-    "uglify-js": "^3.14.5"
+    "debug": "^4.3.3"
   }
 }