v2.0.22

refactor: replace legacy WebSocket/EventSource mocks with a robust class-based implementation in runner and update tests

Author: manatlan

htag/runner.py

@@ -184,10 +184,13 @@ def _render_page(self) -> str:
         request = current_request.get()
         if request and hasattr(request, "cookies"):
             mode = request.cookies.get("htag_mode")
-            if mode == "http":
-                protocol_patch = "window.WebSocket=window.EventSource=function(){var self=this;setTimeout(function(){if(self.onerror)self.onerror(new Error('Forced HTTP mode'))},0)};"
-            elif mode == "sse":
-                protocol_patch = "window.WebSocket=function(){var self=this;setTimeout(function(){if(self.onerror)self.onerror(new Error('Forced SSE mode'))},0)};"
+            if mode in ("http", "sse"):
+                # Robust mock for WebSocket (and EventSource for http mode)
+                mock_js = "class{constructor(){Object.assign(this,{readyState:3,close:()=>{},send:()=>{}});setTimeout(()=>this.onerror&&this.onerror(new Event('error')),0)}}; ['CONNECTING','OPEN','CLOSING','CLOSED'].forEach((name,i)=>{if(window.WebSocket)window.WebSocket[name]=i; if(window.EventSource)window.EventSource[name]=i;});"
+                if mode == "http":
+                    protocol_patch = f"window.WebSocket=window.EventSource={mock_js}"
+                else:
+                    protocol_patch = f"window.WebSocket={mock_js}"
 
         html_content = f"""
         <!DOCTYPE html>

pyproject.toml

@@ -9,7 +9,7 @@ include-package-data = true
 
 [project]
 name = "htag"
-version = "2.0.21"
+version = "2.0.22"
 description = "Python3 GUI toolkit for building 'beautiful' applications for mobile, web, and desktop from a single codebase"
 readme = "README.md"
 requires-python = ">=3.10"

tests/test_htag_mode.py

@@ -22,8 +22,8 @@ def test_htag_mode_http():
     response = client.get("/", cookies={"htag_mode": "http"})
     assert response.status_code == 200
     # Both WebSocket and EventSource should be mocked
-    assert "window.WebSocket=window.EventSource=function()" in response.text
-    assert "Forced HTTP mode" in response.text
+    assert "window.WebSocket=window.EventSource=class{" in response.text
+    assert "new Event('error')" in response.text
 
 def test_htag_mode_sse():
     """Verify protocol mocking for 'sse' mode."""
@@ -32,9 +32,9 @@ def test_htag_mode_sse():
     response = client.get("/", cookies={"htag_mode": "sse"})
     assert response.status_code == 200
     # Only WebSocket should be mocked
-    assert "window.WebSocket=function()" in response.text
-    assert "window.EventSource=function()" not in response.text
-    assert "Forced SSE mode" in response.text
+    assert "window.WebSocket=class{" in response.text
+    assert "window.EventSource=class{" not in response.text
+    assert "new Event('error')" in response.text
 
 def test_htag_mode_invalid():
     """Verify that invalid cookie values are ignored."""