refactor: dedupe script validation helpers · openclaw/openclaw@b8311ad

Recent Commits to openclaw:main

vincentkoc · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@ import fs from "node:fs";`
`5`	`5`	`import path from "node:path";`
`6`	`6`	`import process from "node:process";`
`7`	`7`	`import { pathToFileURL } from "node:url";`
	`8`	`+import {`
	`9`	`+parseNonNegativeInt,`
	`10`	`+parsePositiveInt,`
	`11`	`+parsePositiveNumber,`
	`12`	`+} from "./lib/numeric-options.mjs";`
`8`	`13`	`import { collectGatewayCpuObservations } from "./lib/plugin-gateway-gauntlet.mjs";`
`9`	`14`	`import { createPnpmRunnerSpawnSpec } from "./pnpm-runner.mjs";`
`10`	`15`
`@@ -92,42 +97,6 @@ function parseArgs(argv) {`
`92`	`97`	`return options;`
`93`	`98`	`}`
`94`	`99`
`95`		`-function parsePositiveInt(raw, label) {`
`96`		`-const text = String(raw).trim();`
`97`		`-if (!/^\d+$/u.test(text)) {`
`98`		-throw new Error(`${label} must be a positive integer`);
`99`		`-}`
`100`		`-const value = Number(text);`
`101`		`-if (!Number.isSafeInteger(value) \|\| value < 1) {`
`102`		-throw new Error(`${label} must be a positive integer`);
`103`		`-}`
`104`		`-return value;`
`105`		`-}`
`106`		`-`
`107`		`-function parseNonNegativeInt(raw, label) {`
`108`		`-const text = String(raw).trim();`
`109`		`-if (!/^\d+$/u.test(text)) {`
`110`		-throw new Error(`${label} must be a non-negative integer`);
`111`		`-}`
`112`		`-const value = Number(text);`
`113`		`-if (!Number.isSafeInteger(value) \|\| value < 0) {`
`114`		-throw new Error(`${label} must be a non-negative integer`);
`115`		`-}`
`116`		`-return value;`
`117`		`-}`
`118`		`-`
`119`		`-function parsePositiveNumber(raw, label) {`
`120`		`-const text = String(raw).trim();`
`121`		`-if (!/^(?:\d+(?:\.\d+)?\|\.\d+)$/u.test(text)) {`
`122`		-throw new Error(`${label} must be a positive number`);
`123`		`-}`
`124`		`-const value = Number(text);`
`125`		`-if (!Number.isFinite(value) \|\| value <= 0) {`
`126`		-throw new Error(`${label} must be a positive number`);
`127`		`-}`
`128`		`-return value;`
`129`		`-}`
`130`		`-`
`131`	`100`	`function printHelp() {`
`132`	`101`	console.log(`Usage: pnpm test:gateway:cpu-scenarios [options]
`133`	`102`

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,11 @@ import os from "node:os";`
`6`	`6`	`import path from "node:path";`
`7`	`7`	`import process from "node:process";`
`8`	`8`	`import { fileURLToPath } from "node:url";`
	`9`	`+import {`
	`10`	`+parseNonNegativeInt,`
	`11`	`+parsePositiveInt,`
	`12`	`+parsePositiveNumber,`
	`13`	`+} from "./lib/numeric-options.mjs";`
`9`	`14`	`import {`
`10`	`15`	`buildGauntletPrebuildEnv,`
`11`	`16`	`collectGatewayCpuObservations,`
`@@ -219,42 +224,6 @@ function readOptionalNonNegativeIntEnv(name) {`
`219`	`224`	`return raw ? parseNonNegativeInt(raw, name) : undefined;`
`220`	`225`	`}`
`221`	`226`
`222`		`-function parsePositiveInt(raw, label) {`
`223`		`-const text = String(raw).trim();`
`224`		`-if (!/^\d+$/u.test(text)) {`
`225`		-throw new Error(`${label} must be a positive integer`);
`226`		`-}`
`227`		`-const value = Number(text);`
`228`		`-if (!Number.isSafeInteger(value) \|\| value < 1) {`
`229`		-throw new Error(`${label} must be a positive integer`);
`230`		`-}`
`231`		`-return value;`
`232`		`-}`
`233`		`-`
`234`		`-function parseNonNegativeInt(raw, label) {`
`235`		`-const text = String(raw).trim();`
`236`		`-if (!/^\d+$/u.test(text)) {`
`237`		-throw new Error(`${label} must be a non-negative integer`);
`238`		`-}`
`239`		`-const value = Number(text);`
`240`		`-if (!Number.isSafeInteger(value) \|\| value < 0) {`
`241`		-throw new Error(`${label} must be a non-negative integer`);
`242`		`-}`
`243`		`-return value;`
`244`		`-}`
`245`		`-`
`246`		`-function parsePositiveNumber(raw, label) {`
`247`		`-const text = String(raw).trim();`
`248`		`-if (!/^(?:\d+(?:\.\d+)?\|\.\d+)$/u.test(text)) {`
`249`		-throw new Error(`${label} must be a positive number`);
`250`		`-}`
`251`		`-const value = Number(text);`
`252`		`-if (!Number.isFinite(value) \|\| value <= 0) {`
`253`		-throw new Error(`${label} must be a positive number`);
`254`		`-}`
`255`		`-return value;`
`256`		`-}`
`257`		`-`
`258`	`227`	`export function createGauntletPrebuildCommand(repoRoot) {`
`259`	`228`	`return {`
`260`	`229`	`command: process.execPath,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,40 @@`
	`1`	`+function bodyTooLargeError(label, byteLimit) {`
	`2`	+return Object.assign(new Error(`${label} response body exceeded ${byteLimit} bytes`), {
	`3`	`+code: "ETOOBIG",`
	`4`	`+});`
	`5`	`+}`
	`6`	`+`
	`7`	`+export async function readBoundedResponseText(response, label, byteLimit, timeoutPromise) {`
	`8`	`+const contentLength = response.headers.get("content-length");`
	`9`	`+if (contentLength) {`
	`10`	`+const parsedLength = Number(contentLength);`
	`11`	`+if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
	`12`	`+await response.body?.cancel().catch(() => {});`
	`13`	`+throw bodyTooLargeError(label, byteLimit);`
	`14`	`+}`
	`15`	`+}`
	`16`	`+if (!response.body) {`
	`17`	`+return "";`
	`18`	`+}`
	`19`	`+`
	`20`	`+const reader = response.body.getReader();`
	`21`	`+const decoder = new TextDecoder();`
	`22`	`+let byteCount = 0;`
	`23`	`+let text = "";`
	`24`	`+try {`
	`25`	`+while (true) {`
	`26`	`+const { done, value } = await Promise.race([reader.read(), timeoutPromise]);`
	`27`	`+if (done) {`
	`28`	`+return text + decoder.decode();`
	`29`	`+}`
	`30`	`+byteCount += value.byteLength;`
	`31`	`+if (byteCount > byteLimit) {`
	`32`	`+await reader.cancel().catch(() => {});`
	`33`	`+throw bodyTooLargeError(label, byteLimit);`
	`34`	`+}`
	`35`	`+text += decoder.decode(value, { stream: true });`
	`36`	`+}`
	`37`	`+} finally {`
	`38`	`+reader.releaseLock();`
	`39`	`+}`
	`40`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`	`2`	`import fs from "node:fs/promises";`
	`3`	`+import { readBoundedResponseText } from "./lib/bounded-response-text.mjs";`
`3`	`4`
`4`	`5`	`const DEFAULT_ENDPOINT_PREFIX = "/qa-credentials/v1";`
`5`	`6`	`const DEFAULT_ACQUIRE_TIMEOUT_MS = 90_000;`
`@@ -165,41 +166,6 @@ function resolveConfig() {`
`165`	`166`	`};`
`166`	`167`	`}`
`167`	`168`
`168`		`-async function readBoundedResponseText(response, label, byteLimit, timeoutPromise) {`
`169`		`-const contentLength = response.headers.get("content-length");`
`170`		`-if (contentLength) {`
`171`		`-const parsedLength = Number(contentLength);`
`172`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`173`		`-await response.body?.cancel().catch(() => {});`
`174`		-throw taggedError(`${label} response body exceeded ${byteLimit} bytes`, "ETOOBIG");
`175`		`-}`
`176`		`-}`
`177`		`-if (!response.body) {`
`178`		`-return "";`
`179`		`-}`
`180`		`-`
`181`		`-const reader = response.body.getReader();`
`182`		`-const decoder = new TextDecoder();`
`183`		`-let byteCount = 0;`
`184`		`-let text = "";`
`185`		`-try {`
`186`		`-while (true) {`
`187`		`-const { done, value } = await Promise.race([reader.read(), timeoutPromise]);`
`188`		`-if (done) {`
`189`		`-return text + decoder.decode();`
`190`		`-}`
`191`		`-byteCount += value.byteLength;`
`192`		`-if (byteCount > byteLimit) {`
`193`		`-await reader.cancel().catch(() => {});`
`194`		-throw taggedError(`${label} response body exceeded ${byteLimit} bytes`, "ETOOBIG");
`195`		`-}`
`196`		`-text += decoder.decode(value, { stream: true });`
`197`		`-}`
`198`		`-} finally {`
`199`		`-reader.releaseLock();`
`200`		`-}`
`201`		`-}`
`202`		`-`
`203`	`169`	`function parseBrokerPayload(rawPayload, response) {`
`204`	`170`	`if (!rawPayload.trim()) {`
`205`	`171`	`return response.ok ? { status: "ok" } : {};`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`	`2`	`import fs from "node:fs/promises";`
`3`	`3`	`import path from "node:path";`
	`4`	`+import { readBoundedResponseText } from "./lib/bounded-response-text.mjs";`
`4`	`5`
`5`	`6`	`const groupId = process.env.OPENCLAW_QA_TELEGRAM_GROUP_ID;`
`6`	`7`	`const driverToken = process.env.OPENCLAW_QA_TELEGRAM_DRIVER_BOT_TOKEN;`
`@@ -64,41 +65,6 @@ function taggedError(message, code) {`
`64`	`65`	`return Object.assign(new Error(message), { code });`
`65`	`66`	`}`
`66`	`67`
`67`		`-async function readBoundedResponseText(response, label, byteLimit, timeoutPromise) {`
`68`		`-const contentLength = response.headers.get("content-length");`
`69`		`-if (contentLength) {`
`70`		`-const parsedLength = Number(contentLength);`
`71`		`-if (Number.isSafeInteger(parsedLength) && parsedLength > byteLimit) {`
`72`		`-await response.body?.cancel().catch(() => {});`
`73`		-throw taggedError(`${label} response body exceeded ${byteLimit} bytes`, "ETOOBIG");
`74`		`-}`
`75`		`-}`
`76`		`-if (!response.body) {`
`77`		`-return "";`
`78`		`-}`
`79`		`-`
`80`		`-const reader = response.body.getReader();`
`81`		`-const decoder = new TextDecoder();`
`82`		`-let byteCount = 0;`
`83`		`-let text = "";`
`84`		`-try {`
`85`		`-while (true) {`
`86`		`-const { done, value } = await Promise.race([reader.read(), timeoutPromise]);`
`87`		`-if (done) {`
`88`		`-return text + decoder.decode();`
`89`		`-}`
`90`		`-byteCount += value.byteLength;`
`91`		`-if (byteCount > byteLimit) {`
`92`		`-await reader.cancel().catch(() => {});`
`93`		-throw taggedError(`${label} response body exceeded ${byteLimit} bytes`, "ETOOBIG");
`94`		`-}`
`95`		`-text += decoder.decode(value, { stream: true });`
`96`		`-}`
`97`		`-} finally {`
`98`		`-reader.releaseLock();`
`99`		`-}`
`100`		`-}`
`101`		`-`
`102`	`68`	`function parseJsonPayload(rawPayload, label) {`
`103`	`69`	`try {`
`104`	`70`	`return JSON.parse(rawPayload);`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+export function parsePositiveInt(raw, label) {`
	`2`	`+const text = String(raw).trim();`
	`3`	`+if (!/^\d+$/u.test(text)) {`
	`4`	+throw new Error(`${label} must be a positive integer`);
	`5`	`+}`
	`6`	`+const value = Number(text);`
	`7`	`+if (!Number.isSafeInteger(value) \|\| value < 1) {`
	`8`	+throw new Error(`${label} must be a positive integer`);
	`9`	`+}`
	`10`	`+return value;`
	`11`	`+}`
	`12`	`+`
	`13`	`+export function parseNonNegativeInt(raw, label) {`
	`14`	`+const text = String(raw).trim();`
	`15`	`+if (!/^\d+$/u.test(text)) {`
	`16`	+throw new Error(`${label} must be a non-negative integer`);
	`17`	`+}`
	`18`	`+const value = Number(text);`
	`19`	`+if (!Number.isSafeInteger(value) \|\| value < 0) {`
	`20`	+throw new Error(`${label} must be a non-negative integer`);
	`21`	`+}`
	`22`	`+return value;`
	`23`	`+}`
	`24`	`+`
	`25`	`+export function parsePositiveNumber(raw, label) {`
	`26`	`+const text = String(raw).trim();`
	`27`	`+if (!/^(?:\d+(?:\.\d+)?\|\.\d+)$/u.test(text)) {`
	`28`	+throw new Error(`${label} must be a positive number`);
	`29`	`+}`
	`30`	`+const value = Number(text);`
	`31`	`+if (!Number.isFinite(value) \|\| value <= 0) {`
	`32`	+throw new Error(`${label} must be a positive number`);
	`33`	`+}`
	`34`	`+return value;`
	`35`	`+}`

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

推荐订阅源

Recent Commits to openclaw:main