Merge pull request #3 from mujin/zozo_FixLargeRequests

Allow server to receive files more than initial receive buffer size
mujin · Jun 18, 2024 · e73979b · e73979b
2 parents f1fafb8 + d20405b
commit e73979b
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/python/mujinasync/asynctcp.py b/python/mujinasync/asynctcp.py
@@ -328,8 +328,9 @@ def SpinOnce(self, timeout=0):
         socketConnections = {}
         for serverClient in self._servers + self._clients:
             for connection in serverClient._connections:
-                if connection.receiveBuffer.size < connection.receiveBuffer.capacity:
-                    rsockets.append(connection.connectionSocket)
+                if connection.receiveBuffer.size >= connection.receiveBuffer.capacity:
+                    connection.receiveBuffer.capacity *= 2
+                rsockets.append(connection.connectionSocket)
                 if connection.sendBuffer.size > 0:
                     wsockets.append(connection.connectionSocket)
                 xsockets.append(connection.connectionSocket)
@@ -366,6 +367,11 @@ def SpinOnce(self, timeout=0):
             serverClient, connection = socketConnections[rsocket]
             try:
                 received = rsocket.recv_into(connection.receiveBuffer.writeView)
+            except socket.error as e:
+                if e.errno not in (errno.EAGAIN, errno.EWOULDBLOCK):
+                    connection.closeType = 'Immediate'
+                    log.exception('error while trying to receive from connection %s: %s', connection, e)
+                continue
             except Exception as e:
                 connection.closeType = 'Immediate'
                 log.exception('error while trying to receive from connection %s: %s', connection, e)