junis 0.2.0 → 0.2.3

package/dist/server/mcp.js

@@ -46,6 +46,7 @@ var import_path = __toESM(require("path"));
 var import_glob = require("glob");
 var import_zod = require("zod");
 var execAsync = (0, import_util.promisify)(import_child_process.exec);
+var execFileAsync = (0, import_util.promisify)(import_child_process.execFile);
 var FilesystemTools = class {
   register(server) {
     server.tool(
@@ -91,8 +92,16 @@ ${error.stderr ?? ""}`
         encoding: import_zod.z.enum(["utf-8", "base64"]).optional().default("utf-8").describe("\uC778\uCF54\uB529")
       },
       async ({ path: filePath, encoding }) => {
-        const content = await import_promises.default.readFile(filePath, encoding);
-        return { content: [{ type: "text", text: content }] };
+        try {
+          const content = await import_promises.default.readFile(filePath, encoding);
+          return { content: [{ type: "text", text: content }] };
+        } catch (err) {
+          const e = err;
+          if (e.code === "ENOENT") {
+            return { content: [{ type: "text", text: `\u274C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: ${filePath}` }], isError: true };
+          }
+          return { content: [{ type: "text", text: `\u274C \uD30C\uC77C \uC77D\uAE30 \uC2E4\uD328: ${e.message}` }], isError: true };
+        }
       }
     );
     server.tool(
@@ -115,9 +124,17 @@ ${error.stderr ?? ""}`
         path: import_zod.z.string().describe("\uB514\uB809\uD1A0\uB9AC \uACBD\uB85C")
       },
       async ({ path: dirPath }) => {
-        const entries = await import_promises.default.readdir(dirPath, { withFileTypes: true });
-        const lines = entries.map((e) => `${e.isDirectory() ? "\u{1F4C1}" : "\u{1F4C4}"} ${e.name}`);
-        return { content: [{ type: "text", text: lines.join("\n") }] };
+        try {
+          const entries = await import_promises.default.readdir(dirPath, { withFileTypes: true });
+          const lines = entries.map((e) => `${e.isDirectory() ? "\u{1F4C1}" : "\u{1F4C4}"} ${e.name}`);
+          return { content: [{ type: "text", text: lines.join("\n") }] };
+        } catch (err) {
+          const e = err;
+          if (e.code === "ENOENT") {
+            return { content: [{ type: "text", text: `\u274C \uB514\uB809\uD1A0\uB9AC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4: ${dirPath}` }], isError: true };
+          }
+          return { content: [{ type: "text", text: `\u274C \uB514\uB809\uD1A0\uB9AC \uC77D\uAE30 \uC2E4\uD328: ${e.message}` }], isError: true };
+        }
       }
     );
     server.tool(
@@ -130,18 +147,20 @@ ${error.stderr ?? ""}`
       },
       async ({ pattern, directory, file_pattern }) => {
         try {
-          const { stdout } = await execAsync(
-            `rg --no-heading -n "${pattern}" ${directory}`,
+          const { stdout } = await execFileAsync(
+            "rg",
+            ["--no-heading", "-n", pattern, directory],
             { timeout: 1e4 }
           );
           return { content: [{ type: "text", text: stdout || "\uACB0\uACFC \uC5C6\uC74C" }] };
         } catch {
-          const files = await (0, import_glob.glob)(file_pattern, { cwd: directory });
+          const safeDirectory = import_path.default.resolve(directory);
+          const files = await (0, import_glob.glob)(file_pattern, { cwd: safeDirectory });
           const results = [];
           for (const file of files.slice(0, 100)) {
             try {
               const content = await import_promises.default.readFile(
-                import_path.default.join(directory, file),
+                import_path.default.join(safeDirectory, file),
                 "utf-8"
               );
               const lines = content.split("\n");
@@ -268,6 +287,17 @@ var import_zod2 = require("zod");
 var BrowserTools = class {
   browser = null;
   page = null;
+  // 동시 요청 시 race condition 방지용 직렬화 락
+  lock = Promise.resolve();
+  withLock(fn) {
+    let release;
+    const next = new Promise((r) => {
+      release = r;
+    });
+    const current = this.lock;
+    this.lock = this.lock.then(() => next);
+    return current.then(() => fn()).finally(() => release());
+  }
   async init() {
     try {
       this.browser = await import_playwright.chromium.launch({ headless: true });
@@ -290,22 +320,22 @@ var BrowserTools = class {
       "browser_navigate",
       "URL\uB85C \uC774\uB3D9",
       { url: import_zod2.z.string().describe("\uC774\uB3D9\uD560 URL") },
-      async ({ url }) => {
+      ({ url }) => this.withLock(async () => {
         const page = requirePage();
         await page.goto(url, { waitUntil: "domcontentloaded" });
         return {
           content: [{ type: "text", text: `\uC774\uB3D9 \uC644\uB8CC: ${page.url()}` }]
         };
-      }
+      })
     );
     server.tool(
       "browser_click",
       "\uC694\uC18C \uD074\uB9AD",
       { selector: import_zod2.z.string().describe("CSS \uC120\uD0DD\uC790") },
-      async ({ selector }) => {
+      ({ selector }) => this.withLock(async () => {
         await requirePage().click(selector);
         return { content: [{ type: "text", text: "\uD074\uB9AD \uC644\uB8CC" }] };
-      }
+      })
     );
     server.tool(
       "browser_type",
@@ -315,12 +345,12 @@ var BrowserTools = class {
         text: import_zod2.z.string().describe("\uC785\uB825\uD560 \uD14D\uC2A4\uD2B8"),
         clear: import_zod2.z.boolean().optional().default(false).describe("\uAE30\uC874 \uB0B4\uC6A9 \uC0AD\uC81C \uD6C4 \uC785\uB825")
       },
-      async ({ selector, text, clear }) => {
+      ({ selector, text, clear }) => this.withLock(async () => {
         const page = requirePage();
         if (clear) await page.fill(selector, text);
         else await page.type(selector, text);
         return { content: [{ type: "text", text: "\uC785\uB825 \uC644\uB8CC" }] };
-      }
+      })
     );
     server.tool(
       "browser_screenshot",
@@ -329,7 +359,7 @@ var BrowserTools = class {
         path: import_zod2.z.string().optional().describe("\uC800\uC7A5 \uACBD\uB85C (\uC5C6\uC73C\uBA74 base64 \uBC18\uD658)"),
         full_page: import_zod2.z.boolean().optional().default(false)
       },
-      async ({ path: path2, full_page }) => {
+      ({ path: path2, full_page }) => this.withLock(async () => {
         const page = requirePage();
         const screenshot = await page.screenshot({
           path: path2 ?? void 0,
@@ -347,13 +377,13 @@ var BrowserTools = class {
             }
           ]
         };
-      }
+      })
     );
     server.tool(
       "browser_snapshot",
       "\uD398\uC774\uC9C0 \uC811\uADFC\uC131 \uD2B8\uB9AC \uC870\uD68C (\uAD6C\uC870 \uD30C\uC545\uC6A9)",
       {},
-      async () => {
+      () => this.withLock(async () => {
         const page = requirePage();
         const snapshot = await page.locator("body").ariaSnapshot();
         return {
@@ -361,29 +391,36 @@ var BrowserTools = class {
             { type: "text", text: snapshot }
           ]
         };
-      }
+      })
     );
     server.tool(
       "browser_evaluate",
       "JavaScript \uC2E4\uD589",
       { code: import_zod2.z.string().describe("\uC2E4\uD589\uD560 JavaScript \uCF54\uB4DC") },
-      async ({ code }) => {
-        const result = await requirePage().evaluate(code);
-        return {
-          content: [
-            { type: "text", text: JSON.stringify(result, null, 2) }
-          ]
-        };
-      }
+      ({ code }) => this.withLock(async () => {
+        try {
+          const result = await requirePage().evaluate(code);
+          return {
+            content: [
+              { type: "text", text: typeof result === "string" ? result : JSON.stringify(result, null, 2) }
+            ]
+          };
+        } catch (err) {
+          return {
+            content: [{ type: "text", text: `\u274C JavaScript \uC2E4\uD589 \uC624\uB958: ${err.message}` }],
+            isError: true
+          };
+        }
+      })
     );
     server.tool(
       "browser_pdf",
       "\uD604\uC7AC \uD398\uC774\uC9C0 PDF \uC800\uC7A5",
       { path: import_zod2.z.string().describe("\uC800\uC7A5 \uACBD\uB85C (.pdf)") },
-      async ({ path: path2 }) => {
+      ({ path: path2 }) => this.withLock(async () => {
         await requirePage().pdf({ path: path2 });
         return { content: [{ type: "text", text: `PDF \uC800\uC7A5 \uC644\uB8CC: ${path2}` }] };
-      }
+      })
     );
   }
 };
@@ -396,7 +433,11 @@ var import_util2 = require("util");
 var execAsync2 = (0, import_util2.promisify)(import_child_process2.exec);
 async function readNotebook(filePath) {
   const raw = await import_promises2.default.readFile(filePath, "utf-8");
-  return JSON.parse(raw);
+  try {
+    return JSON.parse(raw);
+  } catch {
+    throw new Error(`\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 Jupyter \uB178\uD2B8\uBD81 \uD30C\uC77C\uC785\uB2C8\uB2E4: ${filePath}`);
+  }
 }
 async function writeNotebook(filePath, nb) {
   await import_promises2.default.writeFile(filePath, JSON.stringify(nb, null, 1), "utf-8");
@@ -491,15 +532,21 @@ var NotebookTools = class {
           execution_count: cellType === "code" ? null : void 0
         };
         let actualIndex;
+        let warning = "";
         if (position === void 0 || position === null) {
           nb.cells.push(newCell);
           actualIndex = nb.cells.length - 1;
+        } else if (position > nb.cells.length) {
+          nb.cells.push(newCell);
+          actualIndex = nb.cells.length - 1;
+          warning = ` (\uACBD\uACE0: position ${position}\uC774 \uBC94\uC704\uB97C \uCD08\uACFC\uD558\uC5EC \uB05D(index: ${actualIndex})\uC5D0 \uCD94\uAC00\uB428)`;
         } else {
-          nb.cells.splice(position, 0, newCell);
-          actualIndex = position;
+          const clamped = Math.max(0, position);
+          nb.cells.splice(clamped, 0, newCell);
+          actualIndex = clamped;
         }
         await writeNotebook(filePath, nb);
-        return { content: [{ type: "text", text: `\uC140 \uCD94\uAC00 \uC644\uB8CC (index: ${actualIndex})` }] };
+        return { content: [{ type: "text", text: `\uC140 \uCD94\uAC00 \uC644\uB8CC (index: ${actualIndex})${warning}` }] };
       }
     );
     server.tool(
@@ -527,13 +574,13 @@ var import_child_process3 = require("child_process");
 var import_util3 = require("util");
 var import_zod4 = require("zod");
 var execAsync3 = (0, import_util3.promisify)(import_child_process3.exec);
+var screenRecordPid = null;
 function platform() {
   if (process.platform === "darwin") return "mac";
   if (process.platform === "win32") return "win";
   return "linux";
 }
 var DeviceTools = class {
-  screenRecordPid = null;
   register(server) {
     server.tool(
       "screen_capture",
@@ -543,15 +590,26 @@ var DeviceTools = class {
       },
       async ({ output_path }) => {
         const p = platform();
+        const isTmp = !output_path;
         const tmpPath = output_path ?? `/tmp/junis_screen_${Date.now()}.png`;
         const cmd = {
           mac: `screencapture -x "${tmpPath}"`,
           win: `nircmd.exe savescreenshot "${tmpPath}"`,
           linux: `scrot "${tmpPath}"`
         }[p];
-        await execAsync3(cmd);
-        const { readFileSync } = await import("fs");
+        try {
+          await execAsync3(cmd);
+        } catch (err) {
+          throw new Error(`\uD654\uBA74 \uCEA1\uCC98 \uC2E4\uD328: ${err.message}`);
+        }
+        const { readFileSync, unlinkSync } = await import("fs");
         const data = readFileSync(tmpPath).toString("base64");
+        if (isTmp) {
+          try {
+            unlinkSync(tmpPath);
+          } catch {
+          }
+        }
         return {
           content: [{ type: "image", data, mimeType: "image/png" }]
         };
@@ -565,15 +623,31 @@ var DeviceTools = class {
       },
       async ({ output_path }) => {
         const p = platform();
+        const isTmp = !output_path;
         const tmpPath = output_path ?? `/tmp/junis_cam_${Date.now()}.jpg`;
         const cmd = {
           mac: `imagesnap "${tmpPath}"`,
           win: `ffmpeg -f dshow -i video="Default" -frames:v 1 "${tmpPath}"`,
           linux: `fswebcam -r 1280x720 "${tmpPath}"`
         }[p];
-        await execAsync3(cmd);
-        const { readFileSync } = await import("fs");
+        try {
+          await execAsync3(cmd);
+        } catch (err) {
+          const e = err;
+          return {
+            content: [{ type: "text", text: `\u274C \uCE74\uBA54\uB77C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uAC70\uB098 \uC811\uADFC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
+\uC6D0\uC778: ${e.message}
+
+\uCE74\uBA54\uB77C\uAC00 \uC5F0\uACB0\uB418\uC5B4 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694.` }],
+            isError: true
+          };
+        }
+        const { readFileSync, unlinkSync } = await import("fs");
         const data = readFileSync(tmpPath).toString("base64");
+        if (isTmp) try {
+          unlinkSync(tmpPath);
+        } catch {
+        }
         return {
           content: [{ type: "image", data, mimeType: "image/jpeg" }]
         };
@@ -588,11 +662,17 @@ var DeviceTools = class {
       },
       async ({ title, message }) => {
         const p = platform();
-        const cmd = {
-          mac: `osascript -e 'display notification "${message}" with title "${title}"'`,
-          win: `powershell -Command "[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType=WindowsRuntime]::CreateToastNotifier('Junis').Show([Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom, ContentType=WindowsRuntime]::new())"`,
-          linux: `notify-send "${title}" "${message}"`
-        }[p];
+        let cmd;
+        if (p === "win") {
+          const script = `Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.MessageBox]::Show('${message.replace(/'/g, "''")}', '${title.replace(/'/g, "''")}')`;
+          const encoded = Buffer.from(script, "utf16le").toString("base64");
+          cmd = `powershell -NoProfile -EncodedCommand ${encoded}`;
+        } else {
+          cmd = {
+            mac: `osascript -e 'display notification "${message.replace(/"/g, '\\"')}" with title "${title.replace(/"/g, '\\"')}"'`,
+            linux: `notify-send "${title.replace(/"/g, '\\"')}" "${message.replace(/"/g, '\\"')}"`
+          }[p] ?? "";
+        }
         await execAsync3(cmd);
         return { content: [{ type: "text", text: "\uC54C\uB9BC \uC804\uC1A1 \uC644\uB8CC" }] };
       }
