mdv-live 0.5.8 → 0.5.10

package/CHANGELOG.md

@@ -5,6 +5,62 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.10] - 2026-05-09
+
+### Fixed (UX revert)
+
+- **Markdown PDF ボタンを OS 印刷ダイアログに戻す** (本来の UX 復元):
+  - 0.5.9 (実体は 2026-01-31 `e5526f9` から) で plain Markdown も server-side
+    md-to-pdf 経由の PDF DL に切り替わっていたが、本来の UX は `Cmd+P` 相当の
+    OS 印刷ダイアログ (`window.print()`) で「PDF として保存」を選ぶフロー
+  - `src/static/app.js`: `print()` の markdown 分岐を削除 (`else` 分岐の
+    `browserPrint()` に落ちる)
+  - Marp / HTML preview の挙動は変更なし (server-side marp-cli を維持)
+
+### Fixed (codex review)
+
+- `/api/pdf/export` の `fs.readFile` を `try/catch` 外で実行していた問題を修正
+  (directory 指定や読み取り不可ファイルで Express デフォルトエラーに落ちて
+  controlled JSON が返らなかった)。stat による file 判定を追加
+
+### Removed
+
+- `PdfStyleManager` UI モジュール (markdown が server PDF を使わなくなったため
+  orphan)、`pdfStyleToggle` / `pdfStylePanel` HTML、関連 CSS、`normalizeUserPath`
+  helper、`pdf-style-preview` クラス
+- `md-to-pdf` runtime dependency。web UI で使わなくなったため削除。
+  `bin/mdv.js convert` は元々 `npx md-to-pdf` 経由で 0.5.9 以前と同じ挙動
+- `/api/pdf/export` の markdown 分岐 (Marp 専用エンドポイントに整理)。
+  非 Marp ファイルは 415 で拒否
+
+### Tests
+
+- 241 → **242 件 (+1)**、全 PASS
+- 追加: directory path → 404 controlled JSON (codex round 3 regression)
+- 変更: plain markdown PDF テスト → 415 テストに置換
+
+## [0.5.9] - 2026-05-09
+
+### Fixed
+
+- **PDF export hang for plain Markdown** (regression since 2026-01-31 `e5526f9`):
+  - 原因 1: `md-to-pdf` が `package.json` に未宣言だったため `npx md-to-pdf` 経路に
+    依存。npx キャッシュ / TTY / レジストリ状況により挙動が不安定
+  - 原因 2: `child_process.execFile` は `stdio` オプションを受け付けない (Node 仕様)。
+    `md-to-pdf` 内部の `get-stdin` が EOF を待ち続け 180s SIGTERM していた
+  - 直し方: `md-to-pdf` を `dependencies` に追加 / `npx` 経由をやめて
+    `node_modules/.bin/md-to-pdf` を直接 spawn / `stdio: ['ignore', ...]` で stdin 即 EOF
+  - Marp 経路 (`marp-cli`) も同じ helper (`runPdfTool`) に統一して防御
+
+### Added
+
+- `tests/test-pdf-export.js`: PDF export 経路の自動テスト 5 件 (400 / 403 / 404 / plain
+  PDF / Marp PDF)。リグレッション再発防止
+
+### Tests
+
+- 236 → **241 件 (+5)**、全 PASS
+
 ## [0.5.8] - 2026-05-08
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdv-live",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "description": "Markdown Viewer - File tree + Live preview + Marp support + Hot reload",
   "main": "src/server.js",
   "bin": {
@@ -45,16 +45,16 @@
     "LICENSE"
   ],
   "dependencies": {
-    "express": "^4.21.2",
-    "ws": "^8.18.0",
+    "@marp-team/marp-core": "^4.0.0",
     "chokidar": "^4.0.3",
+    "express": "^4.21.2",
+    "highlight.js": "^11.10.0",
     "markdown-it": "^14.1.0",
     "markdown-it-task-lists": "^2.1.1",
-    "@marp-team/marp-core": "^4.0.0",
-    "highlight.js": "^11.10.0",
-    "open": "^10.1.0",
     "mime-types": "^2.1.35",
-    "multer": "^1.4.5-lts.1"
+    "multer": "^1.4.5-lts.1",
+    "open": "^10.1.0",
+    "ws": "^8.18.0"
   },
   "optionalDependencies": {
     "@marp-team/marp-cli": "^4.0.3"

package/src/api/pdf.js

@@ -1,17 +1,11 @@
-import { execFile } from 'child_process';
-import { promisify } from 'util';
+import { spawn } from 'child_process';
 import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import os from 'os';
-import { createRequire } from 'module';
 import { isMarp } from '../rendering/markdown.js';
-import { validatePath, validatePathReal } from '../utils/path.js';
-import { resolvePdfOptions } from '../styles/index.js';
+import { validatePath } from '../utils/path.js';
 
-const execFileAsync = promisify(execFile);
-const require = createRequire(import.meta.url);
-const highlightStylesheet = path.resolve(path.dirname(require.resolve('highlight.js')), '..', 'styles', 'atom-one-dark.css');
 const marpBin = path.join(
   path.dirname(fileURLToPath(import.meta.url)),
   '..',
@@ -23,53 +17,46 @@ const marpBin = path.join(
 const PDF_EXPORT_TIMEOUT_MS = 180000;
 
 /**
- * Resolve an optional user-selected file path under the server root.
- * @param {string | undefined} relativePath - Path supplied by the web UI.
- * @param {string} rootDir - Server root directory.
- * @returns {Promise<string | null>} Absolute path or null.
+ * Spawn marp-cli with stdin closed.
+ *
+ * 注意: execFile は stdio オプションを受け付けない (Node 仕様) ため spawn を使う。
  */
-async function resolveOptionalUserFile(relativePath, rootDir) {
-  if (!relativePath) return null;
-  if (!await validatePathReal(relativePath, rootDir)) {
-    throw new Error(`Access denied: ${relativePath}`);
-  }
-  const fullPath = path.join(rootDir, relativePath);
-  const stat = await fs.stat(fullPath);
-  if (!stat.isFile()) {
-    throw new Error(`Not a file: ${relativePath}`);
-  }
-  return fullPath;
-}
-
-/**
- * Export a regular markdown document with md-to-pdf.
- * @param {string} inputPath - Source markdown file.
- * @param {string} outputPath - Temporary output path.
- * @param {string | null} stylesheetPath - Optional custom CSS file.
- * @param {string | null} pdfOptionsPath - Optional PDF options JSON file.
- * @returns {Promise<void>}
- */
-async function exportMarkdownPdf(inputPath, outputPath, stylesheetPath, pdfOptionsPath) {
-  const pdfOptions = await resolvePdfOptions(pdfOptionsPath || undefined);
-  const args = ['md-to-pdf', inputPath, '--pdf-options', JSON.stringify(pdfOptions)];
-
-  if (stylesheetPath) {
-    args.push('--stylesheet', highlightStylesheet);
-    args.push('--stylesheet', stylesheetPath);
-    args.push('--highlight-style', 'atom-one-dark');
-  }
-
-  await execFileAsync('npx', args, {
-    cwd: path.dirname(inputPath),
-    timeout: PDF_EXPORT_TIMEOUT_MS,
+function runMarp(args) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(marpBin, args, { stdio: ['ignore', 'pipe', 'pipe'] });
+    let stderr = '';
+    child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });
+
+    const timer = setTimeout(() => {
+      child.kill('SIGTERM');
+    }, PDF_EXPORT_TIMEOUT_MS);
+
+    child.on('error', (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+    child.on('close', (code, signal) => {
+      clearTimeout(timer);
+      if (code === 0) {
+        resolve();
+      } else {
+        const err = new Error(`marp exited with code=${code} signal=${signal}`);
+        err.code = code;
+        err.signal = signal;
+        err.stderr = stderr;
+        reject(err);
+      }
+    });
   });
-
-  const generatedPdf = inputPath.replace(/\.(md|markdown)$/i, '.pdf');
-  await fs.rename(generatedPdf, outputPath);
 }
 
 /**
- * Setup PDF export routes
+ * Setup PDF export routes.
+ *
+ * Web UI からは Marp ファイルのみがこの経路を使う。通常 Markdown は
+ * クライアント側で window.print() (OS 印刷ダイアログ) に流す設計のため、
+ * このエンドポイントは Marp 以外を 415 で拒否する。
+ *
  * @param {Express} app - Express application
  * @returns {void}
  */
@@ -77,7 +64,7 @@ export function setupPdfRoutes(app) {
   const { rootDir } = app.locals;
 
   app.post('/api/pdf/export', async (req, res) => {
-    const { filePath, stylePath, pdfOptionsPath } = req.body;
+    const { filePath } = req.body;
 
     if (!filePath) {
       return res.status(400).json({ error: 'filePath is required' });
@@ -88,29 +75,28 @@ export function setupPdfRoutes(app) {
     }
 
     const fullPath = path.join(rootDir, filePath);
-
-    try {
-      await fs.access(fullPath);
-    } catch {
-      return res.status(404).json({ error: 'File not found' });
-    }
-
     const baseName = path.basename(fullPath, '.md');
     const outputPath = path.join(os.tmpdir(), `mdv-${Date.now()}-${baseName}.pdf`);
     const outputFileName = `${baseName}.pdf`;
 
     try {
+      let stat;
+      try {
+        stat = await fs.stat(fullPath);
+      } catch {
+        return res.status(404).json({ error: 'File not found' });
+      }
+      if (!stat.isFile()) {
+        return res.status(404).json({ error: 'File not found' });
+      }
+
       const content = await fs.readFile(fullPath, 'utf-8');
-      if (isMarp(content)) {
-        await execFileAsync(marpBin, [fullPath, '-o', outputPath, '--html', '--allow-local-files', '--no-stdin'], { timeout: PDF_EXPORT_TIMEOUT_MS });
-      } else {
-        const [stylesheetPath, resolvedPdfOptionsPath] = await Promise.all([
-          resolveOptionalUserFile(stylePath, rootDir),
-          resolveOptionalUserFile(pdfOptionsPath, rootDir),
-        ]);
-        await exportMarkdownPdf(fullPath, outputPath, stylesheetPath, resolvedPdfOptionsPath);
+      if (!isMarp(content)) {
+        return res.status(415).json({ error: 'Server-side PDF export supports Marp files only. Use the browser print dialog for regular Markdown.' });
       }
 
+      await runMarp([fullPath, '-o', outputPath, '--html', '--allow-local-files', '--no-stdin']);
+
       res.download(outputPath, outputFileName, async (err) => {
         if (err) {
           console.error('Download error:', err);

package/src/static/app.js

@@ -11,9 +11,7 @@
 
     const STORAGE_KEYS = {
         THEME: 'mdv-theme',
-        SIDEBAR_WIDTH: 'mdv-sidebar-width',
-        PDF_STYLE_PATH: 'mdv-pdf-style-path',
-        PDF_OPTIONS_PATH: 'mdv-pdf-options-path'
+        SIDEBAR_WIDTH: 'mdv-sidebar-width'
     };
 
     const HLJS_THEMES = {
@@ -87,9 +85,7 @@
         isResizing: false,
         skipScrollRestore: false,
         uploadTargetPath: '',
-        rootPath: '',
-        pdfStylePath: localStorage.getItem(STORAGE_KEYS.PDF_STYLE_PATH) || '',
-        pdfOptionsPath: localStorage.getItem(STORAGE_KEYS.PDF_OPTIONS_PATH) || ''
+        rootPath: ''
     };
 
     // ============================================================
@@ -125,12 +121,6 @@
         statusText: document.getElementById('statusText'),
         resizeHandle: document.getElementById('resizeHandle'),
         editToggle: document.getElementById('editToggle'),
-        pdfStyleToggle: document.getElementById('pdfStyleToggle'),
-        pdfStylePanel: document.getElementById('pdfStylePanel'),
-        pdfStylePath: document.getElementById('pdfStylePath'),
-        pdfOptionsPath: document.getElementById('pdfOptionsPath'),
-        pdfStyleApply: document.getElementById('pdfStyleApply'),
-        pdfStyleClear: document.getElementById('pdfStyleClear'),
         editLabel: document.getElementById('editLabel'),
         editorStatus: document.getElementById('editorStatus'),
         shutdownBtn: document.getElementById('shutdownBtn'),
@@ -173,10 +163,6 @@
         });
     }
 
-    function normalizeUserPath(path) {
-        return path.trim().replace(/^\/+/, '');
-    }
-
     async function apiRequest(url, options = {}) {
         const response = await fetch(url, options);
         const data = await response.json();
@@ -249,101 +235,6 @@
         }
     };
 
-    // ============================================================
-    // PDF Style Preview
-    // ============================================================
-
-    const PdfStyleManager = {
-        scopedCssId: 'pdf-style-preview-css',
-
-        init() {
-            elements.pdfStylePath.value = state.pdfStylePath;
-            elements.pdfOptionsPath.value = state.pdfOptionsPath;
-            elements.pdfStyleToggle.addEventListener('click', () => {
-                elements.pdfStylePanel.classList.toggle('hidden');
-            });
-            elements.pdfStyleApply.addEventListener('click', () => this.applyFromInputs());
-            elements.pdfStyleClear.addEventListener('click', () => this.clear());
-            elements.pdfStylePath.addEventListener('keydown', (event) => {
-                if (event.key === 'Enter') this.applyFromInputs();
-            });
-            elements.pdfOptionsPath.addEventListener('keydown', (event) => {
-                if (event.key === 'Enter') this.applyFromInputs();
-            });
-            this.loadPreviewCss();
-        },
-
-        getExportOptions() {
-            return {
-                stylePath: normalizeUserPath(state.pdfStylePath),
-                pdfOptionsPath: normalizeUserPath(state.pdfOptionsPath)
-            };
-        },
-
-        async applyFromInputs() {
-            state.pdfStylePath = normalizeUserPath(elements.pdfStylePath.value);
-            state.pdfOptionsPath = normalizeUserPath(elements.pdfOptionsPath.value);
-            elements.pdfStylePath.value = state.pdfStylePath;
-            elements.pdfOptionsPath.value = state.pdfOptionsPath;
-            localStorage.setItem(STORAGE_KEYS.PDF_STYLE_PATH, state.pdfStylePath);
-            localStorage.setItem(STORAGE_KEYS.PDF_OPTIONS_PATH, state.pdfOptionsPath);
-            await this.loadPreviewCss();
-            TabManager.renderActive();
-        },
-
-        clear() {
-            state.pdfStylePath = '';
-            state.pdfOptionsPath = '';
-            elements.pdfStylePath.value = '';
-            elements.pdfOptionsPath.value = '';
-            localStorage.removeItem(STORAGE_KEYS.PDF_STYLE_PATH);
-            localStorage.removeItem(STORAGE_KEYS.PDF_OPTIONS_PATH);
-            const oldStyle = document.getElementById(this.scopedCssId);
-            if (oldStyle) oldStyle.remove();
-            TabManager.renderActive();
-            elements.statusText.textContent = 'PDF style cleared';
-            setTimeout(() => { elements.statusText.textContent = 'Connected'; }, 1600);
-        },
-
-        async loadPreviewCss() {
-            const oldStyle = document.getElementById(this.scopedCssId);
-            if (oldStyle) oldStyle.remove();
-            if (!state.pdfStylePath) return;
-
-            try {
-                const response = await fetch(`/raw/${state.pdfStylePath}`);
-                if (!response.ok) throw new Error('CSS file not found');
-                const cssText = await response.text();
-                const style = document.createElement('style');
-                style.id = this.scopedCssId;
-                style.textContent = this.scopeCss(cssText);
-                document.head.appendChild(style);
-                elements.statusText.textContent = 'PDF style applied';
-                setTimeout(() => { elements.statusText.textContent = 'Connected'; }, 1600);
-            } catch (error) {
-                console.error('PDF style preview error:', error);
-                elements.statusText.textContent = 'PDF style failed';
-                setTimeout(() => { elements.statusText.textContent = 'Connected'; }, 2500);
-            }
-        },
-
-        scopeCss(cssText) {
-            const scope = '.markdown-body.pdf-style-preview';
-            const withoutComments = cssText.replace(/\/\*[\s\S]*?\*\//g, '');
-            return withoutComments.replace(/([^{}]+)\{/g, (match, selectorText) => {
-                const selectors = selectorText.trim();
-                if (!selectors || selectors.startsWith('@')) return match;
-                const scopedSelectors = selectors.split(',').map((selector) => {
-                    const trimmed = selector.trim();
-                    if (trimmed === ':root' || trimmed === 'body') return scope;
-                    if (trimmed.startsWith(scope)) return trimmed;
-                    return `${scope} ${trimmed}`;
-                });
-                return `${scopedSelectors.join(', ')} {`;
-            });
-        }
-    };
-
     // ============================================================
     // Sidebar Management
     // ============================================================
@@ -880,9 +771,7 @@
         render(htmlContent, fileType) {
             const containerClass = fileType === 'code'
                 ? 'markdown-body code-view-container'
-                : fileType === 'markdown'
-                    ? 'markdown-body pdf-style-preview'
-                    : 'markdown-body';
+                : 'markdown-body';
             elements.content.innerHTML = `<div class="${containerClass}">${htmlContent}</div>`;
 
             elements.content.querySelectorAll('pre code').forEach(block => {
@@ -1709,8 +1598,6 @@
                 await this.exportPdf(tab.path);
             } else if (this.isHtmlPreview()) {
                 this.printHtmlPreview(tab.name);
-            } else if (tab.fileType === 'markdown') {
-                await this.exportPdf(tab.path);
             } else {
                 this.browserPrint(tab.name);
             }
@@ -1738,9 +1625,8 @@
 
             try {
                 statusText.textContent = 'Generating PDF...';
-                const exportOptions = PdfStyleManager.getExportOptions();
 
-                const response = await MDVApi.exportPdf({ filePath, ...exportOptions });
+                const response = await MDVApi.exportPdf({ filePath });
 
                 if (!response.ok) {
                     const error = await response.json();
@@ -2366,7 +2252,6 @@
     async function init() {
         // Initialize all managers
         ThemeManager.init();
-        PdfStyleManager.init();
         SidebarManager.init();
         ResizeHandler.init();
         EditorManager.init();

package/src/static/index.html

@@ -95,13 +95,6 @@
                     PDF
                 </button>
 
-                <button class="toolbar-btn" id="pdfStyleToggle" title="PDF style settings" aria-label="PDF style settings">
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" />
-                    </svg>
-                    Style
-                </button>
-
                 <div class="toolbar-spacer"></div>
 
                 <span class="editor-status" id="editorStatus" style="display: none;">Ready</span>
@@ -117,19 +110,6 @@
                 </div>
             </div>
 
-            <div class="pdf-style-panel hidden" id="pdfStylePanel">
-                <label>
-                    <span>CSS</span>
-                    <input type="text" id="pdfStylePath" placeholder="src/styles/report.example.css">
-                </label>
-                <label>
-                    <span>PDF options</span>
-                    <input type="text" id="pdfOptionsPath" placeholder="src/styles/report.pdf-options.example.json">
-                </label>
-                <button class="toolbar-btn" id="pdfStyleApply">Apply</button>
-                <button class="toolbar-btn" id="pdfStyleClear">Clear</button>
-            </div>
-
             <!-- Tab bar -->
             <div class="tab-bar" id="tabBar" role="tablist" aria-label="Open files"></div>
 

package/src/static/styles.css

@@ -241,40 +241,6 @@ body {
 
 .toolbar-spacer { flex: 1; }
 
-.pdf-style-panel {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    padding: 8px 16px;
-    border-bottom: 1px solid var(--border);
-    background: var(--bg-secondary);
-}
-
-.pdf-style-panel label {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    min-width: 0;
-    color: var(--text-secondary);
-    font-size: 12px;
-}
-
-.pdf-style-panel input {
-    width: min(34vw, 360px);
-    min-width: 160px;
-    padding: 6px 8px;
-    background: var(--bg-primary);
-    border: 1px solid var(--border);
-    border-radius: 6px;
-    color: var(--text-primary);
-    font-size: 12px;
-}
-
-.pdf-style-panel input:focus {
-    border-color: var(--accent);
-    outline: none;
-}
-
 .status {
     display: flex;
     align-items: center;