@aiquants/html-to-markdown 0.2.6 → 0.4.0

package/dist/{mcp-server-streamable-3B3B1fuS.js → mcp-server-streamable-CcZ7Lsel.js}

@@ -1,10 +1,8 @@
-import { J as JSONRPCMessageSchema, i as isInitializeRequest, a as isJSONRPCRequest, D as DEFAULT_NEGOTIATED_PROTOCOL_VERSION, b as SUPPORTED_PROTOCOL_VERSIONS, c as isJSONRPCResponse, d as isJSONRPCError, g as getPackageVersion, S as Server, I as InitializeRequestSchema, L as ListToolsRequestSchema, C as CallToolRequestSchema } from "./version-PCzxchJe.js";
+import { J as JSONRPCMessageSchema, i as isInitializeRequest, e as isJSONRPCRequest, D as DEFAULT_NEGOTIATED_PROTOCOL_VERSION, f as SUPPORTED_PROTOCOL_VERSIONS, h as isJSONRPCResponse, j as isJSONRPCError, g as getPackageVersion, S as Server, I as InitializeRequestSchema, L as ListToolsRequestSchema, C as CallToolRequestSchema, p as parseHtmlToMarkdownArgs, b as parseSaveContentArgs, s as saveContentToFile, d as parseUrlToMarkdownFileArgs } from "./version-BSh9aXhF.js";
 import { a as getAugmentedNamespace, c as commonjsGlobal, b as getDefaultExportFromCjs, h as htmlToMarkdown } from "./core-CouDTni-.js";
 import { randomUUID } from "node:crypto";
 import cors from "cors";
 import express from "express";
