Skip to content

Write HTML. Render video. Built for agents.

fix(aws-lambda): old stacks are refused before any upload; stale local copies never re-upload (#5909)

Miguel Ángel6fe20f764d14
diff --git a/docs/deploy/aws-lambda.mdx b/docs/deploy/aws-lambda.mdx
index d6f769431c..e379ef3ebc 100644
--- a/docs/deploy/aws-lambda.mdx
+++ b/docs/deploy/aws-lambda.mdx
@@ -75,6 +75,8 @@ CLI versions reserved 8 by default, so they stay at 8 until you pass
`--concurrency=N`. Pass `--concurrency=none` to remove the reservation so each
render sizes itself to the account.
+`deploy` records the stack's bucket and state machine in `.hyperframes/lambda-stack-<stack-name>.json` under the current directory. Every other `lambda` command reads that file, so run them from the same directory with the same `--stack-name`, or they stop with "no stack state". Redeploying to upgrade rewrites the same file.
+
After `deploy`, render anything with:
```bash
@@ -99,7 +101,7 @@ hyperframes lambda render ./my-project --site-id=a1b2c3d4e5f6g7h8 \
The `siteId` is content-addressed via a SHA-256 of the project tree. A site is a small `sites/<siteId>/files.json` that lists each file's path and SHA-256. The files themselves live once per bucket under `cas/sha256/`, shared by every site and render, so a file another project already uploaded is never uploaded again. Pass the same `--site-id` to as many `lambda render` calls as you like.
-The stack's bucket expires objects under `cas/sha256/` 30 days after they were last written (the `ExpireSharedContent` lifecycle rule). Each render or `sites create` that reuses a file at least 7 days old rewrites it in place, so files in use never expire. If a site's files did expire, `lambda render --site-id` re-uploads them from the project directory. `renderToLambda` given a `siteHandle` but no `projectDir` stops with `SITE_FILES_MISSING` before starting; run `sites create` again to restore them.
+The stack's bucket expires objects under `cas/sha256/` 30 days after they were last written (the `ExpireSharedContent` lifecycle rule). Each render or `sites create` that reuses a file at least 7 days old rewrites it in place, so files in use never expire. If a site's files did expire, `lambda render --site-id` re-uploads them from the project directory, if its copies still match. Otherwise, or when `renderToLambda` gets a `siteHandle` but no `projectDir`, the render stops with `SITE_FILES_MISSING` before starting; run `sites create` again to restore them.
#### Upgrading from a version before shared content storage
@@ -236,7 +238,7 @@ The stack was deployed by an earlier version that cannot read this version's sit
### `SITE_FILES_MISSING` or `SITE_NOT_FOUND`
-`SITE_FILES_MISSING`: some of the site's files expired from `cas/sha256/` after 30 days unused. Pass the project directory to `lambda render`, or run `sites create` again. `SITE_NOT_FOUND`: the bucket has no site under that id in either format; run `sites create` again and use the id it prints.
+`SITE_FILES_MISSING`: some of the site's files expired from `cas/sha256/` after 30 days unused. Render from the project directory the site was created from, or run `sites create` again. `SITE_NOT_FOUND`: the bucket has no site under that id in either format; run `sites create` again and use the id it prints.
## Current limits
diff --git a/packages/aws-lambda/src/sdk/deploySite.ts b/packages/aws-lambda/src/sdk/deploySite.ts
index 338b43556a..9b328d2058 100644
--- a/packages/aws-lambda/src/sdk/deploySite.ts
+++ b/packages/aws-lambda/src/sdk/deploySite.ts
@@ -11,7 +11,7 @@
* where `siteId` is derived from a SHA-256 over the project files.
*/
-import { mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, mkdtempSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { S3Client } from "@aws-sdk/client-s3";
@@ -104,15 +104,16 @@ export async function ensureSiteStored(
await ensureContentStoreObject(s3, bucket, sha256, sizeBytes);
} catch (error) {
if ((error as Error).name !== "PLAN_ARTIFACT_MISSING") throw error;
- if (!projectDir) return void missing.push(path);
- await putContentStoreFile(s3, join(projectDir, path), bucket, sha256);
+ const localPath = projectDir && join(projectDir, path);
+ if (!localPath || !(await hasContent(localPath, sha256))) return void missing.push(path);
+ await putContentStoreFile(s3, localPath, bucket, sha256);
}
});
if (missing.length > 0) {
const error = new Error(
`[deploySite] SITE_FILES_MISSING: ${missing.length} of ${files.length} files of site ` +
`${site.siteId} are no longer stored (unused for ${CONTENT_STORE_RETENTION_DAYS} days). ` +
- "Run `hyperframes lambda sites create`, or pass projectDir to re-upload them.",
+ "Run `hyperframes lambda sites create`, or render from the project directory that has them.",
);
error.name = "SITE_FILES_MISSING";
throw error;
@@ -123,6 +124,10 @@ export async function ensureSiteStored(
}
}
+async function hasContent(localPath: string, sha256: string): Promise<boolean> {
+ return existsSync(localPath) && (await sha256File(localPath)) === sha256;
+}
+
async function tarballSite(site: SiteHandle, s3: S3Client, bucket: string): Promise<SiteHandle> {
const projectS3Uri = siteTarballUri(bucket, site.siteId);
if (await s3ObjectExists(s3, projectS3Uri)) return { ...site, projectS3Uri };
diff --git a/packages/aws-lambda/src/sdk/index.ts b/packages/aws-lambda/src/sdk/index.ts
index ad7f842151..23775a0a80 100644
--- a/packages/aws-lambda/src/sdk/index.ts
+++ b/packages/aws-lambda/src/sdk/index.ts
@@ -14,7 +14,12 @@ export {
type SiteHandle,
siteHandleFromId,
} from "./deploySite.js";
-export { renderToLambda, type RenderHandle, type RenderToLambdaOptions } from "./renderToLambda.js";
+export {
+ assertStackReadsSites,
+ renderToLambda,
+ type RenderHandle,
+ type RenderToLambdaOptions,
+} from "./renderToLambda.js";
export {
getRenderProgress,
type GetRenderProgressOptions,
diff --git a/packages/aws-lambda/src/sdk/renderToLambda.test.ts b/packages/aws-lambda/src/sdk/renderToLambda.test.ts
index 0b3292938d..e0cd9fafc8 100644
--- a/packages/aws-lambda/src/sdk/renderToLambda.test.ts
+++ b/packages/aws-lambda/src/sdk/renderToLambda.test.ts
@@ -254,6 +254,22 @@ describe("renderToLambda", () => {
expect(sfn.starts).toHaveLength(1);
});
+ it("refuses when the project dir's copy differs or is gone, uploading nothing", async () => {
+ const s3 = new FakeS3();
+ const sfn = new FakeSFN();
+ const { site } = await deployThenExpire(s3);
+ writeFileSync(join(projectDir, "index.html"), "<html>edited</html>");
+ await expect(renderWith(s3, sfn, site, projectDir)).rejects.toMatchObject({
+ name: "SITE_FILES_MISSING",
+ });
+ rmSync(join(projectDir, "index.html"));
+ await expect(renderWith(s3, sfn, site, projectDir)).rejects.toMatchObject({
+ name: "SITE_FILES_MISSING",
+ });
+ expect(s3.ops.filter((op) => op.kind === "put")).toHaveLength(0);
+ expect(sfn.starts).toHaveLength(0);
+ });
+
it("without a project dir, refuses with the missing-file count before starting", async () => {
const s3 = new FakeS3();
const sfn = new FakeSFN();
diff --git a/packages/aws-lambda/src/sdk/renderToLambda.ts b/packages/aws-lambda/src/sdk/renderToLambda.ts
index a0c80ebb65..bbb20766d0 100644
--- a/packages/aws-lambda/src/sdk/renderToLambda.ts
+++ b/packages/aws-lambda/src/sdk/renderToLambda.ts
@@ -94,7 +94,7 @@ export async function renderToLambda(opts: RenderToLambdaOptions): Promise<Rende
}
const sfn = opts.sfn ?? new SFNClient({ region: opts.region });
- await assertStackReadsSites(sfn, opts.stateMachineArn);
+ await assertStackReadsSites({ stateMachineArn: opts.stateMachineArn, sfn });
const executionName = opts.executionName ?? `hf-render-${randomUUID()}`;
const ext = formatExtension(opts.config.format);
@@ -160,7 +160,13 @@ export async function renderToLambda(opts: RenderToLambdaOptions): Promise<Rende
}
/** An older stack's plan step would try to untar a site manifest and fail after retries. */
-async function assertStackReadsSites(sfn: SFNClient, stateMachineArn: string): Promise<void> {
+export async function assertStackReadsSites(opts: {
+ stateMachineArn: string;
+ region?: string;
+ sfn?: SFNClient;
+}): Promise<void> {
+ const sfn = opts.sfn ?? new SFNClient({ region: opts.region });
+ const { stateMachineArn } = opts;
const { definition } = await sfn.send(new DescribeStateMachineCommand({ stateMachineArn }));
if (definition?.includes(`"${SITE_MANIFEST_INVALID}"`)) return;
const error = new Error(
diff --git a/packages/cli/src/commands/lambda/render-batch.ts b/packages/cli/src/commands/lambda/render-batch.ts
index c5bff7f846..9526d0adcf 100644
--- a/packages/cli/src/commands/lambda/render-batch.ts
+++ b/packages/cli/src/commands/lambda/render-batch.ts
@@ -226,7 +226,10 @@ export async function runRenderBatch(args: RenderBatchArgs): Promise<void> {
// Deploy the site once and reuse it across every entry. --site-id and
// --dry-run both skip the deploy via a synthesised handle.
let siteHandle: SiteHandle;
- const { deploySite, siteHandleFromId } = await loadSDK();
+ const { assertStackReadsSites, deploySite, siteHandleFromId } = await loadSDK();
+ if (!args.dryRun) {
+ await assertStackReadsSites({ stateMachineArn: stack.stateMachineArn, region: stack.region });
+ }
if (args.siteId) {
siteHandle = siteHandleFromId(stack.bucketName, args.siteId);
} else if (args.dryRun) {
diff --git a/packages/cli/src/commands/lambda/sites.ts b/packages/cli/src/commands/lambda/sites.ts
index f033b1810f..0b7532c33f 100644
--- a/packages/cli/src/commands/lambda/sites.ts
+++ b/packages/cli/src/commands/lambda/sites.ts
@@ -30,7 +30,8 @@ export async function runSitesCreate(args: SitesCreateArgs): Promise<void> {
const stack = requireStack(args.stackName);
const projectDir = resolvePath(args.projectDir);
- const { deploySite } = await loadSDK();
+ const { assertStackReadsSites, deploySite } = await loadSDK();
+ await assertStackReadsSites({ stateMachineArn: stack.stateMachineArn, region: stack.region });
const handle = await deploySite({
projectDir,
bucketName: stack.bucketName,
diff --git a/packages/cli/src/commands/lambda/stackCheck.test.ts b/packages/cli/src/commands/lambda/stackCheck.test.ts
new file mode 100644
index 0000000000..ab7942513a
--- /dev/null
+++ b/packages/cli/src/commands/lambda/stackCheck.test.ts
@@ -0,0 +1,65 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+const sdk = vi.hoisted(() => ({
+ assertStackReadsSites: vi.fn(),
+ deploySite: vi.fn(),
+ renderToLambda: vi.fn(),
+ siteHandleFromId: vi.fn(),
+}));
+vi.mock("@hyperframes/aws-lambda/sdk", () => sdk);
+vi.mock("./state.js", () => ({
+ DEFAULT_STACK_NAME: "hyperframes",
+ requireStack: () => ({
+ bucketName: "test-bucket",
+ stateMachineArn: "arn:aws:states:us-east-2:1234:stateMachine:hf",
+ region: "us-east-2",
+ reservedConcurrency: 8,
+ }),
+}));
+
+import { runRenderBatch } from "./render-batch.js";
+import { runSitesCreate } from "./sites.js";
+
+let projectDir: string;
+
+beforeEach(() => {
+ projectDir = mkdtempSync(join(tmpdir(), "hf-stack-check-"));
+ writeFileSync(join(projectDir, "index.html"), "<html></html>");
+ writeFileSync(join(projectDir, "batch.jsonl"), '{"outputKey":"renders/a.mp4"}\n');
+ sdk.assertStackReadsSites.mockRejectedValue(
+ Object.assign(new Error("STACK_TOO_OLD"), { name: "STACK_TOO_OLD" }),
+ );
+});
+
+afterEach(() => {
+ rmSync(projectDir, { recursive: true, force: true });
+ vi.clearAllMocks();
+});
+
+describe("a stack too old to read sites is refused before anything uploads", () => {
+ it("in render-batch", async () => {
+ await expect(
+ runRenderBatch({
+ projectDir,
+ stackName: "hyperframes",
+ batch: join(projectDir, "batch.jsonl"),
+ fps: 30,
+ width: 1920,
+ height: 1080,
+ format: "mp4",
+ json: true,
+ }),
+ ).rejects.toMatchObject({ name: "STACK_TOO_OLD" });
+ expect(sdk.deploySite).not.toHaveBeenCalled();
+ });
+
+ it("in sites create", async () => {
+ await expect(
+ runSitesCreate({ projectDir, stackName: "hyperframes", json: true }),
+ ).rejects.toMatchObject({ name: "STACK_TOO_OLD" });
+ expect(sdk.deploySite).not.toHaveBeenCalled();
+ });
+});