github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 16:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: chore: Fix types in tests 12/N.

Browse Source
This commit is contained in:
cpojer
2026-02-17 11:17:45 +09:00
parent e02feaff83
commit 262b7a157a
7 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/infra/provider-usage.fetch.antigravity.test.ts
View File

@@ -13,7 +13,7 @@ const toRequestUrl = (input: Parameters<typeof fetch>[0]): string =>
const createAntigravityFetch = (
handler: (url: string, init?: Parameters<typeof fetch>[1]) => Promise<Response> | Response,
) =>
vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input, init) =>
vi.fn(async (input: string | Request | URL, init?: RequestInit) =>
handler(toRequestUrl(input), init),
);
@@ -38,7 +38,7 @@ function createEndpointFetch(spec: {
}
async function runUsage(mockFetch: ReturnType<typeof createAntigravityFetch>) {
return fetchAntigravityUsage("token-123", 5000, mockFetch);
return fetchAntigravityUsage("token-123", 5000, mockFetch as unknown as typeof fetch);
}
function findWindow(snapshot: Awaited<ReturnType<typeof fetchAntigravityUsage>>, label: string) {

50
src/infra/provider-usage.test.ts
View File

@@ -23,7 +23,7 @@ function toRequestUrl(input: Parameters<typeof fetch>[0]): string {
}
function createMinimaxOnlyFetch(payload: unknown) {
return vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input) => {
return vi.fn(async (input: string | Request | URL) => {
if (toRequestUrl(input).includes(minimaxRemainsEndpoint)) {
return makeResponse(200, payload);
}
@@ -41,7 +41,7 @@ async function expectMinimaxUsage(
const summary = await loadProviderUsageSummary({
now: Date.UTC(2026, 0, 7, 0, 0, 0),
auth: [{ provider: "minimax", token: "token-1b" }],
fetch: mockFetch,
fetch: mockFetch as unknown as typeof fetch,
});
const minimax = summary.providers.find((p) => p.provider === "minimax");
@@ -113,7 +113,7 @@ describe("provider usage formatting", () => {
describe("provider usage loading", () => {
it("loads usage snapshots with injected auth", async () => {
const mockFetch = vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input) => {
const mockFetch = vi.fn(async (input: string | Request | URL) => {
const url = toRequestUrl(input);
if (url.includes("api.anthropic.com")) {
return makeResponse(200, {
@@ -159,7 +159,7 @@ describe("provider usage loading", () => {
{ provider: "minimax", token: "token-1b" },
{ provider: "zai", token: "token-2" },
],
fetch: mockFetch,
fetch: mockFetch as unknown as typeof fetch,
});
expect(summary.providers).toHaveLength(3);
@@ -266,33 +266,27 @@ describe("provider usage loading", () => {
return new Response(payload, { status, headers });
};
const mockFetch = vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(
async (input, init) => {
const url =
typeof input === "string"
? input
: input instanceof URL
? input.toString()
: input.url;
if (url.includes("api.anthropic.com/api/oauth/usage")) {
const headers = (init?.headers ?? {}) as Record<string, string>;
expect(headers.Authorization).toBe("Bearer token-1");
return makeResponse(200, {
five_hour: {
utilization: 20,
resets_at: "2026-01-07T01:00:00Z",
},
});
}
return makeResponse(404, "not found");
},
);
const mockFetch = vi.fn(async (input: string | Request | URL, init?: RequestInit) => {
const url =
typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
if (url.includes("api.anthropic.com/api/oauth/usage")) {
const headers = (init?.headers ?? {}) as Record<string, string>;
expect(headers.Authorization).toBe("Bearer token-1");
return makeResponse(200, {
five_hour: {
utilization: 20,
resets_at: "2026-01-07T01:00:00Z",
},
});
}
return makeResponse(404, "not found");
});
const summary = await loadProviderUsageSummary({
now: Date.UTC(2026, 0, 7, 0, 0, 0),
providers: ["anthropic"],
agentDir,
fetch: mockFetch,
fetch: mockFetch as unknown as typeof fetch,
});
expect(summary.providers).toHaveLength(1);
@@ -321,7 +315,7 @@ describe("provider usage loading", () => {
return new Response(payload, { status, headers });
};
const mockFetch = vi.fn<Parameters<typeof fetch>, ReturnType<typeof fetch>>(async (input) => {
const mockFetch = vi.fn(async (input: string | Request | URL) => {
const url =
typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
if (url.includes("api.anthropic.com/api/oauth/usage")) {
@@ -349,7 +343,7 @@ describe("provider usage loading", () => {
const summary = await loadProviderUsageSummary({
now: Date.UTC(2026, 0, 7, 0, 0, 0),
auth: [{ provider: "anthropic", token: "sk-ant-oauth-1" }],
fetch: mockFetch,
fetch: mockFetch as unknown as typeof fetch,
});
expect(summary.providers).toHaveLength(1);

14
src/infra/session-cost-usage.ts
View File

@@ -2,8 +2,15 @@ import fs from "node:fs";
import path from "node:path";
import readline from "node:readline";
import type { NormalizedUsage, UsageLike } from "../agents/usage.js";
import { normalizeUsage } from "../agents/usage.js";
import type { OpenClawConfig } from "../config/config.js";
import {
resolveSessionFilePath,
resolveSessionTranscriptsDirForAgent,
} from "../config/sessions/paths.js";
import type { SessionEntry } from "../config/sessions/types.js";
import { countToolResults, extractToolCallNames } from "../utils/transcript-tools.js";
import { estimateUsageCost, resolveModelCostConfig } from "../utils/usage-format.js";
import type {
CostBreakdown,
CostUsageTotals,
@@ -24,13 +31,6 @@ import type {
SessionUsageTimePoint,
SessionUsageTimeSeries,
} from "./session-cost-usage.types.js";
import { normalizeUsage } from "../agents/usage.js";
import {
resolveSessionFilePath,
resolveSessionTranscriptsDirForAgent,
} from "../config/sessions/paths.js";
import { countToolResults, extractToolCallNames } from "../utils/transcript-tools.js";
import { estimateUsageCost, resolveModelCostConfig } from "../utils/usage-format.js";
export type {
CostUsageDailyEntry,