send all websocket subprotocols if serializer not specified

Author: Mahad-10

xconn/async_client.py

@@ -12,7 +12,7 @@ class AsyncClient:
     def __init__(
         self,
         authenticator: auth.IClientAuthenticator = auth.AnonymousAuthenticator(""),
-        serializer: serializers.Serializer = serializers.JSONSerializer(),
+        serializer: serializers.Serializer = None,
         ws_config: types.WebsocketConfig = types.WebsocketConfig(),
     ):
         self._authenticator = authenticator

xconn/client.py

@@ -12,7 +12,7 @@ class Client:
     def __init__(
         self,
         authenticator: auth.IClientAuthenticator = auth.AnonymousAuthenticator(""),
-        serializer: serializers.Serializer = serializers.JSONSerializer(),
+        serializer: serializers.Serializer = None,
         config: types.TransportConfig = types.TransportConfig(),
     ):
         self._authenticator = authenticator

xconn/helpers.py

@@ -20,6 +20,9 @@
 
 SERIALIZER_TYPE_CAPNPROTO = 14
 
+WS_SUBPROTOCOLS = ["wamp.2.cbor", "wamp.2.json", "wamp.2.msgpack"]
+if _CAPNP_AVAILABLE:
+    WS_SUBPROTOCOLS.append("wamp.2.capnproto.split_payload")
 
 def get_ws_subprotocol(serializer: serializers.Serializer):
     if isinstance(serializer, serializers.JSONSerializer):

xconn/joiner.py

@@ -9,19 +9,22 @@ class WebsocketsJoiner:
     def __init__(
         self,
         authenticator: auth.IClientAuthenticator = None,
-        serializer: serializers.Serializer = serializers.JSONSerializer(),
+        serializer: serializers.Serializer = None,
         ws_config: types.WebsocketConfig = types.WebsocketConfig(),
     ):
         self._authenticator = authenticator
         self._serializer = serializer
         self._ws_config = ws_config
 
     def join(self, uri: str, realm: str) -> types.BaseSession:
-        transport = WebSocketTransport.connect(
-            uri,
-            subprotocols=[helpers.get_ws_subprotocol(serializer=self._serializer)],
-            config=self._ws_config,
-        )
+        if self._serializer is None:
+            subprotocols = helpers.WS_SUBPROTOCOLS
+        else:
+            subprotocols = [helpers.get_ws_subprotocol(serializer=self._serializer)]
+
+        transport = WebSocketTransport.connect(uri, subprotocols=subprotocols, config=self._ws_config)
+        if self._serializer is None:
+            self._serializer = helpers.get_serializer(transport.subprotocol())
 
         j: Joiner = joiner.Joiner(realm, serializer=self._serializer, authenticator=self._authenticator)
         transport.write(j.send_hello())
@@ -39,19 +42,22 @@ class AsyncWebsocketsJoiner:
     def __init__(
         self,
         authenticator: auth.IClientAuthenticator = None,
-        serializer: serializers.Serializer = serializers.JSONSerializer(),
+        serializer: serializers.Serializer = None,
         ws_config: types.WebsocketConfig = types.WebsocketConfig(),
     ):
         self._ws_config = ws_config
         self._authenticator = authenticator
         self._serializer = serializer
 
     async def join(self, uri: str, realm: str) -> types.AsyncBaseSession:
-        transport = await AsyncWebSocketTransport.connect(
-            uri,
-            subprotocols=[helpers.get_ws_subprotocol(serializer=self._serializer)],
-            config=self._ws_config,
-        )
+        if self._serializer is None:
+            subprotocols = helpers.WS_SUBPROTOCOLS
+        else:
+            subprotocols = [helpers.get_ws_subprotocol(serializer=self._serializer)]
+
+        transport = await AsyncWebSocketTransport.connect(uri, subprotocols=subprotocols, config=self._ws_config)
+        if self._serializer is None:
+            self._serializer = helpers.get_serializer(transport.subprotocol())
 
         j: Joiner = joiner.Joiner(realm, serializer=self._serializer, authenticator=self._authenticator)
         await transport.write(j.send_hello())

xconn/transports.py

@@ -304,6 +304,9 @@ def ping(self, timeout: int = 10) -> float:
         received_at = time.time() * 1000
         return received_at - created_at
 
+    def subprotocol(self):
+        return self._websocket.subprotocol
+
 
 class AsyncWebSocketTransport(IAsyncTransport):
     def __init__(self, websocket: ClientConnection):
@@ -355,3 +358,6 @@ async def ping(self, timeout: int = 10) -> float:
         await asyncio.wait_for(awaitable, timeout)
         received_at = time.time() * 1000
         return received_at - created_at
+
+    def subprotocol(self):
+        return self._websocket.subprotocol