refactor: centralize safe expiry parsing · openclaw/openclaw@5a294cb

Recent Commits to openclaw:main

steipete · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { randomBytes } from "node:crypto";`
`2`		`-import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";`
	`2`	`+import { resolveExpiresAtMsFromDurationSeconds } from "openclaw/plugin-sdk/number-runtime";`
`3`	`3`	`import { generatePkceVerifierChallenge, toFormUrlEncoded } from "openclaw/plugin-sdk/provider-auth";`
`4`	`4`	`import {`
`5`	`5`	`parseOAuthCallbackInput,`
`@@ -99,16 +99,11 @@ function buildAuthorizeUrl(params: {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`function resolveChutesExpiresAt(value: unknown, now: number): number \| undefined {`
`102`		`-const expiresInSeconds = parseStrictPositiveInteger(value);`
`103`		`-if (expiresInSeconds === undefined) {`
`104`		`-return undefined;`
`105`		`-}`
`106`		`-const lifetimeMs = expiresInSeconds * 1000;`
`107`		`-const expiresAt = now + lifetimeMs - 5 * 60 * 1000;`
`108`		`-if (!Number.isSafeInteger(lifetimeMs) \|\| !Number.isSafeInteger(expiresAt)) {`
`109`		`-return undefined;`
`110`		`-}`
`111`		`-return Math.max(expiresAt, now + 30_000);`
	`102`	`+return resolveExpiresAtMsFromDurationSeconds(value, {`
	`103`	`+nowMs: now,`
	`104`	`+bufferMs: 5 * 60 * 1000,`
	`105`	`+minRemainingMs: 30_000,`
	`106`	`+});`
`112`	`107`	`}`
`113`	`108`
`114`	`109`	`async function fetchChutesUserInfo(params: {`

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ import { intro, note, outro, spinner } from "@clack/prompts";`
`2`	`2`	`import { stylePromptTitle } from "openclaw/plugin-sdk/cli-runtime";`
`3`	`3`	`import { logConfigUpdated, updateConfig } from "openclaw/plugin-sdk/config-mutation";`
`4`	`4`	`import {`
`5`		`-parseStrictNonNegativeInteger,`
`6`		`-parseStrictPositiveInteger,`
	`5`	`+nonNegativeSecondsToSafeMilliseconds,`
	`6`	`+positiveSecondsToSafeMilliseconds,`
`7`	`7`	`} from "openclaw/plugin-sdk/number-runtime";`
`8`	`8`	`import {`
`9`	`9`	`applyAuthProfileConfig,`
`@@ -86,21 +86,12 @@ function parseJsonResponse(value: unknown): Record<string, unknown> {`
`86`	`86`	`return value as Record<string, unknown>;`
`87`	`87`	`}`
`88`	`88`
`89`		`-function secondsToSafeMilliseconds(seconds: number): number \| undefined {`
`90`		`-const milliseconds = seconds * 1000;`
`91`		`-return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;`
`92`		`-}`
`93`		`-`
`94`	`89`	`function parseDeviceCodeResponse(`
`95`	`90`	`value: Record<string, unknown>,`
`96`	`91`	`issuedAt: number,`
`97`	`92`	`): DeviceCodeResponse {`
`98`		`-const expiresInSeconds = parseStrictPositiveInteger(value.expires_in);`
`99`		`-const intervalSeconds = parseStrictNonNegativeInteger(value.interval);`
`100`		`-const expiresInMs =`
`101`		`-expiresInSeconds === undefined ? undefined : secondsToSafeMilliseconds(expiresInSeconds);`
`102`		`-const intervalMs =`
`103`		`-intervalSeconds === undefined ? undefined : secondsToSafeMilliseconds(intervalSeconds);`
	`93`	`+const expiresInMs = positiveSecondsToSafeMilliseconds(value.expires_in);`
	`94`	`+const intervalMs = nonNegativeSecondsToSafeMilliseconds(value.interval);`
`104`	`95`	`const expiresAt = expiresInMs === undefined ? undefined : issuedAt + expiresInMs;`
`105`	`96`
`106`	`97`	`if (`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";`
	`1`	`+import { resolveExpiresAtMsFromDurationSeconds } from "openclaw/plugin-sdk/number-runtime";`
`2`	`2`	`import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";`
`3`	`3`	`import { fetchWithSsrFGuard } from "openclaw/plugin-sdk/ssrf-runtime";`
`4`	`4`	`import { createMSTeamsHttpError } from "./http-error.js";`
`@@ -42,16 +42,7 @@ function createMSTeamsTokenBody(params: {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function resolveMSTeamsTokenExpiresAt(value: unknown): number \| undefined {`
`45`		`-const expiresInSeconds = parseStrictPositiveInteger(value);`
`46`		`-if (expiresInSeconds === undefined) {`
`47`		`-return undefined;`
`48`		`-}`
`49`		`-`
`50`		`-const lifetimeMs = expiresInSeconds * 1000;`
`51`		`-const expiresAt = Date.now() + lifetimeMs - EXPIRY_BUFFER_MS;`
`52`		`-return Number.isSafeInteger(lifetimeMs) && Number.isSafeInteger(expiresAt)`
`53`		`- ? expiresAt`
`54`		`- : undefined;`
	`45`	`+return resolveExpiresAtMsFromDurationSeconds(value, { bufferMs: EXPIRY_BUFFER_MS });`
`55`	`46`	`}`
`56`	`47`
`57`	`48`	`function parseMSTeamsTokenResponse(`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { createHash, randomBytes } from "node:crypto";`
`2`		`-import { parseStrictPositiveInteger } from "../infra/parse-finite-number.js";`
	`2`	`+import { resolveExpiresAtMsFromDurationSeconds } from "../infra/parse-finite-number.js";`
`3`	`3`	`import type { OAuthCredentials } from "../llm/oauth.js";`
`4`	`4`	`import { normalizeOptionalString } from "../shared/string-coerce.js";`
`5`	`5`
`@@ -83,16 +83,11 @@ export function parseOAuthCallbackInput(`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`function resolveChutesExpiresAt(value: unknown, now: number): number \| undefined {`
`86`		`-const expiresInSeconds = parseStrictPositiveInteger(value);`
`87`		`-if (expiresInSeconds === undefined) {`
`88`		`-return undefined;`
`89`		`-}`
`90`		`-const lifetimeMs = expiresInSeconds * 1000;`
`91`		`-const expiresAt = now + lifetimeMs - DEFAULT_EXPIRES_BUFFER_MS;`
`92`		`-if (!Number.isSafeInteger(lifetimeMs) \|\| !Number.isSafeInteger(expiresAt)) {`
`93`		`-return undefined;`
`94`		`-}`
`95`		`-return Math.max(expiresAt, now + 30_000);`
	`86`	`+return resolveExpiresAtMsFromDurationSeconds(value, {`
	`87`	`+nowMs: now,`
	`88`	`+bufferMs: DEFAULT_EXPIRES_BUFFER_MS,`
	`89`	`+minRemainingMs: 30_000,`
	`90`	`+});`
`96`	`91`	`}`
`97`	`92`
`98`	`93`	`async function fetchChutesUserInfo(params: {`

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,8 @@ export {`
`4`	`4`	`parseStrictInteger,`
`5`	`5`	`parseStrictNonNegativeInteger,`
`6`	`6`	`parseStrictPositiveInteger,`
	`7`	`+positiveSecondsToSafeMilliseconds,`
	`8`	`+nonNegativeSecondsToSafeMilliseconds,`
	`9`	`+resolveExpiresAtMsFromDurationSeconds,`
	`10`	`+resolveExpiresAtMsFromEpochSeconds,`
`7`	`11`	`} from "../shared/number-coercion.js";`

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`import {`
`6`		`-parseStrictNonNegativeInteger,`
`7`		`-parseStrictPositiveInteger,`
	`6`	`+nonNegativeSecondsToSafeMilliseconds,`
	`7`	`+positiveSecondsToSafeMilliseconds,`
	`8`	`+resolveExpiresAtMsFromDurationSeconds,`
	`9`	`+resolveExpiresAtMsFromEpochSeconds,`
`8`	`10`	`} from "../../../infra/parse-finite-number.js";`
`9`	`11`	`import type { Model } from "../../types.js";`
`10`	`12`	`import type { OAuthCredentials, OAuthLoginCallbacks, OAuthProviderInterface } from "./types.js";`
`@@ -60,40 +62,12 @@ type CopilotRequestOptions = {`
`60`	`62`	`timeoutMs?: number;`
`61`	`63`	`};`
`62`	`64`
`63`		`-function secondsToSafeMilliseconds(value: unknown): number \| undefined {`
`64`		`-const seconds = parseStrictPositiveInteger(value);`
`65`		`-if (seconds === undefined) {`
`66`		`-return undefined;`
`67`		`-}`
`68`		`-const milliseconds = seconds * 1000;`
`69`		`-return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;`
`70`		`-}`
`71`		`-`
`72`		`-function nonNegativeSecondsToSafeMilliseconds(value: unknown): number \| undefined {`
`73`		`-const seconds = parseStrictNonNegativeInteger(value);`
`74`		`-if (seconds === undefined) {`
`75`		`-return undefined;`
`76`		`-}`
`77`		`-const milliseconds = seconds * 1000;`
`78`		`-return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;`
`79`		`-}`
`80`		`-`
`81`	`65`	`function resolveExpiresAtFromDurationSeconds(value: unknown): number \| undefined {`
`82`		`-const durationMs = secondsToSafeMilliseconds(value);`
`83`		`-if (durationMs === undefined) {`
`84`		`-return undefined;`
`85`		`-}`
`86`		`-const expiresAt = Date.now() + durationMs;`
`87`		`-return Number.isSafeInteger(expiresAt) ? expiresAt : undefined;`
	`66`	`+return resolveExpiresAtMsFromDurationSeconds(value);`
`88`	`67`	`}`
`89`	`68`
`90`	`69`	`function resolveExpiresAtFromEpochSeconds(value: unknown): number \| undefined {`
`91`		`-const epochMs = secondsToSafeMilliseconds(value);`
`92`		`-if (epochMs === undefined) {`
`93`		`-return undefined;`
`94`		`-}`
`95`		`-const expiresAt = epochMs - 5 * 60 * 1000;`
`96`		`-return Number.isSafeInteger(expiresAt) ? expiresAt : undefined;`
	`70`	`+return resolveExpiresAtMsFromEpochSeconds(value, { bufferMs: 5 * 60 * 1000 });`
`97`	`71`	`}`
`98`	`72`
`99`	`73`	`export function normalizeDomain(input: string): string \| null {`
`@@ -350,7 +324,7 @@ async function pollForGitHubAccessToken(`
`350`	`324`
`351`	`325`	`if (error === "slow_down") {`
`352`	`326`	`slowDownResponses += 1;`
`353`		`-const slowDownIntervalMs = secondsToSafeMilliseconds(interval);`
	`327`	`+const slowDownIntervalMs = positiveSecondsToSafeMilliseconds(interval);`
`354`	`328`	`pollingIntervalMs =`
`355`	`329`	`slowDownIntervalMs === undefined`
`356`	`330`	`? Math.max(1000, pollingIntervalMs + 5000)`

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,9 @@ export {`
`10`	`10`	`parseStrictFiniteNumber,`
`11`	`11`	`parseStrictNonNegativeInteger,`
`12`	`12`	`parseStrictPositiveInteger,`
	`13`	`+positiveSecondsToSafeMilliseconds,`
	`14`	`+nonNegativeSecondsToSafeMilliseconds,`
	`15`	`+resolveExpiresAtMsFromDurationSeconds,`
	`16`	`+resolveExpiresAtMsFromEpochSeconds,`
`13`	`17`	`} from "../shared/number-coercion.js";`
`14`	`18`	`export { MAX_TCP_PORT, parseTcpPort } from "../infra/tcp-port.js";`

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,12 @@ import {`
`3`	`3`	`asFiniteNumber,`
`4`	`4`	`asFiniteNumberInRange,`
`5`	`5`	`asSafeIntegerInRange,`
	`6`	`+nonNegativeSecondsToSafeMilliseconds,`
`6`	`7`	`parseFiniteNumber,`
	`8`	`+positiveSecondsToSafeMilliseconds,`
`7`	`9`	`resolveIntegerOption,`
	`10`	`+resolveExpiresAtMsFromDurationSeconds,`
	`11`	`+resolveExpiresAtMsFromEpochSeconds,`
`8`	`12`	`resolveNonNegativeIntegerOption,`
`9`	`13`	`resolveOptionalIntegerOption,`
`10`	`14`	`parseStrictFiniteNumber,`
`@@ -69,6 +73,33 @@ describe("number-coercion", () => {`
`69`	`73`	`expect(parseStrictNonNegativeInteger("-1")).toBeUndefined();`
`70`	`74`	`});`
`71`	`75`
	`76`	`+test("seconds helpers reject unsafe millisecond values", () => {`
	`77`	`+expect(positiveSecondsToSafeMilliseconds("10")).toBe(10_000);`
	`78`	`+expect(positiveSecondsToSafeMilliseconds("0")).toBeUndefined();`
	`79`	`+expect(positiveSecondsToSafeMilliseconds("1e309")).toBeUndefined();`
	`80`	`+expect(nonNegativeSecondsToSafeMilliseconds("0")).toBe(0);`
	`81`	`+expect(nonNegativeSecondsToSafeMilliseconds("-1")).toBeUndefined();`
	`82`	`+});`
	`83`	`+`
	`84`	`+test("expiry helpers resolve safe absolute timestamps", () => {`
	`85`	`+expect(`
	`86`	`+resolveExpiresAtMsFromDurationSeconds("3600", {`
	`87`	`+nowMs: 1_000,`
	`88`	`+bufferMs: 300,`
	`89`	`+}),`
	`90`	`+).toBe(3_600_700);`
	`91`	`+expect(`
	`92`	`+resolveExpiresAtMsFromDurationSeconds("10", {`
	`93`	`+nowMs: 1_000,`
	`94`	`+bufferMs: 20_000,`
	`95`	`+minRemainingMs: 30_000,`
	`96`	`+}),`
	`97`	`+).toBe(31_000);`
	`98`	`+expect(resolveExpiresAtMsFromDurationSeconds("1e309", { nowMs: 1_000 })).toBeUndefined();`
	`99`	`+expect(resolveExpiresAtMsFromEpochSeconds("3600", { bufferMs: 300 })).toBe(3_599_700);`
	`100`	`+expect(resolveExpiresAtMsFromEpochSeconds("1e309")).toBeUndefined();`
	`101`	`+});`
	`102`	`+`
`72`	`103`	`test("integer option helpers floor finite values and fall back for non-finite values", () => {`
`73`	`104`	`expect(resolveIntegerOption(7.9, 1, { min: 1, max: 10 })).toBe(7);`
`74`	`105`	`expect(resolveIntegerOption(Number.NaN, 4.9, { min: 1 })).toBe(4);`

Original file line number	Diff line number	Diff line change
`@@ -133,3 +133,50 @@ export function parseStrictNonNegativeInteger(value: unknown): number \| undefine`
`133`	`133`	`const parsed = parseStrictInteger(value);`
`134`	`134`	`return parsed !== undefined && parsed >= 0 ? parsed : undefined;`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+export function positiveSecondsToSafeMilliseconds(value: unknown): number \| undefined {`
	`138`	`+const seconds = parseStrictPositiveInteger(value);`
	`139`	`+if (seconds === undefined) {`
	`140`	`+return undefined;`
	`141`	`+}`
	`142`	`+const milliseconds = seconds * 1000;`
	`143`	`+return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;`
	`144`	`+}`
	`145`	`+`
	`146`	`+export function nonNegativeSecondsToSafeMilliseconds(value: unknown): number \| undefined {`
	`147`	`+const seconds = parseStrictNonNegativeInteger(value);`
	`148`	`+if (seconds === undefined) {`
	`149`	`+return undefined;`
	`150`	`+}`
	`151`	`+const milliseconds = seconds * 1000;`
	`152`	`+return Number.isSafeInteger(milliseconds) ? milliseconds : undefined;`
	`153`	`+}`
	`154`	`+`
	`155`	`+export function resolveExpiresAtMsFromDurationSeconds(`
	`156`	`+value: unknown,`
	`157`	`+opts: { nowMs?: number; bufferMs?: number; minRemainingMs?: number } = {},`
	`158`	`+): number \| undefined {`
	`159`	`+const durationMs = positiveSecondsToSafeMilliseconds(value);`
	`160`	`+if (durationMs === undefined) {`
	`161`	`+return undefined;`
	`162`	`+}`
	`163`	`+const nowMs = opts.nowMs ?? Date.now();`
	`164`	`+const expiresAt = nowMs + durationMs - (opts.bufferMs ?? 0);`
	`165`	`+if (!Number.isSafeInteger(expiresAt)) {`
	`166`	`+return undefined;`
	`167`	`+}`
	`168`	`+const minRemainingMs = opts.minRemainingMs;`
	`169`	`+return minRemainingMs === undefined ? expiresAt : Math.max(expiresAt, nowMs + minRemainingMs);`
	`170`	`+}`
	`171`	`+`
	`172`	`+export function resolveExpiresAtMsFromEpochSeconds(`
	`173`	`+value: unknown,`
	`174`	`+opts: { bufferMs?: number } = {},`
	`175`	`+): number \| undefined {`
	`176`	`+const epochMs = positiveSecondsToSafeMilliseconds(value);`
	`177`	`+if (epochMs === undefined) {`
	`178`	`+return undefined;`
	`179`	`+}`
	`180`	`+const expiresAt = epochMs - (opts.bufferMs ?? 0);`
	`181`	`+return Number.isSafeInteger(expiresAt) ? expiresAt : undefined;`
	`182`	`+}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main