@mgsoftwarebv/mg-dashboard-mcp 3.10.1 → 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();