From b04b20f8f01d4cfdd9f41591e03d675e1512b911 Mon Sep 17 00:00:00 2001
From: Zephyruso <127948745+Zephyruso@users.noreply.github.com>
Date: Fri, 8 Sep 2023 11:35:53 +0800
Subject: [PATCH] fix(connections): ws error when switch end point

---
 src/signals/connections.ts | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/signals/connections.ts b/src/signals/connections.ts
index 6b538f2d..e3187e81 100644
--- a/src/signals/connections.ts
+++ b/src/signals/connections.ts
@@ -1,11 +1,5 @@
 import { differenceWith, unionWith } from 'lodash'
-import {
-  createEffect,
-  createMemo,
-  createResource,
-  createSignal,
-  untrack,
-} from 'solid-js'
+import { Accessor, createEffect, createSignal, untrack } from 'solid-js'
 import { Connection, ConnectionWithSpeed } from '~/types'
 import { selectedEndpoint, useWsRequest } from './request'
 
@@ -22,19 +16,17 @@ const [allConnectionsWithSpeed, setAllConnectionsWithSpeed] = createSignal<
   ConnectionWithSpeed[]
 >([])
 
-const [latestConnectionWsMessage] = createResource(async () => {
-  await new Promise<void>((resolve) => {
-    createEffect(() => {
-      if (selectedEndpoint()) {
-        resolve()
-      }
-    })
-  })
-
-  return useWsRequest<WsMsg>('connections')
+export let connections: Accessor<WsMsg> = () => ({
+  uploadTotal: 0,
+  downloadTotal: 0,
+  connections: [],
 })
 
-export const connections = createMemo(() => latestConnectionWsMessage()?.())
+createEffect(() => {
+  if (selectedEndpoint()) {
+    connections = useWsRequest<WsMsg>('connections')
+  }
+})
 
 export const useConnections = () => {
   const [closedConnectionsWithSpeed, setClosedConnectionsWithSpeed] =