portal 3.7.0__tar.gz → 3.7.2__tar.gz

{portal-3.7.0/portal.egg-info → portal-3.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.7.0
+Version: 3.7.2
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.7.0 → portal-3.7.2}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.7.0'
+__version__ = '3.7.2'
 
 import multiprocessing as mp
 try:

{portal-3.7.0 → portal-3.7.2}/portal/batching.py

@@ -19,7 +19,8 @@ class BatchServer:
       self, port, name='Server', workers=1, errors=True,
       process=True, shmem=False, **kwargs):
     inner_port = utils.free_port()
-    assert port != inner_port, (port, inner_port)
+    while inner_port == port:
+      inner_port = utils.free_port()
     self.name = name
     self.server = server.Server(inner_port, name, workers, errors, **kwargs)
     if process:

{portal-3.7.0 → portal-3.7.2}/portal/client_socket.py

@@ -207,7 +207,7 @@ class ClientSocket:
         sock.settimeout(10)
         sock.connect(addr)
         self._log('Connection established')
-        self._send_handshake(sock)
+        sock.sendall(self.options.handshake.encode('utf-8'))
         sock.settimeout(0)
         return sock
       except TimeoutError as e:
@@ -252,11 +252,6 @@ class ClientSocket:
 
     return sock
 
-  def _send_handshake(self, sock):
-    buf = buffers.SendBuffer(self.options.handshake.encode('utf-8'))
-    while not buf.done():
-      buf.send(sock)
-
   def _log(self, *args):
     if not self.options.logging:
       return

{portal-3.7.0 → portal-3.7.2}/portal/server_socket.py

@@ -16,7 +16,7 @@ class Connection:
     self.sock = sock
     self.addr = addr
     self.recvbuf = None
-    self.handshake = False
+    self.handshake = b''
     self.sendbufs = collections.deque()
 
   def fileno(self):
@@ -44,6 +44,7 @@ class ServerSocket:
       port = int(port.rsplit(':', 1)[-1])
     self.name = name
     self.options = Options(**{**contextlib.context.serverkw, **kwargs})
+    self.handshake = self.options.handshake.encode('utf-8')
     if self.options.ipv6:
       self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
       self.sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 1)
@@ -152,7 +153,11 @@ class ServerSocket:
     if not conn.recvbuf:
       conn.recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
     try:
-      conn.recvbuf.recv(conn.sock)
+      if len(conn.handshake) < len(self.handshake):
+        self._handshake(conn)
+        return
+      else:
+        conn.recvbuf.recv(conn.sock)
     except OSError as e:
       # For example:
       # - ConnectionResetError
@@ -163,16 +168,8 @@ class ServerSocket:
       return
     if self.recvq.qsize() > self.options.max_recv_queue:
       raise RuntimeError('Too many incoming messages enqueued')
-    message = conn.recvbuf.result()
+    self.recvq.put((conn.addr, conn.recvbuf.result()))
     conn.recvbuf = None
-    if not conn.handshake:
-      if message != self.options.handshake.encode('utf-8'):
-        e = ValueError(f"Handshake '{self.options.handshake}' expected")
-        self._disconnect(conn, e)
-        return
-      conn.handshake = True
-    else:
-      self.recvq.put((conn.addr, message))
 
   def _disconnect(self, conn, e):
     detail = f'{type(e).__name__}'
@@ -189,6 +186,13 @@ class ServerSocket:
   def _numsending(self):
     return sum(len(x.sendbufs) for x in self.conns.values())
 
+  def _handshake(self, conn):
+    assert len(conn.handshake) < len(self.handshake)
+    conn.handshake += conn.sock.recv(len(self.handshake) - len(conn.handshake))
+    if conn.handshake != self.handshake[:len(conn.handshake)]:
+      msg = f"Expected handshake '{self.handshake}' got '{conn.handshake}'"
+      self._disconnect(conn, ValueError(msg))
+
   def _log(self, *args, **kwargs):
     if not self.options.logging:
       return

{portal-3.7.0 → portal-3.7.2/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.7.0
+Version: 3.7.2
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.7.0 → portal-3.7.2}/tests/test_client.py

@@ -286,6 +286,7 @@ class TestClient:
     port = portal.free_port()
     a = threading.Barrier(2)
     b = threading.Barrier(2)
+    c = threading.Barrier(2)
 
     def server():
       server = Server(port)
@@ -296,10 +297,11 @@ class TestClient:
       stats = server.stats()
       assert stats['numrecv'] == 1
       assert stats['numsend'] == stats['numrecv']
+      b.wait()
       server = Server(port)
       server.bind('fn', lambda x: x)
       server.start(block=False)
-      b.wait()
+      c.wait()
       server.close()
 
     def client():
@@ -310,9 +312,10 @@ class TestClient:
       time.sleep(0.1)
       with pytest.raises(portal.Disconnected):
         client.fn(3).result()
+      b.wait()
       client.connect()
       assert client.fn(3).result() == 3
-      b.wait()
+      c.wait()
       client.close()
 
     portal.run([