Update bất đồng bộ

BACKEND/providers/socket_io_provider.ts

@@ -665,7 +665,7 @@ export class WebSocketIo {
     action: LineAction,
     options: HandleOptions = {}
   ): Promise<void> {
-    for (const lineId of lineIds) {
+    lineIds.forEach(async (lineId) => {
       try {
         const line = this.lineMap.get(lineId)
         // console.log(line?.config)
@@ -675,8 +675,7 @@ export class WebSocketIo {
           // await sleep(500)
           await action(line, options)
         } else {
-          if (this.lineConnecting.includes(lineId)) continue
-
+          if (!this.lineConnecting.includes(lineId)) {
             const linesData = await Line.findBy('id', lineId)
             const stationData = await Station.findBy('id', stationId)
             io.emit('line_connecting', {
@@ -709,11 +708,12 @@ export class WebSocketIo {
               io.emit('line_error', { lineId, error: 'Line not connected\r\n', stationId })
             }
           }
+        }
       } catch (err: any) {
         this.lineConnecting = this.lineConnecting.filter((el) => el !== lineId)
         io.emit('line_error', { lineId, error: `\n[ERROR] ${err.message}\n`, stationId })
       }
-    }
+    })
   }
 
   private async connectApc(socket: any, apcName: string, station: Station) {

FRONTEND/src/components/TerminalXTerm.tsx

@@ -162,7 +162,9 @@ const TerminalCLI: React.FC<TerminalCLIProps> = ({
         terminal.current?.write(initContent);
         setIsInit(true);
         if (!miniSize && !isDisabled) terminal.current?.focus();
-        terminal.current.scrollToBottom();
+        setTimeout(() => {
+          if (terminal.current) terminal.current.scrollToBottom();
+        }, 100);
         if (terminal.current.options.theme) {
           const textColor =
             localStorage.getItem("terminal-text-color") || "#41ee4a";