From 16a28eca258e07d45c7e2a8ee95368d4eb077d4d Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Jun 2016 01:18:10 +0800 Subject: [web] websocket --- web/src/js/ducks/websocket.js | 101 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 87 insertions(+), 14 deletions(-) (limited to 'web/src/js/ducks/websocket.js') diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js index ebb39cf8..268c9e65 100644 --- a/web/src/js/ducks/websocket.js +++ b/web/src/js/ducks/websocket.js @@ -1,30 +1,103 @@ +import { ConnectionActions } from '../actions.js' +import { AppDispatcher } from '../dispatcher.js' +import * as eventLogActions from './eventLog' +import * as flowActions from './flows' + +const CONNECT = 'WEBSOCKET_CONNECT' const CONNECTED = 'WEBSOCKET_CONNECTED' +const DISCONNECT = 'WEBSOCKET_DISCONNECT' const DISCONNECTED = 'WEBSOCKET_DISCONNECTED' +const ERROR = 'WEBSOCKET_ERROR' +const MESSAGE = 'WEBSOCKET_MESSAGE' +/* we may want to have an error message attribute here at some point */ +const defaultState = { connected: false, socket: null } -const defaultState = { - connected: false, - /* we may want to have an error message attribute here at some point */ -} export default function reducer(state = defaultState, action) { switch (action.type) { + + case CONNECT: + return { ...state, socket: action.socket } + case CONNECTED: - return { - connected: true - } + return { ...state, connected: true } + + case DISCONNECT: + return { ...state, connected: false } + case DISCONNECTED: - return { - connected: false - } + return { ...state, socket: null } + default: return state } } +export function connect() { + return dispatch => { + const socket = new WebSocket(location.origin.replace('http', 'ws') + '/updates') + + // @todo remove this + window.ws = socket + + socket.addEventListener('open', () => dispatch(onConnect())) + socket.addEventListener('close', () => dispatch(onDisconnect())) + socket.addEventListener('message', msg => dispatch(onMessage(msg))) + socket.addEventListener('error', error => dispatch(onError(error))) + + dispatch({ type: CONNECT, socket }) + + return socket + } +} + +export function disconnect() { + return { type: DISCONNECT } +} + +export function onConnect() { + // workaround to make sure that our state is already available. + return dispatch => { + dispatch({ type: CONNECTED }) + dispatch(flowActions.fetchFlows()).then(() => ConnectionActions.open()) + } +} + +export function onDisconnect() { + return dispatch => { + ConnectionActions.close() + dispatch(eventLogActions.addLogEntry('WebSocket connection closed.')) + dispatch({ type: DISCONNECTED }) + } +} + +export function onMessage(msg) { + return dispatch => { + const data = JSON.parse(msg.data) + + AppDispatcher.dispatchServerAction(data) -export function connected() { - return {type: CONNECTED} + switch (data.type) { + + case eventLogActions.UPDATE_LOG: + return dispatch(eventLogActions.updateLogEntries(data)) + + case flowActions.UPDATE_FLOWS: + return dispatch(flowActions.updateFlows(data)) + + default: + console.warn('unknown message', data) + } + + dispatch({ type: MESSAGE, msg }) + } } -export function disconnected() { - return {type: DISCONNECTED} + +export function onError(error) { + // @todo let event log subscribe WebSocketActions.ERROR + return dispatch => { + ConnectionActions.error() + dispatch(eventLogActions.addLogEntry('WebSocket connection error.')) + dispatch({ type: ERROR, error }) + } } -- cgit v1.2.3 From 6c0511b06fdc359ec4c48879f803c80d7fbeb34c Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 18 Jun 2016 14:11:42 +0800 Subject: [web] add app ducks --- web/src/js/ducks/websocket.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'web/src/js/ducks/websocket.js') diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js index 268c9e65..0d0556ad 100644 --- a/web/src/js/ducks/websocket.js +++ b/web/src/js/ducks/websocket.js @@ -3,17 +3,17 @@ import { AppDispatcher } from '../dispatcher.js' import * as eventLogActions from './eventLog' import * as flowActions from './flows' -const CONNECT = 'WEBSOCKET_CONNECT' -const CONNECTED = 'WEBSOCKET_CONNECTED' -const DISCONNECT = 'WEBSOCKET_DISCONNECT' -const DISCONNECTED = 'WEBSOCKET_DISCONNECTED' -const ERROR = 'WEBSOCKET_ERROR' -const MESSAGE = 'WEBSOCKET_MESSAGE' +export const CONNECT = 'WEBSOCKET_CONNECT' +export const CONNECTED = 'WEBSOCKET_CONNECTED' +export const DISCONNECT = 'WEBSOCKET_DISCONNECT' +export const DISCONNECTED = 'WEBSOCKET_DISCONNECTED' +export const ERROR = 'WEBSOCKET_ERROR' +export const MESSAGE = 'WEBSOCKET_MESSAGE' /* we may want to have an error message attribute here at some point */ const defaultState = { connected: false, socket: null } -export default function reducer(state = defaultState, action) { +export default function reduce(state = defaultState, action) { switch (action.type) { case CONNECT: @@ -52,7 +52,10 @@ export function connect() { } export function disconnect() { - return { type: DISCONNECT } + return (dispatch, getState) => { + getState().settings.socket.close() + dispatch({ type: DISCONNECT }) + } } export function onConnect() { -- cgit v1.2.3 From 9a7415a58d299edb4c7219a2bc01d139f050d754 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jun 2016 00:51:45 +0800 Subject: [web] store ws object in symbol property --- web/src/js/ducks/websocket.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'web/src/js/ducks/websocket.js') diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js index 766f7236..2d4e2b39 100644 --- a/web/src/js/ducks/websocket.js +++ b/web/src/js/ducks/websocket.js @@ -4,6 +4,8 @@ import * as eventLogActions from './eventLog' import * as flowsActions from './flows' import * as settingsActions from './settings' +export const SYM_SOCKET = Symbol('WEBSOCKET_SYM_SOCKET') + export const CONNECT = 'WEBSOCKET_CONNECT' export const CONNECTED = 'WEBSOCKET_CONNECTED' export const DISCONNECT = 'WEBSOCKET_DISCONNECT' @@ -18,7 +20,7 @@ export default function reduce(state = defaultState, action) { switch (action.type) { case CONNECT: - return { ...state, socket: action.socket } + return { ...state, [SYM_SOCKET]: action.socket } case CONNECTED: return { ...state, connected: true } @@ -27,7 +29,7 @@ export default function reduce(state = defaultState, action) { return { ...state, connected: false } case DISCONNECTED: - return { ...state, socket: null } + return { ...state, [SYM_SOCKET]: null } default: return state @@ -54,7 +56,7 @@ export function connect() { export function disconnect() { return (dispatch, getState) => { - getState().settings.socket.close() + getState().settings[SYM_SOCKET].close() dispatch({ type: DISCONNECT }) } } -- cgit v1.2.3 From 57af1d00ddd16bd36609a8c6dbf61411f5cd504c Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jun 2016 11:29:21 +0800 Subject: [web] set connected to false when DISCONNECTED --- web/src/js/ducks/websocket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/src/js/ducks/websocket.js') diff --git a/web/src/js/ducks/websocket.js b/web/src/js/ducks/websocket.js index 2d4e2b39..f38124c9 100644 --- a/web/src/js/ducks/websocket.js +++ b/web/src/js/ducks/websocket.js @@ -29,7 +29,7 @@ export default function reduce(state = defaultState, action) { return { ...state, connected: false } case DISCONNECTED: - return { ...state, [SYM_SOCKET]: null } + return { ...state, [SYM_SOCKET]: null, connected: false } default: return state -- cgit v1.2.3