Skip to content

Commit 73afb57

Browse files
authored
feat(web): virtualize large file previews (pingdotgg#21466)
1 parent d69810a commit 73afb57

20 files changed

Lines changed: 1862 additions & 111 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ describe("AssetAccess", () => {
995995
}).pipe(Effect.provide(layerTest)),
996996
);
997997

998-
it.effect("issues exact workspace URLs for image, office, and font previews", () =>
998+
it.effect("issues exact workspace URLs for every non-HTML preview", () =>
999999
Effect.gen(function* () {
10001000
const fileSystem = yield* FileSystem.FileSystem;
10011001
const path = yield* Path.Path;
@@ -1009,6 +1009,7 @@ describe("AssetAccess", () => {
10091009
"private document",
10101010
);
10111011
for (const extension of [
1012+
"pdf",
10121013
"png",
10131014
"bmp",
10141015
"heic",

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

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ import {
2020
} from "@t3tools/contracts";
2121
import {
2222
hostPreviewMimeTypeFromExtension,
23-
officePreviewKind,
2423
isWorkspaceAudioPreviewPath,
25-
isWorkspaceImagePreviewPath,
26-
isWorkspaceFontPreviewPath,
2724
isWorkspacePreviewEntryPath,
2825
isWorkspaceVideoPreviewPath,
2926
WORKSPACE_BROWSER_PREVIEW_EXTENSIONS,
@@ -517,24 +514,21 @@ const finalizeWorkspaceFileAsset = Effect.fn("AssetAccess.finalizeWorkspaceFileA
517514
? yield* readImageDimensionsFromHeader(canonicalFile)
518515
: null;
519516
return {
520-
claims:
521-
isWorkspaceImagePreviewPath(resolved.relativePath) ||
522-
isWorkspaceFontPreviewPath(resolved.relativePath) ||
523-
officePreviewKind({ name: resolved.relativePath }) !== null
524-
? {
525-
version: 1 as const,
526-
kind: "workspace-file-exact" as const,
527-
workspaceRoot: canonicalWorkspaceRoot,
528-
relativePath: resolved.relativePath,
529-
expiresAt: input.expiresAt,
530-
}
531-
: {
532-
version: 1 as const,
533-
kind: "workspace-file" as const,
534-
workspaceRoot: canonicalWorkspaceRoot,
535-
baseRelativePath: path.dirname(resolved.relativePath),
536-
expiresAt: input.expiresAt,
537-
},
517+
claims: !/\.html?$/i.test(resolved.relativePath)
518+
? {
519+
version: 1 as const,
520+
kind: "workspace-file-exact" as const,
521+
workspaceRoot: canonicalWorkspaceRoot,
522+
relativePath: resolved.relativePath,
523+
expiresAt: input.expiresAt,
524+
}
525+
: {
526+
version: 1 as const,
527+
kind: "workspace-file" as const,
528+
workspaceRoot: canonicalWorkspaceRoot,
529+
baseRelativePath: path.dirname(resolved.relativePath),
530+
expiresAt: input.expiresAt,
531+
},
538532
fileName: path.basename(resolved.relativePath),
539533
imageDimensions,
540534
fileRevision: undefined,

‎apps/server/src/http.test.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,9 +630,22 @@ describe("video asset byte ranges", () => {
630630
const image = HttpServerResponse.toWeb(
631631
yield* assetFileResponse({ path: file, mimeType: "image/png" }, "bytes=0-1"),
632632
);
633-
expect(image.status).toBe(200);
634-
expect(image.headers.has("accept-ranges")).toBe(false);
635-
expect(yield* Effect.promise(() => image.text())).toBe("0123456789");
633+
expect(image.status).toBe(206);
634+
expect(image.headers.get("accept-ranges")).toBe("bytes");
635+
expect(yield* Effect.promise(() => image.text())).toBe("01");
636+
for (const mimeType of ["text/plain", "text/csv", "application/octet-stream"]) {
637+
for (const [range, expected, status] of [
638+
["bytes=2-5", "2345", 206],
639+
["bytes=-3", "789", 206],
640+
["bytes=10-", "", 416],
641+
] as const) {
642+
const result = HttpServerResponse.toWeb(
643+
yield* assetFileResponse({ path: file, mimeType }, range),
644+
);
645+
expect(result.status).toBe(status);
646+
expect(yield* Effect.promise(() => result.text())).toBe(expected);
647+
}
648+
}
636649
}).pipe(Effect.provide(layerFileResponse)),
637650
);
638651

‎apps/server/src/http.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export const assetFileResponse = Effect.fn("assetFileResponse")(function* (
199199
let status = 200;
200200
let offset = 0n;
201201
let bytesToRead: bigint | undefined;
202-
if (isMedia) {
202+
{
203203
headers["Accept-Ranges"] = "bytes";
204204
// If-Range requires a matching validator. A full response is safe when we cannot validate it.
205205
if (method === "GET" && rangeHeader && ifRangeHeader === undefined) {

‎apps/web/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"culori": "^4.0.2",
6262
"dompurify": "^3.4.16",
6363
"effect": "catalog:",
64+
"fast-xml-parser": "5.7.3",
6465
"hast-util-to-html": "^9.0.5",
6566
"hast-util-to-jsx-runtime": "^2.3.6",
6667
"heic-to": "^1.5.2",

0 commit comments

Comments
 (0)