@@ -633,7 +713,7 @@ var DeviceTools = class {
       async ({ action, output_path }) => {
         const p = platform();
         if (action === "start") {
-          if (this.screenRecordPid) {
+          if (screenRecordPid) {
             return { content: [{ type: "text", text: "\uC774\uBBF8 \uB179\uD654 \uC911\uC785\uB2C8\uB2E4." }] };
           }
           const tmpPath = output_path ?? `/tmp/junis_record_${Date.now()}.mp4`;
@@ -641,17 +721,18 @@ var DeviceTools = class {
           const cmd = p === "mac" ? ["screencapture", ["-v", tmpPath]] : ["ffmpeg", ["-f", p === "win" ? "gdigrab" : "x11grab", "-i", p === "win" ? "desktop" : ":0.0", tmpPath]];
           const child = spawn(cmd[0], cmd[1], { detached: true, stdio: "ignore" });
           child.unref();
-          this.screenRecordPid = child.pid ?? null;
-          return { content: [{ type: "text", text: `\uB179\uD654 \uC2DC\uC791\uB428. \uC800\uC7A5 \uACBD\uB85C: ${tmpPath} (PID: ${this.screenRecordPid})` }] };
+          screenRecordPid = child.pid ?? null;
+          return { content: [{ type: "text", text: `\uB179\uD654 \uC2DC\uC791\uB428. \uC800\uC7A5 \uACBD\uB85C: ${tmpPath} (PID: ${screenRecordPid})` }] };
         } else {
-          if (!this.screenRecordPid) {
+          if (!screenRecordPid) {
             return { content: [{ type: "text", text: "\uD604\uC7AC \uB179\uD654 \uC911\uC774 \uC544\uB2D9\uB2C8\uB2E4." }] };
           }
           try {
-            process.kill(this.screenRecordPid, "SIGINT");
+            process.kill(screenRecordPid, "SIGINT");
+            await new Promise((r) => setTimeout(r, 1e3));
           } catch {
           }
-          this.screenRecordPid = null;
+          screenRecordPid = null;
           return { content: [{ type: "text", text: "\uB179\uD654 \uC911\uC9C0\uB428." }] };
         }
       }
@@ -670,12 +751,15 @@ var DeviceTools = class {
           } catch {
           }
         }
-        const res = await fetch("https://ipapi.co/json/");
+        const res = await fetch("http://ip-api.com/json/");
         const data = await res.json();
+        if (data.status !== "success") {
+          throw new Error(`IP \uC704\uCE58 \uC870\uD68C \uC2E4\uD328: ${data.message ?? data.status}`);
+        }
         return {
           content: [{
             type: "text",
-            text: `\uC704\uB3C4: ${data.latitude}, \uACBD\uB3C4: ${data.longitude}, \uB3C4\uC2DC: ${data.city}, \uAD6D\uAC00: ${data.country_name} (IP \uAE30\uBC18 \uCD94\uC815)`
+            text: `\uC704\uB3C4: ${data.lat}, \uACBD\uB3C4: ${data.lon}, \uB3C4\uC2DC: ${data.city}, \uAD6D\uAC00: ${data.country} (IP \uAE30\uBC18 \uCD94\uC815)`
           }]
         };
       }