diff --git a/client/public/wsModule.js b/client/public/wsModule.js index 33c29f0..b70460f 100644 --- a/client/public/wsModule.js +++ b/client/public/wsModule.js @@ -28,7 +28,13 @@ import { renderChat } from "./render.js"; * @returns {{ socket: WebSocket, sendMessage: (content: string) => void }} */ export function initWebSocket(username, chatEl, inputContainer, usersListEl) { - const socket = new WebSocket("ws://localhost:8080", "coms"); + const socket = new WebSocket( + (location.protocol === "https:" ? "wss" : "ws") + + "://" + + location.host + + "/ws", + "coms", + ); socket.onopen = () => { // Announce join. diff --git a/client/server.js b/client/server.js index d385b8a..e91f15d 100644 --- a/client/server.js +++ b/client/server.js @@ -1,13 +1,19 @@ const express = require("express"); const path = require("path"); -const livereload = require("livereload"); -const connectLivereload = require("connect-livereload"); +const isDev = process.env.NODE_ENV !== "production"; +let livereload, connectLivereload; +if (isDev) { + livereload = require("livereload"); + connectLivereload = require("connect-livereload"); +} const app = express(); const PORT = 3000; -const liveReloadServer = livereload.createServer(); -liveReloadServer.watch(path.join(__dirname, "public")); -app.use(connectLivereload()); +if (isDev) { + const liveReloadServer = livereload.createServer(); + liveReloadServer.watch(path.join(__dirname, "public")); + app.use(connectLivereload()); +} app.use(express.static("public")); diff --git a/server/src/main.c b/server/src/main.c index 7ba101c..282b60b 100644 --- a/server/src/main.c +++ b/server/src/main.c @@ -2,6 +2,8 @@ #include "include/session.h" #include +#include +#include #include #include #include