ee-core 1.1.11 → 1.2.2

package/config/config.default.js

@@ -193,8 +193,8 @@ module.exports = appInfo => {
 
   /* 内置socket服务 */
   config.socketServer = {
-    port: 7070, // 默认端口
-    isDynamic: false, // 如果值为false，框架默认使用port端口（如果默认端口被使用，则随机获取一个）；如果为true，默认端口无效，框架随机生成
+    enable: false, // 是否启用
+    port: 7070, // 默认端口（如果端口被使用，则随机获取一个）
     path: "/socket.io/", // 路径名称
     connectTimeout: 45000, // 客户端连接超时时间
     pingTimeout: 30000, // 心跳检测超时时间
@@ -204,7 +204,25 @@ module.exports = appInfo => {
     cors: {
       origin: true, // http协议时，要设置跨域 类型 Boolean String RegExp Array Function
     }
+  };
+  
+  /* 内置http服务 */
+  config.httpServer = {
+    enable: false, // 是否启用
+    protocol: 'http://',
+    host: '127.0.0.1',
+    port: 7071, // 默认端口（如果端口被使用，则随机获取一个）
+    cors: {
+      origin: "*"
+    }
   };  
 
+  /* 主进程加载的地址 */
+  config.mainServer = {
+    protocol: 'http://',
+    host: '127.0.0.1',
+    port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
+  }; 
+
   return config;
 };

package/core/lib/ee.js

@@ -206,12 +206,4 @@ class EeCore extends KoaApplication {
   }
 }
 
-// delegate all router method to application
-// utils.methods.concat([ 'all', 'resources', 'register', 'redirect' ]).forEach(method => {
-//   EeCore.prototype[method] = function(...args) {
-//     this.router[method](...args);
-//     return this;
-//   };
-// });
-
 module.exports = EeCore;

package/lib/application.js

@@ -49,8 +49,9 @@ 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_WEB_PORT = null;
+    env.EE_MAIN_PORT = null;
     env.EE_SOCKET_PORT = null;
+    env.EE_HTTP_PORT = null;
     env.EGG_SERVER_ENV = options.env;
     debug('options:%j', options)
 

package/lib/baseApp.js

@@ -108,30 +108,6 @@ class BaseApp extends EeAppCore {
     return this[HTTPCLIENT];
   }
 
-  /**
-   * 调用 egg api
-   */
-  // async curlEgg (method, uri, params, timeout = 15000) {
-  //   let result = null;
-  //   try {
-  //     const port = this.config.egg.port;
-  //     const url = "http://127.0.0.1:" + port + uri;
-  //     // console.log('[ee:baseApp] [curlEgg] url:', url);
-  //     const response = await this.curl(url, {
-  //       method: method,
-  //       contentType: 'application/json',
-  //       data: params,
-  //       dataType: 'json',
-  //       timeout: timeout,
-  //     });
-  //     result = response.data;
-  //   } catch (err) {
-  //     this.logger.error('[ee:baseApp] [curlEgg] throw error:', err);
-  //   }
-
-  //   return result; 
-  // }
-
   /**
    * core app have been loaded
    */

package/lib/eeApp.js

@@ -12,7 +12,10 @@ class EeApp extends BaseApp {
 
     this.electron = {
       mainWindow: null,
-      tray: null
+      tray: null,
+      extra: {
+        closeWindow: false,
+      }
     };
   }
 
@@ -20,17 +23,23 @@ class EeApp extends BaseApp {
    * 生成端口
    */
   async createPorts () {
-    const socketPort = await getPort({port: this.config.socketServer.port});
-    //const webPort = this.config.env === 'prod' ? await getPort() : this.config.webServer.port;
-    const webPort = await getPort();
+    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;
+    }
     
-    process.env.EE_SOCKET_PORT = socketPort;
-    process.env.EE_WEB_PORT = webPort;
-    //this.coreLogger.info('[ee-core:EeApp] [createPorts] socket port:', socketPort);
-    //this.coreLogger.info('[ee-core:EeApp] [createPorts] web port:', webPort);
+    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.config.socketServer.port = socketPort;
     this.getCoreDB().setItem('config', this.config);
   }
 
