vortexpy 4.0.23__tar.gz → 4.0.25__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.0.23
+Version: 4.0.25
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 License: MIT License
@@ -41,3 +41,4 @@ Requires-Dist: reactivex>=4.0.4
 Requires-Dist: ddt>=1.6.0
 Requires-Dist: psutil
 Requires-Dist: txhttputil>=1.2.0
+Dynamic: license-file

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

@@ -7,7 +7,7 @@ license-file = "LICENSE"
 
 [project]
 name = "vortexpy"
-version = "4.0.23"
+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.23 → 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.23 → vortexpy-4.0.25}/vortex/__init__.py

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

{vortexpy-4.0.23 → vortexpy-4.0.25}/vortex/handler/TupleDataObservableCache.py

@@ -109,6 +109,13 @@ class TupleDataObservableCache(metaclass=ABCMeta):
     def __init__(self) -> None:
         self.__cache: Dict[str, _CachedSubscribedData] = {}
 
+    def start(self):
+
+        self.__pollLoopingCall = task.LoopingCall(self.__cacheCheck)
+
+        d = self.__pollLoopingCall.start(self.__CHECK_PERIOD, now=False)
+        d.addErrback(vortexLogFailure, logger, consumeError=True)
+
     def shutdown(self):
         if not self.__pollLoopingCall:
             raise Exception("This has already been shutdown")
@@ -122,13 +129,6 @@ class TupleDataObservableCache(metaclass=ABCMeta):
 
         self.__cache = {}
 
-    def start(self):
-
-        self.__pollLoopingCall = task.LoopingCall(self.__cacheCheck)
-
-        d = self.__pollLoopingCall.start(self.__CHECK_PERIOD, now=False)
-        d.addErrback(vortexLogFailure, logger, consumeError=True)
-
     def _tupleSelectors(self) -> typing.List[TupleSelector]:
         tupleSelectors = []
         for key in self.__cache:
@@ -138,21 +138,24 @@ class TupleDataObservableCache(metaclass=ABCMeta):
     ## ----- Implement local observable
 
     def __cacheCheck(self):
-        currentVortexUuids = set(VortexFactory.getRemoteVortexUuids())
+        try:
+            currentVortexUuids = set(VortexFactory.getRemoteVortexUuids())
 
-        for ts, cache in list(self.__cache.items()):
-            cache.vortexUuids = cache.vortexUuids & currentVortexUuids
+            for ts, cache in list(self.__cache.items()):
+                cache.vortexUuids = cache.vortexUuids & currentVortexUuids
 
-            if cache.vortexUuids or cache.subject.observers:
-                cache.resetTearDown()
+                if cache.vortexUuids or cache.subject.observers:
+                    cache.resetTearDown()
 
-            elif cache.isReadyForTearDown():
-                logger.debug("Cleaning cache for %s", cache.tupleSelector)
-                self._sendUnsubscribeToServer(cache.tupleSelector)
-                del self.__cache[ts]
+                elif cache.isReadyForTearDown():
+                    logger.debug("Cleaning cache for %s", cache.tupleSelector)
+                    self._sendUnsubscribeToServer(cache.tupleSelector)
+                    del self.__cache[ts]
 
-            else:
-                cache.markForTearDown()
+                else:
+                    cache.markForTearDown()
+        except Exception as e:
+            logger.error("Looping call __cacheCheck threw exception: %s", e)
 
     def _getCache(
         self, tupleSelector: TupleSelector

{vortexpy-4.0.23 → vortexpy-4.0.25}/vortex/handler/TupleDataObservableHandler.py

@@ -195,6 +195,7 @@ class TupleDataObservableHandler:
         sendResponse: SendVortexMsgResponseCallable,
         **kwargs,
     ):
