feat(settings): added in settings

.vscode/settings.json

@@ -3,7 +3,9 @@
 	"workbench.colorTheme": "Default Dark+",
 	"terminal.integrated.env.windows": {},
 	"editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {"source.fixAll.biome": "explicit",
+	"editor.codeActionsOnSave": {
-"source.organizeImports.biome": "explicit" },
+		"source.fixAll.biome": "explicit",
-    "cSpell.words": ["alpla", "alplamart", "alplaprod", "ppoo"]
+		"source.organizeImports.biome": "explicit"
+	},
+	"cSpell.words": ["alpla", "alplamart", "alplaprod", "intiallally", "ppoo"]
 }

app/main.ts

@@ -1,26 +1,29 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+
+import { toNodeHandler } from "better-auth/node";
+import cors from "cors";
 import express from "express";
-import morgan from "morgan";
 import { createServer } from "http";
-import { setupRoutes } from "./src/internal/routerHandler/routeHandler.js";
+import morgan from "morgan";
-import { printers } from "./src/internal/ocp/printers/printers.js";
+import os from "os";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+import { schedulerManager } from "./src/internal/logistics/controller/schedulerManager.js";
+import { printers } from "./src/internal/ocp/printers/printers.js";
+import { setupRoutes } from "./src/internal/routerHandler/routeHandler.js";
+import { baseSettings } from "./src/internal/system/controller/settings/baseSettings.js";
+import { auth } from "./src/pkg/auth/auth.js";
 import { db } from "./src/pkg/db/db.js";
 import { settings } from "./src/pkg/db/schema/settings.js";
-import { validateEnv } from "./src/pkg/utils/envValidator.js";
 import { createLogger } from "./src/pkg/logger/logger.js";
-import { returnFunc } from "./src/pkg/utils/return.js";
+import { v1Listener } from "./src/pkg/logger/v1Listener.js";
-import { initializeProdPool } from "./src/pkg/prodSql/prodSqlConnect.js";
-import { tryCatch } from "./src/pkg/utils/tryCatch.js";
-import os from "os";
-import cors from "cors";
-import { sendNotify } from "./src/pkg/utils/notify.js";
-import { toNodeHandler } from "better-auth/node";
-import { auth } from "./src/pkg/auth/auth.js";
 import { apiHitMiddleware } from "./src/pkg/middleware/apiHits.js";
+import { initializeProdPool } from "./src/pkg/prodSql/prodSqlConnect.js";
+import { validateEnv } from "./src/pkg/utils/envValidator.js";
+import { sendNotify } from "./src/pkg/utils/notify.js";
+import { returnFunc } from "./src/pkg/utils/return.js";
+import { tryCatch } from "./src/pkg/utils/tryCatch.js";
 import { setupIoServer } from "./src/ws/server.js";
-import { schedulerManager } from "./src/internal/logistics/controller/schedulerManager.js";
 
 const main = async () => {
 	const env = validateEnv(process.env);
@@ -74,7 +77,7 @@ const main = async () => {
 
 		app.use(
 			basePath + "/test",
-            express.static(join(__dirname, "../controller"))
+			express.static(join(__dirname, "../controller")),
 		);
 	}
 
@@ -106,10 +109,7 @@ const main = async () => {
 					}
 
 					// Now this works for *.alpla.net
-                    if (
+					if (hostname.endsWith(".alpla.net") || hostname === "alpla.net") {
-                        hostname.endsWith(".alpla.net") ||
-                        hostname === "alpla.net"
-                    ) {
 						return callback(null, true);
 					}
 				} catch (err) {
@@ -120,17 +120,14 @@ const main = async () => {
 			},
 			methods: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
 			credentials: true,
-        })
+		}),
 	);
 
 	// docs and api stuff
-    app.use(
+	app.use(basePath + "/d", express.static(join(__dirname, "../lstDocs/build")));
-        basePath + "/d",
-        express.static(join(__dirname, "../lstDocs/build"))
-    );
 	app.use(
 		basePath + "/app",
-        express.static(join(__dirname, "../frontend/dist"))
+		express.static(join(__dirname, "../frontend/dist")),
 	);
 
 	//  server setup
