mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 11:01:24 +00:00
refactor(auth): share remaining-time formatter
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { buildAuthHealthSummary, DEFAULT_OAUTH_WARN_MS } from "./auth-health.js";
|
||||
import {
|
||||
buildAuthHealthSummary,
|
||||
DEFAULT_OAUTH_WARN_MS,
|
||||
formatRemainingShort,
|
||||
} from "./auth-health.js";
|
||||
|
||||
describe("buildAuthHealthSummary", () => {
|
||||
const now = 1_700_000_000_000;
|
||||
@@ -87,3 +91,10 @@ describe("buildAuthHealthSummary", () => {
|
||||
expect(statuses["google:no-refresh"]).toBe("expired");
|
||||
});
|
||||
});
|
||||
|
||||
describe("formatRemainingShort", () => {
|
||||
it("supports an explicit under-minute label override", () => {
|
||||
expect(formatRemainingShort(20_000)).toBe("1m");
|
||||
expect(formatRemainingShort(20_000, { underMinuteLabel: "soon" })).toBe("soon");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -43,14 +43,23 @@ export function resolveAuthProfileSource(_profileId: string): AuthProfileSource
|
||||
return "store";
|
||||
}
|
||||
|
||||
export function formatRemainingShort(remainingMs?: number): string {
|
||||
export function formatRemainingShort(
|
||||
remainingMs?: number,
|
||||
opts?: {
|
||||
underMinuteLabel?: string;
|
||||
},
|
||||
): string {
|
||||
if (remainingMs === undefined || Number.isNaN(remainingMs)) {
|
||||
return "unknown";
|
||||
}
|
||||
if (remainingMs <= 0) {
|
||||
return "0m";
|
||||
}
|
||||
const minutes = Math.max(1, Math.round(remainingMs / 60_000));
|
||||
const roundedMinutes = Math.round(remainingMs / 60_000);
|
||||
if (roundedMinutes < 1) {
|
||||
return opts?.underMinuteLabel ?? "1m";
|
||||
}
|
||||
const minutes = roundedMinutes;
|
||||
if (minutes < 60) {
|
||||
return `${minutes}m`;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user