Merge branch 'main' of https://github.com/sebastiankrll/simradar24

Author: sebastiankrll

apps/api/src/index.ts

@@ -1,6 +1,6 @@
 import "dotenv/config";
-import { pgGetTrackPointsByid } from "@sk/db/pg";
-import { rdsGetRingStorage, rdsGetSingle } from "@sk/db/redis";
+import { pgGetAirportPilots, pgGetTrackPointsByid } from "@sk/db/pg";
+import { rdsGetMultiple, rdsGetRingStorage, rdsGetSingle } from "@sk/db/redis";
 import cors from "cors";
 import express from "express";
 
@@ -59,7 +59,7 @@ app.get("/data/init", async (_req, res) => {
 app.get("/data/pilot/:id", async (req, res) => {
 	try {
 		const { id } = req.params;
-		console.log("Requested pilot:", id);
+		// console.log("Requested pilot:", id);
 
 		const pilot = await rdsGetSingle(`pilot:${id}`);
 		if (!pilot) return res.status(404).json({ error: "Pilot not found" });
@@ -74,7 +74,7 @@ app.get("/data/pilot/:id", async (req, res) => {
 app.get("/data/airport/:icao", async (req, res) => {
 	try {
 		const { icao } = req.params;
-		console.log("Requested airport:", icao);
+		// console.log("Requested airport:", icao);
 
 		const airport = await rdsGetSingle(`airport:${icao}`);
 		if (!airport) return res.status(404).json({ error: "Airport not found" });
@@ -86,15 +86,16 @@ app.get("/data/airport/:icao", async (req, res) => {
 	}
 });
 
-app.get("/data/controller/:callsign", async (req, res) => {
+app.get("/data/controllers/:callsigns", async (req, res) => {
 	try {
-		const { callsign } = req.params;
-		console.log("Requested controller:", callsign);
+		const { callsigns } = req.params;
+		// console.log("Requested controller:", callsigns);
 
-		const controller = await rdsGetSingle(`controller:${callsign}`);
-		if (!controller) return res.status(404).json({ error: "Controller not found" });
+		const controllers = await rdsGetMultiple("controller", callsigns.split(","));
+		const validControllers = controllers.filter((controller) => controller !== null);
+		if (!validControllers) return res.status(404).json({ error: "Controller not found" });
 
-		res.json(controller);
+		res.json(validControllers);
 	} catch (err) {
 		console.error(err);
 		res.status(500).json({ error: "Internal server error" });
@@ -104,7 +105,7 @@ app.get("/data/controller/:callsign", async (req, res) => {
 app.get("/data/track/:id", async (req, res) => {
 	try {
 		const { id } = req.params;
-		console.log("Requested track:", id);
+		// console.log("Requested track:", id);
 
 		const trackPoints = await pgGetTrackPointsByid(id);
 
@@ -118,7 +119,7 @@ app.get("/data/track/:id", async (req, res) => {
 app.get("/data/aircraft/:reg", async (req, res) => {
 	try {
 		const { reg } = req.params;
-		console.log("Requested aircraft:", reg);
+		// console.log("Requested aircraft:", reg);
 
 		const aircraft = await rdsGetSingle(`fleet:${reg}`);
 		if (!aircraft) return res.status(404).json({ error: "Aircraft not found" });
@@ -144,6 +145,23 @@ app.get("/data/dashboard/", async (_req, res) => {
 	}
 });
 
+// GET /data/airport/<icao>/flights?direction=<direction>&limit=<limit>&cursor=<base64string>
+app.get("/data/airport/:icao/flights", async (req, res) => {
+	try {
+		const icao = String(req.params.icao).toUpperCase();
+		const direction = (String(req.query.direction || "dep").toLowerCase() === "arr" ? "arr" : "dep") as "dep" | "arr";
+		const limit = Math.max(1, Math.min(200, Number(req.query.limit) || 20));
+		const cursor = typeof req.query.cursor === "string" ? req.query.cursor : undefined;
+		const afterCursor = typeof req.query.afterCursor === "string" ? req.query.afterCursor : undefined;
+
+		const data = await pgGetAirportPilots(icao, direction, limit, cursor, afterCursor);
+		res.json(data);
+	} catch (err) {
+		console.error(err);
+		res.status(500).json({ error: "Internal server error" });
+	}
+});
+
 const PORT = process.env.API_PORT || 3001;
 app.listen(PORT, () => {
 	console.log(`Express API listening on port ${PORT}`);

apps/ingestion/package.json

@@ -10,13 +10,15 @@
 	},
 	"devDependencies": {
 		"@sk/typescript-config": "*",
+		"@types/xml2js": "^0.4.14",
 		"tsup": "^8.5.0",
 		"typescript": "^5.9.3"
 	},
 	"dependencies": {
 		"@sk/db": "*",
 		"@sk/types": "*",
 		"axios": "^1.13.2",
-		"dotenv": "^17.2.3"
+		"dotenv": "^17.2.3",
+		"xml2js": "^0.6.2"
 	}
 }

apps/ingestion/src/airport.ts

@@ -1,11 +1,43 @@
+import { promisify } from "node:util";
+import * as zlib from "node:zlib";
 import type { AirportDelta, AirportLong, AirportShort, PilotLong } from "@sk/types/vatsim";
+import axios from "axios";
+import { parseStringPromise } from "xml2js";
+
+interface MetarXML {
+	response?: {
+		data?: Array<{
+			METAR?: Array<{
+				station_id?: string[];
+				raw_text?: string[];
+			}>;
+		}>;
+	};
+}
+
+interface TafXML {
+	response?: {
+		data?: Array<{
+			TAF?: Array<{
+				station_id?: string[];
+				raw_text?: string[];
+			}>;
+		}>;
+	};
+}
+
+const METAR_URL = "https://aviationweather.gov/data/cache/metars.cache.xml.gz";
+const TAF_URL = "https://aviationweather.gov/data/cache/tafs.cache.xml.gz";
+const WEATHER_FETCH_INTERVAL = 600_000;
 
 let cached: AirportLong[] = [];
 let deleted: string[] = [];
 let updated: AirportShort[] = [];
 let added: AirportShort[] = [];
 
-export function mapAirports(pilotsLong: PilotLong[]): AirportLong[] {
+export async function mapAirports(pilotsLong: PilotLong[]): Promise<AirportLong[]> {
+	await updateWeather();
+
 	const airportRecord: Record<string, AirportLong> = {};
 	const routeRecord: Record<string, Map<string, number>> = {};
 
@@ -59,18 +91,38 @@ export function mapAirports(pilotsLong: PilotLong[]): AirportLong[] {
 		const routes = routeRecord[icao];
 		if (!routes) continue;
 
-		let busiestRoute = "-";
-		let maxFlights = 0;
+		let busiestDeparture = "-";
+		let busiestArrival = "-";
+		let busiestDepCount = 0;
+		let busiestArrCount = 0;
+		let uniqueDepartures = 0;
+		let uniqueArrivals = 0;
 
 		routes.forEach((count, route) => {
-			if (count > maxFlights) {
-				maxFlights = count;
-				busiestRoute = route;
+			const [depIcao, arrIcao] = route.split("-");
+			if (depIcao === icao) {
+				uniqueDepartures++;
+				if (count > busiestDepCount) {
+					busiestDeparture = route;
+					busiestDepCount = count;
+				}
+			} else if (arrIcao === icao) {
+				uniqueArrivals++;
+				if (count > busiestArrCount) {
+					busiestArrival = route;
+					busiestArrCount = count;
+				}
 			}
 		});
 
-		airportRecord[icao].busiest_route = busiestRoute;
-		airportRecord[icao].total_routes = routes.size;
+		airportRecord[icao].busiest = {
+			departure: busiestDeparture,
+			arrival: busiestArrival,
+		};
+		airportRecord[icao].unique = {
+			departures: uniqueDepartures,
+			arrivals: uniqueArrivals,
+		};
 	}
 
 	const airportsLong = Object.values(airportRecord);
@@ -109,8 +161,10 @@ function initAirportRecord(icao: string): AirportLong {
 		icao: icao,
 		dep_traffic: { traffic_count: 0, average_delay: 0, flights_delayed: 0 },
 		arr_traffic: { traffic_count: 0, average_delay: 0, flights_delayed: 0 },
-		busiest_route: "",
-		total_routes: 0,
+		busiest: { departure: "-", arrival: "-" },
+		unique: { departures: 0, arrivals: 0 },
+		metar: getMetar(icao),
+		taf: getTaf(icao),
 	};
 }
 
@@ -129,3 +183,72 @@ function calculateArrivalDelay(pilot: PilotLong): number {
 
 	return Math.min(Math.max(delay_min, 0), 120);
 }
+
+const gunzip = promisify(zlib.gunzip);
+let metarCache: Map<string, string> = new Map();
+let tafCache: Map<string, string> = new Map();
+let lastWeatherFetch = 0;
+
+async function fetchWeather(url: string): Promise<MetarXML | TafXML> {
+	const response = await axios.get<Buffer>(url, {
+		responseType: "arraybuffer",
+	});
+
+	const decompressed = await gunzip(response.data);
+	const xml = decompressed.toString("utf-8");
+
+	const parsed = (await parseStringPromise(xml)) as MetarXML | TafXML;
+
+	return parsed;
+}
+
+async function updateWeather(): Promise<void> {
+	if (Date.now() - lastWeatherFetch < WEATHER_FETCH_INTERVAL) {
+		return;
+	}
+	lastWeatherFetch = Date.now();
+
+	try {
+		const parsedMetar = (await fetchWeather(METAR_URL)) as MetarXML;
+		const parsedTaf = (await fetchWeather(TAF_URL)) as TafXML;
+
+		const metars = parsedMetar?.response?.data?.[0]?.METAR || [];
+		const tafs = parsedTaf?.response?.data?.[0]?.TAF || [];
+
+		const newMetarCache = new Map<string, string>();
+		const newTafCache = new Map<string, string>();
+
+		for (const metar of metars) {
+			const icao = metar.station_id?.[0];
+			const raw = metar.raw_text?.[0];
+
+			if (icao && raw) {
+				newMetarCache.set(icao, raw);
+			}
+		}
+
+		for (const taf of tafs) {
+			const icao = taf.station_id?.[0];
+			const raw = taf.raw_text?.[0];
+
+			if (icao && raw) {
+				newTafCache.set(icao, raw);
+			}
+		}
+
+		metarCache = newMetarCache;
+		tafCache = newTafCache;
+
+		// console.log(`✅ Updated ${metarCache.size} METAR entries and ${tafCache.size} TAF entries`);
+	} catch (error) {
+		console.error("❌ Error fetching weather data:", error instanceof Error ? error.message : error);
+	}
+}
+
+export function getMetar(icao: string): string | null {
+	return metarCache.get(icao) || null;
+}
+
+export function getTaf(icao: string): string | null {
+	return tafCache.get(icao) || null;
+}