Remove /api prefix from API routes and update configs

API endpoints in the Express server no longer use the /api prefix. Updated all frontend fetch calls to match the new routes. Adjusted docker-compose.prod.yml to use path-based routing and strip prefixes for both API and WebSocket services, ensuring compatibility with Traefik routing and new public URLs.

Author: sebastiankrll

apps/api/src/index.ts

@@ -8,7 +8,7 @@ const app = express();
 app.use(cors());
 app.use(express.json());
 
-app.get("/api/static/versions", async (_req, res) => {
+app.get("/static/versions", async (_req, res) => {
 	try {
 		const airportsVersion = await rdsGetSingle("static_airports:version");
 		const firsVersion = await rdsGetSingle("static_firs:version");
@@ -27,7 +27,7 @@ app.get("/api/static/versions", async (_req, res) => {
 	}
 });
 
-app.get("/api/static/:type", async (req, res) => {
+app.get("/static/:type", async (req, res) => {
 	try {
 		const { type } = req.params;
 		const allowedTypes = ["airports", "tracons", "firs", "airlines"];
@@ -44,7 +44,7 @@ app.get("/api/static/:type", async (req, res) => {
 	}
 });
 
-app.get("/api/data/init", async (_req, res) => {
+app.get("/data/init", async (_req, res) => {
 	try {
 		const all = await rdsGetSingle("ws:all");
 		if (!all) return res.status(404).json({ error: "Initial data not found" });
@@ -56,7 +56,7 @@ app.get("/api/data/init", async (_req, res) => {
 	}
 });
 
-app.get("/api/data/pilot/:callsign", async (req, res) => {
+app.get("/data/pilot/:callsign", async (req, res) => {
 	try {
 		const { callsign } = req.params;
 		console.log("Requested pilot:", callsign);
@@ -71,7 +71,7 @@ app.get("/api/data/pilot/:callsign", async (req, res) => {
 	}
 });
 
-app.get("/api/data/airport/:icao", async (req, res) => {
+app.get("/data/airport/:icao", async (req, res) => {
 	try {
 		const { icao } = req.params;
 		console.log("Requested airport:", icao);
@@ -86,7 +86,7 @@ app.get("/api/data/airport/:icao", async (req, res) => {
 	}
 });
 
-app.get("/api/data/controller/:callsign", async (req, res) => {
+app.get("/data/controller/:callsign", async (req, res) => {
 	try {
 		const { callsign } = req.params;
 		console.log("Requested controller:", callsign);
@@ -101,7 +101,7 @@ app.get("/api/data/controller/:callsign", async (req, res) => {
 	}
 });
 
-app.get("/api/data/track/:id", async (req, res) => {
+app.get("/data/track/:id", async (req, res) => {
 	try {
 		const { id } = req.params;
 		console.log("Requested track:", id);

apps/web/storage/cache.ts

@@ -26,7 +26,7 @@ export async function initData(setStatus?: StatusSetter): Promise<void> {
 	await dxInitDatabases();
 	setStatus?.((prev) => ({ ...prev, indexedDB: true }));
 
-	const data = (await fetch(`${BASE_URL}/api/data/init`).then((res) => res.json())) as WsAll;
+	const data = (await fetch(`${BASE_URL}/data/init`).then((res) => res.json())) as WsAll;
 	setStatus?.((prev) => ({ ...prev, initData: true }));
 
 	await initAirportFeatures();
@@ -117,5 +117,5 @@ export async function getCachedFir(id: string): Promise<FIRFeature | null> {
 }
 
 export async function fetchTrackPoints(id: string): Promise<TrackPoint[]> {
-	return await fetch(`${BASE_URL}/api/data/track/${id}`).then((res) => res.json());
+	return await fetch(`${BASE_URL}/data/track/${id}`).then((res) => res.json());
 }

apps/web/storage/dexie.ts

@@ -30,7 +30,7 @@ db.version(1).stores({
 const BASE_URL = process.env.NEXT_PUBLIC_API_URL || "http://localhost:3001";
 
 export async function dxInitDatabases(): Promise<void> {
-	const serverVersions = (await fetch(`${BASE_URL}/api/static/versions`).then((res) => res.json())) as StaticVersions;
+	const serverVersions = (await fetch(`${BASE_URL}/static/versions`).then((res) => res.json())) as StaticVersions;
 	const localVersions: StaticVersions = JSON.parse(localStorage.getItem("databaseVersions") || "{}");
 
 	if (serverVersions.airportsVersion !== localVersions.airportsVersion) {
@@ -67,7 +67,7 @@ export async function dxInitDatabases(): Promise<void> {
 }
 
 async function fetchStaticData(type: string): Promise<any> {
-	const response = await fetch(`${BASE_URL}/api/static/${type}`);
+	const response = await fetch(`${BASE_URL}/static/${type}`);
 	const data = await response.json();
 
 	return data;

docker/docker-compose.prod.yml

@@ -27,8 +27,8 @@ services:
       context: ..
       dockerfile: apps/web/Dockerfile
       args:
-        NEXT_PUBLIC_API_URL: "https://api.radar.skruellex.com"
-        NEXT_PUBLIC_WEBSOCKET_URL: "wss://ws.radar.skruellex.com"
+        NEXT_PUBLIC_API_URL: "https://api.radar.skruellex.com/api"
+        NEXT_PUBLIC_WEBSOCKET_URL: "wss://ws.radar.skruellex.com/ws"
     container_name: sr24_web
     restart: always
     environment:
@@ -69,11 +69,13 @@ services:
       - sr24_backend
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.api.rule=Host(`api.radar.skruellex.com`)"
+      - "traefik.http.routers.api.rule=Host(`radar.skruellex.com`) && PathPrefix(`/api`)"
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.tls=true"
       - "traefik.http.routers.api.tls.certresolver=letsencrypt"
       - "traefik.http.services.api.loadbalancer.server.port=3001"
+      - "traefik.http.middlewares.api-stripprefix.stripprefix.prefixes=/api"
+      - "traefik.http.routers.api.middlewares=api-stripprefix"
       - "traefik.docker.network=traefik_proxy" 
 
   ws:
@@ -96,11 +98,13 @@ services:
       - sr24_backend
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.ws.rule=Host(`ws.radar.skruellex.com`)"
+      - "traefik.http.routers.ws.rule=Host(`radar.skruellex.com`) && PathPrefix(`/ws`)"
       - "traefik.http.routers.ws.entrypoints=websecure"
       - "traefik.http.routers.ws.tls=true"
       - "traefik.http.routers.ws.tls.certresolver=letsencrypt"
       - "traefik.http.services.ws.loadbalancer.server.port=3002"
+      - "traefik.http.middlewares.ws-stripprefix.stripprefix.prefixes=/ws"
+      - "traefik.http.routers.ws.middlewares=ws-stripprefix"
       - "traefik.docker.network=traefik_proxy" 
 
   ingestion: