fix(servers): fixed the weird conflict import that happened

server/scripts/updateServers.ts

@@ -4,26 +4,12 @@ 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
@@ -47,32 +33,7 @@ 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",
@@ -116,15 +77,6 @@ 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
@@ -135,12 +87,6 @@ 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();
@@ -148,12 +94,6 @@ 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();
@@ -161,13 +101,6 @@ 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) {
@@ -181,27 +114,12 @@ export const updateServer = async (
                     await db
                         .update(serverData)
                         .set({ lastUpdated: sql`NOW()`, isUpgrading: false })
-            .where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
+                        .where(
-          createLog(
+                            eq(
-            "info",
+                                serverData.plantToken,
-            "lst",
+                                server?.toLowerCase() ?? ""
-            "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
-            .update(serverData)
-            .set({ lastUpdated: sql`NOW()`, isUpgrading: false })
-            .where(eq(serverData.plantToken, server?.toLowerCase() ?? ""));
                     createLog(
                         "info",
                         "lst",
@@ -217,12 +135,6 @@ 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.`,
@@ -230,9 +142,6 @@ export const updateServer = async (
             } else {
                 const errorMessage = `Process exited with code ${code}`;
 
-        // if (count >= servers) {
-        //     //onClose(code);
-        // }
                 // if (count >= servers) {
                 //     //onClose(code);
                 // }
@@ -243,12 +152,6 @@ 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) => {
@@ -257,18 +160,10 @@ 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",
@@ -279,20 +174,16 @@ export async function processAllServers(devApp: string) {
     let count = 1;
     for (const server of servers) {
         try {
-      const updateToServer = await updateServer(devApp, server.plantToken);
+            const updateToServer = await updateServer(
-      createLog("info", "lst", "serverUpdater", `${server.sName} was updated.`);
+                devApp,
-      count = count + 1;
+                server.plantToken
+            );
             createLog(
                 "info",
                 "lst",
                 "serverUpdater",
-    `Running the update on all servers`
+                `${server.sName} was updated.`
             );
-  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;
 
             //return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
@@ -306,15 +197,4 @@ 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}`};
-    }
-  }
 }