get subprotocol from client

xconnio · May 8, 2024 · 636ba01 · 636ba01
1 parent 92759ba
commit 636ba01
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 23 deletions.
diff --git a/lib/src/helpers.dart b/lib/src/helpers.dart
@@ -1,14 +1,17 @@
-import "package:wamp/src/wsjoiner.dart";
 import "package:wampproto/messages.dart";
 import "package:wampproto/serializers.dart";
 
+const String jsonSubProtocol = "wamp.2.json";
+const String cborSubProtocol = "wamp.2.cbor";
+const String msgpackSubProtocol = "wamp.2.msgpack";
+
 String getSubProtocol(Serializer serializer) {
   if (serializer is JSONSerializer) {
-    return WAMPSessionJoiner.jsonSubProtocol;
+    return jsonSubProtocol;
   } else if (serializer is CBORSerializer) {
-    return WAMPSessionJoiner.cborSubProtocol;
+    return cborSubProtocol;
   } else if (serializer is MsgPackSerializer) {
-    return WAMPSessionJoiner.msgpackSubProtocol;
+    return msgpackSubProtocol;
   } else {
     throw ArgumentError("invalid serializer");
   }
@@ -26,3 +29,15 @@ String wampErrorString(Error err) {
   }
   return errStr;
 }
+
+Serializer getSerializer(String? subprotocol) {
+  if (subprotocol == null || subprotocol == jsonSubProtocol) {
+    return JSONSerializer();
+  } else if (subprotocol == cborSubProtocol) {
+    return CBORSerializer();
+  } else if (subprotocol == msgpackSubProtocol) {
+    return MsgPackSerializer();
+  } else {
+    throw Exception("invalid websocket subprotocol $subprotocol");
+  }
+}
diff --git a/lib/src/server.dart b/lib/src/server.dart
@@ -2,6 +2,7 @@ import "dart:async";
 import "dart:io";
 
 import "package:wamp/exports.dart";
+import "package:wamp/src/helpers.dart";
 import "package:wamp/src/types.dart";
 import "package:wamp/src/wsacceptor.dart";
 
@@ -10,13 +11,37 @@ class Server {
 
   Router router;
 
+  List<String> supportedProtocols = [jsonSubProtocol, cborSubProtocol, msgpackSubProtocol];
+
+  String? protocolSelector(HttpRequest request) {
+    String? subprotocol = request.headers.value("Sec-WebSocket-Protocol");
+
+    if (subprotocol != null) {
+      List<String> subprotocols = subprotocol.split(",");
+
+      subprotocols = subprotocols.map((proto) => proto.trim()).toList();
+
+      for (final String sub in subprotocols) {
+        if (supportedProtocols.contains(sub)) {
+          return sub;
+        }
+      }
+    }
+
+    return null;
+  }
+
   Future<void> start(String host, int port) async {
     var server = await HttpServer.bind(host, port);
 
     await for (final request in server) {
-      var webSocket = await WebSocketTransformer.upgrade(request);
-      WAMPSessionAcceptor a = WAMPSessionAcceptor();
-      BaseSession baseSession = await a.accept(webSocket);
+      var webSocket = await WebSocketTransformer.upgrade(
+        request,
+        protocolSelector: (supportedProtocols) => protocolSelector(request),
+      );
+
+      WAMPSessionAcceptor acceptor = WAMPSessionAcceptor();
+      BaseSession baseSession = await acceptor.accept(webSocket);
       router.attachClient(baseSession);
 
       _handleWebSocket(baseSession, webSocket);

diff --git a/lib/src/wsacceptor.dart b/lib/src/wsacceptor.dart
@@ -1,37 +1,35 @@
 import "dart:async";
 import "dart:io";
 
+import "package:wamp/src/helpers.dart";
 import "package:wamp/src/types.dart";
 import "package:wampproto/acceptor.dart";
 import "package:wampproto/auth.dart";
 import "package:wampproto/serializers.dart";
 
 class WAMPSessionAcceptor {
-  WAMPSessionAcceptor({IServerAuthenticator? authenticator, Serializer? serializer}) {
-    _serializer = serializer ?? JSONSerializer();
+  WAMPSessionAcceptor({IServerAuthenticator? authenticator}) {
     _authenticator = authenticator;
   }
 
   IServerAuthenticator? _authenticator;
   late Serializer _serializer;
-  static const String jsonSubProtocol = "wamp.2.json";
-  static const String cborSubProtocol = "wamp.2.cbor";
-  static const String msgpackSubProtocol = "wamp.2.msgpack";
 
   Future<BaseSession> accept(WebSocket ws) async {
-    Acceptor a = Acceptor(serializer: _serializer, authenticator: _authenticator);
+    _serializer = getSerializer(ws.protocol);
+    Acceptor acceptor = Acceptor(serializer: _serializer, authenticator: _authenticator);
 
     Completer<BaseSession> completer = Completer<BaseSession>();
 
     late StreamSubscription<dynamic> wsStreamSubscription;
     final sessionStreamController = StreamController.broadcast();
 
     wsStreamSubscription = ws.listen((message) {
-      MapEntry<Object, bool> received = a.receive(message);
+      MapEntry<Object, bool> received = acceptor.receive(message);
       ws.add(received.key);
       if (received.value) {
         wsStreamSubscription.onData(sessionStreamController.add);
-        completer.complete(BaseSession(ws, sessionStreamController, a.getSessionDetails(), _serializer));
+        completer.complete(BaseSession(ws, sessionStreamController, acceptor.getSessionDetails(), _serializer));
         return;
       }
     });

diff --git a/lib/src/wsjoiner.dart b/lib/src/wsjoiner.dart
@@ -13,10 +13,6 @@ class WAMPSessionJoiner {
     _authenticator = authenticator;
   }
 
-  static const String jsonSubProtocol = "wamp.2.json";
-  static const String cborSubProtocol = "wamp.2.cbor";
-  static const String msgpackSubProtocol = "wamp.2.msgpack";
-
   IClientAuthenticator? _authenticator;
   late Serializer _serializer;
 

diff --git a/test/wamp_session_joiner_test.dart b/test/wamp_session_joiner_test.dart
@@ -2,7 +2,6 @@ import "dart:typed_data";
 
 import "package:test/test.dart";
 import "package:wamp/src/helpers.dart";
-import "package:wamp/src/wsjoiner.dart";
 import "package:wampproto/messages.dart";
 import "package:wampproto/serializers.dart";
 
@@ -21,17 +20,17 @@ class TestSerializer implements Serializer {
 void main() {
   test("jsonSubProtocol", () {
     var result = getSubProtocol(JSONSerializer());
-    expect(result, equals(WAMPSessionJoiner.jsonSubProtocol));
+    expect(result, equals(jsonSubProtocol));
   });
 
   test("cborSubProtocol", () {
     var result = getSubProtocol(CBORSerializer());
-    expect(result, equals(WAMPSessionJoiner.cborSubProtocol));
+    expect(result, equals(cborSubProtocol));
   });
 
   test("msgpackSubProtocol", () {
     var result = getSubProtocol(MsgPackSerializer());
-    expect(result, equals(WAMPSessionJoiner.msgpackSubProtocol));
+    expect(result, equals(msgpackSubProtocol));
   });
 
   test("invalidSerializer", () {