@@ -47,23 +56,21 @@ class EeApp extends BaseApp {
    */
   async createElectronApp () {
     const self = this;
-    await this.limitOneWindow();
+
+    const gotTheLock = app.requestSingleInstanceLock();
+    if (!gotTheLock) {
+      await this.appQuit();
+      return;
+    }
 
     app.on('second-instance', (event) => {
-      if (self.electron.mainWindow) {
-        if (self.electron.mainWindow.isMinimized()) {
-          self.electron.mainWindow.restore();
-        }
-        self.electron.mainWindow.focus()
-      }
+      self.restoreMainWindow();
     })
   
     app.whenReady().then(() => {
       self.createWindow();
       app.on('activate', function () {
-        if (BrowserWindow.getAllWindows().length === 0) {
-          self.createWindow();
-        }
+        self.restoreMainWindow();
       })
     })
     
@@ -73,15 +80,18 @@ class EeApp extends BaseApp {
         self.appQuit();
       }
     })
+
+    app.on('before-quit', () => {
+      self.electron.extra.closeWindow = true;
+    })
+
+    await this.electronAppReady();
   }
     
   /**
    * 创建应用主窗口
    */
   async createWindow () {
-
-    await this.electronAppReady();
-
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
 
@@ -104,6 +114,18 @@ class EeApp extends BaseApp {
     }
   }
 
+  /**
+   * 还原窗口
+   */
+  restoreMainWindow () {
+    if (this.electron.mainWindow) {
+      if (this.electron.mainWindow.isMinimized()) {
+        this.electron.mainWindow.restore();
+      }
+      this.electron.mainWindow.show()
+    }
+  }
+
   /**
    * 加载已经实现的功能
    */
@@ -190,14 +212,15 @@ class EeApp extends BaseApp {
     }
 
     const koaApp = new Koa();	
-    koaApp.use(koaServe(staticDir))
-    const port = process.env.EE_WEB_PORT;
-    let url = 'http://127.0.0.1:' + port;
+    koaApp.use(koaServe(staticDir));
+
+    const mainServer = this.config.mainServer;
+    let url = mainServer.protocol + mainServer.host + ':' + mainServer.port;
     if (mode == 'html') {
       url += '/' + hostInfo.indexPage;
     }
 
