motorcortex-python 1.0.2__py3-none-any.whl → 1.0.3__py3-none-any.whl

motorcortex/__init__.py

@@ -181,6 +181,14 @@ def makeUrl(address: str, port: int | None) -> str:
     return address
 
 
+# Bound for the session-management RPCs issued from the reconnect path
+# (restoreSession, fallback login). Any finite value prevents the
+# state-callback worker from blocking forever on a reply that never
+# arrives (e.g. the redial landed on a reverse proxy before the engine
+# behind it was ready); 5 s is ~1000x a normal RPC round-trip.
+_SESSION_RPC_TIMEOUT_MS = 5000
+
+
 def _reconnect_state_update(
         req: Any, sub: Any, state: "ConnectionState", *,
         motorcortex_types: "MessageTypes",
@@ -212,11 +220,11 @@ def _reconnect_state_update(
         return
 
     restored = False
+    motorcortex_msg = motorcortex_types.motorcortex()
     if req.token:
         try:
             restore_reply = req.restoreSession(req.token)
-            restore_msg = restore_reply.get(timeout_ms=5000)
-            motorcortex_msg = motorcortex_types.motorcortex()
+            restore_msg = restore_reply.get(timeout_ms=_SESSION_RPC_TIMEOUT_MS)
             if restore_msg and restore_msg.status == motorcortex_msg.OK:
                 restored = True
                 logger.debug("[SESSION] Session restored using token")
@@ -225,7 +233,29 @@ def _reconnect_state_update(
 
     if not restored:
         logger.debug("[SESSION] Falling back to login")
-        req.login(login, password).get()
+        # Guarded like restoreSession above: an unanswered or rejected
+        # login must not wedge the state-callback worker (Reply.get()
+        # without a timeout waits forever) nor leave the token-refresh
+        # timer polling a dead session ("requested session token but is
+        # not logged in" every 30 s). On failure: stop the timer, bail
+        # out, and let the next CONNECTION_OK edge retry the re-auth.
+        try:
+            login_msg = req.login(login, password).get(timeout_ms=_SESSION_RPC_TIMEOUT_MS)
+            if not login_msg or login_msg.status != motorcortex_msg.OK:
+                logger.warning(
+                    "[SESSION] Re-login after reconnect failed (status %s); "
+                    "will retry on next reconnect",
+                    getattr(login_msg, "status", None),
+                )
+                req._stopTokenRefresh()
+                return
+        except Exception as e:
+            logger.warning(
+                "[SESSION] Re-login after reconnect failed: %s; "
+                "will retry on next reconnect", e,
+            )
+            req._stopTokenRefresh()
+            return
 
     req._startTokenRefresh(token_interval_sec)
     sub.resubscribe()

motorcortex/version.py

@@ -1 +1 @@
-__version__ = '1.0.2'
+__version__ = '1.0.3'

{motorcortex_python-1.0.2.dist-info → motorcortex_python-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: motorcortex-python
-Version: 1.0.2
+Version: 1.0.3
 Summary: Python bindings for Motorcortex Engine
 Home-page: https://www.motorcortex.io
 Author: Alexey Zakharov

{motorcortex_python-1.0.2.dist-info → motorcortex_python-1.0.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-motorcortex/__init__.py,sha256=eVuJIbn8gj549T1HZ7JKZ1i4gx0aibuOLJ-apB6CO3g,15204
+motorcortex/__init__.py,sha256=o-xtJGJvQvFWgbsY7HfqmXBov0RlDEhrwGdwwYyK514,16691
 motorcortex/_connection_state.py,sha256=0jos75PAyMsN3ew6HRoRDbLY-lGCzDit-SiUR7ZvnlA,2203
 motorcortex/_request_builders.py,sha256=ZP-WKS56CkrpoKbpU6FEM5e5E_MAr_P2PEQPZYaS5ls,5265
 motorcortex/_request_utils.py,sha256=K8UCqgDx7DenZlY-l8zEqowIM0yiVPuLciTy9KX5wBY,12155
@@ -20,9 +20,9 @@ motorcortex/state_callback_handler.py,sha256=Vr9XZ5vN7-CKJdvbJlFkenwH6JfhuInkM1R
 motorcortex/subscribe.py,sha256=E4Hz03vF2Jgk1vXqhHf42Rd-y337Rt78zY70X2NrXeo,15755
 motorcortex/subscription.py,sha256=UTPmLOl41Tn3mRl3Hyam2R9bCg9D5y5EJsiChYERu5E,15425
 motorcortex/timespec.py,sha256=bZ-CD2EY0ALoWmJyluThxkiqfVCiGZqPPHRlKSvq7Fs,4573
-motorcortex/version.py,sha256=ZTipNH6wyC6qsq1H_lZsvJyVruUa1nu3y4EysMdkpuU,22
-motorcortex_python-1.0.2.dist-info/LICENSE,sha256=m5IaPTxipQwDCpY_YUD927y5QnUzqKGLVUY8E2KxDMk,1165
-motorcortex_python-1.0.2.dist-info/METADATA,sha256=ghM1WccanWR1oyGtsvnIW67hrU1QK2Y1fq5KjfaWjqA,6141
-motorcortex_python-1.0.2.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-motorcortex_python-1.0.2.dist-info/top_level.txt,sha256=2Glsldo3S13fGB0ub_vogd7y-RQYYNXDjnm-qESmjBY,12
-motorcortex_python-1.0.2.dist-info/RECORD,,
+motorcortex/version.py,sha256=qKK4BMzdt84HiCorJPWqgEfa_DbJeuGx_bIPrDui2vc,22
+motorcortex_python-1.0.3.dist-info/LICENSE,sha256=m5IaPTxipQwDCpY_YUD927y5QnUzqKGLVUY8E2KxDMk,1165
+motorcortex_python-1.0.3.dist-info/METADATA,sha256=0IDEK8pY81NIQIiMFL_8xXIXZe2N_wh5Jc60HfjgMTw,6141
+motorcortex_python-1.0.3.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+motorcortex_python-1.0.3.dist-info/top_level.txt,sha256=2Glsldo3S13fGB0ub_vogd7y-RQYYNXDjnm-qESmjBY,12
+motorcortex_python-1.0.3.dist-info/RECORD,,