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

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+
+  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.formatOnSave": true
+  },
+  "[javascriptreact]": {
+    "editor.formatOnSave": true
+  },
+  "[typescript]": {
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.formatOnSave": true
+  },
+  "[json]": {
+    "editor.formatOnSave": true
+  },
+  "[graphql]": {
+    "editor.formatOnSave": true
+  },
+  "[handlebars]": {
+    "editor.formatOnSave": true
+  }
+}

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
     }
   ]
 }

package.json

@@ -1,81 +1,80 @@
 {
-    "name": "lstv2",
-    "version": "2.8.0",
-    "type": "module",
-    "scripts": {
-        "dev": "concurrently -n \"server,frontend\" -c \"#007755,#2f6da3\" \"npm run dev:server\" \"cd frontend && npm run dev\"",
-        "dev:server": "dotenvx run -f .env -- tsx watch server/index.ts",
-        "dev:frontend": "cd frontend && npm run dev",
-        "dev:dbgen": " drizzle-kit generate --config=drizzle-dev.config.ts",
-        "dev:dbmigrate": " drizzle-kit migrate --config=drizzle-dev.config.ts",
-        "build": "npm run build:server && npm run build:frontend",
-        "build:server": "rimraf build && tsc --build && xcopy server\\scripts dist\\server\\scripts /E /I /Y && xcopy server\\services\\server\\utils\\serverData.json dist\\server\\services\\server\\utils /E /I /Y ",
-        "build:frontend": "cd frontend && npm run build",
-        "start": "set NODE_ENV=production && npm run start:server",
-        "start:server": "dotenvx run -f .env -- node dist/server/index.js",
-        "db:generate": "npx drizzle-kit generate",
-        "db:migrate": "npx drizzle-kit push",
-        "db:dev": "npm run build && npm run db:generate && npm run db:migrate",
-        "deploy": "standard-version --conventional-commits && npm run prodBuild",
-        "zipServer": "dotenvx run -f .env -- tsx server/scripts/zipUpBuild.ts \"C:\\Users\\matthes01\\Documents\\lstv2\"",
-        "v1Build": "cd C:\\Users\\matthes01\\Documents\\logisticsSupportTool && npm run oldBuilder",
-        "prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\" && npm run zipServer",
-        "commit": "cz",
-        "prodinstall": "npm i --omit=dev && npm run db:migrate",
-        "checkupdates": "npx npm-check-updates"
-    },
-    "dependencies": {
-        "@dotenvx/dotenvx": "^1.39.0",
-        "@hono/node-server": "^1.14.0",
-        "@hono/node-ws": "^1.1.0",
-        "@hono/zod-openapi": "^0.19.2",
-        "@scalar/hono-api-reference": "^0.7.2",
-        "@types/jsonwebtoken": "^9.0.9",
-        "@types/ws": "^8.18.0",
-        "adm-zip": "^0.5.16",
-        "axios": "^1.8.4",
-        "bcrypt": "^5.1.1",
-        "compression": "^1.8.0",
-        "cookie": "^1.0.2",
-        "date-fns": "^4.1.0",
-        "dotenv": "^16.4.7",
-        "drizzle-kit": "^0.30.5",
-        "drizzle-orm": "^0.41.0",
-        "drizzle-zod": "^0.7.0",
-        "fast-xml-parser": "^5.0.9",
-        "jsonwebtoken": "^9.0.2",
-        "mssql": "^11.0.1",
-        "nodemailer": "^6.10.0",
-        "nodemailer-express-handlebars": "^7.0.0",
-        "pg": "^8.14.1",
-        "pino": "^9.6.0",
-        "pino-abstract-transport": "^2.0.0",
-        "pino-pretty": "^13.0.0",
-        "postgres": "^3.4.5",
-        "zod": "^3.24.2"
-    },
-    "devDependencies": {
-        "@types/adm-zip": "^0.5.7",
-        "@types/bcrypt": "^5.0.2",
-        "@types/js-cookie": "^3.0.6",
-        "@types/mssql": "^9.1.7",
-        "@types/node": "^22.13.11",
-        "@types/pg": "^8.11.11",
-        "concurrently": "^9.1.2",
-        "cz-conventional-changelog": "^3.3.0",
-        "dotenv": "^16.4.7",
-        "rimraf": "^6.0.1",
-        "standard-version": "^9.5.0",
-        "tsx": "^4.19.3",
-        "typescript": "~5.8.2"
-    },
-    "config": {
-        "commitizen": {
-            "path": "./node_modules/cz-conventional-changelog"
-        }
-    },
-    "admConfig": {
-        "build": 47,
-        "oldBuild": "backend-0.1.3.zip"
+  "name": "lstv2",
+  "version": "2.8.0",
+  "type": "module",
+  "scripts": {
+    "dev": "concurrently -n \"server,frontend\" -c \"#007755,#2f6da3\" \"npm run dev:server\" \"cd frontend && npm run dev\"",
+    "dev:server": "dotenvx run -f .env -- tsx watch server/index.ts",
+    "dev:frontend": "cd frontend && npm run dev",
+    "dev:dbgen": " drizzle-kit generate --config=drizzle-dev.config.ts",
+    "dev:dbmigrate": " drizzle-kit migrate --config=drizzle-dev.config.ts",
+    "build": "npm run build:server && npm run build:frontend",
+    "build:server": "rimraf dist && tsc --build && npm run copy:scripts",
+    "build:frontend": "cd frontend && npm run build",
+    "copy:scripts": "tsx server/scripts/copyScripts.ts",
+    "copy:servers": "xcopy server\\services\\server\\utils\\serverData.json dist\\server\\services\\server\\utils /E /I /Y",
+    "start": "set NODE_ENV=production && npm run start:server",
+    "start:server": "dotenvx run -f .env -- node dist/server/index.js",
+    "db:generate": "npx drizzle-kit generate",
+    "db:migrate": "npx drizzle-kit push",
+    "db:dev": "npm run build && npm run db:generate && npm run db:migrate",
+    "deploy": "standard-version --conventional-commits && npm run prodBuild",
+    "zipServer": "dotenvx run -f .env -- tsx server/scripts/zipUpBuild.ts \"C:\\Users\\matthes01\\Documents\\lstv2\"",
+    "v1Build": "cd C:\\Users\\matthes01\\Documents\\logisticsSupportTool && npm run oldBuilder",
+    "prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\" && npm run zipServer",
+    "commit": "cz",
+    "prodinstall": "npm i --omit=dev && npm run db:migrate",
+    "checkupdates": "npx npm-check-updates"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "admConfig": {
+    "build": 47,
+    "oldBuild": "backend-0.1.3.zip"
+  },
+  "devDependencies": {
+    "@types/adm-zip": "^0.5.7",
+    "@types/bcrypt": "^5.0.2",
+    "@types/fs-extra": "^11.0.4",
+    "@types/js-cookie": "^3.0.6",
+    "@types/mssql": "^9.1.7",
+    "@types/node": "^22.13.11",
+    "@types/pg": "^8.11.11",
+    "@types/ws": "^8.18.0",
+    "concurrently": "^9.1.2",
+    "cz-conventional-changelog": "^3.3.0",
+    "drizzle-kit": "^0.30.5",
+    "fs-extra": "^11.3.0",
+    "standard-version": "^9.5.0",
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.2"
+  },
+  "dependencies": {
+    "@dotenvx/dotenvx": "^1.39.0",
+    "@hono/node-server": "^1.14.0",
+    "@hono/zod-openapi": "^0.19.2",
+    "@scalar/hono-api-reference": "^0.7.2",
+    "@types/jsonwebtoken": "^9.0.9",
+    "adm-zip": "^0.5.16",
+    "axios": "^1.8.4",
+    "bcryptjs": "^3.0.2",
+    "date-fns": "^4.1.0",
+    "drizzle-orm": "^0.41.0",
+    "drizzle-zod": "^0.7.0",
+    "fast-xml-parser": "^5.0.9",
+    "jsonwebtoken": "^9.0.2",
+    "mssql": "^11.0.1",
+    "nodemailer": "^6.10.0",
+    "nodemailer-express-handlebars": "^7.0.0",
+    "pg": "^8.14.1",
+    "pino": "^9.6.0",
+    "pino-abstract-transport": "^2.0.0",
+    "pino-pretty": "^13.0.0",
+    "postgres": "^3.4.5",
+    "rimraf": "^6.0.1",
+    "zod": "^3.24.2"
+  }
 }

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,97 +29,66 @@ 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());
 app.use(
-    "*",
-    cors({
-        origin: "*", // Allow all origins
-        allowHeaders: ["Content-Type", "Authorization", "X-Requested-With"],
-        allowMethods: ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"],
-        //exposeHeaders: ["Content-Length", "X-Kuma-Revision"],
-        credentials: true, // Allow credentials if needed
-        maxAge: 600,
-    })
+  "*",
+  cors({
+    origin: "*", // Allow all origins
+    allowHeaders: ["Content-Type", "Authorization", "X-Requested-With"],
+    allowMethods: ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"],
+    //exposeHeaders: ["Content-Length", "X-Kuma-Revision"],
+    credentials: true, // Allow credentials if needed
+    maxAge: 600,
+  })
 );
 
 // Middleware to normalize route case
 app.use("*", async (c, next) => {
-    const lowercasedUrl = c.req.url.toLowerCase();
-    //console.log("Incoming Request:", c.req.url, c.req.method);
-    // If the URL is already lowercase, continue as usual
-    if (c.req.url === lowercasedUrl) {
-        return next();
-    }
+  const lowercasedUrl = c.req.url.toLowerCase();
+  //console.log("Incoming Request:", c.req.url, c.req.method);
+  // If the URL is already lowercase, continue as usual
+  if (c.req.url === lowercasedUrl) {
+    return next();
+  }
 
-    // Otherwise, re-route internally
-    return c.redirect(lowercasedUrl, 308); // 308 preserves the HTTP method
+  // Otherwise, re-route internally
+  return c.redirect(lowercasedUrl, 308); // 308 preserves the HTTP method
 });
 
 app.doc("/api/ref", {
-    openapi: "3.0.0",
-    info: {
-        version: "2.0.0",
-        title: "LST API",
-    },
+  openapi: "3.0.0",
+  info: {
+    version: "2.0.0",
+    title: "LST API",
+  },
 });
 
-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,
-    // apiHits,
-    system,
-    tcpServer,
-    sqlService,
-    logistics,
-    rfid,
-    printers,
-    loggerService,
-    ocpService,
+  scalar,
+  auth,
+  // apiHits,
+  system,
+  tcpServer,
+  sqlService,
+  logistics,
+  rfid,
+  printers,
+  loggerService,
+  ocpService,
 ] as const;
 
 const appRoutes = routes.forEach((route) => {
-    app.route("/api/", route);
+  app.route("/api/", route);
 });
 
 app.route("/ocme/", ocme);
