External/SnapOtter
1
0
Fork 0
mirror of https://github.com/snapotter-hq/SnapOtter.git synced 2026-08-03 07:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: honor unlimited processing timeout (#638)

Browse Source 
* fix(web): recover stalled job progress streams

* fix(ai): honor unlimited processing timeout

* fix(web): keep retrying stalled progress streams
This commit is contained in:
SnapOtter
2026-07-25 11:36:02 +08:00
committed by GitHub
parent 841f47f6ca
commit 025851beef
5 changed files with 399 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/ai/bridge-extended.test.ts
+35 -7
View File
@@ -712,7 +712,7 @@ describe("bridge - PROCESSING_TIMEOUT_S env for dispatcher path", () => {
vi.useRealTimers();
});
it("ignores zero PROCESSING_TIMEOUT_S and uses default 600s", async () => {
it("treats zero PROCESSING_TIMEOUT_S as unlimited despite an explicit timeout", async () => {
process.env.PROCESSING_TIMEOUT_S = "0";
vi.useFakeTimers();
@@ -724,13 +724,16 @@ describe("bridge - PROCESSING_TIMEOUT_S env for dispatcher path", () => {
vi.advanceTimersByTime(100);
await initPromise;
const promise = runPythonWithProgress("test.py", []);
const promise = runPythonWithProgress("test.py", [], { timeout: 50 });
const settled = promise.then(
(result) => ({ status: "resolved" as const, result }),
(error: Error) => ({ status: "rejected" as const, error }),
);
await vi.advanceTimersByTimeAsync(10);
// Advance 10s -- should NOT have timed out with default 600s
vi.advanceTimersByTime(10_000);
vi.advanceTimersByTime(600_001);
expect(mock.process.kill).not.toHaveBeenCalled();
// Respond before default timeout
const line = mock.stdinWrites.join("").split("\n").filter(Boolean)[0];
const id = JSON.parse(line).id;
mock.stdout.emit(
@@ -738,8 +741,33 @@ describe("bridge - PROCESSING_TIMEOUT_S env for dispatcher path", () => {
Buffer.from(`${JSON.stringify({ id, exitCode: 0, stdout: '{"ok":true}' })}\n`),
);
const result = await promise;
expect(result.stdout).toBe('{"ok":true}');
const outcome = await settled;
expect(outcome).toMatchObject({
status: "resolved",
result: { stdout: '{"ok":true}' },
});
vi.useRealTimers();
});
it("lets positive PROCESSING_TIMEOUT_S override an explicit timeout", async () => {
process.env.PROCESSING_TIMEOUT_S = "2";
vi.useFakeTimers();
const mock = createMockProcess();
vi.mocked(spawn).mockReturnValue(mock.process);
const initPromise = initDispatcher();
mock.stderr.emit("data", Buffer.from('{"ready": true, "gpu": false}\n'));
vi.advanceTimersByTime(100);
await initPromise;
const promise = runPythonWithProgress("test.py", [], { timeout: 60_000 });
const rejection = expect(promise).rejects.toThrow("Python script timed out");
await vi.advanceTimersByTimeAsync(10);
vi.advanceTimersByTime(2_500);
await rejection;
vi.useRealTimers();
});
tests/unit/ai/bridge.test.ts
+44 -12
View File
@@ -619,25 +619,57 @@ describe("bridge - runPythonWithProgress (per-request fallback)", () => {
}
});
it("ignores invalid PROCESSING_TIMEOUT_S values", async () => {
it("treats zero PROCESSING_TIMEOUT_S as unlimited despite an explicit timeout", async () => {
const origTimeout = process.env.PROCESSING_TIMEOUT_S;
process.env.PROCESSING_TIMEOUT_S = "0";
const mock = createMockProcess();
vi.mocked(spawn).mockReturnValue(mock.process);
vi.useFakeTimers();
try {
const mock = createMockProcess();
vi.mocked(spawn).mockReturnValue(mock.process);
const promise = runPythonWithProgress("test_script.py", []);
const promise = runPythonWithProgress("test_script.py", [], { timeout: 50 });
mock.stdout.emit("data", Buffer.from('{"success": true}\n'));
mock.emitEvent("close", 0, null);
vi.advanceTimersByTime(600_001);
expect(mock.process.kill).not.toHaveBeenCalled();
// Should not throw -- falls back to 600000ms default
await expect(promise).resolves.toBeDefined();
mock.stdout.emit("data", Buffer.from('{"success": true}\n'));
mock.emitEvent("close", 0, null);
if (origTimeout !== undefined) {
process.env.PROCESSING_TIMEOUT_S = origTimeout;
} else {
delete process.env.PROCESSING_TIMEOUT_S;
await expect(promise).resolves.toBeDefined();
} finally {
vi.useRealTimers();
if (origTimeout !== undefined) {
process.env.PROCESSING_TIMEOUT_S = origTimeout;
} else {
delete process.env.PROCESSING_TIMEOUT_S;
}
}
});
it("lets positive PROCESSING_TIMEOUT_S override an explicit timeout", async () => {
const origTimeout = process.env.PROCESSING_TIMEOUT_S;
process.env.PROCESSING_TIMEOUT_S = "2";
vi.useFakeTimers();
try {
const mock = createMockProcess();
vi.mocked(spawn).mockReturnValue(mock.process);
const promise = runPythonWithProgress("test_script.py", [], { timeout: 60_000 });
const rejection = expect(promise).rejects.toThrow("Python script timed out");
vi.advanceTimersByTime(2_500);
mock.emitEvent("close", null, "SIGTERM");
await rejection;
} finally {
vi.useRealTimers();
if (origTimeout !== undefined) {
process.env.PROCESSING_TIMEOUT_S = origTimeout;
} else {
delete process.env.PROCESSING_TIMEOUT_S;
}
}
});
});