style: 优化样式

napcat.webui/src/controllers/terminal_manager.ts

@@ -1,3 +1,5 @@
+import { serverRequest } from '@/utils/request'
+
 type TerminalCallback = (data: string) => void
 
 interface TerminalConnection {
@@ -7,10 +9,38 @@ interface TerminalConnection {
   buffer: string[] // 添加缓存数组
 }
 
+export interface TerminalSession {
+  id: string
+}
+
+export interface TerminalInfo {
+  id: string
+}
+
 class TerminalManager {
   private connections: Map<string, TerminalConnection> = new Map()
   private readonly MAX_BUFFER_SIZE = 1000 // 限制缓存大小
 
+  async createTerminal(cols: number, rows: number): Promise<TerminalSession> {
+    const { data } = await serverRequest.post<ServerResponse<TerminalSession>>(
+      '/Log/terminal/create',
+      { cols, rows }
+    )
+    return data.data
+  }
+
+  async closeTerminal(id: string): Promise<void> {
+    await serverRequest.post(`/Log/terminal/${id}/close`)
+  }
+
+  async getTerminalList(): Promise<TerminalInfo[]> {
+    const { data } =
+      await serverRequest.get<ServerResponse<TerminalInfo[]>>(
+        '/Log/terminal/list'
+      )
+    return data.data
+  }
+
   connectTerminal(id: string, callback: TerminalCallback): WebSocket {
     let conn = this.connections.get(id)
 

napcat.webui/src/controllers/webui_manager.ts

@@ -138,65 +138,4 @@ export default class WebUIManager {
 
     return eventSource
   }
-
-  public static async createTerminal(
-    cols: number,
-    rows: number
-  ): Promise<TerminalSession> {
-    const { data } = await serverRequest.post<ServerResponse<TerminalSession>>(
-      '/Log/terminal/create',
-      { cols, rows }
-    )
-    return data.data
-  }
-
-  public static async closeTerminal(id: string): Promise<void> {
-    await serverRequest.post(`/Log/terminal/${id}/close`)
-  }
-
-  public static async getTerminalList(): Promise<TerminalInfo[]> {
-    const { data } =
-      await serverRequest.get<ServerResponse<TerminalInfo[]>>(
-        '/Log/terminal/list'
-      )
-    return data.data
-  }
-
-  public static connectTerminal(
-    id: string,
-    onData: (data: string) => void
-  ): WebSocket {
-    const token = localStorage.getItem('token')
-    if (!token) throw new Error('未登录')
-
-    const _token = JSON.parse(token)
-
-    const url = new URL(window.location.origin)
-    url.protocol = "ws://"
-    url.pathname = "/api/ws/terminal"
-    url.searchParams.set('token', _token)
-    url.searchParams.set("id", id)
-      console.log(url.toString())
-
-    const ws = new WebSocket(url.toString())
-
-    ws.onmessage = (event) => {
-      try {
-        const { data } = JSON.parse(event.data)
-        onData(data)
-      } catch (error) {
-        console.error(error)
-      }
-    }
-
-    ws.onerror = (error) => {
-      console.error('WebSocket连接出错:', error)
-    }
-
-    ws.onclose = () => {
-      console.log('WebSocket连接关闭')
-    }
-
-    return ws
-  }
 }