fix(vom): fix CI

This commit is contained in:
Ljy-0827 authored and GitHub committed 2026-08-19 15:05:55 +08:00
1 parent f86e506d47
commit 3df2738280
2 files changed
+36 -9

No files matched your search

@@ -12,7 +12,7 @@
* events, and never move the registry's current pointer. * events, and never move the registry's current pointer.
*/ */
import { createHash } from "node:crypto"; import { createHash, randomUUID } from "node:crypto";
import { readFile, unlink } from "node:fs/promises"; import { readFile, unlink } from "node:fs/promises";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { join } from "node:path";
@@ -78,6 +78,7 @@ const FAILURE_BACKOFF_THRESHOLD = 3;
const FRAME_RING_SIZE = 2; const FRAME_RING_SIZE = 2;
export class ObservationService { export class ObservationService {
private readonly scratchNamespace = randomUUID();
private readonly observations = new Map<string, SessionObservation>(); private readonly observations = new Map<string, SessionObservation>();
private readonly listeners = new Set<(event: ObservationEvent) => void>(); private readonly listeners = new Set<(event: ObservationEvent) => void>();
private readonly captureTimers = new Map<string, unknown>(); private readonly captureTimers = new Map<string, unknown>();
@@ -304,9 +305,9 @@ export class ObservationService {
if (current === undefined || current.dead === true) return; if (current === undefined || current.dead === true) return;
if (this.captureInFlight.has(sessionId)) return; if (this.captureInFlight.has(sessionId)) return;
this.captureInFlight.add(sessionId); this.captureInFlight.add(sessionId);
// One fixed scratch path per session (overwritten each frame) and always // Stable within this service, isolated from captures owned by other instances.
// unlinked after the bytes are read — /tmp must not grow without bound. const sessionKey = createHash("sha256").update(sessionId).digest("hex").slice(0, 16);
const outPath = join(tmpdir(), `bsk-obs-${sessionId}.png`); const outPath = join(tmpdir(), `bsk-obs-${this.scratchNamespace}-${sessionKey}.png`);
let writtenPath = outPath; let writtenPath = outPath;
try { try {
const result = await this.deps.queue.run(sessionId, () => const result = await this.deps.queue.run(sessionId, () =>
@@ -5,7 +5,7 @@
import { existsSync, mkdtempSync, writeFileSync } from "node:fs"; import { existsSync, mkdtempSync, writeFileSync } from "node:fs";
import type { IncomingMessage, ServerResponse } from "node:http"; import type { IncomingMessage, ServerResponse } from "node:http";
import { tmpdir } from "node:os"; import { tmpdir } from "node:os";
import { join } from "node:path"; import { basename, dirname } from "node:path";
import { describe, expect, it } from "vitest"; import { describe, expect, it } from "vitest";
import { import {
actionForLabel, actionForLabel,
@@ -548,8 +548,12 @@ describe("scratch files and thumbnail references", () => {
); );
const firstOut = runner.calls.filter((c) => c.args[0] === "screenshot").at(-1)?.args; const firstOut = runner.calls.filter((c) => c.args[0] === "screenshot").at(-1)?.args;
const pathOf = (args: string[]) => args[args.indexOf("--out") + 1]; const pathOf = (args: string[]) => args[args.indexOf("--out") + 1];
expect(pathOf(firstOut ?? [])).toBe(join(tmpdir(), "bsk-obs-s1.png")); const firstPath = pathOf(firstOut ?? []);
expect(existsSync(pathOf(firstOut ?? []))).toBe(false); expect(dirname(firstPath)).toBe(tmpdir());
expect(basename(firstPath)).toMatch(
/^bsk-obs-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}-[0-9a-f]{16}\.png$/,
);
expect(existsSync(firstPath)).toBe(false);
// second frame: same path, deleted again // second frame: same path, deleted again
service.endAction("s1"); service.endAction("s1");
scheduler.runNext(); scheduler.runNext();
@@ -559,11 +563,33 @@ describe("scratch files and thumbnail references", () => {
scheduler.pending().length === 1, scheduler.pending().length === 1,
); );
const secondOut = runner.calls.filter((c) => c.args[0] === "screenshot").at(-1)?.args; const secondOut = runner.calls.filter((c) => c.args[0] === "screenshot").at(-1)?.args;
expect(pathOf(secondOut ?? [])).toBe(join(tmpdir(), "bsk-obs-s1.png")); const secondPath = pathOf(secondOut ?? []);
await waitFor(() => !existsSync(pathOf(secondOut ?? []))); expect(secondPath).toBe(firstPath);
await waitFor(() => !existsSync(secondPath));
service.dispose(); service.dispose();
}); });
it("isolates scratch paths between service instances", async () => {
const first = setup({ scheduler: fakeScheduler(), runner: fakeRunner() });
const second = setup({ scheduler: fakeScheduler(), runner: fakeRunner() });
first.service.addSession("s1");
second.service.addSession("s1");
first.scheduler.runNext();
second.scheduler.runNext();
await waitFor(
() =>
first.service.getState()[0]?.thumbnailAttachmentId !== undefined &&
second.service.getState()[0]?.thumbnailAttachmentId !== undefined,
);
const pathOf = (runner: FakeRunner) => {
const args = runner.calls.find((call) => call.args[0] === "screenshot")?.args ?? [];
return args[args.indexOf("--out") + 1];
};
expect(pathOf(first.runner)).not.toBe(pathOf(second.runner));
first.service.dispose();
second.service.dispose();
});
it("keeps the last two distinct frames and evicts the third", async () => { it("keeps the last two distinct frames and evicts the third", async () => {
let n = 0; let n = 0;
const runner = fakeRunner({ const runner = fakeRunner({