portal 3.5.1__tar.gz → 3.7.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.5.1
+Version: 3.7.0
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -58,7 +58,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54

{portal-3.5.1 → portal-3.7.0}/README.md

@@ -45,7 +45,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54

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

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

{portal-3.5.1 → portal-3.7.0}/portal/buffers.py

@@ -17,7 +17,7 @@ class SendBuffer:
     assert all(len(x) for x in buffers)
     assert 1 <= length, length
     assert not maxsize or length <= length, (length, maxsize)
-    lenbuf = length.to_bytes(4, 'little', signed=False)
+    lenbuf = length.to_bytes(8, 'little', signed=False)
     self.buffers = [lenbuf, *buffers]
     self.remaining = collections.deque(self.buffers)
     self.pos = 0
@@ -64,10 +64,10 @@ class RecvBuffer:
 
   def recv(self, sock):
     if self.buffer is None:
-      part = sock.recv(4 - len(self.lenbuf))
+      part = sock.recv(8 - len(self.lenbuf))
       self.lenbuf += part
       size = len(part)
-      if len(self.lenbuf) == 4:
+      if len(self.lenbuf) == 8:
         length = int.from_bytes(self.lenbuf, 'little', signed=False)
         assert 1 <= length <= self.maxsize, (1, length, self.maxsize)
         # We use Numpy to allocate uninitialized memory because Python's

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

@@ -31,6 +31,7 @@ class Options:
   logging: bool = True
   logging_color: str = 'yellow'
   connect_wait: float = 0.1
+  handshake: str = 'portal_handshake'
 
 
 class ClientSocket:
@@ -205,8 +206,9 @@ class ClientSocket:
       try:
         sock.settimeout(10)
         sock.connect(addr)
-        sock.settimeout(0)
         self._log('Connection established')
+        self._send_handshake(sock)
+        sock.settimeout(0)
         return sock
       except TimeoutError as e:
         error = e
@@ -250,6 +252,11 @@ 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.5.1 → portal-3.7.0}/portal/server.py

@@ -168,3 +168,5 @@ class Server:
       # Wait until the error is delivered to the client and then raise.
       self.close(internal=True)
       raise RuntimeError(message)
+    else:
+      print(f'Error in server method: {message}')

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

@@ -16,6 +16,7 @@ class Connection:
     self.sock = sock
     self.addr = addr
     self.recvbuf = None
+    self.handshake = False
     self.sendbufs = collections.deque()
 
   def fileno(self):
@@ -32,6 +33,7 @@ class Options:
   max_send_queue: int = 4096
   logging: bool = True
   logging_color: str = 'blue'
+  handshake: str = 'portal_handshake'
 
 
 class ServerSocket:
@@ -157,11 +159,20 @@ class ServerSocket:
       # - TimeoutError: [Errno 110] Connection timed out
       self._disconnect(conn, e)
       return
-    if conn.recvbuf.done():
-      if self.recvq.qsize() > self.options.max_recv_queue:
-        raise RuntimeError('Too many incoming messages enqueued')
-      self.recvq.put((conn.addr, conn.recvbuf.result()))
-      conn.recvbuf = None
+    if not conn.recvbuf.done():
+      return
+    if self.recvq.qsize() > self.options.max_recv_queue:
+      raise RuntimeError('Too many incoming messages enqueued')
+    message = 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__}'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.5.1
+Version: 3.7.0
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner
@@ -58,7 +58,7 @@ def server():
 
 def client():
   import portal
-  client = portal.Client('localhost', 2222)
+  client = portal.Client('localhost:2222')
   future = client.add(12, 42)
   result = future.result()
   print(result)  # 54

{portal-3.5.1 → portal-3.7.0}/tests/test_socket.py

@@ -193,3 +193,14 @@ class TestSocket:
        portal.Process(server, port),
        portal.Process(client, port),
    ])
+
+  @pytest.mark.parametrize('ipv6', (False, True))
+  def test_wrong_protocol(self, ipv6):
+    port = portal.free_port()
+    server = portal.ServerSocket(port, ipv6=ipv6)
+    client = portal.ClientSocket(
+        port, ipv6=ipv6, autoconn=False, handshake='unknown_word')
+    client.connect()
+    with pytest.raises(portal.Disconnected):
+      client.recv()
+    server.close()