ee-core 1.1.6 → 1.1.9

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;
@@ -79,6 +79,9 @@ class EeApp extends BaseApp {
    * 创建应用主窗口
    */
   async createWindow () {
+
+    await this.electronAppReady();
+
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
 
@@ -109,34 +112,6 @@ class EeApp extends BaseApp {
     return await preferences(this);
   }
 
-  /**
-   * 创建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();
-  //   }
-  // }
-
   /**
    * 加载loading页面
    */
@@ -231,39 +206,10 @@ 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);
-   }  
-
-  /**
-   * egg
-   */
-  // 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);
-  //   if (is.function(this.startEggCluster)) {
-  //     return this.startEggCluster(options);
-  //   }
-  // }
 
   /**
    * 限制一个窗口
@@ -337,6 +283,14 @@ class EeApp extends BaseApp {
     // });
   }
 
+  /**
+   * electron app已经准备好，主窗口还未创建
+   */
+  async electronAppReady () {
+    // do some things
+
+  }
+
   /**
    * 主应用窗口已经创建
    */

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.1.6",
+  "version": "1.1.9",
   "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;