@@ -142,18 +139,24 @@ const main = async () => {
 	// ws stuff
 	setupIoServer(server, basePath);
 
-    // sub systems
+	// start all systems after we are intiallally up and running
+	setTimeout(() => {
+		baseSettings();
 		printers();
 		schedulerManager();
 
+		// start up the v1listener
+		v1Listener();
+	}, 5 * 1000);
+
 	// start the server up
 	server.listen(PORT, "0.0.0.0", () =>
 		log.info(
 			{ stack: { name: "test" } },
 			`Server running in ${
 				process.env.NODE_ENV ? process.env.NODE_ENV : "dev"
-            }, on http://0.0.0.0:${PORT}${basePath}`
+			}, on http://0.0.0.0:${PORT}${basePath}`,
-        )
+		),
 	);
 
 	process.on("uncaughtException", async (err) => {
@@ -189,10 +192,8 @@ const main = async () => {
 	// 	const used = process.memoryUsage();
 	// 	console.log(
 	// 		`Heap: ${(used.heapUsed / 1024 / 1024).toFixed(2)} MB / RSS: ${(
-    //             used.rss /
+	// 			used.rss / 1024 / 1024
-    //             1024 /
+	// 		).toFixed(2)} MB`,
-    //             1024
-    //         ).toFixed(2)} MB`
 	// 	);
 	// }, 10000);
 };

app/src/internal/admin/controller/servers/matchServers.ts

@@ -0,0 +1,22 @@
+/**
+ * This is intended for when running as dev so we can always keep the servers in sync with the main server.
+ * in the event the server has a change on it we want to make sure we stay in sync
+ */
+
+import { createLogger } from "../../../../pkg/logger/logger.js";
+
+export const mainServerSync = async () => {
+	const log = createLogger({ module: "admin", subModule: "main server sync" });
+	if (
+		process.env.NODE_ENV?.trim() !== "production" &&
+		process.env.MAIN_SERVER
+	) {
+		log.info(
+			{},
+			"Running in dev and have a main server set we will now pull the servers and look for any changes",
+		);
+	} else {
+		log.info({}, "This server is running in production no sync will happen");
+		return;
+	}
+};

app/src/internal/admin/routes.ts

@@ -1,6 +1,6 @@
 import type { Express, Request, Response } from "express";
 import { requireAuth } from "../../pkg/middleware/authMiddleware.js";
-
+import { mainServerSync } from "./controller/servers/matchServers.js";
 //admin routes
 import users from "./routes/getUserRoles.js";
 import grantRoles from "./routes/grantRole.js";
@@ -30,4 +30,9 @@ export const setupAdminRoutes = (app: Express, basePath: string) => {
 		requireAuth("user", ["systemAdmin", "admin"]), // will pass bc system admin but this is just telling us we need this
 		revokeRoles,
 	);
+
+	// run the sync only on startup
+	setTimeout(() => {
+		mainServerSync();
+	}, 5 * 1000);
 };

app/src/internal/admin/routes/servers/addServer.ts

@@ -1,15 +1,15 @@
-import { Router } from "express";
+import axios from "axios";
+import { type DrizzleError, sql } from "drizzle-orm";
 import type { Request, Response } from "express";
+import { Router } from "express";
+import https from "https";
+import { db } from "../../../../pkg/db/db.js";
 import {
 	insertServerDataSchema,
 	serverData,
 } from "../../../../pkg/db/schema/servers.js";
-import { db } from "../../../../pkg/db/db.js";
-import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
-import type { DrizzleError } from "drizzle-orm";
-import axios from "axios";
 import { createLogger } from "../../../../pkg/logger/logger.js";
-import https from "https";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
 
 const router = Router();
 
@@ -26,12 +26,18 @@ router.post("/", async (req: Request, res: Response) => {
 	const { data, error } = await tryCatch(
 		db
 			.insert(serverData)
-            .values(parsed.data)
+			.values({
+				...parsed.data,
+				add_user: req.user?.username,
+				add_date: sql`NOW()`,
+				upd_user: req.user?.username,
+				upd_date: sql`NOW()`,
+			})
 			//.onConflictDoNothing()
 			.returning({
 				name: serverData.name,
 				plantToken: serverData.plantToken,
-            })
+			}),
 	);
 
 	if (error) {
@@ -58,7 +64,7 @@ router.post("/", async (req: Request, res: Response) => {
 			},
 			{
 				headers: { "Content-Type": "application/json" },
-            }
+			},
 		)) as any;
 		const setCookie = loginRes.headers["set-cookie"][0];
 
