Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions apps/server/src/assets/AssetAccess.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,37 @@ describe("AssetAccess", () => {
}).pipe(Effect.provide(layerTest)),
);

it.effect("previews draft audio and video from relative workspace paths", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-draft-media-" });
for (const [name, mimeType] of [
["video.mp4", "video/mp4"],
["audio.wav", "audio/wav"],
] as const) {
const filePath = path.join(root, name);
yield* fs.writeFileString(filePath, "media bytes");
const result = yield* issueAssetUrl({
resource: { _tag: "draft-workspace-file", cwd: root, path: name },
workspaceRoot: root,
});
expect(result.fileRevision).toEqual(expect.any(String));
const suffix = result.relativeUrl.slice(`${ASSET_ROUTE_PREFIX}/`.length);
const separator = suffix.indexOf("/");
const token = suffix.slice(0, separator);
const asset = yield* resolveAsset(token, suffix.slice(separator + 1));
expect(asset).toMatchObject({ kind: "file", path: yield* fs.realPath(filePath), mimeType });
if (asset?.kind !== "file") throw new Error("Expected draft media file");
const response = HttpServerResponse.toWeb(yield* assetFileResponse(asset));
expect(yield* Effect.promise(() => response.text())).toBe("media bytes");
expect(
yield* resolveAsset(token, name === "video.mp4" ? "audio.wav" : "video.mp4"),
).toBeNull();
}
}).pipe(Effect.provide(layerTest)),
);

it.effect("resolves home-relative media paths independently of the workspace", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
Expand Down
16 changes: 15 additions & 1 deletion apps/server/src/assets/AssetAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ import {
import {
audioMimeTypeFromExtension,
hostPreviewMimeTypeFromExtension,
isWorkspaceAudioPreviewPath,
isWorkspaceImagePreviewPath,
isWorkspacePreviewEntryPath,
isWorkspaceVideoPreviewPath,
WORKSPACE_BROWSER_PREVIEW_EXTENSIONS,
WORKSPACE_IMAGE_PREVIEW_EXTENSIONS,
} from "@t3tools/shared/filePreview";
Expand Down Expand Up @@ -451,7 +453,11 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
}),
),
);
if (!isWorkspacePreviewEntryPath(resolved.relativePath)) {
const isDraftMedia =
input.resource._tag === "draft-workspace-file" &&
(isWorkspaceAudioPreviewPath(resolved.relativePath) ||
isWorkspaceVideoPreviewPath(resolved.relativePath));
if (!isDraftMedia && !isWorkspacePreviewEntryPath(resolved.relativePath)) {
return yield* new AssetPreviewTypeValidationError({
resource: input.resource,
});
Expand All @@ -473,6 +479,12 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
resource: input.resource,
});
}
if (isDraftMedia) {
return yield* finalizeAbsoluteMediaFileAsset({
...input,
requestedPath: canonicalFile,
});
}
const canonicalWorkspaceRoot = yield* fileSystem.realPath(input.workspaceRoot).pipe(
Effect.mapError(
(cause) =>
Expand Down Expand Up @@ -505,6 +517,7 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
},
fileName: path.basename(resolved.relativePath),
imageDimensions,
fileRevision: undefined,
};
},
);
Expand Down Expand Up @@ -617,6 +630,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
claims = finalized.claims;
fileName = finalized.fileName;
imageDimensions = finalized.imageDimensions;
fileRevision = finalized.fileRevision;
break;
}
case "attachment": {
Expand Down
Loading