From 6b87c7b0c4f37455b603dfbcbc5c594d05d1af4d Mon Sep 17 00:00:00 2001
From: YoungSoo Shin <shinys000114@gmail.com>
Date: Mon, 1 Sep 2025 12:14:24 +0900
Subject: [PATCH] Fix: Make event listener setup idempotent and modularize
 connection logic

Signed-off-by: YoungSoo Shin <shinys000114@gmail.com>
---
 page/src/events.js | 11 +++++++++++
 page/src/main.js   | 35 ++++++++++++++++++++++-------------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/page/src/events.js b/page/src/events.js
index 2f23be2..8b81328 100644
--- a/page/src/events.js
+++ b/page/src/events.js
@@ -13,11 +13,19 @@ import { debounce, isMobile } from './utils.js';
 
 // A flag to track if charts have been initialized
 let chartsInitialized = false;
+let listenersAttached = false;
 
 /**
  * Sets up all event listeners for the application's interactive elements.
+ * This function is now idempotent and will only attach listeners once.
  */
 export function setupEventListeners() {
+    if (listenersAttached) {
+        console.log("Event listeners already attached. Skipping.");
+        return;
+    }
+    console.log("Attaching event listeners...");
+
     // --- Theme Toggle ---
     dom.themeToggle.addEventListener('change', () => {
         const newTheme = dom.themeToggle.checked ? 'dark' : 'light';
@@ -90,4 +98,7 @@ export function setupEventListeners() {
     // --- Window Resize Event ---
     // Debounced to avoid excessive calls during resizing.
     window.addEventListener('resize', debounce(ui.handleResize, 150));
+
+    listenersAttached = true;
+    console.log("Event listeners attached successfully.");
 }
diff --git a/page/src/main.js b/page/src/main.js
index c0b12e1..2112f6e 100644
--- a/page/src/main.js
+++ b/page/src/main.js
@@ -46,7 +46,7 @@ function onWsClose() {
         term.write('\r\n\x1b[31mConnection closed. Reconnecting...\x1b[0m\r\n');
     }
     // Attempt to re-establish the connection after 2 seconds
-    setTimeout(initialize, 2000);
+    setTimeout(connect, 2000);
 }
 
 /**
@@ -75,9 +75,26 @@ function onWsMessage(event) {
 
 // --- Application Initialization ---
 
+/**
+ * Establishes the connection-related parts of the application.
+ * Fetches initial status and initializes WebSocket.
+ */
+function connect() {
+    // Fetch initial status on page load or reconnect
+    updateControlStatus();
+
+    // Establish the WebSocket connection with the defined handlers
+    initWebSocket({
+        onOpen: onWsOpen,
+        onClose: onWsClose,
+        onMessage: onWsMessage
+    });
+}
+
 /**
  * Initializes the entire application.
- * This function sets up the UI, theme, terminal, chart, WebSocket connection, and event listeners.
+ * This function sets up the UI, theme, terminal, and event listeners.
+ * It should only be called once when the DOM is loaded.
  */
 function initialize() {
     // Initialize basic UI components
@@ -87,22 +104,14 @@ function initialize() {
     setupTerminal();
 
     // Apply the saved theme or detect the user's preferred theme.
-    // This must be done AFTER the chart and terminal are initialized.
     const savedTheme = localStorage.getItem('theme') || (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
     applyTheme(savedTheme);
 
-    // Fetch initial status on page load
-    updateControlStatus();
-
-    // Establish the WebSocket connection with the defined handlers
-    initWebSocket({
-        onOpen: onWsOpen,
-        onClose: onWsClose,
-        onMessage: onWsMessage
-    });
-
     // Attach all event listeners to the DOM elements
     setupEventListeners();
+
+    // Start the connection process
+    connect();
 }
 
 // --- Start Application ---