diff --git a/server/services/ocme/controller/triggerCamera.ts b/server/services/ocme/controller/triggerCamera.ts index ef4e7bf..881c430 100644 --- a/server/services/ocme/controller/triggerCamera.ts +++ b/server/services/ocme/controller/triggerCamera.ts @@ -38,9 +38,28 @@ export const triggerScanner = async () => { createLog("info", "wrapperScanner", "ocme", `Triggered`); camera.write("TRIGGER", "utf8"); camera.end(); + setTimeout(() => { + if (!camera.destroyed) { + camera.destroy(); + } + }, 500); resolve({ success: true, message: "Camera was triggered." }); }); + camera.on("end", () => { + setTimeout(() => { + if (!camera.destroyed) { + createLog( + "info", + "ocme", + "ocme", + `Ocme Camera was destroyed, on trigger status` + ); + camera.destroy(); + } + }, 1000); + }); + camera.on("error", (error) => { createLog("error", "wrapperScanner", "ocme", `${error}`); resolve({ @@ -50,7 +69,5 @@ export const triggerScanner = async () => { )}`, }); }); - - resolve({ success: true, message: "Camera was triggered." }); }); }; diff --git a/server/services/ocp/utils/pausePrinter.ts b/server/services/ocp/utils/pausePrinter.ts index cf8fc4b..9109db2 100644 --- a/server/services/ocp/utils/pausePrinter.ts +++ b/server/services/ocp/utils/pausePrinter.ts @@ -42,6 +42,20 @@ export const pausePrinter = async (printerData: any) => { }); }); + pause.on("end", () => { + setTimeout(() => { + if (!pause.destroyed) { + createLog( + "info", + "printerState", + "ocp", + `${printerData.name}: was force closed, in pausing trigger` + ); + pause.destroy(); + } + }, 1000); + }); + resolve({ success: true, message: `${ diff --git a/server/services/ocp/utils/unpausePrinter.ts b/server/services/ocp/utils/unpausePrinter.ts index b0aee91..18df484 100644 --- a/server/services/ocp/utils/unpausePrinter.ts +++ b/server/services/ocp/utils/unpausePrinter.ts @@ -45,6 +45,20 @@ export const unPausePrinter = async (printerData: any) => { }); }); + pause.on("end", () => { + setTimeout(() => { + if (!pause.destroyed) { + createLog( + "info", + "printerState", + "ocp", + `${printerData.name}: was force closed, in unpause menu` + ); + pause.destroy(); + } + }, 1000); + }); + resolve({ success: true, message: `${ diff --git a/server/services/tcpServer/tcpServer.ts b/server/services/tcpServer/tcpServer.ts index bee4951..96b5628 100644 --- a/server/services/tcpServer/tcpServer.ts +++ b/server/services/tcpServer/tcpServer.ts @@ -74,11 +74,23 @@ export const startTCPServer = () => { socket.on("end", () => { createLog("debug", "tcp", "tcp", "Client disconnected"); + // just in case we dont fully disconnect + setTimeout(() => { + if (!socket.destroyed) { + socket.destroy(); + } + }, 1000); tcpSockets.delete(socket); }); socket.on("error", (err: Error) => { createLog("info", "tcp", "tcp", `Socket error:", ${err}`); + // just in case we dont fully disconnect + setTimeout(() => { + if (!socket.destroyed) { + socket.destroy(); + } + }, 1000); tcpSockets.delete(socket); }); });