Everywhere: Merge the WebSocket service into RequestServer

This keeps the APIs separate as they are wildly different, a future
improvement could be to somehow unify the APIs (if possible).

Closes #23080.

Meta/Lagom/CMakeLists.txt

@@ -486,8 +486,6 @@ if (BUILD_LAGOM)
     # These are needed for both LibWeb and LibProtocol.
     compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestClient.ipc Userland/Services/RequestServer/RequestClientEndpoint.h)
     compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestServer.ipc Userland/Services/RequestServer/RequestServerEndpoint.h)
-    compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebSocket/WebSocketClient.ipc Userland/Services/WebSocket/WebSocketClientEndpoint.h)
-    compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebSocket/WebSocketServer.ipc Userland/Services/WebSocket/WebSocketServerEndpoint.h)
 
     if (ENABLE_LAGOM_LIBWEB)
         list(APPEND lagom_standard_libraries Web WebView)

Meta/gn/secondary/Ladybird/BUILD.gn

@@ -335,7 +335,6 @@ if (current_os != "mac") {
       "$root_out_dir/libexec/SQLServer",
       "$root_out_dir/libexec/WebContent",
       "$root_out_dir/libexec/WebDriver",
-      "$root_out_dir/libexec/WebSocket",
       "$root_out_dir/libexec/WebWorker",
       "$root_out_dir/libexec/headless-browser",
     ]

Meta/gn/secondary/Ladybird/RequestServer/BUILD.gn

@@ -15,6 +15,7 @@ executable("RequestServer") {
     "//Userland/Libraries/LibMain",
     "//Userland/Libraries/LibProtocol",
     "//Userland/Libraries/LibTLS",
+    "//Userland/Libraries/LibWebSocket",
   ]
   sources = [
     "//Userland/Services/RequestServer/ConnectionCache.cpp",

Meta/gn/secondary/Ladybird/WebSocket/BUILD.gn

@@ -1,22 +0,0 @@
-executable("WebSocket") {
-  configs += [ "//Ladybird:ladybird_config" ]
-  include_dirs = [
-    "//Userland/Libraries",
-    "//Userland/Services",
-  ]
-  deps = [
-    "//AK",
-    "//Userland/Libraries/LibCore",
-    "//Userland/Libraries/LibFileSystem",
-    "//Userland/Libraries/LibIPC",
-    "//Userland/Libraries/LibMain",
-    "//Userland/Libraries/LibProtocol",
-    "//Userland/Libraries/LibTLS",
-    "//Userland/Libraries/LibWebSocket",
-  ]
-  sources = [
-    "//Userland/Services/WebSocket/ConnectionFromClient.cpp",
-    "main.cpp",
-  ]
-  output_dir = "$root_out_dir/libexec"
-}

Meta/gn/secondary/Userland/Libraries/LibProtocol/BUILD.gn

@@ -22,28 +22,6 @@ compiled_action("RequestServerEndpoint") {
   ]
 }
 
-compiled_action("WebSocketClientEndpoint") {
-  tool = "//Meta/Lagom/Tools/CodeGenerators/IPCCompiler"
-  inputs = [ "//Userland/Services/WebSocket/WebSocketClient.ipc" ]
-  outputs = [ "$root_gen_dir/WebSocket/WebSocketClientEndpoint.h" ]
-  args = [
-    rebase_path(inputs[0], root_build_dir),
-    "-o",
-    rebase_path(outputs[0], root_build_dir),
-  ]
-}
-
-compiled_action("WebSocketServerEndpoint") {
-  tool = "//Meta/Lagom/Tools/CodeGenerators/IPCCompiler"
-  inputs = [ "//Userland/Services/WebSocket/WebSocketServer.ipc" ]
-  outputs = [ "$root_gen_dir/WebSocket/WebSocketServerEndpoint.h" ]
-  args = [
-    rebase_path(inputs[0], root_build_dir),
-    "-o",
-    rebase_path(outputs[0], root_build_dir),
-  ]
-}
-
 shared_library("LibProtocol") {
   output_name = "protocol"
   include_dirs = [
@@ -53,8 +31,6 @@ shared_library("LibProtocol") {
   deps = [
     ":RequestClientEndpoint",
     ":RequestServerEndpoint",
-    ":WebSocketClientEndpoint",
-    ":WebSocketServerEndpoint",
     "//AK",
     "//Userland/Libraries/LibCore",
     "//Userland/Libraries/LibIPC",
@@ -63,10 +39,7 @@ shared_library("LibProtocol") {
     "Request.cpp",
     "RequestClient.cpp",
     "WebSocket.cpp",
-    "WebSocketClient.cpp",
   ]
   sources += get_target_outputs(":RequestClientEndpoint") +
-             get_target_outputs(":RequestServerEndpoint") +
-             get_target_outputs(":WebSocketClientEndpoint") +
-             get_target_outputs(":WebSocketServerEndpoint")
+             get_target_outputs(":RequestServerEndpoint")
 }