-    koaApp.listen(port, () => {
+    koaApp.listen(mainServer.port, () => {
       self.loadMainUrl(mode, url);
     });
   }
@@ -208,18 +231,17 @@ class EeApp extends BaseApp {
   loadMainUrl (type, url) {
     this.logger.info('main page is env: %s, type: %s, App running at: %s', this.config.env, type, url);
     this.electron.mainWindow.loadURL(url);
-  }  
-
+  }
 
   /**
    * 限制一个窗口
    */
-  async limitOneWindow () {
-    const gotTheLock = app.requestSingleInstanceLock();
-    if (!gotTheLock) {
-      await this.appQuit();
-    }
-  }
+  // async limitOneWindow () {
+  //   const gotTheLock = app.requestSingleInstanceLock();
+  //   if (!gotTheLock) {
+  //     await this.appQuit();
+  //   }
+  // }
 
   /**
    * electron app退出
@@ -228,7 +250,7 @@ class EeApp extends BaseApp {
     await this.beforeClose();
     
     // 窗口销毁
-    this.electron.mainWindow.destroy();
+    //this.electron.mainWindow.close();
 
     //console.log('Exit now!');
     // 托盘销毁

package/lib/socket/httpServer.js

@@ -0,0 +1,105 @@
+'use strict';
+
+const assert = require('assert');
+const is = require('is-type-of');
+const Koa = require('koa');
+const BodyParser = require('koa-bodyparser');
+const cors = require('koa2-cors');
+
+/**
+ * http server
+ */
+class HttpServer {
+  constructor (app) {
+    this.app = app;
+    const options = this.app.config.httpServer;
+
+    if (!options.enable) {
+      return;
+    }
+
+    let port = process.env.EE_HTTP_PORT ? parseInt(process.env.EE_HTTP_PORT) : parseInt(this.getHttpPort());
+    assert(typeof port === 'number', 'http port required, and must be a number');
+
+    this.create();
+  }
+
+  /**
+   * 创建服务
+   */
+  create () {
+    const self = this;
+    const httpServer = this.app.config.httpServer;
+    const url = httpServer.protocol + httpServer.host + ':' + httpServer.port;
+    const corsOptions = httpServer.cors;
+
+    const koaApp = new Koa();
+    const bodyparser= new BodyParser();
+
+    koaApp
+      .use(cors(corsOptions))
+      .use(bodyparser)
+      .use(async (ctx, next) => {
+        ctx.eeApp = self.app;
+        await next();
+      })
+      .use(this.dispatch);
+
+    koaApp.listen(httpServer.port, () => {
+      self.app.coreLogger.info('[ee-core:http:server] http server is:', url);
+    });
+  }
+
+  /**
+   * 路由分发
+   */
+  async dispatch (ctx, next) {
+    let uriPath = ctx.request.path;
+    const method = ctx.request.method;
+    let params = ctx.request.query;
+    params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
+    const body = ctx.request.body;
+    // 添加到全局属性
+    ctx.eeApp.request = ctx.request;
+    ctx.eeApp.response = ctx.response;
+
+    try {
+      // 找函数
+      if (uriPath.indexOf('/') !== -1) {
+        uriPath = uriPath.substring(1);
+      }
+      const cmd = uriPath.split('/').join('.');
+      const args = (method == 'POST') ? body : params;
+      let fn = null;
+      if (is.string(cmd)) {
+        const actions = cmd.split('.');
+        let obj = ctx.eeApp;
+        actions.forEach(key => {
+          obj = obj[key];
+          if (!obj) throw new Error(`class or function '${key}' not exists`);
+        });
+        fn = obj;
+      }
+      if (!fn) throw new Error('function not exists');
+
+      const result = await fn.call(ctx.eeApp, args);
+      ctx.response.status = 200;
+      ctx.response.body = result;
+    } catch (err) {
+      ctx.eeApp.console.error('[ee-core:http:server] throw error:', err);
+    }
+
+    await next();
+  }
+
+  /**
+   * 获取http端口
+   */  
+  getHttpPort () {
+    const cdb = this.getCoreDB();
+    const port = cdb.getItem('config').httpServer.port;
+    return parseInt(port);
+  } 
+}
+
+module.exports = HttpServer;

package/lib/socket/socketServer.js

@@ -11,14 +11,20 @@ const is = require('is-type-of');
  */
 class SocketServer {
   constructor (app) {
-    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketcPort());
-
-    assert(typeof port === 'number', 'port required, and must be a number');
-
     this.app = app;
-    this.consoleLogger = new EggConsoleLogger();
-    this.consoleLogger.info('[ee-core:socket:server] start server, socket port is:', port);
     const options = this.app.config.socketServer;
+    this.consoleLogger = new EggConsoleLogger();
+
+    if (!options.enable) {
+      return;
+    }
+
+    let port = process.env.EE_SOCKET_PORT ? parseInt(process.env.EE_SOCKET_PORT) : parseInt(this.getSocketPort());
+    assert(typeof port === 'number', 'socekt port required, and must be a number');
+    this.consoleLogger.info('[ee-core:socket:server] socket server port is:', port);
+
+    // let opt = Object.assign({}, options);
+    // delete opt.enable;
     this.io = new Server(port, options);
     this.connec();
   }
@@ -50,7 +56,7 @@ class SocketServer {
           const result = await fn.call(self.app, args);
           callback(result);
         } catch (err) {
-          self.app.logger.error('[ee:socket] throw error:', err);
+          self.app.console.error('[ee-core:socket:server] throw error:', err);
         }
       });
     });
@@ -61,7 +67,7 @@ class SocketServer {
     return coreDB;
   }
 
-  getSocketcPort () {
+  getSocketPort () {
     const cdb = this.getCoreDB();
     const port = cdb.getItem('config').socketServer.port;
     return port;

package/lib/socket/start.js

@@ -2,6 +2,7 @@
 
 const socketServer = require('./socketServer');
 const ipcServer = require('./ipcServer');
+const httpServer = require('./httpServer');
 
 /**
  * server
@@ -11,6 +12,9 @@ const ipcServer = require('./ipcServer');
   // 启动 socket server
   new socketServer(app);
 
+  // 启动 http server
+  new httpServer(app);  
+
   // 启动 electron ipc server
   new ipcServer(app);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.1.11",
+  "version": "1.2.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -27,10 +27,13 @@
     "humanize-ms": "^1.2.1",
     "is-type-of": "^1.2.1",
     "koa": "^2.13.4",
+    "koa-bodyparser": "^4.3.0",
     "koa-convert": "^2.0.0",
     "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
     "lodash": "^4.17.21",
     "lowdb": "^1.0.0",
+    "path-to-regexp": "^6.2.0",
     "socket.io": "^4.4.1",
     "socket.io-client": "^4.4.1",
     "uglify-js": "^3.14.5",

package/tools/codeCompress.js

@@ -128,7 +128,9 @@ class CodeCompress {
    * 移除备份
    */
   rmBackup () {
-    fs.rmdirSync(this.backupCodeDir, {recursive: true});
+    if (fs.existsSync(this.backupCodeDir)) {
+      fs.rmSync(this.backupCodeDir, {recursive: true, force: true});
+    }
     return;
   }