From 60735dd4c2fc87ed863d7dbf7de361500d963dd3 Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Thu, 28 Oct 2021 00:27:09 +0100
Subject: [PATCH] Use correct binary packet types in the msgpack packet encoder
 (Fixes #811)

---
 src/socketio/msgpack_packet.py      |  2 ++
 src/socketio/packet.py              |  5 ++++-
 tests/common/test_msgpack_packet.py | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/socketio/msgpack_packet.py b/src/socketio/msgpack_packet.py
index d883b57..cb6afe8 100644
--- a/src/socketio/msgpack_packet.py
+++ b/src/socketio/msgpack_packet.py
@@ -3,6 +3,8 @@ from . import packet
 
 
 class MsgPackPacket(packet.Packet):
+    uses_binary_events = False
+
     def encode(self):
         """Encode the packet for transmission."""
         return msgpack.dumps(self._to_dict())
diff --git a/src/socketio/packet.py b/src/socketio/packet.py
index e85e58c..1830769 100644
--- a/src/socketio/packet.py
+++ b/src/socketio/packet.py
@@ -19,6 +19,7 @@ class Packet(object):
     # id: ASCII encoded, only if id is not None
     # data: JSON dump of data payload
 
+    uses_binary_events = True
     json = _json
 
     def __init__(self, packet_type=EVENT, data=None, namespace=None, id=None,
@@ -27,7 +28,9 @@ class Packet(object):
         self.data = data
         self.namespace = namespace
         self.id = id
-        if binary or (binary is None and self._data_is_binary(self.data)):
+        if self.uses_binary_events and \
+                (binary or (binary is None and self._data_is_binary(
+                    self.data))):
             if self.packet_type == EVENT:
                 self.packet_type = BINARY_EVENT
             elif self.packet_type == ACK:
diff --git a/tests/common/test_msgpack_packet.py b/tests/common/test_msgpack_packet.py
index d8049a0..4930cff 100644
--- a/tests/common/test_msgpack_packet.py
+++ b/tests/common/test_msgpack_packet.py
@@ -22,3 +22,15 @@ class TestMsgPackPacket(unittest.TestCase):
         assert p.data == p2.data
         assert p.id == p2.id
         assert p.namespace == p2.namespace
+
+    def test_encode_binary_event_packet(self):
+        p = msgpack_packet.MsgPackPacket(packet.EVENT, data={'foo': b'bar'})
+        assert p.packet_type == packet.EVENT
+        p2 = msgpack_packet.MsgPackPacket(encoded_packet=p.encode())
+        assert p2.data == {'foo': b'bar'}
+
+    def test_encode_binary_ack_packet(self):
+        p = msgpack_packet.MsgPackPacket(packet.ACK, data={'foo': b'bar'})
+        assert p.packet_type == packet.ACK
+        p2 = msgpack_packet.MsgPackPacket(encoded_packet=p.encode())
+        assert p2.data == {'foo': b'bar'}