Simulator nicht verbunden warnung

apps/dispatch-server/socket-events/connect-pilot.ts

@@ -5,7 +5,15 @@ import { Server, Socket } from "socket.io";
 
 export const handleConnectPilot =
 	(socket: Socket, io: Server) =>
-	async ({ logoffTime, stationId }: { logoffTime: string; stationId: string }) => {
+	async ({
+		logoffTime,
+		stationId,
+		debug,
+	}: {
+		logoffTime: string;
+		stationId: string;
+		debug: boolean;
+	}) => {
 		try {
 			if (!stationId) return Error("Station ID is required");
 			const user: User = socket.data.user; // User ID aus dem JWT-Token
@@ -78,8 +86,7 @@ export const handleConnectPilot =
 				return { lat, lng };
 			}
 
-			const randomPos =
+			const randomPos = debug ? getRandomGermanPosition() : undefined;
-				process.env.environment === "development" ? getRandomGermanPosition() : undefined;
 
 			const connectedAircraftEntry = await prisma.connectedAircraft.create({
 				data: {
@@ -87,8 +94,7 @@ export const handleConnectPilot =
 					esimatedLogoutTime: parsedLogoffDate?.toISOString() || null,
 					userId: userId,
 					stationId: parseInt(stationId),
-					lastHeartbeat:
+					lastHeartbeat: debug ? nowPlus2h.toISOString() : undefined,
-						process.env.environment === "development" ? nowPlus2h.toISOString() : undefined,
 					posLat: randomPos?.lat,
 					posLng: randomPos?.lng,
 				},

apps/dispatch/app/(app)/dispatch/_components/pannel/MissionForm.tsx

@@ -41,7 +41,7 @@ export const MissionForm = () => {
 
 	const { data: aircrafts } = useQuery({
 		queryKey: ["aircrafts"],
-		queryFn: getConnectedAircraftsAPI,
+		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10000,
 	});
 

apps/dispatch/app/(app)/pilot/_components/SimConnectionAlert.tsx

@@ -0,0 +1,39 @@
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
+import { AlertTriangle } from "lucide-react";
+import { useEffect, useState } from "react";
+
+export const SimConnectionAlert = ({ lastUpdated }: { lastUpdated?: Date }) => {
+	const [lastHearbeetSeconds, setLastHearbeetSeconds] = useState(0);
+	const { disconnect } = usePilotConnectionStore((state) => state);
+	useEffect(() => {
+		const interval = setInterval(() => {
+			if (lastUpdated) {
+				const now = new Date();
+				const diff = Math.floor((now.getTime() - new Date(lastUpdated).getTime()) / 1000);
+				setLastHearbeetSeconds(diff);
+			} else {
+				setLastHearbeetSeconds(0);
+			}
+		}, 1000);
+
+		return () => clearInterval(interval);
+	}, [lastUpdated]);
+
+	return (
+		<div role="alert" className="alert">
+			<AlertTriangle className="w-6 h-6" />
+			<div>
+				<h3 className="font-bold">
+					Keine Simulator Verbindung{" "}
+					{lastHearbeetSeconds ? `seit ${lastHearbeetSeconds} Sekunden` : "gefunden"}
+				</h3>
+				<div className="text-xs">
+					Wenn dein Simulator abgestürzt ist informiere den Disponenten über den Chat links
+				</div>
+			</div>
+			<button className="btn btn-sm btn-warning" onClick={() => disconnect()}>
+				Verbindung trennen
+			</button>
+		</div>
+	);
+};

apps/dispatch/app/(app)/pilot/_components/navbar/_components/Connection.tsx

@@ -7,6 +7,7 @@ import { getStationsAPI } from "_querys/stations";
 import toast from "react-hot-toast";
 import { editConnectedAircraftAPI } from "_querys/aircrafts";
 import { Prisma } from "@repo/db";
+import { debug } from "console";
 
 export const ConnectionBtn = () => {
 	const modalRef = useRef<HTMLDialogElement>(null);
@@ -14,9 +15,11 @@ export const ConnectionBtn = () => {
 	const [form, setForm] = useState<{
 		logoffTime: string | null;
 		selectedStationId: number | null;
+		debugPosition: boolean;
 	}>({
 		logoffTime: null,
 		selectedStationId: null,
+		debugPosition: false,
 	});
 	const [logoffDebounce, setLogoffDebounce] = useState<NodeJS.Timeout | null>(null);
 
@@ -165,6 +168,21 @@ export const ConnectionBtn = () => {
 							<p className="fieldset-label">Du kannst diese Zeit später noch anpassen.</p>
 						)}
 					</fieldset>
+
+					{session.data?.user.permissions.includes("ADMIN_STATION") && (
+						<fieldset className="fieldset bg-base-100 border-base-300 rounded-box w-full border p-4">
+							<legend className="fieldset-legend">Debug-optionen</legend>
+							<label className="label">
+								<input
+									checked={form.debugPosition}
+									onChange={(e) => setForm({ ...form, debugPosition: e.target.checked })}
+									type="checkbox"
+									className="checkbox"
+								/>
+								Zufalls Position für 2h anzeigen
+							</label>
+						</fieldset>
+					)}
 					<div className="modal-action flex justify-between w-full">
 						<form method="dialog" className="w-full flex justify-between">
 							<button className="btn btn-soft">Zurück</button>
@@ -195,6 +213,7 @@ export const ConnectionBtn = () => {
 												form.logoffTime || "",
 												selectedStation,
 												session.data!.user,
+												form.debugPosition,
 											);
 										}
 									}}

apps/dispatch/app/(app)/pilot/page.tsx

@@ -6,12 +6,28 @@ import { Report } from "../../_components/left/Report";
 import { Dme } from "(app)/pilot/_components/dme/Dme";
 import dynamic from "next/dynamic";
 import { ConnectedDispatcher } from "tracker/_components/ConnectedDispatcher";
+import { useQuery } from "@tanstack/react-query";
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
+import { getAircraftsAPI, getConnectedAircraftsAPI } from "_querys/aircrafts";
+import { checkSimulatorConnected } from "_helpers/simulatorConnected";
+import { SimConnectionAlert } from "(app)/pilot/_components/SimConnectionAlert";
 
 const Map = dynamic(() => import("_components/map/Map"), {
 	ssr: false,
 });
 
 const DispatchPage = () => {
+	const { connectedAircraft, status } = usePilotConnectionStore((state) => state);
+	const { data: ownAircraftArray = [] } = useQuery({
+		queryKey: ["aircrafts", connectedAircraft?.id],
+		queryFn: () =>
+			getAircraftsAPI({
+				id: connectedAircraft?.id,
+			}),
+		refetchInterval: 1000,
+	});
+	const ownAircraft = ownAircraftArray[0];
+	const simulatorConnected = ownAircraft ? checkSimulatorConnected(ownAircraft) : false;
 	return (
 		<div className="relative flex-1 flex transition-all duration-500 ease w-full h-screen overflow-hidden">
 			{/* <MapToastCard2 /> */}
@@ -25,7 +41,10 @@ const DispatchPage = () => {
 				<div className="flex w-2/3 h-full">
 					<div className="relative flex flex-1 h-full">
 						<Map />
-						<div className="absolute top-5 right-10 z-99999">
+						<div className="absolute top-5 right-10 z-99999 space-y-2">
+							{!simulatorConnected && status === "connected" && (
+								<SimConnectionAlert lastUpdated={ownAircraft?.lastHeartbeat} />
+							)}
 							<ConnectedDispatcher />
 						</div>
 					</div>

apps/dispatch/app/_components/map/AircraftMarker.tsx

@@ -382,7 +382,7 @@ const AircraftMarker = ({ aircraft }: { aircraft: ConnectedAircraft & { Station:
 export const AircraftLayer = () => {
 	const { data: aircrafts } = useQuery({
 		queryKey: ["aircrafts"],
-		queryFn: getConnectedAircraftsAPI,
+		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10_000,
 	});
 

apps/dispatch/app/_components/map/MissionMarkers.tsx

@@ -217,7 +217,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
 
 	const { data: aircrafts } = useQuery({
 		queryKey: ["aircrafts"],
-		queryFn: getConnectedAircraftsAPI,
+		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10000,
 	});
 

apps/dispatch/app/_components/map/_components/MarkerCluster.tsx

@@ -139,7 +139,7 @@ export const MarkerCluster = () => {
 	const dispatcherConnected = dispatchState.status === "connected";
 	const { data: aircrafts } = useQuery({
 		queryKey: ["aircrafts"],
-		queryFn: getConnectedAircraftsAPI,
+		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10_000,
 	});
 

apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx

@@ -363,7 +363,7 @@ const Rettungsmittel = ({ mission }: { mission: Mission }) => {
 	);
 	const { data: connectedAircrafts } = useQuery({
 		queryKey: ["aircrafts"],
-		queryFn: getConnectedAircraftsAPI,
+		queryFn: () => getConnectedAircraftsAPI(),
 	});
 	const updateMissionMutation = useMutation({
 		mutationKey: ["missions", "stations-mission", mission.id],

apps/dispatch/app/_querys/aircrafts.ts

@@ -11,6 +11,16 @@ export const getConnectedAircraftsAPI = async () => {
 	return res.data.filter((a) => checkSimulatorConnected(a));
 };
 
+export const getAircraftsAPI = async (filter?: Prisma.ConnectedAircraftWhereInput) => {
+	const res = await axios.get<(ConnectedAircraft & { Station: Station })[]>("/api/aircrafts", {
+		params: { filter: JSON.stringify(filter) },
+	});
+	if (res.status !== 200) {
+		throw new Error("Failed to fetch stations");
+	}
+	return res.data;
+};
+
 export const editConnectedAircraftAPI = async (
 	id: number,
 	mission: Prisma.ConnectedAircraftUpdateInput,

apps/dispatch/app/_store/pilot/connectionStore.ts

@@ -9,7 +9,7 @@ import { useAudioStore } from "_store/audioStore";
 interface ConnectionStore {
 	status: "connected" | "disconnected" | "connecting" | "error";
 	message: string;
-
+	debug: boolean;
 	logoffTime: string;
 	selectedStation: Station | null;
 	connectedAircraft: ConnectedAircraft | null;
@@ -24,6 +24,7 @@ interface ConnectionStore {
 		logoffTime: string,
 		station: Station,
 		user: User,
+		debug?: boolean,
 	) => Promise<void>;
 	disconnect: () => void;
 }
@@ -35,14 +36,16 @@ export const usePilotConnectionStore = create<ConnectionStore>((set) => ({
 	selectedStation: null,
 	connectedAircraft: null,
 	activeMission: null,
+	debug: false,
 
-	connect: async (uid, stationId, logoffTime, station, user) =>
+	connect: async (uid, stationId, logoffTime, station, user, debug) =>
 		new Promise((resolve) => {
 			set({
 				status: "connecting",
 				message: "",
 				selectedStation: station,
 				logoffTime,
+				debug,
 			});
 
 			pilotSocket.auth = { uid };
@@ -64,13 +67,14 @@ export const usePilotConnectionStore = create<ConnectionStore>((set) => ({
 
 pilotSocket.on("connect", () => {
 	usePilotConnectionStore.setState({ status: "connected", message: "" });
-	const { logoffTime, selectedStation } = usePilotConnectionStore.getState();
+	const { logoffTime, selectedStation, debug } = usePilotConnectionStore.getState();
 	dispatchSocket.disconnect();
 	useAudioStore.getState().connect("LST_01", selectedStation?.bosCallsignShort || "pilot");
 
 	pilotSocket.emit("connect-pilot", {
 		logoffTime,
 		stationId: selectedStation?.id,
+		debug,
 	});
 });
 

apps/dispatch/app/api/aircrafts/route.ts

@@ -1,7 +1,7 @@
-import { NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 import { Prisma, prisma } from "@repo/db";
 
-export async function GET(request: Request): Promise<NextResponse> {
+export async function GET(request: NextRequest): Promise<NextResponse> {
 	try {
 		const filter = JSON.parse(
 			new URL(request.url).searchParams.get("filter") || "{}",
@@ -17,6 +17,7 @@ export async function GET(request: Request): Promise<NextResponse> {
 			},
 		});
 
+		console.log("Filter applied:", filter, connectedAircraft);
 		return NextResponse.json(connectedAircraft, {
 			status: 200,
 		});