Upload app.py

app.py

@@ -192,7 +192,8 @@ def start_url_monitoring_thread(target_url_id):
         # Stop existing thread if it's alive
         if "_thread" in url_data_entry and url_data_entry["_thread"].is_alive():
             print(f"Monitor for URL ID {target_url_id} already running. Attempting to restart.")
-            url_data_entry["_stop_event"].set()
+            if "_stop_event" in url_data_entry and url_data_entry["_stop_event"]: # Check if _stop_event exists
+                url_data_entry["_stop_event"].set()
             url_data_entry["_thread"].join(timeout=3) # Wait for thread to stop
 
         new_stop_event = threading.Event()
@@ -211,7 +212,8 @@ def stop_url_monitoring_thread(target_url_id):
         url_data_entry = monitored_urls_store[target_url_id]
         if "_thread" in url_data_entry and url_data_entry["_thread"].is_alive():
             print(f"Signaling stop for monitor thread of URL ID {target_url_id}")
-            url_data_entry["_stop_event"].set()
+            if "_stop_event" in url_data_entry and url_data_entry["_stop_event"]: # Check if _stop_event exists
+                url_data_entry["_stop_event"].set()
             # Not joining here to keep API responsive, daemon thread will exit.
         url_data_entry.pop("_thread", None)
         url_data_entry.pop("_stop_event", None)
@@ -255,8 +257,9 @@ def add_new_url():
     with lock:
         # Check for duplicates (case-insensitive, ignoring trailing slashes)
         normalized_new_url = input_url.rstrip('/').lower()
-        for existing_url in monitored_urls_store.values():
-            if existing_url['url'].rstrip('/').lower() == normalized_new_url:
+        for existing_url_id in list(monitored_urls_store.keys()): # Iterate over keys to avoid issues if store is modified
+            existing_url_data = monitored_urls_store.get(existing_url_id)
+            if existing_url_data and existing_url_data['url'].rstrip('/').lower() == normalized_new_url:
                 return jsonify({"error": "URL already monitored"}), 409 # Conflict
 
         new_url_id = str(uuid.uuid4())
@@ -266,13 +269,18 @@ def add_new_url():
             "id": new_url_id, "url": input_url, "status": 'pending', 
             "ip": resolved_ip, "responseTime": None, "lastChecked": None, "history": []
         }
-        monitored_urls_store[new_url_id] = url_entry_to_add
+        
+        # Make a copy of the entry for the response *before* it's potentially modified
+        # by start_url_monitoring_thread with non-serializable objects.
+        response_payload = url_entry_to_add.copy()
+
+        monitored_urls_store[new_url_id] = url_entry_to_add # url_entry_to_add will be modified by start_url_monitoring_thread
         save_data_to_json() 
     
-    start_url_monitoring_thread(new_url_id) 
+    start_url_monitoring_thread(new_url_id) # This will add _thread and _stop_event to monitored_urls_store[new_url_id]
 
-    # Return the newly created URL entry (without thread objects)
-    return jsonify(url_entry_to_add), 201
+    # Return the clean response_payload, which does not have _thread or _stop_event
+    return jsonify(response_payload), 201
 
 
 @app.route('/api/urls/<string:target_url_id>', methods=['DELETE'])
@@ -284,7 +292,7 @@ def delete_existing_url(target_url_id):
             save_data_to_json()
             
             # Prepare data for response (without thread objects)
-            response_data = removed_url_entry.copy()
+            response_data = removed_url_entry.copy() # Copy before potential modification if stop_url_monitoring_thread didn't pop everything
             response_data.pop("_thread", None)
             response_data.pop("_stop_event", None)
             print(f"Deleted URL ID {target_url_id}")
@@ -301,7 +309,12 @@ if os.environ.get('WERKZEUG_RUN_MAIN') != 'true': # Avoids double load in Flask
 if __name__ == '__main__':
     # This block is for local development (e.g., `python app.py`)
     # `load_data_from_json()` is called above unless Werkzeug reloader is active.
+    # If using Flask's reloader, load_data_from_json will be called twice:
+    # once by the main process, once by the reloader's child process.
+    # The check for WERKZEUG_RUN_MAIN ensures it only loads in the main one or the child.
+    if os.environ.get('WERKZEUG_RUN_MAIN') == 'true': # Ensure data is loaded in the reloaded process too
+        load_data_from_json()
     app.run(debug=True, host='0.0.0.0', port=7860)
 
 # When run with Gunicorn, Gunicorn imports `app` from this `app.py` file.
-# `load_data_from_json()` will have been called during that import.
+# `load_data_from_json()` will have been called during that import (due to the WERKZEUG_RUN_MAIN check).