@@ -76,19 +82,19 @@ router.post("/", async (req: Request, res: Response) => {
 						Cookie: setCookie.split(";")[0],
 					},
 					withCredentials: true,
-                }
+				},
-            )
+			),
 		);
 
 		if (error) {
 			log.error(
 				{ stack: error },
-                "There was an error adding the server to Main Server"
+				"There was an error adding the server to Main Server",
 			);
 		}
 		log.info(
 			{ stack: data?.data },
-            "A new Server was just added to the server."
+			"A new Server was just added to the server.",
 		);
 	}
 

app/src/internal/admin/routes/servers/updateServer.ts

@@ -1,12 +1,12 @@
-import { Router } from "express";
+import axios from "axios";
+import { eq, sql } from "drizzle-orm";
 import type { Request, Response } from "express";
+import { Router } from "express";
+import https from "https";
 import { db } from "../../../../pkg/db/db.js";
 import { serverData } from "../../../../pkg/db/schema/servers.js";
-import { eq } from "drizzle-orm";
-import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
-import axios from "axios";
 import { createLogger } from "../../../../pkg/logger/logger.js";
-import https from "https";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
 
 const router = Router();
 
@@ -66,6 +66,10 @@ router.patch("/:token", async (req: Request, res: Response) => {
 	if (req.body?.active !== undefined) {
 		updates.active = req.body.active;
 	}
+
+	updates.upd_user = req.user!.username || "lst_user";
+	updates.upd_date = sql`NOW()`;
+
 	try {
 		if (Object.keys(updates).length > 0) {
 			await db
@@ -90,7 +94,7 @@ router.patch("/:token", async (req: Request, res: Response) => {
 				},
 				{
 					headers: { "Content-Type": "application/json" },
-                }
+				},
 			)) as any;
 
 			const setCookie = loginRes?.headers["set-cookie"][0];
@@ -98,9 +102,7 @@ router.patch("/:token", async (req: Request, res: Response) => {
 			//console.log(setCookie.split(";")[0].replace("__Secure-", ""));
 
 			if (!setCookie) {
-                throw new Error(
+				throw new Error("Did not receive a Set-Cookie header from login");
-                    "Did not receive a Set-Cookie header from login"
-                );
 			}
 
 			const { data, error } = await tryCatch(
@@ -113,20 +115,20 @@ router.patch("/:token", async (req: Request, res: Response) => {
 							Cookie: setCookie.split(";")[0],
 						},
 						withCredentials: true,
-                    }
+					},
-                )
+				),
 			);
 
 			if (error) {
 				console.log(error);
 				log.error(
 					{ stack: error },
-                    "There was an error adding the server to Main Server"
+					"There was an error adding the server to Main Server",
 				);
 			}
 			log.info(
 				{ stack: data?.data },
-                "A new Server was just added to the server."
+				"A new Server was just added to the server.",
 			);
 		}
 		res.status(200).json({ message: `${token} Server was just updated` });

app/src/internal/system/controller/settings/baseSettings.ts

@@ -0,0 +1,37 @@
+/**
+ * will be all the base settings so we dont have to remember to add ever new setting in these will be the defaults
+ */
+
+import { readFileSync } from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+import { db } from "../../../../pkg/db/db.js";
+import { settings } from "../../../../pkg/db/schema/settings.js";
+import { createLogger } from "../../../../pkg/logger/logger.js";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export const baseSettings = async () => {
+	const log = createLogger({ module: "system", subModule: "base settings" });
+	const settingsPath = path.resolve(__dirname, "./settings.json");
+
+	const newSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+
+	const { data, error } = await tryCatch(
+		db
+			.insert(settings)
+			.values(newSettings)
+			.onConflictDoNothing()
+			.returning({ name: settings.name }),
+	);
+
+	if (error) {
+		log.error({ error }, "There was an error adding new settings");
+	}
+
+	if (data) {
+		log.info({ newSettingsAdded: data }, "New settings added");
+	}
+};

