[feature]修复缺陷

Author: 954053260

README.md

@@ -621,11 +621,37 @@ getInstance(option)
 /**
  * @param {string} eventName 通知事件名
  * @param {object} param 参数
- * @return {browserWindow}
+ * @return {promise}
  */
 publisher(eventName, param)
 ```
-
+**subscribe [实例方法]向当前窗口订阅通知，可参考ipc模块**
+```
+/**
+ * @param {string} eventName 通知事件名
+ * @param {function} callback 回调
+ * @return {unsubscribe} 取消订阅函数
+ */
+subscribe(eventName, callback)
+```
+**unsubscribe [实例方法]向当前窗口取消订阅通知，可参考ipc模块**
+```
+/**
+ * @param {string} eventName 通知事件名
+ * @param {function} callback 回调
+ */
+unsubscribe(eventName, callback)
+```
+**request [实例方法]向当前窗口发起请求，可参考ipc模块**
+```
+/**
+ * @param {string} eventName 请求事件名事件名
+ * @param {object} param 参数
+ * @param {number} timeout 超时时间
+ * @return {promise}
+ */
+request(eventName, param, timeout)
+```
 **使用举例**
 ```
 // -----------------------主进程-----------------------

core/BaseWindow/main.js

@@ -56,17 +56,10 @@ class BaseWindow extends Events {
         // 注册到窗口中心
         windowCenter._register(name, this);
     }
