refactor(backend): transition to generic cache

future-proof baby

Author: WarningImHack3r

src/lib/server/github-cache.ts

@@ -165,68 +165,4 @@ export class GitHubCache {
 	}
 }
 
-/**
- * A {@link GitHubCache} specifically meant for
- * repositories inside the `sveltejs` ownership
- */
-export class SvelteGitHubCache {
-	readonly #cache: GitHubCache;
-	readonly #owner = "sveltejs";
-
-	/**
-	 * Creates the cache; see {@link GitHubCache.constructor} for more info
-	 *
-	 * @constructor
-	 */
-	constructor(redisUrl: string, redisToken: string, githubToken: string) {
-		this.#cache = new GitHubCache(redisUrl, redisToken, githubToken);
-	}
-
-	/**
-	 * Get the releases; see {@link GitHubCache.getReleases} for more info
-	 */
-	async getReleases(repo: string) {
-		return await this.#cache.getReleases(this.#owner, repo);
-	}
-
-	/**
-	 * Add new releases to the cache; see {@link GitHubCache.addReleases} for more info
-	 */
-	async addReleases(repo: string, newReleases: GitHubRelease[]) {
-		return await this.#cache.addReleases(this.#owner, repo, newReleases);
-	}
-
-	/**
-	 * Fetches and adds to the cache; see {@link GitHubCache.fetchAndCacheReleases} for more info
-	 */
-	async fetchAndCacheReleases(repo: string) {
-		return await this.#cache.fetchAndCacheReleases(this.#owner, repo);
-	}
-
-	/**
-	 * Checks if a cached entry exists; see {@link GitHubCache.exists} for more info
-	 */
-	async exists(repo: string) {
-		return await this.#cache.exists(this.#owner, repo);
-	}
-
-	/**
-	 * Deletes an entry; see {@link GitHubCache.deleteEntry} for more info
-	 */
-	async deleteEntry(repo: string) {
-		await this.#cache.deleteEntry(this.#owner, repo);
-	}
-
-	/**
-	 * A convenience getter for the underlying cache
-	 */
-	get cache() {
-		return this.#cache;
-	}
-}
-
-export const svelteGitHubCache = new SvelteGitHubCache(
-	KV_REST_API_URL,
-	KV_REST_API_TOKEN,
-	GITHUB_TOKEN
-);
+export const gitHubCache = new GitHubCache(KV_REST_API_URL, KV_REST_API_TOKEN, GITHUB_TOKEN);

src/lib/server/package-discoverer.ts

@@ -1,5 +1,5 @@
 import type { Prettify } from "$lib/types";
-import { GitHubCache, type GitHubRelease, svelteGitHubCache } from "./github-cache";
+import { GitHubCache, type GitHubRelease, gitHubCache } from "./github-cache";
 import { publicRepos, type Repository } from "$lib/repositories";
 
 export type DiscoveredPackage = Prettify<
@@ -140,4 +140,4 @@ export class PackageDiscoverer {
 	}
 }
 
-export const discoverer = new PackageDiscoverer(svelteGitHubCache.cache, publicRepos);
+export const discoverer = new PackageDiscoverer(gitHubCache, publicRepos);

src/routes/cron/+server.ts

@@ -1,6 +1,6 @@
 import { error, type RequestHandler } from "@sveltejs/kit";
 import { CRON_SECRET } from "$env/static/private";
-import { svelteGitHubCache } from "$lib/server/github-cache";
+import { gitHubCache } from "$lib/server/github-cache";
 import { discoverer } from "$lib/server/package-discoverer";
 import { uniqueRepos } from "$lib/repositories";
 
@@ -11,7 +11,7 @@ export const GET: RequestHandler = async ({ request }) => {
 
 	await Promise.all(
 		uniqueRepos.map(async ({ owner, name: repo }) => {
-			const releases = await svelteGitHubCache.fetchAndCacheReleases(repo);
+			const releases = await gitHubCache.fetchAndCacheReleases(owner, repo);
 			await discoverer.discoverReleases(owner, repo, releases);
 		})
 	);

src/routes/package/[...package]/+page.server.ts

@@ -1,5 +1,5 @@
 import { error } from "@sveltejs/kit";
-import { svelteGitHubCache } from "$lib/server/github-cache";
+import { gitHubCache } from "$lib/server/github-cache";
 import { discoverer } from "$lib/server/package-discoverer";
 
 export async function load({ params }) {
@@ -16,7 +16,7 @@ export async function load({ params }) {
 						category,
 						...rest
 					},
-					releases: svelteGitHubCache.getReleases(rest.repoName).then(releases => {
+					releases: gitHubCache.getReleases(rest.owner, rest.repoName).then(releases => {
 						const dataFiltered = releases.filter(release => dataFilter?.(release) ?? true);
 						const pkgTagFiltered = dataFiltered.filter(({ tag_name }) =>
 							tag_name.includes(slugPackage)