fix: bound doctor output buffer and normalize credential values (#497)

This commit is contained in:
Lingxuan Zuo
2026-03-15 20:37:22 +08:00
committed by GitHub
Unverified
parent 1dbe4a8466
commit 89bda3c7af
4 changed files with 340 additions and 5 deletions

View File

@@ -6,6 +6,7 @@ import { logger } from './logger';
import { getUvMirrorEnv } from './uv-env';
const OPENCLAW_DOCTOR_TIMEOUT_MS = 60_000;
const MAX_DOCTOR_OUTPUT_BYTES = 10 * 1024 * 1024;
const OPENCLAW_DOCTOR_ARGS = ['doctor', '--json'];
const OPENCLAW_DOCTOR_FIX_ARGS = ['doctor', '--fix', '--yes', '--non-interactive'];
@@ -24,6 +25,39 @@ export interface OpenClawDoctorResult {
error?: string;
}
function appendDoctorOutput(
current: string,
currentBytes: number,
data: Buffer | string,
stream: 'stdout' | 'stderr',
alreadyTruncated: boolean,
): { output: string; bytes: number; truncated: boolean } {
if (alreadyTruncated) {
return { output: current, bytes: currentBytes, truncated: true };
}
const chunk = typeof data === 'string' ? Buffer.from(data) : data;
if (currentBytes + chunk.length <= MAX_DOCTOR_OUTPUT_BYTES) {
return {
output: current + chunk.toString(),
bytes: currentBytes + chunk.length,
truncated: false,
};
}
const remaining = Math.max(0, MAX_DOCTOR_OUTPUT_BYTES - currentBytes);
const appended = remaining > 0 ? chunk.subarray(0, remaining).toString() : '';
logger.warn(
`OpenClaw doctor ${stream} exceeded ${MAX_DOCTOR_OUTPUT_BYTES} bytes; truncating additional output`,
);
return {
output: current + appended,
bytes: MAX_DOCTOR_OUTPUT_BYTES,
truncated: true,
};
}
function getBundledBinPath(): string {
const target = `${process.platform}-${process.arch}`;
return app.isPackaged
@@ -79,6 +113,10 @@ async function runDoctorCommand(mode: OpenClawDoctorMode): Promise<OpenClawDocto
let stdout = '';
let stderr = '';
let stdoutBytes = 0;
let stderrBytes = 0;
let stdoutTruncated = false;
let stderrTruncated = false;
let settled = false;
const finish = (result: Omit<OpenClawDoctorResult, 'durationMs'>) => {
@@ -111,11 +149,17 @@ async function runDoctorCommand(mode: OpenClawDoctorMode): Promise<OpenClawDocto
}, OPENCLAW_DOCTOR_TIMEOUT_MS);
child.stdout?.on('data', (data) => {
stdout += data.toString();
const next = appendDoctorOutput(stdout, stdoutBytes, data, 'stdout', stdoutTruncated);
stdout = next.output;
stdoutBytes = next.bytes;
stdoutTruncated = next.truncated;
});
child.stderr?.on('data', (data) => {
stderr += data.toString();
const next = appendDoctorOutput(stderr, stderrBytes, data, 'stderr', stderrTruncated);
stderr = next.output;
stderrBytes = next.bytes;
stderrTruncated = next.truncated;
});
child.on('error', (error) => {