@mgsoftwarebv/mg-dashboard-mcp 3.10.0 → 3.10.2

package/dist/index.js

@@ -2149,52 +2149,89 @@ async function r2List(bucket, prefix, options) {
   } while (continuationToken && entries.length < options.maxResults);
   return entries;
 }
+function r2WrapError(bucket, key, e) {
+  const err = e;
+  const status = err?.$metadata?.httpStatusCode;
+  const name = err?.name || "";
+  if (name === "NoSuchKey" || name === "NotFound" || status === 404) {
+    return new Error(`r2://${bucket}/${key} not found`);
+  }
+  if (name === "NoSuchBucket") return new Error(`R2 bucket "${bucket}" not found`);
+  if (status === 403 || name === "AccessDenied") return new Error(`Access denied for r2://${bucket}/${key} (check R2_ACCESS_KEY_ID / R2_SECRET_ACCESS_KEY)`);
+  return new Error(`R2 error (${name || "unknown"}${status ? ` ${status}` : ""}): ${err?.message || String(e)}`);
+}
 async function r2GetObject(bucket, key, maxBytes) {
   const client = getR2Client();
-  const head = await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
-  const size = head.ContentLength || 0;
+  let size = 0;
+  try {
+    const head = await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
+    size = head.ContentLength || 0;
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
   if (size > maxBytes) {
     throw new Error(`Object too large: ${size} bytes (max ${maxBytes} for inline read; use sftp-write with sourcePath to mirror locally instead, or pass { offset, length } for a ranged read)`);
   }
-  const result = await client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
-  const body = result.Body;
-  if (!body?.transformToString) throw new Error("R2 returned no readable body");
-  return body.transformToString();
+  try {
+    const result = await client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
+    const body = result.Body;
+    if (!body?.transformToString) throw new Error("R2 returned no readable body");
+    return await body.transformToString();
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
 }
 async function r2GetObjectRange(bucket, key, range) {
   const client = getR2Client();
-  const head = await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
-  const size = head.ContentLength || 0;
+  let size = 0;
+  try {
+    const head = await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
+    size = head.ContentLength || 0;
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
   if (range.offset >= size && size > 0) throw new Error(`offset ${range.offset} is past end of object (size ${size})`);
   const MAX = 1048576;
   const remaining = Math.max(0, size - range.offset);
   const effectiveLen = range.length !== void 0 ? Math.min(range.length, remaining, MAX) : Math.min(remaining, MAX);
   const end = range.offset + effectiveLen - 1;
-  const result = await client.send(new GetObjectCommand({
-    Bucket: bucket,
-    Key: key,
-    Range: `bytes=${range.offset}-${end}`
-  }));
-  const body = result.Body;
-  if (!body?.transformToString) throw new Error("R2 returned no readable body");
-  const text = await body.transformToString();
-  const header = `# range: bytes ${range.offset}-${end} of ${size} (${effectiveLen} bytes)`;
-  return `${header}
+  try {
+    const result = await client.send(new GetObjectCommand({
+      Bucket: bucket,
+      Key: key,
+      Range: `bytes=${range.offset}-${end}`
+    }));
+    const body = result.Body;
+    if (!body?.transformToString) throw new Error("R2 returned no readable body");
+    const text = await body.transformToString();
+    const header = `# range: bytes ${range.offset}-${end} of ${size} (${effectiveLen} bytes)`;
+    return `${header}
 ${text}`;
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
 }
 async function r2PutObject(bucket, key, body, contentLength) {
   const client = getR2Client();
-  await client.send(new PutObjectCommand({
-    Bucket: bucket,
-    Key: key,
-    Body: body,
-    ContentLength: contentLength,
-    ContentType: "application/octet-stream"
-  }));
+  try {
+    await client.send(new PutObjectCommand({
+      Bucket: bucket,
+      Key: key,
+      Body: body,
+      ContentLength: contentLength,
+      ContentType: "application/octet-stream"
+    }));
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
 }
 async function r2DeleteObject(bucket, key) {
   const client = getR2Client();
-  await client.send(new DeleteObjectCommand({ Bucket: bucket, Key: key }));
+  try {
+    await client.send(new DeleteObjectCommand({ Bucket: bucket, Key: key }));
+  } catch (e) {
+    throw r2WrapError(bucket, key, e);
+  }
 }
 async function r2DeletePrefix(bucket, prefix) {
   const client = getR2Client();
@@ -3627,43 +3664,47 @@ ${result.stderr}`);
         if (containers.length === 0) {
           return { content: [{ type: "text", text: "Error: no valid containerName provided" }] };
         }
-        const tail = Number(a.tail) > 0 ? Number(a.tail) : Number(a.lines) > 0 ? Number(a.lines) : 100;
+        const followSeconds = Math.max(0, Math.min(300, Number(a.followSeconds) || 0));
+        const userTail = a.tail !== void 0 ? Number(a.tail) : a.lines !== void 0 ? Number(a.lines) : void 0;
+        const tailArg = userTail !== void 0 && Number.isFinite(userTail) && userTail >= 0 ? userTail : followSeconds > 0 ? 0 : 100;
         const sinceRaw = typeof a.since === "string" ? a.since.trim() : "";
         const grepRaw = typeof a.grep === "string" ? a.grep : "";
-        const followSeconds = Math.max(0, Math.min(300, Number(a.followSeconds) || 0));
         if (sinceRaw && !/^\d+[smhd]$/i.test(sinceRaw) && !/^\d{4}-\d{2}-\d{2}/.test(sinceRaw)) {
           return { content: [{ type: "text", text: 'Error: invalid `since` format (expected e.g. "10m", "2h", or ISO timestamp)' }] };
         }
         const sinceArg = sinceRaw ? ` --since ${posixQuote(sinceRaw)}` : "";
         const grepSuffix = grepRaw ? ` | grep -i -E ${posixQuote(grepRaw)} --line-buffered` : "";
-        const followTail = a.tail !== void 0 || a.lines !== void 0 ? tail : 0;
-        const tailArg = followSeconds > 0 ? followTail : tail;
         const { conn, proxy } = await getServerConnection(String(a.serverId));
-        if (followSeconds > 0) conn.timeout = (followSeconds + 10) * 1e3;
+        const wallSeconds = followSeconds > 0 ? followSeconds : 30;
+        conn.timeout = (wallSeconds + 10) * 1e3;
         const followFlag = followSeconds > 0 ? " -f" : "";
         if (containers.length === 1) {
           const c = containers[0];
-          const inner2 = `docker logs${followFlag} --tail ${tailArg}${sinceArg} ${c} 2>&1${grepSuffix}`;
-          const cmd2 = followSeconds > 0 ? `timeout --signal=INT ${followSeconds} sh -c ${posixQuote(inner2)}` : inner2;
+          const inner = `docker logs${followFlag} --tail ${tailArg}${sinceArg} ${c} 2>&1${grepSuffix}`;
+          const cmd2 = `timeout --signal=INT ${wallSeconds} sh -c ${posixQuote(inner)}`;
           const result2 = await sshExec(conn, cmd2, proxy);
-          const acceptable2 = followSeconds > 0 ? result2.exitCode === 0 || result2.exitCode === 124 || result2.exitCode === 130 : result2.exitCode === 0 || grepRaw && result2.exitCode === 1;
-          if (!acceptable2) {
-            return { content: [{ type: "text", text: `Error (exit ${result2.exitCode}): ${result2.stderr || result2.stdout}` }] };
+          const acceptable2 = result2.exitCode === 0 || result2.exitCode === 124 || result2.exitCode === 130 || result2.exitCode === 143 || !!grepRaw && result2.exitCode === 1;
+          if (!acceptable2 && !result2.stdout) {
+            return { content: [{ type: "text", text: `Error (exit ${result2.exitCode}): ${result2.stderr || "(no output)"}` }] };
           }
-          return { content: [{ type: "text", text: result2.stdout || "(no log lines matched)" }] };
+          const note2 = result2.exitCode === 124 ? `
+(note: command exceeded ${wallSeconds}s wall budget; partial output)` : "";
+          return { content: [{ type: "text", text: (result2.stdout || "(no log lines matched)") + note2 }] };
         }
         const subShells = containers.map((c) => {
-          const inner2 = `docker logs${followFlag} --tail ${tailArg}${sinceArg} ${c} 2>&1${grepSuffix}`;
-          return `(${inner2} | sed -u -e ${posixQuote(`s/^/[${c}] /`)})`;
+          const inner = `docker logs${followFlag} --tail ${tailArg}${sinceArg} ${c} 2>&1${grepSuffix}`;
+          return `(${inner} | sed -u -e ${posixQuote(`s/^/[${c}] /`)})`;
         });
-        const inner = followSeconds > 0 ? subShells.join(" & ") + " & wait" : subShells.join("; ");
-        const cmd = followSeconds > 0 ? `timeout --signal=INT ${followSeconds} sh -c ${posixQuote(inner)}` : inner;
+        const innerCmd = subShells.join(" & ") + " & wait";
+        const cmd = `timeout --signal=INT ${wallSeconds} sh -c ${posixQuote(innerCmd)}`;
         const result = await sshExec(conn, cmd, proxy);
-        const acceptable = followSeconds > 0 ? result.exitCode === 0 || result.exitCode === 124 || result.exitCode === 130 || result.exitCode === 143 : result.exitCode === 0 || grepRaw && result.exitCode === 1;
-        if (!acceptable) {
-          return { content: [{ type: "text", text: `Error (exit ${result.exitCode}): ${result.stderr || result.stdout}` }] };
+        const acceptable = result.exitCode === 0 || result.exitCode === 124 || result.exitCode === 130 || result.exitCode === 143 || !!grepRaw && result.exitCode === 1;
+        if (!acceptable && !result.stdout) {
+          return { content: [{ type: "text", text: `Error (exit ${result.exitCode}): ${result.stderr || "(no output)"}` }] };
         }
-        return { content: [{ type: "text", text: result.stdout || "(no log lines matched)" }] };
+        const note = result.exitCode === 124 ? `
+(note: one or more containers exceeded ${wallSeconds}s wall budget; partial output)` : "";
+        return { content: [{ type: "text", text: (result.stdout || "(no log lines matched)") + note }] };
       }
       case "docker-exec": {
         const container = String(a.container).replace(/[^a-zA-Z0-9._-]/g, "");