Merge pull request #35 from sxjeru/2144

feat: add credential name mapping and name filter

Author: sxjeru

app/api/explore/route.ts

@@ -13,12 +13,14 @@ const EXPLORE_CACHE_TTL_MS = 30_000;
 const EXPLORE_CACHE_MAX_ENTRIES = 100;
 const exploreCache = new Map<string, CachedExplore>();
 
-function makeCacheKey(input: { days?: number; maxPoints?: number; start?: string | null; end?: string | null }) {
+function makeCacheKey(input: { days?: number; maxPoints?: number; start?: string | null; end?: string | null; route?: string | null; name?: string | null }) {
   return JSON.stringify({
     days: input.days ?? null,
     maxPoints: input.maxPoints ?? null,
     start: input.start ?? null,
-    end: input.end ?? null
+    end: input.end ?? null,
+    route: input.route ?? null,
+    name: input.name ?? null
   });
 }
 
@@ -53,17 +55,19 @@ export async function GET(request: Request) {
     const maxPointsParam = searchParams.get("maxPoints");
     const start = searchParams.get("start");
     const end = searchParams.get("end");
+    const route = searchParams.get("route");
+    const name = searchParams.get("name");
 
     const days = daysParam ? Number.parseInt(daysParam, 10) : undefined;
     const maxPoints = maxPointsParam ? Number.parseInt(maxPointsParam, 10) : undefined;
 
-    const cacheKey = makeCacheKey({ days, maxPoints, start, end });
+    const cacheKey = makeCacheKey({ days, maxPoints, start, end, route, name });
     const cached = getCached(cacheKey);
     if (cached) {
       return NextResponse.json(cached, { status: 200 });
     }
 
-    const payload = await getExplorePoints(days, { maxPoints, start, end });
+    const payload = await getExplorePoints(days, { maxPoints, start, end, route, name });
     setCached(cacheKey, payload);
     return NextResponse.json(payload, { status: 200 });
   } catch (error) {

app/api/overview/route.ts

@@ -20,11 +20,13 @@ const OVERVIEW_CACHE_TTL_MS = 30_000;
 const OVERVIEW_CACHE_MAX_ENTRIES = 100;
 const overviewCache = new Map<string, CachedOverview>();
 
-function makeCacheKey(input: { days?: number; model?: string | null; route?: string | null; page?: number; pageSize?: number; start?: string | null; end?: string | null }) {
+function makeCacheKey(input: { days?: number; model?: string | null; route?: string | null; source?: string | null; name?: string | null; page?: number; pageSize?: number; start?: string | null; end?: string | null }) {
   return JSON.stringify({
     days: input.days ?? null,
     model: input.model ?? null,
     route: input.route ?? null,
+    source: input.source ?? null,
+    name: input.name ?? null,
     page: input.page ?? null,
     pageSize: input.pageSize ?? null,
     start: input.start ?? null,
@@ -63,6 +65,8 @@ export async function GET(request: Request) {
     const days = daysParam ? Number.parseInt(daysParam, 10) : undefined;
     const model = searchParams.get("model");
     const route = searchParams.get("route");
+    const source = searchParams.get("source");
+    const name = searchParams.get("name");
     const pageParam = searchParams.get("page");
     const pageSizeParam = searchParams.get("pageSize");
     const start = searchParams.get("start");
@@ -72,7 +76,7 @@ export async function GET(request: Request) {
     const pageSize = pageSizeParam ? Number.parseInt(pageSizeParam, 10) : undefined;
     const skipCacheParam = searchParams.get("skipCache");
     const skipCache = skipCacheParam === "1" || skipCacheParam === "true";
-    const cacheKey = makeCacheKey({ days, model, route, page, pageSize, start, end });
+    const cacheKey = makeCacheKey({ days, model, route, source, name, page, pageSize, start, end });
     if (!skipCache) {
       const cached = getCached(cacheKey);
       if (cached) {
@@ -83,6 +87,8 @@ export async function GET(request: Request) {
     const { overview, empty, days: appliedDays, meta, filters, timezone } = await getOverview(days, {
       model: model || undefined,
       route: route || undefined,
+      source: source || undefined,
+      name: name || undefined,
       page,
       pageSize,
       start,

app/api/records/route.ts

@@ -18,6 +18,7 @@ export async function GET(request: Request) {
       | "occurredAt"
       | "model"
       | "route"
+      | "source"
       | "totalTokens"
       | "inputTokens"
       | "outputTokens"
@@ -30,6 +31,7 @@ export async function GET(request: Request) {
     const cursor = searchParams.get("cursor");
     const model = searchParams.get("model");
     const route = searchParams.get("route");
+    const source = searchParams.get("source");
     const start = searchParams.get("start");
     const end = searchParams.get("end");
     const includeFilters = searchParams.get("includeFilters") === "1";
@@ -43,6 +45,7 @@ export async function GET(request: Request) {
       cursor,
       model: model || undefined,
       route: route || undefined,
+      source: source || undefined,
       start,
       end,
       includeFilters

app/api/sync/route.ts

@@ -3,7 +3,8 @@ import { cookies } from "next/headers";
 import { eq, sql } from "drizzle-orm";
 import { config, assertEnv } from "@/lib/config";
 import { db } from "@/lib/db/client";
-import { usageRecords } from "@/lib/db/schema";
+import { authFileMappings, usageRecords } from "@/lib/db/schema";
+import { toAuthFileMappings } from "@/lib/auth-files";
 import { parseUsagePayload, toUsageRecords } from "@/lib/usage";
 
 export const runtime = "nodejs";
@@ -47,6 +48,44 @@ async function isAuthorized(request: Request) {
   return false;
 }
 
+async function syncAuthFileMappings(pulledAt: Date) {
+  const authFilesUrl = `${config.cliproxy.baseUrl.replace(/\/$/, "")}/auth-files`;
+
+  const response = await fetch(authFilesUrl, {
+    headers: {
+      Authorization: `Bearer ${config.cliproxy.apiKey}`,
+      "Content-Type": "application/json"
+    },
+    cache: "no-store"
+  });
+
+  if (!response.ok) {
+    throw new Error(`Failed to fetch auth-files: ${response.status} ${response.statusText}`);
+  }
+
+  const json = await response.json();
+  const rows = toAuthFileMappings(json, pulledAt);
+  if (rows.length === 0) return 0;
+
+  await db
+    .insert(authFileMappings)
+    .values(rows)
+    .onConflictDoUpdate({
+      target: authFileMappings.authId,
+      set: {
+        name: sql`coalesce(nullif(excluded.name, ''), ${authFileMappings.name})`,
+        label: sql`coalesce(nullif(excluded.label, ''), ${authFileMappings.label})`,
+        provider: sql`coalesce(nullif(excluded.provider, ''), ${authFileMappings.provider})`,
+        source: sql`coalesce(nullif(excluded.source, ''), ${authFileMappings.source})`,
+        email: sql`coalesce(nullif(excluded.email, ''), ${authFileMappings.email})`,
+        updatedAt: sql`coalesce(excluded.updated_at, ${authFileMappings.updatedAt})`,
+        syncedAt: pulledAt
+      }
+    });
+
+  return rows.length;
+}
+
 async function performSync(request: Request) {
   if (!config.password && !config.cronSecret && !PASSWORD) return missingPassword();
   if (!(await isAuthorized(request))) return unauthorized();
@@ -89,16 +128,31 @@ async function performSync(request: Request) {
 
   const rows = toUsageRecords(payload, pulledAt);
 
+  let authFilesSynced = 0;
+  let authFilesWarning: string | undefined;
+  try {
+    authFilesSynced = await syncAuthFileMappings(pulledAt);
+  } catch (error) {
+    authFilesWarning = "auth-files sync failed";
+    console.warn("/api/sync auth-files sync failed:", error);
+  }
+
   if (rows.length === 0) {
-    return NextResponse.json({ status: "ok", inserted: 0, message: "No usage data" });
+    return NextResponse.json({
+      status: "ok",
+      inserted: 0,
+      message: "No usage data",
+      authFilesSynced,
+      ...(authFilesWarning ? { authFilesWarning } : {})
+    });
   }
 
   let insertedRows: Array<{ id: number }>;
   try {
     insertedRows = await db
       .insert(usageRecords)
       .values(rows)
-      .onConflictDoNothing({ target: [usageRecords.occurredAt, usageRecords.route, usageRecords.model] })
+      .onConflictDoNothing({ target: [usageRecords.occurredAt, usageRecords.route, usageRecords.model, usageRecords.source] })
       .returning({ id: usageRecords.id });
   } catch (dbError) {
     console.error("/api/sync database insert failed:", dbError);
@@ -119,7 +173,13 @@ async function performSync(request: Request) {
     inserted = Number(fallback?.[0]?.count ?? 0);
   }
 
-  return NextResponse.json({ status: "ok", inserted, attempted: rows.length });
+  return NextResponse.json({
+    status: "ok",
+    inserted,
+    attempted: rows.length,
+    authFilesSynced,
+    ...(authFilesWarning ? { authFilesWarning } : {})
+  });
 }
 
 export async function POST(request: Request) {