wirexaapi 1.1.0__tar.gz → 1.1.1__tar.gz

{wirexaapi-1.1.0 → wirexaapi-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wirexaapi
-Version: 1.1.0
+Version: 1.1.1
 Summary: Wirexa API SDK - voice API client (SignalWire/Twilio compatible) and Wirexa DB document database client
 Author-email: Wirexa Team <dev@wirexa.io>
 License: MIT

{wirexaapi-1.1.0 → wirexaapi-1.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wirexaapi"
-version = "1.1.0"
+version = "1.1.1"
 description = "Wirexa API SDK - voice API client (SignalWire/Twilio compatible) and Wirexa DB document database client"
 readme = "README.md"
 license = {text = "MIT"}

{wirexaapi-1.1.0 → wirexaapi-1.1.1}/wirexaapi/db.py

@@ -307,43 +307,76 @@ class WirexaClient:
             with self._lock:
                 self._all.append(c)
         if c.sock is None:
-            try:
-                c.connect()
-            except socket.timeout as e:
-                raise ServerSelectionTimeoutError("%s:%d: %s" % (self.address + (e,)))
-            except OSError as e:
-                raise ConnectionFailure("%s:%d: %s" % (self.address + (e,)))
+            c.connect()  # las excepciones las gestiona _op (reintenta)
+            c._wdb_used = False
             c.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+            try:
+                c.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+            except OSError:
+                pass
             c.sock.settimeout(self._read_timeout)
         return c
 
+    # Errores que significan "la conexión keep-alive ya no sirve": hay que
+    # reabrir y reintentar. Incluye los de TLS (SSLEOFError/"EOF occurred in
+    # violation of protocol"), que es lo que lanza Python cuando nginx cierra
+    # una conexión keep-alive inactiva (keepalive_timeout) y se reusa el socket.
+    _STALE = (
+        http.client.RemoteDisconnected,
+        http.client.BadStatusLine,
+        http.client.CannotSendRequest,
+        http.client.ResponseNotReady,
+        ConnectionResetError,
+        BrokenPipeError,
+        ConnectionAbortedError,
+        ssl.SSLError,            # incluye ssl.SSLEOFError y ssl.SSLZeroReturnError
+    )
+
     def _op(self, op, retry_safe=False, **fields):
         if self._closed:
             raise ConnectionFailure("el cliente está cerrado")
         body = json.dumps(_encode(dict(op=op, **fields)), separators=(",", ":")).encode()
-        for attempt in (0, 1):
-            c = self._conn()
-            reused = getattr(c, "_wdb_used", False)
+        attempts = 4
+        last = None
+        for attempt in range(attempts):
+            c = None
+            reused = False
+            stage = "connect"
             try:
+                c = self._conn()
+                reused = getattr(c, "_wdb_used", False)
+                stage = "request"
                 c.request("POST", _PATH, body, self._headers)
                 r = c.getresponse()
                 status, raw = r.status, r.read()
                 c._wdb_used = True
                 break
-            except (http.client.RemoteDisconnected, ConnectionResetError, BrokenPipeError,
-                    http.client.CannotSendRequest, http.client.ResponseNotReady) as e:
-                # Conexión keep-alive cerrada por el servidor mientras estaba
-                # ociosa: se reabre y se reintenta una sola vez.
-                c.close()
-                c._wdb_used = False
-                if attempt == 1 or not (reused or retry_safe):
-                    raise ConnectionFailure("%s:%d: %s" % (self.address + (e,)))
             except socket.timeout as e:
-                c.close()
+                last = e
+                self._kill(c)
+                # timeout al conectar -> reintentar; al leer -> la petición pudo
+                # ejecutarse, así que solo se reintenta si es idempotente.
+                if attempt + 1 < attempts and (stage == "connect" or retry_safe):
+                    continue
+                if stage == "connect":
+                    raise ServerSelectionTimeoutError("%s:%d: %s" % (self.address + (e,)))
                 raise ConnectionFailure("timeout esperando respuesta: %s" % e)
+            except self._STALE as e:
+                last = e
+                self._kill(c)
+                # Seguro reintentar cuando: falló al conectar (nunca se envió),
+                # el socket reusado estaba muerto (no se procesó), o es lectura.
+                if attempt + 1 < attempts and (stage == "connect" or reused or retry_safe):
+                    continue
+                raise ConnectionFailure("%s:%d: %s" % (self.address + (e,)))
             except OSError as e:
-                c.close()
+                last = e
+                self._kill(c)
+                if attempt + 1 < attempts and (stage == "connect" or reused or retry_safe):
+                    continue
                 raise ConnectionFailure("%s:%d: %s" % (self.address + (e,)))
+        else:  # pragma: no cover
+            raise ConnectionFailure("%s:%d: %s" % (self.address + (last,)))
         try:
             data = json.loads(raw, object_hook=_decode_hook)
         except ValueError:
@@ -356,6 +389,18 @@ class WirexaClient:
             raise OperationFailure(msg, code, data)
         return data
 
+    def _kill(self, c):
+        """Cierra la conexión del hilo para que el próximo _op abra una nueva."""
+        if c is None:
+            return
+        try:
+            c.close()
+        except Exception:
+            pass
+        c._wdb_used = False
+        if getattr(self._local, "conn", None) is c:
+            self._local.conn = None
+
     def __getitem__(self, name):
         return Database(self, name)
 

{wirexaapi-1.1.0 → wirexaapi-1.1.1}/wirexaapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wirexaapi
-Version: 1.1.0
+Version: 1.1.1
 Summary: Wirexa API SDK - voice API client (SignalWire/Twilio compatible) and Wirexa DB document database client
 Author-email: Wirexa Team <dev@wirexa.io>
 License: MIT