ee-core 1.1.2 → 1.1.5

package/config/config.default.js

@@ -175,5 +175,19 @@ module.exports = appInfo => {
     },
   };
 
+  /* egg服务 (待定) */
+  config.egg = {
+    enable: false, // 是否启用
+    title: 'ee', // 进程的title属性标识（默认你的应用名称-英文）
+    port: 7068,
+    hostname: '127.0.0.1',
+    workers: 1 // 工作进程数据
+  };
+
+  /* web渲染服务 */
+  config.webServer = {
+    port: 7068
+  };
+
   return config;
 };

package/lib/application.js

@@ -46,7 +46,7 @@ class Appliaction extends EeApp {
     env.EE_USER_HOME = options.userHome;
     env.EE_APP_DATA = options.appData;
     env.EE_APP_USER_DATA = options.appUserData;
-    env.EE_EGG_PORT = null;
+    env.EE_WEB_PORT = null;
     env.EE_IPC_PORT = null;
     env.EGG_SERVER_ENV = options.env;
     debug('options:%j', options)

package/lib/eeApp.js

@@ -21,12 +21,12 @@ class EeApp extends BaseApp {
    */
   async createPorts () {
     const ipcPort = await getPort();
-    const eggPort = this.config.env === 'prod' ? await getPort() : this.config.egg.port;
-    this.config.egg.port = eggPort;
+    const webPort = this.config.env === 'prod' ? await getPort() : this.config.webServer.port;
+    this.config.webServer.port = webPort;
     process.env.EE_IPC_PORT = ipcPort;
-    process.env.EE_EGG_PORT = eggPort;
+    process.env.EE_WEB_PORT = webPort;
     this.coreLogger.info('[ee-core:EeApp] [createPorts] ipc port:', ipcPort);
-    this.coreLogger.info('[ee-core:EeApp] [createPorts] egg port:', eggPort);
+    this.coreLogger.info('[ee-core:EeApp] [createPorts] web port:', webPort);
     
     // 更新db配置
     this.getCoreDB().setItem('ipc_port', ipcPort);
@@ -82,7 +82,7 @@ class EeApp extends BaseApp {
     this.electron.mainWindow = new BrowserWindow(winOptions);
 
     // 隐藏菜单
-    if (this.config.openAppMenu) {
+    if (!this.config.openAppMenu) {
       Menu.setApplicationMenu(null);
     }
 
@@ -95,8 +95,6 @@ class EeApp extends BaseApp {
     await this.loderPreload();
 
     this.loadLocalWeb();
-    
-    await this.startEggServer();
 
     // DevTools
     if (!app.isPackaged && this.config.openDevTools) {
@@ -124,16 +122,12 @@ class EeApp extends BaseApp {
       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;
+    const port = process.env.EE_WEB_PORT;
     koaApp.listen(port, () => {
       const url = 'http://127.0.0.1:' + port;
       self.loadMainUrl('local_web', url);
@@ -151,30 +145,30 @@ class EeApp extends BaseApp {
   /**
    * 创建egg服务
    */  
-  async startEggServer () {
-    // egg服务是否开启
-    if (this.config.egg.enable == false) {
-      return;
-    }
-    let eggConfig = this.config.egg;
-    const protocol = 'http://';
-    let startRes = null;
-    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('egg', url);
-    } else {
-      // 失败后重启
-      app.relaunch();
-    }
-  }
+  // async startEggServer () {
+  //   // egg服务是否开启
+  //   if (this.config.egg.enable == false) {
+  //     return;
+  //   }
+  //   let eggConfig = this.config.egg;
+  //   const protocol = 'http://';
+  //   let startRes = null;
+  //   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('egg', url);
+  //   } else {
+  //     // 失败后重启
+  //     app.relaunch();
+  //   }
+  // }
 
   /**
    * 加载loading页面
@@ -233,36 +227,32 @@ class EeApp extends BaseApp {
   /**
    * egg
    */
-  startEgg (argv) {
-    const startCluster = require('egg-cluster').startCluster;
+  // startEgg (argv) {
     
-    let homeDir = this.homeDir;
-    argv.baseDir = homeDir;
-    argv.framework = path.join(homeDir, 'node_modules', 'egg');
-
-    const appName = this.config.name;
-    argv.title = argv.title || `egg-server-${appName}`;
-
-
-    // normalize env
-    // 目前没有用到，不用修改；想要修改的话，区分打包前后的路径？
-    // env.HOME = HOME; // 这个home不能修改，因为自动升级功能会用到（win没有问题，mac有权限问题）
-    //env.NODE_ENV = 'production';
-
-    // 更新缓存配置  
-    this.getCoreDB().setItem('config', this.config);
-
-    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(){
-        resolve('success');
-      });
-    });
-  }
+  //   let homeDir = this.homeDir;
+  //   argv.baseDir = homeDir;
+  //   argv.framework = path.join(homeDir, 'node_modules', 'egg');
+
+  //   const appName = this.config.name;
+  //   argv.title = argv.title || `egg-server-${appName}`;
+
+
+  //   // normalize env
+  //   // 目前没有用到，不用修改；想要修改的话，区分打包前后的路径？
+  //   // env.HOME = HOME; // 这个home不能修改，因为自动升级功能会用到（win没有问题，mac有权限问题）
+  //   //env.NODE_ENV = 'production';
+
+  //   // 更新缓存配置  
+  //   this.getCoreDB().setItem('config', this.config);
+
+  //   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);
+  //   if (is.function(this.startEggCluster)) {
+  //     return this.startEggCluster(options);
+  //   }
+  // }
 
   /**
    * 限制一个窗口

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
-    "egg-cluster": "^1.27.1",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
     "electron-is": "^3.0.0",
     "electron-updater": "^4.6.1",
+    "extend2": "^1.0.1",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "globby": "^10.0.0",