@mccaskie-labs/workbench-pdf 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mccaskie-labs/workbench-pdf
 
+## 0.1.2
+
+### Patch Changes
+
+- `createPdfMaker({ logo })` takes the logo's bytes when the app already holds them, instead of fetching `brand.logo.url`. A logo URL that answers with a web page (such as an Access sign-in) now says so.
+
+## 0.1.1
+
+### Patch Changes
+
+- No code change. The first version published by the publish workflow, which confirms the package's npm trusted publisher.
+
 ## 0.1.0
 
 - First version: `createPdfMaker` with the standard branded layout (`document`) and the app's own HTML (`html`), `renderDocument` for previews, and `WorkbenchPdfError` (`docs/spec.md` §10, 11 November 2026).

package/README.md

@@ -40,7 +40,7 @@ export default {
 
 | Export | What it does |
 | --- | --- |
-| `createPdfMaker({ browser, brand, size?, timeoutMs? })` | The maker. Checks the brand at once (`invalid_brand`). `size` is `A4` (default) or `Letter`; `timeoutMs` is 1,000 to 120,000, default 30,000 |
+| `createPdfMaker({ browser, brand, logo?, size?, timeoutMs? })` | The maker. Checks the brand at once (`invalid_brand`). `logo` is the logo's bytes when the app already holds them (a customer's upload in its own R2, for example): used instead of fetching `brand.logo.url`, so a private logo needn't be public. `size` is `A4` (default) or `Letter`; `timeoutMs` is 1,000 to 120,000, default 30,000 |
 | `pdf.document(doc, { size?, landscape? })` | The standard layout: logo and name across the top, the title, subtitle and date, then the blocks; the footer on every page has the name, site, `footer` line and "Page n of m". Returns the PDF bytes |
 | `pdf.html(body, { title, standardStyles?, header?, javascript?, allowOrigins?, size?, landscape? })` | The app's own HTML (a body fragment, trusted as given) with the brand's fonts, colours, header and footer. The brand is in CSS variables: `--brand-primary`, `--brand-text`, `--brand-background`, `--brand-muted`, `--brand-heading-font`, `--brand-body-font` |
 | `pdf.renderDocument(doc)` | The standard layout's HTML without printing, for previews and tests |

package/dist/logo.d.ts

@@ -1,3 +1,5 @@
 export declare const MAX_LOGO_BYTES: number;
 /** The logo as a `data:` URI. PNG, JPEG or SVG only, at most 1 MiB, within `timeoutMs`. */
 export declare function logoDataUri(url: string, fetcher: typeof fetch, timeoutMs?: number): Promise<string>;
+/** Logo bytes the app already holds (from its own storage) as a `data:` URI. Same checks as a fetched logo. */
+export declare function logoBytesDataUri(bytes: Uint8Array): string;

package/dist/logo.js

@@ -33,11 +33,20 @@ export async function logoDataUri(url, fetcher, timeoutMs = 10_000) {
     const length = Number(res.headers.get("content-length") ?? "0");
     if (length > MAX_LOGO_BYTES)
         throw fail("larger than 1 MiB");
-    const bytes = new Uint8Array(await res.arrayBuffer());
+    return logoBytesDataUri(new Uint8Array(await res.arrayBuffer()));
+}
+/** Logo bytes the app already holds (from its own storage) as a `data:` URI. Same checks as a fetched logo. */
+export function logoBytesDataUri(bytes) {
+    if (!(bytes instanceof Uint8Array))
+        throw fail("bytes must be a Uint8Array");
     if (bytes.length > MAX_LOGO_BYTES)
         throw fail("larger than 1 MiB");
     const kind = sniff(bytes);
-    if (!kind)
+    if (!kind) {
+        const head = new TextDecoder().decode(bytes.subarray(0, 256)).trimStart().toLowerCase();
+        if (head.startsWith("<!doctype html") || head.startsWith("<html"))
+            throw fail("got a web page, not an image (is the logo behind a sign-in such as Cloudflare Access?)");
         throw fail("not PNG, JPEG or SVG");
+    }
     return `data:${kind};base64,${base64(bytes)}`;
 }

package/dist/maker.d.ts

@@ -37,6 +37,12 @@ export interface PdfMakerOptions {
     size?: PageSize;
     /** Time allowed for one PDF, in ms. Default 30,000. */
     timeoutMs?: number;
+    /**
+     * The logo's bytes, when the app already holds them (a customer's upload in
+     * its own R2, say). Used instead of fetching `brand.logo.url`, so a private
+     * logo needn't be public. PNG, JPEG or SVG, at most 1 MiB.
+     */
+    logo?: Uint8Array;
     /** For tests. */
     launch?: Launch;
     /** For tests: fetches the logo. Defaults to the global fetch. */

package/dist/maker.js

@@ -6,7 +6,7 @@ import { printBrand } from "./brand.js";
 import { checkDocument } from "./document.js";
 import { WorkbenchPdfError } from "./errors.js";
 import { footerTemplate, ownPage, standardPage } from "./layout.js";
-import { logoDataUri } from "./logo.js";
+import { logoBytesDataUri, logoDataUri } from "./logo.js";
 const GOOGLE_FONT_FILES = "https://fonts.gstatic.com";
 function fontOrigins(brand) {
     const out = new Set();
@@ -71,7 +71,8 @@ export function createPdfMaker(options) {
     const launch = options.launch ?? defaultLaunch;
     const fetcher = options.fetch ?? ((input, init) => fetch(input, init));
     const fonts = fontOrigins(brand);
-    let logo;
+    // Bytes the app passed are checked now, so a bad file fails at once.
+    let logo = options.logo === undefined ? undefined : Promise.resolve(logoBytesDataUri(options.logo));
     // Fetched once per maker; a failure is not kept, so the next PDF tries again.
     const logoSrc = () => {
         logo ??= logoDataUri(brand.logo.url, fetcher).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mccaskie-labs/workbench-pdf",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Branded PDFs for Workbench apps: the app's content printed with its logo, colours and fonts, in its own Worker through the Browser Rendering binding.",
   "license": "UNLICENSED",
   "type": "module",