Prepare KV store for OMM data

Author: MrTalon63

src/main.ts

@@ -20,7 +20,7 @@ new Elysia()
 	.get("/", async () => {
 		const activeGroups = [];
 		for (const group of config.allowedGroups) {
-			const timestamp = await kv.get(`${group}_timestamp`);
+			const timestamp = await kv.get(`${group}_timestamp_tle`);
 			const lastUpdate = timestamp ? new Date(timestamp).toISOString() : "Never";
 			activeGroups.push({ name: group, lastUpdate });
 		}

src/routes/tle.ts

@@ -17,7 +17,7 @@ const tleRoute = new Elysia({ prefix: "/tle" })
 			return new Response(`Group "${group}" is not allowed.`, { status: 403 });
 		}
 
-		let timestamp = await kv.get(`${group}_timestamp`);
+		let timestamp = await kv.get(`${group}_timestamp_tle`);
 		const now = Date.now();
 		const staleDuration = group === "active" ? config.cacheActiveDuration : config.cacheDuration;
 		const isStale = timestamp ? now - timestamp > staleDuration : true;
@@ -28,20 +28,20 @@ const tleRoute = new Elysia({ prefix: "/tle" })
 			return new Response(null, { status: 304, headers: { "Last-Modified": new Date(timestamp).toUTCString(), "Cache-Control": `max-age=${group === "active" ? Math.ceil((config.cacheActiveDuration - (now - timestamp)) / 1000) : Math.ceil((config.cacheDuration - (now - timestamp)) / 1000)}` } });
 		}
 
-		let tle = await kv.get(group);
+		let tle = await kv.get(`${group}_tle`);
 
 		if (!tle) {
 			log.debug(`No cached TLEs for group "${group}". Fetching from Celestrak...`);
 			tle = await tleFetcher(group);
 			timestamp = now;
-			kv.set(group, tle);
-			kv.set(`${group}_timestamp`, timestamp);
+			kv.set(`${group}_tle`, tle);
+			kv.set(`${group}_timestamp_tle`, timestamp);
 		} else if (isStale) {
 			log.debug(`TLEs for group "${group}" are stale. Fetching fresh TLEs...`);
 			tle = await tleFetcher(group);
 			timestamp = now;
-			kv.set(group, tle);
-			kv.set(`${group}_timestamp`, timestamp);
+			kv.set(`${group}_tle`, tle);
+			kv.set(`${group}_timestamp_tle`, timestamp);
 		} else {
 			log.debug(`Serving cached TLEs for group "${group}".`);
 		}
@@ -56,7 +56,7 @@ const tleRoute = new Elysia({ prefix: "/tle" })
 			return new Response(`Group "${group}" is not allowed.`, { status: 403 });
 		}
 
-		const timestamp = await kv.get(`${group}_timestamp`);
+		const timestamp = await kv.get(`${group}_timestamp_tle`);
 		if (!timestamp) {
 			return new Response(`No cached TLEs for group "${group}".`, { status: 404 });
 		}

src/utils/tleFetcher.ts

@@ -7,7 +7,7 @@ async function fetchTle(group: string) {
 	const url = `https://celestrak.org/NORAD/elements/gp.php?GROUP=${group}&FORMAT=tle`;
 	log.debug(`Fetching TLEs for group "${group}" from Celestrak...`);
 	try {
-		const lastFetch = await kv.get(`${group}_timestamp`);
+		const lastFetch = await kv.get(`${group}_timestamp_tle`);
 		const response = await fetch(url, {
 			headers: {
 				"If-Modified-Since": lastFetch ? new Date(lastFetch).toUTCString() : "",
@@ -18,8 +18,8 @@ async function fetchTle(group: string) {
 			throw new Error(`Failed to fetch TLEs: ${response.status} ${response.statusText}`);
 		}
 		const tleData = await response.text();
-		await kv.set(group, tleData);
-		await kv.set(`${group}_timestamp`, Date.now());
+		await kv.set(`${group}_tle`, tleData);
+		await kv.set(`${group}_timestamp_tle`, Date.now());
 		log.debug(`Successfully cached TLEs for group "${group}".`);
 		return tleData;
 	} catch (error) {

src/utils/tleGetter.ts

@@ -13,11 +13,11 @@ async function getObjectsTle(noradId: number) {
 	const isStale = timestamp ? now - timestamp > config.cacheNoradDuration : true;
 
 	if (!tleData || isStale) {
-		let allTles = (await kv.get("active")) as string | null;
+		let allTles = (await kv.get("active_tle")) as string | null;
 		if (!allTles) {
 			await fetchTle("active");
 		}
-		allTles = (await kv.get("active")) as string | null;
+		allTles = (await kv.get("active_tle")) as string | null;
 
 		// If we still don't have the active TLEs then something went wrong with fetching, so we throw an error
 		if (!allTles) {