sweetspot-remote-agent 1.8.2 → 1.8.3

package/mcp-server.js

@@ -7,8 +7,6 @@
  */
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import express from "express";
 import crypto from "crypto";
 import { z } from "zod";
 
@@ -253,8 +251,6 @@ function createServer() {
 // ── 서버 시작 ──
 const args = process.argv.slice(2);
 const isStdio = args.includes("--stdio");
-const portIdx = args.indexOf("--port");
-const port = portIdx !== -1 ? parseInt(args[portIdx + 1], 10) : 8080;
 
 import os from "os";
 
@@ -277,92 +273,117 @@ if (!isStdio && !noRegister && !regName) {
   process.exit(1);
 }
 
-function getLocalIP() {
-  const nets = os.networkInterfaces();
-  for (const iface of Object.values(nets)) {
-    for (const net of iface) {
-      if (net.family === "IPv4" && !net.internal) return net.address;
-    }
-  }
-  return "127.0.0.1";
-}
+// ── 토큰 자동 생성/저장 ──
+import fs from "fs";
+
+const tokenFile = `${os.homedir()}/.sweetspot-token`;
 
-async function autoRegister() {
-  if (noRegister || isStdio) return;
+function loadOrCreateToken() {
+  if (fs.existsSync(tokenFile)) return fs.readFileSync(tokenFile, "utf-8").trim();
+  const token = crypto.randomUUID();
+  fs.writeFileSync(tokenFile, token, "utf-8");
+  return token;
+}
 
-  const localIP = getLocalIP();
-  const agentUrl = `http://${localIP}:${port}`;
+// ── WebSocket 클라이언트 (GCP 역방향 연결) ──
+async function connectWs(name, token) {
+  const { default: WebSocket } = await import("ws");
+  const wsUrl = BOT_SERVER.replace(/^http/, "ws") + "/agent";
+  let alive = true;
 
-  console.error(`[register] 봇 서버에 등록 중... (${regName} → ${agentUrl})`);
+  function connect() {
+    if (!alive) return;
+    const ws = new WebSocket(wsUrl);
 
-  try {
-    const res = await fetch(`${BOT_SERVER}/register`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "ngrok-skip-browser-warning": "true",
-      },
-      body: JSON.stringify({ name: regName, agentUrl }),
+    ws.on("open", () => {
+      ws.send(JSON.stringify({ type: "register", name, token }));
+      console.error(`[remote-agent] GCP 서버에 연결 중... (${name})`);
     });
-    const data = await res.json();
-    if (data.ok) {
-      console.error(`[register] ✅ 등록 완료! Slack 유저: ${data.name}`);
-    } else {
-      console.error(`[register] ❌ 등록 실패: ${data.error}`);
-    }
-  } catch (e) {
-    console.error(`[register] ❌ 봇 서버 연결 실패: ${e.message}`);
-  }
-}
 
-async function main() {
-  if (!isStdio) {
-    // HTTP 모드: 원격 연결용
-    const app = express();
-    app.use(express.json());
-
-    // 세션별 transport 관리
-    const transports = new Map();
-
-    app.all("/mcp", async (req, res) => {
-      // 새 세션 초기화 (POST + initialize 메서드)
-      const sessionId = req.headers["mcp-session-id"];
-
-      if (!sessionId && req.method === "POST") {
-        const transport = new StreamableHTTPServerTransport({
-          sessionIdGenerator: () => crypto.randomUUID(),
-        });
-        // 세션마다 새 McpServer 인스턴스 생성 (멀티세션 지원)
-        const sessionServer = createServer();
-        transport.onclose = () => {
-          if (transport.sessionId) transports.delete(transport.sessionId);
-        };
-        await sessionServer.connect(transport);
-        await transport.handleRequest(req, res, req.body);
-        if (transport.sessionId) transports.set(transport.sessionId, transport);
+    ws.on("message", async (data) => {
+      let msg;
+      try { msg = JSON.parse(data.toString()); } catch { return; }
+
+      if (msg.type === "registered") {
+        console.error(`[remote-agent] ✅ 등록 완료! Slack 유저: ${msg.name}`);
         return;
       }
-
-      // 기존 세션
-      if (sessionId && transports.has(sessionId)) {
-        await transports.get(sessionId).handleRequest(req, res, req.body);
+      if (msg.type === "error") {
+        console.error(`[remote-agent] ❌ ${msg.message}`);
         return;
       }
-
-      res.status(400).json({ error: "Invalid or missing session" });
+      if (msg.type === "ping") {
+        ws.send(JSON.stringify({ type: "pong" }));
+        return;
+      }
+      if (msg.type === "command") {
+        const result = await executeAction(msg);
+        ws.send(JSON.stringify({ type: "result", id: msg.id, ...result }));
+      }
     });
 
-    app.listen(port, "0.0.0.0", () => {
-      console.error(`[remote-agent] MCP 서버 시작 (HTTP 0.0.0.0:${port})`);
-      // 서버 시작 후 자동 등록
-      autoRegister();
+    ws.on("close", () => {
+      if (alive) {
+        console.error("[remote-agent] 연결 끊김, 5초 후 재연결...");
+        setTimeout(connect, 5000);
+      }
     });
-  } else {
-    // stdio 모드: 로컬 사용
+
+    ws.on("error", (e) => console.error("[remote-agent] 연결 오류:", e.message));
+  }
+
+  connect();
+}
+
+// ── 명령 실행 ──
+async function executeAction(msg) {
+  const { action } = msg;
+  try {
+    const { click, doubleClick, typeText, pressKey, hotkey, scroll } = await import("./lib/input.mjs");
+    const { openApp, openUrl, listApps, closeApp, focusApp, getClipboard, setClipboard } = await import("./lib/apps.mjs");
+    const { runCommand, getSystemInfo } = await import("./lib/shell.mjs");
+    const screenshotMod = await import("screenshot-desktop");
+    const screenshot = screenshotMod.default;
+
+    switch (action) {
+      case "screenshot": {
+        const buf = await screenshot({ format: "png" });
+        return { action, success: true, image: buf.toString("base64") };
+      }
+      case "click": { click(msg.x, msg.y); return { action, success: true }; }
+      case "doubleclick": { doubleClick(msg.x, msg.y); return { action, success: true }; }
+      case "type": { typeText(msg.text); return { action, success: true }; }
+      case "key": { pressKey(msg.key); return { action, success: true }; }
+      case "hotkey": { hotkey(msg.keys); return { action, success: true }; }
+      case "scroll": { scroll(msg.direction || "down", msg.amount || 3); return { action, success: true }; }
+      case "open_app": { openApp(msg.app); return { action, success: true }; }
+      case "open_url": { openUrl(msg.url); return { action, success: true }; }
+      case "list_apps": { return { action, success: true, apps: listApps() }; }
+      case "close_app": { closeApp(msg.app); return { action, success: true }; }
+      case "focus_app": { focusApp(msg.app); return { action, success: true }; }
+      case "get_clipboard": { return { action, success: true, text: getClipboard() }; }
+      case "set_clipboard": { setClipboard(msg.text); return { action, success: true }; }
+      case "shell": { return { action, success: true, output: runCommand(msg.cmd, msg.timeout || 30000) }; }
+      case "sysinfo": { return { action, success: true, info: getSystemInfo() }; }
+      default: return { action, success: false, error: `알 수 없는 명령: ${action}` };
+    }
+  } catch (err) {
+    return { action, success: false, error: err.message };
+  }
+}
+
+async function main() {
+  if (isStdio) {
+    // stdio 모드: 로컬 사용 (Claude Code 등)
     const stdioServer = createServer();
     const transport = new StdioServerTransport();
     await stdioServer.connect(transport);
     console.error("[remote-agent] MCP 서버 시작 (stdio)");
+  } else {
+    // WebSocket 모드: GCP 역방향 연결 (ngrok 불필요)
+    const token = loadOrCreateToken();
+    console.error(`[remote-agent] 토큰 파일: ${tokenFile}`);
+    await connectWs(regName, token);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sweetspot-remote-agent",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Sweetspot 원격 제어 MCP 서버 — 스크린샷, 마우스/키보드, 앱 제어, 파일 탐색, 셸 실행",
   "type": "module",
   "main": "mcp-server.js",
@@ -17,8 +17,8 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.1",
-    "express": "^5.2.1",
     "screenshot-desktop": "^1.15.0",
+    "ws": "^8.18.0",
     "zod": "^4.3.6"
   },
   "license": "ISC",