diff --git a/Scripts/web_server.py b/Scripts/web_server.py index bb4218b..9c4edd9 100644 --- a/Scripts/web_server.py +++ b/Scripts/web_server.py @@ -8,6 +8,7 @@ class TempWebServer: self.port = port self.socket = None self.sensors = {} + self.last_page_render = 0 # Track last successful HTML generation def start(self): """Start the web server (non-blocking).""" @@ -20,34 +21,47 @@ class TempWebServer: print("Web server started on port {}".format(self.port)) except Exception as e: print("Failed to start web server: {}".format(e)) - + def check_requests(self, sensors, ac_monitor=None, heater_monitor=None, schedule_monitor=None): """Check for incoming requests (call in main loop).""" if not self.socket: return - try: conn, addr = self.socket.accept() conn.settimeout(3.0) request = conn.recv(1024).decode('utf-8') - - # Check if this is a POST request (form submission) + if 'POST /update' in request: response = self._handle_update(request, sensors, ac_monitor, heater_monitor, schedule_monitor) + + elif 'GET /schedule' in request: + response = self._get_schedule_editor_page(sensors, ac_monitor, heater_monitor) + conn.send('HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n') + conn.sendall(response.encode('utf-8')) + conn.close() + return + elif 'POST /schedule' in request: response = self._handle_schedule_update(request, sensors, ac_monitor, heater_monitor, schedule_monitor) + # If handler returns a redirect response, send it raw and exit + if isinstance(response, str) and response.startswith('HTTP/1.1 303'): + conn.sendall(response.encode('utf-8')) + conn.close() + return + elif 'GET /ping' in request: + # Quick health check endpoint (no processing) + conn.send('HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nConnection: close\r\n\r\n') + conn.sendall(b'OK') + conn.close() + return + else: - # Regular GET request response = self._get_status_page(sensors, ac_monitor, heater_monitor) - - # Make sure we have a valid response + if response is None: - print("Error: response is None, generating default page") response = self._get_status_page(sensors, ac_monitor, heater_monitor) - - conn.send('HTTP/1.1 200 OK\r\n') - conn.send('Content-Type: text/html; charset=utf-8\r\n') - conn.send('Connection: close\r\n\r\n') + + conn.send('HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nConnection: close\r\n\r\n') conn.sendall(response.encode('utf-8')) conn.close() except OSError: @@ -56,12 +70,24 @@ class TempWebServer: print("Web server error: {}".format(e)) import sys sys.print_exception(e) - + def _save_config_to_file(self, config): - """Save configuration to config.json file.""" + """Save configuration to config.json file (atomic write).""" try: - with open('config.json', 'w') as f: + import os + # Write to temp file first + with open('config.tmp', 'w') as f: json.dump(config, f) + + # Remove old config if exists + try: + os.remove('config.json') + except: + pass + + # Rename temp to config (atomic on most filesystems) + os.rename('config.tmp', 'config.json') + print("Settings saved to config.json") return True except Exception as e: @@ -86,6 +112,7 @@ class TempWebServer: def _handle_schedule_update(self, request, sensors, ac_monitor, heater_monitor, schedule_monitor): """Handle schedule form submission.""" + try: body = request.split('\r\n\r\n')[1] if '\r\n\r\n' in request else '' params = {} @@ -160,7 +187,6 @@ class TempWebServer: # Redirect back to homepage return 'HTTP/1.1 303 See Other\r\nLocation: /\r\n\r\n' - # ===== END: Handle mode actions ===== elif mode_action == 'save_schedules': # Just fall through to schedule parsing below @@ -177,6 +203,20 @@ class TempWebServer: heater_key = 'schedule_{}_heater'.format(i) if time_key in params and params[time_key]: + # Validate time format (HH:MM) + time_val = params[time_key] + if ':' not in time_val or len(time_val.split(':')) != 2: + print("Invalid time format: {}".format(time_val)) + return 'HTTP/1.1 303 See Other\r\nLocation: /schedule\r\n\r\n' + + try: + hours, mins = time_val.split(':') + if not (0 <= int(hours) <= 23 and 0 <= int(mins) <= 59): + raise ValueError + except: + print("Invalid time value: {}".format(time_val)) + return 'HTTP/1.1 303 See Other\r\nLocation: /schedule\r\n\r\n' + schedule = { 'time': params[time_key], 'name': params.get(name_key, 'Schedule {}'.format(i+1)), @@ -223,13 +263,16 @@ class TempWebServer: except: pass # ===== END: Handle schedule configuration save ===== - + + # Redirect back to schedule page + return 'HTTP/1.1 303 See Other\r\nLocation: /schedule\r\n\r\n' + except Exception as e: print("Error updating schedule: {}".format(e)) import sys sys.print_exception(e) - - return self._get_status_page(sensors, ac_monitor, heater_monitor, show_success=True) + # Safety: avoid rendering an error page here; just redirect + return 'HTTP/1.1 303 See Other\r\nLocation: /schedule\r\n\r\n' def _handle_update(self, request, sensors, ac_monitor, heater_monitor, schedule_monitor): """Handle form submission and update settings.""" @@ -342,12 +385,18 @@ class TempWebServer: """Generate HTML status page.""" print("DEBUG: Generating status page...") try: - # Get current temperatures - inside_temps = sensors['inside'].read_all_temps(unit='F') - outside_temps = sensors['outside'].read_all_temps(unit='F') + # Get current temperatures (use cached values to avoid blocking) + inside_temp = getattr(sensors.get('inside'), 'last_temp', None) + outside_temp = getattr(sensors.get('outside'), 'last_temp', None) - inside_temp = list(inside_temps.values())[0] if inside_temps else "N/A" - outside_temp = list(outside_temps.values())[0] if outside_temps else "N/A" + # Fallback to sensor read if no cached value (first load only) + if inside_temp is None: + inside_temps = sensors['inside'].read_all_temps(unit='F') + inside_temp = list(inside_temps.values())[0] if inside_temps else "N/A" + + if outside_temp is None: + outside_temps = sensors['outside'].read_all_temps(unit='F') + outside_temp = list(outside_temps.values())[0] if outside_temps else "N/A" # Get AC/Heater status ac_status = "ON" if ac_monitor and ac_monitor.ac.get_state() else "OFF" @@ -386,6 +435,9 @@ class TempWebServer: # Build schedule cards schedule_cards = "" + + # Build mode buttons for dashboard + mode_buttons = self._build_mode_buttons(config) if config.get('schedules'): for schedule in config.get('schedules', []): # ===== START: Decode URL-encoded values ===== @@ -416,9 +468,6 @@ class TempWebServer: """ - # Build schedule form - schedule_form = self._build_schedule_form(config) - # Success message success_html = """
@@ -732,7 +781,13 @@ class TempWebServer:
{schedule_cards}
- {schedule_form} + {mode_buttons} + +
+ + ⚙️ Edit Schedules + +
@@ -759,8 +814,9 @@ class TempWebServer: schedule_color=schedule_color, schedule_icon=schedule_icon, schedule_cards=schedule_cards, - schedule_form=schedule_form + mode_buttons=mode_buttons ) + self.last_page_render = time.time() # Track successful render return html except Exception as e: @@ -771,13 +827,11 @@ class TempWebServer: def _get_error_page(self, error_title, error_message, sensors, ac_monitor, heater_monitor): """Generate error page with message.""" - # Get current temps - inside_temps = sensors['inside'].read_all_temps(unit='F') - outside_temps = sensors['outside'].read_all_temps(unit='F') - - inside_temp = list(inside_temps.values())[0] if inside_temps else "N/A" - outside_temp = list(outside_temps.values())[0] if outside_temps else "N/A" + # Get current temps (cached, fast - no blocking sensor reads) + inside_temp = getattr(sensors.get('inside'), 'last_temp', None) or "N/A" + outside_temp = getattr(sensors.get('outside'), 'last_temp', None) or "N/A" + # Format temperature values inside_temp_str = "{:.1f}".format(inside_temp) if isinstance(inside_temp, float) else str(inside_temp) outside_temp_str = "{:.1f}".format(outside_temp) if isinstance(outside_temp, float) else str(outside_temp) @@ -896,137 +950,197 @@ class TempWebServer: ) return html - - def _build_schedule_form(self, config): - """Build the schedule editing form.""" + + def _get_schedule_editor_page(self, sensors, ac_monitor, heater_monitor): + """Generate schedule editor page (no auto-refresh, schedules only).""" + # Get current temps (use cached to avoid blocking) + inside_temp = getattr(sensors.get('inside'), 'last_temp', None) or "N/A" + outside_temp = getattr(sensors.get('outside'), 'last_temp', None) or "N/A" + + # Format temperature values + inside_temp_str = "{:.1f}".format(inside_temp) if isinstance(inside_temp, float) else str(inside_temp) + outside_temp_str = "{:.1f}".format(outside_temp) if isinstance(outside_temp, float) else str(outside_temp) + + # Load config + config = self._load_config() schedules = config.get('schedules', []) # Pad with empty schedules up to 4 while len(schedules) < 4: - schedules.append({'time': '', 'name': '', 'ac_target': 77.0, 'heater_target': 80.0}) - - # ===== START: Determine current mode ===== - # Check if schedules exist - has_schedules = len([s for s in schedules if s.get('time')]) > 0 - - # Determine mode based on config - if not has_schedules: - current_mode = "no_schedules" # No schedules configured yet - elif config.get('schedule_enabled'): - current_mode = "automatic" # Schedules are running - elif config.get('permanent_hold', False): - current_mode = "permanent_hold" # User disabled schedules permanently - else: - current_mode = "temporary_hold" # Manual override (HOLD mode) - # ===== END: Determine current mode ===== - - # ===== START: Build mode control buttons ===== - if current_mode == "no_schedules": - # No mode buttons if no schedules configured - mode_buttons = """ -
- ℹ️ Configure schedules below, then choose a mode -
- """ - elif current_mode == "automatic": - # Automatic mode active - mode_buttons = """ -
-
- ✅ Automatic Mode Active -
-
- Temperatures automatically adjust based on schedule -
-
- - -
-
- """ - elif current_mode == "temporary_hold": - # Temporary hold (manual override) - mode_buttons = """ -
-
- ⏸️ Temporary Hold Active -
-
- Manual settings in use - Schedule paused -
-
- - -
-
- """ - else: # permanent_hold - # Permanent hold (schedules disabled by user) - mode_buttons = """ -
-
- 🛑 Permanent Hold Active -
-
- Schedules disabled - Manual control only -
-
- -
-
- """ - # ===== END: Build mode control buttons ===== - - form = """ -
-

