vortexpy 6.1.0__tar.gz → 6.1.1__tar.gz

{vortexpy-6.1.0 → vortexpy-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 6.1.0
+Version: 6.1.1
 Summary: Flying Ion's observable, routable, data serialisation and transport code.
 Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
 License: MIT

{vortexpy-6.1.0 → vortexpy-6.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vortexpy"
-version = "6.1.0"
+version = "6.1.1"
 license = {text = "MIT"}
 authors = [{name = "Flying Ion Pty Ltd", email = "contact@flyingion.com"}]
 description = "Flying Ion's observable, routable, data serialisation and transport code."

{vortexpy-6.1.0 → vortexpy-6.1.1}/vortex/VortexServer.py

@@ -43,7 +43,10 @@ VortexServer
 """
 
 HEART_BEAT_PERIOD = 10.0
-HEART_BEAT_TIMEOUT = 60.0
+# Browser background-tab timer throttling (Chrome intensive wake-up throttling)
+# can reduce a hidden tab's client heartbeats to one per minute; 75s gives one
+# full missed-beat margin over that 60s cadence before the connection is closed.
+HEART_BEAT_TIMEOUT = 75.0
 
 
 class VortexServer(VortexABC):
@@ -225,6 +228,10 @@ class VortexServer(VortexABC):
             if conn.httpSessionUuid == httpSessionUuid:
                 del self._connectionByVortexUuid[vortexUuid]
                 vortexClosedNames.append(conn.remoteVortexName)
+                # Close the connection: without this the client keeps a
+                # "live" vortex against the expired session and reconnects
+                # unauthenticated instead of returning to login.
+                conn.close()
 
         self._connectionsChanged(vortexClosedNames, nowOnline=False)
 
@@ -378,7 +385,11 @@ class VortexSessionI(Interface):
 @implementer(VortexSessionI)
 class VortexSession(object):
     def __init__(self, session):
-        session.sessionTimeout = HEART_BEAT_TIMEOUT
+        # Never shorten a configured session timeout: the heartbeat floor
+        # applies only when the app (or Twisted default) allows less.
+        # Shortening here expires active operator sessions when browser
+        # background-tab timer throttling delays heartbeats past 60s.
+        session.sessionTimeout = max(session.sessionTimeout, HEART_BEAT_TIMEOUT)
         self.connections = {}
 
 

{vortexpy-6.1.0 → vortexpy-6.1.1}/vortex/VortexServer_test.py

@@ -8,7 +8,11 @@ from twisted.trial.unittest import SynchronousTestCase
 from twisted.web.server import Site
 from twisted.web.test.requesthelper import DummyRequest
 
-from vortex.VortexServer import VortexServer, VortexSessionI
+from vortex.VortexServer import (
+    HEART_BEAT_TIMEOUT,
+    VortexServer,
+    VortexSessionI,
+)
 from vortex.VortexServerWebsocket import VortexWebsocketServerProtocol
 
 
@@ -127,6 +131,92 @@ class VortexServerConnectionClosedTest(SynchronousTestCase):
         self.assertIs(conns.get("uuid-a"), conn_b)
 
 
+class _RecordingCloseConnection(_MockServerConnection):
+    """Mock connection that records close() without re-entering the server."""
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self.closeCalls = 0
+
+    def close(self) -> None:
+        self.closeCalls += 1
+
+
+class VortexServerSessionExpiredTest(SynchronousTestCase):
+    _nextSessionUid = 0
+
+    def _httpSession(self):
+        request = DummyRequest(b"/vortexws")
+        request.site = Site(None)
+        session = request.getSession()
+        # DummyRequest always assigns uid b"0"; give each session a
+        # distinct uid so per-session bookkeeping can be told apart.
+        type(self)._nextSessionUid += 1
+        session.uid = str(type(self)._nextSessionUid).encode()
+        return session
+
+    def testSessionExpiredClosesMatchingConnections(self) -> None:
+        server = VortexServer("test-server")
+        session = self._httpSession()
+        conn_a = _RecordingCloseConnection(
+            server, "uuid-a", "peek-office-app", session
+        )
+        conn_b = _RecordingCloseConnection(
+            server, "uuid-b", "peek-field-app", session
+        )
+        server.connectionOpened(session, conn_a)
+        server.connectionOpened(session, conn_b)
+
+        server._sessionExpired(session.uid)
+
+        self.assertEqual(conn_a.closeCalls, 1)
+        self.assertEqual(conn_b.closeCalls, 1)
+        self.assertNotIn("uuid-a", server._connectionByVortexUuid)
+        self.assertNotIn("uuid-b", server._connectionByVortexUuid)
+
+    def testSessionExpiredLeavesOtherSessionsConnectionsOpen(self) -> None:
+        server = VortexServer("test-server")
+        session_one = self._httpSession()
+        session_two = self._httpSession()
+        conn_one = _RecordingCloseConnection(
+            server, "uuid-a", "peek-office-app", session_one
+        )
+        conn_two = _RecordingCloseConnection(
+            server, "uuid-b", "peek-office-app", session_two
+        )
+        server.connectionOpened(session_one, conn_one)
+        server.connectionOpened(session_two, conn_two)
+
+        server._sessionExpired(session_one.uid)
+
+        self.assertEqual(conn_one.closeCalls, 1)
+        self.assertEqual(conn_two.closeCalls, 0)
+        self.assertIn("uuid-b", server._connectionByVortexUuid)
+
+
+class VortexSessionAdapterTimeoutTest(SynchronousTestCase):
+    def _httpSession(self):
+        request = DummyRequest(b"/vortexws")
+        request.site = Site(None)
+        return request.getSession()
+
+    def testAdapterKeepsLongerConfiguredTimeout(self) -> None:
+        session = self._httpSession()
+        session.sessionTimeout = 86400
+
+        VortexSessionI(session)
+
+        self.assertEqual(session.sessionTimeout, 86400)
+
+    def testAdapterRaisesShorterTimeoutToHeartbeatFloor(self) -> None:
+        session = self._httpSession()
+        session.sessionTimeout = 5
+
+        VortexSessionI(session)
+
+        self.assertEqual(session.sessionTimeout, HEART_BEAT_TIMEOUT)
+
+
 class VortexWebsocketServerProtocolConnectionLostTest(SynchronousTestCase):
     def testConnectionLostTwiceDoesNotRaise(self) -> None:
         vortex_server = VortexServer("test-server")

{vortexpy-6.1.0 → vortexpy-6.1.1}/vortex/__init__.py

@@ -6,4 +6,4 @@
 # Website : https://flyingion.com
 # Support : contact@flyingion.com
 
-__version__ = '6.1.0'
+__version__ = '6.1.1'

{vortexpy-6.1.0 → vortexpy-6.1.1}/vortexpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vortexpy
-Version: 6.1.0
+Version: 6.1.1
 Summary: Flying Ion's observable, routable, data serialisation and transport code.
 Author-email: Flying Ion Pty Ltd <contact@flyingion.com>
 License: MIT

{vortexpy-6.1.0 → vortexpy-6.1.1}/vortexpy.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE
 README.md
 pyproject.toml
 example/TwistedDeferredTimeout.py

vortexpy-6.1.0/LICENSE

@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2016-2026 Flying Ion Pty Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-