From 825bb6347623d998c671d3d42268230d1a783d76 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 1 Oct 2017 17:04:26 +0900 Subject: [PATCH] BackgroundComponent --- src/background/index.js | 41 +++---------------------- src/components/background.js | 59 ++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 36 deletions(-) create mode 100644 src/components/background.js diff --git a/src/background/index.js b/src/background/index.js index 040a2d5..bf89a33 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,10 +1,9 @@ import * as keys from './keys'; import * as inputActions from '../actions/input'; import * as operationActions from '../actions/operation'; -import * as commandActions from '../actions/command'; import * as consoleActions from '../actions/console'; import * as settingsActions from '../actions/setting'; -import * as tabActions from '../actions/tab'; +import BackgroundComponent from '../components/background'; import reducers from '../reducers'; import messages from '../content/messages'; import * as store from '../store'; @@ -18,6 +17,10 @@ const backgroundStore = store.createStore(reducers, (e, sender) => { backgroundStore.dispatch(consoleActions.showError(e.message), sender); } }); +const backgroundComponent = new BackgroundComponent(backgroundStore); +backgroundStore.subscribe((sender) => { + backgroundComponent.update(sender); +}); backgroundStore.subscribe((sender) => { let currentInput = backgroundStore.getState().input; if (JSON.stringify(prevInput) === JSON.stringify(currentInput)) { @@ -66,40 +69,6 @@ const keyQueueChanged = (state, sender) => { backgroundStore.dispatch(inputActions.clearKeys(), sender); }; -const handleMessage = (message, sender) => { - switch (message.type) { - case messages.KEYDOWN: - return backgroundStore.dispatch( - inputActions.keyPress(message.code, message.ctrl), sender); - case messages.OPEN_URL: - if (message.newTab) { - return backgroundStore.dispatch( - tabActions.openNewTab(message.url), sender); - } - return backgroundStore.dispatch( - tabActions.openToTab(message.url, sender.tab), sender); - case messages.CONSOLE_BLURRED: - return backgroundStore.dispatch( - consoleActions.hide(), sender); - case messages.CONSOLE_ENTERED: - return backgroundStore.dispatch( - commandActions.exec(message.text, settings), sender); - case messages.CONSOLE_CHANGEED: - return backgroundStore.dispatch( - commandActions.complete(message.text, settings), sender); - case messages.SETTINGS_RELOAD: - backgroundStore.dispatch(settingsActions.load()); - } -}; - -browser.runtime.onMessage.addListener((message, sender) => { - try { - handleMessage(message, sender); - } catch (e) { - backgroundStore.dispatch(consoleActions.showError(e.message), sender); - } -}); - const initializeSettings = () => { backgroundStore.dispatch(settingsActions.load()); }; diff --git a/src/components/background.js b/src/components/background.js new file mode 100644 index 0000000..4c5bb19 --- /dev/null +++ b/src/components/background.js @@ -0,0 +1,59 @@ +import messages from '../content/messages'; +import * as commandActions from '../actions/command'; +import * as consoleActions from '../actions/console'; +import * as inputActions from '../actions/input'; +import * as settingsActions from '../actions/setting'; +import * as tabActions from '../actions/tab'; + +export default class BackgroundComponent { + constructor(store) { + this.store = store; + this.setting = {}; + + browser.runtime.onMessage.addListener((message, sender) => { + try { + this.onMessage(message, sender); + } catch (e) { + this.store.dispatch(consoleActions.showError(e.message), sender); + } + }); + } + + update() { + let state = this.store.getState(); + this.updateSettings(state.setting); + } + + updateSettings(setting) { + if (!setting.settings.json) { + return; + } + this.settings = JSON.parse(setting.settings.json); + } + + onMessage(message, sender) { + switch (message.type) { + case messages.KEYDOWN: + return this.store.dispatch( + inputActions.keyPress(message.code, message.ctrl), sender); + case messages.OPEN_URL: + if (message.newTab) { + return this.store.dispatch( + tabActions.openNewTab(message.url), sender); + } + return this.store.dispatch( + tabActions.openToTab(message.url, sender.tab), sender); + case messages.CONSOLE_BLURRED: + return this.store.dispatch( + consoleActions.hide(), sender); + case messages.CONSOLE_ENTERED: + return this.store.dispatch( + commandActions.exec(message.text, this.settings), sender); + case messages.CONSOLE_CHANGEED: + return this.store.dispatch( + commandActions.complete(message.text, this.settings), sender); + case messages.SETTINGS_RELOAD: + this.store.dispatch(settingsActions.load()); + } + } +}