-
-    // 发布通知
-    publisher(eventName, params = {}) {
-        ipc._publisher({ header: { fromId: this.name, eventName }, body: params });
-        this.emit(eventName, params);
-    }
-
     open(option = {}) {
         try {
             if (this.instance === null) {
-                const _option = Object.assign(defaultOption, this.option, option);
+                const _option = Object.assign({}, defaultOption, this.option, option);
                 this.instance = new BrowserWindow(_option);
                 // 窗口ID，必须
                 this.instance.windowId = this.name;
@@ -92,6 +85,24 @@ class BaseWindow extends Events {
     getInstance() {
         return this.instance;
     }
+
+      // 发布通知
+    publisher(eventName, params = {}) {
+        ipc._publisher({ header: { fromId: this.name, eventName }, body: params });
+        this.emit(eventName, params);
+    }
+
+    request(eventName = '', data = {}, timeout) {
+        return ipc.request(this.name, eventName, data, timeout);
+    }
+
+    subscribe(eventName = '', callback) {
+        return ipc.subscribe(this.name, eventName, callback);
+    }
+
+    unsubscribe(eventName, callback) {
+        return ipc.unsubscribe(this.name, eventName, callback);
+    }
 }
 
 module.exports = BaseWindow;

core/common/main.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { SUGAR_OPTION } = require('../const');
+global[SUGAR_OPTION] = {};
 const config = require('../config/main');
 const store = require('../store/main');
 const fs = require('fs');

core/index.js

@@ -1,5 +1,3 @@
-const { SUGAR_OPTION } = require('./const');
-global[SUGAR_OPTION] = {};
 const common = require('./common');
 const modules = {
     BaseWindow: require('./BaseWindow'),
@@ -11,4 +9,4 @@ const modules = {
     windowCenter: require('./windowCenter')
 };
 
-module.exports = Object.assign(common, modules);
+module.exports = Object.assign({}, common, modules);

core/ipc/main.js

@@ -9,9 +9,9 @@ const {
   SUBSCRIBER,
   UNSUBSCRIBER,
   IPC_NAME,
-  RESPONSE_OVERTIME,
-  MAIN_PROCESS_NAME
+  RESPONSE_OVERTIME
 } = require('./const');
+const { MAIN_PROCESS_NAME } = require('../const');
 const processes = {}; // 进程模块合集
 const subscribeTasks = {}; // 缓存进程订阅任务
 const responseCallbacks = {};
@@ -79,7 +79,7 @@ class MainSDK {
       const { header = {}, body } = params;
       const { fromId, toId } = header;
       processes[fromId] && processes[fromId].webContents.send(IPC_NAME, {
-        header: Object.assign(header, {
+        header: Object.assign({}, header, {
           fromId: toId,
           toId: fromId
         }),
@@ -259,7 +259,7 @@ class MainSDK {
     this._publisher({ header: { fromId: MAIN_PROCESS_NAME, eventName }, body: params });
   }
 
-  subscribe(toId = '', eventName = '', callback = () => { }) {
+  subscribe(toId = '', eventName = '', callback = () => {}) {
     if (!subscribeCb[`${toId}${eventName}`]) {
       subscribeCb[`${toId}${eventName}`] = [];
     }

core/store/main.js

@@ -1,4 +1,5 @@
-const { STORE, SET_STATE, STATE_CHANGE, MAIN_PROCESS_NAME } = require('./const');
+const { STORE, SET_STATE, STATE_CHANGE } = require('./const');
+const { MAIN_PROCESS_NAME } = require('../const');
 const ipc = require('../ipc/main');
 const Event = require('events');
 const event = new Event();
@@ -17,7 +18,7 @@ function initStore(store, modules = []) {
                     var keyState = `${STORE}${modules.join('|')}`;
                     global[keyState] = item;
                     if (keyState === STORE) {
-                        modules.state = global[keyState];
+                        moduleExports.state = global[keyState];
                     }
                     break;
                 case 'modules':
@@ -60,7 +61,7 @@ function setState(json) {
 }
 
 // 初始化
-const modules = {
+const moduleExports = {
     createStore(store = {}) {
         initStore(store);
     },
@@ -118,4 +119,4 @@ const modules = {
     }
 };
 
-module.exports = modules;
+module.exports = moduleExports;

core/store/render.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-async-promise-executor */
 const { remote } = require('electron');
-const { STORE, SET_STATE, STATE_CHANGE, MAIN_PROCESS_NAME } = require('./const');
+const { STORE, SET_STATE, STATE_CHANGE } = require('./const');
+const { MAIN_PROCESS_NAME } = require('../const');
 const ipc = require('../ipc/render');
 
 module.exports = {

core/windowCenter/render.js

@@ -1,6 +1,7 @@
 const remote = require('electron').remote;
 const ipc = require('../ipc/render');
-const { WINDOW_CENTER_IPC_NAME, WINDOW_CENTER_GET_INFO, MAIN_PROCESS_NAME } = require('./const');
+const { WINDOW_CENTER_IPC_NAME, WINDOW_CENTER_GET_INFO } = require('./const');
+const { MAIN_PROCESS_NAME } = require('../const');
 const modules = {};
 const ipcKeys = ['request', 'subscribe', 'unsubscribe'];
 async function actionWindow (windowName, action = '', args) {
@@ -10,14 +11,16 @@ async function actionWindow (windowName, action = '', args) {
 }
 // 初始化
 const { names = [], keys = [] } = remote.getGlobal(WINDOW_CENTER_GET_INFO);
-names.forEach(name => {
+names.concat([MAIN_PROCESS_NAME]).forEach(name => {
     modules[name] = {};
-    keys.forEach(key => {
-        modules[name][key] = function () {
-            const args = [].slice.call(arguments);
-            return actionWindow(name, key, args);
-        }
-    });
+    if (name !== MAIN_PROCESS_NAME) {
+        keys.forEach(key => {
+            modules[name][key] = function () {
+                const args = [].slice.call(arguments);
+                return actionWindow(name, key, args);
+            }
+        });
+    }
     ipcKeys.forEach(key => {
         modules[name][key] = function () {
             const args = [].slice.call(arguments);

main.js

@@ -1,5 +1,3 @@
-const { SUGAR_OPTION } = require('./core/const');
-global[SUGAR_OPTION] = {};
 const common = require('./core/common/main');
 const modules = {
     BaseWindow: require('./core/BaseWindow/main'),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sugar-electron",
-  "version": "1.0.43",
+  "version": "1.0.50",
   "description": "",
   "main": "index.js",
   "scripts": {