- Checkpoint

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server.js

@@ -5,6 +5,8 @@ const path = require("path");
 const compression = require("compression");
 const cookieParser = require("cookie-parser");
 const http = require("http");
+const https = require("https");
+const fs = require("fs");
 const { Server } = require("socket.io");
 const { createClient } = require("redis");
 const { createAdapter } = require("@socket.io/redis-adapter");
@@ -24,28 +26,27 @@ require("dotenv").config({
  * @type {string[][]}
  */
 const SOCKETIO_CORS_ORIGIN = [
-  [
-    "https://test.imex.online",
-    "https://www.test.imex.online",
-    "http://localhost:3000",
-    "https://imex.online",
-    "https://www.imex.online",
-    "https://romeonline.io",
-    "https://www.romeonline.io",
-    "https://beta.test.romeonline.io",
-    "https://www.beta.test.romeonline.io",
-    "https://beta.romeonline.io",
-    "https://www.beta.romeonline.io",
-    "https://beta.test.imex.online",
-    "https://www.beta.test.imex.online",
-    "https://beta.imex.online",
-    "https://www.beta.imex.online",
-    "https://www.test.promanager.web-est.com",
-    "https://test.promanager.web-est.com",
-    "https://www.promanager.web-est.com",
-    "https://www.promanager.web-est.com",
-    "http://localhost:3000"
-  ]
+  "https://test.imex.online",
+  "https://www.test.imex.online",
+  "http://localhost:3000",
+  "https://imex.online",
+  "https://www.imex.online",
+  "https://romeonline.io",
+  "https://www.romeonline.io",
+  "https://beta.test.romeonline.io",
+  "https://www.beta.test.romeonline.io",
+  "https://beta.romeonline.io",
+  "https://www.beta.romeonline.io",
+  "https://beta.test.imex.online",
+  "https://www.beta.test.imex.online",
+  "https://beta.imex.online",
+  "https://www.beta.imex.online",
+  "https://www.test.promanager.web-est.com",
+  "https://test.promanager.web-est.com",
+  "https://www.promanager.web-est.com",
+  "https://www.promanager.web-est.com",
+  "http://localhost:3000",
+  "https://localhost:3000"
 ];
 
 /**
@@ -101,35 +102,49 @@ const applyRoutes = (app) => {
  * @returns {Promise<void>}
  */
 const main = async () => {
-  // Express app and server setup
   const app = express();
   const port = process.env.PORT || 5000;
-  const server = http.createServer(app);
+
+  let server;
+
+  if (process.env.NODE_ENV === "development") {
+    console.log("Setting up HTTPS for Development");
+    // In development, run HTTPS server
+    const sslKeyPath = path.resolve(__dirname, "./certs/key.pem");
+    const sslCertPath = path.resolve(__dirname, "./certs/cert.pem");
+
+    const httpsOptions = {
+      key: fs.readFileSync(sslKeyPath),
+      cert: fs.readFileSync(sslCertPath)
+    };
+
+    server = https.createServer(httpsOptions, app);
+    logger.log(`[${process.env.NODE_ENV}] HTTPS Server will run on port ${port}`, "INFO", "api");
+  } else {
+    // In production or default, use HTTP
+    server = http.createServer(app);
+    logger.log(`[${process.env.NODE_ENV}] HTTP Server will run on port ${port}`, "INFO", "api");
+  }
 
   // Redis client setup for Pub/Sub and Key-Value Store
   const pubClient = createClient({ url: process.env.REDIS_URL || "redis://localhost:6379" });
   const subClient = pubClient.duplicate();
 
-  // Add Error listeners to Redis clients
   pubClient.on("error", (err) => logger.log(`Redis pubClient error: ${err}`, "ERROR", "redis"));
   subClient.on("error", (err) => logger.log(`Redis subClient error: ${err}`, "ERROR", "redis"));
 
-  // Connect Redis clients
   try {
-    console.log("Establishing Redis Connection...");
     await Promise.all([pubClient.connect(), subClient.connect()]);
+    logger.log("Connected to Redis", "INFO", "redis");
   } catch (redisError) {
-    logger.log(`Failed to connect to Redis`, "ERROR", "redis", redisError);
+    logger.log("Failed to connect to Redis", "ERROR", "redis", redisError);
   }
 
-  // Clean up on exit
   process.on("SIGINT", async () => {
     await Promise.all([pubClient.disconnect(), subClient.disconnect()]);
     process.exit(0);
   });
 
-  // Redis Pub/Sub adapter for Socket.IO
-  // Export io and Redis client for external use
   exports.io = new Server(server, {
     path: "/ws",
     adapter: createAdapter(pubClient, subClient),
@@ -141,31 +156,20 @@ const main = async () => {
     }
   });
 
-  // Export Redis client for external use
   exports.redisClient = pubClient;
 
-  // Include the Socket IO references
   require("./server/web-sockets/web-socket");
 
-  // Middleware
   applyMiddleware(app);
-
-  // Route groupings
   applyRoutes(app);
 
   try {
     await server.listen(port);
-    logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server started on port ${port}`, "INFO", "api");
+    logger.log(`[${process.env.NODE_ENV}] Server started on port ${port}`, "INFO", "api");
   } catch (error) {
-    logger.log(
-      `[${process.env.NODE_ENV || "DEVELOPMENT"}] Server failed to start on port ${port}`,
-      "ERROR",
-      "api",
-      error
-    );
+    logger.log(`[${process.env.NODE_ENV}] Server failed to start on port ${port}`, "ERROR", "api", error);
   }
 };
 
 // Start server
-// noinspection JSIgnoredPromiseFromCall
 main();