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

Support for multiple servers

pull/1164/head
Miguel Grinberg 2 years ago
parent
e3fc32d949
commit
93c8cb32e8
Failed to extract signature
3 changed files with 49 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      examples/server/asgi/app.py
  2. 31
      src/socketio/admin.py
  3. 35
      src/socketio/async_admin.py

2
examples/server/asgi/app.py
View File

@ -2,7 +2,7 @@
# set instrument to `True` to accept connections from the official Socket.IO
# Admin UI hosted at https://admin.socket.io
instrument = True
instrument = False
admin_login = {
'username': 'admin',
'password': 'python', # change this to a strong secret for production use!

31
src/socketio/admin.py
View File

@ -56,7 +56,8 @@ class InstrumentedServer:
# start thread that emits "server_stats" every 2 seconds
self.stop_stats_event = sio.eio.create_event()
self.stats_task = None
self.stats_task = self.sio.start_background_task(
self._emit_server_stats)
def instrument(self):
self.sio.on('connect', self.admin_connect,
@ -119,6 +120,12 @@ class InstrumentedServer:
Socket._websocket_handler = functools.partialmethod(
self.__class__._eio_websocket_handler, self)
# report connected sockets with each ping
if self.mode == 'development':
Socket.__send_ping = Socket._send_ping
Socket._send_ping = functools.partialmethod(
self.__class__._eio_send_ping, self)
def uninstrument(self): # pragma: no cover
if self.mode == 'development':
self.sio.manager.connect = self.sio.manager.__connect
@ -134,6 +141,7 @@ class InstrumentedServer:
from engineio.socket import Socket
Socket.handle_post_request = Socket.__handle_post_request
Socket._websocket_handler = Socket.__websocket_handler
Socket.send_ping = Socket.__send_ping
def admin_connect(self, sid, environ, client_auth):
if self.auth:
@ -172,9 +180,6 @@ class InstrumentedServer:
namespace=self.admin_namespace)
self.sio.start_background_task(config, sid)
if self.stats_task is None:
self.stats_task = self.sio.start_background_task(
self._emit_server_stats)
def admin_emit(self, _, namespace, room_filter, event, *data):
self.sio.emit(event, data, to=room_filter, namespace=namespace)
@ -208,10 +213,6 @@ class InstrumentedServer:
serialized_socket,
datetime.utcfromtimestamp(t).isoformat() + 'Z',
), namespace=self.admin_namespace)
if serialized_socket['transport'] == 'polling': # pragma: no cover
self.sio.start_background_task(
self._check_for_upgrade, eio_sid, sid, namespace)
return sid
def _disconnect(self, sid, namespace, **kwargs):
@ -332,6 +333,20 @@ class InstrumentedServer:
ws.wait = functools.partial(_wait, ws)
return socket.__websocket_handler(ws)
def _eio_send_ping(socket, self):
eio_sid = socket.sid
t = time.time()
for namespace in self.sio.manager.get_namespaces():
sid = self.sio.manager.sid_from_eio_sid(eio_sid, namespace)
if sid:
serialized_socket = self.serialize_socket(sid, namespace,
eio_sid)
self.sio.emit('socket_connected', (
serialized_socket,
datetime.utcfromtimestamp(t).isoformat() + 'Z',
), namespace=self.admin_namespace)
return socket.__send_ping()
def _emit_server_stats(self):
start_time = time.time()
namespaces = list(self.sio.handlers.keys())

35
src/socketio/async_admin.py
View File

@ -37,7 +37,8 @@ class InstrumentedAsyncServer:
# start thread that emits "server_stats" every 2 seconds
self.stop_stats_event = sio.eio.create_event()
self.stats_task = None
self.stats_task = self.sio.start_background_task(
self._emit_server_stats)
def instrument(self):
self.sio.on('connect', self.admin_connect,
@ -88,7 +89,7 @@ class InstrumentedAsyncServer:
self.sio.eio.on('disconnect', self._handle_eio_disconnect)
# report polling packets
from engineio.asyncio_socket import AsyncSocket
from engineio.async_socket import AsyncSocket
self.sio.eio.__ok = self.sio.eio._ok
self.sio.eio._ok = self._eio_http_response
AsyncSocket.__handle_post_request = AsyncSocket.handle_post_request
@ -100,6 +101,12 @@ class InstrumentedAsyncServer:
AsyncSocket._websocket_handler = functools.partialmethod(
self.__class__._eio_websocket_handler, self)
# report connected sockets with each ping
if self.mode == 'development':
AsyncSocket.__send_ping = AsyncSocket._send_ping
AsyncSocket._send_ping = functools.partialmethod(
self.__class__._eio_send_ping, self)
def uninstrument(self): # pragma: no cover
if self.mode == 'development':
self.sio.manager.connect = self.sio.manager.__connect
@ -112,9 +119,10 @@ class InstrumentedAsyncServer:
self.sio._handle_event_internal = self.sio.__handle_event_internal
self.sio.eio._ok = self.sio.eio.__ok
from engineio.asyncio_socket import AsyncSocket
from engineio.async_socket import AsyncSocket
AsyncSocket.handle_post_request = AsyncSocket.__handle_post_request
AsyncSocket._websocket_handler = AsyncSocket.__websocket_handler
AsyncSocket.schedule_ping = AsyncSocket.__schedule_ping
async def admin_connect(self, sid, environ, client_auth):
authenticated = True
@ -157,9 +165,6 @@ class InstrumentedAsyncServer:
namespace=self.admin_namespace)
self.sio.start_background_task(config, sid)
if self.stats_task is None:
self.stats_task = self.sio.start_background_task(
self._emit_server_stats)
async def admin_emit(self, _, namespace, room_filter, event, *data):
await self.sio.emit(event, data, to=room_filter, namespace=namespace)
@ -193,10 +198,6 @@ class InstrumentedAsyncServer:
serialized_socket,
datetime.utcfromtimestamp(t).isoformat() + 'Z',
), namespace=self.admin_namespace)
if serialized_socket['transport'] == 'polling':
self.sio.start_background_task(
self._check_for_upgrade, eio_sid, sid, namespace)
return sid
async def _disconnect(self, sid, namespace, **kwargs):
@ -318,6 +319,20 @@ class InstrumentedAsyncServer:
ws.wait = functools.partial(_wait, ws)
return await socket.__websocket_handler(ws)
async def _eio_send_ping(socket, self):
eio_sid = socket.sid
t = time.time()
for namespace in self.sio.manager.get_namespaces():
sid = self.sio.manager.sid_from_eio_sid(eio_sid, namespace)
if sid:
serialized_socket = self.serialize_socket(sid, namespace,
eio_sid)
await self.sio.emit('socket_connected', (
serialized_socket,
datetime.utcfromtimestamp(t).isoformat() + 'Z',
), namespace=self.admin_namespace)
return await socket.__send_ping()
async def _emit_server_stats(self):
start_time = time.time()
namespaces = list(self.sio.handlers.keys())

Write Preview
Loading…
Cancel
Save