Skip to content

send all websocket subprotocols if serializer not specified #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mahad-10 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

send all websocket subprotocols if serializer not specified #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tests/interop_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@

PROCEDURE_ADD = "io.xconn.backend.add2"

SERIALIZERS = [serializers.JSONSerializer(), serializers.CBORSerializer(), serializers.MsgPackSerializer()]
SERIALIZERS = [None, serializers.JSONSerializer(), serializers.CBORSerializer(), serializers.MsgPackSerializer()]
AUTHENTICATORS = [
None,
auth.AnonymousAuthenticator(""),
auth.TicketAuthenticator("ticket-user", "ticket-pass", {}),
auth.WAMPCRAAuthenticator("wamp-cra-user", "cra-secret", {}),
Expand Down
2 changes: 1 addition & 1 deletion xconn/async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xconn/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions xconn/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

SERIALIZER_TYPE_CAPNPROTO = 14

WS_SUBPROTOCOLS = [CBOR_SUBPROTOCOL, MSGPACK_SUBPROTOCOL, JSON_SUBPROTOCOL]
if _CAPNP_AVAILABLE:
WS_SUBPROTOCOLS.append(CAPNPROTO_SUBPROTOCOL)

def get_ws_subprotocol(serializer: serializers.Serializer):
if isinstance(serializer, serializers.JSONSerializer):
Expand Down
38 changes: 22 additions & 16 deletions xconn/joiner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())
Expand All @@ -69,11 +75,11 @@ class RawSocketJoiner:
def __init__(
self,
authenticator: auth.IClientAuthenticator = None,
serializer: serializers.Serializer = serializers.JSONSerializer(),
serializer: serializers.Serializer = serializers.CBORSerializer(),
config: types.TransportConfig = types.TransportConfig(),
):
self._authenticator = authenticator
self._serializer = serializer
self._serializer = serializer if serializer is not None else serializers.CBORSerializer()
self._config = config

def join(self, uri: str, realm: str) -> types.BaseSession:
Expand All @@ -95,11 +101,11 @@ class AsyncRawSocketJoiner:
def __init__(
self,
authenticator: auth.IClientAuthenticator = None,
serializer: serializers.Serializer = serializers.JSONSerializer(),
serializer: serializers.Serializer = serializers.CBORSerializer(),
config: types.TransportConfig = types.TransportConfig(),
):
self._authenticator = authenticator
self._serializer = serializer
self._serializer = serializer if serializer is not None else serializers.CBORSerializer()
self._config = config

async def join(self, uri: str, realm: str) -> types.AsyncBaseSession:
Expand Down
6 changes: 6 additions & 0 deletions xconn/transports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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