ee-core 1.1.7 → 1.1.10

package/config/config.default.js

@@ -194,7 +194,16 @@ module.exports = appInfo => {
   /* 内置socket服务 */
   config.socketServer = {
     port: 7070, // 默认端口
-    isDynamic: false // 如果值为false，框架默认使用port端口（如果默认端口被使用，则随机获取一个）；如果为true，默认端口无效，框架随机生成
+    isDynamic: false, // 如果值为false，框架默认使用port端口（如果默认端口被使用，则随机获取一个）；如果为true，默认端口无效，框架随机生成
+    path: "/socket.io/", // 路径名称
+    connectTimeout: 45000, // 客户端连接超时时间
+    pingTimeout: 30000, // 心跳检测超时时间
+    pingInterval: 25000, // 心跳检测间隔
+    maxHttpBufferSize: 1e8, // 每条消息的数据大小 1M
+    transports: ["polling", "websocket"], // http轮询和websocket
+    cors: {
+      origin: true, // http协议时，要设置跨域 类型 Boolean String RegExp Array Function
+    }
   };  
 
   return config;

package/lib/eeApp.js

@@ -26,8 +26,8 @@ class EeApp extends BaseApp {
     
     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);
+    //this.coreLogger.info('[ee-core:EeApp] [createPorts] socket port:', socketPort);
+    //this.coreLogger.info('[ee-core:EeApp] [createPorts] web port:', webPort);
     
     // 更新db配置
     this.config.socketServer.port = socketPort;
@@ -206,7 +206,7 @@ class EeApp extends BaseApp {
    * 主页面
    */
   loadMainUrl (type, url) {
-    this.logger.info('main page is env: %s, type: %s, url: %s', this.config.env, 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);
   }  
 

package/lib/socket/io.js

@@ -4,6 +4,7 @@ const IoServer = require('socket.io');
 const IoClient = require('socket.io-client');
 //const socketServer = require('./socketServer');
 const socketClient = require('./socketClient');
+const Koa = require('koa');
 
 const EeSocket = {
   getServer: () => {
@@ -18,5 +19,6 @@ const EeSocket = {
 module.exports = {
   IoServer,
   IoClient,
-  EeSocket
+  EeSocket,
+  Koa
 };

package/lib/socket/socketServer.js

@@ -18,7 +18,8 @@ class SocketServer {
     this.app = app;
     this.consoleLogger = new EggConsoleLogger();
     this.consoleLogger.info('[ee-core:socket:server] start server, socket port is:', port);
-    this.io = new Server(port);
+    const options = this.app.config.socketServer;
+    this.io = new Server(port, options);
     this.connec();
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.1.7",
+  "version": "1.1.10",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",
+    "co": "^4.6.0",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
     "electron-is": "^3.0.0",

package/utils/index.js

@@ -8,6 +8,9 @@ const is = require('is-type-of');
 const co = require('co');
 const utility = require('utility');
 
+/**
+ * 创建文件夹
+ */
 exports.mkdir = function(dirpath, dirname) {
   // 判断是否是第一次调用
   if (typeof dirname === 'undefined') {
@@ -30,6 +33,9 @@ exports.mkdir = function(dirpath, dirname) {
   }
 };
 
+/**
+ * 修改文件权限
+ */
 exports.chmodPath = function(path, mode) {
   let files = [];
   if (fs.existsSync(path)) {
@@ -131,6 +137,29 @@ exports.getSocketChannel = function() {
   return constant.socketIo.channel;
 }
 
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const cdb = this.getCoreDB();
+  const config = cdb.getItem('config');
+  const execDir = config.execDir;
+
+  // 资源路径不同
+  let dir = '';
+  if (config.isPackaged) {
+    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
+    dir = path.join(execDir, "resources", "extraResources");
+  } else {
+    // 打包前
+    dir = path.join(execDir, "build", "extraResources");
+  }
+  return dir;
+}
+
+/**
+ * 执行一个函数
+ */
 exports.callFn = async function (fn, args, ctx) {
   args = args || [];
   if (!is.function(fn)) return;