From b033b4825dfeb2e3a15bae298856d5001310a487 Mon Sep 17 00:00:00 2001 From: Haishan Date: Thu, 26 Dec 2019 18:16:40 +0800 Subject: [PATCH] feat: can healthcheck a provider --- src/api/proxies.js | 14 ++++++++++---- src/components/ProxyProvider.js | 16 ++++++++++++++-- src/components/ProxyProvider.module.css | 6 ++++++ src/store/proxies.js | 13 +++++++++++++ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/api/proxies.js b/src/api/proxies.js index 3ffb275..5bedf31 100644 --- a/src/api/proxies.js +++ b/src/api/proxies.js @@ -53,9 +53,15 @@ export async function fetchProviderProxies(config) { export async function updateProviderByName(config, name) { const { url, init } = getURLAndInit(config); - const options = { - ...init, - method: 'PUT' - }; + const options = { ...init, method: 'PUT' }; return await fetch(url + '/providers/proxies/' + name, options); } + +export async function healthcheckProviderByName(config, name) { + const { url, init } = getURLAndInit(config); + const options = { ...init, method: 'GET' }; + return await fetch( + url + '/providers/proxies/' + name + '/healthcheck', + options + ); +} diff --git a/src/components/ProxyProvider.js b/src/components/ProxyProvider.js index e18fe17..3a0b2ef 100644 --- a/src/components/ProxyProvider.js +++ b/src/components/ProxyProvider.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ChevronDown, RotateCw } from 'react-feather'; +import { ChevronDown, RotateCw, Zap } from 'react-feather'; import { formatDistance } from 'date-fns'; import ResizeObserver from 'resize-observer-polyfill'; import { motion } from 'framer-motion'; @@ -12,7 +12,10 @@ import { SectionNameType } from './shared/Basic'; import { ProxyList, ProxyListSummaryView } from './ProxyGroup'; import { ButtonWithIcon, ButtonPlain } from './Button'; -import { updateProviderByName } from '../store/proxies'; +import { + updateProviderByName, + healthcheckProviderByName +} from '../store/proxies'; import s from './ProxyProvider.module.css'; @@ -42,6 +45,10 @@ function ProxyProvider({ item, dispatch }: Props) { () => dispatch(updateProviderByName(apiConfig, item.name)), [apiConfig, dispatch, item.name] ); + const healthcheckProvider = useCallback( + () => dispatch(healthcheckProviderByName(apiConfig, item.name)), + [apiConfig, dispatch, item.name] + ); const [isCollapsibleOpen, setCollapsibleOpen] = useState(false); const toggle = useCallback(() => setCollapsibleOpen(x => !x), []); @@ -67,6 +74,11 @@ function ProxyProvider({ item, dispatch }: Props) { icon={} onClick={updateProvider} /> + } + onClick={healthcheckProvider} + /> diff --git a/src/components/ProxyProvider.module.css b/src/components/ProxyProvider.module.css index 6668f67..270cd03 100644 --- a/src/components/ProxyProvider.module.css +++ b/src/components/ProxyProvider.module.css @@ -33,6 +33,12 @@ .actionFooter { display: flex; + button { + margin: 0 5px; + &:first-child { + margin-left: 0; + } + } } .refresh { diff --git a/src/store/proxies.js b/src/store/proxies.js index fe51368..cf02737 100644 --- a/src/store/proxies.js +++ b/src/store/proxies.js @@ -66,6 +66,19 @@ export function updateProviderByName(apiConfig, name) { }; } +export function healthcheckProviderByName(apiConfig, name) { + return async dispatch => { + try { + await proxiesAPI.healthcheckProviderByName(apiConfig, name); + } catch (x) { + // ignore + } + // should be optimized + // but ¯\_(ツ)_/¯ + dispatch(fetchProxies(apiConfig)); + }; +} + export function switchProxy(apiConfig, name1, name2) { return async dispatch => { proxiesAPI