test-wuying-agentbay-sdk 0.15.0-beta.20260114082807 → 0.15.0-beta.20260114142100

package/dist/index.cjs

@@ -12805,6 +12805,87 @@ var _Computer = class _Computer {
   constructor(session) {
     this.session = session;
   }
+  static normalizeImageFormat(format, defaultValue) {
+    const f = String(format || "").trim().toLowerCase();
+    if (!f) {
+      return defaultValue;
+    }
+    if (f === "jpg") {
+      return "jpeg";
+    }
+    return f;
+  }
+  static validateBase64String(base64String) {
+    const s = String(base64String || "");
+    if (!s) {
+      throw new Error("Empty base64 string");
+    }
+    if (s.length % 4 !== 0) {
+      throw new Error("Invalid base64 string length");
+    }
+    const base64WithoutPadding = s.replace(/=+$/, "");
+    if (!/^[A-Za-z0-9+/]+$/.test(base64WithoutPadding)) {
+      throw new Error("Invalid base64 string format");
+    }
+    const paddingMatch = s.match(/=+$/);
+    if (paddingMatch && paddingMatch[0].length > 2) {
+      throw new Error("Invalid base64 padding format");
+    }
+  }
+  static decodeScreenshotJsonToBytesStrict(jsonText, expectedFormat) {
+    const s = String(jsonText || "").trim();
+    if (!s) {
+      throw new Error("Empty image data");
+    }
+    if (!s.startsWith("{")) {
+      throw new Error("Screenshot tool returned non-JSON data");
+    }
+    let obj;
+    try {
+      obj = JSON.parse(s);
+    } catch (e) {
+      throw new Error(`Invalid screenshot JSON: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
+      throw new Error("Invalid screenshot JSON: expected object");
+    }
+    const b64 = obj.data;
+    if (typeof b64 !== "string" || !b64.trim()) {
+      throw new Error("Screenshot JSON missing base64 field");
+    }
+    _Computer.validateBase64String(b64);
+    let bytes;
+    if (typeof Buffer !== "undefined") {
+      bytes = new Uint8Array(Buffer.from(b64, "base64"));
+    } else {
+      const binary = atob(b64);
+      const out = new Uint8Array(binary.length);
+      for (let i = 0; i < binary.length; i++) {
+        out[i] = binary.charCodeAt(i);
+      }
+      bytes = out;
+    }
+    const fmt = _Computer.normalizeImageFormat(expectedFormat, "png");
+    if (fmt === "png") {
+      const pngMagic = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10]);
+      for (let i = 0; i < pngMagic.length; i++) {
+        if (bytes[i] !== pngMagic[i]) {
+          throw new Error("Screenshot data does not match expected format 'png'");
+        }
+      }
+      return bytes;
+    }
+    if (fmt === "jpeg") {
+      const jpgMagic = new Uint8Array([255, 216, 255]);
+      for (let i = 0; i < jpgMagic.length; i++) {
+        if (bytes[i] !== jpgMagic[i]) {
+          throw new Error("Screenshot data does not match expected format 'jpeg'");
+        }
+      }
+      return bytes;
+    }
+    throw new Error(`Unsupported format: ${JSON.stringify(expectedFormat)}`);
+  }
   /**
    * Click mouse at specified coordinates.
    *
@@ -13270,6 +13351,55 @@ var _Computer = class _Computer {
       };
     }
   }
+  /**
+   * Capture the current screen and return raw image bytes (beta).
+   *
+   * This API uses the MCP tool `screenshot` (wuying_capture) and expects the backend to return
+   * a JSON string with top-level field `data` containing base64.
+   *
+   * @param format - Output image format ("png", "jpeg", or "jpg"). Default is "png"
+   */
+  async betaTakeScreenshot(format = "png") {
+    const fmt = _Computer.normalizeImageFormat(format, "png");
+    if (fmt !== "png" && fmt !== "jpeg") {
+      return {
+        success: false,
+        requestId: "",
+        errorMessage: `Unsupported format: ${JSON.stringify(format)}. Supported values: "png", "jpeg".`,
+        data: new Uint8Array(),
+        format: fmt
+      };
+    }
+    try {
+      const result = await this.session.callMcpTool("screenshot", { format: fmt }, false, "wuying_capture");
+      const requestId = result.requestId || "";
+      if (!result.success) {
+        return {
+          success: false,
+          requestId,
+          errorMessage: result.errorMessage || "Failed to take screenshot",
+          data: new Uint8Array(),
+          format: fmt
+        };
+      }
+      const bytes = _Computer.decodeScreenshotJsonToBytesStrict(String(result.data || ""), fmt);
+      return {
+        success: true,
+        requestId,
+        errorMessage: "",
+        data: bytes,
+        format: fmt
+      };
+    } catch (error) {
+      return {
+        success: false,
+        requestId: "",
+        errorMessage: `Failed to take screenshot: ${error instanceof Error ? error.message : String(error)}`,
+        data: new Uint8Array(),
+        format: fmt
+      };
+    }
+  }
   /**
    * Lists all root windows.
    *
@@ -16164,41 +16294,27 @@ function normalizeImageFormat(format, defaultValue) {
   return f;
 }
 _chunkJB6CNGN4cjs.__name.call(void 0, normalizeImageFormat, "normalizeImageFormat");
-function stripDataUrlPrefix(b64) {
-  const s = String(b64 || "").trim();
-  const idx = s.indexOf("base64,");
-  if (idx >= 0) {
-    return s.slice(idx + "base64,".length).trim();
+function validateBase64String(base64String) {
+  const s = String(base64String || "");
+  if (!s) {
+    throw new Error("Empty base64 string");
   }
-  return s;
-}
-_chunkJB6CNGN4cjs.__name.call(void 0, stripDataUrlPrefix, "stripDataUrlPrefix");
-function indexOfSubarray(haystack, needle, maxSearch) {
-  if (needle.length === 0 || haystack.length < needle.length) {
-    return -1;
-  }
-  const limit = Math.min(haystack.length, Math.max(0, maxSearch));
-  for (let i = 0; i + needle.length <= limit; i++) {
-    let ok = true;
-    for (let j = 0; j < needle.length; j++) {
-      if (haystack[i + j] !== needle[j]) {
-        ok = false;
-        break;
-      }
-    }
-    if (ok) {
-      return i;
-    }
+  const base64WithoutPadding = s.replace(/=+$/, "");
+  if (!/^[A-Za-z0-9+/]+$/.test(base64WithoutPadding)) {
+    throw new Error("Invalid base64 string format");
   }
-  return -1;
-}
-_chunkJB6CNGN4cjs.__name.call(void 0, indexOfSubarray, "indexOfSubarray");
-function base64ToUint8Array(input) {
-  let s = stripDataUrlPrefix(input).replace(/[\r\n\t ]+/g, "").replace(/-/g, "+").replace(/_/g, "/");
-  const mod = s.length % 4;
-  if (mod !== 0) {
-    s += "=".repeat(4 - mod);
+  if (s.length % 4 !== 0) {
+    throw new Error("Invalid base64 string length");
+  }
+  const paddingMatch = s.match(/=+$/);
+  if (paddingMatch && paddingMatch[0].length > 2) {
+    throw new Error("Invalid base64 padding format");
   }
+}
+_chunkJB6CNGN4cjs.__name.call(void 0, validateBase64String, "validateBase64String");
+function base64ToUint8ArrayStrict(input) {
+  const s = String(input || "").trim();
+  validateBase64String(s);
   if (typeof Buffer !== "undefined") {
     return new Uint8Array(Buffer.from(s, "base64"));
   }
@@ -16209,82 +16325,55 @@ function base64ToUint8Array(input) {
   }
   return out;
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, base64ToUint8Array, "base64ToUint8Array");
-function decodeBase64Image(input, expectedFormat) {
-  const b64 = extractBase64FromMcpPayload(input);
-  const raw = base64ToUint8Array(b64);
-  let b = raw;
-  const pngIdx = indexOfSubarray(b, PNG_MAGIC, 128);
-  if (pngIdx > 0) {
-    b = b.slice(pngIdx);
-  }
-  const jpgIdx = indexOfSubarray(b, JPEG_MAGIC, 128);
-  if (jpgIdx > 0) {
-    b = b.slice(jpgIdx);
-  }
-  const fmt = indexOfSubarray(b, PNG_MAGIC, PNG_MAGIC.length) === 0 ? "png" : indexOfSubarray(b, JPEG_MAGIC, JPEG_MAGIC.length) === 0 ? "jpeg" : expectedFormat;
-  return { bytes: b, format: fmt };
+_chunkJB6CNGN4cjs.__name.call(void 0, base64ToUint8ArrayStrict, "base64ToUint8ArrayStrict");
+function startsWithMagic(bytes, magic) {
+  if (bytes.length < magic.length) {
+    return false;
+  }
+  for (let i = 0; i < magic.length; i++) {
+    if (bytes[i] !== magic[i]) {
+      return false;
+    }
+  }
+  return true;
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, decodeBase64Image, "decodeBase64Image");
-function extractBase64FromMcpPayload(input) {
-  const s = String(input || "").trim();
-  if (!(s.startsWith("{") || s.startsWith("["))) {
-    return s;
+_chunkJB6CNGN4cjs.__name.call(void 0, startsWithMagic, "startsWithMagic");
+function detectImageFormat(bytes) {
+  if (startsWithMagic(bytes, PNG_MAGIC)) {
+    return "png";
   }
-  try {
-    const obj = JSON.parse(s);
-    const b64 = extractBase64FromAny(obj);
-    return b64 || s;
-  } catch (e12) {
-    return s;
+  if (startsWithMagic(bytes, JPEG_MAGIC)) {
+    return "jpeg";
   }
+  return "";
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, extractBase64FromMcpPayload, "extractBase64FromMcpPayload");
-function extractBase64FromAny(v) {
-  if (!v) {
-    return "";
+_chunkJB6CNGN4cjs.__name.call(void 0, detectImageFormat, "detectImageFormat");
+function decodeBase64Image(input, expectedFormat) {
+  const s = String(input || "").trim();
+  if (!s) {
+    throw new Error("Empty image data");
   }
-  if (typeof v === "string") {
-    return v;
+  if (!s.startsWith("{")) {
+    throw new Error("Screenshot tool returned non-JSON data");
   }
-  if (Array.isArray(v)) {
-    return v.length > 0 ? extractBase64FromAny(v[0]) : "";
+  let obj;
+  try {
+    obj = JSON.parse(s);
+  } catch (e) {
+    throw new Error(`Invalid screenshot JSON: ${e instanceof Error ? e.message : String(e)}`);
   }
-  if (typeof v === "object") {
-    if (typeof v.data === "string" && v.data) {
-      return v.data;
-    }
-    const content = v.content;
-    if (Array.isArray(content) && content.length > 0 && typeof content[0] === "object" && content[0]) {
-      const c0 = content[0];
-      if (typeof c0.blob === "string" && c0.blob) {
-        return c0.blob;
-      }
-      if (typeof c0.data === "string" && c0.data) {
-        return c0.data;
-      }
-      if (typeof c0.text === "string" && c0.text) {
-        return c0.text;
-      }
-      if (c0.blob && typeof c0.blob === "object") {
-        if (typeof c0.blob.data === "string" && c0.blob.data) {
-          return c0.blob.data;
-        }
-      }
-      if (c0.image && typeof c0.image === "object" && typeof c0.image.data === "string" && c0.image.data) {
-        return c0.image.data;
-      }
-      if (c0.source && typeof c0.source === "object" && typeof c0.source.data === "string" && c0.source.data) {
-        return c0.source.data;
-      }
-    }
-    if (v.result) {
-      return extractBase64FromAny(v.result);
-    }
+  if (!obj || typeof obj !== "object" || Array.isArray(obj)) {
+    throw new Error("Invalid screenshot JSON: expected object");
   }
-  return "";
+  const b64 = obj.data;
+  if (typeof b64 !== "string" || !b64.trim()) {
+    throw new Error("Screenshot JSON missing base64 field");
+  }
+  const bytes = base64ToUint8ArrayStrict(b64);
+  const detected = detectImageFormat(bytes);
+  return { bytes, format: detected || expectedFormat };
 }
-_chunkJB6CNGN4cjs.__name.call(void 0, extractBase64FromAny, "extractBase64FromAny");
+_chunkJB6CNGN4cjs.__name.call(void 0, decodeBase64Image, "decodeBase64Image");
 var _Mobile = class _Mobile {
   constructor(session) {
     this.session = session;
@@ -18488,6 +18577,7 @@ var _Session = class _Session {
         url.searchParams.append("token", this.getToken());
         const requestId = `vpc-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         url.searchParams.append("requestId", requestId);
+        setRequestId(requestId);
         const response = await fetch(url.toString(), {
           method: "GET",
           headers: {
@@ -18499,7 +18589,7 @@ var _Session = class _Session {
             success: false,
             data: "",
             errorMessage: `VPC request failed: ${response.statusText}`,
-            requestId: ""
+            requestId
           };
         }
         const responseData = await response.json();
@@ -18535,14 +18625,14 @@ var _Session = class _Session {
             success: true,
             data: dataStr,
             errorMessage: "",
-            requestId: ""
+            requestId
           };
         }
         return {
           success: true,
           data: textContent || JSON.stringify(actualResult),
           errorMessage: "",
-          requestId: ""
+          requestId
         };
       } else {
         const callToolRequest = new (0, _chunkQGXJA3GTcjs.CallMcpToolRequest)({
@@ -18572,6 +18662,9 @@ var _Session = class _Session {
         }
         const data = response.body.data;
         const reqId = extractRequestId(response) || "";
+        if (reqId) {
+          setRequestId(reqId);
+        }
         if (toolName === "run_code") {
           let dataStr = "";
           if (data && Array.isArray(data.content) && data.content.length > 0 && data.content[0].text) {