Merge pull request #22 from atsign-foundation/fix-socket-closed-while…

…-other-side-still-writing

fix: correctly handle situation where a socket has been closed but the other side is still writing to it

CHANGELOG.md

@@ -1,7 +1,12 @@
+## 2.3.1
+
+- fix: correctly handle situation where a socket has been closed but the other
+  side is still writing to it
+
 ## 2.3.0
 
 - feat: Add `authTimeout` property to SocketConnector. Previously this was
-- hard-coded to 5 seconds which is a bit restrictive for slow network
+  hard-coded to 5 seconds which is a bit restrictive for slow network
   connections. It now defaults to 30 seconds but may be set at time of
   construction
 - feat: added `authTimeout` parameter to `serverToServer`; this is provided

lib/src/socket_connector.dart

@@ -141,9 +141,17 @@ class SocketConnector {
           StreamController<Uint8List> sc = StreamController<Uint8List>();
           side.farSide!.sink = sc;
           Stream<List<int>> transformed = side.transformer!(sc.stream);
-          transformed.listen(side.farSide!.socket.add);
+          transformed.listen((event) {
+            try {
+              side.farSide!.socket.add(event);
+            } catch (e) {
+              _log('Failed to write to side ${side.farSide!.name} - closing',
+                  force: true);
+              _destroySide(side.farSide!);
+            }
+          });
         }
-        side.stream.listen((Uint8List data) async {
+        side.stream.listen((Uint8List data) {
           if (logTraffic) {
             final message = String.fromCharCodes(data);
             if (side.isSideA) {
@@ -154,7 +162,13 @@ class SocketConnector {
                   'B -> A : ${message.replaceAll(RegExp('[\x00-\x1F\x7F-\xFF]'), '*')}'));
             }
           }
-          side.farSide!.sink.add(data);
+          try {
+            side.farSide!.sink.add(data);
+          } catch (e) {
+            _log('Failed to write to side ${side.farSide!.name} - closing',
+                force: true);
+            _destroySide(side.farSide!);
+          }
         }, onDone: () {
           _log('stream.onDone on side ${side.name}');
           _destroySide(side);

pubspec.yaml

@@ -1,7 +1,7 @@
 name: socket_connector
 description: Package for joining sockets together to create socket relays.
 
-version: 2.3.0
+version: 2.3.1
 repository: https://github.com/cconstab/socket_connector
 
 environment: