@aiquants/html-to-markdown 0.2.5 → 0.3.0

package/dist/{mcp-server-streamable-BC-Qlr-9.js → mcp-server-streamable-CVDJHcWu.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-BXLLJx3Z.js";
-import { a as getAugmentedNamespace, c as commonjsGlobal, b as getDefaultExportFromCjs, h as htmlToMarkdown } from "./core-CFnkfU5N.js";
+import { J as JSONRPCMessageSchema, i as isInitializeRequest, d as isJSONRPCRequest, D as DEFAULT_NEGOTIATED_PROTOCOL_VERSION, e as SUPPORTED_PROTOCOL_VERSIONS, f as isJSONRPCResponse, h 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 } from "./version-BF9-U8Ef.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,59 @@ 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)
       }
     ];
     this.setupRequestHandlers();
@@ -7339,19 +7315,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 +7335,61 @@ 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}`);
-      }
-      if (savedPaths.length > 0) {
-        responseText += `
-
-=== Files Saved ===
-${savedPaths.map((path) => `- ${path}`).join("\n")}`;
-      }
-      const content = [{ type: "text", text: responseText }];
+      const responseText = `Content saved successfully 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,7 +7401,8 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
               type: "text",
               text: `エラーが発生しました: ${errorMessage}`
             }
-          ]
+          ],
+          isError: true
         }
       };
     }
@@ -7466,7 +7423,7 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
     app.use(express.json());
     await this.server.connect(this.transport);
     app.post("/mcp", async (req, res) => {
-      console.error("Received MCP request:", req.body);
+      console.info("Received MCP request:", req.body);
       try {
         res.setHeader("Content-Type", "application/json");
         const request = req.body;
@@ -7573,7 +7530,7 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
       }
     });
     app.get("/mcp", async (_req, res) => {
-      console.error("Received GET MCP request");
+      console.info("Received GET MCP request");
       res.writeHead(405).end(
         JSON.stringify({
           jsonrpc: "2.0",
@@ -7586,7 +7543,7 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
       );
     });
     app.delete("/mcp", async (_req, res) => {
-      console.error("Received DELETE MCP request");
+      console.info("Received DELETE MCP request");
       res.writeHead(405).end(
         JSON.stringify({
           jsonrpc: "2.0",
@@ -7599,19 +7556,19 @@ ${savedPaths.map((path) => `- ${path}`).join("\n")}`;
       );
     });
     const server = app.listen(port, host, () => {
-      console.error(`HTML to Markdown Streamable MCP server started on http://${host}:${port}/mcp`);
+      console.info(`HTML to Markdown Streamable MCP server started on http://${host}:${port}/mcp`);
     });
     process.on("SIGINT", async () => {
-      console.error("Shutting down server...");
+      console.info("Shutting down server...");
       try {
-        console.error("Closing transport");
+        console.info("Closing transport");
         await this.transport.close();
       } catch (error) {
         console.error("Error closing transport:", error);
       }
       await this.server.close();
       server.close(() => {
-        console.error("Server shutdown complete");
+        console.info("Server shutdown complete");
         process.exit(0);
       });
     });