@toon-protocol/client-mcp 0.5.2 → 0.5.3

package/dist/{chunk-R75M6TK6.js → chunk-3UECPDBJ.js}

@@ -6963,6 +6963,42 @@ function buildStoreWriteEnvelope(event) {
   const head = [REQUEST_LINE, ...HEADERS].join("\r\n");
   return encodeUtf8(head + "\r\n\r\n" + body);
 }
+var CRLF = "\r\n";
+function findHeaderEnd(bytes) {
+  for (let i = 0; i + 3 < bytes.length; i++) {
+    if (bytes[i] === 13 && bytes[i + 1] === 10 && bytes[i + 2] === 13 && bytes[i + 3] === 10) {
+      return i + 4;
+    }
+  }
+  return -1;
+}
+function parseFulfillHttpBytes(bytes) {
+  const notHttp = {
+    isHttp: false,
+    status: 0,
+    statusText: "",
+    body: ""
+  };
+  const headerEnd = findHeaderEnd(bytes);
+  const headBytes = headerEnd === -1 ? bytes : bytes.subarray(0, headerEnd - 2);
+  const bodyBytes = headerEnd === -1 ? new Uint8Array(0) : bytes.subarray(headerEnd);
+  const headText = decodeUtf8(headBytes);
+  const lines = headText.split(CRLF).filter((l) => l.length > 0);
+  const statusLine = lines.shift();
+  if (!statusLine) return notHttp;
+  if (!statusLine.trimStart().startsWith("HTTP/")) return notHttp;
+  const match = /^HTTP\/\d\.\d\s+(\d{3})(?:\s+(.*))?$/.exec(statusLine.trim());
+  if (!match) return notHttp;
+  return {
+    isHttp: true,
+    status: parseInt(match[1], 10),
+    statusText: match[2] ?? "",
+    body: decodeUtf8(bodyBytes)
+  };
+}
+function parseFulfillHttp(base64Data) {
+  return parseFulfillHttpBytes(fromBase64(base64Data));
+}
 async function withRetry(operation, options) {
   const {
     maxRetries,
@@ -9934,15 +9970,17 @@ async function requestBlobStorage(client, secretKey, params) {
     return {
       success: false,
       eventId: event.id,
-      error: "FULFILL contained no data; expected base64-encoded Arweave tx ID"
+      error: "FULFILL contained no data; expected an HTTP response with the Arweave tx ID"
     };
   }
-  const txId = decodeUtf8(fromBase64(result.data));
-  if (!ARWEAVE_TX_ID_REGEX.test(txId)) {
+  let txId;
+  try {
+    txId = extractArweaveTxId(result.data);
+  } catch (error) {
     return {
       success: false,
       eventId: event.id,
-      error: `Decoded FULFILL data is not a valid Arweave tx ID: "${txId}"`
+      error: error instanceof Error ? error.message : String(error)
     };
   }
   return {
@@ -9951,6 +9989,49 @@ async function requestBlobStorage(client, secretKey, params) {
     eventId: event.id
   };
 }
+function extractArweaveTxId(base64Data) {
+  const http2 = parseFulfillHttp(base64Data);
+  if (!http2.isHttp) {
+    const legacy = decodeUtf8(fromBase64(base64Data));
+    if (!ARWEAVE_TX_ID_REGEX.test(legacy)) {
+      throw new Error(
+        `Decoded FULFILL data is not a valid Arweave tx ID: "${legacy}"`
+      );
+    }
+    return legacy;
+  }
+  if (http2.status < 200 || http2.status >= 300) {
+    const detail = http2.body ? ` - ${http2.body}` : "";
+    throw new Error(
+      `Blob upload failed: DVM returned HTTP ${http2.status} ${http2.statusText}`.trimEnd() + detail
+    );
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(http2.body);
+  } catch {
+    throw new Error(
+      `Blob upload response body was not valid JSON: "${http2.body}"`
+    );
+  }
+  const body = parsed;
+  if (body.accept === false) {
+    const reason = typeof body.error === "string" ? `: ${body.error}` : "";
+    throw new Error(`Blob upload rejected by DVM (accept:false)${reason}`);
+  }
+  if (typeof body.txId === "string" && ARWEAVE_TX_ID_REGEX.test(body.txId)) {
+    return body.txId;
+  }
+  if (typeof body.data === "string" && body.data.length > 0) {
+    const decoded = decodeUtf8(fromBase64(body.data));
+    if (ARWEAVE_TX_ID_REGEX.test(decoded)) {
+      return decoded;
+    }
+  }
+  throw new Error(
+    `Blob upload response did not contain a valid Arweave tx ID: "${http2.body}"`
+  );
+}
 var Http402Client = class {
   fetchImpl;
   resolveClaim;
@@ -10123,7 +10204,7 @@ function parseX402Body(body) {
   }
   return version !== void 0 ? { x402Version: version } : {};
 }
-var CRLF = "\r\n";
+var CRLF2 = "\r\n";
 function concatHeadAndBody(head, body) {
   const headBytes = encodeUtf8(head);
   const out = new Uint8Array(headBytes.length + body.length);
@@ -10153,10 +10234,10 @@ function serializeHttpRequest(req) {
     `${req.method.toUpperCase()} ${target} HTTP/1.1`,
     ...headers.values()
   ];
-  const head = lines.join(CRLF) + CRLF + CRLF;
+  const head = lines.join(CRLF2) + CRLF2 + CRLF2;
   return concatHeadAndBody(head, bodyBytes);
 }
-function findHeaderEnd(bytes) {
+function findHeaderEnd2(bytes) {
   for (let i = 0; i + 3 < bytes.length; i++) {
     if (bytes[i] === 13 && bytes[i + 1] === 10 && bytes[i + 2] === 13 && bytes[i + 3] === 10) {
       return i + 4;
@@ -10165,11 +10246,11 @@ function findHeaderEnd(bytes) {
   return -1;
 }
 function parseHttpResponse(bytes) {
-  const headerEnd = findHeaderEnd(bytes);
+  const headerEnd = findHeaderEnd2(bytes);
   const headBytes = headerEnd === -1 ? bytes : bytes.subarray(0, headerEnd - 2);
   const body = headerEnd === -1 ? new Uint8Array(0) : bytes.subarray(headerEnd);
   const headText = decodeUtf8(headBytes);
-  const lines = headText.split(CRLF).filter((l) => l.length > 0);
+  const lines = headText.split(CRLF2).filter((l) => l.length > 0);
   const statusLine = lines.shift();
   if (!statusLine) {
     throw new ConnectorError(
@@ -10524,6 +10605,16 @@ var ToonClient = class {
           error: `Event rejected: ${response.code} - ${response.message}`
         };
       }
+      if (response.data) {
+        const httpResult = parseFulfillHttp(response.data);
+        if (httpResult.isHttp && (httpResult.status < 200 || httpResult.status >= 300)) {
+          const detail = httpResult.body ? ` - ${httpResult.body}` : "";
+          return {
+            success: false,
+            error: `Write failed: relay returned HTTP ${httpResult.status} ${httpResult.statusText}`.trimEnd() + detail
+          };
+        }
+      }
       return {
         success: true,
         eventId: event.id,
@@ -12025,4 +12116,4 @@ export {
 @scure/bip32/lib/esm/index.js:
   (*! scure-bip32 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-R75M6TK6.js.map
+//# sourceMappingURL=chunk-3UECPDBJ.js.map