-import { promises } from "fs";
-import { join, resolve, dirname } from "path";
 import yargsParser from "yargs-parser";
 var bytes = { exports: {} };
 /*!
@@ -6418,10 +6416,10 @@ function requireRawBody() {
     if (done) {
       return readStream(stream, encoding, length, limit, wrap(done));
     }
-    return new Promise(function executor(resolve2, reject) {
+    return new Promise(function executor(resolve, reject) {
       readStream(stream, encoding, length, limit, function onRead(err, buf) {
         if (err) return reject(err);
-        resolve2(buf);
+        resolve(buf);
       });
     });
   }
@@ -7159,41 +7157,6 @@ class StreamableHTTPServerTransport {
     }
   }
 }
-function generateFilename(url, outputFormat) {
-  if (url && url !== "direct-html-input") {
-    try {
-      const urlObj = new URL(url);
-      let filename = urlObj.pathname.split("/").pop() || "page";
-      filename = filename.replace(/\.[^.]*$/, "");
-      filename = filename.replace(/[<>:"/\\|?*]/g, "_");
-      if (!filename || filename.match(/^\.+$/)) {
-        filename = "page";
-      }
-      return filename;
-    } catch {
-      return "page";
-    }
-  }
-  return "page";
-}
-async function saveContentToFile(content, savePath, saveDirectory, url, outputFormat) {
-  if (!savePath && !saveDirectory) {
-    return null;
-  }
-  let finalPath;
-  if (savePath) {
-    finalPath = resolve(savePath);
-  } else if (saveDirectory) {
-    const filename = generateFilename(url);
-    const extension = outputFormat === "html" ? ".html" : ".md";
-    finalPath = resolve(saveDirectory, `${filename}${extension}`);
-  } else {
-    return null;
-  }
-  await promises.mkdir(dirname(finalPath), { recursive: true });
-  await promises.writeFile(finalPath, content, "utf-8");
-  return finalPath;
-}
 class StreamableHtmlToMarkdownMcpServer {
   constructor() {
     this.version = getPackageVersion();
@@ -7213,46 +7176,96 @@ class StreamableHtmlToMarkdownMcpServer {
       sessionIdGenerator: void 0
       // Stateless server
     });
-    const toolParameters = {
-      type: "object",
-      properties: {
-        url: {
-          type: "string",
-          description: "URL of the web page to convert (e.g., https://example.com). Handles JavaScript-rendered dynamic content effectively."
-        },
-        html_content: {
-          type: "string",
-          description: "HTML string to convert directly. Use instead of URL for local files or API response HTML content."
-        },
-        locale: {
-          type: "string",
-          description: "Browser locale setting. Use 'ja-JP' for Japanese sites, 'en-US' for English sites. Affects content rendering and language detection.",
-          enum: ["en-US", "ja-JP"],
-          default: "en-US"
-        },
-        output_format: {
-          type: "string",
-          description: "Output format: 'markdown' (Markdown only), 'html' (original HTML only), 'both' (returns both formats).",
-          enum: ["markdown", "html", "both"],
-          default: "markdown"
-        },
-        save_path: {
-          type: "string",
-          description: "Complete file path including filename to save converted content (e.g., '/home/user/output.md'). Cannot be used with save_directory."
-        },
-        save_directory: {
-          type: "string",
-          description: "Directory path to save converted content with auto-generated filename (e.g., '/home/user/downloads'). Cannot be used with save_path."
-        }
-      },
-      anyOf: [{ required: ["url"] }, { required: ["html_content"] }]
-    };
     this.tools = [
       {
         name: "html_to_markdown_streamable",
         description: "Streamable HTML to Markdown converter with real-time progress updates. Ideal for large pages and time-consuming conversions with JavaScript dynamic content support.",
-        inputSchema: toolParameters,
+        inputSchema: {
+          type: "object",
+          properties: {
+            url: {
+              type: "string",
+              description: "URL of the web page to convert (e.g., https://example.com). Handles JavaScript-rendered dynamic content effectively."
+            },
+            html_content: {
+              type: "string",
+              description: "HTML string to convert directly. Use instead of URL for local files or API response HTML content."
+            },
+            locale: {
+              type: "string",
+              description: "Browser locale setting. Use 'ja-JP' for Japanese sites, 'en-US' for English sites. Affects content rendering and language detection.",
+              enum: ["en-US", "ja-JP"],
+              default: "en-US"
+            }
+          },
+          anyOf: [{ required: ["url"] }, { required: ["html_content"] }]
+        },
         handler: (args, context) => this.handleHtmlToMarkdown(args, context)
+      },
+      {
+        name: "save_content_to_file",
+        description: "Save text content to a file with specified path or directory. Supports automatic filename generation. Content will be saved as Markdown format.",
+        inputSchema: {
+          type: "object",
+          properties: {
+            content: {
+              type: "string",
+              description: "Text content to save to file. Will be saved as Markdown format."
+            },
+            save_path: {
+              type: "string",
+              description: "Complete file path including filename to save content (e.g., '/home/user/output.md'). Cannot be used with save_directory."
+            },
+            save_directory: {
+              type: "string",
+              description: "Directory path to save content with auto-generated filename (e.g., '/home/user/downloads'). Cannot be used with save_path."
+            },
+            filename: {
+              type: "string",
+              description: "Base filename to use when save_directory is specified (e.g., 'my-document'). Extension .md will be added automatically."
+            }
+          },
+          required: ["content"],
+          anyOf: [{ required: ["save_path"] }, { required: ["save_directory"] }]
+        },
+        handler: (args, context) => this.handleSaveContentToFile(args, context)
+      },
+      {
+        name: "url_to_markdown_file_streamable",
+        description: "Streamable URL to Markdown file converter with real-time progress updates. Combines HTML-to-Markdown conversion and file saving in one step. Ideal for large pages with JavaScript dynamic content support.",
+        inputSchema: {
+          type: "object",
+          properties: {
+            url: {
+              type: "string",
+              description: "URL of the web page to convert and save as Markdown file (e.g., https://example.com). Handles JavaScript-rendered dynamic content effectively."
+            },
+            html_content: {
+              type: "string",
+              description: "HTML string to convert directly and save as Markdown file. Use instead of URL for local files or API response HTML content."
+            },
+            locale: {
+              type: "string",
+              description: "Browser locale setting. Use 'ja-JP' for Japanese sites, 'en-US' for English sites. Affects content rendering and language detection.",
+              enum: ["en-US", "ja-JP"],
+              default: "en-US"
+            },
+            save_path: {
+              type: "string",
+              description: "Complete file path including filename to save the converted Markdown content (e.g., '/home/user/output.md'). Cannot be used with save_directory."
+            },
+            save_directory: {
+              type: "string",
+              description: "Directory path to save the converted Markdown content with auto-generated filename (e.g., '/home/user/downloads'). Cannot be used with save_path."
+            },
+            filename: {
+              type: "string",
+              description: "Base filename to use when save_directory is specified (e.g., 'my-document'). Extension .md will be added automatically."
+            }
+          },
+          anyOf: [{ required: ["url", "save_path"] }, { required: ["url", "save_directory"] }, { required: ["html_content", "save_path"] }, { required: ["html_content", "save_directory"] }]
+        },
+        handler: (args, context) => this.handleUrlToMarkdownFile(args, context)
       }
     ];
     this.setupRequestHandlers();
@@ -7339,19 +7352,8 @@ class StreamableHtmlToMarkdownMcpServer {
    */
   async *handleHtmlToMarkdown(args, _context) {
     try {
-      const { url, html_content, locale = "en-US", output_format = "markdown", save_path, save_directory } = args;
-      if (!url && !html_content) {
-        throw new Error("url または html_content のいずれかを提供する必要があります。");
-      }
-      if (save_path && typeof save_path !== "string") {
-        throw new Error("'save_path' must be a string");
-      }
-      if (save_directory && typeof save_directory !== "string") {
-        throw new Error("'save_directory' must be a string");
-      }
-      if (save_path && save_directory) {
-        throw new Error("Cannot specify both 'save_path' and 'save_directory'");
-      }
+      const validatedArgs = parseHtmlToMarkdownArgs(args);
+      const { url, html_content, locale = "en-US" } = validatedArgs;
       if (url) {
         try {
           new URL(url);
@@ -7370,70 +7372,130 @@ class StreamableHtmlToMarkdownMcpServer {
       });
       yield {
         type: "progress",
-        progress: 50,
-        message: "変換が完了しました。ファイル保存を実行中..."
+        progress: 100,
+        message: "変換が完了しました。"
       };
-      const savedPaths = [];
-      if (save_path || save_directory) {
-        switch (output_format) {
-          case "markdown": {
-            const savedPath = await saveContentToFile(result.markdown, save_path, save_directory, url, "markdown");
-            if (savedPath) savedPaths.push(savedPath);
-            break;
-          }
-          case "html": {
-            const savedPath = await saveContentToFile(result.html, save_path, save_directory, url, "html");
-            if (savedPath) savedPaths.push(savedPath);
-            break;
-          }
-          case "both": {
-            const markdownPath = save_path ? save_path.endsWith(".md") ? save_path : `${save_path}.md` : save_directory ? join(save_directory, `${generateFilename(url)}.md`) : void 0;
-            if (markdownPath) {
-              const savedMarkdownPath = await saveContentToFile(result.markdown, markdownPath, void 0, url, "markdown");
-              if (savedMarkdownPath) savedPaths.push(savedMarkdownPath);
-            }
-            const htmlPath = save_path ? save_path.endsWith(".html") ? save_path : `${save_path}.html` : save_directory ? join(save_directory, `${generateFilename(url)}.html`) : void 0;
-            if (htmlPath) {
-              const savedHtmlPath = await saveContentToFile(result.html, htmlPath, void 0, url, "html");
-              if (savedHtmlPath) savedPaths.push(savedHtmlPath);
+      const responseText = result.markdown;
+      const content = [{ type: "text", text: responseText }];
+      yield {
+        type: "result",
+        result: { content }
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      yield {
+        type: "result",
+        result: {
+          content: [
+            {
+              type: "text",
+              text: `エラーが発生しました: ${errorMessage}`
             }
-            break;
-          }
+          ]
         }
-      }
+      };
+    }
+  }
+  /**
+   * Handle save content to file tool call with streamable support.
+   * streamable サポート付きのファイル保存ツール呼び出しを処理
+   */
+  async *handleSaveContentToFile(args, _context) {
+    try {
+      const validatedArgs = parseSaveContentArgs(args);
+      const { content, save_path, save_directory, filename } = validatedArgs;
+      yield {
+        type: "progress",
+        progress: 20,
+        message: "ファイル保存の準備中..."
+      };
+      const savedPath = await saveContentToFile(content, save_path, save_directory, filename);
       yield {
         type: "progress",
         progress: 100,
-        message: "処理が完了しました。"
+        message: "ファイル保存が完了しました。"
       };
-      let responseText = "";
-      switch (output_format) {
-        case "markdown":
-          responseText = result.markdown;
-          break;
-        case "html":
-          responseText = result.html;
-          break;
-        case "both":
-          responseText = `=== Markdown ===
-${result.markdown}
-
-=== HTML ===
-${result.html}`;
-          break;
-        default:
-          throw new Error(`Invalid output format: ${output_format}`);
+      const responseText = `Content saved successfully to: ${savedPath}`;
+      yield {
+        type: "result",
+        result: {
+          content: [
+            {
+              type: "text",
+              text: responseText
+            }
+          ],
+          isError: false
+        }
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      yield {
+        type: "result",
+        result: {
+          content: [
+            {
+              type: "text",
+              text: `エラーが発生しました: ${errorMessage}`
+            }
+          ],
+          isError: true
+        }
+      };
+    }
+  }
+  /**
+   * Handle URL to Markdown file conversion tool call with streamable support.
+   * streamable サポート付きの URL から Markdown ファイルへの変換ツール呼び出しを処理
+   */
+  async *handleUrlToMarkdownFile(args, _context) {
+    try {
+      const validatedArgs = parseUrlToMarkdownFileArgs(args);
+      const { url, html_content, locale = "en-US", save_path, save_directory, filename } = validatedArgs;
+      if (url) {
+        try {
+          new URL(url);
+        } catch {
+          throw new Error(`Invalid URL: ${url}`);
+        }
       }
-      if (savedPaths.length > 0) {
-        responseText += `
-
-=== Files Saved ===
-${savedPaths.map((path) => `- ${path}`).join("\n")}`;
+      yield {
+        type: "progress",
+        progress: 0,
+        message: "Web ページの内容を取得して Markdown に変換します。"
+      };
+      const result = await htmlToMarkdown(url || "direct-html-input", {
+        locale,
+        htmlContent: html_content
+      });
+      yield {
+        type: "progress",
+        progress: 70,
+        message: "Markdown への変換が完了しました。ファイルに保存しています。"
+      };
+      const markdownContent = result.markdown;
+      let finalFilename = filename;
+      if (!finalFilename && url) {
+        finalFilename = this.generateFilenameFromUrl(url);
       }
-      const content = [{ type: "text", text: responseText }];
+      const savedPath = await saveContentToFile(markdownContent, save_path, save_directory, finalFilename);
+      yield {
+        type: "progress",
+        progress: 100,
+        message: "ファイルの保存が完了しました。"
+      };
+      const responseText = `URL successfully converted to Markdown and saved to: ${savedPath}`;
       yield {
         type: "result",
-        result: { content }
+        result: {
+          content: [
+            {
+              type: "text",
+              text: responseText
+            }
+          ],
+          isError: false
+        }
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -7445,11 +7507,30 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
               type: "text",
               text: `エラーが発生しました: ${errorMessage}`
             }
-          ]
+          ],
+          isError: true
         }
       };
     }
   }
+  /**
+   * Generate filename from URL.
+   * URL からファイル名を生成
+   */
+  generateFilenameFromUrl(url) {
+    try {
+      const urlObj = new URL(url);
+      let filename = urlObj.pathname.split("/").pop() || "page";
+      filename = filename.replace(/\.[^.]*$/, "");
+      filename = filename.replace(/[<>:"/\\|?*]/g, "_");
+      if (!filename || filename.match(/^\.+$/)) {
+        filename = "page";
+      }
+      return filename;
+    } catch {
+      return "page";
+    }
+  }
   /**
    * Start the streamable MCP server.
    * streamable MCP サーバーを開始

package/dist/mcp-streamable.cjs

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-"use strict";require("./mcp-server-streamable-Cc4QsZQe.cjs").runStreamableMcpServer().catch(e=>{process.exit(1)});
+"use strict";require("./mcp-server-streamable-BNn6Kd9b.cjs").runStreamableMcpServer().catch(e=>{process.exit(1)});

package/dist/mcp-streamable.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as runStreamableMcpServer } from "./mcp-server-streamable-3B3B1fuS.js";
+import { r as runStreamableMcpServer } from "./mcp-server-streamable-CcZ7Lsel.js";
 runStreamableMcpServer().catch((error) => {
   console.error("Failed to start streamable MCP server:", error);
   process.exit(1);

package/dist/mcp.cjs

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-const e=new(require("happy-dom").Window);Object.assign(global,{document:e.document,window:e,self:e});require("./mcp-server-Bo_mCvzz.cjs").runMcpServer().catch(e=>{process.exit(1)});
+const e=new(require("happy-dom").Window);Object.assign(global,{document:e.document,window:e,self:e});require("./mcp-server-Co1kuNGX.cjs").runMcpServer().catch(e=>{process.exit(1)});

package/dist/mcp.js

@@ -6,7 +6,7 @@ Object.assign(global, {
   window,
   self: window
 });
-import { r as runMcpServer } from "./mcp-server-B8hz3lXI.js";
+import { r as runMcpServer } from "./mcp-server-DzB_5cTs.js";
 runMcpServer().catch((error) => {
   console.error("Failed to start MCP server:", error);
   process.exit(1);

package/dist/src/mcp-common.d.ts

@@ -0,0 +1,164 @@
+import { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+/**
+ * Arguments for HTML to Markdown conversion tool.
+ * HTML から Markdown への変換ツールの引数
+ */
+export interface HtmlToMarkdownArgs {
+    url?: string;
+    html_content?: string;
+    locale?: "en-US" | "ja-JP";
+}
+/**
+ * Arguments for file saving tool.
+ * ファイル保存ツールの引数
+ */
+export interface SaveContentArgs {
+    content: string;
+    save_path?: string;
+    save_directory?: string;
+    filename?: string;
+}
+/**
+ * Arguments for URL to Markdown file conversion tool.
+ * URL から Markdown ファイルへの変換ツールの引数
+ */
+export interface UrlToMarkdownFileArgs {
+    url?: string;
+    html_content?: string;
+    locale?: "en-US" | "ja-JP";
+    save_path?: string;
+    save_directory?: string;
+    filename?: string;
+}
+/**
+ * Validate and parse arguments for HTML to Markdown conversion.
+ * HTML から Markdown への変換の引数を検証・解析
+ */
+export declare function parseHtmlToMarkdownArgs(args: HtmlToMarkdownArgs | undefined): HtmlToMarkdownArgs;
+/**
+ * Validate and parse arguments for content saving.
+ * コンテンツ保存の引数を検証・解析
+ */
+export declare function parseSaveContentArgs(args: SaveContentArgs | undefined): SaveContentArgs;
+/**
+ * Validate and parse arguments for URL to Markdown file conversion.
+ * URL から Markdown ファイルへの変換の引数を検証・解析
+ */
+export declare function parseUrlToMarkdownFileArgs(args: UrlToMarkdownFileArgs | undefined): UrlToMarkdownFileArgs;
+/**
+ * Generate filename from URL or use default.
+ * URL からファイル名を生成または既定値を使用
+ */
+export declare function generateFilename(url?: string): string;
+/**
+ * Save content to file and return the saved path.
+ * コンテンツをファイルに保存し、保存したパスを返す
+ */
+export declare function saveContentToFile(content: string, savePath?: string, saveDirectory?: string, filename?: string): Promise<string>;
+/**
+ * Tool schema definitions for MCP servers.
+ * MCP サーバー用のツールスキーマ定義
+ */
+export declare const MCP_TOOL_SCHEMAS: {
+    htmlToMarkdown: {
+        readonly type: "object";
+        readonly properties: {
+            readonly url: {
+                readonly type: "string";
+                readonly description: "URL of the web page to convert (e.g., https://example.com). Handles JavaScript-rendered dynamic content effectively.";
+            };
+            readonly html_content: {
+                readonly type: "string";
+                readonly description: "HTML string to convert directly. Use instead of URL for local files or API response HTML content.";
+            };
+            readonly locale: {
+                readonly type: "string";
+                readonly description: "Browser locale setting. Use 'ja-JP' for Japanese sites, 'en-US' for English sites. Affects content rendering and language detection.";
+                readonly enum: readonly ["en-US", "ja-JP"];
+                readonly default: "en-US";
+            };
+        };
+        readonly anyOf: readonly [{
+            readonly required: readonly ["url"];
+        }, {
+            readonly required: readonly ["html_content"];
+        }];
+    };
+    saveContentToFile: {
+        readonly type: "object";
+        readonly properties: {
+            readonly content: {
+                readonly type: "string";
+                readonly description: "Text content to save to file. Will be saved as Markdown format.";
+            };
+            readonly save_path: {
+                readonly type: "string";
+                readonly description: "Complete file path including filename to save content (e.g., '/home/user/output.md'). Cannot be used with save_directory.";
+            };
+            readonly save_directory: {
+                readonly type: "string";
+                readonly description: "Directory path to save content with auto-generated filename (e.g., '/home/user/downloads'). Cannot be used with save_path.";
+            };
+            readonly filename: {
+                readonly type: "string";
+                readonly description: "Base filename to use when save_directory is specified (e.g., 'my-document'). Extension .md will be added automatically.";
+            };
+        };
+        readonly required: readonly ["content"];
+        readonly anyOf: readonly [{
+            readonly required: readonly ["save_path"];
+        }, {
+            readonly required: readonly ["save_directory"];
+        }];
+    };
+    urlToMarkdownFile: {
+        readonly type: "object";
+        readonly properties: {
+            readonly url: {
+                readonly type: "string";
+                readonly description: "URL of the web page to convert and save as Markdown file (e.g., https://example.com). Handles JavaScript-rendered dynamic content effectively.";
+            };
+            readonly html_content: {
+                readonly type: "string";
+                readonly description: "HTML string to convert directly and save as Markdown file. Use instead of URL for local files or API response HTML content.";
+            };
+            readonly locale: {
+                readonly type: "string";
+                readonly description: "Browser locale setting. Use 'ja-JP' for Japanese sites, 'en-US' for English sites. Affects content rendering and language detection.";
+                readonly enum: readonly ["en-US", "ja-JP"];
+                readonly default: "en-US";
+            };
+            readonly save_path: {
+                readonly type: "string";
+                readonly description: "Complete file path including filename to save the converted Markdown content (e.g., '/home/user/output.md'). Cannot be used with save_directory.";
+            };
+            readonly save_directory: {
+                readonly type: "string";
+                readonly description: "Directory path to save the converted Markdown content with auto-generated filename (e.g., '/home/user/downloads'). Cannot be used with save_path.";
+            };
+            readonly filename: {
+                readonly type: "string";
+                readonly description: "Base filename to use when save_directory is specified (e.g., 'my-document'). Extension .md will be added automatically.";
+            };
+        };
+        readonly anyOf: readonly [{
+            readonly required: readonly ["url", "save_path"];
+        }, {
+            readonly required: readonly ["url", "save_directory"];
+        }, {
+            readonly required: readonly ["html_content", "save_path"];
+        }, {
+            readonly required: readonly ["html_content", "save_directory"];
+        }];
+    };
+};
+/**
+ * Common error handling utility for MCP tools.
+ * MCP ツール用の共通エラーハンドリングユーティリティ
+ */
+export declare function createErrorResult(error: unknown): CallToolResult;
+/**
+ * Common success result utility for MCP tools.
+ * MCP ツール用の共通成功結果ユーティリティ
+ */
+export declare function createSuccessResult(text: string): CallToolResult;