Improve server with security context, improve scheme

Author: CodeDoctorDE

api/lib/connection.dart

@@ -171,6 +171,9 @@ class SwampConnection extends NetworkerPipe<Uint8List, RpcNetworkerPacket>
         scheme: scheme.substring(kSwampSchemePrefix.length),
       );
     }
+    if (!address.hasScheme) {
+      address = address.replace(scheme: 'wss');
+    }
     final channel =
         _channel = WebSocketChannel.connect(address, protocols: ['swamp-0']);
     channel.stream.listen(

server/bin/swamp.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:consoler/consoler.dart';
 import 'package:swamp/server.dart';
 
 final welcomeMessage = """
@@ -21,8 +22,25 @@ Future<void> main(List<String> args) async {
 
   // For running in containers, we respect the PORT environment variable.
   final port = int.parse(Platform.environment['PORT'] ?? '8080');
-  final server = SwampServer(ip, port);
+  SecurityContext? securityContext;
+  try {
+    final privateKey = await File('certs/server.key').readAsBytes();
+    final certificate = await File('certs/server.crt').readAsBytes();
+    securityContext =
+        SecurityContext()
+          ..usePrivateKeyBytes(privateKey)
+          ..useCertificateChainBytes(certificate);
+  } on PathNotFoundException catch (_) {}
+  final server = SwampServer(ip, port, securityContext: securityContext);
   server.log(welcomeMessage);
+  if (securityContext != null) {
+    server.log('Certificates found, using secure connection', LogLevel.info);
+  } else {
+    server.log(
+      'No certificates found, using insecure connection',
+      LogLevel.warning,
+    );
+  }
   await server.init();
   server.log('Server listening on port ${server.port}');
 }

server/lib/server.dart

@@ -24,6 +24,7 @@ class SwampServer extends NetworkerSocketServer {
     super.port, {
     bool withConsole = true,
     LogLevel? minLogLevel,
+    super.securityContext,
   }) {
     connect(_rpcPipe..connect(_roomManager));
 

server/lib/src/programs/room.dart

@@ -1,3 +1,5 @@
+import 'dart:typed_data';
+
 import 'package:consoler/consoler.dart';
 import 'package:swamp/room.dart';
 import 'package:swamp_api/models.dart';
@@ -19,7 +21,13 @@ class RoomProgram extends ConsoleProgram {
       print("Usage: room ${getUsage()}");
       return;
     }
-    final roomId = decodeRoomCode(args[0]);
+    Uint8List roomId;
+    try {
+      roomId = decodeRoomCode(args[0]);
+    } on FormatException {
+      print("Invalid room code");
+      return;
+    }
     final room = roomManager.getRoom(roomId);
     if (room == null) {
       print("Room not found");