Skip to content

Commit 2a19323

Browse files
fix(server): serve audio and video from draft workspaces
1 parent 22dc1da commit 2a19323

2 files changed

Lines changed: 45 additions & 1 deletion

File tree

‎apps/server/src/assets/AssetAccess.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,36 @@ describe("AssetAccess", () => {
315315
}).pipe(Effect.provide(layerTest)),
316316
);
317317

318+
it.effect("previews draft audio and video from relative workspace paths", () =>
319+
Effect.gen(function* () {
320+
const fs = yield* FileSystem.FileSystem;
321+
const path = yield* Path.Path;
322+
const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-draft-media-" });
323+
for (const [name, mimeType] of [
324+
["video.mp4", "video/mp4"],
325+
["audio.wav", "audio/wav"],
326+
] as const) {
327+
const filePath = path.join(root, name);
328+
yield* fs.writeFileString(filePath, "media bytes");
329+
const result = yield* issueAssetUrl({
330+
resource: { _tag: "draft-workspace-file", cwd: root, path: name },
331+
workspaceRoot: root,
332+
});
333+
const suffix = result.relativeUrl.slice(`${ASSET_ROUTE_PREFIX}/`.length);
334+
const separator = suffix.indexOf("/");
335+
const token = suffix.slice(0, separator);
336+
const asset = yield* resolveAsset(token, suffix.slice(separator + 1));
337+
expect(asset).toMatchObject({ kind: "file", path: yield* fs.realPath(filePath), mimeType });
338+
if (asset?.kind !== "file") throw new Error("Expected draft media file");
339+
const response = HttpServerResponse.toWeb(yield* assetFileResponse(asset));
340+
expect(yield* Effect.promise(() => response.text())).toBe("media bytes");
341+
expect(
342+
yield* resolveAsset(token, name === "video.mp4" ? "audio.wav" : "video.mp4"),
343+
).toBeNull();
344+
}
345+
}).pipe(Effect.provide(layerTest)),
346+
);
347+
318348
it.effect("resolves home-relative media paths independently of the workspace", () =>
319349
Effect.gen(function* () {
320350
const fs = yield* FileSystem.FileSystem;

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ import {
2020
import {
2121
audioMimeTypeFromExtension,
2222
hostPreviewMimeTypeFromExtension,
23+
isWorkspaceAudioPreviewPath,
2324
isWorkspaceImagePreviewPath,
2425
isWorkspacePreviewEntryPath,
26+
isWorkspaceVideoPreviewPath,
2527
WORKSPACE_BROWSER_PREVIEW_EXTENSIONS,
2628
WORKSPACE_IMAGE_PREVIEW_EXTENSIONS,
2729
} from "@t3tools/shared/filePreview";
@@ -451,7 +453,11 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
451453
}),
452454
),
453455
);
454-
if (!isWorkspacePreviewEntryPath(resolved.relativePath)) {
456+
const isDraftMedia =
457+
input.resource._tag === "draft-workspace-file" &&
458+
(isWorkspaceAudioPreviewPath(resolved.relativePath) ||
459+
isWorkspaceVideoPreviewPath(resolved.relativePath));
460+
if (!isDraftMedia && !isWorkspacePreviewEntryPath(resolved.relativePath)) {
455461
return yield* new AssetPreviewTypeValidationError({
456462
resource: input.resource,
457463
});
@@ -473,6 +479,12 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
473479
resource: input.resource,
474480
});
475481
}
482+
if (isDraftMedia) {
483+
return yield* finalizeAbsoluteMediaFileAsset({
484+
...input,
485+
requestedPath: canonicalFile,
486+
});
487+
}
476488
const canonicalWorkspaceRoot = yield* fileSystem.realPath(input.workspaceRoot).pipe(
477489
Effect.mapError(
478490
(cause) =>
@@ -505,6 +517,7 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
505517
},
506518
fileName: path.basename(resolved.relativePath),
507519
imageDimensions,
520+
fileRevision: undefined,
508521
};
509522
},
510523
);
@@ -617,6 +630,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
617630
claims = finalized.claims;
618631
fileName = finalized.fileName;
619632
imageDimensions = finalized.imageDimensions;
633+
fileRevision = finalized.fileRevision;
620634
break;
621635
}
622636
case "attachment": {

0 commit comments

Comments
 (0)