@narumitw/pi-usage 0.60.6 → 0.60.8

package/src/providers/codex.ts

@@ -1,150 +1,139 @@
 import { sanitizeDisplayText } from "../core.js";
 import type { CodexBackendPayload, UsageBucket, UsageMetric, UsageReport } from "../types.js";
 
-export function normalizeCodexBackendPayload(
-	payload: CodexBackendPayload,
-	capturedAt: number,
-): UsageReport {
-	const buckets: UsageBucket[] = [];
-	normalizeRateLimitGroup(buckets, "codex", "Codex", payload.rate_limit, false);
+export function normalizeCodexBackendPayload(payload: CodexBackendPayload, capturedAt: number): UsageReport {
+  const buckets: UsageBucket[] = [];
+  normalizeRateLimitGroup(buckets, "codex", "Codex", payload.rate_limit, false);
 
-	const additional = Array.isArray(payload.additional_rate_limits)
-		? payload.additional_rate_limits
-		: [];
-	for (const item of additional) {
-		const value = asObject(item);
-		const id = asString(value?.metered_feature) ?? asString(value?.limit_name);
-		if (!value || !id) continue;
-		try {
-			normalizeRateLimitGroup(
-				buckets,
-				id,
-				asString(value.limit_name) ?? id,
-				value.rate_limit,
-				true,
-			);
-		} catch {
-			// Optional provider-specific buckets must not hide otherwise useful primary data.
-		}
-	}
+  const additional = Array.isArray(payload.additional_rate_limits) ? payload.additional_rate_limits : [];
+  for (const item of additional) {
+    const value = asObject(item);
+    const id = asString(value?.metered_feature) ?? asString(value?.limit_name);
+    if (!value || !id) continue;
+    try {
+      normalizeRateLimitGroup(buckets, id, asString(value.limit_name) ?? id, value.rate_limit, true);
+    } catch {
+      // Optional provider-specific buckets must not hide otherwise useful primary data.
+    }
+  }
 
-	const metrics: UsageMetric[] = [];
-	const credits = asObject(payload.credits);
-	if (credits?.has_credits === true) {
-		if (credits.unlimited === true) {
-			metrics.push({ id: "credits", label: "Credits", value: "unlimited" });
-		} else {
-			const balance = asNumber(credits.balance);
-			if (balance !== undefined) {
-				metrics.push({ id: "credits", label: "Credits", value: balance, unit: "count" });
-			} else {
-				metrics.push({ id: "credits", label: "Credits", value: "available" });
-			}
-		}
-	} else if (credits?.has_credits === false) {
-		metrics.push({ id: "credits", label: "Credits", value: "none" });
-	}
-	const resetCredits = asObject(payload.rate_limit_reset_credits);
-	const resetCount = asNonnegativeInteger(resetCredits?.available_count);
-	if (resetCount !== undefined) {
-		metrics.push({
-			id: "reset-credits",
-			label: "Usage limit resets",
-			value: resetCount,
-			unit: "count",
-		});
-	}
-	if (buckets.length === 0 && metrics.length === 0) {
-		throw new Error("Codex usage endpoint returned no displayable usage data.");
-	}
+  const metrics: UsageMetric[] = [];
+  const credits = asObject(payload.credits);
+  if (credits?.has_credits === true) {
+    if (credits.unlimited === true) {
+      metrics.push({ id: "credits", label: "Credits", value: "unlimited" });
+    } else {
+      const balance = asNumber(credits.balance);
+      if (balance !== undefined) {
+        metrics.push({ id: "credits", label: "Credits", value: balance, unit: "count" });
+      } else {
+        metrics.push({ id: "credits", label: "Credits", value: "available" });
+      }
+    }
+  } else if (credits?.has_credits === false) {
+    metrics.push({ id: "credits", label: "Credits", value: "none" });
+  }
+  const resetCredits = asObject(payload.rate_limit_reset_credits);
+  const resetCount = asNonnegativeInteger(resetCredits?.available_count);
+  if (resetCount !== undefined) {
+    metrics.push({
+      id: "reset-credits",
+      label: "Usage limit resets",
+      value: resetCount,
+      unit: "count",
+    });
+  }
+  if (buckets.length === 0 && metrics.length === 0) {
+    throw new Error("Codex usage endpoint returned no displayable usage data.");
+  }
 
-	const planType = asString(payload.plan_type);
-	return {
-		providerId: "openai-codex",
-		providerName: "OpenAI Codex",
-		capturedAt,
-		source: "codex-pi-auth",
-		semantics: {
-			kind: "consumer-subscription",
-			label: "ChatGPT subscription limits",
-		},
-		buckets,
-		metrics,
-		...(planType ? { notes: [`Plan: ${planType}`] } : {}),
-	};
+  const planType = asString(payload.plan_type);
+  return {
+    providerId: "openai-codex",
+    providerName: "OpenAI Codex",
+    capturedAt,
+    source: "codex-pi-auth",
+    semantics: {
+      kind: "consumer-subscription",
+      label: "ChatGPT subscription limits",
+    },
+    buckets,
+    metrics,
+    ...(planType ? { notes: [`Plan: ${planType}`] } : {}),
+  };
 }
 
 function normalizeRateLimitGroup(
-	buckets: UsageBucket[],
-	groupId: string,
-	groupLabel: string,
-	raw: unknown,
-	optional: boolean,
+  buckets: UsageBucket[],
+  groupId: string,
+  groupLabel: string,
+  raw: unknown,
+  optional: boolean,
 ): void {
-	if (raw === undefined || raw === null) return;
-	const details = asObject(raw);
-	if (!details) {
-		if (optional) return;
-		throw new Error("Codex rate limit was not an object.");
-	}
-	addWindow(buckets, groupId, groupLabel, "primary", details.primary_window);
-	addWindow(buckets, groupId, groupLabel, "secondary", details.secondary_window);
+  if (raw === undefined || raw === null) return;
+  const details = asObject(raw);
+  if (!details) {
+    if (optional) return;
+    throw new Error("Codex rate limit was not an object.");
+  }
+  addWindow(buckets, groupId, groupLabel, "primary", details.primary_window);
+  addWindow(buckets, groupId, groupLabel, "secondary", details.secondary_window);
 }
 
 function addWindow(
-	buckets: UsageBucket[],
-	groupId: string,
-	groupLabel: string,
-	position: "primary" | "secondary",
-	raw: unknown,
+  buckets: UsageBucket[],
+  groupId: string,
+  groupLabel: string,
+  position: "primary" | "secondary",
+  raw: unknown,
 ): void {
-	if (raw === undefined || raw === null) return;
-	const value = asObject(raw);
-	if (!value) throw new Error("Codex rate-limit window was not an object.");
-	const used = asNumber(value.used_percent);
-	if (used === undefined) return;
-	const seconds = asNumber(value.limit_window_seconds);
-	const resetsAt = asNumber(value.reset_at);
-	buckets.push({
-		id: `${groupId}:${position}`,
-		label: position === "primary" ? "Primary limit" : "Secondary limit",
-		groupId,
-		groupLabel,
-		modelKeys: [groupId, groupLabel],
-		used,
-		remaining: 100 - clampPercent(used),
-		limit: 100,
-		unit: "percent",
-		...(seconds !== undefined && seconds > 0 ? { windowMinutes: Math.ceil(seconds / 60) } : {}),
-		...(resetsAt !== undefined ? { resetsAt } : {}),
-	});
+  if (raw === undefined || raw === null) return;
+  const value = asObject(raw);
+  if (!value) throw new Error("Codex rate-limit window was not an object.");
+  const used = asNumber(value.used_percent);
+  if (used === undefined) return;
+  const seconds = asNumber(value.limit_window_seconds);
+  const resetsAt = asNumber(value.reset_at);
+  buckets.push({
+    id: `${groupId}:${position}`,
+    label: position === "primary" ? "Primary limit" : "Secondary limit",
+    groupId,
+    groupLabel,
+    modelKeys: [groupId, groupLabel],
+    used,
+    remaining: 100 - clampPercent(used),
+    limit: 100,
+    unit: "percent",
+    ...(seconds !== undefined && seconds > 0 ? { windowMinutes: Math.ceil(seconds / 60) } : {}),
+    ...(resetsAt !== undefined ? { resetsAt } : {}),
+  });
 }
 
 function asObject(value: unknown): Record<string, unknown> | undefined {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
-	return value as Record<string, unknown>;
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+  return value as Record<string, unknown>;
 }
 
 function asString(value: unknown): string | undefined {
-	if (typeof value !== "string") return undefined;
-	return sanitizeDisplayText(value, 160) || undefined;
+  if (typeof value !== "string") return undefined;
+  return sanitizeDisplayText(value, 160) || undefined;
 }
 
 function asNumber(value: unknown): number | undefined {
-	if (typeof value === "number" && Number.isFinite(value)) return value;
-	if (typeof value === "string" && value.trim()) {
-		const parsed = Number(value);
-		return Number.isFinite(parsed) ? parsed : undefined;
-	}
-	return undefined;
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim()) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+  }
+  return undefined;
 }
 
 function asNonnegativeInteger(value: unknown): number | undefined {
-	const parsed = asNumber(value);
-	if (parsed === undefined || !Number.isSafeInteger(parsed)) return undefined;
-	return Math.max(0, parsed);
+  const parsed = asNumber(value);
+  if (parsed === undefined || !Number.isSafeInteger(parsed)) return undefined;
+  return Math.max(0, parsed);
 }
 
 function clampPercent(value: number): number {
-	return Math.min(100, Math.max(0, value));
+  return Math.min(100, Math.max(0, value));
 }

