mirror
/
miguelgrinberg.python-socketio
mirror of https://github.com/miguelgrinberg/python-socketio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add NamespaceNotFoundError

pull/856/head
Sam Mosleh 3 years ago
parent
b78549890c
commit
f91522ecbd
3 changed files with 27 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/socketio/asyncio_server.py
  2. 3
      src/socketio/exceptions.py
  3. 19
      src/socketio/server.py

20
src/socketio/asyncio_server.py
View File

@ -377,7 +377,7 @@ class AsyncServer(server.Server):
eio_sid = self.manager.pre_disconnect(sid, namespace=namespace) eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
await self._send_packet(eio_sid, self.packet_class( await self._send_packet(eio_sid, self.packet_class(
packet.DISCONNECT, namespace=namespace)) packet.DISCONNECT, namespace=namespace))
await self._trigger_event('disconnect', namespace, sid) await self._trigger_event('disconnect', namespace, sid, safe=True)
self.manager.disconnect(sid, namespace=namespace) self.manager.disconnect(sid, namespace=namespace)
async def handle_request(self, *args, **kwargs): async def handle_request(self, *args, **kwargs):
@ -450,18 +450,20 @@ class AsyncServer(server.Server):
try: try:
if data: if data:
success = await self._trigger_event( success = await self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid], data) 'connect', namespace, sid, self.environ[eio_sid], data, safe=False)
else: else:
try: try:
success = await self._trigger_event( success = await self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid]) 'connect', namespace, sid, self.environ[eio_sid], safe=False)
except TypeError: except TypeError:
success = await self._trigger_event( success = await self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid], None) 'connect', namespace, sid, self.environ[eio_sid], None, safe=False)
except exceptions.ConnectionRefusedError as exc: except exceptions.ConnectionRefusedError as exc:
fail_reason = exc.error_args fail_reason = exc.error_args
success = False success = False
except exceptions.NamespaceNotFoundError:
fail_reason = "Namespace not found"
success = False
if success is False: if success is False:
if self.always_connect: if self.always_connect:
self.manager.pre_disconnect(sid, namespace) self.manager.pre_disconnect(sid, namespace)
@ -483,7 +485,7 @@ class AsyncServer(server.Server):
if not self.manager.is_connected(sid, namespace): # pragma: no cover if not self.manager.is_connected(sid, namespace): # pragma: no cover
return return
self.manager.pre_disconnect(sid, namespace=namespace) self.manager.pre_disconnect(sid, namespace=namespace)
await self._trigger_event('disconnect', namespace, sid) await self._trigger_event('disconnect', namespace, sid, safe=True)
self.manager.disconnect(sid, namespace) self.manager.disconnect(sid, namespace)
async def _handle_event(self, eio_sid, namespace, id, data): async def _handle_event(self, eio_sid, namespace, id, data):
@ -505,7 +507,7 @@ class AsyncServer(server.Server):
async def _handle_event_internal(self, server, sid, eio_sid, data, async def _handle_event_internal(self, server, sid, eio_sid, data,
namespace, id): namespace, id):
r = await server._trigger_event(data[0], namespace, sid, *data[1:]) r = await server._trigger_event(data[0], namespace, sid, *data[1:], safe=True)
if id is not None: if id is not None:
# send ACK packet with the response returned by the handler # send ACK packet with the response returned by the handler
# tuples are expanded as multiple arguments # tuples are expanded as multiple arguments
@ -525,7 +527,7 @@ class AsyncServer(server.Server):
self.logger.info('received ack from %s [%s]', sid, namespace) self.logger.info('received ack from %s [%s]', sid, namespace)
await self.manager.trigger_callback(sid, id, data) await self.manager.trigger_callback(sid, id, data)
async def _trigger_event(self, event, namespace, *args): async def _trigger_event(self, event, namespace, *args, safe):
"""Invoke an application event handler.""" """Invoke an application event handler."""
# first see if we have an explicit handler for the event # first see if we have an explicit handler for the event
if namespace in self.handlers: if namespace in self.handlers:
@ -550,6 +552,8 @@ class AsyncServer(server.Server):
elif namespace in self.namespace_handlers: elif namespace in self.namespace_handlers:
return await self.namespace_handlers[namespace].trigger_event( return await self.namespace_handlers[namespace].trigger_event(
event, *args) event, *args)
elif not safe:
raise exceptions.NamespaceNotFoundError(namespace, event)
async def _handle_eio_connect(self, eio_sid, environ): async def _handle_eio_connect(self, eio_sid, environ):
"""Handle the Engine.IO connection event.""" """Handle the Engine.IO connection event."""

