@mlightcad/cad-simple-viewer-cli 1.7.4 → 1.7.6-preview.0

package/README.md

@@ -68,10 +68,13 @@ npx cad-simple-viewer-cli -i ./drawing.dwg -s ./export-png.scr -o ./out
 | `--circle-sides <n>` | Max segments for circle tessellation (default: `50` draft) |
 | `--locale <code>` | Prompt/keyword locale (`en`, `zh`, …) |
 | `--base-url <url>` | Resource base URL for fonts and templates (`http(s)`). Fonts load from `<url>/fonts/`. Default: CDN `cad-data` |
+| `--disable-gpu` | Force software WebGL (SwiftShader). Without this flag, hardware GPU is preferred and the CLI falls back to software automatically when no usable GPU is present |
 | `--logfile <path>` | Append start / finish / download log lines |
 
 Progressive rendering is always off in CLI mode so drawings open as quickly as possible (headless scripts do not need mid-open paints).
 
+Headless Chromium prefers a real GPU for WebGL by default. If the machine has no usable GPU (or the driver is blocked), the CLI automatically falls back to software rendering — you do not need `--disable-gpu` for that case.
+
 ## AcCoreConsole mapping
 
 | AcCoreConsole | cad-simple-viewer-cli |
@@ -146,6 +149,7 @@ const { outputDir, savedFiles } = await runHeadless({
   circleSides: 50,              // optional
   baseUrl: 'https://cdn.example.com/cad-data/', // optional
   locale: 'en',                 // optional
+  useGpu: true,                 // optional; default true (pass false for --disable-gpu)
   logfile: './cli.log'          // optional
 })
 
@@ -155,5 +159,5 @@ console.log(outputDir, savedFiles)
 ## How it works
 
 1. The published package includes a prebuilt Playwright runner (`dist-runner/`).
-2. The CLI starts headless Chromium, opens the drawing (or a blank template) with progressive rendering forced off, waits for entity convert / deferred text geometry, then runs `AcApDocManager.runScript()`.
+2. The CLI starts headless Chromium (GPU WebGL by default, SwiftShader fallback), opens the drawing (or a blank template) with progressive rendering forced off, waits for entity convert / deferred text geometry, then runs `AcApDocManager.runScript()`.
 3. Export commands trigger downloads; the CLI writes captured files under `-o`.

package/dist/cli.js

@@ -58,6 +58,7 @@ program
     .option('--circle-sides <n>', 'Max segments for circle tessellation (default: 50 draft)', parseCircleSides)
     .option('--locale <code>', 'UI locale for prompts/keywords (e.g. en, zh)', 'en')
     .option('--base-url <url>', 'Resource base URL for fonts and templates (default: CDN cad-data). Fonts load from <url>/fonts/', parseBaseUrl)