app/src/internal/system/controller/settings/settings.json

@@ -0,0 +1,16 @@
+[
+	{
+		"name": "plantToken",
+		"value": "test3",
+		"description": "The plant token for the plant IE: test3  or usday1",
+		"moduleName": "system",
+		"roles": ["systemAdmin"]
+	},
+	{
+		"name": "dbServer",
+		"value": "usmcd1vms036",
+		"description": "What is the db server",
+		"moduleName": "system",
+		"roles": ["systemAdmin"]
+	}
+]

app/src/internal/system/routes.ts

@@ -1,6 +1,12 @@
 import type { Express, Request, Response } from "express";
+import settings from "./routes/settings/settingRoutes.js";
 import stats from "./routes/stats.js";
 
 export const setupSystemRoutes = (app: Express, basePath: string) => {
 	app.use(basePath + "/api/system/stats", stats);
+
+	app.use(
+		basePath + "/api/system/settings", // will pass bc system admin but this is just telling us we need this
+		settings,
+	);
 };

app/src/internal/system/routes/settings/getSettings.ts

@@ -0,0 +1,35 @@
+import { Router } from "express";
+import type { Request, Response } from "express";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
+import { db } from "../../../../pkg/db/db.js";
+import { serverData } from "../../../../pkg/db/schema/servers.js";
+import { and, asc, eq } from "drizzle-orm";
+
+const router = Router();
+
+router.get("/", async (req: Request, res: Response) => {
+    const token = req.query.token;
+
+    const conditions = [];
+
+    if (token !== undefined) {
+        conditions.push(eq(serverData.plantToken, `${token}`));
+    }
+
+    conditions.push(eq(serverData.active, true));
+
+    const { data, error } = await tryCatch(
+        db
+            .select()
+            .from(serverData)
+            .where(and(...conditions))
+            .orderBy(asc(serverData.name))
+    );
+
+    if (error) {
+        return res.status(400).json({ error: error });
+    }
+    res.status(200).json({ message: "Current Active server", data: data });
+});
+
+export default router;

app/src/internal/system/routes/settings/settingRoutes.ts

@@ -0,0 +1,11 @@
+import { Router } from "express";
+import { requireAuth } from "../../../../pkg/middleware/authMiddleware.js";
+import getSettings from "./getSettings.js";
+import updateSetting from "./updateSetting.js";
+
+const router = Router();
+
+router.use("/", getSettings);
+router.use("/", requireAuth("system", ["systemAdmin", "admin"]), updateSetting);
+
+export default router;

app/src/internal/system/routes/settings/updateSetting.ts

