Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity

[web] fix settings ducks

Browse Source
This commit is contained in:
Jason 2016-06-17 06:01:29 +08:00
parent cedac98b70
commit 6ad2f13341
4 changed files with 185 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/web/static/app.js
View File

File diff suppressed because one or more lines are too long

306
mitmproxy/web/static/vendor.js
View File

File diff suppressed because one or more lines are too long

10
web/src/js/components/ProxyApp.jsx
View File

@ -3,6 +3,7 @@ import ReactDOM from "react-dom"
import _ from "lodash"
import { connect } from 'react-redux'
import { fetch as fetchSettings } from '../ducks/settings'
import { Splitter } from "./common.js"
import Header from "./Header"
import EventLog from "./EventLog"
@ -51,6 +52,10 @@ class ProxyAppMain extends Component {
return _.clone(this.props.location.query)
}
componentWillMount() {
this.props.fetchSettings();
}
/**
* @todo connect websocket here
* @todo listen to window's key events
@ -139,5 +144,8 @@ export default connect(
state => ({
showEventLog: state.eventLog.visible,
settings: state.settings.settings,
})
}),
{
fetchSettings,
}
)(ProxyAppMain)

24
web/src/js/ducks/settings.js
View File

@ -6,7 +6,8 @@ export const WS_MSG_CMD_RESET = 'reset'
export const WS_MSG_CMD_UPDATE = 'update'
export const BEGIN_FETCH = 'SETTINGS_BEGIN_FETCH'
export const FETCH_SETTINGS = 'SETTINGS_FETCH_SETTINGS'
export const FETCHED = 'SETTINGS_FETCHED'
export const RESET = 'SETTINGS_RESET'
export const FETCH_ERROR = 'SETTINGS_FETCH_ERROR'
export const RECV_WS_MSG = 'SETTINGS_RECV_WS_MSG'
@ -18,9 +19,12 @@ export default function reduce(state = defaultState, action) {
case BEGIN_FETCH:
return { ...state, pendings: [], req: action.req }
case FETCH_SETTINGS:
case FETCHED:
const pendings = state.pendings || []
return { ...state, pendings: null, settings: pendings.reduce(reduceData, data) }
return { ...state, pendings: null, settings: pendings.reduce(reduceData, action.data) }
case RESET:
return { ...state, pendings: null, settings: action.data || {} }
case RECV_WS_MSG:
if (state.pendings) {
@ -40,7 +44,7 @@ function reduceData(data, action) {
return action.data || {}
case WS_MSG_CMD_UPDATE:
return _.merge({}, data.settings, action.data)
return _.merge({}, data, action.data)
default:
return data
@ -49,8 +53,8 @@ function reduceData(data, action) {
export function fetch() {
return dispatch => {
const req = $.getJSON('/' + this.type)
.done(msg => dispatch(reset(msg.data)))
const req = $.getJSON('/settings')
.done(msg => dispatch(handleFetchResponse(msg.data)))
.fail(error => dispatch(handleFetchError(error)));
dispatch({ type: BEGIN_FETCH, req })
@ -61,7 +65,7 @@ export function fetch() {
export function handleWsMsg(msg) {
return (dispatch, getState) => {
if (msg.cmd !== STORE_CMDS_RESET) {
if (msg.cmd !== StoreCmds.RESET) {
return dispatch({ type: RECV_WS_MSG, cmd: msg.cmd, data: msg.data })
}
const req = getState().settings.req
@ -72,8 +76,12 @@ export function handleWsMsg(msg) {
}
}
export function handleFetchResponse(data) {
return { type: FETCHED, data }
}
export function reset(data) {
return { type: FETCH_SETTINGS, data }
return { type: RESET, data }
}
export function handleFetchError(error) {