From 916a661011a3b559df6b91fd85bb2a17e039f508 Mon Sep 17 00:00:00 2001
From: YetAnotherZephyruso
 <176294927+YetAnotherZephyruso@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:40:21 +0800
Subject: [PATCH] feat: quick filter for connections (#856)

* feat: quick filter for connections

* feat: make persisted for collapse map status

* fix: config error when tun is disabled in sing-box
---
 src/components/ConnectionsSettingsModal.tsx | 12 +++++++
 src/i18n/en.ts                              |  1 +
 src/i18n/zh.ts                              |  1 +
 src/pages/Config.tsx                        |  6 ++--
 src/pages/Connections.tsx                   | 40 ++++++++++++++++++---
 src/pages/Overview.tsx                      |  4 +--
 src/pages/Proxies.tsx                       | 21 ++++++++---
 src/signals/connections.ts                  |  9 +++++
 src/signals/proxies.ts                      |  3 --
 9 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/components/ConnectionsSettingsModal.tsx b/src/components/ConnectionsSettingsModal.tsx
index f7b16e8..cff9e5d 100644
--- a/src/components/ConnectionsSettingsModal.tsx
+++ b/src/components/ConnectionsSettingsModal.tsx
@@ -31,8 +31,10 @@ import {
   allConnections,
   clientSourceIPTags,
   connectionsTableSize,
+  quickFilterRegex,
   setClientSourceIPTags,
   setConnectionsTableSize,
+  setQuickFilterRegex,
 } from '~/signals'
 import {
   ConnectionsTableColumnOrder,
@@ -205,6 +207,16 @@ export const ConnectionsSettingsModal = (props: {
       }
     >
       <div class="flex flex-col gap-4">
+        <div>
+          <ConfigTitle withDivider>{t('quickFilter')}</ConfigTitle>
+          <input
+            type="text"
+            class="input input-bordered w-full"
+            onInput={(e) => setQuickFilterRegex(e.target.value)}
+            value={quickFilterRegex()}
+          ></input>
+        </div>
+
         <div>
           <ConfigTitle withDivider>{t('tableSize')}</ConfigTitle>
 
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 3b2396b..2ad2929 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -112,4 +112,5 @@ export default {
   en: 'English',
   zh: 'Chinese',
   port: '{{ name }} Port',
+  quickFilter: 'Quick Filter',
 }
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index b3473ab..d56150a 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -114,4 +114,5 @@ export default {
   en: '英文',
   zh: '中文',
   port: '{{ name }} 端口',
+  quickFilter: '快速过滤',
 } satisfies Dict
diff --git a/src/pages/Config.tsx b/src/pages/Config.tsx
index 153708a..141cad2 100644
--- a/src/pages/Config.tsx
+++ b/src/pages/Config.tsx
@@ -244,7 +244,7 @@ const ConfigForm: Component<{ backendVersion: Accessor<string> }> = ({
               id="enable-tun-device"
               type="checkbox"
               class="toggle"
-              checked={configsData()?.tun.enable}
+              checked={configsData()?.tun?.enable}
               onChange={(e) =>
                 void updateBackendConfigAPI(
                   'tun',
@@ -263,7 +263,7 @@ const ConfigForm: Component<{ backendVersion: Accessor<string> }> = ({
             <select
               id="tun-ip-stack"
               class="select select-bordered flex-1"
-              value={configsData()?.tun.stack}
+              value={configsData()?.tun?.stack}
               onChange={(e) =>
                 void updateBackendConfigAPI(
                   'tun',
@@ -287,7 +287,7 @@ const ConfigForm: Component<{ backendVersion: Accessor<string> }> = ({
             <input
               id="device-name"
               class="input input-bordered min-w-0"
-              value={configsData()?.tun.device}
+              value={configsData()?.tun?.device}
               onChange={(e) =>
                 void updateBackendConfigAPI(
                   'tun',
diff --git a/src/pages/Connections.tsx b/src/pages/Connections.tsx
index eddf3bf..653b332 100644
--- a/src/pages/Connections.tsx
+++ b/src/pages/Connections.tsx
@@ -45,6 +45,7 @@ import {
   connectionsTableSize,
   endpoint,
   formatTimeFromNow,
+  quickFilterRegex,
   setConnectionsTableColumnOrder,
   setConnectionsTableColumnVisibility,
   tableSizeClassName,
@@ -89,7 +90,13 @@ export default () => {
     useConnections()
 
   const [globalFilter, setGlobalFilter] = createSignal('')
-
+  const [enableQuickFilter, setEnableQuickFilter] = makePersisted(
+    createSignal(false),
+    {
+      name: 'enableQuickFilter',
+      storage: localStorage,
+    },
+  )
   const [selectedConnectionID, setSelectedConnectionID] = createSignal<string>()
 
   const columns: ColumnDef<Connection>[] = [
@@ -283,9 +290,24 @@ export default () => {
       },
     },
     get data() {
-      return activeTab() === ActiveTab.activeConnections
-        ? activeConnections()
-        : closedConnections()
+      const connections =
+        activeTab() === ActiveTab.activeConnections
+          ? activeConnections()
+          : closedConnections()
+
+      connections.sort((a, b) => {
+        return a.id.localeCompare(b.id)
+      })
+
+      if (!enableQuickFilter()) {
+        return connections
+      }
+
+      const reg = new RegExp(quickFilterRegex(), 'i')
+
+      return connections.filter(
+        (connection) => !reg.test(connection.chains.join('')),
+      )
     },
     sortDescFirst: true,
     enableHiding: true,
@@ -353,6 +375,16 @@ export default () => {
             </Index>
           </div>
 
+          <div class="flex items-center">
+            <span class="mr-2 hidden lg:inline-block">{t('quickFilter')}:</span>
+            <input
+              type="checkbox"
+              class="toggle"
+              checked={enableQuickFilter()}
+              onChange={(e) => setEnableQuickFilter(e.target.checked)}
+            />
+          </div>
+
           <select
             class="select select-bordered select-primary select-sm w-full max-w-full flex-1 sm:select-md"
             onChange={(e) => setSourceIPFilter(e.target.value)}
diff --git a/src/pages/Overview.tsx b/src/pages/Overview.tsx
index b6e7247..828e924 100644
--- a/src/pages/Overview.tsx
+++ b/src/pages/Overview.tsx
@@ -87,8 +87,8 @@ export default () => {
   ])
 
   return (
-    <div class="flex flex-col gap-2">
-      <div class="stats stats-vertical w-full grid-cols-2 bg-primary shadow lg:stats-horizontal lg:flex">
+    <div class="flex flex-col gap-2 lg:h-full">
+      <div class="stats stats-vertical w-full flex-shrink-0 grid-cols-2 bg-gradient-to-br from-primary to-secondary shadow lg:stats-horizontal lg:flex">
         <TrafficWidget label={t('upload')}>
           {byteSize(traffic()?.up || 0).toString()}/s
         </TrafficWidget>
diff --git a/src/pages/Proxies.tsx b/src/pages/Proxies.tsx
index 91717a7..f2c1a81 100644
--- a/src/pages/Proxies.tsx
+++ b/src/pages/Proxies.tsx
@@ -1,3 +1,4 @@
+import { makePersisted } from '@solid-primitives/storage'
 import {
   IconBrandSpeedtest,
   IconReload,
@@ -55,14 +56,24 @@ export default () => {
     updateAllProvider,
     proxyGroupLatencyTest,
     proxyProviderLatencyTest,
-    collapsedMap,
-    setCollapsedMap,
     proxyGroupLatencyTestingMap,
     proxyProviderLatencyTestingMap,
     isAllProviderUpdating,
     updatingMap,
   } = useProxies()
 
+  const [collapsedMap, setCollapsedMap] = makePersisted(
+    createSignal<Record<string, boolean>>({}),
+    {
+      name: 'collapsedMap',
+      storage: localStorage,
+    },
+  )
+
+  const setCollapsedMapByKey = (key: string, value: boolean) => {
+    setCollapsedMap((prev) => ({ ...prev, [key]: value }))
+  }
+
   onMount(fetchProxies)
 
   const onProxyGroupLatencyTestClick = async (
@@ -221,7 +232,9 @@ export default () => {
                   <Collapse
                     isOpen={collapsedMap()[proxyGroup.name]}
                     title={title}
-                    onCollapse={(val) => setCollapsedMap(proxyGroup.name, val)}
+                    onCollapse={(val) =>
+                      setCollapsedMapByKey(proxyGroup.name, val)
+                    }
                   >
                     <For each={sortedProxyNames()}>
                       {(proxyName) => (
@@ -330,7 +343,7 @@ export default () => {
                     isOpen={collapsedMap()[proxyProvider.name]}
                     title={title}
                     onCollapse={(val) =>
-                      setCollapsedMap(proxyProvider.name, val)
+                      setCollapsedMapByKey(proxyProvider.name, val)
                     }
                   >
                     <For each={sortedProxyNames()}>
diff --git a/src/signals/connections.ts b/src/signals/connections.ts
index b4897fa..a569a3c 100644
--- a/src/signals/connections.ts
+++ b/src/signals/connections.ts
@@ -1,3 +1,4 @@
+import { makePersisted } from '@solid-primitives/storage'
 import { differenceWith, isNumber, unionWith } from 'lodash'
 import { CONNECTIONS_TABLE_MAX_CLOSED_ROWS } from '~/constants'
 import { Connection, ConnectionRawMessage } from '~/types'
@@ -8,6 +9,14 @@ export type WsMsg = {
   downloadTotal: number
 } | null
 
+export const [quickFilterRegex, setQuickFilterRegex] = makePersisted(
+  createSignal<string>('Direct|direct|dns-out'),
+  {
+    name: 'quickFilterRegex',
+    storage: localStorage,
+  },
+)
+
 // we make connections global, so we can keep track of connections when user in proxy page
 // when user selects proxy and close some connections they can back and check connections
 // they closed
diff --git a/src/signals/proxies.ts b/src/signals/proxies.ts
index e62bf42..dac9930 100644
--- a/src/signals/proxies.ts
+++ b/src/signals/proxies.ts
@@ -32,7 +32,6 @@ type ProxyInfo = {
 export type ProxyWithProvider = Proxy & { provider?: string }
 export type ProxyNodeWithProvider = ProxyNode & { provider?: string }
 
-const { map: collapsedMap, set: setCollapsedMap } = useStringBooleanMap()
 const {
   map: proxyLatencyTestingMap,
   setWithCallback: setProxyLatencyTestingMap,
@@ -322,8 +321,6 @@ export const useProxies = () => {
     })
 
   return {
-    collapsedMap,
-    setCollapsedMap,
     proxyIPv6SupportMap,
     proxyLatencyTestingMap,
     proxyGroupLatencyTestingMap,