Revert "PR v2.0.7"

apps/dispatch/app/_store/audioStore.ts

@@ -21,13 +21,12 @@ import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
 import { changeDispatcherAPI } from "_querys/dispatcher";
 import { getRadioStream } from "_helpers/radioEffect";
 import { usePilotConnectionStore } from "_store/pilot/connectionStore";
-import { ROOMS } from "_data/livekitRooms";
 
 let interval: NodeJS.Timeout;
 
 type TalkState = {
 	addSpeakingParticipant: (participant: Participant) => void;
-	connect: (room: (typeof ROOMS)[number] | undefined, role: string) => void;
+	connect: (roomName: string, role: string) => void;
 	connectionQuality: ConnectionQuality;
 	disconnect: () => void;
 	isTalking: boolean;
@@ -45,8 +44,6 @@ type TalkState = {
 		radioVolume: number;
 		dmeVolume: number;
 	};
-	selectedRoom?: (typeof ROOMS)[number];
-	setSelectedRoom: (room: (typeof ROOMS)[number]) => void;
 	speakingParticipants: Participant[];
 	state: "connecting" | "connected" | "disconnected" | "error";
 	toggleTalking: () => void;
@@ -75,10 +72,6 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 	remoteParticipants: 0,
 	connectionQuality: ConnectionQuality.Unknown,
 	room: null,
-	selectedRoom: ROOMS[0],
-	setSelectedRoom: (room) => {
-		set({ selectedRoom: room });
-	},
 	resetSpeakingParticipants: (source: string) => {
 		set({
 			speakingParticipants: [],
@@ -124,11 +117,11 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 			(oldSettings.micDeviceId !== newSettings.micDeviceId ||
 				oldSettings.micVolume !== newSettings.micVolume)
 		) {
-			const { room, disconnect, connect, selectedRoom } = get();
+			const { room, disconnect, connect } = get();
 			const role = room?.localParticipant.attributes.role;
-			if (selectedRoom || role) {
+			if (room?.name || role) {
 				disconnect();
-				connect(selectedRoom, role || "user");
+				connect(room?.name || "", role || "user");
 			}
 		}
 	},
@@ -167,7 +160,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 
 		set((state) => ({ isTalking: !state.isTalking, transmitBlocked: false }));
 	},
-	connect: async (_room, role) => {
+	connect: async (roomName, role) => {
 		set({ state: "connecting" });
 
 		try {
@@ -179,16 +172,13 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 				connectedRoom.removeAllListeners();
 			}
 
-			const { selectedRoom } = get();
-
 			const url = process.env.NEXT_PUBLIC_LIVEKIT_URL;
 			if (!url) return console.error("NEXT_PUBLIC_LIVEKIT_URL not set");
 
-			const token = await getToken(_room?.name || selectedRoom?.name || "VAR_LST_RD_01");
+			const token = await getToken(roomName);
 			if (!token) throw new Error("Fehlende Berechtigung");
 			const room = new Room({});
 			await room.prepareConnection(url, token);
-			const roomConnectedSound = new Audio("/sounds/403.wav");
 			room
 				// Connection events
 				.on(RoomEvent.Connected, async () => {
@@ -196,7 +186,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 
 					if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
 						changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
-							zone: _room?.name || selectedRoom?.name || "VAR_LST_RD_01",
+							zone: roomName,
 							ghostMode: dispatchState.ghostMode,
 						});
 					}
@@ -218,7 +208,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 						source: Track.Source.Microphone,
 					});
 					await publishedTrack.mute();
-					roomConnectedSound.play();
+
 					set({ localRadioTrack: publishedTrack });
 
 					set({ state: "connected", room, isTalking: false, message: null });

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

@@ -27,7 +27,7 @@ export const useDispatchConnectionStore = create<ConnectionStore>((set) => ({
 	setHideDraftMissions: (hide) => set({ hideDraftMissions: hide }),
 	connectedDispatcher: null,
 	message: "",
-	selectedZone: "VAR_LST_RD_01",
+	selectedZone: "LST_01",
 	logoffTime: "",
 	ghostMode: false,
 	connect: async (uid, selectedZone, logoffTime, ghostMode) =>
@@ -48,7 +48,7 @@ export const useDispatchConnectionStore = create<ConnectionStore>((set) => ({
 
 dispatchSocket.on("connect", () => {
 	const { logoffTime, selectedZone, ghostMode } = useDispatchConnectionStore.getState();
-	useAudioStore.getState().connect(undefined, selectedZone || "Leitstelle");
+	useAudioStore.getState().connect("LST_01", selectedZone || "Leitstelle");
 	dispatchSocket.emit("connect-dispatch", {
 		logoffTime,
 		selectedZone,

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

@@ -1,92 +1,173 @@
+import { MissionSdsLog, Station } from "@repo/db";
+import { fmsStatusDescription } from "_data/fmsStatusDescription";
+import { DisplayLineProps } from "(app)/pilot/_components/mrt/Mrt";
 import { create } from "zustand";
+import { syncTabs } from "zustand-sync-tabs";
 
-interface SetOffPageParams {
-	page: "off";
-}
-
-interface SetStartupPageParams {
-	page: "startup";
+interface SetSdsPageParams {
+	page: "sds";
+	station: Station;
+	sdsMessage: MissionSdsLog;
 }
 
 interface SetHomePageParams {
 	page: "home";
+	station: Station;
+	fmsStatus: string;
 }
 
-interface SetVoicecallPageParams {
-	page: "voice-call";
-}
-interface SetSdsReceivedPopupParams {
-	popup: "sds-received";
+interface SetSendingStatusPageParams {
+	page: "sending-status";
+	station: Station;
 }
 
-interface SetGroupSelectionPopupParams {
-	popup: "group-selection";
+interface SetNewStatusPageParams {
+	page: "new-status";
+	station: Station;
 }
 
-interface SetStatusSentPopupParams {
-	popup: "status-sent";
-}
-
-interface SetLoginPopupParams {
-	popup: "login";
-}
-
-interface SetSdsSentPopupParams {
-	popup: "sds-sent";
-}
-
-export type SetPageParams =
+type SetPageParams =
 	| SetHomePageParams
-	| SetOffPageParams
-	| SetStartupPageParams
-	| SetVoicecallPageParams;
-
-export type SetPopupParams =
-	| SetStatusSentPopupParams
-	| SetSdsSentPopupParams
-	| SetGroupSelectionPopupParams
-	| SetSdsReceivedPopupParams
-	| SetLoginPopupParams;
-
-interface StringifiedData {
-	sdsText?: string;
-	sentSdsText?: string;
-
-	groupSelectionGroupId?: string;
-	callTextHeader?: string;
-}
+	| SetSendingStatusPageParams
+	| SetSdsPageParams
+	| SetNewStatusPageParams;
 
 interface MrtStore {
 	page: SetPageParams["page"];
-	popup?: SetPopupParams["popup"];
 
-	stringifiedData: StringifiedData;
-	setStringifiedData: (data: Partial<StringifiedData>) => void;
+	lines: DisplayLineProps[];
 
 	setPage: (pageData: SetPageParams) => void;
-	setPopup: (popupData: SetPopupParams | null) => void;
-
-	// internal
-	updateIntervall?: number;
-	nightMode: boolean;
-	setNightMode: (nightMode: boolean) => void;
+	setLines: (lines: MrtStore["lines"]) => void;
 }
 
-export const useMrtStore = create<MrtStore>((set) => ({
-	page: "off",
-	nightMode: false,
-	stringifiedData: {
-		groupSelectionGroupId: "2201",
-	},
-	setNightMode: (nightMode) => set({ nightMode }),
-	setStringifiedData: (data) =>
-		set((state) => ({
-			stringifiedData: { ...state.stringifiedData, ...data },
-		})),
-	setPopup: (popupData) => {
-		set({ popup: popupData ? popupData.popup : undefined });
-	},
-	setPage: (pageData) => {
-		set({ page: pageData.page });
-	},
-}));
+export const useMrtStore = create<MrtStore>(
+	syncTabs(
+		(set) => ({
+			page: "home",
+			pageData: {
+				message: "",
+			},
+			lines: [
+				{
+					textLeft: "VAR.#",
+					textSize: "2",
+				},
+				{
+					textLeft: "No Data",
+					textSize: "3",
+				},
+			],
+			setLines: (lines) => set({ lines }),
+			setPage: (pageData) => {
+				switch (pageData.page) {
+					case "home": {
+						const { station, fmsStatus } = pageData as SetHomePageParams;
+						set({
+							page: "home",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textLeft: fmsStatus,
+									style: { fontWeight: "extrabold" },
+									textSize: "4",
+								},
+								{
+									textLeft: fmsStatusDescription[fmsStatus],
+									textSize: "1",
+								},
+							],
+						});
+						break;
+					}
+
+					case "sending-status": {
+						const { station } = pageData as SetSendingStatusPageParams;
+						set({
+							page: "sending-status",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textMid: "sending...",
+									style: { fontWeight: "bold" },
+									textSize: "4",
+								},
+								{
+									textLeft: "Status wird gesendet...",
+									textSize: "1",
+								},
+							],
+						});
+						break;
+					}
+					case "new-status": {
+						const { station } = pageData as SetNewStatusPageParams;
+						set({
+							page: "new-status",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textLeft: "empfangen",
+									style: { fontWeight: "bold" },
+									textSize: "4",
+								},
+							],
+						});
+						break;
+					}
+					case "sds": {
+						const { sdsMessage } = pageData as SetSdsPageParams;
+						const msg = sdsMessage.data.message;
+						set({
+							page: "sds",
+							lines: [
+								{
+									textLeft: `SDS-Nachricht`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{
+									textLeft: msg,
+									style: {
+										whiteSpace: "normal",
+										overflowWrap: "break-word",
+										wordBreak: "break-word",
+										display: "block",
+										maxWidth: "100%",
+										maxHeight: "100%",
+										overflow: "auto",
+										textOverflow: "ellipsis",
+										lineHeight: "1.2em",
+									},
+									textSize: "2",
+								},
+							],
+						});
+						break;
+					}
+					default:
+						set({ page: "home" });
+						break;
+				}
+			},
+		}),
+		{
+			name: "mrt-store", // unique name
+		},
+	),
+);

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

@@ -86,7 +86,7 @@ pilotSocket.on("connect", () => {
 	usePilotConnectionStore.setState({ status: "connected", message: "" });
 	const { logoffTime, selectedStation, debug } = usePilotConnectionStore.getState();
 	dispatchSocket.disconnect();
-	useAudioStore.getState().connect(undefined, selectedStation?.bosCallsignShort || "pilot");
+	useAudioStore.getState().connect("LST_01", selectedStation?.bosCallsignShort || "pilot");
 
 	pilotSocket.emit("connect-pilot", {
 		logoffTime,
@@ -109,7 +109,7 @@ pilotSocket.on("connect-message", (data) => {
 });
 
 pilotSocket.on("disconnect", () => {
-	usePilotConnectionStore.setState({ status: "disconnected", connectedAircraft: null });
+	usePilotConnectionStore.setState({ status: "disconnected" });
 	useAudioStore.getState().disconnect();
 });
 
@@ -142,13 +142,11 @@ pilotSocket.on("mission-alert", (data: Mission & { Stations: Station[] }) => {
 });
 
 pilotSocket.on("sds-message", (sdsMessage: MissionSdsLog) => {
-	console.log("Received sds-message via socket:", sdsMessage);
 	const station = usePilotConnectionStore.getState().selectedStation;
 	if (!station) return;
-	useMrtStore.getState().setPopup({
-		popup: "sds-received",
-	});
-	useMrtStore.getState().setStringifiedData({
-		sdsText: sdsMessage.data.message,
+	useMrtStore.getState().setPage({
+		page: "sds",
+		station,
+		sdsMessage,
 	});
 });

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

@@ -1,6 +1,7 @@
 import { Mission, Station, User } from "@repo/db";
 import { DisplayLineProps } from "(app)/pilot/_components/dme/Dme";
 import { create } from "zustand";
+import { syncTabs } from "zustand-sync-tabs";
 
 interface SetHomePageParams {
 	page: "home";
@@ -44,190 +45,197 @@ interface MrtStore {
 
 let interval: NodeJS.Timeout | null = null;
 
-export const useDmeStore = create<MrtStore>((set) => ({
-	page: "home",
-	pageData: {
-		message: "",
-	},
-	lines: [
-		{
-			textLeft: "",
-		},
-		{
-			textMid: "VAR . DME# No Data",
-			textSize: "2",
-		},
-		{
-			textLeft: "",
-		},
-	],
-	setLines: (lines) => set({ lines }),
-	latestMission: null,
-	setPage: (pageData) => {
-		if (interval) clearInterval(interval);
-		switch (pageData.page) {
-			case "home": {
-				const setHomePage = () =>
-					set({
-						page: "home",
-						lines: [
-							{
-								textMid: pageData.station.bosCallsign
-									? `${pageData.station.bosCallsign}`
-									: "no Data",
-								style: { fontWeight: "bold" },
-							},
-							{ textMid: "⠀" },
-							{
-								textMid: new Date().toLocaleDateString("de-DE", {
-									year: "numeric",
-									month: "2-digit",
-									day: "2-digit",
-								}),
-							},
-							{
-								textMid: new Date().toLocaleTimeString(),
-								style: { fontWeight: "bold" },
-							},
-							{ textMid: "⠀" },
-							{
-								textMid: `${pageData.user.lastname} ${pageData.user.firstname}`,
-							},
-							{ textMid: "⠀" },
-						],
-					});
-				setHomePage();
+export const useDmeStore = create<MrtStore>(
+	syncTabs(
+		(set) => ({
+			page: "home",
+			pageData: {
+				message: "",
+			},
+			lines: [
+				{
+					textLeft: "",
+				},
+				{
+					textMid: "VAR . DME# No Data",
+					textSize: "2",
+				},
+				{
+					textLeft: "",
+				},
+			],
+			setLines: (lines) => set({ lines }),
+			latestMission: null,
+			setPage: (pageData) => {
+				if (interval) clearInterval(interval);
+				switch (pageData.page) {
+					case "home": {
+						const setHomePage = () =>
+							set({
+								page: "home",
+								lines: [
+									{
+										textMid: pageData.station.bosCallsign
+											? `${pageData.station.bosCallsign}`
+											: "no Data",
+										style: { fontWeight: "bold" },
+									},
+									{ textMid: "⠀" },
+									{
+										textMid: new Date().toLocaleDateString("de-DE", {
+											year: "numeric",
+											month: "2-digit",
+											day: "2-digit",
+										}),
+									},
+									{
+										textMid: new Date().toLocaleTimeString(),
+										style: { fontWeight: "bold" },
+									},
+									{ textMid: "⠀" },
+									{
+										textMid: `${pageData.user.lastname} ${pageData.user.firstname}`,
+									},
+									{ textMid: "⠀" },
+								],
+							});
+						setHomePage();
 
-				interval = setInterval(() => {
-					setHomePage();
-				}, 1000);
-				break;
-			}
+						interval = setInterval(() => {
+							setHomePage();
+						}, 1000);
+						break;
+					}
 
-			case "new-mission": {
-				set({
-					page: "new-mission",
-					lines: [
-						{ textMid: "⠀" },
-						{
-							textMid: "new mission received",
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			case "mission": {
-				set({
-					latestMission: pageData.mission,
-					page: "mission",
-					lines: [
-						{
-							textLeft: `${pageData.mission.missionKeywordAbbreviation}`,
-							textRight: pageData.mission.Stations.map((s) => s.bosCallsignShort).join(","),
-							style: { fontWeight: "bold" },
-						},
-						...(pageData.mission.type == "primär"
-							? [
-									{
-										textMid: `${pageData.mission.missionKeywordName}`,
-										style: { fontWeight: "bold" },
-									},
-								]
-							: []),
+					case "new-mission": {
+						set({
+							page: "new-mission",
+							lines: [
+								{ textMid: "⠀" },
+								{
+									textMid: "new mission received",
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					case "mission": {
+						set({
+							latestMission: pageData.mission,
+							page: "mission",
+							lines: [
+								{
+									textLeft: `${pageData.mission.missionKeywordAbbreviation}`,
+									textRight: pageData.mission.Stations.map((s) => s.bosCallsignShort).join(","),
+									style: { fontWeight: "bold" },
+								},
+								...(pageData.mission.type == "primär"
+									? [
+											{
+												textMid: `${pageData.mission.missionKeywordName}`,
+												style: { fontWeight: "bold" },
+											},
+										]
+									: []),
 
-						{ textLeft: `${pageData.mission.addressStreet}` },
-						{
-							textLeft: `${pageData.mission.addressZip} ${pageData.mission.addressCity}`,
-						},
-						{
-							textMid: "Weitere Standortinformationen:",
-							style: { fontWeight: "bold" },
-						},
-						{
-							textLeft: pageData.mission.addressAdditionalInfo || "keine Daten",
-						},
-						...(pageData.mission.type === "sekundär"
-							? [
-									{
-										textMid: "Zielort:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.addressMissionDestination || "keine Daten",
-									},
-								]
-							: []),
-						...(pageData.mission.missionPatientInfo &&
-						pageData.mission.missionPatientInfo.length > 0
-							? [
-									{
-										textMid: "Patienteninfos:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.missionPatientInfo,
-									},
-								]
-							: []),
-						...(pageData.mission.missionAdditionalInfo &&
-						pageData.mission.missionAdditionalInfo.length > 0
-							? [
-									{
-										textMid: "Weitere Infos:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.missionAdditionalInfo,
-									},
-								]
-							: []),
-					],
-				});
-				break;
-			}
-			case "error": {
-				set({
-					page: "error",
-					lines: [
-						{ textMid: "Fehler:" },
-						{
-							textMid: pageData.error,
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			case "acknowledge": {
-				set({
-					page: "acknowledge",
-					lines: [
-						{ textMid: "⠀" },
-						{
-							textMid: "Einsatz angenommen",
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			default:
-				set({
-					page: "error",
-					lines: [
-						{ textMid: "Fehler:" },
-						{
-							textMid: `Unbekannte Seite`,
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-		}
-	},
-}));
+								{ textLeft: `${pageData.mission.addressStreet}` },
+								{
+									textLeft: `${pageData.mission.addressZip} ${pageData.mission.addressCity}`,
+								},
+								{
+									textMid: "Weitere Standortinformationen:",
+									style: { fontWeight: "bold" },
+								},
+								{
+									textLeft: pageData.mission.addressAdditionalInfo || "keine Daten",
+								},
+								...(pageData.mission.type === "sekundär"
+									? [
+											{
+												textMid: "Zielort:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.addressMissionDestination || "keine Daten",
+											},
+										]
+									: []),
+								...(pageData.mission.missionPatientInfo &&
+								pageData.mission.missionPatientInfo.length > 0
+									? [
+											{
+												textMid: "Patienteninfos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionPatientInfo,
+											},
+										]
+									: []),
+								...(pageData.mission.missionAdditionalInfo &&
+								pageData.mission.missionAdditionalInfo.length > 0
+									? [
+											{
+												textMid: "Weitere Infos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionAdditionalInfo,
+											},
+										]
+									: []),
+							],
+						});
+						break;
+					}
+					case "error": {
+						set({
+							page: "error",
+							lines: [
+								{ textMid: "Fehler:" },
+								{
+									textMid: pageData.error,
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					case "acknowledge": {
+						set({
+							page: "acknowledge",
+							lines: [
+								{ textMid: "⠀" },
+								{
+									textMid: "Einsatz angenommen",
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					default:
+						set({
+							page: "error",
+							lines: [
+								{ textMid: "Fehler:" },
+								{
+									textMid: `Unbekannte Seite`,
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+				}
+			},
+		}),
+		{
+			name: "dme-store", // unique name
+		},
+	),
+);