From 20978b12b058bac0f53f1093ff9cebac7b4d3fcf Mon Sep 17 00:00:00 2001
From: Dreamacro <8615343+Dreamacro@users.noreply.github.com>
Date: Tue, 28 Feb 2023 13:20:50 +0800
Subject: [PATCH] Feature: add meanDelay display

---
 .../Proxies/components/Proxy/index.tsx        |  15 +--
 src/containers/Settings/index.tsx             |   2 +-
 src/lib/request.ts                            |   1 +
 src/models/Proxy.ts                           | 106 ------------------
 src/models/index.ts                           |   1 -
 5 files changed, 10 insertions(+), 115 deletions(-)
 delete mode 100644 src/models/Proxy.ts

diff --git a/src/containers/Proxies/components/Proxy/index.tsx b/src/containers/Proxies/components/Proxy/index.tsx
index 3e1492e..7d7ba8f 100644
--- a/src/containers/Proxies/components/Proxy/index.tsx
+++ b/src/containers/Proxies/components/Proxy/index.tsx
@@ -49,10 +49,11 @@ export function Proxy (props: ProxyProps) {
         })
     }, [config.name, getDelay, set])
 
-    const delay = useMemo(
-        () => config.history?.length ? config.history.slice(-1)[0].delay : 0,
-        [config],
-    )
+    const delay = config.history?.length ? config.history.slice(-1)[0].delay : 0
+    const meanDelay = config.history?.length ? config.history.slice(-1)[0].meanDelay : undefined
+
+    const delayText = delay === 0 ? '-' : `${delay}ms`
+    const meanDelayText = meanDelay === undefined || meanDelay === 0 ? '' : `(${meanDelay}ms)`
 
     useLayoutEffect(() => {
         const handler = () => { speedTest() }
@@ -63,9 +64,9 @@ export function Proxy (props: ProxyProps) {
     const hasError = useMemo(() => delay === 0, [delay])
     const color = useMemo(
         () => Object.keys(TagColors).find(
-            threshold => delay <= TagColors[threshold as keyof typeof TagColors],
+            threshold => (meanDelay ?? delay) <= TagColors[threshold as keyof typeof TagColors],
         ),
-        [delay],
+        [delay, meanDelay],
     )
 
     const backgroundColor = hasError ? '#E5E7EB' : color
@@ -80,7 +81,7 @@ export function Proxy (props: ProxyProps) {
                 <p className="proxy-name">{config.name}</p>
             </div>
             <div className="flex flex-col h-full items-center justify-center md:flex-row md:h-[18px] md:justify-between md:space-y-0 space-y-3 text-[10px]">
-                <p>{delay === 0 ? '-' : `${delay}ms`}</p>
+                <p >{delayText}{meanDelayText}</p>
                 { config.udp && <p className="bg-gray-200 p-[3px] rounded text-gray-600">UDP</p> }
             </div>
         </div>
diff --git a/src/containers/Settings/index.tsx b/src/containers/Settings/index.tsx
index ce719a1..233688c 100644
--- a/src/containers/Settings/index.tsx
+++ b/src/containers/Settings/index.tsx
@@ -102,7 +102,7 @@ export default function Settings () {
     )
 
     const controllers = isClashX
-        ? <span>{`${externalControllerHost}:${externalControllerPort}`}</span>
+        ? <span className="text-primary-darken text-sm">{`${externalControllerHost}:${externalControllerPort}`}</span>
         : (
             <>
                 <Select
diff --git a/src/lib/request.ts b/src/lib/request.ts
index 87bfa6a..0167a49 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -52,6 +52,7 @@ export interface ProxyProviders {
 interface History {
     time: string
     delay: number
+    meanDelay?: number
 }
 
 export interface Proxy {
diff --git a/src/models/Proxy.ts b/src/models/Proxy.ts
deleted file mode 100644
index f823222..0000000
--- a/src/models/Proxy.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * proxy config interface
- */
-
-export const ProxyType = {
-    Shadowsocks: 'ss',
-    Vmess: 'vmess',
-    Socks5: 'socks5',
-}
-
-export type Proxy = ShadowsocksProxy & VmessProxy & Socks5Proxy
-
-export const SsProxyConfigList = [
-    'name', 'type', 'server', 'port', 'cipher', 'password', 'obfs', 'obfs-host',
-]
-export interface ShadowsocksProxy {
-    name?: string
-
-    type?: 'ss'
-
-    server?: string
-
-    port?: number
-
-    cipher?: string
-
-    password?: string
-
-    obfs?: string
-
-    'obfs-host'?: string
-}
-
-export const VmessProxyConfigList = [
-    'name', 'type', 'server', 'port', 'uuid', 'alterid', 'cipher', 'tls',
-]
-export interface VmessProxy {
-    name?: string
-
-    type?: 'vmess'
-
-    server?: string
-
-    port?: number
-
-    uuid?: string
-
-    alterId?: number
-
-    cipher?: string
-
-    tls?: boolean
-}
-
-export const Socks5ProxyConfigList = ['name', 'type', 'server', 'port']
-export interface Socks5Proxy {
-    name?: string
-
-    type?: 'socks5'
-
-    server?: string
-
-    port?: number
-}
-
-export type ProxyGroup = SelectProxyGroup & UrlTestProxyGroup & FallbackProxyGroup & LoadBalanceGroup
-
-export interface SelectProxyGroup {
-    name?: string
-
-    type?: 'select'
-
-    proxies?: string[] // proxy names
-}
-
-export interface LoadBalanceGroup {
-    name?: string
-
-    type?: 'load-balance'
-
-    proxies?: string[] // proxy names
-}
-
-export interface FallbackProxyGroup {
-    name?: string
-
-    type?: 'fallback'
-
-    proxies?: string[] // proxy names
-
-    url?: string
-
-    interval?: number // second
-}
-
-export interface UrlTestProxyGroup {
-    name?: string
-
-    type?: 'url-test'
-
-    proxies?: string[] // proxy names
-
-    url?: string
-
-    interval?: number // second
-}
diff --git a/src/models/index.ts b/src/models/index.ts
index 9c60e9c..af7e53b 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -1,5 +1,4 @@
 export * from './BaseProps'
 export * from './Config'
-export * from './Proxy'
 export * from './Rule'
 export * from './Cipher'