@wafflebase/cli 0.3.7 → 0.4.0

package/dist/commands/docs.js

@@ -5,6 +5,7 @@ import { printDryRun } from '../client/dry-run.js';
 import { parseContentFormat, runDocsContent } from '../docs/content.js';
 import { exportPdf } from '../docs/pdf-export.js';
 import { exportDocx } from '../docs/docx-export.js';
+import { createImageFetcher } from '../docs/image-fetcher.js';
 import { parsePageRange } from '../docs/page-range.js';
 import { writeBinary } from '../output/binary.js';
 import { runDocsImport } from '../docs/import.js';
@@ -224,6 +225,15 @@ export function registerDocsCommand(program) {
                 throw new Error(`HTTP ${res.status}`);
             }
             const fetchedDoc = res.data;
+            // Image inlines reference URLs that PdfExporter and DocxExporter
+            // can't resolve on their own. The fetcher walks each unique
+            // `src`, GETs it (via `globalThis.fetch`), and hands back a
+            // Blob. Relative URLs (`/images/<id>`) resolve against the
+            // configured server base so the same doc round-trips between
+            // the editor (browser-relative) and the CLI.
+            const imageFetcher = createImageFetcher({
+                serverBase: getConfig(opts).server,
+            });
             let bytes;
             if (format === 'pdf') {
                 // Pagination uses the FontkitMeasurer's coarse Latin estimate
@@ -238,6 +248,7 @@ export function registerDocsCommand(program) {
                     // see `extractPages` in pdf-export.ts.
                     const fullPdf = await exportPdf(fetchedDoc, {
                         includeHeaderFooter: local.includeHeaderFooter,
+                        imageFetcher,
                     });
                     const total = await pdfPageCount(fullPdf);
                     pageRange = parsePageRange(local.pages, total);
@@ -248,11 +259,13 @@ export function registerDocsCommand(program) {
                     bytes = await exportPdf(fetchedDoc, {
                         includeHeaderFooter: local.includeHeaderFooter,
                         pages: pageRange,
+                        imageFetcher,
                     });
                 }
                 else {
                     bytes = await exportPdf(fetchedDoc, {
                         includeHeaderFooter: local.includeHeaderFooter,
+                        imageFetcher,
                     });
                 }
             }
@@ -262,6 +275,7 @@ export function registerDocsCommand(program) {
                 }
                 bytes = await exportDocx(fetchedDoc, {
                     includeHeaderFooter: local.includeHeaderFooter,
+                    imageFetcher,
                 });
             }
             writeBinary(bytes, file, { force: local.force, quiet: opts.quiet });

package/dist/config/config.d.ts

@@ -23,7 +23,10 @@ export declare function getConfigPath(): string;
  *
  * Auth resolution order:
  * 1. Flag/env `--api-key` or `WAFFLEBASE_API_KEY` → API key auth
- * 2. Session `~/.wafflebase/session.json` exists and token valid → JWT auth
+ * 2. Session `~/.wafflebase/session.json` with both tokens → JWT auth
+ *    (the access token may already be past its `expiresAt`; the HTTP
+ *    client refreshes it on the first 401 and falls back to a clear
+ *    SESSION_EXPIRED error when the refresh token is also dead)
  * 3. Config profile `api-key` → API key auth
  * 4. None → empty (commands will fail)
  */

package/dist/config/config.js

@@ -2,7 +2,7 @@ import { readFileSync, existsSync, mkdirSync, copyFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { parse as parseYaml } from 'yaml';
-import { loadSession, isSessionExpired } from './session.js';
+import { loadSession } from './session.js';
 export const DEFAULT_SERVER = 'https://api.wafflebase.io';
 /**
  * Migrate config from old path (~/.config/wafflebase/config.yaml) to new path
@@ -40,7 +40,10 @@ export function getConfigPath() {
  *
  * Auth resolution order:
  * 1. Flag/env `--api-key` or `WAFFLEBASE_API_KEY` → API key auth
- * 2. Session `~/.wafflebase/session.json` exists and token valid → JWT auth
+ * 2. Session `~/.wafflebase/session.json` with both tokens → JWT auth
+ *    (the access token may already be past its `expiresAt`; the HTTP
+ *    client refreshes it on the first 401 and falls back to a clear
+ *    SESSION_EXPIRED error when the refresh token is also dead)
  * 3. Config profile `api-key` → API key auth
  * 4. None → empty (commands will fail)
  */
@@ -62,9 +65,14 @@ export function resolveConfig(flags) {
             authMode: 'api-key',
         };
     }
-    // Step 2: Try session
+    // Step 2: Try session — accept it whenever both tokens are present.
+    // Gating on `isSessionExpired` here would silently drop the session
+    // (and its `activeWorkspace`) the moment the access token expired,
+    // turning every command into a `/workspaces//...` 404. Letting the
+    // HTTP client see the expired access token + refresh token lets its
+    // 401 → refresh → retry path do its job.
     const session = loadSession();
