diff --git a/src/components/Collpase.tsx b/src/components/Collpase.tsx index 7f96742..c41a889 100644 --- a/src/components/Collpase.tsx +++ b/src/components/Collpase.tsx @@ -39,7 +39,7 @@ const Collapse: ParentComponent = (props) => {
{content} diff --git a/src/components/ProxyNodeCard.tsx b/src/components/ProxyNodeCard.tsx index f0d4115..f0d16c4 100644 --- a/src/components/ProxyNodeCard.tsx +++ b/src/components/ProxyNodeCard.tsx @@ -1,3 +1,4 @@ +import { createMemo } from 'solid-js' import { twMerge } from 'tailwind-merge' import { useProxies } from '~/signals/proxies' @@ -7,17 +8,24 @@ export default (props: { onClick?: () => void }) => { const { proxyName, isSelected, onClick } = props - const { delayMap } = useProxies() + const { delayMap, proxyNodeMap } = useProxies() + const proxyNode = createMemo(() => proxyNodeMap()[proxyName]) const Delay = (proxyname: string) => { const delay = delayMap()[proxyname] + let textClassName = 'text-green-500' if (typeof delay !== 'number' || delay === 0) { return '' } - return {delay}ms + if (delay > 500) { + textClassName = 'text-red-500' + } else if (delay > 200) { + textClassName = 'text-yellow-500' + } + + return {delay}ms } - console.log(proxyName) return (
onClick?.()} data-tip={proxyName} > - {proxyName} - {Delay(proxyName)} +
{proxyName}
+
+
+ {proxyNode().type} + {proxyNode().udp ? ' :: udp' : ''} +
+
{Delay(proxyName)}
+
) } diff --git a/src/signals/proxies.ts b/src/signals/proxies.ts index 20dbc6c..8ead3bb 100644 --- a/src/signals/proxies.ts +++ b/src/signals/proxies.ts @@ -1,12 +1,16 @@ import { createSignal } from 'solid-js' import { useRequest } from '~/signals' -import type { Proxy, ProxyProvider } from '~/types' +import type { Proxy, ProxyNode, ProxyProvider } from '~/types' // these signals should be global state const [proxies, setProxies] = createSignal([]) -const [delayMap, setDelayMap] = createSignal>({}) const [proxyProviders, setProxyProviders] = createSignal([]) +const [delayMap, setDelayMap] = createSignal>({}) +const [proxyNodeMap, setProxyNodeMap] = createSignal>( + {}, +) + export function useProxies() { const request = useRequest() @@ -18,6 +22,7 @@ export function useProxies() { Object.values(providers).forEach((provider) => { provider.proxies.forEach((proxy) => { + setProxyNodeMap({ ...proxyNodeMap(), [proxy.name]: proxy }) delay[proxy.name] = proxy.history[proxy.history.length - 1]?.delay }) }) @@ -73,6 +78,7 @@ export function useProxies() { proxies, proxyProviders, delayTestByProxyGroupName, + proxyNodeMap, delayMap, updateProxy, setProxiesByProxyName, diff --git a/src/types.d.ts b/src/types.d.ts index bcff54c..0393ba8 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -21,22 +21,24 @@ export type Proxy = { now: string } +export type ProxyNode = { + alive: boolean + type: string + name: string + tfo: boolean + udp: boolean + xudp: boolean + id: string + extra: Record + history: { + time: string + delay: number + }[] +} + export type ProxyProvider = { name: string - proxies: { - alive: boolean - type: string - name: string - tfo: boolean - udp: boolean - xudp: boolean - id: string - extra: Record - history: { - time: string - delay: number - }[] - }[] + proxies: ProxyNode[] testUrl: string updatedAt: string vehicleType: string