+    .option('--disable-gpu', 'Force software WebGL (SwiftShader); omit to prefer hardware GPU with automatic fallback')
     .option('--logfile <path>', 'Append runtime log lines to this file')
     .action(async (opts) => {
     try {
@@ -82,6 +83,7 @@ program
             circleSides: opts.circleSides,
             baseUrl: opts.baseUrl,
             locale: opts.locale,
+            useGpu: opts.disableGpu ? false : undefined,
             logfile: opts.logfile ? path.resolve(opts.logfile) : undefined
         });
         if (result.savedFiles.length === 0) {

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/headlessGpu.js

@@ -0,0 +1,129 @@
+import { chromium } from 'playwright';
+/**
+ * Hardware backends for this OS, then SwiftShader.
+ *
+ * Playwright's headless Chromium otherwise stays on SwiftShader even when a
+ * GPU is present. Each entry is probed; the first real GPU wins.
+ */
+export function gpuBackendOrder(platform = process.platform) {
+    switch (platform) {
+        case 'win32':
+            return ['d3d11', 'd3d9', 'swiftshader'];
+        case 'darwin':
+            return ['metal', 'gl', 'swiftshader'];
+        default:
+            return ['vulkan', 'gl', 'egl', 'gles', 'swiftshader'];
+    }
+}
+/** True for CPU rasterizers (SwiftShader, llvmpipe, WARP, …). */
+export function isSoftwareWebGlRenderer(renderer) {
+    return /swiftshader|llvmpipe|softpipe|lavapipe|microsoft basic render|software raster/i.test(renderer);
+}
+function chromiumArgsForBackend(backend) {
+    const shared = ['--ignore-gpu-blocklist', '--enable-gpu', '--enable-webgl'];
+    if (backend === 'swiftshader') {
+        return [
+            ...shared,
+            '--use-gl=angle',
+            '--use-angle=swiftshader',
+            '--enable-unsafe-swiftshader'
+        ];
+    }
+    if (backend === 'egl') {
+        return [...shared, '--use-gl=egl'];
+    }
+    return [...shared, '--use-gl=angle', `--use-angle=${backend}`];
+}
+async function probeWebGlRenderer(browser) {
+    const page = await browser.newPage();
+    try {
+        return await page.evaluate(() => {
+            const canvas = document.createElement('canvas');
+            const gl = canvas.getContext('webgl2') || canvas.getContext('webgl');
+            if (!gl)
+                return 'unavailable';
+            const ext = gl.getExtension('WEBGL_debug_renderer_info');
+            const renderer = ext
+                ? gl.getParameter(ext.UNMASKED_RENDERER_WEBGL)
+                : gl.getParameter(gl.RENDERER);
+            return renderer ? String(renderer) : 'unavailable';
+        });
+    }
+    catch {
+        return 'unavailable';
+    }
+    finally {
+        await page.close().catch(() => undefined);
+    }
+}
+async function launchSwiftShader(base) {
+    const browser = await chromium.launch({
+        ...base,
+        args: chromiumArgsForBackend('swiftshader')
+    });
+    const renderer = await probeWebGlRenderer(browser);
+    return { browser, renderer, backend: 'swiftshader' };
+}
+/**
+ * Launches headless Chromium for WebGL.
+ *
+ * With {@link LaunchHeadlessChromiumOptions.useGpu} `true` (default), probes
+ * hardware backends for this OS and falls back to SwiftShader when none work.
+ * With `useGpu` `false`, skips the probe and uses SwiftShader immediately.
+ */
+export async function launchHeadlessChromium(options = {}) {
+    const channel = options.channel;
+    const platform = options.platform ?? process.platform;
+    const useGpu = options.useGpu !== false;
+    const base = {
+        headless: true,
+        ...(channel ? { channel } : {})
+    };
+    if (!useGpu) {
+        console.log('[cad-simple-viewer-cli] GPU disabled; using software renderer (SwiftShader)');
+        return launchSwiftShader(base);
+    }
+    let software;
+    const skipped = [];
+    for (const backend of gpuBackendOrder(platform)) {
+        let browser;
+        try {
+            browser = await chromium.launch({
+                ...base,
+                args: chromiumArgsForBackend(backend)
+            });
+        }
+        catch (error) {
+            skipped.push(`${backend} (${error instanceof Error ? error.message : String(error)})`);
+            continue;
+        }
+        const renderer = await probeWebGlRenderer(browser);
+        if (renderer === 'unavailable') {
+            skipped.push(`${backend} (no WebGL)`);
+            await browser.close().catch(() => undefined);
+            continue;
+        }
+        if (!isSoftwareWebGlRenderer(renderer)) {
+            if (software) {
+                await software.browser.close().catch(() => undefined);
+            }
+            return { browser, renderer, backend };
+        }
+        skipped.push(`${backend} (${renderer})`);
+        if (!software) {
+            software = { browser, renderer, backend };
+        }
+        else {
+            await browser.close().catch(() => undefined);
+        }
+    }
+    if (software) {
+        if (skipped.length > 0) {
+            console.log(`[cad-simple-viewer-cli] no hardware WebGL; using software renderer. Tried ${skipped.join('; ')}`);
+        }
+        return software;
+    }
+    console.log('[cad-simple-viewer-cli] no hardware WebGL; falling back to SwiftShader');
+    return launchSwiftShader(base);
+}
+//# sourceMappingURL=headlessGpu.js.map

package/dist/headlessGpu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"headlessGpu.js","sourceRoot":"","sources":["../src/headlessGpu.ts"],"names":[],"mappings":"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"}

package/dist/runHeadless.js

@@ -3,7 +3,7 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { createServer } from 'node:http';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { chromium } from 'playwright';
+import { launchHeadlessChromium } from './headlessGpu.js';
 /**
  * Resolves the `@mlightcad/cad-simple-viewer-cli` package root
  * (parent of the compiled `dist/` directory).
@@ -82,56 +82,76 @@ function drawingNameFromUrl(urlString) {
     }
     return 'drawing.dwg';
 }
-/**
- * Loads drawing bytes from a local path or remote URL.
- */
-async function loadDrawingInput(inputPath) {
-    if (isHttpUrl(inputPath)) {
-        const fileName = drawingNameFromUrl(inputPath);
-        const ext = path.extname(fileName).toLowerCase();
-        if (ext !== '.dxf' && ext !== '.dwg') {
-            throw new Error(`Unsupported remote drawing "${fileName}". URL path must end with .dxf or .dwg.`);
-        }
-        const response = await fetch(inputPath);
-        if (!response.ok) {
-            throw new Error(`Failed to download drawing (${response.status} ${response.statusText}): ${inputPath}`);
-        }
-        const bytes = Buffer.from(await response.arrayBuffer());
-        return {
-            label: inputPath,
-            fileName,
-            base64: bytes.toString('base64')
-        };
-    }
-    const absoluteInput = path.resolve(inputPath);
-    const ext = path.extname(absoluteInput).toLowerCase();
-    if (ext !== '.dxf' && ext !== '.dwg') {
-        throw new Error(`Unsupported file type "${ext}". Only .dxf and .dwg are supported.`);
-    }
-    if (!existsSync(absoluteInput)) {
-        throw new Error(`Input drawing not found: ${absoluteInput}`);
-    }
-    const fileBytes = await readFile(absoluteInput);
-    return {
-        label: absoluteInput,
-        fileName: path.basename(absoluteInput),
-        base64: fileBytes.toString('base64')
+function contentTypeFor(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    const types = {
+        '.html': 'text/html; charset=utf-8',
+        '.js': 'text/javascript; charset=utf-8',
+        '.css': 'text/css; charset=utf-8',
+        '.json': 'application/json',
+        '.wasm': 'application/wasm',
+        '.dwg': 'application/octet-stream',
+        '.dxf': 'application/octet-stream'
     };
+    return types[ext] ?? 'application/octet-stream';
+}
+async function readRequestBody(req) {
+    const chunks = [];
+    for await (const chunk of req) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks);
 }
 /**
- * Starts a loopback HTTP server that serves static files from `root`.
- *
- * Used to load the Vite-built runner page into Playwright without packing
- * assets into a `file://` URL.
- *
- * @param root - Absolute directory to serve (typically {@link runnerDistDir})
- * @returns Server base URL and a `close` function that shuts the listener down
+ * Starts a loopback HTTP server for the CLI runner, drawing inputs, and
+ * binary download saves (avoids base64 over CDP).
  */
-function startStaticServer(root) {
+function startCliStaticServer(root) {
     return new Promise((resolve, reject) => {
+        const mountedInputs = new Map();
+        let saveDir = null;
+        let savedFiles = [];
+        let mountSeq = 0;
         const server = createServer((req, res) => {
+            void handleRequest(req, res);
+        });
+        async function handleRequest(req, res) {
             try {
-                const urlPath = decodeURIComponent((req.url ?? '/').split('?')[0]);
+                const urlPath = decodeURIComponent((req.url ?? '/').split('?')[0] ?? '/');
+                if (req.method === 'POST' && urlPath.startsWith('/__cli_save__/')) {
+                    if (!saveDir) {
+                        res.writeHead(500);
+                        res.end('Save directory not configured');
+                        return;
+                    }
+                    const fileName = path.basename(urlPath.slice('/__cli_save__/'.length));
+                    if (!fileName) {
+                        res.writeHead(400);
+                        res.end('Missing file name');
+                        return;
+                    }
+                    const body = await readRequestBody(req);
+                    const dest = uniqueOutputPath(saveDir, fileName);
+                    await writeFile(dest, body);
+                    savedFiles.push(dest);
+                    res.writeHead(204);
+                    res.end();
+                    return;
+                }
+                if (urlPath.startsWith('/__cli_input__/')) {
+                    const absolute = mountedInputs.get(urlPath);
+                    if (!absolute || !existsSync(absolute)) {
+                        res.writeHead(404);
+                        res.end();
+                        return;
+                    }
+                    const body = await readFile(absolute);
+                    res.setHeader('Content-Type', contentTypeFor(absolute));
+                    res.setHeader('Content-Length', String(body.byteLength));
+                    res.writeHead(200);
+                    res.end(body);
+                    return;
+                }
                 const relative = urlPath === '/' ? 'index.html' : urlPath.replace(/^\//, '');
                 const filePath = path.join(root, relative);
                 if (!filePath.startsWith(root)) {
@@ -144,33 +164,42 @@ function startStaticServer(root) {
                     res.end();
                     return;
                 }
-                const ext = path.extname(filePath).toLowerCase();
-                const types = {
-                    '.html': 'text/html; charset=utf-8',
-                    '.js': 'text/javascript; charset=utf-8',
-                    '.css': 'text/css; charset=utf-8',
-                    '.json': 'application/json',
-                    '.wasm': 'application/wasm'
-                };
-                res.setHeader('Content-Type', types[ext] ?? 'application/octet-stream');
-                void readFile(filePath).then(body => {
-                    res.writeHead(200);
-                    res.end(body);
-                });
+                res.setHeader('Content-Type', contentTypeFor(filePath));
+                const body = await readFile(filePath);
+                res.writeHead(200);
+                res.end(body);
             }
             catch (error) {
                 res.writeHead(500);
                 res.end(String(error));
             }
-        });
+        }
         server.listen(0, '127.0.0.1', () => {
             const address = server.address();
             if (!address || typeof address === 'string') {
                 reject(new Error('Failed to start static server for CLI runner.'));
                 return;
             }
+            const baseUrl = `http://127.0.0.1:${address.port}`;
             resolve({
-                url: `http://127.0.0.1:${address.port}`,
+                url: baseUrl,
+                mountInput: (absolutePath, _fileName) => {
+                    const token = String(++mountSeq);
+                    const urlPath = `/__cli_input__/${token}`;
+                    mountedInputs.set(urlPath, absolutePath);
+                    return `${baseUrl}${urlPath}`;
+                },
+                setSaveDir: dir => {
+                    saveDir = dir;
+                },
+                takeSavedFiles: () => {
+                    const files = savedFiles;
+                    savedFiles = [];
+                    return files;
+                },
+                resetSavedFiles: () => {
+                    savedFiles = [];
+                },
                 close: () => new Promise((closeResolve, closeReject) => {
                     server.close(err => (err ? closeReject(err) : closeResolve()));
                 })
@@ -179,93 +208,135 @@ function startStaticServer(root) {
     });
 }
 /**
- * Runs a `.scr` command script in headless Chromium and writes captured
- * export downloads into `outputDir`.
- *
- * When `inputPath` is omitted, the runner starts from a blank ISO template
- * (write mode) so scripts can create geometry from scratch. The page waits for
- * entity convert / deferred font geometry before executing the script so
- * exports such as `pngout` include rendered text.
- *
- * @param options - Script path, optional input drawing, output dir, locale,
- *   open mode / view / tessellation options, resource base URL, logfile
- * @returns Absolute output directory and list of saved file paths
- * @throws If the script or input file is missing, the file type is unsupported,
- *   the runner build is missing, or the in-page script fails
+ * Long-lived headless Chromium session that can run many drawings without
+ * relaunching the browser or reloading WASM/fonts for each file.
  */
-export async function runHeadless(options) {
-    const absoluteScript = path.resolve(options.scriptPath);
-    if (!existsSync(absoluteScript)) {
-        throw new Error(`Script not found: ${absoluteScript}`);
-    }
-    let absoluteInput;
-    let fileName = null;
-    let base64 = null;
-    if (options.inputPath) {
-        const drawing = await loadDrawingInput(options.inputPath);
-        absoluteInput = drawing.label;
-        fileName = drawing.fileName;
-        base64 = drawing.base64;
-    }
-    const outputDir = path.resolve(options.outputDir ??
-        (absoluteInput && !isHttpUrl(absoluteInput)
-            ? path.dirname(absoluteInput)
-            : process.cwd()));
-    await mkdir(outputDir, { recursive: true });
-    const runnerDir = runnerDistDir();
-    if (!existsSync(path.join(runnerDir, 'index.html'))) {
-        throw new Error('CLI runner is not built. Run "pnpm --filter @mlightcad/cad-simple-viewer-cli build".');
+export class HeadlessCadSession {
+    browser;
+    page;
+    server;
+    launchMs;
+    constructor(browser, page, server, launchMs) {
+        this.browser = browser;
+        this.page = page;
+        this.server = server;
+        this.launchMs = launchMs;
     }
-    const scriptText = await readFile(absoluteScript, 'utf8');
-    const mode = options.mode ?? (absoluteInput ? 'read' : 'write');
-    const logfile = options.logfile ? path.resolve(options.logfile) : undefined;
-    await appendLog(logfile, `[cad-simple-viewer-cli] input=${absoluteInput ?? '(blank)'} script=${absoluteScript} output=${outputDir}`);
-    const server = await startStaticServer(runnerDir);
-    const channel = process.env.PLAYWRIGHT_BROWSER_CHANNEL;
-    const browser = await chromium.launch({
-        headless: true,
-        ...(channel ? { channel } : {})
-    });
-    const savedFiles = [];
-    try {
+    static async create(options = {}) {
+        const runnerDir = runnerDistDir();
+        if (!existsSync(path.join(runnerDir, 'index.html'))) {
+            throw new Error('CLI runner is not built. Run "pnpm --filter @mlightcad/cad-simple-viewer-cli build".');
+        }
+        const t0 = performance.now();
+        const server = await startCliStaticServer(runnerDir);
+        const channel = process.env.PLAYWRIGHT_BROWSER_CHANNEL;
+        const gpu = await launchHeadlessChromium({
+            channel,
+            useGpu: options.useGpu
+        });
+        const browser = gpu.browser;
+        console.log(`[cad-simple-viewer-cli] webgl: ${gpu.renderer} (${gpu.backend})`);
         const context = await browser.newContext({ acceptDownloads: true });
         const page = await context.newPage();
+        page.on('console', msg => {
+            const text = msg.text();
+            if (text.includes('GL Driver Message')) {
+                return;
+            }
+            if (text.startsWith('[cad-simple-viewer-cli]') ||
+                text.startsWith('[chtml]') ||
+                msg.type() === 'error' ||
+                msg.type() === 'warning') {
+                console.log(text);
+            }
+        });
+        page.on('pageerror', error => {
+            console.error('[cad-simple-viewer-cli] page error:', error.message);
+        });
+        page.on('response', response => {
+            if (response.status() < 400)
+                return;
+            console.warn(`[cad-simple-viewer-cli] HTTP ${response.status()} ${response.url()}`);
+        });
         await page.goto(`${server.url}/index.html`, { waitUntil: 'networkidle' });
+        const launchMs = performance.now() - t0;
+        console.log(`[cad-simple-viewer-cli] browser ready: ${launchMs.toFixed(0)} ms`);
+        return new HeadlessCadSession(browser, page, server, launchMs);
+    }
+    get browserLaunchMs() {
+        return this.launchMs;
+    }
+    async run(options) {
+        const absoluteScript = path.resolve(options.scriptPath);
+        if (!existsSync(absoluteScript)) {
+            throw new Error(`Script not found: ${absoluteScript}`);
+        }
+        const timings = {
+            browserLaunch: this.launchMs
+        };
+        const runT0 = performance.now();
+        let absoluteInput;
+        let fileName = null;
+        let drawingUrl = null;
+        if (options.inputPath) {
+            const tLoad = performance.now();
+            if (isHttpUrl(options.inputPath)) {
+                absoluteInput = options.inputPath;
+                fileName = drawingNameFromUrl(options.inputPath);
+                const ext = path.extname(fileName).toLowerCase();
+                if (ext !== '.dxf' && ext !== '.dwg') {
+                    throw new Error(`Unsupported remote drawing "${fileName}". URL path must end with .dxf or .dwg.`);
+                }
+                drawingUrl = options.inputPath;
+            }
+            else {
+                absoluteInput = path.resolve(options.inputPath);
+                const ext = path.extname(absoluteInput).toLowerCase();
+                if (ext !== '.dxf' && ext !== '.dwg') {
+                    throw new Error(`Unsupported file type "${ext}". Only .dxf and .dwg are supported.`);
+                }
+                if (!existsSync(absoluteInput)) {
+                    throw new Error(`Input drawing not found: ${absoluteInput}`);
+                }
+                fileName = path.basename(absoluteInput);
+                drawingUrl = this.server.mountInput(absoluteInput, fileName);
+            }
+            timings.mountInput = performance.now() - tLoad;
+        }
+        const outputDir = path.resolve(options.outputDir ??
+            (absoluteInput && !isHttpUrl(absoluteInput)
+                ? path.dirname(absoluteInput)
+                : process.cwd()));
+        await mkdir(outputDir, { recursive: true });
+        this.server.setSaveDir(outputDir);
+        this.server.resetSavedFiles();
+        const scriptText = await readFile(absoluteScript, 'utf8');
+        const mode = options.mode ?? (absoluteInput ? 'read' : 'write');
+        const logfile = options.logfile ? path.resolve(options.logfile) : undefined;
+        await appendLog(logfile, `[cad-simple-viewer-cli] input=${absoluteInput ?? '(blank)'} script=${absoluteScript} output=${outputDir}`);
         const openExtras = {
             openViewMode: options.openViewMode,
             drawNoPlotLayers: options.drawNoPlotLayers,
             circleSides: options.circleSides,
-            baseUrl: options.baseUrl
+            baseUrl: options.baseUrl,
+            saveBaseUrl: `${this.server.url}/__cli_save__/`
         };
-        let result;
+        const tScript = performance.now();
         try {
-            result = await page.evaluate(async ({ name, data, script, locale, mode: openMode, startBlank, openViewMode, drawNoPlotLayers, circleSides, baseUrl }) => {
-                const runOptions = {
+            await this.page.evaluate(async ({ name, drawingUrl: url, script, locale, mode: openMode, startBlank, openViewMode, drawNoPlotLayers, circleSides, baseUrl, saveBaseUrl }) => {
+                return window.runCadScript(name, url, script, {
                     locale,
                     mode: openMode,
+                    startBlank,
                     openViewMode,
                     drawNoPlotLayers,
                     circleSides,
-                    baseUrl
-                };
-                if (data == null || name == null) {
-                    return window.runCadScript(null, null, script, {
-                        ...runOptions,
-                        startBlank
-                    });
-                }
-                const binary = atob(data);
-                const bytes = new Uint8Array(binary.length);
-                for (let i = 0; i < binary.length; i++) {
-                    bytes[i] = binary.charCodeAt(i);
-                }
-                return window.runCadScript(name, bytes, script, {
-                    ...runOptions,
-                    startBlank: false
+                    baseUrl,
+                    saveBaseUrl
                 });
             }, {
                 name: fileName,
-                data: base64,
+                drawingUrl,
                 script: scriptText,
                 locale: options.locale,
                 mode,
@@ -278,18 +349,60 @@ export async function runHeadless(options) {
             await appendLog(logfile, `[cad-simple-viewer-cli] script failed: ${message}`);
             throw error;
         }
-        for (const file of result.files) {
-            const dest = uniqueOutputPath(outputDir, file.fileName);
-            await writeFile(dest, Buffer.from(file.base64, 'base64'));
-            savedFiles.push(dest);
+        timings.scriptAndExport = performance.now() - tScript;
+        const savedFiles = this.server.takeSavedFiles();
+        for (const dest of savedFiles) {
             await appendLog(logfile, `[cad-simple-viewer-cli] saved ${dest}`);
         }
-        await appendLog(logfile, `[cad-simple-viewer-cli] done saved=${savedFiles.length}`);
-        return { outputDir, savedFiles };
+        timings.total = performance.now() - runT0;
+        await appendLog(logfile, `[cad-simple-viewer-cli] done saved=${savedFiles.length} totalMs=${timings.total.toFixed(0)}`);
+        console.log('[cad-simple-viewer-cli] timings: ' +
+            Object.entries(timings)
+                .map(([k, v]) => `${k}=${v.toFixed(0)}ms`)
+                .join(' '));
+        return { outputDir, savedFiles, timings };
+    }
+    async close() {
+        await this.browser.close();
+        await this.server.close();
+    }
+}
+/**
+ * Runs a `.scr` command script in headless Chromium and writes captured
+ * export downloads into `outputDir`.
+ *
+ * Prefer {@link HeadlessCadSession} when exporting many drawings so the
+ * browser and WASM parser stay warm across files.
+ */
+export async function runHeadless(options) {
+    const session = await HeadlessCadSession.create({ useGpu: options.useGpu });
+    try {
+        return await session.run(options);
+    }
+    finally {
+        await session.close();
+    }
+}
+/**
+ * Runs the same script against many drawings in one Chromium session.
+ *
+ * GPU preference is taken from the first job's {@link RunHeadlessOptions.useGpu}
+ * (default: hardware when available).
+ */
+export async function runHeadlessBatch(jobs) {
+    if (jobs.length === 0) {
+        return [];
+    }
+    const session = await HeadlessCadSession.create({ useGpu: jobs[0].useGpu });
+    const results = [];
+    try {
+        for (const job of jobs) {
+            results.push(await session.run(job));
+        }
+        return results;
     }
     finally {
-        await browser.close();
-        await server.close();
+        await session.close();
     }
 }
 //# sourceMappingURL=runHeadless.js.map