@@ -0,0 +1,141 @@
+import axios from "axios";
+import { eq, sql } from "drizzle-orm";
+import type { Request, Response } from "express";
+import { Router } from "express";
+import https from "https";
+import { db } from "../../../../pkg/db/db.js";
+import { serverData } from "../../../../pkg/db/schema/servers.js";
+import { createLogger } from "../../../../pkg/logger/logger.js";
+import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
+
+const router = Router();
+
+router.patch("/:token", async (req: Request, res: Response) => {
+	const log = createLogger({ module: "admin", subModule: "update server" });
+
+	// when a server is updated and is posted from localhost or 127.0.0.1 we also want to post it to the test server so we can see it from there, we want to insert with update on conflict.
+	const token = req.params.token;
+	const updates: Record<string, any> = {};
+
+	if (req.body?.name !== undefined) {
+		updates.name = req.body.name;
+	}
+	if (req.body?.serverDNS !== undefined) {
+		updates.serverDNS = req.body.serverDNS;
+	}
+	if (req.body?.ipAddress !== undefined) {
+		updates.ipAddress = req.body.ipAddress;
+	}
+
+	if (req.body?.greatPlainsPlantCode !== undefined) {
+		updates.greatPlainsPlantCode = req.body.greatPlainsPlantCode;
+	}
+
+	if (req.body?.lstServerPort !== undefined) {
+		updates.lstServerPort = req.body.lstServerPort;
+	}
+
+	if (req.body?.serverLoc !== undefined) {
+		updates.serverLoc = req.body.serverLoc;
+	}
+
+	if (req.body?.streetAddress !== undefined) {
+		updates.streetAddress = req.body.streetAddress;
+	}
+
+	if (req.body?.cityState !== undefined) {
+		updates.cityState = req.body.cityState;
+	}
+
+	if (req.body?.zipcode !== undefined) {
+		updates.zipcode = req.body.zipcode;
+	}
+
+	if (req.body?.contactEmail !== undefined) {
+		updates.contactEmail = req.body.contactEmail;
+	}
+
+	if (req.body?.contactPhone !== undefined) {
+		updates.contactPhone = req.body.contactPhone;
+	}
+
+	if (req.body?.customerTiAcc !== undefined) {
+		updates.customerTiAcc = req.body.customerTiAcc;
+	}
+
+	if (req.body?.active !== undefined) {
+		updates.active = req.body.active;
+	}
+
+	updates.upd_user = req.user!.username || "lst_user";
+	updates.upd_date = sql`NOW()`;
+
+	try {
+		if (Object.keys(updates).length > 0) {
+			await db
+				.update(serverData)
+				.set(updates)
+				.where(eq(serverData.plantToken, token));
+		}
+
+		if (req.hostname === "localhost" && process.env.MAIN_SERVER) {
+			log.info({}, "Running in dev server about to add in a new server");
+			const axiosInstance = axios.create({
+				httpsAgent: new https.Agent({ rejectUnauthorized: false }),
+				baseURL: process.env.MAIN_SERVER,
+				withCredentials: true,
+			});
+
+			const loginRes = (await axiosInstance.post(
+				`${process.env.MAIN_SERVER}/lst/api/auth/sign-in/username`,
+				{
+					username: process.env.MAIN_SERVER_USERNAME,
+					password: process.env.MAIN_SERVER_PASSWORD,
+				},
+				{
+					headers: { "Content-Type": "application/json" },
+				},
+			)) as any;
+
+			const setCookie = loginRes?.headers["set-cookie"][0];
+
+			//console.log(setCookie.split(";")[0].replace("__Secure-", ""));
+
+			if (!setCookie) {
+				throw new Error("Did not receive a Set-Cookie header from login");
+			}
+
+			const { data, error } = await tryCatch(
+				axios.patch(
+					`${process.env.MAIN_SERVER}/lst/api/admin/server/${token}`,
+					updates,
+					{
+						headers: {
+							"Content-Type": "application/json",
+							Cookie: setCookie.split(";")[0],
+						},
+						withCredentials: true,
+					},
+				),
+			);
+
+			if (error) {
+				console.log(error);
+				log.error(
+					{ stack: error },
+					"There was an error adding the server to Main Server",
+				);
+			}
+			log.info(
+				{ stack: data?.data },
+				"A new Server was just added to the server.",
+			);
+		}
+		res.status(200).json({ message: `${token} Server was just updated` });
+	} catch (error) {
+		console.log(error);
+		res.status(400).json({ message: "Error Server updated", error });
+	}
+});
+
+export default router;

app/src/pkg/db/schema/servers.ts

@@ -30,12 +30,16 @@ export const serverData = pgTable(
 		serverLoc: text("serverLoc").notNull(),
 		lastUpdated: timestamp("lastUpdated").defaultNow(),
 		isUpgrading: boolean("isUpgrading").default(false),
+		add_user: text("add_user").default("lst_user"),
+		add_date: timestamp("add_date").defaultNow(),
+		upd_user: text("upd_user").default("lst_user"),
+		upd_date: timestamp("upd_date").defaultNow(),
 	},
 
 	(table) => [
 		// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
 		uniqueIndex("plantToken").on(table.plantToken),
-    ]
+	],
 );
 
 export const selectServerDataSchema = createSelectSchema(serverData);

app/src/pkg/utils/delay.ts

@@ -0,0 +1,3 @@
+export const delay = (ms: number) => {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+};