electron-event-flux
Advanced tools
Comparing version 1.3.6 to 1.3.7
@@ -0,1 +1,2 @@ | ||
import { Log } from "./utils/loggerApply"; | ||
export default class ElectronMainClient { | ||
@@ -5,3 +6,4 @@ unregisterRenderer: any; | ||
clientMap: any; | ||
constructor(callbacks: any); | ||
log: Log; | ||
constructor(callbacks: any, log: Log); | ||
getForwardClients(): any; | ||
@@ -8,0 +10,0 @@ checkWebContents(webContents: any): boolean; |
@@ -7,4 +7,5 @@ "use strict"; | ||
var ElectronMainClient = /** @class */ (function () { | ||
function ElectronMainClient(callbacks) { | ||
function ElectronMainClient(callbacks, log) { | ||
var _this = this; | ||
this.log = log; | ||
var clientInfos = []; // webContentsId -> {webContents, filter, clientId, windowId, active} | ||
@@ -130,2 +131,3 @@ var clientMap = {}; | ||
win.webContents.send("__INIT_WINDOW__", params); | ||
this.log(function (logger) { return logger("ElectronMainClient", "init Window", params); }); | ||
}; | ||
@@ -132,0 +134,0 @@ return ElectronMainClient; |
@@ -8,3 +8,3 @@ import MultiWinManagerStore from './MultiWinManagerStore'; | ||
WinHandleStore?: typeof MultiWinStore; | ||
}): { | ||
}, logger: any): { | ||
[x: string]: any; | ||
@@ -11,0 +11,0 @@ _stateListeners: {}; |
@@ -55,2 +55,3 @@ "use strict"; | ||
var stateFilterDecorator_1 = require("./utils/stateFilterDecorator"); | ||
var loggerApply_1 = require("./utils/loggerApply"); | ||
var isEmpty = require('lodash/isEmpty'); | ||
@@ -75,3 +76,3 @@ var isObject = require('lodash/isObject'); | ||
} | ||
function storeEnhancer(appStore, stores, storeShape) { | ||
function storeEnhancer(appStore, stores, storeShape, log) { | ||
var callbacks = { | ||
@@ -122,3 +123,3 @@ addWin: function (clientId) { | ||
}; | ||
var mainClient = new MainClient_1.default(callbacks); | ||
var mainClient = new MainClient_1.default(callbacks, log); | ||
appStore.mainClient = mainClient; | ||
@@ -160,5 +161,6 @@ var forwarder = function (prevState, state, prevFilters, filters) { | ||
__extends(MultiWindowAppStore, _super); | ||
function MultiWindowAppStore() { | ||
var _this = _super !== null && _super.apply(this, arguments) || this; | ||
function MultiWindowAppStore(log) { | ||
var _this = _super.call(this) || this; | ||
_this.filterCallbacks = []; | ||
_this.log = log; | ||
return _this; | ||
@@ -180,3 +182,3 @@ } | ||
_super.prototype.init.call(this); | ||
this.forwarder = storeEnhancer(this, this.stores, this.storeShape); | ||
this.forwarder = storeEnhancer(this, this.stores, this.storeShape, this.log); | ||
return this; | ||
@@ -224,3 +226,3 @@ }; | ||
}(AppStore_1.default)); | ||
function buildMultiWinAppStore(stores, winStores, _a) { | ||
function buildMultiWinAppStore(stores, winStores, _a, logger) { | ||
var _b = _a.WindowsManagerStore, WindowsManagerStore = _b === void 0 ? MultiWinManagerStore_1.default : _b, _c = _a.ActionStore, ActionStore = _c === void 0 ? ActionRecordStore_1.default : _c, _d = _a.WinHandleStore, WinHandleStore = _d === void 0 ? MultiWinStore_1.default : _d; | ||
@@ -233,3 +235,3 @@ var _e; | ||
var storeShape = filterStore_1.filterOneStore(MultiWinAppStore, { applyFilter: true }); | ||
var appStore = new MultiWinAppStore(); | ||
var appStore = new MultiWinAppStore(loggerApply_1.default(logger)); | ||
appStore.storeShape = storeShape; | ||
@@ -236,0 +238,0 @@ appStore.init(); |
import AppStore from 'event-flux/lib/AppStore'; | ||
import StoreProxyHandler from './utils/StoreProxyHandler'; | ||
import { Emitter } from 'event-kit'; | ||
import { Log } from './utils/loggerApply'; | ||
declare class IDGenerator { | ||
@@ -17,3 +18,5 @@ count: number; | ||
winInitParams: any; | ||
log: Log; | ||
static innerStores: any; | ||
constructor(log: Log); | ||
asyncInit(): Promise<{}>; | ||
@@ -38,4 +41,4 @@ handleStore(resolve: any, filter: any, state: any, store: any): void; | ||
} | ||
export default function buildRendererAppStore(stores: any, onChange: any): RendererAppStore; | ||
export default function buildRendererAppStore(stores: any, onChange: any, logger: any): RendererAppStore; | ||
export {}; | ||
//# sourceMappingURL=RendererAppStore.d.ts.map |
@@ -23,2 +23,3 @@ "use strict"; | ||
var filterStore_1 = require("./utils/filterStore"); | ||
var loggerApply_1 = require("./utils/loggerApply"); | ||
var IDGenerator = /** @class */ (function () { | ||
@@ -37,7 +38,8 @@ function IDGenerator() { | ||
__extends(RendererAppStore, _super); | ||
function RendererAppStore() { | ||
var _this = _super !== null && _super.apply(this, arguments) || this; | ||
function RendererAppStore(log) { | ||
var _this = _super.call(this) || this; | ||
_this.idGenerator = new IDGenerator(); | ||
_this.resolveMap = {}; | ||
_this.storeProxyHandler = new StoreProxyHandler_1.default(); | ||
_this.log = log; | ||
return _this; | ||
@@ -99,2 +101,3 @@ } | ||
this.emitter.emit('did-init-window', params); | ||
this.log(function (logger) { return logger("RendererAppStore", "init window", params); }); | ||
}; | ||
@@ -144,6 +147,6 @@ RendererAppStore.prototype.observeInitWindow = function (callback) { | ||
exports.RendererAppStore = RendererAppStore; | ||
function buildRendererAppStore(stores, onChange) { | ||
function buildRendererAppStore(stores, onChange, logger) { | ||
RendererAppStore.innerStores = stores; | ||
var storeShape = filterStore_1.filterOneStore(RendererAppStore); | ||
var appStore = new RendererAppStore(); | ||
var appStore = new RendererAppStore(loggerApply_1.default(logger)); | ||
appStore.onDidChange(onChange); | ||
@@ -150,0 +153,0 @@ appStore.storeShape = storeShape; |
@@ -5,4 +5,4 @@ interface RenderOptions { | ||
} | ||
export default function rendererInit(rendererStores: any, options?: RenderOptions): Promise<import("./RendererAppStore").RendererAppStore>; | ||
export default function rendererInit(rendererStores: any, options: RenderOptions, logger: any): Promise<import("./RendererAppStore").RendererAppStore>; | ||
export {}; | ||
//# sourceMappingURL=rendererInitializer.d.ts.map |
@@ -86,3 +86,3 @@ "use strict"; | ||
; | ||
function rendererInit(rendererStores, options) { | ||
function rendererInit(rendererStores, options, logger) { | ||
if (options === void 0) { options = {}; } | ||
@@ -101,3 +101,3 @@ var query = getQuery(); | ||
window['action'] = getAction(); | ||
var store = RendererAppStore_1.default(rendererStores, options.renderHandler); | ||
var store = RendererAppStore_1.default(rendererStores, options.renderHandler, logger); | ||
var genProxy = function (store, multiWinStore) { | ||
@@ -104,0 +104,0 @@ return new Proxy(multiWinStore, { |
{ | ||
"name": "electron-event-flux", | ||
"version": "1.3.6", | ||
"version": "1.3.7", | ||
"description": "Redux store which synchronizes between instances in multiple process", | ||
@@ -5,0 +5,0 @@ "main": "lib/index.js", |
@@ -0,1 +1,3 @@ | ||
import { Log } from "./utils/loggerApply"; | ||
const { | ||
@@ -11,4 +13,7 @@ mainInitName, mainDispatchName, mainReturnName, renderDispatchName, renderRegisterName, messageName, winMessageName | ||
clientMap: any; | ||
constructor(callbacks) { | ||
log: Log; | ||
constructor(callbacks, log: Log) { | ||
this.log = log; | ||
let clientInfos = []; // webContentsId -> {webContents, filter, clientId, windowId, active} | ||
@@ -154,3 +159,4 @@ let clientMap = {}; | ||
win.webContents.send("__INIT_WINDOW__", params); | ||
this.log((logger) => logger("ElectronMainClient", "init Window", params)); | ||
} | ||
} |
@@ -13,2 +13,3 @@ import AppStore from 'event-flux/lib/AppStore'; | ||
import { addStateFilter } from './utils/stateFilterDecorator'; | ||
import loggerApply, { Log } from './utils/loggerApply'; | ||
@@ -33,3 +34,3 @@ const isEmpty = require('lodash/isEmpty'); | ||
function storeEnhancer(appStore: MultiWindowAppStore, stores, storeShape) { | ||
function storeEnhancer(appStore: MultiWindowAppStore, stores, storeShape, log: Log) { | ||
const callbacks = { | ||
@@ -82,3 +83,3 @@ addWin(clientId) { | ||
const mainClient = new MainClient(callbacks); | ||
const mainClient = new MainClient(callbacks, log); | ||
appStore.mainClient = mainClient; | ||
@@ -137,5 +138,11 @@ const forwarder = (prevState, state, prevFilters, filters) => { | ||
mainClient: any; | ||
log: Log; | ||
static innerStores; | ||
constructor(log: Log) { | ||
super(); | ||
this.log = log; | ||
} | ||
init() { | ||
@@ -156,3 +163,3 @@ this.buildStores(); | ||
super.init(); | ||
this.forwarder = storeEnhancer(this, this.stores, this.storeShape); | ||
this.forwarder = storeEnhancer(this, this.stores, this.storeShape, this.log); | ||
return this; | ||
@@ -213,3 +220,4 @@ } | ||
WinHandleStore = MultiWinStore, | ||
} | ||
}, | ||
logger | ||
) { | ||
@@ -225,3 +233,3 @@ WinPackStore.innerStores = { ...winStores, actionRecord: ActionStore }; | ||
const storeShape = filterOneStore(MultiWinAppStore, { applyFilter: true }); | ||
const appStore = new MultiWinAppStore(); | ||
const appStore = new MultiWinAppStore(loggerApply(logger)); | ||
appStore.storeShape = storeShape; | ||
@@ -228,0 +236,0 @@ appStore.init(); |
@@ -8,2 +8,3 @@ import AppStore from 'event-flux/lib/AppStore'; | ||
import { filterOneStore } from './utils/filterStore'; | ||
import loggerApply, { Log } from './utils/loggerApply'; | ||
@@ -30,4 +31,11 @@ class IDGenerator { | ||
winInitParams: any; | ||
log: Log; | ||
static innerStores; | ||
constructor(log: Log) { | ||
super(); | ||
this.log = log; | ||
} | ||
asyncInit() { | ||
@@ -99,2 +107,3 @@ super.init(); | ||
this.emitter.emit('did-init-window', params); | ||
this.log((logger) => logger("RendererAppStore", "init window", params)) | ||
} | ||
@@ -150,6 +159,6 @@ | ||
export default function buildRendererAppStore(stores, onChange) { | ||
export default function buildRendererAppStore(stores, onChange, logger) { | ||
RendererAppStore.innerStores = stores; | ||
const storeShape = filterOneStore(RendererAppStore); | ||
const appStore = new RendererAppStore(); | ||
const appStore = new RendererAppStore(loggerApply(logger)); | ||
appStore.onDidChange(onChange); | ||
@@ -156,0 +165,0 @@ appStore.storeShape = storeShape; |
@@ -84,3 +84,3 @@ import buildRendererAppStore from './RendererAppStore'; | ||
export default function rendererInit(rendererStores, options: RenderOptions = {}) { | ||
export default function rendererInit(rendererStores, options: RenderOptions = {}, logger) { | ||
let query = getQuery(); | ||
@@ -99,3 +99,3 @@ window['clientId'] = query['clientId'] || 'mainClient'; | ||
const store = buildRendererAppStore(rendererStores, options.renderHandler); | ||
const store = buildRendererAppStore(rendererStores, options.renderHandler, logger); | ||
@@ -102,0 +102,0 @@ const genProxy = (store, multiWinStore) => { |
309608
141
7756