@@ -154,48 +121,55 @@ 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 () => {
-    console.log("\nGracefully shutting down...");
-    //await closePool();
-    process.exit(0);
+  console.log("\nGracefully shutting down...");
+  //await closePool();
+  process.exit(0);
 });
 
 process.on("SIGTERM", async () => {
-    console.log("Received termination signal, closing database...");
-    //await closePool();
-    process.exit(0);
+  console.log("Received termination signal, closing database...");
+  //await closePool();
+  process.exit(0);
 });
 
 process.on("uncaughtException", async (err) => {
-    console.log("Uncaught Exception:", err);
-    //await closePool();
-    process.exit(1);
+  console.log("Uncaught Exception:", err);
+  //await closePool();
+  process.exit(1);
 });
 
 process.on("beforeExit", async () => {
-    console.log("Process is about to exit...");
-    //await closePool();
+  console.log("Process is about to exit...");
+  //await closePool();
 });
 
-const port = process.env.NODE_ENV === "development" ? process.env.VITE_SERVER_PORT : process.env.PROD_PORT;
-injectWebSocket(
-    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}`);
-        }
-    )
+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}`
+    );
+  }
 );
 
 export type AppRoutes = typeof appRoutes;

server/scripts/copyScripts.ts

@@ -0,0 +1,65 @@
+import fs from "fs-extra";
+import path from "path";
+import { fileURLToPath } from "url";
+
+// Get the current directory of the module
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const sourceDir = path.join(__dirname, "/");
+const destDir = path.join("./", "dist", "server", "scripts");
+
+// Copy only .ps1 files
+fs.readdir(sourceDir)
+  .then((files) => {
+    files.forEach((file) => {
+      if (path.extname(file) === ".ps1") {
+        const sourceFile = path.join(sourceDir, file);
+        const destFile = path.join(destDir, file);
+
+        // Copy each .ps1 file
+        fs.copy(sourceFile, destFile)
+          .then(() => {
+            console.log(`Copied: ${file}`);
+          })
+          .catch((err) => {
+            console.error(`Error copying file: ${file}`, err);
+          });
+      }
+    });
+  })
+  .catch((err) => {
+    console.error("Error reading source directory:", err);
+  });
+
+// Paths for source and destination of serverData.json
+const sourceFile = path.join(
+  "./",
+  "server",
+  "services",
+  "server",
+  "utils",
+  "serverData.json"
+);
+const serverDataDest = path.join(
+  "./",
+  "dist",
+  "server",
+  "services",
+  "server",
+  "utils"
+);
+const destFile = path.join(serverDataDest, "serverData.json");
+
+// Ensure the destination directory exists
+fs.ensureDir(destDir)
+  .then(() => {
+    // Copy the serverData.json file
+    return fs.copy(sourceFile, destFile);
+  })
+  .then(() => {
+    console.log("serverData.json copied successfully!");
+  })
+  .catch((err) => {
+    console.error("Error copying serverData.json:", err);
+  });

