refactor(tcpserver): just the tcp server doing something

.vscode/settings.json

@@ -1,6 +1,8 @@
 {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-
+    "workbench.colorTheme": "Default Dark+",
+    "prettier.tabWidth": 4,
+    "terminal.integrated.env.windows": {},
     "editor.formatOnSave": true,
     "[javascript]": {
         "editor.formatOnSave": true

frontend/src/components/ocme/ocmeCycleCount.tsx

@@ -2,10 +2,23 @@ import {toast} from "sonner";
 import { LstCard } from "../extendedUI/LstCard";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
-import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "../ui/table";
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "../ui/table";
 import { Skeleton } from "../ui/skeleton";
 //import CycleCountLog from "./CycleCountLog";
-import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from "../ui/select";
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "../ui/select";
 import { Controller, useForm } from "react-hook-form";
 import axios from "axios";
 import { useState } from "react";
@@ -45,20 +58,25 @@ export default function OcmeCycleCount() {
         <div className="flex flex-row w-screen">
             <div className="m-2 w-5/6">
                 <LstCard>
-                    <p className="ml-2">Please enter the name or laneID you want to cycle count.</p>
+                    <p className="ml-2">
+                        Please enter the name or laneID you want to cycle count.
+                    </p>
                     <div>
                         <form onSubmit={handleSubmit(onSubmit)}>
                             <div className="flex justify-between">
                                 <div className="m-2 flex flex-row">
                                     <Input
                                         placeholder="enter lane: L064"
-                                        className={errors.lane ? "border-red-500" : ""}
+                                        className={
+                                            errors.lane ? "border-red-500" : ""
+                                        }
                                         aria-invalid={!!errors.lane}
                                         {...register("lane", {
                                             required: true,
                                             minLength: {
                                                 value: 3,
-                                                message: "The lane is too short!",
+                                                message:
+                                                    "The lane is too short!",
                                             },
                                         })}
                                     />
@@ -72,21 +90,35 @@ export default function OcmeCycleCount() {
                                                 fieldState: {},
                                                 //formState,
                                             }) => (
-                                                <Select onValueChange={onChange}>
+                                                <Select
+                                                    onValueChange={onChange}
+                                                >
                                                     <SelectTrigger className="w-[180px]">
                                                         <SelectValue placeholder="Select name or id" />
                                                     </SelectTrigger>
                                                     <SelectContent>
-                                                        <SelectItem value="name">Name</SelectItem>
-                                                        <SelectItem value="laneId">Lane ID</SelectItem>
+                                                        <SelectItem value="name">
+                                                            Name
+                                                        </SelectItem>
+                                                        <SelectItem value="laneId">
+                                                            Lane ID
+                                                        </SelectItem>
                                                     </SelectContent>
                                                 </Select>
                                             )}
                                         />
                                     </div>
                                 </div>
-                                <Button className="m-2" type="submit" disabled={counting}>
-                                    {counting ? <span>Counting...</span> : <span>CycleCount</span>}
+                                <Button
+                                    className="m-2"
+                                    type="submit"
+                                    disabled={counting}
+                                >
+                                    {counting ? (
+                                        <span>Counting...</span>
+                                    ) : (
+                                        <span>CycleCount</span>
+                                    )}
                                 </Button>
                             </div>
                         </form>
@@ -142,7 +174,9 @@ export default function OcmeCycleCount() {
                                 <>
                                     {data.map((i: any) => {
                                         let classname = ``;
-                                        if (i.info === "Quality Check Required") {
+                                        if (
+                                            i.info === "Quality Check Required"
+                                        ) {
                                             classname = `bg-red-500`;
                                         }
                                         if (i.info === "Sent to Inv") {
@@ -150,24 +184,46 @@ export default function OcmeCycleCount() {
                                         }
                                         return (
                                             <TableRow key={i.runningNumber}>
-                                                <TableCell className={`font-medium ${classname}`}>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
                                                     {i.alpla_laneID}
                                                 </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
                                                     {i.alpla_laneDescription}
                                                 </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
                                                     {i.Article}
                                                 </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
                                                     {i.alpla_laneDescription}
                                                 </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
                                                     {i.runningNumber}
                                                 </TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>{i.ocme}</TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>{i.stock}</TableCell>
-                                                <TableCell className={`font-medium ${classname}`}>{i.info}</TableCell>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
+                                                    {i.ocme}
+                                                </TableCell>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
+                                                    {i.stock}
+                                                </TableCell>
+                                                <TableCell
+                                                    className={`font-medium ${classname}`}
+                                                >
+                                                    {i.info}
+                                                </TableCell>
                                             </TableRow>
                                         );
                                     })}

package.json

@@ -21,7 +21,7 @@
     "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",
+    "prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2-dev\" && npm run zipServer",
     "commit": "cz",
     "prodinstall": "npm i --omit=dev && npm run db:migrate",
     "checkupdates": "npx npm-check-updates"
@@ -32,7 +32,7 @@
     }
   },
   "admConfig": {
-    "build": 50,
+    "build": 76,
     "oldBuild": "backend-0.1.3.zip"
   },
   "devDependencies": {

server/index.ts

@@ -39,7 +39,10 @@ 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(
     "*",
     cors({
@@ -53,17 +56,17 @@ app.use(
 );
 
 // Middleware to normalize route case
-app.use("*", async (c, next) => {
-  const lowercasedUrl = c.req.url.toLowerCase();
+// 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();
-  }
+//   //   // If the URL is already lowercase, continue as usual
+//   //   if (c.req.url === lowercasedUrl) {
+//   await 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",

server/scripts/update.ps1

@@ -415,10 +415,10 @@ try {
     Start-Service -DisplayName  $serviceLstV2
     Start-Sleep -Seconds 1
     Write-Host "$($server) finished updating"
-    if($token -eq "usday1"){
-        Write-Host "Starting $($serviceOcme)"
-        Start-Service -DisplayName  $serviceOcme 
-    }
+    # if($token -eq "usday1"){
+    #     Write-Host "Starting $($serviceOcme)"
+    #     Start-Service -DisplayName  $serviceOcme 
+    # }
 
 }
 Invoke-Command -ComputerName $server -ScriptBlock $plantFunness -ArgumentList $server, $token, $location, $buildZip, $buildLoc, $obslst, $obsBuild -Credential $credentials

server/scripts/updateServers.ts

@@ -4,13 +4,30 @@ 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> => {
+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
+): Promise<UpdateServerResponse> => {
   const app = await getAppInfo(devApp);
   const serverInfo = await db
     .select()
@@ -26,10 +43,36 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     );
     return {
       success: false,
-            message: "Looks like you are missing the plant token or have entered an incorrect one please try again.",
+      message:
+        "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",
@@ -73,6 +116,15 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     ,
   ];
 
+  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
@@ -83,6 +135,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     //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();
@@ -90,6 +148,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
       //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();
@@ -97,6 +161,13 @@ export const updateServer = async (devApp: string, server: string | null): Promi
       //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) {
@@ -105,6 +176,26 @@ export const updateServer = async (devApp: string, server: string | null): Promi
         // }
         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
@@ -126,6 +217,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
           );
         }
 
+        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.`,
@@ -133,6 +230,9 @@ export const updateServer = async (devApp: string, server: string | null): Promi
       } else {
         const errorMessage = `Process exited with code ${code}`;
 
+        // if (count >= servers) {
+        //     //onClose(code);
+        // }
         // if (count >= servers) {
         //     //onClose(code);
         // }
@@ -143,6 +243,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
         });
       }
     });
+        reject({
+          success: false,
+          message: `${server?.toLowerCase()}, Has encounted an error while updating.`,
+        });
+      }
+    });
 
     // Handle errors with the process itself
     process.on("error", (error) => {
@@ -151,12 +257,37 @@ export const updateServer = async (devApp: string, server: string | null): Promi
       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`);
+  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",
+    "serverUpdater",
+    `Running the update on all servers`
+  );
   let count = 1;
   for (const server of servers) {
     try {
@@ -166,7 +297,23 @@ export async function processAllServers(devApp: string) {
 
       //return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
     } catch (error: any) {
-            createLog("info", "lst", "serverUpdater", `Error updating ${server.sName}: ${error.message}`);
+      createLog(
+        "info",
+        "lst",
+        "serverUpdater",
+        `Error updating ${server.sName}: ${error.message}`
+      );
+      //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}`};
     }
   }

server/scripts/zipUpBuild.ts

@@ -99,7 +99,7 @@ const updateBuildNumber = (appLock: string) => {
       // Auto-commit changes
       execSync("git add package.json");
       execSync(
-        `git commit -m "build: bump build number to ${pkgJson.admConfig.build}"`
+        `git commit -m "chore(release): bump build number to ${pkgJson.admConfig.build}"`
       );
     } else {
       createLog(

server/services/ocme/controller/cycleCount/ocmeInventory.ts

@@ -3,9 +3,14 @@ import axios from "axios";
 export const ocmeInv = async (data: any) => {
     try {
         const res = await axios.post(
-            "http://usday1vms010:3250/api/v1/getLaneData",
+            "http://usday1vms010:3250/api/v1/getlanedata",
             { lane: data.lane, laneType: data.laneType },
-            {headers: {"Content-Type": "application/json", Connection: "keep-alive"}}
+            {
+                headers: {
+                    "Content-Type": "application/json",
+                    Connection: "keep-alive",
+                },
+            }
         );
         // console.log(res.data.data);
 

server/services/ocme/controller/getInfo.ts

@@ -7,17 +7,31 @@ import {eq} from "drizzle-orm";
 export const getInfo = async () => {
   let ocmeInfo: any = [];
   try {
-        ocmeInfo = await db.select().from(ocmeData).where(eq(ocmeData.pickedUp, false));
+    ocmeInfo = await db
+      .select()
+      .from(ocmeData)
+      .where(eq(ocmeData.pickedUp, false));
 
     // add in the time difference
     ocmeInfo = ocmeInfo.map((o: any) => {
       const now = new Date(Date.now());
-            const diff = differenceInMinutes(now, o.add_Date!);
+      //const strippedDate = o.add_Date.replace("Z", "");
+      const diff = differenceInMinutes(now, o.add_Date);
       return { ...o, waitingFor: diff };
     });
-        createLog("info", "ocme", "ocme", `There are ${ocmeInfo.length} pallet(s) to be picked up.`);
+    createLog(
+      "info",
+      "ocme",
+      "ocme",
+      `There are ${ocmeInfo.length} pallet(s) to be picked up.`
+    );
   } catch (error) {
-        createLog("error", "ocme", "ocme", "There was an error trying to retrive the ocmeInfo.");
+    createLog(
+      "error",
+      "ocme",
+      "ocme",
+      "There was an error trying to retrive the ocmeInfo."
+    );
     throw Error("There was an error trying to retrive the.");
   }
 

server/services/ocme/controller/postRunningNr.ts

@@ -4,40 +4,79 @@ 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) => {
-    // if we have sscc we will do everything here and ignore the rn even it its sent over
-    if (data.sscc && !data.runningNr) {
-        data.runningNr = data.sscc.slice(10, -1);
+    console.log(data);
+    let newData = data;
+    if (Array.isArray(data)) {
+        newData = {
+            sscc: data[1],
+            areaFrom: data[0],
+            completed: true,
+        };
     }
 
-    if (!data.sscc && !data.runningNr) {
-        // data.runningNr = data.sscc.slice(10, -1);
-        return {success: false, message: "Missing data please try again", data: []};
+    if (newData.sscc && !newData.runningNr) {
+        newData.runningNr = newData.sscc.slice(10, -1);
+    }
+    if (!newData.sscc && !newData.runningNr) {
+        return {
+            success: false,
+            message: "Missing data please try again",
+            data: [],
+        };
     }
-
     let label;
-    const filterQuery = labelData.replaceAll("[rn]", data.runningNr);
-
+    const filterQuery = labelData.replaceAll("[rn]", newData.runningNr);
     try {
         label = await query(filterQuery, "Label data");
     } catch (error) {
-        createLog("error", "ocme", "ocme", "There was an error getting the labelData");
+        createLog(
+            "error",
+            "ocme",
+            "ocme",
+            "There was an error getting the labelData"
+        );
     }
     const newPost = {
-        sscc: data.sscc ? data.sscc : await createSSCC(data.runningNr),
-        runningNr: data.runningNr,
-        completed: data.completed,
-        lineNum: label[0].machineLocation,
-        areaFrom: data.areaFrom,
+        sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr),
+        runningNr: newData.runningNr,
+        completed: newData.completed ? newData.completed : true,
+        lineNum: label[0]?.machineLocation,
+        areaFrom: newData.areaFrom,
         pickedUp: false,
     };
-
     try {
-        const enterNewData = await db.insert(ocmeData).values(newPost).returning({sscc: ocmeData.sscc});
-        return {success: true, message: "Data was posted to ocme info", data: enterNewData};
+        const enterNewData = await db
+            .insert(ocmeData)
+            .values(newPost)
+            .returning({
+                sscc: ocmeData.sscc,
+                runningNr: ocmeData.runningNr,
+                areaFrom: ocmeData.areaFrom,
+                lineNum: ocmeData.lineNum,
+                completed: ocmeData.completed,
+                pickedUp: ocmeData.pickedUp,
+            });
+
+        //console.log(enterNewData);
+        return {
+            success: true,
+            message: "Data was posted to ocme info",
+            data: enterNewData,
+        };
     } catch (error) {
-        console.log(error);
-        return {success: false, message: "Data was posted to ocme info", data: newPost};
+        //console.log(error);
+        return {
+            success: false,
+            message: "Data was posted to ocme info",
+            data: [],
+        };
     }
 };

server/services/ocme/controller/triggerCamera.ts

@@ -0,0 +1,49 @@
+import net from "net";
+import { db } from "../../../../database/dbclient.js";
+import { settings } from "../../../../database/schema/settings.js";
+import { eq } from "drizzle-orm";
+import { createLog } from "../../logger/logger.js";
+
+export const triggerScanner = async () => {
+    const camera = new net.Socket();
+    let setting = await db
+        .select()
+        .from(settings)
+        .where(eq(settings.name, "zebraScanners"));
+    if (setting.length === 0) {
+        return {
+            success: false,
+            message: "Looks like the setting is missing.",
+        };
+    }
+    const scannerData = JSON.parse(setting[0]?.value);
+    let data = scannerData.filter((n: any) => n.name === "wrapper1");
+    let port = data[0].port;
+    console.log(data);
+    createLog(
+        "info",
+        "wrapperScanner",
+        "ocme",
+        `End of line Camera was triggered`
+    );
+    return new Promise((resolve, reject) => {
+        camera.connect(port, data[0].ip, async () => {
+            createLog("info", "wrapperScanner", "ocme", `Triggered`);
+            camera.write("TRIGGER", "utf8");
+            camera.end();
+            resolve({ success: true, message: "Camera was triggered." });
+        });
+
+        camera.on("error", (error) => {
+            createLog("error", "wrapperScanner", "ocme", `${error}`);
+            resolve({
+                success: false,
+                message: `There was an error triggering the camera: ${JSON.stringify(
+                    error
+                )}`,
+            });
+        });
+
+        resolve({ success: true, message: "Camera was triggered." });
+    });
+};

server/services/ocme/ocmeService.ts

@@ -11,10 +11,19 @@ import {serve} from "@hono/node-server";
 import { createLog } from "../logger/logger.js";
 import { db } from "../../../database/dbclient.js";
 import { settings } from "../../../database/schema/settings.js";
+import manualTrigger from "./route/triggerCamera.js";
 
 const app = new OpenAPIHono();
 const port = process.env.OCME_PORT;
-const routes = [getInfo, postRunningNr, postsscc, pickedup, getShipments, cycleCount] as const;
+const routes = [
+  getInfo,
+  postRunningNr,
+  postsscc,
+  pickedup,
+  getShipments,
+  cycleCount,
+  manualTrigger,
+] as const;
 const setting = await db.select().from(settings);
 
 const isActive = setting.filter((n) => n.name === "ocmeService");
@@ -23,7 +32,10 @@ const appRoutes = routes.forEach((route) => {
 });
 
 app.all("/api/v1/*", (c) => {
-    return c.json({success: false, message: "you have encounted an ocme route that dose not exist."});
+  return c.json({
+    success: false,
+    message: "you have encounted an ocme route that dose not exist.",
+  });
 });
 if (port && isActive[0]?.value === "1") {
   serve(
@@ -33,7 +45,12 @@ if (port && isActive[0]?.value === "1") {
       hostname: "0.0.0.0",
     },
     (info) => {
-            createLog("info", "LST", "server", `Ocme section is listening on http://${info.address}:${info.port}`);
+      createLog(
+        "info",
+        "LST",
+        "server",
+        `Ocme section is listening on http://${info.address}:${info.port}`
+      );
     }
   );
 }

server/services/ocme/route/cycleCount.ts

@@ -18,7 +18,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Cycle counts a lane based on the lane Alias",
     method: "post",
-        path: "/cyclecount",
+    path: "/cycleCount",
     middleware: authMiddleware,
     request: {
       body: {
@@ -48,10 +48,21 @@ app.openapi(
 
     try {
       const cycleData = await cycleCount(body, user);
-            return c.json({success: true, message: `${body.lane} was just cycle counted.`, data: cycleData}, 200);
+      return c.json(
+        {
+          success: true,
+          message: `${body.lane} was just cycle counted.`,
+          data: cycleData,
+        },
+        200
+      );
     } catch (error) {
       return c.json(
-                {success: false, message: `There was an error cycle counting ${body.lane}`, data: error},
+        {
+          success: false,
+          message: `There was an error cycle counting ${body.lane}`,
+          data: error,
+        },
         400
       );
     }

server/services/ocme/route/getInfo.ts

@@ -1,80 +1,36 @@
 import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
 import { getInfo } from "../controller/getInfo.js";
 import { apiHit } from "../../../globalUtils/apiHits.js";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
 
 const app = new OpenAPIHono({ strict: false });
 
-const AddSetting = z.object({
-    name: z.string().openapi({example: "server"}),
-    value: z.string().openapi({example: "localhost"}),
-    description: z.string().openapi({example: "The server we are going to connect to"}),
-    roles: z.string().openapi({example: "admin"}),
-    module: z.string().openapi({example: "production"}),
-});
-
 app.openapi(
     createRoute({
         tags: ["ocme"],
         summary: "Get all current info",
         method: "get",
-        path: "/getinfo",
-        request: {
-            body: {
-                content: {
-                    "application/json": {schema: AddSetting},
-                },
-            },
-        },
-        responses: {
-            200: {
-                content: {
-                    "application/json": {
-                        schema: z.object({
-                            success: z.boolean().openapi({example: true}),
-                            message: z.string().openapi({example: "Starter"}),
-                            data: z.array(z.object({})).optional().openapi({example: []}),
-                        }),
-                    },
-                },
-                description: "Response message",
-            },
-            400: {
-                content: {
-                    "application/json": {
-                        schema: z.object({
-                            success: z.boolean().openapi({example: false}),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
-                            data: z.array(z.object({})).optional().openapi({example: []}),
-                        }),
-                    },
-                },
-                description: "Internal Server Error",
-            },
-            // 401: {
-            //     content: {
-            //         "application/json": {
-            //             schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}),
-            //         },
-            //     },
-            //     description: "Unauthorized",
-            // },
-            // 500: {
-            //     content: {
-            //         "application/json": {
-            //             schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}),
-            //         },
-            //     },
-            //     description: "Internal Server Error",
-            // },
-        },
+        path: "/getInfo",
+
+        responses: responses(),
     }),
     async (c) => {
         // make sure we have a vaid user being accessed thats really logged in
         apiHit(c, { endpoint: "api/auth/register" });
         try {
-            return c.json({success: true, message: "Ocme Info", data: await getInfo()}, 200);
+            return c.json(
+                { success: true, message: "Ocme Info", data: await getInfo() },
+                200
+            );
         } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+            return c.json(
+                {
+                    success: false,
+                    message: "There was an error getting ocmeInfo data",
+                    data: error,
+                },
+                400
+            );
         }
     }
 );

server/services/ocme/route/getShipmentPallets.ts

@@ -13,7 +13,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/getshipmentpallets",
+    path: "/GetShipmentPallets",
     request: {
       body: {
         content: {
@@ -42,7 +42,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
               data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
@@ -73,9 +76,15 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/getshipmentpallets", lastBody: data });
 
+      console.log;
+
       if (!data.shipmentID) {
         return c.json(
-                    {success: false, message: "You are missing the shipment id please try again.", data: []},
+          {
+            success: false,
+            message: "You are missing the shipment id please try again.",
+            data: [],
+          },
           400
         );
       }
@@ -83,11 +92,22 @@ app.openapi(
       const shiptmentData = await getShipmentPallets(data.shipmentID);
 
       return c.json(
-                {success: shiptmentData.success, message: shiptmentData.message, data: shiptmentData.data ?? []},
+        {
+          success: shiptmentData.success,
+          message: shiptmentData.message,
+          data: shiptmentData.data ?? [],
+        },
         200
       );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting the shipment data.", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting the shipment data.",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/pickedUp.ts

@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
 const PostRunningNr = z.object({
   sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
   runningNr: z.string().optional().openapi({ example: "localhost" }),
-    areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
+  areaFrom: z
+    .string()
+    .optional()
+    .openapi({ example: "The server we are going to connect to" }),
   completed: z.boolean().optional().openapi({ example: true }),
   all: z.boolean().optional().openapi({ example: false }),
 });
@@ -20,7 +23,7 @@ app.openapi(
     method: "patch",
     description:
       "removes the pallet(s) from showing as needed to be picked up, we clear everything related to the pallet number to reduce the risk of a mix, passing `all` will just clear everything that is pending.",
-        path: "/pickedup",
+    path: "/pickedUp",
     request: {
       body: {
         content: {
@@ -49,7 +52,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
               data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
@@ -67,7 +73,12 @@ app.openapi(
       500: {
         content: {
           "application/json": {
-                        schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}),
+            schema: z.object({
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
+            }),
           },
         },
         description: "Internal Server Error",
@@ -80,9 +91,23 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/pickedup", lastBody: data });
       const postPallet = await pickedup(data);
-            return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data}, 200);
+      return c.json(
+        {
+          success: postPallet.success,
+          message: postPallet.message,
+          data: postPallet.data,
+        },
+        200
+      );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting ocmeInfo data",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/postRunningNumber.ts

@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
 const PostRunningNr = z.object({
   sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
   runningNr: z.string().optional().openapi({ example: "localhost" }),
-    areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
+  areaFrom: z
+    .string()
+    .optional()
+    .openapi({ example: "The server we are going to connect to" }),
   completed: z.boolean().optional().openapi({ example: true }),
 });
 
@@ -17,7 +20,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/postrunningnumber",
+    path: "/postRunningNumber",
     request: {
       body: {
         content: {
@@ -46,7 +49,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
               data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
@@ -77,9 +83,23 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
       const postPallet = await postLabelData(data);
-            return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data ?? []}, 200);
+      return c.json(
+        {
+          success: postPallet.success,
+          message: postPallet.message,
+          data: postPallet.data ?? [],
+        },
+        200
+      );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting ocmeInfo data",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/postSSCC.ts

@@ -8,7 +8,10 @@ const app = new OpenAPIHono();
 const PostRunningNr = z.object({
   sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
   runningNr: z.string().optional().openapi({ example: "localhost" }),
-    areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
+  areaFrom: z
+    .string()
+    .optional()
+    .openapi({ example: "The server we are going to connect to" }),
   completed: z.boolean().optional().openapi({ example: true }),
 });
 
@@ -17,7 +20,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/postsscc",
+    path: "/postSSCC",
     request: {
       body: {
         content: {
@@ -46,7 +49,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
               data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
@@ -77,9 +83,23 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
       const postPallet = await postLabelData(data);
-            return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data ?? []}, 200);
+      return c.json(
+        {
+          success: postPallet.success,
+          message: postPallet.message,
+          data: postPallet.data ?? [],
+        },
+        200
+      );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting ocmeInfo data",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/triggerCamera.ts

@@ -0,0 +1,25 @@
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { getInfo } from "../controller/getInfo.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import { triggerScanner } from "../controller/triggerCamera.js";
+
+const app = new OpenAPIHono({ strict: false });
+
+app.openapi(
+  createRoute({
+    tags: ["ocme"],
+    summary: "Triggers the camera at the end of the dyco.",
+    method: "get",
+    path: "/manualCameraTrigger",
+    responses: responses(),
+  }),
+  async (c) => {
+    // make sure we have a vaid user being accessed thats really logged in
+    apiHit(c, { endpoint: "api/auth/register" });
+    const manualTrigger = await triggerScanner();
+    console.log(manualTrigger);
+    return c.json({ success: true, message: "Manual triggered" });
+  }
+);
+export default app;

server/services/rfid/controller/stations/wrappers.ts

@@ -18,18 +18,28 @@ export const wrapperStuff = async (tagData: TagData[]) => {
     tagStuff(tagData);
   } else {
     const tagdata = await tagStuff(tagData);
+    if (!tagData) {
+      createLog("error", "rfid", "rfid", `No tagData was grabbed.`);
+    }
 
     /**
      * we want to make sure this pallet came from a line as its last spot if not we need to have a manual check.
      */
-        const station3 = tagdata.some((n: any) => n.lastareaIn.includes("line3"));
+    if (
+      !Array.isArray(tagdata) &&
+      tagdata?.some((n: any) => n.lastareaIn.includes("line3"))
+    ) {
+      createLog("error", "rfid", "rfid", `Data passed over is not an array.`);
+      return;
+    }
+    const station3 = tagdata; //?.some((n: any) => n.lastareaIn.includes("line3"));
 
     if (!station3) {
       createLog(
         "error",
         "rfid",
         "rfid",
-                `${tagdata.tag}, Did not come from a line please check the pallet and manually print the label.`
+        `${tagdata[0].tag}, Did not come from a line please check the pallet and manually print the label.`
       );
 
       // when we manually run again we want to make sure we read from the 3rd antenna this way we do not get the wrong info.
@@ -38,9 +48,19 @@ export const wrapperStuff = async (tagData: TagData[]) => {
 
     // check if a running number exists
     if (station3.runningNumber) {
-            createLog("info", "rfid", "rfid", `Reprint label ${station3.runningNumber}`);
+      createLog(
+        "info",
+        "rfid",
+        "rfid",
+        `Reprint label ${station3.runningNumber}`
+      );
     } else {
-            createLog("info", "rfid", "rfid", `A new labels will be created and linked to this ${tagdata.tag} tag`);
+      createLog(
+        "info",
+        "rfid",
+        "rfid",
+        `A new labels will be created and linked to this ${tagdata.tag} tag`
+      );
     }
   }
 };

server/services/tcpServer/tcpServer.ts

@@ -8,16 +8,21 @@ import restartTCP from "./route/restartServer.js";
 import { db } from "../../../database/dbclient.js";
 import { settings } from "../../../database/schema/settings.js";
 import { eq } from "drizzle-orm";
+import { postLabelData } from "../ocme/controller/postRunningNr.js";
 
 let tcpServer: net.Server;
 let tcpSockets: Set<net.Socket> = new Set();
 let isServerRunning = false;
 
-const tcpPort = await db.select().from(settings).where(eq(settings.name, "tcpPort"));
+const tcpPort = await db
+    .select()
+    .from(settings)
+    .where(eq(settings.name, "tcpPort"));
 const app = new OpenAPIHono();
 
 export const startTCPServer = () => {
-    if (isServerRunning) return {success: false, message: "Server is already running"};
+    if (isServerRunning)
+        return { success: false, message: "Server is already running" };
 
     tcpServer = net.createServer((socket) => {
         console.log("Client connected");
@@ -25,7 +30,19 @@ export const startTCPServer = () => {
         tcpSockets.add(socket);
         socket.on("data", (data: Buffer) => {
             console.log("Received:", data.toString());
-            socket.write("Message received");
+            const parseData = data.toString("utf-8").trimEnd().split(" ");
+            // hb from the scanners
+            if (parseData[0] === "HB") {
+                return;
+            }
+
+            // alert from the printers
+            if (parseData[0] === "ALERT:" || parseData[0] === "ALERT") {
+                return;
+            }
+
+            // from the wrapper send the data
+            postLabelData(parseData);
         });
 
         socket.on("end", () => {
@@ -40,7 +57,12 @@ export const startTCPServer = () => {
     });
 
     tcpServer.listen(tcpPort[0]?.value ?? 2222, () => {
-        createLog("info", "lst", "tcp", `TCP Server listening on port ${tcpPort[0]?.value ?? 2222}`);
+        createLog(
+            "info",
+            "lst",
+            "tcp",
+            `TCP Server listening on port ${tcpPort[0]?.value ?? 2222}`
+        );
     });
 
     isServerRunning = true;
@@ -49,7 +71,8 @@ export const startTCPServer = () => {
 
 // Function to stop the TCP server
 export const stopTCPServer = () => {
-    if (!isServerRunning) return {success: false, message: "Server is not running"};
+    if (!isServerRunning)
+        return { success: false, message: "Server is not running" };
     for (const socket of tcpSockets) {
         socket.destroy();
     }