Merge pull request #18 from xconnio/detach-on-client-disconnect

Detach client on abrupt client disconnect
xconnio · May 11, 2024 · b3ba036 · b3ba036
2 parents 9ee9de3 + 9a38f53
commit b3ba036
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/src/acceptor.dart b/lib/src/acceptor.dart
@@ -15,16 +15,14 @@ class WAMPSessionAcceptor {
 
   IServerAuthenticator? _authenticator;
   late Serializer _serializer;
+  late StreamSubscription wsStreamSubscription;
 
   Future<BaseSession> accept(WebSocket ws) async {
     _serializer = getSerializer(ws.protocol);
     Acceptor acceptor = Acceptor(serializer: _serializer, authenticator: _authenticator);
 
     Completer<BaseSession> completer = Completer<BaseSession>();
 
-    // ignore: cancel_subscriptions
-    late StreamSubscription<dynamic> wsStreamSubscription;
-
     wsStreamSubscription = ws.listen((message) {
       MapEntry<Object, bool> received = acceptor.receive(message);
       ws.add(received.key);

diff --git a/lib/src/server.dart b/lib/src/server.dart
@@ -45,6 +45,9 @@ class Server {
       _router.attachClient(baseSession);
 
       _handleWebSocket(baseSession, webSocket);
+      acceptor.wsStreamSubscription.onDone(() {
+        _router.detachClient(baseSession);
+      });
     }
   }
 

diff --git a/lib/src/types.dart b/lib/src/types.dart
@@ -51,7 +51,12 @@ abstract class IBaseSession {
 }
 
 class BaseSession extends IBaseSession {
-  BaseSession(this._ws, this._wsStreamSubscription, this.sessionDetails, this._serializer);
+  BaseSession(this._ws, this._wsStreamSubscription, this.sessionDetails, this._serializer) {
+    // close cleanly on abrupt client disconnect
+    _wsStreamSubscription.onDone(() async {
+      await close();
+    });
+  }
 
   final WebSocket _ws;
   final StreamSubscription<dynamic> _wsStreamSubscription;