server/scripts/install.md

@@ -1,37 +1,56 @@
 # Install
+
 ## Files needed to be downloaded before install.
+
 ### To run the server
-* [PostgresSQL](https://www.postgresql.org/download/windows/) - current version using is 17
-* [NodeJS](https://nodejs.org)
-* [NSSM](https://nssm.cc/)
+
+- [PostgresSQL](https://www.postgresql.org/download/windows/) - current version using is 17
+- [NodeJS](https://nodejs.org)
+- [NSSM](https://nssm.cc/)
+
 ### To manage the server
-* [VSCODE](https://code.visualstudio.com/)
-* [Postman](https://www.postman.com/downloads/)
+
+- [VSCODE](https://code.visualstudio.com/)
+- [Postman](https://www.postman.com/downloads/)
 
 ## Creating directories needed
-* Create a new folder where we will host the server files.
-    * Copy the nssm.exe into this folder
-* Copy the build files to the server (only needed for intial install).
-    * This will house all the compiles and minified files needed to start the server up, this includes the frontend.
-* Save the nssm.exe into this folder as well, this will be used to control the service.
+
+- Create a new folder where we will host the server files.
+  - Copy the nssm.exe into this folder
+- Copy the build files to the server (only needed for intial install).
+  - This will house all the compiles and minified files needed to start the server up, this includes the frontend.
+- Save the nssm.exe into this folder as well, this will be used to control the service.
 
 ## Do the intial install
+
 ### DB instal setup
+
 1. Install postgres
 2. Open pgAdmin
 3. create a new Database named lst_db
 
 ### Intial server setup
+
 1. Open VSCode and navigate to the folder where you extracted the files.
 2. Click trusted when it pops up.
 3. Open a terminal window inside vscode.
 4. Run the install script this will install all dependaceys needed as well as do all the database migrations
+
 ```bash
-npm run prodinstall  
+npm run prodinstall
 ```
+
+Next we want to do an intial build for the db
+
+```bash
+npm run build
+```
+
 ### Create the .env file
+
 In the root of the folder create a new .env file
 add in the below and change each setting area that says change me to something that suits your needs
+
 ```env
 # PORTS
 # To keep it all simple we will pass VITE to the ports that are used on both sides.
@@ -39,7 +58,9 @@ VITE_SERVER_PORT=4400
 
 # logLevel
 LOG_LEVEL=debug
-
+PROD_PORT=4000
+# DUE to lstv1 we need 3000
+SEC_PORT=3000
 # Auth stuff
 SALTING=12
 SECRET=CHANGEME
@@ -47,7 +68,7 @@ JWT_SECRET=CHANGEME
 JWT_REFRESH_SECRET=CHANGEME
 
 # Expire info plus refresh change as needed
-JWT_EXPIRES=60 
+JWT_EXPIRES=60
 JWT_REFRESH_THRESHOLD=30
 JWT_ACCESS_EXPIRATION="1h"
 JWT_REFRESH_EXPIRATION="7d"
@@ -64,62 +85,80 @@ MAXLOTS=3
 ```
 
 ### Run the start command to get all the basic settings and modules installed
+
 1. Run the below
+
 ```bash
 npm start
 ```
+
 This command will start up the server and seed the database.
-* Settings will be set here.
-* All modules will be added.
+
+- Settings will be set here.
+- All modules will be added.
 
 2. Press CTRL + C to stop the server.
 3. Reopen postgres and review the settings make the changes to match the server your going to be running in.
-    * Change the server
-    * change the dbServer
-    * change plantToken
-    * then the remaining settings confirm if you need on or want to leave as default.
+   - Change the server
+   - change the dbServer
+   - change plantToken
+   - then the remaining settings confirm if you need on or want to leave as default.
 
 ### Creating first user.
+
 1. Start the server back up.
+
 ```bash
 npm start
 ```
+
 2. Open http://[SERVER]:[PORT]/api/docs or postman and create a user.
-    * Please do not try to manually enter a new user this is due to how the password is hashed, as well as setting systemAdmin for the first user.
-    * Change the server and port to what you changed in the DB.
+   - Please do not try to manually enter a new user this is due to how the password is hashed, as well as setting systemAdmin for the first user.
+   - Change the server and port to what you changed in the DB.
 3. Stop the server again with CTRL + C.
 
 ### Running as a serivice.
+
 You want to CD into the scripts folder.
+
 ```bash
 cd .\dist\server\scripts\
 ```
+
 Next use the example command below to get the service up and running.
-* Options legend
-    * serviceName = not recommended to change to reduce issues with the update process
-    * option = use install for the install, but you can use this script later to stop, start, restart the service.
-    * appPath = where did you extract the server files
-    * description = no need to change this unless you want it to be something else
-    * command = do not change this unless you know what your doing and really need to change this.
+
+- Options legend
+  - serviceName = not recommended to change to reduce issues with the update process
+  - option = use install for the install, but you can use this script later to stop, start, restart the service.
+  - appPath = where did you extract the server files
+  - description = no need to change this unless you want it to be something else
+  - command = do not change this unless you know what your doing and really need to change this.
+
 ```powershell
 .\services.ps1 -serviceName "LSTV2" -option "install" -appPath "E:\LST\lstV2" -description "Logistics Support Tool V2" -command "run start"
 ```
 
 # Migrating From V1 to V2
+
 ## User migration
+
 1. Open the sqlite db and export to sql the users table
 2. OPen the sql in notepad++ or your editor of choice and change the query to be similar to below.
-    * we only need to have save the username, role, email, password
+   - we only need to have save the username, role, email, password
 
 An example new query will look like
-* Below is how it looks when exported from sqlite
+
+- Below is how it looks when exported from sqlite
+
 ```sql
 INSERT INTO "User" ("id", "username", "email", "role", "password", "passwordToken", "tokenExpire", "active", "pinCode", "lastLogin", "add_user", "add_date", "upd_user", "upd_date") VALUES
 (1, 'matthes01', 'blake.matthes@alpla.com', 'admin', 'JDJiJDEMUJEdGtL', NULL, NULL, '1', NULL, '1721075647687', 'LST_System', '1721075647687', 'LST_System', '1721075647687');
 ```
 
 The way we want to put recreate the query to work with the new db
-* Below example 
+
+- Below example
+
 ```sql
 INSERT INTO "users" ("username", "email", "role", "password") VALUES
 ('matthes01','blake.matthes@alpla.com','admin','JDJiJDE1FuNFpkYlk4NGdHUXpEMzlHR1BD'),
@@ -127,11 +166,12 @@ INSERT INTO "users" ("username", "email", "role", "password") VALUES
 ('brandon001','brandon.harry@alpla.com','manager','wdm1RSXJlZnJDYTZP');
 ;
 ```
-* You could have many users and just add like above with the identical info from the db
 
+- You could have many users and just add like above with the identical info from the db
 
 ## Running v1 along Side V2 for the interm
-* change v2 prod port to 4000 in the env and db
-* change v1 env to 4400 in the env. and in the db you will need to change the auth server to 4000 and the serverPort to 4400
 
-This will change so that v2 is the main server now, this is needed for ocme mainly.
+- change v2 prod port to 4000 in the env and db
+- change v1 env to 4400 in the env. and in the db you will need to change the auth server to 4000 and the serverPort to 4400
+
+This will change so that v2 is the main server now, this is needed for ocme mainly.

server/services/auth/utils/checkPassword.ts

@@ -1,16 +1,18 @@
-import bcrypt from "bcrypt";
+import bcrypt from "bcryptjs";
+export const checkPassword = async (
+  currentPassword: string,
+  dbPassword: string
+) => {
+  let decyptPass = "";
+  try {
+    decyptPass = atob(dbPassword);
+  } catch (error) {
+    console.log(error);
+  }
+  // encypt password
+  const pass: string | undefined = process.env.SECRET;
 
-export const checkPassword = async (currentPassword: string, dbPassword: string) => {
-    let decyptPass = "";
-    try {
-        decyptPass = atob(dbPassword);
-    } catch (error) {
-        console.log(error);
-    }
-    // encypt password
-    const pass: string | undefined = process.env.SECRET;
+  const checked = bcrypt.compareSync(pass + currentPassword, decyptPass);
 
-    const checked = bcrypt.compareSync(pass + currentPassword, decyptPass);
-
-    return checked;
+  return checked;
 };

server/services/auth/utils/createPassword.ts

@@ -1,17 +1,17 @@
-import bcrypt from "bcrypt";
+import bcrypt from "bcryptjs";
 
 export const createPassword = async (password: string) => {
-    // encypt password
-    let pass: string | undefined = process.env.SECRET;
-    let salt: string | undefined = process.env.SALTING;
+  // encypt password
+  let pass: string | undefined = process.env.SECRET;
+  let salt: string | undefined = process.env.SALTING;
 
-    if (!pass || !salt) {
-        pass = "error";
-    } else {
-        pass = bcrypt.hashSync(pass + password, parseInt(salt));
+  if (!pass || !salt) {
+    pass = "error";
+  } else {
+    pass = bcrypt.hashSync(pass + password, parseInt(salt));
 
-        pass = btoa(pass);
-    }
+    pass = btoa(pass);
+  }
 
-    return pass;
+  return pass;
 };

tsconfig.json

@@ -1,20 +1,20 @@
 {
-    "compilerOptions": {
-        "target": "ESNext",
-        "module": "NodeNext",
-        "moduleResolution": "nodenext",
-        "strict": true,
-        "verbatimModuleSyntax": true,
-        "skipLibCheck": true,
-        "types": ["node"],
-        "jsx": "react-jsx",
-        "jsxImportSource": "hono/jsx",
-        "outDir": "./dist",
-        "removeComments": true,
-        "allowJs": true,
-        "esModuleInterop": true,
-        "resolveJsonModule": true
-    },
-
-    "exclude": ["node_modules", "frontend", "dist", "testFiles"]
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
+    "strict": true,
+    "verbatimModuleSyntax": true,
+    "skipLibCheck": true,
+    "types": ["node"],
+    "jsx": "react-jsx",
+    "jsxImportSource": "hono/jsx",
+    "outDir": "./dist",
+    "removeComments": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true
+  },
+  "include": ["server", "scripts/**/*.ts"],
+  "exclude": ["node_modules", "frontend", "dist", "testFiles"]
 }