rfid.js wieder auf Originalstand gebracht

html/rfid.js

@@ -53,94 +53,118 @@ function initWebSocket() {
 
     // Wenn eine existierende Verbindung besteht, diese erst schließen
     if (socket) {
-        try {
+        socket.close();
-            socket.onclose = null; // Remove onclose handler before closing
-            socket.onerror = null; // Remove error handler
-            socket.close();
-        } catch (e) {
-            console.error('Error closing existing socket:', e);
-        }
         socket = null;
     }
 
     try {
         socket = new WebSocket('ws://' + window.location.host + '/ws');
 
-        socket.onopen = function() {
+        socket.onopen = function () {
-            console.log('WebSocket connection established');
             isConnected = true;
             updateConnectionStatus();
             startHeartbeat(); // Starte Heartbeat nach erfolgreicher Verbindung
         };
 
-        socket.onclose = function(event) {
+        socket.onclose = function () {
-            console.log('WebSocket connection closed:', event.code, event.reason);
             isConnected = false;
             updateConnectionStatus();
-            if (heartbeatTimer) {
+            if (heartbeatTimer) clearInterval(heartbeatTimer);
-                clearInterval(heartbeatTimer);
-                heartbeatTimer = null;
-            }
 
             // Nur neue Verbindung versuchen, wenn kein Timer läuft
             if (!reconnectTimer) {
                 reconnectTimer = setTimeout(() => {
-                    console.log('Attempting to reconnect...');
                     initWebSocket();
                 }, RECONNECT_INTERVAL);
             }
         };
 
-        socket.onerror = function(error) {
+        socket.onerror = function (error) {
-            console.error('WebSocket error occurred:', error);
             isConnected = false;
             updateConnectionStatus();
-            if (heartbeatTimer) {
+            if (heartbeatTimer) clearInterval(heartbeatTimer);
-                clearInterval(heartbeatTimer);
+
-                heartbeatTimer = null;
+            // Bei Fehler Verbindung schließen und neu aufbauen
+            if (socket) {
+                socket.close();
+                socket = null;
             }
         };
 
-        socket.onmessage = function(event) {
+        socket.onmessage = function (event) {
-            try {
+            lastHeartbeatResponse = Date.now(); // Aktualisiere Zeitstempel bei jeder Server-Antwort
-                lastHeartbeatResponse = Date.now();
-                const data = JSON.parse(event.data);
 
-                // Handle different message types
+            const data = JSON.parse(event.data);
-                switch(data.type) {
+            if (data.type === 'amsData') {
-                    case 'amsData':
+                displayAmsData(data.payload);
-                        displayAmsData(data.payload);
+            } else if (data.type === 'nfcTag') {
-                        break;
+                updateNfcStatusIndicator(data.payload);
-                    case 'nfcTag':
+            } else if (data.type === 'nfcData') {
-                        updateNfcStatusIndicator(data.payload);
+                updateNfcData(data.payload);
-                        break;
+            } else if (data.type === 'writeNfcTag') {
-                    case 'nfcData':
+                handleWriteNfcTagResponse(data.success);
-                        updateNfcData(data.payload);
+            } else if (data.type === 'heartbeat') {
-                        break;
+                // Optional: Spezifische Behandlung von Heartbeat-Antworten
-                    case 'writeNfcTag':
+                // Update status dots
-                        handleWriteNfcTagResponse(data.success);
+                const bambuDot = document.getElementById('bambuDot');
-                        break;
+                const spoolmanDot = document.getElementById('spoolmanDot');
-                    case 'heartbeat':
+                const ramStatus = document.getElementById('ramStatus');
-                        handleHeartbeatResponse(data);
+
-                        break;
+                if (bambuDot) {
-                    case 'setSpoolmanSettings':
+                    bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
-                        handleSpoolmanSettingsResponse(data);
+                    // Add click handler only when offline
-                        break;
+                    if (!data.bambu_connected) {
-                    default:
+                        bambuDot.style.cursor = 'pointer';
-                        console.warn('Unknown message type:', data.type);
+                        bambuDot.onclick = function () {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'bambu'
+                                }));
+                            }
+                        };
+                    } else {
+                        bambuDot.style.cursor = 'default';
+                        bambuDot.onclick = null;
+                    }
+                }
+                if (spoolmanDot) {
+                    spoolmanDot.className = 'status-dot ' + (data.spoolman_connected ? 'online' : 'offline');
+                    // Add click handler only when offline
+                    if (!data.spoolman_connected) {
+                        spoolmanDot.style.cursor = 'pointer';
+                        spoolmanDot.onclick = function () {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'spoolman'
+                                }));
+                            }
+                        };
+                    } else {
+                        spoolmanDot.style.cursor = 'default';
+                        spoolmanDot.onclick = null;
+                    }
+                }
+                if (ramStatus) {
+                    ramStatus.textContent = `${data.freeHeap}k`;
+                }
+            }
+            else if (data.type === 'setSpoolmanSettings') {
+                if (data.payload == 'success') {
+                    showNotification(`Spoolman Settings set successfully`, true);
+                } else {
+                    showNotification(`Error setting Spoolman Settings`, false);
                 }
-            } catch (error) {
-                console.error('Error processing WebSocket message:', error);
             }
         };
     } catch (error) {
-        console.error('Error initializing WebSocket:', error);
         isConnected = false;
         updateConnectionStatus();
 
+        // Nur neue Verbindung versuchen, wenn kein Timer läuft
         if (!reconnectTimer) {
             reconnectTimer = setTimeout(() => {
-                console.log('Attempting to reconnect after error...');
                 initWebSocket();
             }, RECONNECT_INTERVAL);
         }
@@ -165,26 +189,26 @@ function updateConnectionStatus() {
 }
 
 // Event Listeners
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
     initWebSocket();
 
     // Event Listener für Checkbox
-    document.getElementById("onlyWithoutSmId").addEventListener("change", function() {
+    document.getElementById("onlyWithoutSmId").addEventListener("change", function () {
         const spoolsData = window.getSpoolData();
         window.populateVendorDropdown(spoolsData);
     });
 });
 
 // Event Listener für Spoolman Events
-document.addEventListener('spoolDataLoaded', function(event) {
+document.addEventListener('spoolDataLoaded', function (event) {
     window.populateVendorDropdown(event.detail);
 });
 
-document.addEventListener('spoolmanError', function(event) {
+document.addEventListener('spoolmanError', function (event) {
     showNotification(`Spoolman Error: ${event.detail.message}`, false);
 });
 
-document.addEventListener('filamentSelected', function(event) {
+document.addEventListener('filamentSelected', function (event) {
     updateNfcInfo();
     // Zeige Spool-Buttons wenn ein Filament ausgewählt wurde
     const selectedText = document.getElementById("selected-filament").textContent;
@@ -194,12 +218,12 @@ document.addEventListener('filamentSelected', function(event) {
 // Hilfsfunktion für kontrastreiche Textfarbe
 function getContrastColor(hexcolor) {
     // Konvertiere Hex zu RGB
-    const r = parseInt(hexcolor.substr(0,2),16);
+    const r = parseInt(hexcolor.substr(0, 2), 16);
-    const g = parseInt(hexcolor.substr(2,2),16);
+    const g = parseInt(hexcolor.substr(2, 2), 16);
-    const b = parseInt(hexcolor.substr(4,2),16);
+    const b = parseInt(hexcolor.substr(4, 2), 16);
 
     // Berechne Helligkeit (YIQ Formel)
-    const yiq = ((r*299)+(g*587)+(b*114))/1000;
+    const yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
 
     // Return schwarz oder weiß basierend auf Helligkeit
     return (yiq >= 128) ? '#000000' : '#FFFFFF';
@@ -259,7 +283,7 @@ function displayAmsData(amsData) {
                     <img src="spool_in.png" alt="Spool In" style="width: 48px; height: 48px;">
                 </button>`;
 
-                        // Nur für nicht-leere Trays den Button-HTML erstellen
+            // Nur für nicht-leere Trays den Button-HTML erstellen
             const outButtonHtml = `
                 <button class="spool-button" onclick="handleSpoolOut()" 
                         style="position: absolute; top: -35px; right: -15px; 
@@ -365,7 +389,6 @@ function updateSpoolButtons(show) {
     });
 }
 
-// Verbesserte Funktion zum Behandeln von Spoolman Settings
 function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp_min, nozzle_temp_max) {
     // Hole das ausgewählte Filament
     const selectedText = document.getElementById("selected-filament").textContent;
@@ -396,7 +419,6 @@ function handleSpoolmanSettings(tray_info_idx, setting_id, cali_idx, nozzle_temp
     }
 }
 
-// Verbesserte Funktion zum Behandeln von Spool Out
 function handleSpoolOut() {
     // Erstelle Payload
     const payload = {
@@ -421,21 +443,17 @@ function handleSpoolOut() {
     }
 }
 
-// Verbesserte Funktion zum Behandeln des Spool-In-Klicks
+// Neue Funktion zum Behandeln des Spool-In-Klicks
 function handleSpoolIn(amsId, trayId) {
-    console.log("handleSpoolIn called with amsId:", amsId, "trayId:", trayId);
-    
     // Prüfe WebSocket Verbindung zuerst
     if (!socket || socket.readyState !== WebSocket.OPEN) {
         showNotification("No active WebSocket connection!", false);
-        console.error("WebSocket not connected, state:", socket ? socket.readyState : "no socket");
+        console.error("WebSocket not connected");
         return;
     }
 
     // Hole das ausgewählte Filament
     const selectedText = document.getElementById("selected-filament").textContent;
-    console.log("Selected filament:", selectedText);
-    
     if (selectedText === "Please choose...") {
         showNotification("Choose Filament first", false);
         return;
@@ -448,55 +466,53 @@ function handleSpoolIn(amsId, trayId) {
 
     if (!selectedSpool) {
         showNotification("Selected Spool not found", false);
-        console.error("Selected spool not found in spoolsData");
         return;
     }
 
-    console.log("Found spool data:", selectedSpool);
-
     // Temperaturwerte extrahieren
     let minTemp = "175";
     let maxTemp = "275";
 
-    if (selectedSpool.filament && 
+    if (Array.isArray(selectedSpool.filament.nozzle_temperature) &&
-        Array.isArray(selectedSpool.filament.nozzle_temperature) && 
         selectedSpool.filament.nozzle_temperature.length >= 2) {
         minTemp = selectedSpool.filament.nozzle_temperature[0];
         maxTemp = selectedSpool.filament.nozzle_temperature[1];
     }
 
-    // Extrahiere bambu_idx
-    let bambuIdx = "GFL99"; // Default zu Generic PLA
-    if (selectedSpool.filament?.extra?.bambu_idx) {
-        bambuIdx = selectedSpool.filament.extra.bambu_idx.replace(/['"]/g, '');
-    } else if (selectedSpool.extra?.bambu_idx) {
-        bambuIdx = selectedSpool.extra.bambu_idx.replace(/['"]/g, '');
-    }
-
     // Erstelle Payload
     const payload = {
         type: 'setBambuSpool',
         payload: {
             amsId: amsId,
             trayId: trayId,
-            color: selectedSpool.filament && selectedSpool.filament.color_hex ? selectedSpool.filament.color_hex : "FFFFFF",
+            color: selectedSpool.filament.color_hex || "FFFFFF",
             nozzle_temp_min: parseInt(minTemp),
             nozzle_temp_max: parseInt(maxTemp),
-            type: selectedSpool.filament && selectedSpool.filament.material ? selectedSpool.filament.material : "PLA",
+            type: selectedSpool.filament.material,
-            brand: selectedSpool.filament && selectedSpool.filament.vendor ? selectedSpool.filament.vendor.name : "",
+            brand: selectedSpool.filament.vendor.name,
-            tray_info_idx: bambuIdx,
+            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
             cali_idx: "-1"  // Default-Wert setzen
         }
     };
 
-    console.log("Sending payload:", payload);
+    // Prüfe, ob der Key cali_idx vorhanden ist und setze ihn
+    if (selectedSpool.filament.extra.bambu_cali_id) {
+        payload.payload.cali_idx = selectedSpool.filament.extra.bambu_cali_id.replace(/['"]+/g, '').trim();
+    }
+
+    // Prüfe, ob der Key bambu_setting_id vorhanden ist
+    if (selectedSpool.filament.extra.bambu_setting_id) {
+        payload.payload.bambu_setting_id = selectedSpool.filament.extra.bambu_setting_id.replace(/['"]+/g, '').trim();
+    }
+
+    console.log("Spool-In Payload:", payload);
 
     try {
         socket.send(JSON.stringify(payload));
-        showNotification(`Spool settings sent to printer. Please wait...`, true);
+        showNotification(`Spool set in AMS ${amsId} Tray ${trayId}. Pls wait`, true);
     } catch (error) {
-        console.error("Error sending WebSocket message:", error);
+        console.error("Fehler beim Senden der WebSocket Nachricht:", error);
-        showNotification("Error sending spool settings!", false);
+        showNotification("Error while sending", false);
     }
 }
 
@@ -671,75 +687,3 @@ function showNotification(message, isSuccess) {
         }, 300);
     }, 3000);
 }
-
-// Neue Handler-Funktionen für bessere Modularität
-function handleHeartbeatResponse(data) {
-    const bambuDot = document.getElementById('bambuDot');
-    const spoolmanDot = document.getElementById('spoolmanDot');
-    const ramStatus = document.getElementById('ramStatus');
-    
-    if (bambuDot) {
-        bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
-        if (!data.bambu_connected) {
-            bambuDot.style.cursor = 'pointer';
-            bambuDot.onclick = function() {
-                sendReconnectRequest('bambu');
-            };
-        } else {
-            bambuDot.style.cursor = 'default';
-            bambuDot.onclick = null;
-        }
-    }
-    
-    if (spoolmanDot) {
-        spoolmanDot.className = 'status-dot ' + (data.spoolman_connected ? 'online' : 'offline');
-        if (!data.spoolman_connected) {
-            spoolmanDot.style.cursor = 'pointer';
-            spoolmanDot.onclick = function() {
-                sendReconnectRequest('spoolman');
-            };
-        } else {
-            spoolmanDot.style.cursor = 'default';
-            spoolmanDot.onclick = null;
-        }
-    }
-    
-    if (ramStatus) {
-        ramStatus.textContent = `${data.freeHeap}k`;
-    }
-}
-
-function handleSpoolmanSettingsResponse(data) {
-    if (data.payload === 'success') {
-        showNotification(`Spoolman Settings set successfully`, true);
-    } else {
-        showNotification(`Error setting Spoolman Settings`, false);
-    }
-}
-
-function sendReconnectRequest(target) {
-    if (socket?.readyState === WebSocket.OPEN) {
-        socket.send(JSON.stringify({
-            type: 'reconnect',
-            payload: target
-        }));
-    }
-}
-
-// Verbesserte Funktion zum Senden von WebSocket-Nachrichten
-function sendWebSocketMessage(message) {
-    if (!socket || socket.readyState !== WebSocket.OPEN) {
-        console.error('WebSocket is not connected');
-        showNotification("Connection error - please try again", false);
-        return;
-    }
-
-    try {
-        const jsonString = JSON.stringify(message);
-        console.log('Sending WebSocket message:', jsonString);
-        socket.send(jsonString);
-    } catch (error) {
-        console.error('Error sending WebSocket message:', error);
-        showNotification("Error sending message", false);
-    }
-}