@vint.tri/report_gen_mcp 1.5.28 → 1.5.30

package/dist/index.js

@@ -109,7 +109,7 @@ if (process.argv.length === 2) {
     // No command specified, run in stdio mode using MCP SDK
     const mcpServer = new McpServer({
         name: "report_gen_mcp",
-        version: "1.5.28"
+        version: "1.5.30"
     }, {
         // Disable health check to prevent automatic calls
         capabilities: {
@@ -121,10 +121,18 @@ if (process.argv.length === 2) {
         inputSchema: simpleReportTool.inputSchema,
     }, async (args) => {
         const result = await simpleReportTool.action(args);
-        // Modify the resource URI to be a localhost URL
-        if (result.content[0].type === 'resource') {
-            const fileName = path.basename(new URL(result.content[0].resource.uri).pathname);
-            result.content[0].resource.uri = `http://localhost:${serverPort}/reports/${fileName}`;
+        // Find the file path from the results to construct the HTTP URL
+        const localPathResource = result.content.find(c => c.resource.uri.endsWith('.html'));
+        if (localPathResource) {
+            const fileName = path.basename(localPathResource.resource.uri);
+            const httpUrl = `http://localhost:${serverPort}/reports/${fileName}`;
+            // Find the resource with the file:/// URL and update its text
+            const fileUrlResource = result.content.find(c => c.resource.uri.startsWith('file:///'));
+            if (fileUrlResource) {
+                fileUrlResource.resource.text = `File saved at: ${localPathResource.resource.uri}\nHTTP server available at: ${httpUrl}`;
+                // Also update the URI of this resource to be the http URL
+                fileUrlResource.resource.uri = httpUrl;
+            }
         }
         return result;
     });

package/dist/tools/simpleReport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleReport.d.ts","sourceRoot":"","sources":["../../src/tools/simpleReport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gBAAgB;;;;;;;mBAON;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;iBAajC;YAAE,IAAI,EAAE,UAAU,CAAC;YAAC,QAAQ,EAAE;gBAAE,GAAG,EAAE,MAAM,CAAC;gBAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,EAAE;;CAa7F,CAAC"}
+{"version":3,"file":"simpleReport.d.ts","sourceRoot":"","sources":["../../src/tools/simpleReport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,gBAAgB;;;;;;;mBAON;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;;;;;;;;;CAmC/D,CAAC"}

package/dist/tools/simpleReport.js

@@ -21,15 +21,24 @@ export const simpleReportTool = {
         const result = await generateReport(document, outputPath);
         const fileUrl = pathToFileURL(result.filePath).href;
         const fileContent = await fs.readFile(result.filePath, 'utf8');
+        // The http path will be constructed by the caller in index.ts,
+        // but we can provide the file and fileURL paths here.
         const response = {
             content: [
                 {
                     type: 'resource',
                     resource: {
-                        uri: fileUrl,
-                        text: fileContent,
+                        uri: fileUrl, // file:///...
+                        text: `File saved at: ${result.filePath}\nHTTP server available at (this will be filled in by the MCP server):`,
                     },
                 },
+                {
+                    type: 'resource',
+                    resource: {
+                        uri: result.filePath, // local path
+                        text: fileContent,
+                    }
+                }
             ],
         };
         return response;

package/dist/utils/reportGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"AAuIA,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,EAAE,uDAAuD;AACjF,UAAU,EAAE,MAAM;;;GA4InB"}
+{"version":3,"file":"reportGenerator.d.ts","sourceRoot":"","sources":["../../src/utils/reportGenerator.ts"],"names":[],"mappings":"AAmKA,wBAAsB,cAAc,CAClC,gBAAgB,EAAE,MAAM,EAAE,uDAAuD;AACjF,UAAU,EAAE,MAAM;;;GA4InB"}

package/dist/utils/reportGenerator.js

@@ -14,24 +14,45 @@ async function extractElementsFromMarkdown(markdown) {
     console.log("Starting extractElementsFromMarkdown...");
     const elements = {};
     let elementCount = 0;
-    // Regex to find <canvas data-chart="...">
-    const chartRegex = /<canvas\s+data-chart="([^"]*)"[^>]*>/g;
-    let chartMatch;
-    while ((chartMatch = chartRegex.exec(markdown)) !== null) {
-        const chartConfigJson = chartMatch[1];
-        try {
-            const config = JSON.parse(chartConfigJson);
-            if (config && typeof config === 'object' && config.type) {
-                const id = `chart-${elementCount++}`;
-                elements[id] = { type: config.type, config: config };
-                console.log(`Extracted chart: ${id}, type: ${config.type}`);
-                // Replace the original canvas tag with a placeholder
-                markdown = markdown.replace(chartMatch[0], `[[chart:${id}]]`);
+    // Regex to find <canvas> and its corresponding chart script
+    const chartBlockRegex = /(<canvas\s+id="([^"]+)"[^>]*>[\s\S]*?<\/canvas>)\s*<script>([\s\S]*?)<\/script>/gs;
+    let chartBlockMatch;
+    while ((chartBlockMatch = chartBlockRegex.exec(markdown)) !== null) {
+        const canvasTag = chartBlockMatch[1];
+        const canvasId = chartBlockMatch[2];
+        const scriptContent = chartBlockMatch[3];
+        // Extract the 'new Chart' part
+        const newChartRegex = /new\s+Chart\((?:[^,]+),\s*({[\s\S]+})\s*\);/m;
+        const chartConfigMatch = newChartRegex.exec(scriptContent);
+        if (chartConfigMatch) {
+            const chartConfigStr = chartConfigMatch[1];
+            try {
+                // A bit of a hack to make it valid JSON
+                const correctedConfigStr = chartConfigStr
+                    .replace(/(['"])?([a-zA-Z0-9_]+)(['"])?:/g, '"$2":') // Quote keys
+                    .replace(/'/g, '"'); // Replace single quotes with double quotes
+                // It's not perfect JSON, so we need to do some creative parsing
+                const typeMatch = /type:\s*"([^"]+)"/.exec(correctedConfigStr);
+                const dataMatch = /data:\s*({[\s\S]*?})/.exec(correctedConfigStr);
+                if (typeMatch && dataMatch) {
+                    const type = typeMatch[1];
+                    // This is still not perfect, we might need a proper JS parser.
+                    // For now, let's assume the data block is reasonably well-formed.
+                    // A safer approach would be to use a library that can parse JS objects.
+                    // Let's try to make it valid JSON before parsing.
+                    const dataObjStr = dataMatch[1].replace(/'/g, '"').replace(/([a-zA-Z0-9]+):/g, '"$1":');
+                    // This is a simplified extraction. A robust solution would need a more powerful parser.
+                    const data = JSON.parse(dataObjStr);
+                    const id = `chart-${elementCount++}`;
+                    elements[id] = { type: type, config: { ...data, type } };
+                    console.log(`Extracted chart: ${id}, type: ${type}`);
+                    // Replace the whole block (canvas + script) with a placeholder
+                    markdown = markdown.replace(chartBlockMatch[0], `[[chart:${id}]]`);
+                }
+            }
+            catch (e) {
+                console.error(`Error parsing chart config from script: ${scriptContent}`, e);
             }
-        }
-        catch (e) {
-            console.error(`Error parsing chart config: ${chartConfigJson}`, e);
-            // Continue without adding this chart if parsing fails
         }
     }
     // Regex to find <img src="..." alt="...">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vint.tri/report_gen_mcp",
-  "version": "1.5.28",
+  "version": "1.5.30",
   "description": "CLI tool for generating HTML reports with embedded charts and images",
   "main": "dist/index.js",
   "bin": {

package/test_fixed_report.js

@@ -1,56 +1,96 @@
-import { spawn } from 'child_process';
+import { Mcp } from '@modelcontextprotocol/sdk';
 import fs from 'fs';
+import path from 'path';
 
-// Read the fixed configuration
-const config = JSON.parse(fs.readFileSync('./dollar_rate_report_fixed.json', 'utf8'));
-
-// Set the reports directory
-process.env.REPORTS_DIR = './test_reports';
-
-// Spawn the report generator in stdio mode
-const child = spawn('node', ['dist/index.js']);
-
-// Listen for data from the child process
-child.stdout.on('data', (data) => {
-  console.log(`stdout: ${data}`);
-});
-
-child.stderr.on('data', (data) => {
-  console.error(`stderr: ${data}`);
-});
-
-child.on('close', (code) => {
-  console.log(`child process exited with code ${code}`);
-});
-
-// Send the MCP initialize message
-const initializeMessage = {
-  jsonrpc: "2.0",
-  id: 1,
-  method: "initialize",
-  params: {
-    protocolVersion: "2024-08-07",
-    capabilities: {},
-    clientInfo: {
-      name: "test-client",
-      version: "1.0.0"
-    }
-  }
-};
-
-child.stdin.write(JSON.stringify(initializeMessage) + '\n');
-
-// Send the tool call message
-const toolCallMessage = {
-  jsonrpc: "2.0",
-  id: 2,
-  method: "tools/call",
-  params: {
-    name: "generate-report",
-    arguments: config
+async function testGenerateReport() {
+  const mcp = new Mcp();
+  const reportContent = `
+# Отчёт о прибылях Apple за 2024 год
+
+<img src="https://www.apple.com/ac/structured-data/images/knowledge_graph_logo.png?202306160250" alt="Логотип Apple" style="display: block; margin: 0 auto; width: 200px; border-radius: 12px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);" />
+
+## Общее описание
+
+В данном отчёте представлены ключевые финансовые показатели компании Apple за 2024 год. Данные включают выручку, чистую прибыль, распределение доходов по регионам и основным продуктам. Отчёт содержит интерактивные графики для наглядного анализа динамики показателей.
+
+## Выручка по кварталам
+
+<canvas id="revenueChart" width="400" height="200">Ваш браузер не поддерживает элемент canvas.</canvas>
+
+## Чистая прибыль по кварталам
+
+<canvas id="profitChart" width="400" height="200">Ваш браузер не поддерживает элемент canvas.</canvas>
+
+## Распределение прибыли по регионам
+
+<canvas id="regionChart" width="400" height="200">Ваш браузер не поддерживает элемент canvas.</canvas>
+
+## Заключение
+
+Apple продолжает демонстрировать устойчивый рост в 2024 году, несмотря на глобальную экономическую нестабильность. Наибольший вклад в прибыль внесли рынки США и Китая, а также продукты линейки iPhone и Services. Компания укрепляет позиции в сегменте услуг, где маржа прибыли остаётся одной из самых высоких.
+
+<script>
+  // График выручки по кварталам
+  const revenueCtx = document.getElementById('revenueChart').getContext('2d');
+  new Chart(revenueCtx, {
+    type: 'bar',
+    data: {
+      labels: ['Q1', 'Q2', 'Q3', 'Q4'],
+      datasets: [{
+        label: 'Выручка (млрд $)',
+        data: [119.2, 90.8, 81.8, 96.4],
+        backgroundColor: 'rgba(0, 122, 255, 0.7)'
+      }]
+    },
+    options: { responsive: true, plugins: { legend: { position: 'top'   }
+  }});
+
+  // График чистой прибыли
+  const profitCtx = document.getElementById('profitChart').getContext('2d');
+  new Chart(profitCtx, {
+    type: 'line',
+    data: {
+      labels: ['Q1', 'Q2', 'Q3', 'Q4'],
+      datasets: [{
+        label: 'Чистая прибыль (млрд $)',
+        data: [28.5, 23.6, 19.8, 25.2],
+        borderColor: 'rgba(45, 206, 137, 1)',
+        fill: false
+      }]
+    },
+    options: { responsive: true, plugins: { legend: { position: 'top'   }
+  }});
+
+  // Круговая диаграмма по регионам
+  const regionCtx = document.getElementById('regionChart').getContext('2d');
+  new Chart(regionCtx, {
+    type: 'pie',
+    data: {
+      labels: ['США', 'Китай', 'Европа', 'Остальной мир'],
+      datasets: [{
+        data: [42, 28, 18, 12],
+        backgroundColor: [
+          'rgba(0, 122, 255, 0.8)',
+          'rgba(255, 149, 0, 0.8)',
+          'rgba(52, 199, 89, 0.8)',
+          'rgba(255, 59, 48, 0.8)'
+        ]
+      }]
+    },
+    options: { responsive: true, plugins: { legend: { position: 'right'   }
+  }});
+</script>
+`;
+
+  try {
+    const result = await mcp.tool.report_gen_mcp['generate-report']({
+      document: reportContent,
+      outputFile: 'test_report_fixed.html'
+    });
+    console.log(JSON.stringify(result, null, 2));
+  } catch (error) {
+    console.error('Error calling generate-report tool:', error);
   }
-};
+}
 
-setTimeout(() => {
-  child.stdin.write(JSON.stringify(toolCallMessage) + '\n');
-}, 1000);
+testGenerateReport();