vortexpy 4.0.20__tar.gz → 4.0.22__tar.gz

{vortexpy-4.0.20 → vortexpy-4.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.20
+Version: 4.0.22
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy

{vortexpy-4.0.20 → vortexpy-4.0.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "4.0.20"
+version = "4.0.22"
 authors = [{name = "Synerty", email = "contact@synerty.com"}]
 description = "Synertys observable, routable, data serialisation and transport code."
 keywords = [

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/PayloadEnvelope.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import base64
 import json
 import logging

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/Tuple.py

@@ -713,7 +713,7 @@ class _TupleToPlainJsonMixin:
                         valueTypeExtraHint
                     )
 
-                    logger.warning(
+                    logger.debug(
                         f"typing is not checked for key 'key' in value '{value}'"
                     )
                     for key, item in value.items():

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/VortexClientWebsocketFactory.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import logging
 import uuid
 from collections import deque, namedtuple
@@ -317,12 +318,14 @@ class VortexClientWebsocketFactory(
         assert self._server
         assert vortexMsgs
 
-        # This transport requires base64 encoding
-        for index, vortexMsg in enumerate(vortexMsgs):
-            if vortexMsg.startswith(b"{"):
-                vortexMsgs[index] = yield PayloadEnvelope.base64EncodeDefer(
-                    vortexMsg
-                )
+        # If this transport requires base64 encoding
+        if self.requiresBase64Encoding:
+            for index, vortexMsg in enumerate(vortexMsgs):
+                if vortexMsg.startswith(b"{"):
+                    vortexMsg = yield PayloadEnvelope.base64EncodeDefer(
+                        vortexMsg
+                    )
+                    vortexMsgs[index] = vortexMsg + b"."
 
         for vortexMsg in vortexMsgs:
             self.__protocol.write(vortexMsg)

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/VortexFactory.py

@@ -207,9 +207,9 @@ class _VortexFactoryVortexInfo:
 
         self.__remoteVortexNameByUuid: dict[str, tuple[VortexABC, str]] = {}
 
-        self.__localVortexUuidsByName: dict[
-            str, set[tuple[VortexABC, str]]
-        ] = defaultdict(set)
+        self.__localVortexUuidsByName: dict[str, set[tuple[VortexABC, str]]] = (
+            defaultdict(set)
+        )
 
         self.__localVortexNameByUuid: dict[str, tuple[VortexABC, str]] = {}
 
@@ -828,12 +828,14 @@ class VortexFactory:
         base64VortexMsgs = vortexMsgs[:]
 
         # If any transports require base64 encoding, then encode them all
+
         if [v for v in vortexAndUuids if v[0].requiresBase64Encoding]:
             for index, vortexMsg in enumerate(base64VortexMsgs):
                 if vortexMsg.startswith(b"{"):
-                    base64VortexMsgs[
-                        index
-                    ] = yield PayloadEnvelope.base64EncodeDefer(vortexMsg)
+                    base64VortexMsg = yield PayloadEnvelope.base64EncodeDefer(
+                        vortexMsg
+                    )
+                    base64VortexMsgs[index] = base64VortexMsg + b"."
 
         deferreds = []
         for vortex, uuid in vortexAndUuids:

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/VortexPayloadProtocol.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import logging
 from abc import ABCMeta, abstractmethod
 from collections import deque
@@ -24,12 +25,11 @@ logger = logging.getLogger(name=__name__)
 
 class VortexPayloadProtocol(Protocol, metaclass=ABCMeta):
     def __init__(self, logger):
-        self._data = b""
         self._serverVortexUuid = None
         self._serverVortexName = None
         self._logger = logger
 
-        self._processVortexMsgsInProgress = False
+        self._data = b""
         self._vortexMsgsQueue = deque()
 
     @abstractmethod
@@ -110,9 +110,6 @@ class VortexPayloadProtocol(Protocol, metaclass=ABCMeta):
                 self._logger.exception(reasonFailure.value)
 
     def _processData(self):
-        if not self._data:
-            return
-
         def getNextChunkIter():
             try:
                 while True:
@@ -121,13 +118,14 @@ class VortexPayloadProtocol(Protocol, metaclass=ABCMeta):
                 # There is no '.' in it, wait for more data.
                 return
 
-        for nextChunk in getNextChunkIter():
-            vortexMsg = self._data[:nextChunk]
-            self._data = self._data[nextChunk + 1 :]
+        if self._data:
+            for nextChunk in getNextChunkIter():
+                vortexMsg = self._data[:nextChunk]
+                self._data = self._data[nextChunk + 1 :]
 
-            # If we get two heartbeats in a row, this will be false
-            if len(vortexMsg):
-                self._vortexMsgsQueue.append(vortexMsg)
+                # If we get two heartbeats in a row, this will be false
+                if len(vortexMsg):
+                    self._vortexMsgsQueue.append(vortexMsg)
 
         if self._vortexMsgsQueue and not self._processVortexMsgs.running:
             reactor.callLater(0, self._processVortexMsgs)
@@ -172,10 +170,9 @@ class VortexPayloadProtocol(Protocol, metaclass=ABCMeta):
             name=self._serverVortexName, uuid=self._serverVortexUuid
         )
 
-    def _deliverPayload(self, payload):
-
+    def _deliverPayload(self, payloadEnvelope):
         PayloadIO().process(
-            payload,
+            payloadEnvelope,
             vortexUuid=self._serverVortexUuid,
             vortexName=self._serverVortexName,
             httpSession=None,

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/VortexServer.py

@@ -6,6 +6,7 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import logging
 import uuid
 from typing import Any
@@ -314,9 +315,10 @@ class VortexServer(VortexABC):
         if self.requiresBase64Encoding:
             for index, vortexMsg in enumerate(vortexMsgs):
                 if vortexMsg.startswith(b"{"):
-                    vortexMsgs[index] = yield PayloadEnvelope.base64EncodeDefer(
+                    vortexMsg = yield PayloadEnvelope.base64EncodeDefer(
                         vortexMsg
                     )
+                    vortexMsgs[index] = vortexMsg + b"."
 
         if vortexUuid is None:
             conns = self._connectionByVortexUuid.values()

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/VortexServerWebsocket.py

@@ -6,11 +6,14 @@
  * Website : http://www.synerty.com
  * Support : support@synerty.com
 """
+
 import logging
+from collections import deque
 from random import random
 from urllib.parse import parse_qs
 from urllib.parse import urlparse
 
+from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.protocol import Factory
 from twisted.internet.protocol import Protocol
@@ -20,7 +23,7 @@ from twisted.web import resource
 from twisted.web.server import NOT_DONE_YET
 
 from txwebsocket.txws import WebSocketProtocol
-from vortex.DeferUtil import vortexLogFailure
+from vortex.DeferUtil import vortexLogFailure, nonConcurrentMethod
 from vortex.PayloadEnvelope import PayloadEnvelope
 from vortex.VortexServerConnection import VortexServerConnection
 from .PayloadPriority import DEFAULT_PRIORITY
@@ -31,12 +34,12 @@ logger = logging.getLogger(name=__name__)
 
 
 class VortexWebsocketServerProtocol(Protocol):
-
     _DEBUG_LOGGING = False
 
     def __init__(self, vortex: VortexServer, addr, httpSession=None) -> None:
         self._vortex = vortex
         self._addr = addr
+        self._logger = logger
 
         self._conn = None
 
@@ -53,7 +56,9 @@ class VortexWebsocketServerProtocol(Protocol):
 
         # Most messages don't need a buffer, but websockets can split messages
         # around the 128kb mark
-        self._receiveBuffer = b""
+        self._data = b""
+
+        self._vortexMsgsQueue = deque()
 
     def __initConnection(self):
         # self.transport.setBinaryMode(True)
@@ -106,28 +111,74 @@ class VortexWebsocketServerProtocol(Protocol):
         if self._httpSession:
             self._httpSession.touch()
 
-        if data == b".":
-            self._conn.beatReceived()
-            return
+        self._conn.beatReceived()
 
-        if len(data) > 1 and data[-1] == b".":
-            data = data[:-1]
+        if data.startswith(b"{"):
+            # If the data starts with a { then the payloadEnvelope is al in
+            # the websocket message.
+            assert data.endswith(b"}"), (
+                "%s payloadEnvelope doesn't fit in websocket message" % __name__
+            )
+            self._vortexMsgsQueue.append(data)
+        else:
+            # Else it's a base64 encoded payloadEnvelope, and it will be separated
+            # by b'.'
+            self._data += data
 
-        d = self._processVortexMsg(data)
-        d.addErrback(vortexLogFailure, logger, consumeError=True)
+        self._processData()
 
     def connectionLost(self, reason=connectionDone):
         if self._DEBUG_LOGGING:
             logger.debug(
                 "VortexWebsocketServerProtocol.connectionLost reason=%s", reason
             )
+        self._processData()
         if self._conn:
             self._conn.transportClosed()
             self._vortex.connectionClosed(self._conn)
 
+    def _processData(self):
+        def getNextChunkIter():
+            try:
+                while True:
+                    yield self._data.index(b".")
+
+            except ValueError:
+                # There is no '.' in it, wait for more data.
+                return
+
+        if self._data:
+            for nextChunk in getNextChunkIter():
+                vortexMsg = self._data[:nextChunk]
+                self._data = self._data[nextChunk + 1 :]
+
+                # If we get two heartbeats in a row, this will be false
+                if len(vortexMsg):
+                    self._vortexMsgsQueue.append(vortexMsg)
+
+        if self._vortexMsgsQueue and not self._processVortexMsgs.running:
+            reactor.callLater(0, self._processVortexMsgs)
+
     @inlineCallbacks
-    def _processVortexMsg(self, vortexMsg: bytes):
-        payloadEnvelope = yield PayloadEnvelope().fromVortexMsgDefer(vortexMsg)
+    @nonConcurrentMethod
+    def _processVortexMsgs(self):
+        while self._vortexMsgsQueue:
+            vortexMsg = self._vortexMsgsQueue.popleft()
+
+            try:
+                payloadEnvelope = yield PayloadEnvelope().fromVortexMsgDefer(
+                    vortexMsg
+                )
+
+                self._deliverPayload(payloadEnvelope)
+
+            except Exception as e:
+                print(vortexMsg)
+                print(e)
+                self._logger.exception(e)
+                raise
+
+    def _deliverPayload(self, payloadEnvelope):
         self._vortex.payloadReveived(
             httpSession=self._httpSession,
             vortexUuid=self._remoteVortexUuid,
@@ -188,7 +239,6 @@ class VortexWebSocketUpgradeResource(resource.Resource):
         self._websocketFactory = websocketFactory
 
     def render(self, request):
-
         from vortex.VortexFactory import VortexFactory
 
         if not VortexFactory.canConnect(str(request.client.host)):

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortex/__init__.py

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

{vortexpy-4.0.20 → vortexpy-4.0.22}/vortexpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortexpy
-Version: 4.0.20
+Version: 4.0.22
 Summary: Synertys observable, routable, data serialisation and transport code.
 Author-email: Synerty <contact@synerty.com>
 Project-URL: Homepage, https://github.com/Synerty/vortexpy