⚙️ Schedule Configuration

- - {mode_buttons} - """.format(mode_buttons=mode_buttons) + schedules.append({'time': '', 'name': '', 'ac_target': 75.0, 'heater_target': 72.0}) + # Build schedule inputs + schedule_inputs = "" for i, schedule in enumerate(schedules[:4]): - form += """ -
-
- - + schedule_inputs += """ +
+
+ +
-
- - +
+ +
-
- - +
+ +
-
- - +
+ +
""".format( i=i, time=schedule.get('time', ''), name=schedule.get('name', ''), - ac=schedule.get('ac_target', 77.0), - heater=schedule.get('heater_target', 80.0) + heater=schedule.get('heater_target', 72.0), + ac=schedule.get('ac_target', 75.0) ) - form += """ -
- + html = """ + + + + Schedule Editor - Climate Control + + + + + +
+

📅 Schedule Configuration

+ +
+
🏠 Inside: {inside_temp}°F
+
🌡️ Outside: {outside_temp}°F
- - """ + +
+

⏰ Configure Schedule Times & Temperatures

+

+ Set up to 4 time-based schedules. Leave time blank to disable a schedule. +

+ + {schedule_inputs} + +
+ +
+
+ + + +
+ 💡 This page does not auto-refresh
+ To change modes (Automatic/Hold), return to the dashboard +
+
+ + + """.format( + inside_temp=inside_temp_str, + outside_temp=outside_temp_str, + schedule_inputs=schedule_inputs + ) - return form \ No newline at end of file + return html + + def _build_mode_buttons(self, config): + """Build mode control buttons for dashboard only.""" + schedules = config.get('schedules', []) + has_schedules = len([s for s in schedules if s.get('time')]) > 0 + + if not has_schedules: + return """ +
+ ℹ️ No schedules configured - Configure schedules +
+ """ + + # Build mode buttons based on current state + if config.get('schedule_enabled'): + return """ +
+
+
✅ Automatic Mode
+
Temperatures adjust based on schedule
+
+ + +
+
+
+ """ + elif config.get('permanent_hold', False): + return """ +
+
+
🛑 Permanent Hold
+
Manual control only - Schedules disabled
+ +
+
+ """ + else: + return """ +
+
+
⏸️ Temporary Hold
+
Manual override active
+
+ + +
+
+
+ """ \ No newline at end of file