Merge branch 'main' of https://git.tuffraid.net/cowch/lstV2

2025-03-25 07:57:55 -05:00
parent e6e1cecce3 96814c1115
commit 90fb0d364d
5 changed files with 421 additions and 254 deletions
--- a/server/index.ts
+++ b/server/index.ts
@@ -31,28 +31,28 @@ 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;
+    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 });

 // middle ware
 if (process.env.NODE_ENV === "development") {
-  app.use("*", logger());
+    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
@@ -69,29 +69,29 @@ app.use(
 // });

 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",
+    },
 });

 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);
@@ -132,48 +132,48 @@ 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();
-  process.exit(0);
+    console.log("Process is about to exit...");
+    //await closePool();
+    process.exit(0);
 });

 const port =
-  process.env.NODE_ENV === "development"
-    ? process.env.VITE_SERVER_PORT
-    : process.env.PROD_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}`
-    );
-  }
+    {
+        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;
--- a/server/scripts/updateServers.ts
+++ b/server/scripts/updateServers.ts
@@ -4,12 +4,26 @@ import { db } from "../../database/dbclient.js";
 import { serverData } from "../../database/schema/serverData.js";
 import { eq, sql } from "drizzle-orm";
 import { createLog } from "../services/logger/logger.js";
+import { spawn } from "child_process";
+import { getAppInfo } from "../globalUtils/appInfo.js";
+import { db } from "../../database/dbclient.js";
+import { serverData } from "../../database/schema/serverData.js";
+import { eq, sql } from "drizzle-orm";
+import { createLog } from "../services/logger/logger.js";

 type UpdateServerResponse = {
  success: boolean;
  message: string;
+  success: boolean;
+  message: string;
 };

+export const updateServer = async (
+  devApp: string,
+  server: string | null
+): Promise<UpdateServerResponse> => {
+  const app = await getAppInfo(devApp);
+  const serverInfo = await db
 export const updateServer = async (
  devApp: string,
  server: string | null
@@ -33,7 +47,32 @@ export const updateServer = async (
        "Looks like you are missing the plant token or have entered an incorrect one please try again.",
    };
  }
+  if (serverInfo.length === 0) {
+    createLog(
+      "error",
+      "lst",
+      "serverUpdater",
+      `Looks like you are missing the plant token or have entered an incorrect one please try again.`
+    );
+    return {
+      success: false,
+      message:
+        "Looks like you are missing the plant token or have entered an incorrect one please try again.",
+    };
+  }

+  if (serverInfo[0].isUpgrading) {
+    createLog(
+      "error",
+      "lst",
+      "serverUpdater",
+      `Looks like ${serverInfo[0].plantToken} is upgrading already you cant do this again.`
+    );
+    return {
+      success: false,
+      message: `Looks like ${serverInfo[0].plantToken} is upgrading already you cant do this again.`,
+    };
+  }
  if (serverInfo[0].isUpgrading) {
    createLog(
      "error",
@@ -77,6 +116,15 @@ export const updateServer = async (
    ,
  ];

+  return new Promise(async (resolve, reject) => {
+    const process = spawn("powershell", args);
+    // change the server to upgradeing
+    await db
+      .update(serverData)
+      .set({ isUpgrading: true })
+      .where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
+    //let stdout = "";
+    //let stderr = "";
  return new Promise(async (resolve, reject) => {
    const process = spawn("powershell", args);
    // change the server to upgradeing
@@ -87,6 +135,12 @@ export const updateServer = async (
    //let stdout = "";
    //let stderr = "";

+    // Collect stdout data
+    process.stdout.on("data", (data) => {
+      const output = data.toString().trim();
+      createLog("info", "lst", "serverUpdater", `${output}`);
+      //onData(output);
+    });
    // Collect stdout data
    process.stdout.on("data", (data) => {
      const output = data.toString().trim();
@@ -94,6 +148,12 @@ export const updateServer = async (
      //onData(output);
    });

+    // Collect stderr data
+    process.stderr.on("data", (data) => {
+      const output = data.toString().trim();
+      createLog("info", "lst", "serverUpdater", `${output}`);
+      //onData(output);
+    });
    // Collect stderr data
    process.stderr.on("data", (data) => {
      const output = data.toString().trim();
@@ -101,6 +161,13 @@ export const updateServer = async (
      //onData(output);
    });

+    // Handle process close
+    process.on("close", async (code) => {
+      if (code === 0) {
+        // if (count >= servers) {
+        //     //onClose(`Server completed with code: ${code}`);
+        // }
+        createLog("info", "lst", "serverUpdater", `${server}`);
    // Handle process close
    process.on("close", async (code) => {
      if (code === 0) {
@@ -109,6 +176,26 @@ export const updateServer = async (
        // }
        createLog("info", "lst", "serverUpdater", `${server}`);

+        //update the last build.
+        try {
+          await db
+            .update(serverData)
+            .set({ lastUpdated: sql`NOW()`, isUpgrading: false })
+            .where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
+          createLog(
+            "info",
+            "lst",
+            "serverUpdater",
+            `${server?.toLowerCase()}, has been updated and can now be used again.`
+          );
+        } catch (error) {
+          createLog(
+            "error",
+            "lst",
+            "serverUpdater",
+            `There was an error updating the last time the server was updated: ${error}`
+          );
+        }
        //update the last build.
        try {
          await db
@@ -130,6 +217,12 @@ export const updateServer = async (
          );
        }

+        resolve({
+          success: true,
+          message: `${server?.toLowerCase()}, has been updated and can now be used again.`,
+        });
+      } else {
+        const errorMessage = `Process exited with code ${code}`;
        resolve({
          success: true,
          message: `${server?.toLowerCase()}, has been updated and can now be used again.`,
@@ -137,6 +230,9 @@ export const updateServer = async (
      } else {
        const errorMessage = `Process exited with code ${code}`;

+        // if (count >= servers) {
+        //     //onClose(code);
+        // }
        // if (count >= servers) {
        //     //onClose(code);
        // }
@@ -147,6 +243,12 @@ export const updateServer = async (
        });
      }
    });
+        reject({
+          success: false,
+          message: `${server?.toLowerCase()}, Has encounted an error while updating.`,
+        });
+      }
+    });

    // Handle errors with the process itself
    process.on("error", (error) => {
@@ -155,11 +257,31 @@ export const updateServer = async (
      reject(error);
    });
  });
+    // Handle errors with the process itself
+    process.on("error", (error) => {
+      //onError(err.message);
+      createLog("error", "lst", "serverUpdater", `${error}`);
+      reject(error);
+    });
+  });
 };

 export async function processAllServers(devApp: string) {
  const servers = await db.select().from(serverData);
+  const servers = await db.select().from(serverData);

+  createLog(
+    "info",
+    "lst",
+    "serverUpdater",
+    `Running the update on all servers`
+  );
+  let count = 1;
+  for (const server of servers) {
+    try {
+      const updateToServer = await updateServer(devApp, server.plantToken);
+      createLog("info", "lst", "serverUpdater", `${server.sName} was updated.`);
+      count = count + 1;
  createLog(
    "info",
    "lst",
@@ -184,4 +306,15 @@ export async function processAllServers(devApp: string) {
      //return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
    }
  }
+      //return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
+    } catch (error: any) {
+      createLog(
+        "info",
+        "lst",
+        "serverUpdater",
+        `Error updating ${server.sName}: ${error.message}`
+      );
+      //return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
+    }
+  }
 }
--- a/server/services/ocme/controller/postRunningNr.ts
+++ b/server/services/ocme/controller/postRunningNr.ts
@@ -4,6 +4,12 @@ import { createSSCC } from "../../../globalUtils/createSSCC.js";
 import { createLog } from "../../logger/logger.js";
 import { query } from "../../sqlServer/prodSqlServer.js";
 import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
+import { db } from "../../../../database/dbclient.js";
+import { ocmeData } from "../../../../database/schema/ocme.js";
+import { createSSCC } from "../../../globalUtils/createSSCC.js";
+import { createLog } from "../../logger/logger.js";
+import { query } from "../../sqlServer/prodSqlServer.js";
+import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";

 export const postLabelData = async (data: any) => {
    console.log(data);