Skip to content

Commit b832315

Browse files
only21milclaude
andcommitted
refactor(server): Claude and Codex usage limits share one epoch-seconds converter
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3fd2b85 commit b832315

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

‎apps/server/src/provider/claudeUsageLimits.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import * as Schema from "effect/Schema";
1212

1313
import {
1414
clampPercent,
15+
isoFromEpochSeconds,
1516
makeUnavailableUsageLimits,
1617
makeUsageLimits,
1718
} from "@t3tools/provider-core/server/usageLimits";
@@ -125,12 +126,6 @@ function readModelScoped(rateLimits: object): ReadonlyArray<ModelScopedWindow> {
125126
);
126127
}
127128

128-
function isoFromEpochSeconds(value: number | undefined): string | undefined {
129-
if (value === undefined || !Number.isFinite(value) || value <= 0) return undefined;
130-
const dt = DateTime.make(value * 1000);
131-
return Option.isSome(dt) ? DateTime.formatIso(dt.value) : undefined;
132-
}
133-
134129
function isoFromString(value: string | null | undefined): string | undefined {
135130
if (!value) return undefined;
136131
const dt = DateTime.make(value);

‎apps/server/src/provider/codexUsageLimits.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import type {
44
ServerProviderUsageLimits,
55
ServerProviderUsageWindow,
66
} from "@t3tools/contracts";
7-
import * as DateTime from "effect/DateTime";
8-
import * as Option from "effect/Option";
97
import type * as CodexErrors from "effect-codex-app-server/errors";
108

11-
import { clampPercent, makeUsageLimits } from "@t3tools/provider-core/server/usageLimits";
9+
import {
10+
clampPercent,
11+
isoFromEpochSeconds,
12+
makeUsageLimits,
13+
} from "@t3tools/provider-core/server/usageLimits";
1214

1315
interface CodexRateLimitWindow {
1416
readonly usedPercent: number;
@@ -40,12 +42,6 @@ const SESSION_MINS = 5 * 60;
4042
const WEEK_MINS = 7 * 24 * 60;
4143
const MONTH_MINS = 30 * 24 * 60;
4244

43-
function isoFromEpochSeconds(value: number | null | undefined): string | undefined {
44-
if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return undefined;
45-
const dt = DateTime.make(value * 1000);
46-
return Option.isSome(dt) ? DateTime.formatIso(dt.value) : undefined;
47-
}
48-
4945
function kindForDuration(mins: number): ServerProviderUsageWindow["kind"] {
5046
if (mins >= MONTH_MINS) return "monthly";
5147
if (mins >= WEEK_MINS) return "weekly";

‎packages/provider-core/src/server/usageLimits.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import type {
33
ServerProviderUsageLimits,
44
ServerProviderUsageWindow,
55
} from "@t3tools/contracts";
6+
import * as DateTime from "effect/DateTime";
7+
import * as Option from "effect/Option";
68

79
const WINDOW_KIND_ORDER: Record<ServerProviderUsageWindow["kind"], number> = {
810
session: 0,
@@ -15,6 +17,12 @@ export function clampPercent(value: number): number {
1517
return Number.isFinite(value) ? Math.max(0, Math.min(100, value)) : 0;
1618
}
1719

20+
export function isoFromEpochSeconds(value: number | null | undefined): string | undefined {
21+
if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return undefined;
22+
const dt = DateTime.make(value * 1000);
23+
return Option.isSome(dt) ? DateTime.formatIso(dt.value) : undefined;
24+
}
25+
1826
function sortWindows(
1927
windows: Iterable<ServerProviderUsageWindow>,
2028
): ReadonlyArray<ServerProviderUsageWindow> {

0 commit comments

Comments
 (0)