btca-server 1.0.961 → 2.0.0

package/src/metrics/index.ts

@@ -1,57 +1,57 @@
-import { Result } from 'better-result';
-
-import { Context } from '../context/index.ts';
+import { requestId } from '../context/index.ts';
 import { getErrorMessage, getErrorTag } from '../errors.ts';
 
 type LogLevel = 'info' | 'error';
 
 let quietMode = false;
 
-export namespace Metrics {
-	export type Fields = Record<string, unknown>;
+export type MetricsFields = Record<string, unknown>;
 
-	export const setQuiet = (quiet: boolean) => {
-		quietMode = quiet;
-	};
+export const setQuietMetrics = (quiet: boolean) => {
+	quietMode = quiet;
+};
 
-	export const isQuiet = () => quietMode;
-
-	export const errorInfo = (cause: unknown) => ({
-		tag: getErrorTag(cause),
-		message: getErrorMessage(cause)
-	});
-
-	const emit = (level: LogLevel, event: string, fields?: Fields) => {
-		if (quietMode) return;
-
-		const payload = {
-			ts: new Date().toISOString(),
-			level,
-			event,
-			requestId: Context.requestId(),
-			...fields
-		};
-		const line = JSON.stringify(payload);
-		if (level === 'error') console.error(line);
-		else console.log(line);
-	};
+export const isMetricsQuiet = () => quietMode;
 
-	export const info = (event: string, fields?: Fields) => emit('info', event, fields);
-	export const error = (event: string, fields?: Fields) => emit('error', event, fields);
+export const metricsErrorInfo = (cause: unknown) => ({
+	tag: getErrorTag(cause),
+	message: getErrorMessage(cause)
+});
 
-	export const span = async <T>(
-		name: string,
-		fn: () => Promise<T>,
-		fields?: Fields
-	): Promise<T> => {
-		const start = performance.now();
-		const result = await Result.tryPromise(fn);
-		const ms = Math.round(performance.now() - start);
-		if (!Result.isOk(result)) {
-			error('span.err', { name, ms, ...fields, error: errorInfo(result.error) });
-			throw result.error;
-		}
-		info('span.ok', { name, ms, ...fields });
-		return result.value;
+const emitMetrics = (level: LogLevel, event: string, fields?: MetricsFields) => {
+	if (quietMode) return;
+
+	const payload = {
+		ts: new Date().toISOString(),
+		level,
+		event,
+		requestId: requestId(),
+		...fields
 	};
-}
+	const line = JSON.stringify(payload);
+	if (level === 'error') console.error(line);
+	else console.log(line);
+};
+
+export const metricsInfo = (event: string, fields?: MetricsFields) =>
+	emitMetrics('info', event, fields);
+export const metricsError = (event: string, fields?: MetricsFields) =>
+	emitMetrics('error', event, fields);
+
+export const withMetricsSpan = async <T>(
+	name: string,
+	fn: () => Promise<T>,
+	fields?: MetricsFields
+): Promise<T> => {
+	const start = performance.now();
+	try {
+		const value = await fn();
+		const ms = Math.round(performance.now() - start);
+		metricsInfo('span.ok', { name, ms, ...fields });
+		return value;
+	} catch (errorCause) {
+		const ms = Math.round(performance.now() - start);
+		metricsError('span.err', { name, ms, ...fields, error: metricsErrorInfo(errorCause) });
+		throw errorCause;
+	}
+};

package/src/pricing/models-dev.ts

@@ -43,128 +43,126 @@ const hasAnyRate = (rates: ReturnType<typeof toRates>) =>
 	rates.cacheRead != null ||
 	rates.cacheWrite != null;
 
-export namespace ModelsDevPricing {
-	export type RatesUsdPerMTokens = {
-		input?: number;
-		output?: number;
-		reasoning?: number;
-		cacheRead?: number;
-		cacheWrite?: number;
-	};
+export type RatesUsdPerMTokens = {
+	input?: number;
+	output?: number;
+	reasoning?: number;
+	cacheRead?: number;
+	cacheWrite?: number;
+};
 
-	export type Pricing = {
-		source: 'models.dev';
-		modelKey: string;
-		ratesUsdPerMTokens: RatesUsdPerMTokens;
-	};
+export type Pricing = {
+	source: 'models.dev';
+	modelKey: string;
+	ratesUsdPerMTokens: RatesUsdPerMTokens;
+};
 
-	export type Service = {
-		prefetch: () => void;
-		lookup: (args: {
-			providerId: string;
-			modelId: string;
-			timeoutMs?: number;
-		}) => Promise<Pricing | null>;
-	};
+export type ModelsDevPricingService = {
+	prefetch: () => void;
+	lookup: (args: {
+		providerId: string;
+		modelId: string;
+		timeoutMs?: number;
+	}) => Promise<Pricing | null>;
+};
 
-	type Index = {
-		byProviderAndModel: Map<string, Pricing>;
-		byId: Map<string, Pricing>;
-	};
+type PricingIndex = {
+	byProviderAndModel: Map<string, Pricing>;
+	byId: Map<string, Pricing>;
+};
 
-	const buildIndex = (api: ModelsDevApi): Index => {
-		const byProviderAndModel = new Map<string, Pricing>();
-		const byId = new Map<string, Pricing>();
-
-		for (const [providerKey, provider] of Object.entries(api)) {
-			const models = provider.models ?? {};
-			for (const [modelKey, model] of Object.entries(models)) {
-				const ratesUsdPerMTokens = toRates(model.cost);
-				if (!hasAnyRate(ratesUsdPerMTokens)) continue;
-
-				const pricing: Pricing = {
-					source: 'models.dev',
-					modelKey: (typeof model.id === 'string' && model.id.trim().length > 0
-						? model.id
-						: modelKey
-					).trim(),
-					ratesUsdPerMTokens
-				};
-
-				byProviderAndModel.set(`${providerKey}\0${modelKey}`, pricing);
-				if (!byId.has(modelKey)) byId.set(modelKey, pricing);
-				if (typeof model.id === 'string' && model.id.trim().length > 0 && !byId.has(model.id)) {
-					byId.set(model.id, pricing);
-				}
-				if (!byId.has(`${providerKey}/${modelKey}`))
-					byId.set(`${providerKey}/${modelKey}`, pricing);
+const buildPricingIndex = (api: ModelsDevApi): PricingIndex => {
+	const byProviderAndModel = new Map<string, Pricing>();
+	const byId = new Map<string, Pricing>();
+
+	for (const [providerKey, provider] of Object.entries(api)) {
+		const models = provider.models ?? {};
+		for (const [modelKey, model] of Object.entries(models)) {
+			const ratesUsdPerMTokens = toRates(model.cost);
+			if (!hasAnyRate(ratesUsdPerMTokens)) continue;
+
+			const pricing: Pricing = {
+				source: 'models.dev',
+				modelKey: (typeof model.id === 'string' && model.id.trim().length > 0
+					? model.id
+					: modelKey
+				).trim(),
+				ratesUsdPerMTokens
+			};
+
+			byProviderAndModel.set(`${providerKey}\0${modelKey}`, pricing);
+			if (!byId.has(modelKey)) byId.set(modelKey, pricing);
+			if (typeof model.id === 'string' && model.id.trim().length > 0 && !byId.has(model.id)) {
+				byId.set(model.id, pricing);
 			}
+			if (!byId.has(`${providerKey}/${modelKey}`)) byId.set(`${providerKey}/${modelKey}`, pricing);
 		}
+	}
+
+	return { byProviderAndModel, byId };
+};
 
-		return { byProviderAndModel, byId };
+export const createModelsDevPricing = (
+	args: { ttlMs?: number; url?: string } = {}
+): ModelsDevPricingService => {
+	const ttlMs = args.ttlMs ?? 60 * 60 * 1000;
+	const url = args.url ?? MODELS_DEV_URL;
+
+	let cached:
+		| {
+				fetchedAtMs: number;
+				index: PricingIndex;
+		  }
+		| undefined;
+
+	let inFlight: Promise<PricingIndex> | undefined;
+
+	const fetchIndex = async () => {
+		const res = await fetch(url);
+		if (!res.ok) throw new Error(`models.dev fetch failed: ${res.status}`);
+		const json = (await res.json()) as ModelsDevApi;
+		return buildPricingIndex(json);
 	};
 
-	export const create = (args: { ttlMs?: number; url?: string } = {}): Service => {
-		const ttlMs = args.ttlMs ?? 60 * 60 * 1000;
-		const url = args.url ?? MODELS_DEV_URL;
-
-		let cached:
-			| {
-					fetchedAtMs: number;
-					index: Index;
-			  }
-			| undefined;
-
-		let inFlight: Promise<Index> | undefined;
-
-		const fetchIndex = async () => {
-			const res = await fetch(url);
-			if (!res.ok) throw new Error(`models.dev fetch failed: ${res.status}`);
-			const json = (await res.json()) as ModelsDevApi;
-			return buildIndex(json);
-		};
-
-		const getIndex = async () => {
-			const now = Date.now();
-			if (cached && now - cached.fetchedAtMs < ttlMs) return cached.index;
-
-			if (!inFlight) {
-				inFlight = fetchIndex().finally(() => {
-					inFlight = undefined;
-				});
-			}
+	const getIndex = async () => {
+		const now = Date.now();
+		if (cached && now - cached.fetchedAtMs < ttlMs) return cached.index;
 
-			const index = await inFlight;
-			cached = { fetchedAtMs: now, index };
-			return index;
-		};
+		if (!inFlight) {
+			inFlight = fetchIndex().finally(() => {
+				inFlight = undefined;
+			});
+		}
 
-		const lookup: Service['lookup'] = async ({ providerId, modelId, timeoutMs }) => {
-			// Pricing is best-effort: no pricing for unknown/mapped providers.
-			if (!providerId || !modelId) return null;
+		const index = await inFlight;
+		cached = { fetchedAtMs: now, index };
+		return index;
+	};
 
-			const index = await (timeoutMs ? withTimeout(getIndex(), timeoutMs) : getIndex()).catch(
-				() => null
-			);
-			if (!index) return null;
+	const lookup: ModelsDevPricingService['lookup'] = async ({ providerId, modelId, timeoutMs }) => {
+		if (!providerId || !modelId) return null;
 
-			const direct = index.byProviderAndModel.get(`${providerId}\0${modelId}`);
-			if (direct) return direct;
+		const index = await (timeoutMs ? withTimeout(getIndex(), timeoutMs) : getIndex()).catch(
+			() => null
+		);
+		if (!index) return null;
 
-			const byId = index.byId;
-			const exact = byId.get(modelId);
-			if (exact) return exact;
+		const direct = index.byProviderAndModel.get(`${providerId}\0${modelId}`);
+		if (direct) return direct;
 
-			const combined = byId.get(`${providerId}/${modelId}`);
-			if (combined) return combined;
+		const byId = index.byId;
+		const exact = byId.get(modelId);
+		if (exact) return exact;
 
-			return null;
-		};
+		const combined = byId.get(`${providerId}/${modelId}`);
+		if (combined) return combined;
 
-		const prefetch = () => {
-			void getIndex().catch(() => undefined);
-		};
+		return null;
+	};
 
-		return { prefetch, lookup };
+	const prefetch = () => {
+		void getIndex().catch(() => undefined);
 	};
-}
+
+	return { prefetch, lookup };
+};