Skip to content

Commit a54fb04

Browse files
committed
fix(render): bundled pages inline a PNG without its colour tags too
1 parent f0436fb commit a54fb04

13 files changed

Lines changed: 46 additions & 24 deletions

File tree

‎packages/cli/src/utils/compositionServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { resolve, dirname } from "node:path";
77
import { Readable } from "node:stream";
88
import { fileURLToPath } from "node:url";
99
import { getMimeType } from "@hyperframes/studio-server";
10-
import { stripSdrPngColourTags } from "@hyperframes/studio-server/png-colour-tags";
10+
import { stripSdrPngColourTags } from "@hyperframes/core/compiler/png-colour-tags";
1111
import { injectTagsAtHeadStart } from "@hyperframes/core/compiler/html-document";
1212

1313
/**

‎packages/cli/src/utils/staticProjectServer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createServer, request as httpRequest, type Server, type ServerResponse } from "node:http";
22
import { Duplex } from "node:stream";
33
import { createReadStream, existsSync, readFileSync, statSync } from "node:fs";
4-
import { stripSdrPngColourTags } from "@hyperframes/studio-server/png-colour-tags";
4+
import { stripSdrPngColourTags } from "@hyperframes/core/compiler/png-colour-tags";
55
import { isAbsolute, relative, resolve } from "node:path";
66
import {
77
PREVIEW_PROXY_BOX_PARAM,

‎packages/core/package-subpaths.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,12 @@
416416
"types": "./dist/compiler/htmlDocument.d.ts",
417417
"environments": ["browser", "bun", "node"]
418418
},
419+
"./compiler/png-colour-tags": {
420+
"source": "./src/compiler/pngColourTags.ts",
421+
"runtime": "./dist/compiler/pngColourTags.js",
422+
"types": "./dist/compiler/pngColourTags.d.ts",
423+
"environments": ["bun", "node"]
424+
},
419425
"./runtime/position-edits": {
420426
"source": "./src/runtime/positionEdits.ts",
421427
"runtime": "./dist/runtime/positionEdits.js",

‎packages/core/package.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,12 @@
423423
"import": "./src/compiler/htmlDocument.ts",
424424
"types": "./src/compiler/htmlDocument.ts"
425425
},
426+
"./compiler/png-colour-tags": {
427+
"bun": "./src/compiler/pngColourTags.ts",
428+
"node": "./dist/compiler/pngColourTags.js",
429+
"import": "./src/compiler/pngColourTags.ts",
430+
"types": "./src/compiler/pngColourTags.ts"
431+
},
426432
"./runtime/position-edits": {
427433
"bun": "./src/runtime/positionEdits.ts",
428434
"node": "./dist/runtime/positionEdits.js",
@@ -849,6 +855,10 @@
849855
"import": "./dist/compiler/htmlDocument.js",
850856
"types": "./dist/compiler/htmlDocument.d.ts"
851857
},
858+
"./compiler/png-colour-tags": {
859+
"import": "./dist/compiler/pngColourTags.js",
860+
"types": "./dist/compiler/pngColourTags.d.ts"
861+
},
852862
"./runtime/position-edits": {
853863
"import": "./dist/runtime/positionEdits.js",
854864
"types": "./dist/runtime/positionEdits.d.ts"

‎packages/core/src/compiler/htmlBundler.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,6 +2128,26 @@ describe("bundleToSingleHtml", () => {
21282128
},
21292129
);
21302130

2131+
it("inlines a BT.709-tagged PNG without its tag, so the file's own values show", async () => {
2132+
const tagged = Buffer.from(
2133+
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGNJQ1ABAQABlXPCVgAAAAxJREFUeJxj0NfXBwABHgCOTp25kgAAAABJRU5ErkJggg==",
2134+
"base64",
2135+
);
2136+
const dir = makeTempProject({
2137+
"index.html": `<div data-composition-id="root" data-width="320" data-height="180"><img id="photo" src="tagged.png"></div>`,
2138+
});
2139+
writeFileSync(join(dir, "tagged.png"), tagged);
2140+
try {
2141+
const { document } = parseHTML(await bundleToSingleHtml(dir));
2142+
const src = document.getElementById("photo")?.getAttribute("src") ?? "";
2143+
const inlined = Buffer.from(src.slice(src.indexOf(",") + 1), "base64");
2144+
expect(inlined.includes("cICP")).toBe(false);
2145+
expect(inlined.includes("IDAT")).toBe(true);
2146+
} finally {
2147+
rmSync(dir, { recursive: true, force: true });
2148+
}
2149+
});
2150+
21312151
it.each(["?v=2", "#sprite", "?v=2#sprite"])(
21322152
"keeps inlined image bytes decodable with suffix %s",
21332153
async (suffix) => {

‎packages/core/src/compiler/htmlBundler.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
planCompositionAssembly,
1818
} from "./compositionAssembly";
1919
import { SCENE_FONTS_ATTR, SCENE_PART_ATTR } from "../sceneParts";
20+
import { stripSdrPngColourTags } from "./pngColourTags";
2021
import {
2122
ensureExternalScriptTag,
2223
readExternalScriptAttributes,
@@ -392,7 +393,8 @@ function createAssetInliner(
392393
// just to be discarded.
393394
const byteLength = safeStatSize(filePath);
394395
if (byteLength !== null && byteLength > MAX_INLINE_ASSET_BYTES) return { tooLarge: byteLength };
395-
const content = safeReadFileBuffer(filePath);
396+
const read = safeReadFileBuffer(filePath);
397+
const content = read && mimeType === "image/png" ? (stripSdrPngColourTags(read) ?? read) : read;
396398
return {
397399
dataUrl: content === null ? null : `data:${mimeType};base64,${content.toString("base64")}`,
398400
};
File renamed without changes.
File renamed without changes.

‎packages/producer/src/services/fileServer.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Readable } from "node:stream";
2828
import { join, extname, resolve, sep } from "node:path";
2929
import { injectScriptsAtHeadStart, injectScriptsIntoHtml } from "@hyperframes/core/compiler";
3030
import { fpsToNumber, type Fps } from "@hyperframes/core";
31-
import { stripSdrPngColourTags } from "@hyperframes/studio-server/png-colour-tags";
31+
import { stripSdrPngColourTags } from "@hyperframes/core/compiler/png-colour-tags";
3232
import { getVerifiedHyperframeRuntimeSource } from "./hyperframeRuntimeLoader.js";
3333
import { getHfEarlyStub } from "../generated/hf-early-stub-inline.js";
3434
import { defaultLogger, type ProducerLogger } from "../logger.js";
@@ -838,7 +838,7 @@ export function createFileServer(options: FileServerOptions): Promise<FileServer
838838
}
839839

840840
if (ext === ".png") {
841-
const untagged = stripSdrPngColourTags(await readFileAsync(filePath));
841+
const untagged = stripSdrPngColourTags(await readFileAsync(fd));
842842
if (untagged) {
843843
const headers = {
844844
"Content-Type": contentType,
@@ -896,7 +896,8 @@ export function createFileServer(options: FileServerOptions): Promise<FileServer
896896
const stream = createReadStream(filePath, {
897897
fd,
898898
autoClose: true,
899-
...(range ? { start: range.start, end: range.end } : {}),
899+
start: range?.start ?? 0,
900+
...(range ? { end: range.end } : {}),
900901
});
901902
streamOwnsFd = true;
902903
try {

‎packages/studio-server/package-subpaths.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@
9797
"runtime": "./dist/helpers/encoderOptions.js",
9898
"types": "./dist/helpers/encoderOptions.d.ts",
9999
"environments": ["bun", "node"]
100-
},
101-
"./png-colour-tags": {
102-
"source": "./src/helpers/pngColourTags.ts",
103-
"runtime": "./dist/helpers/pngColourTags.js",
104-
"types": "./dist/helpers/pngColourTags.d.ts",
105-
"environments": ["bun", "node"]
106100
}
107101
}
108102
}

0 commit comments

Comments
 (0)