v5 protocol: server unit tests

Author: miguelgrinberg

socketio/asyncio_server.py

@@ -423,15 +423,11 @@ async def _handle_connect(self, eio_sid, namespace):
                 self.manager.pre_disconnect(sid, namespace)
                 await self._send_packet(eio_sid, packet.Packet(
                     packet.DISCONNECT, data=fail_reason, namespace=namespace))
-            elif namespace != '/':
+            else:
                 await self._send_packet(eio_sid, packet.Packet(
                     packet.CONNECT_ERROR, data=fail_reason,
                     namespace=namespace))
             self.manager.disconnect(sid, namespace)
-            if namespace == '/' and \
-                    eio_sid in self.environ:  # pragma: no cover
-                del self.environ[eio_sid]
-            return fail_reason or False
         elif not self.always_connect:
             await self._send_packet(eio_sid, packet.Packet(
                 packet.CONNECT, {'sid': sid}, namespace=namespace))
@@ -440,10 +436,11 @@ async def _handle_disconnect(self, eio_sid, namespace):
         """Handle a client disconnect."""
         namespace = namespace or '/'
         sid = self.manager.sid_from_eio_sid(eio_sid, namespace)
-        if self.manager.is_connected(sid, namespace):
-            self.manager.pre_disconnect(sid, namespace=namespace)
-            await self._trigger_event('disconnect', namespace, sid)
-            self.manager.disconnect(sid, namespace)
+        if not self.manager.is_connected(sid, namespace):  # pragma: no cover
+            return
+        self.manager.pre_disconnect(sid, namespace=namespace)
+        await self._trigger_event('disconnect', namespace, sid)
+        self.manager.disconnect(sid, namespace)
 
     async def _handle_event(self, eio_sid, namespace, id, data):
         """Handle an incoming client event."""
@@ -544,7 +541,8 @@ async def _handle_eio_message(self, eio_sid, data):
 
     async def _handle_eio_disconnect(self, eio_sid):
         """Handle Engine.IO disconnect event."""
-        await self._handle_disconnect(eio_sid, '/')
+        for n in list(self.manager.get_namespaces()).copy():
+            await self._handle_disconnect(eio_sid, n)
         if eio_sid in self.environ:
             del self.environ[eio_sid]
 

socketio/base_manager.py

@@ -60,7 +60,8 @@ def is_connected(self, sid, namespace):
             pass
 
     def sid_from_eio_sid(self, eio_sid, namespace):
-        return self.rooms[namespace][None].inverse.get(eio_sid)
+        if namespace in self.rooms:
+            return self.rooms[namespace][None].inverse.get(eio_sid)
 
     def can_disconnect(self, sid, namespace):
         return self.is_connected(sid, namespace)

socketio/server.py

@@ -116,8 +116,7 @@ def __init__(self, client_manager=None, logger=False, json=None,
             self.logger = logger
         else:
             self.logger = default_logger
-            if not logging.root.handlers and \
-                    self.logger.level == logging.NOTSET:
+            if self.logger.level == logging.NOTSET:
                 if logger:
                     self.logger.setLevel(logging.INFO)
                 else:
@@ -621,15 +620,11 @@ def _handle_connect(self, eio_sid, namespace):
                 self.manager.pre_disconnect(sid, namespace)
                 self._send_packet(eio_sid, packet.Packet(
                     packet.DISCONNECT, data=fail_reason, namespace=namespace))
-            elif namespace != '/':
+            else:
                 self._send_packet(eio_sid, packet.Packet(
                     packet.CONNECT_ERROR, data=fail_reason,
                     namespace=namespace))
             self.manager.disconnect(sid, namespace)
-            if namespace == '/' and \
-                    eio_sid in self.environ:  # pragma: no cover
-                del self.environ[eio_sid]
-            return fail_reason or False
         elif not self.always_connect:
             self._send_packet(eio_sid, packet.Packet(
                 packet.CONNECT, {'sid': sid}, namespace=namespace))
@@ -638,10 +633,11 @@ def _handle_disconnect(self, eio_sid, namespace):
         """Handle a client disconnect."""
         namespace = namespace or '/'
         sid = self.manager.sid_from_eio_sid(eio_sid, namespace)
-        if self.manager.is_connected(sid, namespace):
-            self.manager.pre_disconnect(sid, namespace=namespace)
-            self._trigger_event('disconnect', namespace, sid)
-            self.manager.disconnect(sid, namespace)
+        if not self.manager.is_connected(sid, namespace):  # pragma: no cover
+            return
+        self.manager.pre_disconnect(sid, namespace=namespace)
+        self._trigger_event('disconnect', namespace, sid)
+        self.manager.disconnect(sid, namespace)
 
     def _handle_event(self, eio_sid, namespace, id, data):
         """Handle an incoming client event."""
@@ -731,7 +727,8 @@ def _handle_eio_message(self, eio_sid, data):
 
     def _handle_eio_disconnect(self, eio_sid):
         """Handle Engine.IO disconnect event."""
-        self._handle_disconnect(eio_sid, '/')
+        for n in list(self.manager.get_namespaces()).copy():
+            self._handle_disconnect(eio_sid, n)
         if eio_sid in self.environ:
             del self.environ[eio_sid]