clickshot-mcp 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickshot-mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Local MCP server that feeds ClickShot screenshots into your running Claude (Code/Desktop) on your own subscription.",
   "type": "module",
   "bin": {

package/server.js

@@ -18,7 +18,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
-const VERSION = "0.1.0";
+const VERSION = "0.1.1";
 
 // stdout is the JSON-RPC channel in stdio mode, so all logging goes to stderr.
 const log = (...a) => console.error(...a);
@@ -154,13 +154,31 @@ function buildIngestApp() {
 // ---------------------------------------------------------------------------
 // Boot
 // ---------------------------------------------------------------------------
+// Bind the ingest port without letting a conflict crash the process.
+function listenIngest(app, { fatalOnError }) {
+  const srv = app.listen(PORT, "127.0.0.1", () => {
+    log(`ClickShot ingest on http://127.0.0.1:${PORT}/capture`);
+  });
+  srv.on("error", (err) => {
+    if (err && err.code === "EADDRINUSE") {
+      if (fatalOnError) {
+        log(`Port ${PORT} is already in use — another ClickShot server is running. Stop it, or set CLICKSHOT_PORT to a free port.`);
+        process.exit(1);
+      }
+      log(`Port ${PORT} already in use — another ClickShot server is handling ingest. Continuing with MCP over stdio.`);
+    } else {
+      log("Ingest server error:", err && err.message ? err.message : err);
+      if (fatalOnError) process.exit(1);
+    }
+  });
+  return srv;
+}
+
 async function main() {
   if (STDIO) {
     // Claude Desktop launches this; talk MCP over stdio, ingest over HTTP.
-    const app = buildIngestApp();
-    app.listen(PORT, "127.0.0.1", () => {
-      log(`ClickShot ingest on http://127.0.0.1:${PORT}/capture (stdio MCP mode)`);
-    });
+    // A port conflict must NOT kill the MCP connection.
+    listenIngest(buildIngestApp(), { fatalOnError: false });
     const server = buildMcpServer();
     const transport = new StdioServerTransport();
     await server.connect(transport);
@@ -191,13 +209,21 @@ async function main() {
     app.get("/mcp", methodNotAllowed);
     app.delete("/mcp", methodNotAllowed);
 
-    app.listen(PORT, "127.0.0.1", () => {
+    const srv = app.listen(PORT, "127.0.0.1", () => {
       log(`ClickShot MCP server on http://127.0.0.1:${PORT}`);
       log(`  • extension ingest: POST http://127.0.0.1:${PORT}/capture`);
       log(`  • MCP endpoint:     http://127.0.0.1:${PORT}/mcp`);
       log(`Register in Claude Code:`);
       log(`  claude mcp add --transport http clickshot http://127.0.0.1:${PORT}/mcp`);
     });
+    srv.on("error", (err) => {
+      if (err && err.code === "EADDRINUSE") {
+        log(`Port ${PORT} is already in use — another ClickShot server is running. Stop it, or set CLICKSHOT_PORT to a free port.`);
+      } else {
+        log("Server error:", err && err.message ? err.message : err);
+      }
+      process.exit(1);
+    });
   }
 }