Replaced Regular HttpServer for Shelf

Author: DrRetro2033

lib/scripting/extras/session.dart

@@ -6,11 +6,12 @@ import 'package:reyveld/event.dart';
 import 'package:reyveld/scripting/lua.dart';
 import 'package:reyveld/scripting/sinterface.dart';
 import 'package:talker/talker.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
 
 /// This is the socket interface.
 /// This can be used from Lua to send data through the web socket,
 /// so the external client can know what the script is doing at a given time.
-class SessionInterface extends SInterface<WebSocket> {
+class SessionInterface extends SInterface<WebSocketChannel> {
   @override
   String get className => "Session";
 
@@ -49,7 +50,7 @@ This can be used to send data through the web socket, log messages, etc.""";
           } else if (lua.socket!.closeCode != null) {
             return;
           }
-          lua.socket!.add(
+          lua.socket!.sink.add(
               SocketEvent.data(data, pid: lua.getPID(state) ?? "").toString());
         }),
         LEntry(

lib/scripting/lua.dart

@@ -11,6 +11,7 @@ import 'package:reyveld/skit/skit.dart' show SKitType;
 import 'package:reyveld/uuid.dart';
 import 'package:lua_dardo_async/lua.dart';
 import 'interfaces.dart' as portal;
+import 'package:web_socket_channel/web_socket_channel.dart';
 
 typedef LuaArgs = ({List positional, Map named});
 typedef LuaResult = ({
@@ -21,7 +22,7 @@ typedef LuaResult = ({
 
 /// The main class for running lua scripts.
 class Lua {
-  final WebSocket? socket;
+  final WebSocketChannel? socket;
 
   final Set<Stopwatch> _stopwatches = {};
 

lib/security/certificate/certificate.dart

@@ -19,13 +19,18 @@ class SCertificate extends SRoot {
 
   SCertificate(super._node);
 
+  /// Returns the polices of the [SCertificate].
   List<SPolicy> get policies =>
       getChildren<SPolicy>().whereType<SPolicy>().toList();
 
+  /// Returns true if the [SCertificate] has the [SPolicyAll] policy.
   bool get completeAccess => policies.any((policy) => policy is SPolicyAll);
 
+  /// Returns the application name.
   String get appname => get("appname") ?? "Default";
 
+  /// Is the certificate authorized?
+  /// The user may authorize or deauthorize a certificate at any time.
   bool get authorized => (get("authorized") ?? "1") == "1";
   set authorized(bool value) => set("authorized", value ? "1" : "0");
 

lib/server.dart

@@ -9,11 +9,16 @@ import 'package:reyveld/scripting/lua.dart';
 import 'package:reyveld/security/authveld.dart';
 import 'package:chalkdart/chalkstrings.dart';
 import 'package:cli_spin/cli_spin.dart';
+import 'package:reyveld/uuid.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:shelf_web_socket/shelf_web_socket.dart';
 import 'package:version/version.dart';
 import 'package:reyveld/extensions.dart';
 import 'package:reyveld/extras.dart';
 import 'package:http/http.dart' as http;
+import 'package:shelf_router/shelf_router.dart';
+import 'package:shelf/shelf.dart';
+import 'package:shelf/shelf_io.dart' as io;
 
 typedef ReyveldSession = (Lua, WebSocket);
 
@@ -29,9 +34,6 @@ Future<void> runServer() async {
     exit(0);
   }
 
-  /// The reroute version is the version that this Reyveld executable is rerouting to.
-  Version rerouteVersion = await getMostRecentVersion();
-
   isRunningSpinner.success("Ready to Start!".skyBlue);
 
   File lockFile =
@@ -41,185 +43,100 @@ Future<void> runServer() async {
       CliSpin(spinner: CliSpinners.bounce).start("Starting Server...".skyBlue);
 
   await Reyveld.deleteTempFiles();
-
-  final server = await HttpServer.bind(InternetAddress.anyIPv4, 7274);
-  serverSpinner.success("Server Started!".skyBlue);
-
-  Map<String, ReyveldSession> sessions = {};
   Pool luaPool = Pool(int.parse(await Reyveld.getPerformanceOption("LUAPOOL")),
       timeout: parseDurationFromString(
           await Reyveld.getPerformanceOption("LUAPOOL_TIMEOUT")));
 
-  await for (HttpRequest request in server) {
-    try {
-      Version requestedVersion;
+  HttpServer? server;
 
-      try {
-        requestedVersion = Version.parse(request.uri.pathSegments.first);
-      } catch (e) {
-        requestedVersion = rerouteVersion;
-      }
-
-      /// Check if the requested version is the same as this program's version.
-      if (requestedVersion != Reyveld.version) {
-        /// If not, check if the requested version is running.
-        if (await isRunning(requestedVersion)) {
-          /// The requested version is running.
-          request.response.statusCode = HttpStatus.movedPermanently;
-          await request.response.close();
-          continue;
-        } else {
-          /// The requested version is not running.
-          request.response.statusCode = HttpStatus.notFound;
-          await request.response.close();
-          Reyveld.talker.error(
-              "Version not found. ${request.uri.pathSegments.firstOrNull} not found.");
-          continue;
-        }
-      }
+  final app = Router();
 
-      // Has the client requested a specific version?
-      bool definedVersion = true;
+  app.get("/authveld", (Request request) async {
+    if (!request.url.queryParameters.containsKey("ticket")) {
+      return Response.badRequest(body: "No ticket provided.");
+    }
+    return Response.ok(
+        AuthVeld.authorizePage(request.url.queryParameters["ticket"]!)
+            .codeUnits,
+        headers: {"Content-Type": "text/html"});
+  });
+
+  app.get("/heartbeat", (Request request) async {
+    Reyveld.talker
+        .verbose("Heartbeat checked at ${DateTime.now().toIso8601String()}.");
+    return Response.ok("OK".codeUnits);
+  });
+
+  app.get('/lua', webSocketHandler((webSocket, _) {
+    final id = generateUUID();
+    final lua = Lua(socket: webSocket);
+    Reyveld.printToConsole("(SID:$id) Client connected.".skyBlue);
+    Reyveld.talker.verbose("(SID:$id) Client connected.");
+    // Listen for incoming messages
+    webSocket.stream.listen((data) async {
       try {
-        Version.parse(request.uri.pathSegments.first);
-      } catch (_) {
-        definedVersion = false;
-      }
-      final requestUrl =
-          request.uri.pathSegments.sublist(definedVersion ? 1 : 0).join('/');
-
-      Reyveld.talker.verbose("Request: $requestUrl; ${request.method}");
-
-      /// If the requested version is the same as this program's version, continue as normal.
-      if (request.method == "GET") {
-        switch (requestUrl) {
-          case "authveld":
-            request.response.headers.contentType = ContentType.html;
-            if (!request.uri.queryParameters.containsKey("ticket")) {
-              request.response.statusCode = HttpStatus.badRequest;
-              await request.response.close();
-              continue;
-            }
-            request.response.add(
-                AuthVeld.authorizePage(request.uri.queryParameters["ticket"]!)
-                    .codeUnits);
-            await request.response.close();
-          case "heartbeat":
-            request.response.statusCode = HttpStatus.ok;
-            request.response.add("OK".codeUnits);
-            Reyveld.talker.verbose(
-                "Heartbeat checked at ${DateTime.now().toIso8601String()}.");
-            await request.response.close();
-          case "lua":
-
-            /// We save the client's session ID here, as once the Garbage Collector collects the request, the ID will be gone as well.
-            final id = request.session.id;
-            if (WebSocketTransformer.isUpgradeRequest(request)) {
-              final socket = await WebSocketTransformer.upgrade(request);
-              sessions[id] = (Lua(socket: socket), socket);
-              Reyveld.printToConsole('(SID:$id) Client connected.'.skyBlue);
-              Reyveld.talker.info("(SID:$id) Client connected.");
-              socket.listen((data) async {
-                try {
-                  /// Run the request and get the result.
-                  Reyveld.talker.verbose("(SID:$id) Received request.");
-                  Reyveld.talker.verbose("(SID:$id) Request:\n$data");
-                  final result = await luaPool.withResource(
-                      () async => await sessions[id]!.$1.run(data));
-                  socket.add(SocketEvent.completed(result.result,
-                          pid: result.processId ?? "")
-                      .toString());
-                  Reyveld.talker.verbose(
-                      "(SID:$id, PID:${result.processId ?? ""}) Completed request.");
-                } catch (e, st) {
-                  Reyveld.printToConsole(
-                      "There was a crash on a request, please check the log folder (${Reyveld.appDataPath}/logs) for more information."
-                          .red);
-                  socket.add(SocketEvent.error(e).toString());
-                  Reyveld.talker.error("(SID:$id)", e, st);
-                }
-              }, onDone: () {
-                Reyveld.printToConsole('(SID:$id) Client disconnected'.skyBlue);
-                Reyveld.talker.info("(SID:$id) Client disconnected.");
-                socket.close();
-                sessions.remove(id);
-                return;
-              }, cancelOnError: false);
-            } else {
-              request.response
-                ..statusCode = HttpStatus.forbidden
-                ..close();
-            }
-          case "permissions/details":
-            request.response.headers.contentType = ContentType.html;
-            request.response.add(
-                AuthVeld.getDetailsPage(request.uri.queryParameters["ticket"]!)
-                    .codeUnits);
-            await request.response.close();
-          default:
-            request.response.statusCode = HttpStatus.notFound;
-            await request.response.close();
-        }
-      } else if (request.method == "POST") {
-        switch (requestUrl) {
-          case "authorize":
-            final origin =
-                request.headers["origin"] ?? request.headers['referer'];
-            if (origin == null || origin.isEmpty) {
-              request.response.statusCode = HttpStatus.forbidden;
-              await request.response.close();
-              continue;
-            }
-            await AuthVeld.authorize(request.uri.queryParameters["ticket"]!);
-            request.response.headers.contentType = ContentType.json;
-            request.response.add(jsonEncode({"allowed": true}).codeUnits);
-            await request.response.close();
-          case "deauthorize":
-            final origin =
-                request.headers["origin"] ?? request.headers['referer'];
-            if (origin == null || origin.isEmpty) {
-              request.response.statusCode = HttpStatus.forbidden;
-              await request.response.close();
-              continue;
-            }
-            await AuthVeld.deauthorize(request.uri.queryParameters["ticket"]!);
-            request.response.headers.contentType = ContentType.json;
-            request.response.add(jsonEncode({"allowed": false}).codeUnits);
-            await request.response.close();
-          default:
-            request.response.statusCode = HttpStatus.notFound;
-            await request.response.close();
-        }
-      } else if (request.method == "OPTIONS") {
-        switch (requestUrl) {
-          case "close":
-            for (final session in sessions.entries) {
-              await session.value.$1.awaitForCompletion().then((_) async {
-                await session.value.$2
-                    .close(WebSocketStatus.goingAway, "Server closed.");
-              });
-            }
-            request.response.statusCode = HttpStatus.ok;
-            request.response.headers.contentType = ContentType.json;
-            request.response.add(jsonEncode({}).codeUnits);
-            await request.response.close();
-            await server.close();
-            await Reyveld.deleteTempFiles();
-            exit(0);
-          default:
-            request.response.statusCode = HttpStatus.notFound;
-            await request.response.close();
-        }
+        Reyveld.talker.verbose("(SID:$id) Received data:\n$data");
+        final result =
+            await luaPool.withResource(() async => await lua.run(data));
+        webSocket.sink.add(
+            SocketEvent.completed(result.result, pid: result.processId ?? "")
+                .toString());
+      } catch (e, st) {
+        Reyveld.printToConsole(
+            "There was a crash on a websocket, please check the log folder (${Reyveld.appDataPath}/logs) for more information."
+                .red);
+        webSocket.sink.add(SocketEvent.error(e).toString());
+        Reyveld.talker.error("(SID:$id)", e, st);
       }
-    } catch (e, st) {
+    }, onError: (e) {
       Reyveld.printToConsole(
           "There was a crash on a websocket, please check the log folder (${Reyveld.appDataPath}/logs) for more information."
               .red);
-      Reyveld.talker.critical("Crash Handler", e, st);
+      Reyveld.talker.error("(SID:$id)", e);
+    }, onDone: () {
+      Reyveld.printToConsole("(SID:$id) Client disconnected.".orange);
+      Reyveld.talker.verbose("(SID:$id) Client disconnected.");
+    });
+  }));
+
+  app.get("/permissions/details", (Request request) async {
+    if (!request.url.queryParameters.containsKey("ticket")) {
+      return Response.badRequest(body: "No ticket provided.");
     }
-  }
-  await lockFile.delete();
-  exit(0);
+    return Response.ok(
+        AuthVeld.getDetailsPage(request.url.queryParameters["ticket"]!)
+            .codeUnits,
+        headers: {"Content-Type": "text/html"});
+  });
+
+  app.post("/authorize", (Request request) async {
+    final origin = request.headers["origin"] ?? request.headers['referer'];
+    if (origin == null || origin.isEmpty) {
+      return Response.forbidden("No origin provided in request.");
+    }
+    await AuthVeld.authorize(origin);
+
+    return Response.ok(jsonEncode({"allowed": true}).codeUnits);
+  });
+
+  app.post("/deauthorize", (Request request) async {
+    final origin = request.headers["origin"] ?? request.headers['referer'];
+    if (origin == null || origin.isEmpty) {
+      return Response.forbidden("No origin provided in request.");
+    }
+    await AuthVeld.deauthorize(origin);
+
+    return Response.ok(jsonEncode({"allowed": true}).codeUnits);
+  });
+
+  final versionRedirect = createMiddleware(requestHandler: rerouteVersion);
+
+  final handler =
+      const Pipeline().addMiddleware(versionRedirect).addHandler(app.call);
+
+  server = await io.serve(handler, "127.0.0.1", 7274);
+
+  serverSpinner.success("Server Started!".skyBlue);
 }
 
 /// This function checks if the version of this Reyveld executable is already running.
@@ -262,3 +179,44 @@ Future<Version> getMostRecentVersion() async {
   }
   return currentVersion;
 }
+
+/// This function reroutes a request to the most recent version, or the requested version if it exists.
+///
+/// For example, if there are two versions of Reyveld running, lets say 1.0.0 and 1.0.1, and the request doesn't specify a version;
+/// then by default it will reroute to the most recent version, which is 1.0.1.
+///
+/// If the request does specify a version, then it attempt to reroute to that version, however it must be running for it to be rerouted.
+Future<Response?> rerouteVersion(Request request) async {
+  Version requestedVersion;
+  Version defaultVersion = await getMostRecentVersion();
+
+  // Has the client requested a specific version?
+  bool definedVersion = true;
+  try {
+    requestedVersion = Version.parse(request.url.pathSegments.first);
+  } catch (_) {
+    definedVersion = false;
+    requestedVersion = defaultVersion;
+  }
+
+  /// Check if the requested version is the same as this program's version.
+  if (requestedVersion != Reyveld.version) {
+    /// If not, check if the requested version is running.
+    if (await isRunning(requestedVersion)) {
+      /// The requested version is running.
+      return Response.movedPermanently(request.url);
+    } else {
+      /// The requested version is not running.
+      Reyveld.talker.error(
+          "Version not found. ${request.url.pathSegments.firstOrNull} not found.");
+      return Response.notFound(request.url);
+    }
+  }
+
+  final requestUrl =
+      request.url.pathSegments.sublist(definedVersion ? 1 : 0).join('/');
+
+  request.change(path: requestUrl);
+
+  return null;
+}