electron-event-flux
Advanced tools
Comparing version 1.2.16 to 1.2.17
@@ -6,3 +6,2 @@ "use strict"; | ||
var findIndex = require('lodash/findIndex'); | ||
var log = require('electron-log'); | ||
var ElectronMainClient = /** @class */ (function () { | ||
@@ -64,26 +63,16 @@ function ElectronMainClient(callbacks) { | ||
var webContents = clientMap[clientId].webContents; | ||
log.info('ElectronMainClient will process with invokeId', 'invokeId' + invokeId); | ||
try { | ||
callbacks.handleRendererMessage(stringifiedAction).then(function (result) { | ||
log.info('ElectronMainClient will send with invokeId', 'invokeId' + invokeId); | ||
if (_this.checkWebContents(webContents)) { | ||
log.info('ElectronMainClient will send result:', 'invokeId' + invokeId); | ||
webContents.send(mainReturnName, invokeId, undefined, result); | ||
} | ||
}, function (err) { | ||
log.info('ElectronMainClient will send with invokeId', 'invokeId' + invokeId); | ||
var errObj = null; | ||
if (err) { | ||
errObj = { name: err.name, message: err.message }; | ||
Object.keys(err).forEach(function (key) { return errObj[key] = err[key]; }); | ||
} | ||
if (_this.checkWebContents(webContents)) { | ||
log.info('ElectronMainClient will send error:', 'invokeId' + invokeId); | ||
webContents.send(mainReturnName, invokeId, errObj, undefined); | ||
} | ||
}); | ||
} | ||
catch (err) { | ||
log.info('ElectronMainClient throw error', 'invokeId' + invokeId, err); | ||
} | ||
callbacks.handleRendererMessage(stringifiedAction).then(function (result) { | ||
if (_this.checkWebContents(webContents)) { | ||
webContents.send(mainReturnName, invokeId, undefined, result); | ||
} | ||
}, function (err) { | ||
var errObj = null; | ||
if (err) { | ||
errObj = { name: err.name, message: err.message }; | ||
Object.keys(err).forEach(function (key) { return errObj[key] = err[key]; }); | ||
} | ||
if (_this.checkWebContents(webContents)) { | ||
webContents.send(mainReturnName, invokeId, errObj, undefined); | ||
} | ||
}); | ||
}); | ||
@@ -90,0 +79,0 @@ ipcMain.on(winMessageName, function (event, clientId, data) { |
@@ -5,3 +5,2 @@ "use strict"; | ||
var _b = require('electron'), ipcRenderer = _b.ipcRenderer, remote = _b.remote; | ||
var log = require('electron-log'); | ||
var ElectronRendererClient = /** @class */ (function () { | ||
@@ -25,3 +24,2 @@ function ElectronRendererClient(filter, callback, onGetAction, onGetResult, onGetMessage, onGetWinMessage) { | ||
ipcRenderer.on(mainReturnName, function (event, invokeId, error, result) { | ||
log.info('ElectronRendererClient get result:', 'invokeId' + invokeId, result, error); | ||
onGetResult(invokeId, error, result); | ||
@@ -28,0 +26,0 @@ }); |
@@ -55,3 +55,2 @@ "use strict"; | ||
var stateFilterDecorator_1 = require("./utils/stateFilterDecorator"); | ||
var log = require('electron-log'); | ||
var isEmpty = require('lodash/isEmpty'); | ||
@@ -118,3 +117,2 @@ var isObject = require('lodash/isObject'); | ||
catch (err) { | ||
log.info('ElectronMainClient error:', err); | ||
return Promise.reject(err); | ||
@@ -121,0 +119,0 @@ } |
@@ -37,3 +37,3 @@ "use strict"; | ||
this.windows = []; | ||
this.winSize = 0; | ||
this.winSize = 1; | ||
this.windows = []; | ||
@@ -40,0 +40,0 @@ this.winHandler = winHandler; |
@@ -23,3 +23,2 @@ "use strict"; | ||
var filterStore_1 = require("./utils/filterStore"); | ||
var log = require('electron-log'); | ||
var IDGenerator = /** @class */ (function () { | ||
@@ -63,3 +62,2 @@ function IDGenerator() { | ||
_this.client.forward(invokeId, json_immutable_bn_1.serialize(action)); | ||
log.info('RendererAppStore forward:', 'invokeId' + invokeId); | ||
return new Promise(function (resolve, reject) { return _this.resolveMap[invokeId] = { resolve: resolve, reject: reject }; }); | ||
@@ -66,0 +64,0 @@ }); |
{ | ||
"name": "electron-event-flux", | ||
"version": "1.2.16", | ||
"version": "1.2.17", | ||
"description": "Redux store which synchronizes between instances in multiple process", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
@@ -6,3 +6,2 @@ const { | ||
const findIndex = require('lodash/findIndex'); | ||
const log = require('electron-log'); | ||
@@ -76,28 +75,19 @@ export default class ElectronMainClient { | ||
let webContents = clientMap[clientId].webContents; | ||
log.info('ElectronMainClient will process with invokeId', 'invokeId' + invokeId); | ||
try { | ||
callbacks.handleRendererMessage(stringifiedAction).then(result => { | ||
log.info('ElectronMainClient will send with invokeId', 'invokeId' + invokeId); | ||
if (this.checkWebContents(webContents)) { | ||
log.info('ElectronMainClient will send result:', 'invokeId' + invokeId); | ||
webContents.send(mainReturnName, invokeId, undefined, result); | ||
} | ||
}, (err) => { | ||
log.info('ElectronMainClient will send with invokeId', 'invokeId' + invokeId); | ||
callbacks.handleRendererMessage(stringifiedAction).then(result => { | ||
if (this.checkWebContents(webContents)) { | ||
webContents.send(mainReturnName, invokeId, undefined, result); | ||
} | ||
}, (err) => { | ||
let errObj = null; | ||
if (err) { | ||
errObj = { name: err.name, message: err.message }; | ||
Object.keys(err).forEach(key => errObj[key] = err[key]); | ||
} | ||
let errObj = null; | ||
if (err) { | ||
errObj = { name: err.name, message: err.message }; | ||
Object.keys(err).forEach(key => errObj[key] = err[key]); | ||
} | ||
if (this.checkWebContents(webContents)) { | ||
log.info('ElectronMainClient will send error:', 'invokeId' + invokeId); | ||
webContents.send(mainReturnName, invokeId, errObj, undefined); | ||
} | ||
}); | ||
} catch(err) { | ||
log.info('ElectronMainClient throw error', 'invokeId' + invokeId, err); | ||
} | ||
if (this.checkWebContents(webContents)) { | ||
webContents.send(mainReturnName, invokeId, errObj, undefined); | ||
} | ||
}); | ||
}); | ||
@@ -104,0 +94,0 @@ |
@@ -5,3 +5,2 @@ const { | ||
const { ipcRenderer, remote } = require('electron'); | ||
const log = require('electron-log'); | ||
@@ -30,3 +29,2 @@ export default class ElectronRendererClient { | ||
ipcRenderer.on(mainReturnName, (event, invokeId, error, result) => { | ||
log.info('ElectronRendererClient get result:', 'invokeId' + invokeId, result, error); | ||
onGetResult(invokeId, error, result); | ||
@@ -33,0 +31,0 @@ }); |
@@ -13,3 +13,2 @@ import AppStore from 'event-flux/lib/AppStore'; | ||
import { addStateFilter } from './utils/stateFilterDecorator'; | ||
const log = require('electron-log'); | ||
@@ -77,3 +76,2 @@ const isEmpty = require('lodash/isEmpty'); | ||
} catch (err) { | ||
log.info('ElectronMainClient error:', err); | ||
return Promise.reject(err); | ||
@@ -80,0 +78,0 @@ } |
@@ -12,3 +12,3 @@ import MultiWinStore from './MultiWinStore'; | ||
winHandler: any; | ||
winSize = 0; | ||
winSize = 1; | ||
@@ -15,0 +15,0 @@ constructor(winHandler) { |
@@ -8,3 +8,2 @@ import AppStore from 'event-flux/lib/AppStore'; | ||
import { filterOneStore } from './utils/filterStore'; | ||
const log = require('electron-log'); | ||
@@ -57,3 +56,2 @@ class IDGenerator { | ||
this.client.forward(invokeId, serialize(action)); | ||
log.info('RendererAppStore forward:', 'invokeId' + invokeId); | ||
return new Promise((resolve, reject) => this.resolveMap[invokeId] = {resolve, reject}); | ||
@@ -60,0 +58,0 @@ }); |
307821
7606