From 4f5c615818bd3b65e3aacfaac112d6ff74fd1059 Mon Sep 17 00:00:00 2001 From: "zokutyou2@gmail.com" Date: Wed, 21 Jul 2021 16:53:52 +0900 Subject: [PATCH] applied requested changes --- .../__tests__/components/Header/MenuToggleSpec.js | 1 + web/src/js/__tests__/ducks/optionsSpec.js | 7 ++++--- .../js/components/ContentView/ContentLoader.tsx | 1 - web/src/js/components/FlowView/Details.tsx | 14 +++----------- web/src/js/contrib/CodeMirror.tsx | 2 +- web/src/js/ducks/options.ts | 12 ++++++------ web/src/js/flow.ts | 5 +++++ 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/web/src/js/__tests__/components/Header/MenuToggleSpec.js b/web/src/js/__tests__/components/Header/MenuToggleSpec.js index 36f06277f..15a284049 100644 --- a/web/src/js/__tests__/components/Header/MenuToggleSpec.js +++ b/web/src/js/__tests__/components/Header/MenuToggleSpec.js @@ -24,6 +24,7 @@ test("OptionsToggle", async () => { toggle anticache, {store} ); + globalThis.fetch = jest.fn() expect(asFragment()).toMatchSnapshot(); fireEvent.click(screen.getByText("toggle anticache")); diff --git a/web/src/js/__tests__/ducks/optionsSpec.js b/web/src/js/__tests__/ducks/optionsSpec.js index b6a8ca619..5a8f55412 100644 --- a/web/src/js/__tests__/ducks/optionsSpec.js +++ b/web/src/js/__tests__/ducks/optionsSpec.js @@ -23,11 +23,10 @@ describe('option reducer', () => { }) }) -let store = mockStore() - describe('option actions', () => { it('should be possible to update option', () => { + let store = mockStore() let mockResponse = { status: 200 }, promise = Promise.resolve(mockResponse) global.fetch = r => { return promise } @@ -42,7 +41,8 @@ describe('option actions', () => { describe('sendUpdate', () => { it('should handle error', async () => { - let mockResponse = { status: 404, text: "fooerror" }, + let store = mockStore() + let mockResponse = { status: 404, text: () => "fooerror" }, promise = Promise.resolve(mockResponse) global.fetch = r => { return promise } await store.dispatch(OptionsActions.pureSendUpdate("bar", "error")) @@ -55,6 +55,7 @@ describe('sendUpdate', () => { describe('save', () => { it('should dump options', () => { + let store = mockStore() global.fetch = jest.fn() store.dispatch(OptionsActions.save()) expect(fetch).toBeCalledWith( diff --git a/web/src/js/components/ContentView/ContentLoader.tsx b/web/src/js/components/ContentView/ContentLoader.tsx index 9c1aa824a..42ab3c03f 100644 --- a/web/src/js/components/ContentView/ContentLoader.tsx +++ b/web/src/js/components/ContentView/ContentLoader.tsx @@ -50,7 +50,6 @@ export default function withContentLoader(View) { updateContent(props) { if (this.state.request) { - console.log("request:",this.state.request) this.state.request.abort() } // We have a few special cases where we do not need to make an HTTP request. diff --git a/web/src/js/components/FlowView/Details.tsx b/web/src/js/components/FlowView/Details.tsx index 3bec1c138..0678f7a97 100644 --- a/web/src/js/components/FlowView/Details.tsx +++ b/web/src/js/components/FlowView/Details.tsx @@ -1,6 +1,6 @@ import React from 'react' import {formatTimeDelta, formatTimeStamp} from '../../utils' -import { Flow, HTTPMessage } from '../../flow' +import { Flow, HTTPMessage, Connection } from '../../flow' type TimeStampProps = { t: number, @@ -27,15 +27,7 @@ export function TimeStamp({t, deltaTo, title}: TimeStampProps) { } type ConnectionInfoProps = { - conn: { - address: string[], - sni: string, - tls_version: string, - cipher_name: string, - alpn_proto_negotiated: string, - ip_address: string[], - source_address: string[], - }, + conn: Connection, } export function ConnectionInfo({conn}: ConnectionInfoProps) { @@ -44,7 +36,7 @@ export function ConnectionInfo({conn}: ConnectionInfoProps) { Address: - {conn.address.join(':')} + {conn.address?.join(':')} {conn.sni && ( diff --git a/web/src/js/contrib/CodeMirror.tsx b/web/src/js/contrib/CodeMirror.tsx index 4f1c0bd83..7afba18d2 100644 --- a/web/src/js/contrib/CodeMirror.tsx +++ b/web/src/js/contrib/CodeMirror.tsx @@ -52,7 +52,7 @@ export default class CodeMirror extends React.Component = (state = defaultState, action) => { } export default reducer -export function pureSendUpdate(option: Option, value) { +export function pureSendUpdate(option, value) { return async dispatch => { try { const response = await fetchApi.put('/options', {[option]: value}); if (response.status === 200) { dispatch(optionsEditorActions.updateSuccess(option)) } else { - throw await response.text + throw await response.text() } } catch (error) { - return dispatch(optionsEditorActions.updateError(option, error)) + dispatch(optionsEditorActions.updateError(option, error)) } } } -export function update(name: Option, value: any): AppThunk { - let sendUpdate = _.throttle(pureSendUpdate(name, value), 500, {leading: true, trailing: true}) +let sendUpdate = _.throttle(pureSendUpdate, 500, {leading: true, trailing: true}) +export function update(name: Option, value: any): AppThunk { return dispatch => { dispatch(optionsEditorActions.startUpdate(name, value)) - sendUpdate(); + dispatch(sendUpdate(name, value)); } } diff --git a/web/src/js/flow.ts b/web/src/js/flow.ts index 50cacc862..3b36bc7f1 100644 --- a/web/src/js/flow.ts +++ b/web/src/js/flow.ts @@ -34,13 +34,18 @@ export type Address = [string, number]; export interface Connection { id: string + ip_address?: string[] + address?: string[] + source_address?: string[] peername?: Address sockname?: Address tls_established: boolean sni?: string | boolean cipher?: string + cipher_name?: string alpn?: string + alpn_proto_negotiated?: string tls_version?: string timestamp_start?: number