Skip to content

Commit 96cafb4

Browse files
committed
fix(producer): fallback distributed capture safely
1 parent 372bead commit 96cafb4

10 files changed

Lines changed: 653 additions & 110 deletions

File tree

‎packages/aws-lambda/src/handler.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { S3Client } from "@aws-sdk/client-s3";
1818
import {
1919
assemble,
2020
type AssembleResult,
21+
type ChunkRenderer,
2122
type ChunkResult,
2223
type DistributedRenderConfig,
2324
listPlanV2ArtifactsForTarget,
@@ -77,7 +78,7 @@ export interface HandlerDeps {
7778
primitives?: {
7879
plan: typeof plan;
7980
planV2WithPublisher?: typeof planV2WithPublisher;
80-
renderChunk: typeof renderChunk;
81+
renderChunk: ChunkRenderer;
8182
assemble: typeof assemble;
8283
};
8384
/** Override the per-invocation `/tmp` workdir root (defaults to Lambda's `/tmp`). */

‎packages/engine/src/services/videoFrameInjector.test.ts‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,16 @@ describe("createVideoFrameInjector cache hygiene against page-side skips", () =>
183183
return `data:image/png;base64,fake-${framePath}`;
184184
}
185185

186+
function makeGpuInjector() {
187+
const evaluate = vi.fn(async () => undefined);
188+
const page = { evaluate } as unknown as Page;
189+
const hook = createVideoFrameInjector(
190+
fakeTable({ videoId: "facet", framePath: "/f", frameIndex: 3 }),
191+
{ frameSrcResolver: inlineResolver },
192+
);
193+
return { evaluate, page, hook };
194+
}
195+
186196
beforeEach(() => {
187197
injectVideoFramesBatchMock.mockReset();
188198
syncVideoFrameVisibilityMock.mockReset();
@@ -256,18 +266,33 @@ describe("createVideoFrameInjector cache hygiene against page-side skips", () =>
256266
expect(injectVideoFramesBatchMock).toHaveBeenCalledTimes(1);
257267
});
258268

269+
it("reinjects frame zero when a whole-chunk retry uses a fresh hook and page", async () => {
270+
const table = fakeTable({ videoId: "hero", framePath: "/frame-0", frameIndex: 0 });
271+
const beginFramePage = { evaluate: async () => undefined } as unknown as Page;
272+
const screenshotPage = { evaluate: async () => undefined } as unknown as Page;
273+
const beginFrameHook = createVideoFrameInjector(table, {
274+
frameSrcResolver: inlineResolver,
275+
});
276+
const screenshotRetryHook = createVideoFrameInjector(table, {
277+
frameSrcResolver: inlineResolver,
278+
});
279+
280+
injectVideoFramesBatchMock.mockResolvedValue(["hero"]);
281+
await beginFrameHook!(beginFramePage, 0);
282+
await screenshotRetryHook!(screenshotPage, 0);
283+
284+
expect(injectVideoFramesBatchMock).toHaveBeenCalledTimes(2);
285+
expect(injectVideoFramesBatchMock.mock.calls[0]?.[0]).toBe(beginFramePage);
286+
expect(injectVideoFramesBatchMock.mock.calls[1]?.[0]).toBe(screenshotPage);
287+
});
288+
259289
// Regression: WebGL/WebGPU compositions that sample a <video> as a texture
260290
// render on `hf-seek` BEFORE frames are injected. After injecting the
261291
// decoded frames, the hook must re-render the GPU adapters at the same time
262292
// (window.__hfReseekGpu) so they re-upload their textures from the fresh
263293
// frames — otherwise the facet flickers / goes black non-deterministically.
264294
it("re-renders GPU adapters after injecting frames (post-injection reseek)", async () => {
265-
const evaluate = vi.fn(async () => undefined);
266-
const page = { evaluate } as unknown as Page;
267-
const hook = createVideoFrameInjector(
268-
fakeTable({ videoId: "facet", framePath: "/f", frameIndex: 3 }),
269-
{ frameSrcResolver: inlineResolver },
270-
);
295+
const { evaluate, page, hook } = makeGpuInjector();
271296

272297
injectVideoFramesBatchMock.mockResolvedValueOnce(["facet"]);
273298
await hook!(page, 1.5);
@@ -284,12 +309,7 @@ describe("createVideoFrameInjector cache hygiene against page-side skips", () =>
284309
});
285310

286311
it("does not reseek GPU when the page injected no frames", async () => {
287-
const evaluate = vi.fn(async () => undefined);
288-
const page = { evaluate } as unknown as Page;
289-
const hook = createVideoFrameInjector(
290-
fakeTable({ videoId: "facet", framePath: "/f", frameIndex: 3 }),
291-
{ frameSrcResolver: inlineResolver },
292-
);
312+
const { evaluate, page, hook } = makeGpuInjector();
293313

294314
// Page dropped the video (e.g. hidden host) → nothing injected → no reseek.
295315
injectVideoFramesBatchMock.mockResolvedValueOnce([]);

‎packages/gcp-cloud-run/src/server.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { Hono } from "hono";
2626
import {
2727
assemble,
2828
type AssembleResult,
29+
type ChunkRenderer,
2930
type ChunkResult,
3031
type DistributedRenderConfig,
3132
listPlanV2ArtifactsForTarget,
@@ -84,7 +85,7 @@ export interface HandlerDeps {
8485
primitives?: {
8586
plan: typeof plan;
8687
planV2WithPublisher?: typeof planV2WithPublisher;
87-
renderChunk: typeof renderChunk;
88+
renderChunk: ChunkRenderer;
8889
assemble: typeof assemble;
8990
};
9091
/** Override the per-request workdir root (defaults to the OS tmpdir). */

‎packages/producer/src/distributed.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ export {
8989
readWebGlVendorInfoFromCanvas,
9090
renderChunk,
9191
// Types
92+
type ChunkRenderer,
9293
type ChunkResult,
94+
type EffectiveChunkResult,
9395
// Error codes + classes
9496
FFMPEG_VERSION_MISMATCH,
9597
PLAN_HASH_MISMATCH,

‎packages/producer/src/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ export {
163163
renderChunkV2,
164164
validatePlanV2MaterializedTarget,
165165
type AssembleResult,
166+
type ChunkRenderer,
166167
type ChunkResult,
168+
type EffectiveChunkResult,
167169
type DistributedRenderCapabilities,
168170
type DistributedRenderConfig,
169171
type PlanProtocolConsumerCapabilities,

‎packages/producer/src/services/distributed/planV2Execution.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { tmpdir } from "node:os";
33
import { join } from "node:path";
44
import { assemble, type AssembleResult } from "./assemble.js";
55
import { materializePlanV2Target } from "./planV2.js";
6-
import { renderChunk, type ChunkResult } from "./renderChunk.js";
6+
import { renderChunk, type EffectiveChunkResult } from "./renderChunk.js";
77

88
/**
99
* Direct v2 chunk-role entry point. Storage adapters may instead download the
@@ -13,7 +13,7 @@ export async function renderChunkV2(
1313
planV2Dir: string,
1414
chunkIndex: number,
1515
outputChunkPath: string,
16-
): Promise<ChunkResult> {
16+
): Promise<EffectiveChunkResult> {
1717
const workRoot = mkdtempSync(join(tmpdir(), "hf-plan-v2-chunk-"));
1818
const materializedPlanDir = join(workRoot, "plan");
1919
try {

0 commit comments

Comments
 (0)