+
         if not VortexFactory.isVortexUuidOnline(vortexUuid):
             logger.debug(
                 "Vortex %s is no longer online, skipping reply", vortexUuid
@@ -215,16 +216,24 @@ class TupleDataObservableHandler:
         # Handle unsubscribe
         if payloadEnvelope.filt.get("unsubscribe"):
             if tsStr in self._observerDataByTupleSelector:
-                try:
-                    self._observerDataByTupleSelector[tsStr].observers.remove(
-                        observerDetails
+                observers = self._observerDataByTupleSelector[tsStr].observers
+                if observerDetails in observers:
+                    observers.remove(observerDetails)
+                    logger.debug(f"Processed unsubscribe for: {tsStr}")
+                else:
+                    logger.debug(
+                        "Unsubscribe called for missing subscription: %s",
+                        tsStr,
                     )
 
-                except KeyError:
-                    pass
-
                 if not self._observerDataByTupleSelector[tsStr].observers:
+                    logger.debug(f"Last subscription unsubscribed for {tsStr}")
                     del self._observerDataByTupleSelector[tsStr]
+            else:
+                logger.debug(
+                    "Unsubscribe called for non-existent tuple selector: %s",
+                    tsStr,
+                )
 
             return
 

{vortexpy-4.0.23 → vortexpy-4.0.25}/vortex/handler/TupleDataObservableProxyHandler.py

@@ -173,10 +173,14 @@ class TupleDataObservableProxyHandler(TupleDataObservableCache):
             return
 
         cache = self._getCache(tupleSelector)
-        try:
+        if vortexUuid in cache.vortexUuids:
             cache.vortexUuids.remove(vortexUuid)
-        except KeyError:
-            pass
+        else:
+            logger.debug(
+                "VortexUuid %s not found in cache for %s",
+                vortexUuid,
+                tupleSelector.toJsonStr(),
+            )
 
     def _handleSubscribe(
         self,
@@ -219,14 +223,16 @@ class TupleDataObservableProxyHandler(TupleDataObservableCache):
 
     def _sendRequestToServer(self, payloadEnvelope: PayloadEnvelope):
         payloadEnvelope.filt["observerName"] = self._observerName
+        vortexMsg = payloadEnvelope.toVortexMsg()
         d = VortexFactory.sendVortexMsg(
-            vortexMsgs=payloadEnvelope.toVortexMsg(),
+            vortexMsgs=vortexMsg,
             destVortexName=self._proxyToVortexName,
         )
         d.addErrback(vortexLogFailure, logger, consumeError=True)
 
     def _sendUnsubscribeToServer(self, tupleSelector: TupleSelector):
-        payloadEnvelope = PayloadEnvelope()
+        logger.debug("Sending unsubscribe for: %s", tupleSelector.name)
+        payloadEnvelope = PayloadEnvelope(filt=self._filt.copy())
         payloadEnvelope.filt["tupleSelector"] = tupleSelector
         payloadEnvelope.filt["unsubscribe"] = True
         self._sendRequestToServer(payloadEnvelope)

{vortexpy-4.0.23 → vortexpy-4.0.25}/vortex/handler/TupleDataObserverClient.py

@@ -63,9 +63,9 @@ class TupleDataObserverClient(TupleDataObservableCache):
         # .subscribe(online= > self.vortexOnlineChanged())
         #
         # self.onDestroyEvent.subscribe(() = > isOnlineSub.unsubscribe())
-        VortexFactory.subscribeToVortexStatusChange(destVortexName).pipe(ops.filter(
-            lambda online: online is True
-        )).subscribe(self._vortexOnlineChanged)
+        VortexFactory.subscribeToVortexStatusChange(destVortexName).pipe(
+            ops.filter(lambda online: online is True)
+        ).subscribe(self._vortexOnlineChanged)
 
         TupleDataObservableCache.start(self)
 
@@ -152,7 +152,8 @@ class TupleDataObserverClient(TupleDataObservableCache):
         d.addErrback(vortexLogFailure, logger, consumeError=True)
 
     def _sendUnsubscribeToServer(self, tupleSelector: TupleSelector):
-        payload = PayloadEnvelope()
+        logger.debug("Sending unsubscribe for: %s", tupleSelector.name)
+        payload = PayloadEnvelope(self._sendFilt.copy())
         payload.filt["tupleSelector"] = tupleSelector
         payload.filt["unsubscribe"] = True
         self._sendRequestToServer(payload)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vortexpy
-Version: 4.0.23
+Version: 4.0.25
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 License: MIT License
@@ -41,3 +41,4 @@ Requires-Dist: reactivex>=4.0.4
 Requires-Dist: ddt>=1.6.0
 Requires-Dist: psutil
 Requires-Dist: txhttputil>=1.2.0
+Dynamic: license-file