Fix type check issues

Author: ArktinenKarpalo

src/app/(infoscreen)/@transit/page.tsx

@@ -6,19 +6,19 @@ import { BusFront } from 'lucide-react';
 const Transit = async () => {
 	const transitData = await getTransitData();
 	let stoptimes = [];
-	for (const stop of transitData.data.stops) {
+	for (const stop of transitData.stops) {
 		const now = Date.now();
 		for (const stoptime of stop.stoptimesWithoutPatterns) {
 			const arrival = new Date(
 				(stoptime.serviceDay + stoptime.realtimeArrival) * 1000
 			);
-			if (arrival - now < 120 * 1000)
+			if (arrival.getTime() - now < 120 * 1000)
 				// Don't show if less than 2 minutes
 				continue;
 			let minutesUntil;
-			if (arrival - now < 1000 * 60 * 15) {
+			if (arrival.getTime() - now < 1000 * 60 * 15) {
 				minutesUntil =
-					Math.floor((0, arrival - now) / 1000 / 60) + ' min';
+					Math.floor((arrival.getTime() - now) / 1000 / 60) + ' min';
 			}
 
 			stoptimes.push({
@@ -70,10 +70,10 @@ const Transit = async () => {
 	}
 	stoptimes = stoptimes.sort((a, b) => {
 		const arrival_diff =
-			Math.floor(a.arrival / 1000 / 60) -
-			Math.floor(b.arrival / 1000 / 60);
+			Math.floor(a.arrival.getTime() / 1000 / 60) -
+			Math.floor(b.arrival.getTime() / 1000 / 60);
 		if (arrival_diff != 0) return arrival_diff;
-		return a.num - b.num;
+		return a.num.localeCompare(b.num);
 	});
 	const leftStoptimes = stoptimes.map((x) => x.el);
 	return (

src/server/transit.ts

@@ -8,7 +8,7 @@ const fetchTag = 'hsl-transit';
 const client = createClient({
 	url: ENDPOINT,
 	headers: {
-		'digitransit-subscription-key': process.env.DIGITRANSIT_TOKEN,
+		'digitransit-subscription-key': process.env.DIGITRANSIT_TOKEN ?? "",
 	},
 	shouldRetry: async (err: NetworkError, retries: number) => {
 		if (retries > 3) {
@@ -17,7 +17,7 @@ const client = createClient({
 		}
 
 		// try again when service unavailable, could be temporary
-		if ([502, 503, 504].some(err.response?.status)) {
+		if (err.response?.status != undefined && [502, 503, 504].includes(err.response.status)) {
 			// wait one second (you can alternatively time the promise resolution to your preference)
 			await new Promise((resolve) => setTimeout(resolve, 1000));
 			return true;
@@ -37,13 +37,38 @@ const client = createClient({
 	},
 });
 
-export const getTransitData = async () => {
+type TransitData = {
+	stops: {
+		gtfsId: string
+		name: string
+		code: string
+		stoptimesWithoutPatterns: {
+			arrivalDelay: number
+			departureDelay: number
+			headsign: string
+			realtime: boolean
+			realtimeArrival: number
+			realtimeDeparture: number
+			realtimeState: string
+			serviceDay: number
+			scheduledArrival: number
+			scheduledDeparture: number
+			trip: {
+				tripHeadsign: string
+				route: {
+					type: number
+				}
+				routeShortName: string
+			}
+		}[]
+	}[]
+}
+
+export const getTransitData = async (): Promise<TransitData> => {
 	'use server';
-	let result;
-	console.log('Fetching transit data');
 	return await new Promise((resolve, reject) => {
-		let result;
-		client.subscribe(
+		let result: TransitData | null | undefined;
+		client.subscribe<TransitData>(
 			{
 				query: `
 {
@@ -75,9 +100,14 @@ export const getTransitData = async () => {
         `,
 			},
 			{
-				next: (data) => (result = data),
-				error: (err) => reject,
-				complete: () => resolve(result),
+				next: (data) => (result = data.data),
+				error: () => reject,
+				complete: () => {
+					if(result)
+						resolve(result)
+					else
+						reject(new Error("received undefined result from transit API"))
+				},
 			}
 		);
 	});