package/src/providers/deepseek.ts

@@ -4,82 +4,77 @@ const CURRENCIES = ["CNY", "USD"] as const;
 type DeepSeekCurrency = (typeof CURRENCIES)[number];
 
 const BALANCE_FIELDS = [
-	["total", "Total balance", "total_balance"],
-	["granted", "Granted balance", "granted_balance"],
-	["topped-up", "Topped-up balance", "topped_up_balance"],
+  ["total", "Total balance", "total_balance"],
+  ["granted", "Granted balance", "granted_balance"],
+  ["topped-up", "Topped-up balance", "topped_up_balance"],
 ] as const;
 
-export function normalizeDeepSeekBalancePayload(
-	payload: DeepSeekBalancePayload,
-	capturedAt: number,
-): UsageReport {
-	if (typeof payload.is_available !== "boolean") {
-		throw new Error("DeepSeek API balance response availability was not a boolean.");
-	}
-	if (!Array.isArray(payload.balance_infos) || payload.balance_infos.length === 0) {
-		throw new Error("DeepSeek API balance response returned no balance information.");
-	}
+export function normalizeDeepSeekBalancePayload(payload: DeepSeekBalancePayload, capturedAt: number): UsageReport {
+  if (typeof payload.is_available !== "boolean") {
+    throw new Error("DeepSeek API balance response availability was not a boolean.");
+  }
+  if (!Array.isArray(payload.balance_infos) || payload.balance_infos.length === 0) {
+    throw new Error("DeepSeek API balance response returned no balance information.");
+  }
 
-	const balances = new Map<DeepSeekCurrency, Record<string, unknown>>();
-	for (const raw of payload.balance_infos) {
-		const balance = asObject(raw);
-		if (!balance) throw new Error("DeepSeek API balance row was not an object.");
-		const currency = deepSeekCurrency(balance.currency);
-		if (!currency) throw new Error("DeepSeek API balance row returned an unsupported currency.");
-		if (balances.has(currency)) {
-			throw new Error(`DeepSeek API balance response repeated ${currency}.`);
-		}
-		for (const [, label, field] of BALANCE_FIELDS) {
-			if (!decimalAmount(balance[field])) {
-				throw new Error(`DeepSeek API balance ${label.toLowerCase()} was not a valid amount.`);
-			}
-		}
-		balances.set(currency, balance);
-	}
+  const balances = new Map<DeepSeekCurrency, Record<string, unknown>>();
+  for (const raw of payload.balance_infos) {
+    const balance = asObject(raw);
+    if (!balance) throw new Error("DeepSeek API balance row was not an object.");
+    const currency = deepSeekCurrency(balance.currency);
+    if (!currency) throw new Error("DeepSeek API balance row returned an unsupported currency.");
+    if (balances.has(currency)) {
+      throw new Error(`DeepSeek API balance response repeated ${currency}.`);
+    }
+    for (const [, label, field] of BALANCE_FIELDS) {
+      if (!decimalAmount(balance[field])) {
+        throw new Error(`DeepSeek API balance ${label.toLowerCase()} was not a valid amount.`);
+      }
+    }
+    balances.set(currency, balance);
+  }
 
-	const metrics: UsageMetric[] = [
-		{
-			id: "api-availability",
-			label: "API calls",
-			value: payload.is_available ? "available" : "unavailable",
-		},
-	];
-	for (const currency of CURRENCIES) {
-		const balance = balances.get(currency);
-		if (!balance) continue;
-		for (const [id, label, field] of BALANCE_FIELDS) {
-			metrics.push({
-				id: `${currency.toLowerCase()}-${id}`,
-				label,
-				value: balance[field] as string,
-				unit: "currency",
-				currency,
-			});
-		}
-	}
+  const metrics: UsageMetric[] = [
+    {
+      id: "api-availability",
+      label: "API calls",
+      value: payload.is_available ? "available" : "unavailable",
+    },
+  ];
+  for (const currency of CURRENCIES) {
+    const balance = balances.get(currency);
+    if (!balance) continue;
+    for (const [id, label, field] of BALANCE_FIELDS) {
+      metrics.push({
+        id: `${currency.toLowerCase()}-${id}`,
+        label,
+        value: balance[field] as string,
+        unit: "currency",
+        currency,
+      });
+    }
+  }
 
-	return {
-		providerId: "deepseek",
-		providerName: "DeepSeek",
-		capturedAt,
-		source: "deepseek-balance",
-		semantics: { kind: "api-key", label: "DeepSeek API balance" },
-		buckets: [],
-		metrics,
-	};
+  return {
+    providerId: "deepseek",
+    providerName: "DeepSeek",
+    capturedAt,
+    source: "deepseek-balance",
+    semantics: { kind: "api-key", label: "DeepSeek API balance" },
+    buckets: [],
+    metrics,
+  };
 }
 
 function asObject(value: unknown): Record<string, unknown> | undefined {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
-	return value as Record<string, unknown>;
+  if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+  return value as Record<string, unknown>;
 }
 
 function deepSeekCurrency(value: unknown): DeepSeekCurrency | undefined {
-	return CURRENCIES.find((currency) => currency === value);
+  return CURRENCIES.find((currency) => currency === value);
 }
 
 function decimalAmount(value: unknown): value is string {
-	return (
-		typeof value === "string" && value.length <= 64 && /^(?:0|[1-9]\d*)(?:\.\d+)?$/u.test(value)
-	);
+  return typeof value === "string" && value.length <= 64 && /^(?:0|[1-9]\d*)(?:\.\d+)?$/u.test(value);
 }