mdv-live 0.5.8 → 0.5.9

package/CHANGELOG.md

@@ -5,6 +5,28 @@ 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.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.9",
   "description": "Markdown Viewer - File tree + Live preview + Marp support + Hot reload",
   "main": "src/server.js",
   "bin": {
@@ -45,16 +45,17 @@
     "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",
+    "md-to-pdf": "^5.2.5",
     "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,5 +1,4 @@
-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';
@@ -9,19 +8,55 @@ import { isMarp } from '../rendering/markdown.js';
 import { validatePath, validatePathReal } from '../utils/path.js';
 import { resolvePdfOptions } from '../styles/index.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)),
-  '..',
-  '..',
-  'node_modules',
-  '.bin',
-  'marp'
-);
+const binDir = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', '..', 'node_modules', '.bin');
+const marpBin = path.join(binDir, 'marp');
+const mdToPdfBin = path.join(binDir, 'md-to-pdf');
 const PDF_EXPORT_TIMEOUT_MS = 180000;
 
+/**
+ * Spawn a PDF tool with stdin closed.
+ *
+ * 注意: execFile は stdio オプションを受け付けない (Node 仕様)。md-to-pdf は
+ * 内部で get-stdin を呼ぶため、stdin が pipe のままだと EOF を永遠に待ち続けて
+ * ハングする。spawn で stdin を 'ignore' (= /dev/null) に明示的に縛る。
+ */
+function runPdfTool(bin, args, { cwd } = {}) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(bin, args, {
+      cwd,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', (chunk) => { stdout += chunk.toString(); });
+    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({ stdout, stderr });
+      } else {
+        const err = new Error(`${path.basename(bin)} exited with code=${code} signal=${signal}`);
+        err.code = code;
+        err.signal = signal;
+        err.stdout = stdout;
+        err.stderr = stderr;
+        reject(err);
+      }
+    });
+  });
+}
+
 /**
  * Resolve an optional user-selected file path under the server root.
  * @param {string | undefined} relativePath - Path supplied by the web UI.
@@ -51,7 +86,7 @@ async function resolveOptionalUserFile(relativePath, rootDir) {
  */
 async function exportMarkdownPdf(inputPath, outputPath, stylesheetPath, pdfOptionsPath) {
   const pdfOptions = await resolvePdfOptions(pdfOptionsPath || undefined);
-  const args = ['md-to-pdf', inputPath, '--pdf-options', JSON.stringify(pdfOptions)];
+  const args = [inputPath, '--pdf-options', JSON.stringify(pdfOptions)];
 
   if (stylesheetPath) {
     args.push('--stylesheet', highlightStylesheet);
@@ -59,10 +94,7 @@ async function exportMarkdownPdf(inputPath, outputPath, stylesheetPath, pdfOptio
     args.push('--highlight-style', 'atom-one-dark');
   }
 
-  await execFileAsync('npx', args, {
-    cwd: path.dirname(inputPath),
-    timeout: PDF_EXPORT_TIMEOUT_MS,
-  });
+  await runPdfTool(mdToPdfBin, args, { cwd: path.dirname(inputPath) });
 
   const generatedPdf = inputPath.replace(/\.(md|markdown)$/i, '.pdf');
   await fs.rename(generatedPdf, outputPath);
@@ -102,7 +134,7 @@ export function setupPdfRoutes(app) {
     try {
       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 });
+        await runPdfTool(marpBin, [fullPath, '-o', outputPath, '--html', '--allow-local-files', '--no-stdin']);
       } else {
         const [stylesheetPath, resolvedPdfOptionsPath] = await Promise.all([
           resolveOptionalUserFile(stylePath, rootDir),