From f2ef7790dd8129adf04a82a3f9ebac22a4f2c1bb Mon Sep 17 00:00:00 2001
From: Zephyruso <127948745+Zephyruso@users.noreply.github.com>
Date: Fri, 8 Sep 2023 18:42:15 +0800
Subject: [PATCH] refactor: use ws request conns

---
 src/App.tsx                |  6 ++++++
 src/signals/connections.ts | 15 ++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 73652a0..4e7999d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,12 +4,16 @@ import { twMerge } from 'tailwind-merge'
 import { Header } from '~/components'
 import { ROUTES } from '~/constants'
 import {
+  WsMsg,
   curTheme,
   endpoint,
   selectedEndpoint,
+  setAllConnections,
+  setLatestConnectionMsg,
   useAutoSwitchTheme,
   useProxies,
   useTwemoji,
+  useWsRequest,
 } from '~/signals'
 
 const Setup = lazy(() => import('~/pages/Setup'))
@@ -28,6 +32,8 @@ export const App = () => {
   createEffect(() => {
     if (selectedEndpoint() && endpoint()) {
       void useProxies().updateProxies()
+      setAllConnections([])
+      setLatestConnectionMsg(useWsRequest<WsMsg>('connections'))
     }
   })
 
diff --git a/src/signals/connections.ts b/src/signals/connections.ts
index 4b70919..272edcd 100644
--- a/src/signals/connections.ts
+++ b/src/signals/connections.ts
@@ -1,9 +1,8 @@
 import { differenceWith, isNumber, unionWith } from 'lodash'
 import { Accessor, createEffect, createSignal, untrack } from 'solid-js'
 import { Connection, ConnectionRawMessage } from '~/types'
-import { selectedEndpoint, useWsRequest } from './request'
 
-type WsMsg = {
+export type WsMsg = {
   connections: ConnectionRawMessage[]
   uploadTotal: number
   downloadTotal: number
@@ -13,7 +12,8 @@ type WsMsg = {
 // when user selects proxy and close some connections they can back and check connections
 // they closed
 let allConnections: Connection[] = []
-const setAllConnections = (allConns: Connection[]) => {
+
+export const setAllConnections = (allConns: Connection[]) => {
   allConnections = allConns
 }
 
@@ -23,12 +23,9 @@ export let latestConnectionMsg: Accessor<WsMsg> = () => ({
   connections: [],
 })
 
-createEffect(() => {
-  if (selectedEndpoint()) {
-    setAllConnections([])
-    latestConnectionMsg = useWsRequest<WsMsg>('connections')
-  }
-})
+export const setLatestConnectionMsg = (accessor: Accessor<WsMsg>) => {
+  latestConnectionMsg = accessor
+}
 
 export const useConnections = () => {
   const [closedConnections, setClosedConnections] = createSignal<Connection[]>(