feat(connections): add closed connections tab

MetaCubeX · Sep 5, 2023 · f0e32d9 · f0e32d9
1 parent b91332c
commit f0e32d9
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 24 deletions.
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
@@ -67,4 +67,5 @@ export default {
   switchEndpoint: 'Switch Endpoint',
   switchLanguage: 'Switch Language',
   requestTimeoutDuration: 'Request Timeout Duration',
+  closedConnections: 'Closed Connections',
 }
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
@@ -67,4 +67,5 @@ export default {
   switchEndpoint: '切换后端',
   switchLanguage: '切换语言',
   requestTimeoutDuration: '请求超时时间',
+  closedConnections: '已关闭连接',
 }
diff --git a/src/pages/Connections.tsx b/src/pages/Connections.tsx
@@ -26,6 +26,7 @@ import {
 import byteSize from 'byte-size'
 import dayjs from 'dayjs'
 import { isIPv6 } from 'is-ip'
+import { differenceWith, isEqualWith } from 'lodash'
 import { For, createEffect, createSignal } from 'solid-js'
 import { twMerge } from 'tailwind-merge'
 import { Button, ConnectionsTableOrderingModal } from '~/components'
@@ -47,11 +48,17 @@ type ConnectionWithSpeed = Connection & {
 type ColumnVisibility = Partial<Record<CONNECTIONS_TABLE_ACCESSOR_KEY, boolean>>
 type ColumnOrder = CONNECTIONS_TABLE_ACCESSOR_KEY[]
 
+enum ActiveTab {
+  activeConnections = 'activeConnections',
+  closedConnections = 'closedConnections',
+}
+
 export default () => {
   const [t] = useI18n()
   const request = useRequest()
 
   const [search, setSearch] = createSignal('')
+  const [activeTab, setActiveTab] = createSignal(ActiveTab.activeConnections)
 
   const ws = createReconnectingWS(
     `${wsEndpointURL()}/connections?token=${secret()}`,
@@ -61,9 +68,11 @@ export default () => {
     message: WebSocketEventMap['message']
   }>(ws, 'message')
 
-  const [connectionsWithSpeed, setConnectionsWithSpeed] = createSignal<
-    ConnectionWithSpeed[]
-  >([])
+  const [closedConnectionsWithSpeed, setClosedConnectionsWithSpeed] =
+    createSignal<ConnectionWithSpeed[]>([])
+
+  const [activeConnectionsWithSpeed, setActiveConnectionsWithSpeed] =
+    createSignal<ConnectionWithSpeed[]>([])
 
   createEffect(() => {
     const data = messageEvent()?.data
@@ -72,7 +81,7 @@ export default () => {
       return
     }
 
-    setConnectionsWithSpeed((prevConnections) => {
+    setActiveConnectionsWithSpeed((prevConnections) => {
       const prevMap = new Map<string, Connection>()
       prevConnections.forEach((prev) => prevMap.set(prev.id, prev))
 
@@ -96,6 +105,16 @@ export default () => {
         }
       })
 
+      const closedConnections = differenceWith(
+        prevConnections,
+        connections,
+        (a, b) => isEqualWith(a, b, (a, b) => a.id === b.id),
+      )
+
+      setClosedConnectionsWithSpeed((prev) =>
+        [...prev, ...closedConnections].slice(-1000),
+      )
+
       return connections.slice(-100)
     })
   })
@@ -249,7 +268,9 @@ export default () => {
       },
     },
     get data() {
-      return connectionsWithSpeed()
+      return activeTab() === ActiveTab.activeConnections
+        ? activeConnectionsWithSpeed()
+        : closedConnectionsWithSpeed()
     },
     sortDescFirst: true,
     enableHiding: true,
@@ -266,32 +287,52 @@ export default () => {
 
   const tableSizeClassName = () => {
     const size = tableSize()
-
-    if (size === TAILWINDCSS_SIZE.XS) {
-      return 'table-xs'
-    }
-
-    if (size === TAILWINDCSS_SIZE.SM) {
-      return 'table-sm'
-    }
-
-    if (size === TAILWINDCSS_SIZE.MD) {
-      return 'table-md'
+    let className = 'table-xs'
+
+    switch (size) {
+      case TAILWINDCSS_SIZE.XS:
+        className = 'table-xs'
+        break
+      case TAILWINDCSS_SIZE.SM:
+        className = 'table-sm'
+        break
+      case TAILWINDCSS_SIZE.MD:
+        className = 'table-md'
+        break
+      case TAILWINDCSS_SIZE.LG:
+        className = 'table-lg'
+        break
     }
 
-    if (size === TAILWINDCSS_SIZE.LG) {
-      return 'table-lg'
-    }
-
-    return ''
+    return className
   }
 
+  const tabs = () => [
+    {
+      type: ActiveTab.activeConnections,
+      name: t('activeConnections'),
+      count: activeConnectionsWithSpeed().length,
+    },
+    {
+      type: ActiveTab.closedConnections,
+      name: t('closedConnections'),
+      count: closedConnectionsWithSpeed().length,
+    },
+  ]
+
   return (
     <div class="flex h-full flex-col gap-4 overflow-y-auto p-1">
       <div class="tabs-boxed tabs">
-        <button class="tab tab-active">
-          {t('activeConnections')} ({connectionsWithSpeed().length})
-        </button>
+        <For each={tabs()}>
+          {(tab) => (
+            <button
+              class={twMerge(activeTab() === tab.type && 'tab-active', 'tab')}
+              onClick={() => setActiveTab(tab.type)}
+            >
+              {tab.name} ({tab.count})
+            </button>
+          )}
+        </For>
       </div>
 
       <div class="flex w-full items-center gap-2">