惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

雷峰网
雷峰网
博客园 - 聂微东
酷 壳 – CoolShell
酷 壳 – CoolShell
宝玉的分享
宝玉的分享
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
罗磊的独立博客
Hugging Face - Blog
Hugging Face - Blog
T
Tailwind CSS Blog
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
IT之家
IT之家
博客园_首页
博客园 - 三生石上(FineUI控件)
博客园 - 叶小钗
Apple Machine Learning Research
Apple Machine Learning Research
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
量子位
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
人人都是产品经理
人人都是产品经理
美团技术团队
小众软件
小众软件
Jina AI
Jina AI
S
SegmentFault 最新的问题
博客园 - Franky
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(e2e): finish telegram timeout cleanup promptly · open...
vincentkoc · 2026-06-20 · via Recent Commits to openclaw:main

@@ -22,6 +22,7 @@ type RunCommandOptions = {

2222

const DEFAULT_OUTPUT_LIMIT = 128 * 1024;

2323

const DEFAULT_FETCH_BODY_LIMIT = 1024 * 1024;

2424

const KILL_GRACE_MS = readKillGraceMs();

25+

const PROCESS_TREE_EXIT_POLL_MS = 50;

2526

const SIGNAL_EXIT_CODES = {

2627

SIGHUP: 129,

2728

SIGINT: 130,

@@ -141,8 +142,8 @@ export function runCommand(

141142

let stderr = "";

142143

let settled = false;

143144

let killTimer: NodeJS.Timeout | undefined;

144-

let pendingTimeoutReject: (() => void) | undefined;

145145

let timedOutError: Error | undefined;

146+

let forceKillAt: number | undefined;

146147

const timeoutMs = Math.max(1, options.timeoutMs);

147148

const timeoutKillGraceMs = Math.max(0, options.timeoutKillGraceMs ?? KILL_GRACE_MS);

148149

const clearTimers = () => {

@@ -168,10 +169,11 @@ export function runCommand(

168169

`${command} ${args.join(" ")} timed out after ${timeoutMs}ms\n${stdout}${stderr}`,

169170

);

170171

activeChildTree.killChildTree("SIGTERM");

172+

forceKillAt = Date.now() + timeoutKillGraceMs;

171173

killTimer = setTimeout(() => {

172174

killTimer = undefined;

175+

forceKillAt = undefined;

173176

activeChildTree.killChildTree("SIGKILL");

174-

pendingTimeoutReject?.();

175177

}, timeoutKillGraceMs);

176178

}, timeoutMs);

177179

timeout.unref?.();

@@ -195,15 +197,11 @@ export function runCommand(

195197

}

196198

if (timedOutError && killTimer && childProcessTreeMayStillExist(child)) {

197199

const error = timedOutError;

198-

pendingTimeoutReject = () => {

199-

if (settled) {

200-

return;

201-

}

202-

settled = true;

203-

clearTimers();

204-

activeChildTree.unregister();

205-

reject(error);

206-

};

200+

void finishTimedOutChildProcessTree(child, activeChildTree, {

201+

forceKillAt,

202+

killTimer,

203+

timeoutKillGraceMs,

204+

}).then(() => fail(error), fail);

207205

return;

208206

}

209207

settled = true;

@@ -223,6 +221,29 @@ export function runCommand(

223221

});

224222

}

225223224+

async function finishTimedOutChildProcessTree(

225+

child: ReturnType<typeof spawn>,

226+

activeChildTree: ReturnType<typeof registerActiveChildProcessTree>,

227+

options: {

228+

forceKillAt: number | undefined;

229+

killTimer: NodeJS.Timeout;

230+

timeoutKillGraceMs: number;

231+

},

232+

) {

233+

const graceRemainingMs =

234+

options.forceKillAt === undefined

235+

? options.timeoutKillGraceMs

236+

: Math.max(0, options.forceKillAt - Date.now());

237+

if (graceRemainingMs > 0) {

238+

await waitForChildProcessTreeExit(child, graceRemainingMs);

239+

}

240+

clearTimeout(options.killTimer);

241+

if (childProcessTreeMayStillExist(child)) {

242+

activeChildTree.killChildTree("SIGKILL");

243+

await waitForChildProcessTreeExit(child, options.timeoutKillGraceMs);

244+

}

245+

}

246+226247

function signalChildProcessTree(child: ReturnType<typeof spawn>, signal: NodeJS.Signals) {

227248

if (process.platform !== "win32" && child.pid) {

228249

try {

@@ -247,6 +268,19 @@ function childProcessTreeMayStillExist(child: ReturnType<typeof spawn>) {

247268

}

248269

}

249270271+

async function waitForChildProcessTreeExit(child: ReturnType<typeof spawn>, timeoutMs: number) {

272+

const deadlineAt = Date.now() + timeoutMs;

273+

while (Date.now() < deadlineAt) {

274+

if (!childProcessTreeMayStillExist(child)) {

275+

return true;

276+

}

277+

await new Promise((resolvePoll) => {

278+

setTimeout(resolvePoll, PROCESS_TREE_EXIT_POLL_MS);

279+

});

280+

}

281+

return !childProcessTreeMayStillExist(child);

282+

}

283+250284

function registerActiveChildProcessTree(child: ReturnType<typeof spawn>) {

251285

const killChildTree = (signal: NodeJS.Signals) => signalChildProcessTree(child, signal);

252286

ACTIVE_CHILD_TREE_KILLERS.add(killChildTree);