@striae-org/striae 4.2.0 → 4.3.0

package/workers/pdf-worker/src/pdf-worker.example.ts

@@ -1,19 +1,16 @@
-import type { PDFGenerationData, PDFGenerationRequest, ReportModule } from './report-types';
+import type { PDFGenerationData, PDFGenerationRequest, ReportModule, ReportPdfOptions } from './report-types';
 
 interface Env {
   BROWSER: Fetcher;
   PDF_WORKER_AUTH: string;
   ACCOUNT_ID?: string;
-  CLOUDFLARE_ACCOUNT_ID?: string;
   BROWSER_API_TOKEN?: string;
-  API_TOKEN?: string;
 }
 
-const DEFAULT_REPORT_FORMAT = 'striae';
 const BROWSER_PDF_TIMEOUT_MS = 90_000;
 const BROWSER_RENDERING_API_BASE = 'https://api.cloudflare.com/client/v4/accounts';
 
-const DEFAULT_PDF_OPTIONS = {
+const DEFAULT_PDF_OPTIONS: ReportPdfOptions = {
   printBackground: true,
   format: 'letter',
   margin: {
@@ -24,6 +21,17 @@ const DEFAULT_PDF_OPTIONS = {
   },
 };
 
+function resolvePdfOptions(overrides?: Partial<ReportPdfOptions>): ReportPdfOptions {
+  return {
+    ...DEFAULT_PDF_OPTIONS,
+    ...overrides,
+    margin: {
+      ...DEFAULT_PDF_OPTIONS.margin,
+      ...overrides?.margin,
+    },
+  };
+}
+
 const reportModuleLoaders: Record<string, () => Promise<ReportModule>> = {
   // Default Striae report format module
   striae: () => import('./formats/format-striae'),
@@ -56,66 +64,55 @@ function jsonResponse(body: unknown, status: number): Response {
   });
 }
 
-function resolveBrowserApiToken(env: Env): string {
-  const candidates = [env.BROWSER_API_TOKEN, env.API_TOKEN];
+class MissingSecretError extends Error {
+  readonly secretKey: string;
 
-  for (const candidate of candidates) {
-    if (typeof candidate === 'string' && candidate.trim().length > 0) {
-      return candidate.trim();
-    }
+  constructor(key: string) {
+    super(`Worker is missing required secret: ${key}`);
+    this.name = 'MissingSecretError';
+    this.secretKey = key;
   }
-
-  return '';
 }
 
-function resolveAccountId(env: Env): string {
-  const candidates = [env.ACCOUNT_ID, env.CLOUDFLARE_ACCOUNT_ID];
-
-  for (const candidate of candidates) {
-    if (typeof candidate === 'string' && candidate.trim().length > 0) {
-      return candidate.trim();
-    }
+function getRequiredSecret(value: string | undefined, name: string): string {
+  if (typeof value !== 'string') {
+    throw new MissingSecretError(name);
   }
 
-  return '';
-}
-
-function normalizeReportFormat(format: unknown): string {
-  if (typeof format !== 'string') {
-    return DEFAULT_REPORT_FORMAT;
+  const normalized = value.trim();
+  if (!normalized) {
+    throw new MissingSecretError(name);
   }
 
-  const normalized = format.trim().toLowerCase();
-  return normalized || DEFAULT_REPORT_FORMAT;
+  return normalized;
 }
 
-function resolveReportRequest(payload: unknown): { reportFormat: string; data: PDFGenerationData } {
-  if (!payload || typeof payload !== 'object') {
+function resolveReportRequest(payload: unknown): PDFGenerationRequest {
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
     throw new Error('Request body must be a JSON object');
   }
 
   const record = payload as Record<string, unknown>;
-  const reportFormat = normalizeReportFormat(record.reportFormat);
+  if (typeof record.reportFormat !== 'string' || record.reportFormat.trim().length === 0) {
+    throw new Error('Request body must include a non-empty reportFormat');
+  }
 
-  if (record.data && typeof record.data === 'object') {
-    return {
-      reportFormat,
-      data: record.data as PDFGenerationData,
-    };
+  if (!record.data || typeof record.data !== 'object' || Array.isArray(record.data)) {
+    throw new Error('Request body must include a data object');
   }
 
-  // Backward compatibility: accept legacy top-level payload shape.
-  const legacyData: Record<string, unknown> = { ...record };
-  delete legacyData.reportFormat;
-  delete legacyData.data;
+  const data = record.data as Record<string, unknown>;
+  if (typeof data.currentDate !== 'string' || data.currentDate.trim().length === 0) {
+    throw new Error('Request body data must include a non-empty currentDate');
+  }
 
   return {
-    reportFormat,
-    data: legacyData as PDFGenerationData,
+    reportFormat: record.reportFormat.trim().toLowerCase(),
+    data: record.data as PDFGenerationData,
   };
 }
 
-async function renderReport(reportFormat: string, data: PDFGenerationData): Promise<string> {
+async function renderReport(reportFormat: string, data: PDFGenerationData): Promise<{ html: string; pdfOptions: ReportPdfOptions }> {
   const loader = reportModuleLoaders[reportFormat];
 
   if (!loader) {
@@ -124,28 +121,20 @@ async function renderReport(reportFormat: string, data: PDFGenerationData): Prom
   }
 
   const reportModule = await loader();
-  return reportModule.renderReport(data);
+  return {
+    html: reportModule.renderReport(data),
+    pdfOptions: resolvePdfOptions(reportModule.getPdfOptions?.(data)),
+  };
 }
 
-async function renderPdfViaRestEndpoint(env: Env, html: string): Promise<Response> {
-  const accountId = resolveAccountId(env);
-  const browserApiToken = resolveBrowserApiToken(env);
-
-  if (!accountId || !browserApiToken) {
-    return jsonResponse(
-      {
-        error: 'Missing required Browser Rendering credentials',
-        requiredSecrets: ['ACCOUNT_ID', 'BROWSER_API_TOKEN'],
-        note: 'Set ACCOUNT_ID and a Browser Rendering - Edit token (BROWSER_API_TOKEN) on this worker.',
-      },
-      502
-    );
-  }
+async function renderPdfViaRestEndpoint(env: Env, html: string, pdfOptions: ReportPdfOptions): Promise<Response> {
+  const accountId = getRequiredSecret(env.ACCOUNT_ID, 'ACCOUNT_ID');
+  const browserApiToken = getRequiredSecret(env.BROWSER_API_TOKEN, 'BROWSER_API_TOKEN');
 
   const endpoint = `${BROWSER_RENDERING_API_BASE}/${accountId}/browser-rendering/pdf`;
   const requestBody = JSON.stringify({
     html,
-    pdfOptions: DEFAULT_PDF_OPTIONS,
+    pdfOptions,
   });
 
   let endpointResponse: Response;
@@ -217,12 +206,20 @@ export default {
 
     if (request.method === 'POST') {
       try {
-        const payload = await request.json() as PDFGenerationData | PDFGenerationRequest;
+        const payload = await request.json() as unknown;
         const { reportFormat, data } = resolveReportRequest(payload);
         const document = await renderReport(reportFormat, data);
 
-        return await renderPdfViaRestEndpoint(env, document);
+        return await renderPdfViaRestEndpoint(env, document.html, document.pdfOptions);
       } catch (error) {
+        if (error instanceof MissingSecretError) {
+          console.error(`[pdf-worker] Configuration error: ${error.message}`);
+          return jsonResponse(
+            { error: 'Worker configuration error', missing_secret: error.secretKey },
+            502
+          );
+        }
+
         if (isTimeoutError(error)) {
           const timeoutMessage = error instanceof Error ? error.message : 'PDF generation timed out';
           return jsonResponse({ error: timeoutMessage }, 504);

package/workers/pdf-worker/src/report-layout.ts

@@ -0,0 +1,227 @@
+import type { ReportPdfOptions } from './report-types';
+
+interface ReportChromeTemplateConfig {
+  headerLeft?: string;
+  headerCenter?: string;
+  headerRight?: string;
+  headerDetailLeft?: string;
+  headerDetailRight?: string;
+  footerLeft?: string;
+  footerCenter?: string;
+  footerRight?: string;
+  footerLeftImageSrc?: string;
+  includePageNumbers?: boolean;
+}
+
+const HEADER_TEMPLATE_STYLES = `
+  <style>
+    .report-header {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 0 0.5in 8px;
+      border-bottom: 2px solid #333333;
+      color: #333333;
+      font-family: Arial, sans-serif;
+      font-size: 18px;
+      font-weight: 700;
+    }
+    .report-header__content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 12px;
+      width: 100%;
+    }
+    .report-header__details {
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      gap: 12px;
+      width: 100%;
+      margin-top: 8px;
+      padding-top: 8px;
+      border-top: 1px solid #d9d9d9;
+      font-size: 10px;
+      font-weight: 600;
+      letter-spacing: 0.04em;
+      text-transform: uppercase;
+      color: #666666;
+    }
+    .report-header__cell {
+      flex: 1 1 0;
+      min-width: 0;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .report-header__cell--left {
+      text-align: left;
+    }
+    .report-header__cell--center {
+      text-align: center;
+    }
+    .report-header__cell--right {
+      text-align: right;
+    }
+    .report-header__detail {
+      flex: 1 1 0;
+      min-width: 0;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .report-header__detail--left {
+      text-align: left;
+    }
+    .report-header__detail--right {
+      text-align: right;
+    }
+  </style>
+`;
+
+const FOOTER_TEMPLATE_STYLES = `
+  <style>
+    .report-footer {
+      width: 100%;
+      box-sizing: border-box;
+      padding: 8px 0.5in 0;
+      border-top: 1px solid #cccccc;
+      color: #666666;
+      font-family: Arial, sans-serif;
+      font-size: 9px;
+    }
+    .report-footer__content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 12px;
+      width: 100%;
+    }
+    .report-footer__cell {
+      flex: 1 1 0;
+      min-width: 0;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .report-footer__cell--left {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      text-align: left;
+      font-weight: 500;
+    }
+    .report-footer__cell--center {
+      text-align: center;
+      color: #333333;
+      font-weight: 600;
+    }
+    .report-footer__cell--right {
+      text-align: right;
+      font-style: italic;
+    }
+    .report-footer__page-count {
+      font-style: normal;
+      font-weight: 600;
+      color: #333333;
+    }
+    .report-footer__separator {
+      margin: 0 6px;
+      color: #999999;
+      font-style: normal;
+    }
+    .report-footer__icon {
+      width: 12px;
+      height: 12px;
+      object-fit: contain;
+      flex: 0 0 auto;
+    }
+  </style>
+`;
+
+export function escapeHtml(value: string | undefined): string {
+  if (!value) {
+    return '';
+  }
+
+  return value
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+function renderTemplateCell(value: string | undefined, className: string): string {
+  const content = value && value.trim().length > 0 ? escapeHtml(value.trim()) : '&nbsp;';
+  return `<div class="${className}">${content}</div>`;
+}
+
+export function buildRepeatedChromePdfOptions(config: ReportChromeTemplateConfig): Partial<ReportPdfOptions> {
+  const hasHeaderDetails = Boolean(
+    (config.headerDetailLeft && config.headerDetailLeft.trim().length > 0) ||
+    (config.headerDetailRight && config.headerDetailRight.trim().length > 0)
+  );
+
+  const headerDetails = hasHeaderDetails
+    ? `
+      <div class="report-header__details">
+        ${renderTemplateCell(config.headerDetailLeft, 'report-header__detail report-header__detail--left')}
+        ${renderTemplateCell(config.headerDetailRight, 'report-header__detail report-header__detail--right')}
+      </div>
+    `
+    : '';
+
+  const headerTemplate = `
+    ${HEADER_TEMPLATE_STYLES}
+    <div class="report-header">
+      <div class="report-header__content">
+        ${renderTemplateCell(config.headerLeft, 'report-header__cell report-header__cell--left')}
+        ${renderTemplateCell(config.headerCenter, 'report-header__cell report-header__cell--center')}
+        ${renderTemplateCell(config.headerRight, 'report-header__cell report-header__cell--right')}
+      </div>
+      ${headerDetails}
+    </div>
+  `;
+
+  const footerLeftContent = config.footerLeft && config.footerLeft.trim().length > 0
+    ? `<span>${escapeHtml(config.footerLeft.trim())}</span>`
+    : '<span>&nbsp;</span>';
+
+  const footerIcon = config.footerLeftImageSrc
+    ? `<img class="report-footer__icon" src="${escapeHtml(config.footerLeftImageSrc)}" alt="" />`
+    : '';
+
+  const footerRightText = config.footerRight && config.footerRight.trim().length > 0
+    ? `<span>${escapeHtml(config.footerRight.trim())}</span>`
+    : '';
+
+  const footerPageCount = config.includePageNumbers === false
+    ? ''
+    : `<span class="report-footer__page-count">Page <span class="pageNumber"></span> of <span class="totalPages"></span></span>`;
+
+  const footerRightContent = footerRightText && footerPageCount
+    ? `${footerRightText}<span class="report-footer__separator">|</span>${footerPageCount}`
+    : footerRightText || footerPageCount || '&nbsp;';
+
+  const footerTemplate = `
+    ${FOOTER_TEMPLATE_STYLES}
+    <div class="report-footer">
+      <div class="report-footer__content">
+        <div class="report-footer__cell report-footer__cell--left">${footerLeftContent}${footerIcon}</div>
+        ${renderTemplateCell(config.footerCenter, 'report-footer__cell report-footer__cell--center')}
+        <div class="report-footer__cell report-footer__cell--right">${footerRightContent}</div>
+      </div>
+    </div>
+  `;
+
+  return {
+    displayHeaderFooter: true,
+    headerTemplate,
+    footerTemplate,
+    margin: {
+      top: hasHeaderDetails ? '1.45in' : '1.15in',
+      bottom: '0.8in',
+    },
+  };
+}

package/workers/pdf-worker/src/report-types.ts

@@ -52,7 +52,7 @@ export interface PDFGenerationData {
   caseNumber?: string;
   annotationData?: AnnotationData;
   activeAnnotations?: string[];
-  currentDate?: string;
+  currentDate: string;
   notesUpdatedFormatted?: string;
   userCompany?: string;
   userFirstName?: string;
@@ -61,12 +61,32 @@ export interface PDFGenerationData {
 }
 
 export interface PDFGenerationRequest {
-  reportFormat?: string;
-  data?: PDFGenerationData;
+  reportFormat: string;
+  data: PDFGenerationData;
+}
+
+export interface PDFMarginOptions {
+  top: string;
+  bottom: string;
+  left: string;
+  right: string;
+}
+
+export interface ReportPdfOptions {
+  printBackground?: boolean;
+  format?: string;
+  margin?: Partial<PDFMarginOptions>;
+  displayHeaderFooter?: boolean;
+  headerTemplate?: string;
+  footerTemplate?: string;
+  preferCSSPageSize?: boolean;
 }
 
 export type ReportRenderer = (data: PDFGenerationData) => string;
 
+export type ReportPdfOptionsBuilder = (data: PDFGenerationData) => Partial<ReportPdfOptions>;
+
 export interface ReportModule {
   renderReport: ReportRenderer;
+  getPdfOptions?: ReportPdfOptionsBuilder;
 }

package/workers/pdf-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "PDF_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/pdf-worker.ts",
-  "compatibility_date": "2026-03-20",
+  "compatibility_date": "2026-03-22",
   "compatibility_flags": [
     "nodejs_compat"
   ],

package/workers/user-worker/package.json

@@ -12,7 +12,7 @@
 		"@cloudflare/puppeteer": "^1.0.6",
 		"@cloudflare/vitest-pool-workers": "^0.13.0",
 		"vitest": "~4.1.0",
-		"wrangler": "^4.73.0"
+		"wrangler": "^4.76.0"
 	},
 	"overrides": {
 		"undici": "7.24.1",

package/workers/user-worker/src/user-worker.example.ts

@@ -433,6 +433,22 @@ async function deleteSingleCase(env: Env, userUid: string, caseNumber: string):
   }
 }
 
+async function deleteUserConfirmationSummary(env: Env, userUid: string): Promise<void> {
+  const dataApiKey = env.R2_KEY_SECRET;
+  const dataWorkerBaseUrl = resolveDataWorkerBaseUrl(env);
+  const encodedUserId = encodeURIComponent(userUid);
+  const confirmationSummaryPath = `${dataWorkerBaseUrl}/${encodedUserId}/meta/confirmation-status.json`;
+
+  const response = await fetch(confirmationSummaryPath, {
+    method: 'DELETE',
+    headers: { 'X-Custom-Auth-Key': dataApiKey }
+  });
+
+  if (!response.ok && response.status !== 404) {
+    throw new Error(`Failed to delete confirmation summary metadata: ${response.status}`);
+  }
+}
+
 async function executeUserDeletion(
   env: Env,
   userUid: string,
@@ -490,6 +506,7 @@ async function executeUserDeletion(
     throw new Error(`Failed to fully delete all case data: ${caseCleanupErrors.join(' | ')}`);
   }
 
+  await deleteUserConfirmationSummary(env, userUid);
   await deleteFirebaseAuthUser(env, userUid);
 
   // Delete the user account from the database

package/workers/user-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "USER_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/user-worker.ts",
-  "compatibility_date": "2026-03-20",
+  "compatibility_date": "2026-03-22",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/wrangler.toml.example

@@ -1,6 +1,6 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "PAGES_PROJECT_NAME"
-compatibility_date = "2026-03-20"
+compatibility_date = "2026-03-22"
 compatibility_flags = ["nodejs_compat"]
 pages_build_output_dir = "./build/client"
 

package/NOTICE

@@ -1,13 +0,0 @@
-NOTICE
-
-Striae – A Firearms Examiner’s Comparison Companion
-
-Striae © 2025. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the “License”); you may not use this file except in compliance with the License. You may obtain a copy of the License in the repository’s LICENSE file.
-
-Attributions for bundled components:
-
-Portions of this product may include open-source software licensed under their respective licenses, including but not limited to: Remix, Cloudflare Workers, Firebase, Tailwind CSS, Vite, and other npm packages. License texts for third-party components are provided in their respective source files or in node_modules as applicable.
-
-No trademark rights are granted for “Striae” or any associated names or logos.

package/app/components/sidebar/notes/notes-modal.tsx

@@ -1,52 +0,0 @@
-import { useState } from 'react';
-import { useOverlayDismiss } from '~/hooks/useOverlayDismiss';
-import styles from './notes.module.css';
-
-interface NotesModalProps {
-  isOpen: boolean;
-  onClose: () => void;
-  notes: string;
-  onSave: (notes: string) => void;
-}
-
-export const NotesModal = ({ isOpen, onClose, notes, onSave }: NotesModalProps) => {
-  const [tempNotes, setTempNotes] = useState(notes);
-  const {
-    requestClose,
-    overlayProps,
-    getCloseButtonProps
-  } = useOverlayDismiss({
-    isOpen,
-    onClose
-  });
-
-  if (!isOpen) return null;  
-
-  const handleSave = () => {
-    onSave(tempNotes);
-    requestClose();
-  };
-
-  return (
-    <div
-      className={styles.modalOverlay}
-      aria-label="Close notes dialog"
-      {...overlayProps}
-    >
-      <div className={styles.modal}>
-        <button {...getCloseButtonProps({ ariaLabel: 'Close notes dialog' })}>×</button>
-        <h5 className={styles.modalTitle}>Additional Notes</h5>
-        <textarea
-          value={tempNotes}
-          onChange={(e) => setTempNotes(e.target.value)}
-          className={styles.modalTextarea}
-          placeholder="Enter additional notes..."
-        />
-        <div className={styles.modalButtons}>
-          <button onClick={handleSave} className={styles.saveButton}>Save</button>
-          <button onClick={requestClose} className={styles.cancelButton}>Cancel</button>
-        </div>
-      </div>
-    </div>
-  );
-};

package/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

package/tailwind.config.ts

@@ -1,22 +0,0 @@
-import type { Config } from "tailwindcss";
-
-export default {
-  content: ["./app/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}"],
-  theme: {
-    extend: {
-      fontFamily: {
-        sans: [
-          "Inter",
-          "ui-sans-serif",
-          "system-ui",
-          "sans-serif",
-          "Apple Color Emoji",
-          "Segoe UI Emoji",
-          "Segoe UI Symbol",
-          "Noto Color Emoji",
-        ],
-      },
-    },
-  },
-  plugins: [],
-} satisfies Config;