3
src/socketio/exceptions.py
View File

@ -32,3 +32,6 @@ class TimeoutError(SocketIOError):
class BadNamespaceError(SocketIOError): class BadNamespaceError(SocketIOError):
pass pass
class NamespaceNotFoundError(SocketIOError):
pass

19
src/socketio/server.py
View File

@ -557,7 +557,7 @@ class Server(object):
eio_sid = self.manager.pre_disconnect(sid, namespace=namespace) eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
self._send_packet(eio_sid, self.packet_class( self._send_packet(eio_sid, self.packet_class(
packet.DISCONNECT, namespace=namespace)) packet.DISCONNECT, namespace=namespace))
self._trigger_event('disconnect', namespace, sid) self._trigger_event('disconnect', namespace, sid, safe=True)
self.manager.disconnect(sid, namespace=namespace) self.manager.disconnect(sid, namespace=namespace)
def transport(self, sid): def transport(self, sid):
@ -662,17 +662,20 @@ class Server(object):
try: try:
if data: if data:
success = self._trigger_event( success = self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid], data) 'connect', namespace, sid, self.environ[eio_sid], data, safe=False)
else: else:
try: try:
success = self._trigger_event( success = self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid]) 'connect', namespace, sid, self.environ[eio_sid], safe=False)
except TypeError: except TypeError:
success = self._trigger_event( success = self._trigger_event(
'connect', namespace, sid, self.environ[eio_sid], None) 'connect', namespace, sid, self.environ[eio_sid], None, safe=False)
except exceptions.ConnectionRefusedError as exc: except exceptions.ConnectionRefusedError as exc:
fail_reason = exc.error_args fail_reason = exc.error_args
success = False success = False
except exceptions.NamespaceNotFoundError:
fail_reason = "Namespace not found"
success = False
if success is False: if success is False:
if self.always_connect: if self.always_connect:
@ -695,7 +698,7 @@ class Server(object):
if not self.manager.is_connected(sid, namespace): # pragma: no cover if not self.manager.is_connected(sid, namespace): # pragma: no cover
return return
self.manager.pre_disconnect(sid, namespace=namespace) self.manager.pre_disconnect(sid, namespace=namespace)
self._trigger_event('disconnect', namespace, sid) self._trigger_event('disconnect', namespace, sid, safe=True)
self.manager.disconnect(sid, namespace) self.manager.disconnect(sid, namespace)
def _handle_event(self, eio_sid, namespace, id, data): def _handle_event(self, eio_sid, namespace, id, data):
@ -717,7 +720,7 @@ class Server(object):
def _handle_event_internal(self, server, sid, eio_sid, data, namespace, def _handle_event_internal(self, server, sid, eio_sid, data, namespace,
id): id):
r = server._trigger_event(data[0], namespace, sid, *data[1:]) r = server._trigger_event(data[0], namespace, sid, *data[1:], safe=True)
if id is not None: if id is not None:
# send ACK packet with the response returned by the handler # send ACK packet with the response returned by the handler
# tuples are expanded as multiple arguments # tuples are expanded as multiple arguments
@ -737,7 +740,7 @@ class Server(object):
self.logger.info('received ack from %s [%s]', sid, namespace) self.logger.info('received ack from %s [%s]', sid, namespace)
self.manager.trigger_callback(sid, id, data) self.manager.trigger_callback(sid, id, data)
def _trigger_event(self, event, namespace, *args): def _trigger_event(self, event, namespace, *args, safe):
"""Invoke an application event handler.""" """Invoke an application event handler."""
# first see if we have an explicit handler for the event # first see if we have an explicit handler for the event
if namespace in self.handlers: if namespace in self.handlers:
@ -751,6 +754,8 @@ class Server(object):
elif namespace in self.namespace_handlers: elif namespace in self.namespace_handlers:
return self.namespace_handlers[namespace].trigger_event( return self.namespace_handlers[namespace].trigger_event(
event, *args) event, *args)
elif not safe:
raise exceptions.NamespaceNotFoundError(namespace, event)
def _handle_eio_connect(self, eio_sid, environ): def _handle_eio_connect(self, eio_sid, environ):
"""Handle the Engine.IO connection event.""" """Handle the Engine.IO connection event."""

Write Preview
Loading…
Cancel
Save