@linxin666/dsh-usage 0.4.4 → 0.4.6

package/src/host/routes.ts

@@ -3,6 +3,8 @@ import type { Context } from '@deepseek-ai/cordis'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import { isUsageAllowed } from './access.ts'
 import { writeJson } from './http.ts'
+import { isLedgerDateKey } from '../core/ledger.ts'
+import type { UsageDayResponse } from '../core/types.ts'
 import type { UsageService } from './usage-service.ts'
 
 export const USAGE_API_PREFIX = '/api/dsh-usage'
@@ -31,6 +33,35 @@ export function makeUsageOverviewRoute(ctx: Context, service: UsageService): Web
   }
 }
 
+/**
+ * One retained day route: `GET /api/dsh-usage/day?date=YYYY-MM-DD` answers
+ * that local day's per-provider and per-model totals, so the section's day
+ * pickers can show a past day instead of only today. Same trust fence as the
+ * overview route, and a key that is not a real local date is refused with 400
+ * rather than folded into a bogus day.
+ * @param ctx - host context; may expose remoteWebUiPairing.
+ * @param service - the usage service.
+ * @returns the route.
+ */
+export function makeUsageDayRoute(ctx: Context, service: UsageService): WebRoute {
+  return {
+    kind: 'exact',
+    path: USAGE_API_PREFIX + '/day',
+    handler: (req: IncomingMessage, res: ServerResponse): void => {
+      if (!isUsageAllowed(ctx, req)) {
+        writeJson(res, 403, { ok: false, error: 'forbidden: loopback-only' })
+        return
+      }
+      const date = new URL(req.url ?? '/', 'http://127.0.0.1').searchParams.get('date') ?? ''
+      if (!isLedgerDateKey(date)) {
+        writeJson(res, 400, { ok: false, error: 'date must be YYYY-MM-DD' })
+        return
+      }
+      writeJson(res, 200, { ok: true, day: service.day(date) } satisfies UsageDayResponse, { 'cache-control': 'no-store' })
+    },
+  }
+}
+
 /**
  * Manual refresh: forces one probe cycle now and answers with the fresh
  * overview. Same trust fence as the overview route.

package/src/host/usage-service.ts

@@ -20,7 +20,7 @@ import type { BalanceParse, PlanParse } from '../core/adapters.ts'
 import { foldAliasRoutes } from '../core/provider-routes.ts'
 import { deepseekModelSpend } from '../core/pricing.ts'
 import { createLedgerDocument, deserializeLedger, foldUsage, ledgerDayKeys, localDateKey, pruneLedger, summarizeDays, totalTokens } from '../core/ledger.ts'
-import type { BalanceView, CredentialKind, ObservedSpendView, PlanView, ProviderSnapshotState, ProviderSnapshotView, UsageLedgerDocument, UsageOverviewView, UsageTokenTotals } from '../core/types.ts'
+import type { BalanceView, CredentialKind, ObservedSpendView, PlanView, ProviderSnapshotState, ProviderSnapshotView, UsageDayView, UsageLedgerDocument, UsageOverviewView, UsageTokenTotals } from '../core/types.ts'
 import { addTotals, emptyTotals } from '../core/types.ts'
 
 /**
@@ -350,6 +350,9 @@ export class UsageService {
           totals: range.totals,
           providers: range.providers,
         },
+        // Every retained day, not just the trend window: the day picker's
+        // option list reaches back to the oldest day retention still keeps.
+        availableDays: allKeys,
         all: {
           from: allKeys[0] ?? todayKey,
           to: allKeys[allKeys.length - 1] ?? todayKey,
@@ -393,8 +396,19 @@ export class UsageService {
     }
   }
 
+  /**
+   * One retained local day aggregated per provider and model, as the day
+   * route serves it. A day the ledger never held — pruned by retention, or
+   * simply without usage — reads as a zeroed day rather than an error, so a
+   * picker selection that aged out degrades to "no usage" instead of a broken
+   * panel. The route gates the key's shape before it gets here.
+   */
+  day(dateKey: string): UsageDayView {
+    return this.daySummary(dateKey)
+  }
+
   /** One local day aggregated per provider. */
-  private daySummary(dateKey: string): UsageOverviewView['usage']['today'] {
+  private daySummary(dateKey: string): UsageDayView {
     const day = this.ledger.days[dateKey] ?? {}
     const { totals, providers } = summarizeDays([day])
     return { date: dateKey, totals, providers }

package/src/index.ts

@@ -4,7 +4,7 @@ import type { SettingsNamespace } from '@deepseek-ai/dsh-settings'
 import z from '@deepseek-ai/schemastery'
 import { mountOnce } from './mount-once.ts'
 import { UsageService, type UsageServiceOptions } from './host/usage-service.ts'
-import { makeUsageOverviewRoute, makeUsageRefreshRoute } from './host/routes.ts'
+import { makeUsageDayRoute, makeUsageOverviewRoute, makeUsageRefreshRoute } from './host/routes.ts'
 
 declare module '@deepseek-ai/cordis' {
   interface Events {
@@ -126,9 +126,9 @@ export const apply = mountOnce('@linxin666/dsh-usage', (ctx: Context, config?: U
   /** True while this activation has a start queued behind a predecessor's flush. */
   let queued = false
 
-  /** Register the service's two routes; the returned disposer unregisters them. */
+  /** Register the service's routes; the returned disposer unregisters them. */
   const mountRoutes = (next: UsageService): (() => void) => {
-    const disposers = [makeUsageOverviewRoute(ctx, next), makeUsageRefreshRoute(ctx, next)]
+    const disposers = [makeUsageOverviewRoute(ctx, next), makeUsageDayRoute(ctx, next), makeUsageRefreshRoute(ctx, next)]
       .map((route) => ctx.webServer.register(route))
     return () => {
       for (const dispose of disposers) {