vortexpy 4.0.24__tar.gz → 4.0.25__tar.gz

{vortexpy-4.0.24/vortexpy.egg-info → vortexpy-4.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.0.24
+Version: 4.0.25
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 License: MIT License

{vortexpy-4.0.24 → vortexpy-4.0.25}/pyproject.toml

@@ -7,7 +7,7 @@ license-file = "LICENSE"
 
 [project]
 name = "vortexpy"
-version = "4.0.24"
+version = "4.0.25"
 license = {file = "LICENSE"}
 authors = [{name = "Synerty", email = "contact@synerty.com"}]
 description = "Synertys observable, routable, data serialisation and transport code."

{vortexpy-4.0.24 → vortexpy-4.0.25}/vortex/VortexServerWebsocket.py

@@ -7,8 +7,10 @@
  * Support : support@synerty.com
 """
 
+import json
 import logging
 from collections import deque
+from datetime import datetime, timezone
 from random import random
 from urllib.parse import parse_qs
 from urllib.parse import urlparse
@@ -226,6 +228,11 @@ class VortexWebSocketUpgradeResource(resource.Resource):
 
     If this resource is hit, it will attempt to upgrade the connection to a websocket.
 
+    Plain HTTP GETs without WebSocket upgrade headers are answered with 200 and a
+    small JSON body so browser-side reachability probes (vortexjs NetworkStateBrowser
+    on /vortexws) can confirm the resource is present. txWS rejects non-upgrade
+    requests during an upgrade handshake, which App Proxy surfaces as 502 Bad Gateway.
+
     """
 
     isLeaf = 1
@@ -238,9 +245,47 @@ class VortexWebSocketUpgradeResource(resource.Resource):
         resource.Resource.__init__(self)
         self._websocketFactory = websocketFactory
 
+    @staticmethod
+    def _isWebsocketUpgrade(request) -> bool:
+        connection = b"".join(
+            request.requestHeaders.getRawHeaders(b"connection", [])
+        ).lower()
+        upgrade = b"".join(
+            request.requestHeaders.getRawHeaders(b"upgrade", [])
+        ).lower()
+        return b"upgrade" in connection and upgrade == b"websocket"
+
+    def _renderGet(self, request):
+        from vortex.VortexFactory import VortexFactory
+
+        if not VortexFactory.canConnect(str(request.client.host)):
+            request.setResponseCode(503)
+            request.setHeader("Retry-After", str(max(10, int(random() * 100))))
+            return b"Rejected due to new connections throttling."
+
+        request.setResponseCode(200)
+        request.setHeader(b"Content-Type", b"application/json")
+        request.setHeader(b"Cache-Control", b"no-store")
+        return json.dumps(
+            {
+                "success": True,
+                "websocket": True,
+                "upgradeable": True,
+                "date": datetime.now(timezone.utc).isoformat(),
+            }
+        ).encode("utf-8")
+
     def render(self, request):
         from vortex.VortexFactory import VortexFactory
 
+        if request.method in (b"GET", b"HEAD") and not self._isWebsocketUpgrade(
+            request
+        ):
+            body = self._renderGet(request)
+            if request.method == b"HEAD":
+                return b""
+            return body
+
         if not VortexFactory.canConnect(str(request.client.host)):
             request.setResponseCode(503)
             request.setHeader("Retry-After", str(max(10, int(random() * 100))))

{vortexpy-4.0.24 → vortexpy-4.0.25}/vortex/__init__.py

@@ -7,4 +7,4 @@
  * Support : support@synerty.com
 """
 
-__version__ = '4.0.24'
+__version__ = '4.0.25'

{vortexpy-4.0.24 → vortexpy-4.0.25/vortexpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.0.24
+Version: 4.0.25
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 License: MIT License