ee-core 1.2.2 → 1.2.5

package/config/config.default.js

@@ -224,5 +224,22 @@ module.exports = appInfo => {
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
   }; 
 
+  /**
+   * 应用程序顶部菜单
+   * boolean | string
+   * true, false, 'dev-show'(dev环境显示，prod环境隐藏)
+   */
+  config.openAppMenu = true; 
+
+  /**
+   * 硬件加速
+   */
+  config.hardGpu = false; 
+
+  /**
+   * loading页（废弃）
+   */
+  config.loadingPage = false;  
+
   return config;
 };

package/lib/application.js

@@ -29,10 +29,14 @@ class Appliaction extends EeApp {
     }
 
     // argv
+    let hotReload = false;
     for (let i = 0; i < process.argv.length; i++) {
       const tmpArgv = process.argv[i]
       if (tmpArgv.indexOf('--env=') !== -1) {
-        options.env = tmpArgv.substring(6)
+        options.env = tmpArgv.substring(6);
+      }
+      if (tmpArgv.indexOf('--hot-reload=') !== -1) {
+        hotReload = tmpArgv.substring(13) == 1 ? true : false;
       }
     }
 
@@ -52,7 +56,7 @@ class Appliaction extends EeApp {
     env.EE_MAIN_PORT = null;
     env.EE_SOCKET_PORT = null;
     env.EE_HTTP_PORT = null;
-    env.EGG_SERVER_ENV = options.env;
+    env.HOT_RELOAD = hotReload;
     debug('options:%j', options)
 
     super(options);
@@ -70,7 +74,7 @@ class Appliaction extends EeApp {
 
     await this.createElectronApp();
 
-    this.catchLog();
+    await this.catchLog();
   } 
 }
 

package/lib/eeApp.js

@@ -5,6 +5,7 @@ const BaseApp = require('./baseApp');
 const is = require('is-type-of');
 const Koa = require('koa');
 const koaServe = require('koa-static');
+const utilsCommon = require('../utils/common');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -85,6 +86,10 @@ class EeApp extends BaseApp {
       self.electron.extra.closeWindow = true;
     })
 
+    if (this.config.hardGpu == false) {
+      app.disableHardwareAcceleration();
+    }
+
     await this.electronAppReady();
   }
     
@@ -94,10 +99,21 @@ class EeApp extends BaseApp {
   async createWindow () {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
+    let win = this.electron.mainWindow;
+    if (winOptions.show === false) {
+      win.once('ready-to-show', () => {
+        win.show();
+      })
+    }
 
-    // 隐藏菜单
-    if (!this.config.openAppMenu) {
+    // 菜单显示/隐藏
+    if (this.config.openAppMenu === 'dev-show'
+      && this.config.env == 'prod') {
       Menu.setApplicationMenu(null);
+    } else if (this.config.openAppMenu === false) {
+      Menu.setApplicationMenu(null);
+    } else {
+      // nothing 
     }
 
     this.loadingView(winOptions);
@@ -110,7 +126,7 @@ class EeApp extends BaseApp {
 
     // DevTools
     if (!app.isPackaged && this.config.openDevTools) {
-      this.electron.mainWindow.webContents.openDevTools();
+      win.webContents.openDevTools();
     }
   }
 
@@ -138,10 +154,13 @@ class EeApp extends BaseApp {
    * 加载loading页面
    */
   loadingView (winOptions) {
+    let currentV = process.versions.electron;
+    if (utilsCommon.compareVersion(currentV, '12.2.3') == 1) {
+      return;
+    }
     if (!this.config.loadingPage) {
       return;
     }
-
     const self = this;
     const loadingBrowserView = new BrowserView();
     this.electron.mainWindow.setBrowserView(loadingBrowserView);
@@ -233,31 +252,11 @@ class EeApp extends BaseApp {
     this.electron.mainWindow.loadURL(url);
   }
 
-  /**
-   * 限制一个窗口
-   */
-  // async limitOneWindow () {
-  //   const gotTheLock = app.requestSingleInstanceLock();
-  //   if (!gotTheLock) {
-  //     await this.appQuit();
-  //   }
-  // }
-
   /**
    * electron app退出
    */  
   async appQuit () {
     await this.beforeClose();
-    
-    // 窗口销毁
-    //this.electron.mainWindow.close();
-
-    //console.log('Exit now!');
-    // 托盘销毁
-    // if (this.electron.tray) {
-    //   console.log('ssssssssssss');
-    //   this.electron.tray.destroy();
-    // }
 
     app.quit();
   }
@@ -292,17 +291,12 @@ class EeApp extends BaseApp {
   /**
    * 捕获异常
    */
-  catchLog () {
+  async catchLog () {
     const self = this;
+
     process.on('uncaughtException', function(err) {
       self.logger.error(err);
     });
-    
-    // process.on('SIGINT', function () {
-    //   console.log('Exit now!');
-    //   self.appQuit();
-    //   process.exit();
-    // });
   }
 
   /**

package/lib/socket/ipcServer.js

@@ -81,15 +81,15 @@ class IpcServer {
       for (const key in fns) {
         let channel = pathName + '.' + key;
         debug('register channel %s', channel);
-        ipcMain.on(channel, async (event, params) => {
+
+        function findFn (app, c) {
           try {
             // 找函数
-            const cmd = channel;
-            const args = params;
+            const cmd = c;
             let fn = null;
             if (is.string(cmd)) {
               const actions = cmd.split('.');
-              let obj = self.app;
+              let obj = app;
               actions.forEach(key => {
                 obj = obj[key];
                 if (!obj) throw new Error(`class or function '${key}' not exists`);
@@ -98,12 +98,29 @@ class IpcServer {
             }
             if (!fn) throw new Error('function not exists');
             
-            const result = await fn.call(self.app, args, event);
-            event.reply(`${channel}`, result)
+            return fn;
           } catch (err) {
-            self.app.logger.error('[ee:socket:ipcMain] throw error:', err);
+            app.logger.error('[ee:socket:ipcMain] throw error:', err);
           }
-        })
+          return null;
+        }
+
+        // send/on 模型
+        ipcMain.on(channel, async (event, params) => {
+          const fn = findFn(self.app, channel);
+          const result = await fn.call(self.app, params, event);
+
+          event.returnValue = result;
+          event.reply(`${channel}`, result);
+        });
+
+        // invoke/handle 模型
+        ipcMain.handle(channel, async (event, params) => {
+          const fn = findFn(self.app, channel);
+          const result = await fn.call(self.app, params, event);
+
+          return result;
+        });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/utils/common.js

@@ -0,0 +1,30 @@
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+

package/utils/index.js

@@ -170,3 +170,33 @@ exports.callFn = async function (fn, args, ctx) {
 exports.middleware = function (fn) {
   return is.generatorFunction(fn) ? convert(fn) : fn;
 }
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+