ee-core 1.2.0 → 1.2.3

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,
+      }
     };
   }
 
@@ -53,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();
       })
     })
     
@@ -79,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);
 
@@ -110,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()
+    }
+  }
+
   /**
    * 加载已经实现的功能
    */
@@ -220,12 +236,12 @@ class EeApp extends BaseApp {
   /**
    * 限制一个窗口
    */
-  async limitOneWindow () {
-    const gotTheLock = app.requestSingleInstanceLock();
-    if (!gotTheLock) {
-      await this.appQuit();
-    }
-  }
+  // async limitOneWindow () {
+  //   const gotTheLock = app.requestSingleInstanceLock();
+  //   if (!gotTheLock) {
+  //     await this.appQuit();
+  //   }
+  // }
 
   /**
    * electron app退出
@@ -234,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/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.0",
+  "version": "1.2.3",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

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;
   }