Public-Mirror/metacubexd
1
0
Fork 0
mirror of https://github.com/MetaCubeX/metacubexd.git synced 2024-09-20 14:02:46 +08:00
Code Issues Projects Releases Wiki Activity

fix(proxy): selectProxyInGroup

Browse Source
This commit is contained in:
kunish 2023-09-17 14:55:03 +08:00
parent 72797aaf20
commit dc0b286a88
No known key found for this signature in database
GPG Key ID: 647A12B4F782C430
3 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pages/Proxies.tsx
View File

@ -26,7 +26,6 @@ import {
proxiesOrderingType,
useProxies,
} from '~/signals'
import type { Proxy } from '~/types'
enum ActiveTab {
proxyProviders = 'proxyProviders',
@ -37,7 +36,7 @@ export default () => {
const [t] = useI18n()
const {
proxies,
setProxyGroupByProxyName,
selectProxyInGroup,
latencyTestByProxyGroupName,
latencyMap,
proxyProviders,
@ -50,10 +49,6 @@ export default () => {
const { map: latencyTestingMap, setWithCallback: setLatencyTestingMap } =
useStringBooleanMap()
const onProxyNodeClick = async (proxy: Proxy, proxyName: string) => {
void setProxyGroupByProxyName(proxy, proxyName)
}
const onLatencyTestClick = async (e: MouseEvent, name: string) => {
e.stopPropagation()
void setLatencyTestingMap(name, () => latencyTestByProxyGroupName(name))
@ -153,11 +148,11 @@ export default () => {
<Show when={activeTab() === ActiveTab.proxies}>
<div class="grid grid-cols-1 place-items-start gap-2 sm:grid-cols-2">
<For each={proxies()}>
{(proxy) => {
{(proxyGroup) => {
const sortedProxyNames = createMemo(() =>
filterProxiesByAvailability(
sortProxiesByOrderingType(
proxy.all ?? [],
proxyGroup.all ?? [],
latencyMap(),
proxiesOrderingType(),
),
@ -170,18 +165,20 @@ export default () => {
<>
<div class="mr-8 flex items-center justify-between">
<div class="flex items-center gap-2">
<span>{proxy.name}</span>
<div class="badge badge-sm">{proxy.all?.length}</div>
<span>{proxyGroup.name}</span>
<div class="badge badge-sm">
{proxyGroup.all?.length}
</div>
</div>
<Button
class="btn-circle btn-sm"
disabled={latencyTestingMap()[proxy.name]}
onClick={(e) => onLatencyTestClick(e, proxy.name)}
disabled={latencyTestingMap()[proxyGroup.name]}
onClick={(e) => onLatencyTestClick(e, proxyGroup.name)}
>
<IconBrandSpeedtest
class={twMerge(
latencyTestingMap()[proxy.name] &&
latencyTestingMap()[proxyGroup.name] &&
'animate-pulse text-success',
)}
/>
@ -189,13 +186,14 @@ export default () => {
</div>
<div class="text-sm text-slate-500">
{proxy.type} {proxy.now?.length > 0 && ` :: ${proxy.now}`}
{proxyGroup.type}{' '}
{proxyGroup.now?.length > 0 && ` :: ${proxyGroup.now}`}
</div>
<Show when={!collapsedMap()[proxy.name]}>
<Show when={!collapsedMap()[proxyGroup.name]}>
<ProxyNodePreview
proxyNameList={sortedProxyNames()}
now={proxy.now}
now={proxyGroup.now}
/>
</Show>
</>
@ -203,14 +201,16 @@ export default () => {
return (
<Collapse
isOpen={collapsedMap()[proxy.name]}
isOpen={collapsedMap()[proxyGroup.name]}
title={title}
onCollapse={(val) => setCollapsedMap(proxy.name, val)}
onCollapse={(val) => setCollapsedMap(proxyGroup.name, val)}
>
<ProxyCardGroups
proxyNames={sortedProxyNames()}
now={proxy.now}
onClick={(name) => void onProxyNodeClick(proxy, name)}
now={proxyGroup.now}
onClick={(name) =>
void selectProxyInGroup(proxyGroup, name)
}
/>
</Collapse>
)

17
src/signals/connections.ts
View File

@ -47,10 +47,11 @@ export const useConnections = () => {
rawConns,
activeConnections(),
)
const allConns = mergeAllConnections(activeConns)
mergeAllConnections(activeConnections())
if (!paused()) {
const closedConns = diffClosedConnections(activeConns, allConns)
const closedConns = diffClosedConnections(activeConns, allConnections())
setActiveConnections(activeConns)
setClosedConnections(
@ -58,8 +59,8 @@ export const useConnections = () => {
)
}
setAllConnections(
allConns.slice(
setAllConnections((allConnections) =>
allConnections.slice(
-(activeConns.length + CONNECTIONS_TABLE_MAX_CLOSED_ROWS),
),
)
@ -101,12 +102,12 @@ export const restructRawMsgToConnection = (
}
export const mergeAllConnections = (activeConns: Connection[]) => {
return unionWith(allConnections(), activeConns, (a, b) => a.id === b.id)
setAllConnections((allConnections) =>
unionWith(allConnections, activeConns, (a, b) => a.id === b.id),
)
}
const diffClosedConnections = (
activeConns: Connection[],
allConns: Connection[],
) => {
return differenceWith(allConns, activeConns, (a, b) => a.id === b.id)
}
) => differenceWith(allConns, activeConns, (a, b) => a.id === b.id)

13
src/signals/proxies.ts
View File

@ -13,7 +13,6 @@ import {
latencyQualityMap,
latencyTestTimeoutDuration,
latestConnectionMsg,
mergeAllConnections,
restructRawMsgToConnection,
urlForLatencyTest,
} from '~/signals'
@ -90,11 +89,9 @@ export const useProxies = () => {
})
}
const setProxyGroupByProxyName = async (proxy: Proxy, proxyName: string) => {
const proxyGroupList = proxies().slice()
const proxyGroup = proxyGroupList.find((i) => i.name === proxy.name)!
const selectProxyInGroup = async (proxy: Proxy, proxyName: string) => {
await selectProxyInGroupAPI(proxy.name, proxyName)
await updateProxies()
if (autoCloseConns()) {
// we don't use activeConns from useConnection here for better performance,
@ -111,13 +108,9 @@ export const useProxies = () => {
closeSingleConnectionAPI(id)
}
})
mergeAllConnections(activeConns)
}
})
}
proxyGroup.now = proxyName
setProxies(proxyGroupList)
}
const latencyTestByProxyGroupName = async (proxyGroupName: string) => {
@ -159,7 +152,7 @@ export const useProxies = () => {
latencyMap,
proxyNodeMap,
updateProxies,
setProxyGroupByProxyName,
selectProxyInGroup,
updateProviderByProviderName,
updateAllProvider,
healthCheckByProviderName,