From cbeae274a479400fe56f475033b4eab94bf3fdb0 Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Sat, 24 May 2025 12:50:58 -0700 Subject: [PATCH] removed console log --- .../socket-events/connect-dispatch.ts | 24 ++++--------------- .../socket-events/connect-pilot.ts | 9 +++---- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts index 7eee5a32..c58d6deb 100644 --- a/apps/dispatch-server/socket-events/connect-dispatch.ts +++ b/apps/dispatch-server/socket-events/connect-dispatch.ts @@ -3,24 +3,15 @@ import { Server, Socket } from "socket.io"; export const handleConnectDispatch = (socket: Socket, io: Server) => - async ({ - logoffTime, - selectedZone, - }: { - logoffTime: string; - selectedZone: string; - }) => { + async ({ logoffTime, selectedZone }: { logoffTime: string; selectedZone: string }) => { try { const user: User = socket.data.user; // User ID aus dem JWT-Token - console.log("User connected to dispatch server"); if (!user) return Error("User not found"); + console.log("Disponent connected:", user.publicId); if (!user.permissions?.includes("DISPO")) { - socket.emit( - "error", - "You do not have permission to connect to the dispatch server.", - ); + socket.emit("error", "You do not have permission to connect to the dispatch server."); return; } @@ -32,9 +23,7 @@ export const handleConnectDispatch = }); if (existingConnection) { - await io - .to(`user:${user.id}`) - .emit("force-disconnect", "double-connection"); + await io.to(`user:${user.id}`).emit("force-disconnect", "double-connection"); await prisma.connectedDispatcher.updateMany({ where: { userId: user.id, @@ -100,7 +89,6 @@ export const handleConnectDispatch = }); socket.on("disconnect", async () => { - console.log("Disconnected from dispatch server"); await prisma.connectedDispatcher.update({ where: { id: connectedDispatcherEntry.id, @@ -112,11 +100,7 @@ export const handleConnectDispatch = io.to("dispatchers").emit("dispatchers-update"); io.to("pilots").emit("dispatchers-update"); }); - socket.on("reconnect", async () => { - console.log("Reconnected to dispatch server"); - }); } catch (error) { console.error("Error connecting to dispatch server:", error); - console.log("Error connecting to dispatch server:", error); } }; diff --git a/apps/dispatch-server/socket-events/connect-pilot.ts b/apps/dispatch-server/socket-events/connect-pilot.ts index 0dc89a86..ba430460 100644 --- a/apps/dispatch-server/socket-events/connect-pilot.ts +++ b/apps/dispatch-server/socket-events/connect-pilot.ts @@ -1,4 +1,4 @@ -import { getPublicUser, prisma } from "@repo/db"; +import { getPublicUser, prisma, User } from "@repo/db"; import { channel } from "diagnostics_channel"; import { Server, Socket } from "socket.io"; @@ -6,7 +6,7 @@ export const handleConnectPilot = (socket: Socket, io: Server) => async ({ logoffTime, stationId }: { logoffTime: string; stationId: string }) => { try { - const user = socket.data.user; // User ID aus dem JWT-Token + const user: User = socket.data.user; // User ID aus dem JWT-Token const userId = socket.data.user.id; // User ID aus dem JWT-Token const Station = await prisma.station.findFirst({ @@ -14,10 +14,10 @@ export const handleConnectPilot = id: parseInt(stationId), }, }); - console.log("Pilot connected:", userId); if (!user) return Error("User not found"); + console.log("Pilot connected:", user.publicId); const existingConnection = await prisma.connectedAircraft.findFirst({ where: { userId: user.id, @@ -73,8 +73,6 @@ export const handleConnectPilot = socket.join(`user:${userId}`); // Join the user-specific room socket.join(`station:${stationId}`); // Join the station-specific room - console.log(`Pilot in: station:${stationId}`); - io.to("dispatchers").emit("pilots-update"); io.to("pilots").emit("pilots-update"); @@ -100,7 +98,6 @@ export const handleConnectPilot = }); socket.on("disconnect", async () => { - console.log("Disconnected from dispatch server"); await prisma.connectedAircraft .update({ where: {