-    if (session && !isSessionExpired(session)) {
+    if (session && session.accessToken && session.refreshToken) {
         return {
             server: flags.server ??
                 process.env.WAFFLEBASE_SERVER ??

package/dist/docs/image-fetcher.d.ts

@@ -0,0 +1,37 @@
+import type { DocxImageFetcher } from '@wafflebase/docs';
+export interface ImageFetcherOptions {
+    /**
+     * Base URL of the Wafflebase API server. Used to resolve image
+     * inlines whose `src` is a server-relative path (`/images/<id>`).
+     * Absolute URLs (`http(s)://...`, `data:`, `blob:`, ...) pass through
+     * untouched so docs imported from external sources keep working.
+     */
+    serverBase: string;
+    /**
+     * Optional `fetch` override — kept as a seam for tests. Defaults to
+     * the global `fetch`. The signature matches the WHATWG fetch so a
+     * stub can be a plain async function without pulling DOM types in.
+     */
+    fetch?: typeof globalThis.fetch;
+}
+/**
+ * Resolve a possibly-relative image URL against the configured server
+ * base. Mirrors `resolveImageUrl` in
+ * `packages/frontend/src/app/docs/export-utils.ts` so the CLI and
+ * browser agree on what counts as "absolute". The shared rule: any URL
+ * that starts with a scheme (`http:`, `https:`, `data:`, `blob:`,
+ * `file:`, ...) is left alone; everything else gets prefixed.
+ */
+export declare function resolveImageUrl(url: string, serverBase: string): string;
+/**
+ * Build an `ImageFetcher` for the CLI export pipelines. The fetcher
+ * downloads each unique image inline `src` once, returning a Blob the
+ * exporter can embed verbatim (PDF) or stream into the DOCX zip.
+ *
+ * Backend's `GET /images/:id` is publicly readable, so we don't attach
+ * an Authorization header — sending JWT cookies via the CLI isn't
+ * possible anyway. Relative URLs resolve against `serverBase`; absolute
+ * URLs (e.g., the canonical `https://api.wafflebase.io/images/...`
+ * surfaced by `imageFetcher required` errors) pass through.
+ */
+export declare function createImageFetcher(opts: ImageFetcherOptions): DocxImageFetcher;

package/dist/docs/image-fetcher.js

@@ -0,0 +1,38 @@
+/**
+ * Resolve a possibly-relative image URL against the configured server
+ * base. Mirrors `resolveImageUrl` in
+ * `packages/frontend/src/app/docs/export-utils.ts` so the CLI and
+ * browser agree on what counts as "absolute". The shared rule: any URL
+ * that starts with a scheme (`http:`, `https:`, `data:`, `blob:`,
+ * `file:`, ...) is left alone; everything else gets prefixed.
+ */
+export function resolveImageUrl(url, serverBase) {
+    if (/^[a-z][a-z0-9+.-]*:/i.test(url))
+        return url;
+    const base = serverBase.replace(/\/$/, '');
+    if (!base)
+        return url;
+    return `${base}${url.startsWith('/') ? url : `/${url}`}`;
+}
+/**
+ * Build an `ImageFetcher` for the CLI export pipelines. The fetcher
+ * downloads each unique image inline `src` once, returning a Blob the
+ * exporter can embed verbatim (PDF) or stream into the DOCX zip.
+ *
+ * Backend's `GET /images/:id` is publicly readable, so we don't attach
+ * an Authorization header — sending JWT cookies via the CLI isn't
+ * possible anyway. Relative URLs resolve against `serverBase`; absolute
+ * URLs (e.g., the canonical `https://api.wafflebase.io/images/...`
+ * surfaced by `imageFetcher required` errors) pass through.
+ */
+export function createImageFetcher(opts) {
+    const fetchImpl = opts.fetch ?? globalThis.fetch;
+    return async (url) => {
+        const resolved = resolveImageUrl(url, opts.serverBase);
+        const res = await fetchImpl(resolved);
+        if (!res.ok) {
+            throw new Error(`Image fetch failed: ${res.status} ${res.statusText} for ${resolved}`);
+        }
+        return res.blob();
+    };
+}

package/dist/docs/pdf-export.d.ts

@@ -1,4 +1,4 @@
-import { type Document, type PdfFontsOptions } from '@wafflebase/docs';
+import { type Document, type DocxImageFetcher, type PdfFontsOptions } from '@wafflebase/docs';
 import type { PageRange } from './page-range.js';
 /**
  * Options for the CLI PDF export pipeline.
@@ -21,6 +21,15 @@ export interface CliPdfExportOptions {
      *  and to leave room for a future "strip header/footer" mode. */
     includeHeaderFooter?: boolean;
     fontSources?: PdfFontsOptions['sources'];
+    /** Resolve and download image inlines so they can be embedded in the
+     *  PDF. Required when the document contains image inlines —
+     *  `PdfExporter` throws otherwise to avoid silently dropping content.
+     *  The CLI command builds one via `createImageFetcher` from the
+     *  configured server base; tests inject a stub that returns
+     *  in-memory bytes. Typed as `DocxImageFetcher` (a structural
+     *  `(url) => Promise<Blob>` alias) since the bare `ImageFetcher`
+     *  symbol from `pdf-image-painter` isn't re-exported. */
+    imageFetcher?: DocxImageFetcher;
 }
 /**
  * Render `doc` to a PDF byte buffer using the same `PdfExporter` the

package/dist/docs/pdf-export.js

@@ -19,7 +19,11 @@ export async function exportPdf(doc, opts = {}) {
     const fonts = new PdfFonts({ sources: opts.fontSources });
     const measurer = new FontkitMeasurer();
     await preloadKoreanFonts(fonts, measurer, usage);
-    const blob = await PdfExporter.export(doc, { measurer, fonts });
+    const blob = await PdfExporter.export(doc, {
+        measurer,
+        fonts,
+        imageFetcher: opts.imageFetcher,
+    });
     const fullBytes = new Uint8Array(await blob.arrayBuffer());
     if (!opts.pages || opts.pages.pages.size === 0) {
         return fullBytes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wafflebase/cli",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "description": "CLI for Wafflebase spreadsheet API",
   "license": "Apache-2.0",
   "type": "module",
@@ -20,7 +20,7 @@
     "open": "^11.0.0",
     "pdf-lib": "^1.17.1",
     "yaml": "^2.0.0",
-    "@wafflebase/docs": "0.3.7"
+    "@wafflebase/docs": "0.4.0"
   },
   "devDependencies": {
     "@types/fontkit": "^2.0.0",