fix

Author: CodeShellDev

src/app.js

@@ -1,6 +1,7 @@
 const express = require("express")
 const log = require("./utils/logger")
 const env = require("./env")
+const http = require("http")
 
 const app = express()
 
@@ -25,10 +26,14 @@ app.use((req, res, next) => {
 const auth = require("./auth")
 const wol = require("./wol")
 
+const wss = require("./wss")
+
 app.use("/", auth)
 
-app.use("/", wol)
+const server = http.createServer(app)
+
+wss.attach(server, app, wol)
 
-app.listen(env.ENV.port, () => {
+server.listen(env.ENV.port, () => {
 	log.logger.info(`Server running on Port ${env.ENV.port}`)
 })

src/wol.js

@@ -1,17 +1,11 @@
-const ws = require("ws")
-const http = require("http")
-const { v4: uuidv4 } = require("uuid")
 const express = require("express")
+const wss = require("./wss")
 
 const { logger } = require("./utils/logger")
 const { ENV } = require("./env")
 const fs = require("fs")
 
 const router = express.Router()
-const server = http.createServer(router)
-const wss = new ws.Server({ server })
-
-const clients = {}
 
 const CONFIG = JSON.parse(fs.readFileSync(ENV.configPath, "utf8"))
 
@@ -187,7 +181,7 @@ async function startProcessing(req, res) {
 		return res.json({ error: true, message: "No route for hostname" })
 	}
 
-	const requestId = uuidv4()
+	const requestId = wss.createRequestId()
 
 	res.json({ error: false, message: "Start request received", requestId })
 
@@ -237,7 +231,7 @@ async function startProcessing(req, res) {
 		}
 	}
 
-	const ws = clients[requestId]
+	const ws = wss.getClient(requestId)
 
 	if (ws && ws.readyState === WebSocket.OPEN) {
 		ws.send(
@@ -252,23 +246,6 @@ async function startProcessing(req, res) {
 	}
 }
 
-wss.on("connection", (ws, req) => {
-	const url = new URL(req.url)
-	const requestId = url.searchParams.get("requestId")
-
-	if (!requestId) {
-		ws.send(JSON.stringify({ error: "Missing requestId" }))
-		ws.close()
-		return
-	}
-
-	clients[requestId] = ws
-
-	ws.on("close", () => {
-		delete clients[requestId]
-	})
-})
-
-router.get("/start", async (res, req) => await startProcessing(req, res))
+router.get("/start", async (req, res) => await startProcessing(req, res))
 
 module.exports = router

src/wss.js

@@ -0,0 +1,39 @@
+const WebSocket = require("ws")
+const { v4: uuidv4 } = require("uuid")
+
+const clients = {}
+
+let wss = null
+
+function attach(server, app, router) {
+	wss = new WebSocket.Server({ server })
+
+	wss.on("connection", (socket, req) => {
+		const url = new URL(req.url)
+		const requestId = url.searchParams.get("requestId")
+
+		if (!requestId) {
+			socket.send(JSON.stringify({ error: true, message: "Missing requestId" }))
+			socket.close()
+			return
+		}
+
+		clients[requestId] = socket
+
+		socket.on("close", () => {
+			delete clients[requestId]
+		})
+	})
+
+	app.use("/", router)
+}
+
+function getClient(requestId) {
+	return clients[requestId]
+}
+
+function createRequestId() {
+	return uuidv4()
+}
+
+module.exports = { attach, getClient, createRequestId }