Use GITHUB_API_TOKEN if available (docs/.env, env var). Improve error handling

Author: techniq

docs/src/lib/api.ts

@@ -0,0 +1,86 @@
+import { parse } from '@layerstack/utils';
+
+export type ApiOptions = {
+	method?: 'GET' | 'POST' | 'PUT' | 'DELETE';
+	data?: any;
+	headers?: Record<string, string>;
+	fetch?: typeof globalThis.fetch;
+	parse?<T>(data: string): T;
+};
+
+export async function api<Data = any>(
+	origin: string,
+	resource: string,
+	options: ApiOptions = {}
+): Promise<Data | null> {
+	let url = `${origin}/${resource}`;
+	const method = options?.method ?? 'GET';
+	const _fetch = options?.fetch ?? globalThis.fetch;
+
+	if (method === 'GET' && options?.data) {
+		url += `?${new URLSearchParams(options.data)}`;
+	}
+
+	const response = await _fetch(url, {
+		method,
+		headers: {
+			'Content-Type': 'application/json',
+			...options.headers
+		},
+		...(method === 'POST' &&
+			options?.data && {
+				body: JSON.stringify(options.data)
+			})
+	});
+
+	const text = await response.text();
+
+	if (!response.ok) {
+		console.error(`API ${method} ${url} failed: ${response.status} ${response.statusText} - ${text}`);
+		return null;
+	}
+
+	try {
+		return options.parse ? options.parse<Data>(text) : parse<Data>(text);
+	} catch {
+		console.error(`API ${method} ${url} returned invalid JSON: ${text.slice(0, 200)}`);
+		return null;
+	}
+}
+
+export async function graphql<Data = any>(
+	endpoint: string,
+	query: string,
+	variables: Record<string, any> = {},
+	options: ApiOptions = {}
+): Promise<Data | null> {
+	const _fetch = options?.fetch ?? globalThis.fetch;
+
+	const response = await _fetch(endpoint, {
+		method: options?.method ?? 'POST',
+		headers: {
+			'Content-Type': 'application/json',
+			...options.headers
+		},
+		body: JSON.stringify({
+			query,
+			variables,
+			...options.data
+		})
+	});
+
+	const text = await response.text();
+
+	if (!response.ok) {
+		console.error(`GraphQL ${endpoint} failed: ${response.status} ${response.statusText} - ${text}`);
+		return null;
+	}
+
+	try {
+		const json = options.parse ? options.parse(text) : parse(text);
+		return json.data as Data;
+	} catch {
+		console.error(`GraphQL ${endpoint} returned invalid JSON: ${text.slice(0, 200)}`);
+		return null;
+	}
+}

docs/src/lib/stats.remote.ts

@@ -1,29 +1,39 @@
 import { query, getRequestEvent } from '$app/server';
+import { env } from '$env/dynamic/private';
+import { api } from './api';
 
 export const getStats = query(async () => {
 	const { fetch } = getRequestEvent();
-	const [githubRes, npmWeeklyRes, npmMonthlyRes, npmLifetimeRes, discordRes, bskyRes] =
+
+	const githubHeaders: Record<string, string> = { Accept: 'application/vnd.github.v3+json' };
+	if (env.GITHUB_API_TOKEN) {
+		const prefix = env.GITHUB_API_TOKEN.startsWith('ghp_') ? 'token' : 'Bearer';
+		githubHeaders['Authorization'] = `${prefix} ${env.GITHUB_API_TOKEN}`;
+	}
+
+	const [githubData, npmWeeklyData, npmMonthlyData, npmLifetimeData, discordData, bskyData] =
 		await Promise.all([
-			fetch('https://api.github.com/repos/techniq/layerchart', {
-				headers: { Accept: 'application/vnd.github.v3+json' }
+			api('https://api.github.com', 'repos/techniq/layerchart', {
+				fetch,
+				headers: githubHeaders
+			}),
+			api('https://api.npmjs.org', 'downloads/point/last-week/layerchart', { fetch }),
+			api('https://api.npmjs.org', 'downloads/point/last-month/layerchart', { fetch }),
+			api('https://api.npmjs.org', 'downloads/point/2020-01-01:2099-12-31/layerchart', {
+				fetch
 			}),
-			fetch('https://api.npmjs.org/downloads/point/last-week/layerchart'),
-			fetch('https://api.npmjs.org/downloads/point/last-month/layerchart'),
-			fetch('https://api.npmjs.org/downloads/point/2020-01-01:2099-12-31/layerchart'),
-			fetch('https://discord.com/api/v9/invites/697JhMPD3t?with_counts=true'),
-			fetch('https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=techniq.dev')
+			api('https://discord.com', 'api/v9/invites/697JhMPD3t?with_counts=true', { fetch }),
+			api('https://public.api.bsky.app', 'xrpc/app.bsky.actor.getProfile?actor=techniq.dev', {
+				fetch
+			})
 		]);
 
-	const githubStars = githubRes.ok ? ((await githubRes.json()).stargazers_count as number) : null;
-	const npmWeekly = npmWeeklyRes.ok ? ((await npmWeeklyRes.json()).downloads as number) : null;
-	const npmMonthly = npmMonthlyRes.ok ? ((await npmMonthlyRes.json()).downloads as number) : null;
-	const npmLifetime = npmLifetimeRes.ok
-		? ((await npmLifetimeRes.json()).downloads as number)
-		: null;
-	const bskyFollowers = bskyRes.ok ? ((await bskyRes.json()).followersCount as number) : null;
-	const discordMembers = discordRes.ok
-		? ((await discordRes.json()).approximate_member_count as number)
-		: null;
+	const githubStars = (githubData?.stargazers_count as number) ?? null;
+	const npmWeekly = (npmWeeklyData?.downloads as number) ?? null;
+	const npmMonthly = (npmMonthlyData?.downloads as number) ?? null;
+	const npmLifetime = (npmLifetimeData?.downloads as number) ?? null;
+	const bskyFollowers = (bskyData?.followersCount as number) ?? null;
+	const discordMembers = (discordData?.approximate_member_count as number) ?? null;
 
 	const npmDownloads: [number | null, number | null, number | null] = [
 		npmWeekly,