mcp-3d-printer-server 1.2.2 → 1.2.5

package/src/printers/prusa.ts

@@ -11,13 +11,49 @@ type RequestCandidate = {
 export class PrusaImplementation extends PrinterImplementation {
   private buildAuthHeaders(apiKey: string): Record<string, string> {
     return {
+      Accept: "application/json",
       "X-Api-Key": apiKey,
       Authorization: `Bearer ${apiKey}`,
     };
   }
 
   private buildBaseUrl(host: string, port: string): string {
-    return `http://${host}:${port}`;
+    const trimmedHost = host.trim();
+    const trimmedPort = port.trim();
+    if (!trimmedHost) {
+      throw new Error("Prusa host is required.");
+    }
+
+    const rawBaseUrl = /^[a-z][a-z\d+.-]*:\/\//i.test(trimmedHost)
+      ? trimmedHost
+      : `${this.defaultProtocolFor(trimmedHost, trimmedPort)}://${trimmedHost}`;
+    const parsed = new URL(rawBaseUrl);
+
+    if (trimmedPort && !parsed.port && !this.isDefaultPort(parsed.protocol, trimmedPort)) {
+      parsed.port = trimmedPort;
+    }
+
+    return parsed.toString().replace(/\/$/, "");
+  }
+
+  private defaultProtocolFor(host: string, port: string): "http" | "https" {
+    if (port === "443" || this.isPrusaConnectCloudHost(host)) {
+      return "https";
+    }
+    return "http";
+  }
+
+  private isDefaultPort(protocol: string, port: string): boolean {
+    return (protocol === "https:" && port === "443") || (protocol === "http:" && port === "80");
+  }
+
+  private isPrusaConnectCloudHost(host: string): boolean {
+    try {
+      const parsed = new URL(/^[a-z][a-z\d+.-]*:\/\//i.test(host) ? host : `https://${host}`);
+      return parsed.hostname.toLowerCase() === "connect.prusa3d.com";
+    } catch {
+      return host.toLowerCase().split(":")[0] === "connect.prusa3d.com";
+    }
   }
 
   private isFallbackStatus(error: unknown): boolean {
@@ -86,6 +122,7 @@ export class PrusaImplementation extends PrinterImplementation {
 
   async getStatus(host: string, port: string, apiKey: string) {
     const response = await this.getWithFallback(host, port, apiKey, [
+      "/api/v1/status",
       "/api/v1/printer",
       "/api/printer",
     ]);

package/src/sse-server.ts

@@ -1,409 +1,9 @@
 #!/usr/bin/env node
 
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
-import express, { Request, Response } from 'express';
-import cors from 'cors';
-import { v4 as uuidv4 } from 'uuid';
-import { Readable } from 'stream';
-import {
-  ListResourcesRequestSchema,
-  ReadResourceRequestSchema,
-  ListToolsRequestSchema,
-  CallToolRequestSchema,
-  ErrorCode,
-  McpError
-} from "@modelcontextprotocol/sdk/types.js";
-import axios from "axios";
-import dotenv from "dotenv";
-import fs from "fs";
-import path from "path";
-import * as THREE from 'three';
-import { PrinterFactory } from "./printers/printer-factory.js";
-import { STLManipulator } from "./stl/stl-manipulator.js";
-import { parse3MF, ThreeMFData } from './3mf_parser.js';
-import { BambuImplementation } from "./printers/bambu.js";
+process.env.MCP_TRANSPORT ??= "streamable-http";
 
-// Load environment variables from .env file
-dotenv.config();
-
-// Default values
-const DEFAULT_HOST = process.env.PRINTER_HOST || "localhost";
-const DEFAULT_PORT = process.env.PRINTER_PORT || "80";
-const DEFAULT_API_KEY = process.env.API_KEY || "";
-const DEFAULT_TYPE = process.env.PRINTER_TYPE || "octoprint";
-const TEMP_DIR = process.env.TEMP_DIR || path.join(process.cwd(), "temp");
-
-// SSE Server configuration
-const SSE_PORT = parseInt(process.env.SSE_PORT || "3000");
-
-// Slicer configuration
-const DEFAULT_SLICER_TYPE = process.env.SLICER_TYPE || "prusaslicer";
-const DEFAULT_SLICER_PATH = process.env.SLICER_PATH || "";
-const DEFAULT_SLICER_PROFILE = process.env.SLICER_PROFILE || "";
-
-// Bambu-specific default values
-const DEFAULT_BAMBU_SERIAL = process.env.BAMBU_SERIAL || "";
-const DEFAULT_BAMBU_TOKEN = process.env.BAMBU_TOKEN || "";
-
-// Ensure temp directory exists
-if (!fs.existsSync(TEMP_DIR)) {
-  fs.mkdirSync(TEMP_DIR, { recursive: true });
-}
-
-class ThreeDPrinterMCPServerSSE {
-  private server: Server;
-  private printerFactory: PrinterFactory;
-  private stlManipulator: STLManipulator;
-  private app: express.Application;
-  private sessions: Map<string, { transport: SSEServerTransport, lastActivity: number }> = new Map();
-
-  constructor() {
-    this.server = new Server(
-      {
-        name: "mcp-3d-printer-server",
-        version: "1.0.0"
-      },
-      {
-        capabilities: {
-          resources: {},
-          tools: {}
-        }
-      }
-    );
-
-    this.printerFactory = new PrinterFactory();
-    this.stlManipulator = new STLManipulator(TEMP_DIR);
-
-    this.app = express();
-    this.setupExpressApp();
-    this.setupHandlers();
-    this.setupErrorHandling();
-    this.startSessionCleanup();
-  }
-
-  private setupExpressApp() {
-    // Enable CORS for all origins
-    this.app.use(cors({
-      origin: '*',
-      methods: ['GET', 'POST', 'OPTIONS'],
-      allowedHeaders: ['Content-Type', 'Accept', 'Last-Event-ID'],
-      credentials: true
-    }));
-
-    // Parse JSON bodies
-    this.app.use(express.json({ limit: '50mb' }));
-
-    // SSE endpoint - establishes the event stream
-    this.app.get('/sse', async (req: Request, res: Response) => {
-      const sessionId = uuidv4();
-      const messagesPath = `/messages?session_id=${sessionId}`;
-
-      // Set SSE headers
-      res.setHeader('Content-Type', 'text/event-stream');
-      res.setHeader('Cache-Control', 'no-cache');
-      res.setHeader('Connection', 'keep-alive');
-      res.setHeader('X-Accel-Buffering', 'no');
-
-      // Send initial endpoint event
-      res.write(`event: endpoint\ndata: ${messagesPath}\n\n`);
-
-      // Create transport for this session
-      const transport = new SSEServerTransport(messagesPath);
-      this.sessions.set(sessionId, { transport, lastActivity: Date.now() });
-
-      // Send periodic ping events to keep connection alive
-      const pingInterval = setInterval(() => {
-        if (!res.writableEnded) {
-          res.write(`event: ping\ndata: ${new Date().toISOString()}\n\n`);
-        }
-      }, 30000);
-
-      // Handle client disconnect
-      req.on('close', () => {
-        clearInterval(pingInterval);
-        this.sessions.delete(sessionId);
-        res.end();
-      });
-
-      // Handle transport errors
-      transport.onerror = (error) => {
-        console.error(`SSE Transport error for session ${sessionId}:`, error);
-        clearInterval(pingInterval);
-        this.sessions.delete(sessionId);
-        res.end();
-      };
-    });
-
-    // Messages endpoint - handles JSON-RPC messages
-    this.app.post('/messages', async (req: Request, res: Response) => {
-      const sessionId = req.query.session_id as string;
-      
-      if (!sessionId || !this.sessions.has(sessionId)) {
-        res.status(400).json({
-          jsonrpc: "2.0",
-          error: {
-            code: -32600,
-            message: "Invalid or missing session ID"
-          }
-        });
-        return;
-      }
-
-      const session = this.sessions.get(sessionId)!;
-      session.lastActivity = Date.now();
-
-      try {
-        // Handle the message through the transport
-        const result = await session.transport.handleMessage(req.body);
-        
-        if (result) {
-          res.json(result);
-        } else {
-          res.status(202).send(); // Accepted, no response needed
-        }
-      } catch (error) {
-        console.error('Error handling message:', error);
-        res.status(500).json({
-          jsonrpc: "2.0",
-          error: {
-            code: -32603,
-            message: "Internal error",
-            data: error instanceof Error ? error.message : String(error)
-          }
-        });
-      }
-    });
-
-    // Health check endpoint
-    this.app.get('/health', (req: Request, res: Response) => {
-      res.json({
-        status: 'ok',
-        server: 'mcp-3d-printer-server',
-        transport: 'sse',
-        sessions: this.sessions.size
-      });
-    });
-
-    // Root endpoint
-    this.app.get('/', (req: Request, res: Response) => {
-      res.json({
-        name: 'MCP 3D Printer Server (SSE)',
-        version: '1.0.0',
-        endpoints: {
-          sse: '/sse',
-          messages: '/messages',
-          health: '/health'
-        },
-        transport: 'sse',
-        documentation: 'https://github.com/DMontgomery40/mcp-3D-printer-server'
-      });
-    });
-  }
-
-  private startSessionCleanup() {
-    // Clean up inactive sessions every 5 minutes
-    setInterval(() => {
-      const now = Date.now();
-      const timeout = 10 * 60 * 1000; // 10 minutes
-
-      for (const [sessionId, session] of this.sessions.entries()) {
-        if (now - session.lastActivity > timeout) {
-          console.log(`Cleaning up inactive session: ${sessionId}`);
-          this.sessions.delete(sessionId);
-        }
-      }
-    }, 5 * 60 * 1000);
-  }
-
-  setupErrorHandling() {
-    this.server.onerror = (error) => {
-      console.error("[MCP Error]", error);
-    };
-
-    process.on("SIGINT", async () => {
-      console.log("\nShutting down SSE server...");
-      // Disconnect all printers
-      await this.printerFactory.disconnectAll();
-      // Close all sessions
-      for (const [sessionId, _] of this.sessions.entries()) {
-        this.sessions.delete(sessionId);
-      }
-      await this.server.close();
-      process.exit(0);
-    });
-  }
-
-  setupHandlers() {
-    this.setupResourceHandlers();
-    this.setupToolHandlers();
-  }
-
-  setupResourceHandlers() {
-    // List available resources
-    this.server.setRequestHandler(ListResourcesRequestSchema, async () => {
-      return {
-        resources: [
-          {
-            uri: `printer://${DEFAULT_HOST}/status`,
-            name: "3D Printer Status",
-            mimeType: "application/json",
-            description: "Current status of the 3D printer including temperatures, print progress, and more"
-          },
-          {
-            uri: `printer://${DEFAULT_HOST}/files`,
-            name: "3D Printer Files",
-            mimeType: "application/json",
-            description: "List of files available on the 3D printer"
-          }
-        ],
-        templates: [
-          {
-            uriTemplate: "printer://{host}/status",
-            name: "3D Printer Status",
-            mimeType: "application/json"
-          },
-          {
-            uriTemplate: "printer://{host}/files",
-            name: "3D Printer Files",
-            mimeType: "application/json"
-          },
-          {
-            uriTemplate: "printer://{host}/file/{filename}",
-            name: "3D Printer File Content",
-            mimeType: "application/gcode"
-          }
-        ]
-      };
-    });
-
-    // Read resource
-    this.server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-      const uri = request.params.uri;
-      const match = uri.match(/^printer:\/\/([^\/]+)\/(.+)$/);
-
-      if (!match) {
-        throw new McpError(ErrorCode.InvalidRequest, `Invalid resource URI: ${uri}`);
-      }
-
-      const [, host, resource] = match;
-      let content;
-
-      try {
-        if (resource === "status") {
-          content = await this.getPrinterStatus(host);
-        } else if (resource === "files") {
-          content = await this.getPrinterFiles(host);
-        } else if (resource.startsWith("file/")) {
-          const filename = resource.substring(5);
-          content = await this.getPrinterFile(host, filename);
-        } else {
-          throw new McpError(ErrorCode.InvalidRequest, `Unknown resource: ${resource}`);
-        }
-
-        return {
-          contents: [
-            {
-              uri,
-              mimeType: resource.startsWith("file/") ? "application/gcode" : "application/json",
-              text: typeof content === "string" ? content : JSON.stringify(content, null, 2)
-            }
-          ]
-        };
-      } catch (error) {
-        if (axios.isAxiosError(error)) {
-          throw new McpError(
-            ErrorCode.InternalError,
-            `API error: ${error.response?.data?.error || error.message}`
-          );
-        }
-        throw error;
-      }
-    });
-  }
-
-  setupToolHandlers() {
-    // Tool handlers remain the same as in the stdio version
-    // ... (copy all tool handlers from the original index.ts)
-  }
-
-  // Delegating methods to printer implementations (same as original)
-  
-  async getPrinterStatus(
-    host: string, 
-    port = DEFAULT_PORT, 
-    type = DEFAULT_TYPE, 
-    apiKey = DEFAULT_API_KEY,
-    bambuSerial = DEFAULT_BAMBU_SERIAL,
-    bambuToken = DEFAULT_BAMBU_TOKEN
-  ) {
-    const implementation = this.printerFactory.getImplementation(type);
-    
-    if (type.toLowerCase() === "bambu") {
-      const bambuApiKey = `${bambuSerial}:${bambuToken}`;
-      return implementation.getStatus(host, port, bambuApiKey);
-    }
-    
-    return implementation.getStatus(host, port, apiKey);
-  }
-
-  async getPrinterFiles(
-    host: string, 
-    port = DEFAULT_PORT, 
-    type = DEFAULT_TYPE, 
-    apiKey = DEFAULT_API_KEY,
-    bambuSerial = DEFAULT_BAMBU_SERIAL,
-    bambuToken = DEFAULT_BAMBU_TOKEN
-  ) {
-    const implementation = this.printerFactory.getImplementation(type);
-    
-    if (type.toLowerCase() === "bambu") {
-      const bambuApiKey = `${bambuSerial}:${bambuToken}`;
-      return implementation.getFiles(host, port, bambuApiKey);
-    }
-    
-    return implementation.getFiles(host, port, apiKey);
-  }
-
-  async getPrinterFile(
-    host: string, 
-    filename: string, 
-    port = DEFAULT_PORT, 
-    type = DEFAULT_TYPE, 
-    apiKey = DEFAULT_API_KEY,
-    bambuSerial = DEFAULT_BAMBU_SERIAL,
-    bambuToken = DEFAULT_BAMBU_TOKEN
-  ) {
-    const implementation = this.printerFactory.getImplementation(type);
-    
-    if (type.toLowerCase() === "bambu") {
-      return (implementation as any).getFile(host, port, apiKey, bambuSerial, bambuToken, filename);
-    }
-    
-    return implementation.getFile(host, port, apiKey, filename);
-  }
-
-  // ... (copy all other delegating methods from original index.ts)
-
-  async run() {
-    // Connect SSE transports to the server
-    for (const [sessionId, session] of this.sessions.entries()) {
-      await this.server.connect(session.transport);
-    }
-
-    // Start Express server
-    this.app.listen(SSE_PORT, () => {
-      console.log(`🚀 MCP 3D Printer Server (SSE) running on http://localhost:${SSE_PORT}`);
-      console.log(`📡 SSE endpoint: http://localhost:${SSE_PORT}/sse`);
-      console.log(`💬 Messages endpoint: http://localhost:${SSE_PORT}/messages`);
-    });
-  }
-}
-
-// Check if running as main module
-if (import.meta.url === `file://${process.argv[1]}`) {
-  const server = new ThreeDPrinterMCPServerSSE();
-  server.run().catch(console.error);
+if (!process.env.MCP_HTTP_PORT && process.env.SSE_PORT) {
+  process.env.MCP_HTTP_PORT = process.env.SSE_PORT;
 }
 
-export default ThreeDPrinterMCPServerSSE;
+void import("./index.js");