Skip to content

Commit 005953d

Browse files
phi-fridayphi-friday
committed
fix: apply _create_packet
1 parent c86a3fd commit 005953d

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎src/socketio/async_client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ async def emit(self, event, data=None, namespace=None, callback=None):
243243
data = [data]
244244
else:
245245
data = []
246-
await self._send_packet(self.packet_class(
246+
await self._send_packet(self._create_packet(
247247
packet.EVENT, namespace=namespace, data=[event] + data, id=id))
248248

249249
async def send(self, data, namespace=None, callback=None):
@@ -325,7 +325,7 @@ async def disconnect(self):
325325
# here we just request the disconnection
326326
# later in _handle_eio_disconnect we invoke the disconnect handler
327327
for n in self.namespaces:
328-
await self._send_packet(self.packet_class(packet.DISCONNECT,
328+
await self._send_packet(self._create_packet(packet.DISCONNECT,
329329
namespace=n))
330330
await self.eio.disconnect()
331331

@@ -422,7 +422,7 @@ async def _handle_event(self, namespace, id, data):
422422
data = list(r)
423423
else:
424424
data = [r]
425-
await self._send_packet(self.packet_class(
425+
await self._send_packet(self._create_packet(
426426
packet.ACK, namespace=namespace, id=id, data=data))
427427

428428
async def _handle_ack(self, namespace, id, data):
@@ -555,7 +555,7 @@ async def _handle_eio_connect(self):
555555
self.sid = self.eio.sid
556556
real_auth = await self._get_real_value(self.connection_auth) or {}
557557
for n in self.connection_namespaces:
558-
await self._send_packet(self.packet_class(
558+
await self._send_packet(self._create_packet(
559559
packet.CONNECT, data=real_auth, namespace=n))
560560

561561
async def _handle_eio_message(self, data):
@@ -569,7 +569,7 @@ async def _handle_eio_message(self, data):
569569
else:
570570
await self._handle_ack(pkt.namespace, pkt.id, pkt.data)
571571
else:
572-
pkt = self.packet_class(encoded_packet=data)
572+
pkt = self._create_packet(encoded_packet=data)
573573
if pkt.packet_type == packet.CONNECT:
574574
await self._handle_connect(pkt.namespace, pkt.data)
575575
elif pkt.packet_type == packet.DISCONNECT:

‎src/socketio/async_server.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ async def disconnect(self, sid, namespace=None, ignore_queue=False):
425425
if delete_it:
426426
self.logger.info('Disconnecting %s [%s]', sid, namespace)
427427
eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
428-
await self._send_packet(eio_sid, self.packet_class(
428+
await self._send_packet(eio_sid, self._create_packet(
429429
packet.DISCONNECT, namespace=namespace))
430430
await self._trigger_event('disconnect', namespace, sid,
431431
self.reason.SERVER_DISCONNECT)
@@ -538,13 +538,13 @@ async def _handle_connect(self, eio_sid, namespace, data):
538538
or self.namespaces == '*' or namespace in self.namespaces:
539539
sid = await self.manager.connect(eio_sid, namespace)
540540
if sid is None:
541-
await self._send_packet(eio_sid, self.packet_class(
541+
await self._send_packet(eio_sid, self._create_packet(
542542
packet.CONNECT_ERROR, data='Unable to connect',
543543
namespace=namespace))
544544
return
545545

546546
if self.always_connect:
547-
await self._send_packet(eio_sid, self.packet_class(
547+
await self._send_packet(eio_sid, self._create_packet(
548548
packet.CONNECT, {'sid': sid}, namespace=namespace))
549549
fail_reason = exceptions.ConnectionRefusedError().error_args
550550
try:
@@ -568,15 +568,15 @@ async def _handle_connect(self, eio_sid, namespace, data):
568568
if success is False:
569569
if self.always_connect:
570570
self.manager.pre_disconnect(sid, namespace)
571-
await self._send_packet(eio_sid, self.packet_class(
571+
await self._send_packet(eio_sid, self._create_packet(
572572
packet.DISCONNECT, data=fail_reason, namespace=namespace))
573573
else:
574-
await self._send_packet(eio_sid, self.packet_class(
574+
await self._send_packet(eio_sid, self._create_packet(
575575
packet.CONNECT_ERROR, data=fail_reason,
576576
namespace=namespace))
577577
await self.manager.disconnect(sid, namespace, ignore_queue=True)
578578
elif not self.always_connect:
579-
await self._send_packet(eio_sid, self.packet_class(
579+
await self._send_packet(eio_sid, self._create_packet(
580580
packet.CONNECT, {'sid': sid}, namespace=namespace))
581581

582582
async def _handle_disconnect(self, eio_sid, namespace, reason=None):
@@ -622,7 +622,7 @@ async def _handle_event_internal(self, server, sid, eio_sid, data,
622622
data = list(r)
623623
else:
624624
data = [r]
625-
await server._send_packet(eio_sid, self.packet_class(
625+
await server._send_packet(eio_sid, self._create_packet(
626626
packet.ACK, namespace=namespace, id=id, data=data))
627627

628628
async def _handle_ack(self, eio_sid, namespace, id, data):
@@ -686,7 +686,7 @@ async def _handle_eio_message(self, eio_sid, data):
686686
await self._handle_ack(eio_sid, pkt.namespace, pkt.id,
687687
pkt.data)
688688
else:
689-
pkt = self.packet_class(encoded_packet=data)
689+
pkt = self._create_packet(encoded_packet=data)
690690
if pkt.packet_type == packet.CONNECT:
691691
await self._handle_connect(eio_sid, pkt.namespace, pkt.data)
692692
elif pkt.packet_type == packet.DISCONNECT:

‎src/socketio/client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def emit(self, event, data=None, namespace=None, callback=None):
234234
data = [data]
235235
else:
236236
data = []
237-
self._send_packet(self.packet_class(packet.EVENT, namespace=namespace,
237+
self._send_packet(self._create_packet(packet.EVENT, namespace=namespace,
238238
data=[event] + data, id=id))
239239

240240
def send(self, data, namespace=None, callback=None):
@@ -307,7 +307,7 @@ def disconnect(self):
307307
# here we just request the disconnection
308308
# later in _handle_eio_disconnect we invoke the disconnect handler
309309
for n in self.namespaces:
310-
self._send_packet(self.packet_class(
310+
self._send_packet(self._create_packet(
311311
packet.DISCONNECT, namespace=n))
312312
self.eio.disconnect()
313313

@@ -402,7 +402,7 @@ def _handle_event(self, namespace, id, data):
402402
data = list(r)
403403
else:
404404
data = [r]
405-
self._send_packet(self.packet_class(
405+
self._send_packet(self._create_packet(
406406
packet.ACK, namespace=namespace, id=id, data=data))
407407

408408
def _handle_ack(self, namespace, id, data):
@@ -506,7 +506,7 @@ def _handle_eio_connect(self):
506506
self.sid = self.eio.sid
507507
real_auth = self._get_real_value(self.connection_auth) or {}
508508
for n in self.connection_namespaces:
509-
self._send_packet(self.packet_class(
509+
self._send_packet(self._create_packet(
510510
packet.CONNECT, data=real_auth, namespace=n))
511511

512512
def _handle_eio_message(self, data):
@@ -520,7 +520,7 @@ def _handle_eio_message(self, data):
520520
else:
521521
self._handle_ack(pkt.namespace, pkt.id, pkt.data)
522522
else:
523-
pkt = self.packet_class(encoded_packet=data)
523+
pkt = self._create_packet(encoded_packet=data)
524524
if pkt.packet_type == packet.CONNECT:
525525
self._handle_connect(pkt.namespace, pkt.data)
526526
elif pkt.packet_type == packet.DISCONNECT:

‎src/socketio/server.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ def disconnect(self, sid, namespace=None, ignore_queue=False):
401401
if delete_it:
402402
self.logger.info('Disconnecting %s [%s]', sid, namespace)
403403
eio_sid = self.manager.pre_disconnect(sid, namespace=namespace)
404-
self._send_packet(eio_sid, self.packet_class(
404+
self._send_packet(eio_sid, self._create_packet(
405405
packet.DISCONNECT, namespace=namespace))
406406
self._trigger_event('disconnect', namespace, sid,
407407
self.reason.SERVER_DISCONNECT)
@@ -520,13 +520,13 @@ def _handle_connect(self, eio_sid, namespace, data):
520520
or self.namespaces == '*' or namespace in self.namespaces:
521521
sid = self.manager.connect(eio_sid, namespace)
522522
if sid is None:
523-
self._send_packet(eio_sid, self.packet_class(
523+
self._send_packet(eio_sid, self._create_packet(
524524
packet.CONNECT_ERROR, data='Unable to connect',
525525
namespace=namespace))
526526
return
527527

528528
if self.always_connect:
529-
self._send_packet(eio_sid, self.packet_class(
529+
self._send_packet(eio_sid, self._create_packet(
530530
packet.CONNECT, {'sid': sid}, namespace=namespace))
531531
fail_reason = exceptions.ConnectionRefusedError().error_args
532532
try:
@@ -550,15 +550,15 @@ def _handle_connect(self, eio_sid, namespace, data):
550550
if success is False:
551551
if self.always_connect:
552552
self.manager.pre_disconnect(sid, namespace)
553-
self._send_packet(eio_sid, self.packet_class(
553+
self._send_packet(eio_sid, self._create_packet(
554554
packet.DISCONNECT, data=fail_reason, namespace=namespace))
555555
else:
556-
self._send_packet(eio_sid, self.packet_class(
556+
self._send_packet(eio_sid, self._create_packet(
557557
packet.CONNECT_ERROR, data=fail_reason,
558558
namespace=namespace))
559559
self.manager.disconnect(sid, namespace, ignore_queue=True)
560560
elif not self.always_connect:
561-
self._send_packet(eio_sid, self.packet_class(
561+
self._send_packet(eio_sid, self._create_packet(
562562
packet.CONNECT, {'sid': sid}, namespace=namespace))
563563

564564
def _handle_disconnect(self, eio_sid, namespace, reason=None):
@@ -601,7 +601,7 @@ def _handle_event_internal(self, server, sid, eio_sid, data, namespace,
601601
data = list(r)
602602
else:
603603
data = [r]
604-
server._send_packet(eio_sid, self.packet_class(
604+
server._send_packet(eio_sid, self._create_packet(
605605
packet.ACK, namespace=namespace, id=id, data=data))
606606

607607
def _handle_ack(self, eio_sid, namespace, id, data):
@@ -650,7 +650,7 @@ def _handle_eio_message(self, eio_sid, data):
650650
else:
651651
self._handle_ack(eio_sid, pkt.namespace, pkt.id, pkt.data)
652652
else:
653-
pkt = self.packet_class(encoded_packet=data)
653+
pkt = self._create_packet(encoded_packet=data)
654654
if pkt.packet_type == packet.CONNECT:
655655
self._handle_connect(eio_sid, pkt.namespace, pkt.data)
656656
elif pkt.packet_type == packet.DISCONNECT:

0 commit comments

Comments
 (0)