refactor(server): removed the websocket wrapper going wiht normal ws

database/migrations/0025_amusing_sugar_man.sql

@@ -0,0 +1,2 @@
+DROP TABLE "apiHits" CASCADE;--> statement-breakpoint
+DROP TABLE "eom" CASCADE;

database/migrations/meta/_journal.json

@@ -176,6 +176,13 @@
       "when": 1742408812383,
       "tag": "0024_curved_venom",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "7",
+      "when": 1742655504936,
+      "tag": "0025_amusing_sugar_man",
+      "breakpoints": true
     }
   ]
 }

server/index.ts

@@ -1,11 +1,11 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-import {serve} from "@hono/node-server";
-import {OpenAPIHono} from "@hono/zod-openapi";
-import {proxy} from "hono/proxy";
-import {serveStatic} from "@hono/node-server/serve-static";
-import {logger} from "hono/logger";
-import {cors} from "hono/cors";
-import {createLog} from "./services/logger/logger.js";
+import { serve } from "@hono/node-server";
+import { OpenAPIHono } from "@hono/zod-openapi";
+import { proxy } from "hono/proxy";
+import { serveStatic } from "@hono/node-server/serve-static";
+import { logger } from "hono/logger";
+import { cors } from "hono/cors";
+import { createLog } from "./services/logger/logger.js";
 
 // custom routes
 import scalar from "./services/general/route/scalar.js";
@@ -19,11 +19,9 @@ import rfid from "./services/rfid/rfidService.js";
 import printers from "./services/printers/printerService.js";
 import loggerService from "./services/logger/loggerService.js";
 import ocpService from "./services/ocp/ocpService.js";
-import {db} from "../database/dbclient.js";
-import {settings} from "../database/schema/settings.js";
-import {count, eq} from "drizzle-orm";
-import {createNodeWebSocket} from "@hono/node-ws";
-import {streamSSE} from "hono/streaming";
+import { db } from "../database/dbclient.js";
+import { settings } from "../database/schema/settings.js";
+import { count } from "drizzle-orm";
 
 // create the main prodlogin here
 const username = "lst_user";
@@ -31,12 +29,14 @@ const password = "Alpla$$Prod";
 export const lstAuth = btoa(`${username}:${password}`);
 
 // checking to make sure we have the settings intialized
-const serverIntialized = await db.select({count: count()}).from(settings);
-export const installed = serverIntialized[0].count === 0 && process.env.NODE_ENV !== "development" ? false : true;
+const serverIntialized = await db.select({ count: count() }).from(settings);
+export const installed =
+  serverIntialized[0].count === 0 && process.env.NODE_ENV !== "development"
+    ? false
+    : true;
 createLog("info", "LST", "server", `Server is installed: ${installed}`);
 
-const app = new OpenAPIHono({strict: false});
-export const {injectWebSocket, upgradeWebSocket} = createNodeWebSocket({app});
+const app = new OpenAPIHono({ strict: false });
 
 // middle ware
 app.use("*", logger());
@@ -73,39 +73,6 @@ app.doc("/api/ref", {
   },
 });
 
-app.get(
-    "/api/log",
-    // upgradeWebSocket(() => {
-    //     return {
-    //         onMessage(event, ws) {
-    //             console.log(`Message from client: ${event.data}`);
-    //             ws.send("Hello from server!");
-    //         },
-    //         onClose: () => {
-    //             console.log("Connection closed");
-    //         },
-    //     };
-    // })
-    async (c) => {
-        let id = 0;
-        let running = true;
-        return streamSSE(c, async (stream) => {
-            while (running) {
-                const message = `It is ${new Date().toISOString()}`;
-                await stream.writeSSE({
-                    data: message,
-                    event: "time-update",
-                    id: String(id++),
-                });
-                await stream.sleep(1000);
-                if (id === 5) {
-                    running = false;
-                }
-            }
-        });
-    }
-);
-
 const routes = [
   scalar,
   auth,
@@ -154,11 +121,11 @@ app.route("/ocme/", ocme);
 //---------------------------------------------------\\
 
 // the catch all api route
-app.all("/api/*", (c) => c.json({error: "API route not found"}, 404));
+app.all("/api/*", (c) => c.json({ error: "API route not found" }, 404));
 
 // front end static files
-app.use("/*", serveStatic({root: "./frontend/dist"}));
-app.use("*", serveStatic({path: "./frontend/dist/index.html"}));
+app.use("/*", serveStatic({ root: "./frontend/dist" }));
+app.use("*", serveStatic({ path: "./frontend/dist/index.html" }));
 
 // Handle app exit signals
 process.on("SIGINT", async () => {
@@ -184,18 +151,25 @@ process.on("beforeExit", async () => {
   //await closePool();
 });
 
-const port = process.env.NODE_ENV === "development" ? process.env.VITE_SERVER_PORT : process.env.PROD_PORT;
-injectWebSocket(
-    serve(
+const port =
+  process.env.NODE_ENV === "development"
+    ? process.env.VITE_SERVER_PORT
+    : process.env.PROD_PORT;
+
+serve(
   {
     fetch: app.fetch,
     port: Number(port),
     hostname: "0.0.0.0",
   },
   (info) => {
-            createLog("info", "LST", "server", `Server is running on http://${info.address}:${info.port}`);
+    createLog(
+      "info",
+      "LST",
+      "server",
+      `Server is running on http://${info.address}:${info.port}`
+    );
   }
-    )
 );
 
 export type AppRoutes = typeof appRoutes;