@toon-protocol/client-mcp 0.5.2 → 0.6.0

package/dist/{chunk-R75M6TK6.js → chunk-TDXKG3EI.js}

@@ -6956,13 +6956,49 @@ function decodeUtf8(bytes) {
 function isBase64(str) {
   return /^[A-Za-z0-9+/]*={0,2}$/.test(str);
 }
-var REQUEST_LINE = "POST /write HTTP/1.1";
+var DEFAULT_REQUEST_TARGET = "/write";
 var HEADERS = ["Host: relay", "Content-Type: application/json"];
-function buildStoreWriteEnvelope(event) {
+function buildStoreWriteEnvelope(event, requestTarget = DEFAULT_REQUEST_TARGET) {
   const body = JSON.stringify({ event });
-  const head = [REQUEST_LINE, ...HEADERS].join("\r\n");
+  const head = [`POST ${requestTarget} HTTP/1.1`, ...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,
@@ -8719,12 +8755,12 @@ var OnChainChannelClient = class {
    */
   parseChainId(chain2) {
     const parts = chain2.split(":");
-    if (parts.length < 3) {
+    if (parts.length < 2) {
       throw new Error(
-        `Invalid chain format: "${chain2}". Expected "evm:{network}:{chainId}".`
+        `Invalid chain format: "${chain2}". Expected "evm:{network}:{chainId}" or "evm:{chainId}".`
       );
     }
-    const chainIdStr = parts[2];
+    const chainIdStr = parts.length >= 3 ? parts[2] : parts[1];
     if (!chainIdStr) {
       throw new Error(
         `Invalid chain format: "${chain2}". Expected "evm:{network}:{chainId}".`
@@ -9921,7 +9957,9 @@ async function requestBlobStorage(client, secretKey, params) {
   const result = await client.publishEvent(event, {
     destination: params.destination,
     claim: params.claim,
-    ilpAmount: params.ilpAmount
+    ilpAmount: params.ilpAmount,
+    // The store/DVM backend serves POST /store (not the relay's /write).
+    proxyPath: "/store"
   });
   if (!result.success) {
     return {
@@ -9934,15 +9972,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 +9991,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 +10206,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 +10236,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 +10248,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(
@@ -10376,7 +10459,7 @@ var ToonClient = class {
         if (result.negotiatedChain && result.settlementAddress) {
           const chainType = result.negotiatedChain.split(":")[0] ?? "evm";
           const parts = result.negotiatedChain.split(":");
-          const chainId = parts.length >= 3 ? parseInt(parts[2] ?? "0", 10) : 0;
+          const chainId = parts.length >= 3 ? parseInt(parts[2] ?? "0", 10) : parts.length >= 2 ? parseInt(parts[1] ?? "0", 10) : 0;
           const r = result;
           this.peerNegotiations.set(result.registeredPeerId, {
             chain: result.negotiatedChain,
@@ -10394,7 +10477,7 @@ var ToonClient = class {
           if (matchedChain) {
             const peerAddr = peerInfo.settlementAddresses?.[matchedChain];
             const parts = matchedChain.split(":");
-            const chainId = parts.length >= 3 ? parseInt(parts[2] ?? "0", 10) : 0;
+            const chainId = parts.length >= 3 ? parseInt(parts[2] ?? "0", 10) : parts.length >= 2 ? parseInt(parts[1] ?? "0", 10) : 0;
             if (peerAddr) {
               this.peerNegotiations.set(result.registeredPeerId, {
                 chain: matchedChain,
@@ -10479,7 +10562,7 @@ var ToonClient = class {
       const toonData = this.config.toonEncoder(event);
       const basePricePerByte = 10n;
       const amount = options?.ilpAmount !== void 0 ? String(options.ilpAmount) : String(BigInt(toonData.length) * basePricePerByte);
-      const writeData = buildStoreWriteEnvelope(event);
+      const writeData = buildStoreWriteEnvelope(event, options?.proxyPath);
       const destination = options?.destination ?? this.config.destinationAddress;
       const transport = this.getClaimTransport();
       let claimMessage;
@@ -10524,6 +10607,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,
@@ -10841,7 +10934,7 @@ var ToonClient = class {
   getChainContext(negotiatedChain) {
     if (!negotiatedChain) return void 0;
     const parts = negotiatedChain.split(":");
-    const chainIdPart = parts.length >= 3 ? parts[2] : void 0;
+    const chainIdPart = parts.length >= 3 ? parts[2] : parts.length >= 2 ? parts[1] : void 0;
     const numericChainId = chainIdPart !== void 0 ? parseInt(chainIdPart, 10) : NaN;
     if (isNaN(numericChainId)) return void 0;
     const tokenNetworkAddress = this.config.tokenNetworks?.[negotiatedChain];
@@ -11611,6 +11704,18 @@ function buildIlpPrepare(params) {
   };
 }
 
+// ../arweave/dist/gateways.js
+var ARWEAVE_GATEWAYS = [
+  "https://ar-io.dev",
+  "https://arweave.net",
+  "https://permagate.io"
+];
+function arweaveUrls(txId, gateways = ARWEAVE_GATEWAYS) {
+  const all = (gateways.length ? gateways : ARWEAVE_GATEWAYS).map((g) => `${g}/${txId}`);
+  const [url, ...fallbacks] = all;
+  return { url: url ?? `${ARWEAVE_GATEWAYS[0]}/${txId}`, fallbacks };
+}
+
 // src/daemon/config.ts
 var DEFAULT_KEYSTORE_PASSWORD = "toon-client-default";
 function configDir() {
@@ -11646,6 +11751,11 @@ function resolveMnemonic(file) {
     "No mnemonic configured. Set TOON_CLIENT_MNEMONIC, configure a keystorePath (+ TOON_CLIENT_KEYSTORE_PASSWORD), or add `mnemonic` to the config file."
   );
 }
+function parseCsvEnv(value) {
+  if (!value) return void 0;
+  const items = value.split(",").map((s) => s.trim()).filter(Boolean);
+  return items.length ? items : void 0;
+}
 function resolveConfig(file) {
   const mnemonic = resolveMnemonic(file);
   const proxyUrl = process.env["TOON_CLIENT_PROXY_URL"] ?? file.proxyUrl;
@@ -11657,7 +11767,10 @@ function resolveConfig(file) {
     process.env["TOON_CLIENT_HTTP_PORT"] ?? file.httpPort ?? 8787
   );
   const destination = process.env["TOON_CLIENT_DESTINATION"] ?? file.destination ?? "g.townhouse.town";
+  const publishDestination = process.env["TOON_CLIENT_PUBLISH_DESTINATION"] ?? file.publishDestination ?? destination;
+  const storeDestination = process.env["TOON_CLIENT_STORE_DESTINATION"] ?? file.storeDestination ?? destination;
   const feePerEvent = BigInt(file.feePerEvent ?? "1");
+  const arweaveGateways = parseCsvEnv(process.env["TOON_CLIENT_ARWEAVE_GATEWAYS"]) ?? file.arweaveGateways ?? [...ARWEAVE_GATEWAYS];
   const network = process.env["TOON_CLIENT_NETWORK"] ?? file.network;
   const chain2 = process.env["TOON_CLIENT_CHAIN"] ?? file.chain ?? "evm";
   const apex = file.apexChains?.[chain2] ?? file.apex ?? buildProxyApexNegotiation(file, chain2, destination);
@@ -11703,13 +11816,16 @@ function resolveConfig(file) {
     ...proxyUrl ? { proxyUrl } : {},
     ...faucetUrl ? { faucetUrl } : {},
     destination,
+    publishDestination,
+    storeDestination,
     feePerEvent,
     ...apex ? { apex } : {},
     ...file.apexChildPeers ? { apexChildPeers: file.apexChildPeers } : {},
     chain: chain2,
     apexChannelStorePath,
     toonClientConfig,
-    network
+    network,
+    arweaveGateways
   };
 }
 function defaultChainKey(chain2, chainId) {
@@ -11732,7 +11848,7 @@ function buildProxyApexNegotiation(file, chain2, destination) {
   const settlementAddress = settlementAddresses[chainKey];
   if (!settlementAddress) return void 0;
   const parts = chainKey.split(":");
-  const chainId = chain2 === "evm" && parts.length >= 3 ? Number(parts[2] ?? 0) : 0;
+  const chainId = chain2 === "evm" && parts.length >= 2 ? Number(parts[2] ?? parts[1] ?? 0) : 0;
   const peerId = destination.split(".").at(-1) ?? destination;
   return {
     destination,
@@ -11989,6 +12105,7 @@ export {
   parseIlpPeerInfo2 as parseIlpPeerInfo,
   isEventExpired,
   buildIlpPrepare,
+  arweaveUrls,
   DEFAULT_KEYSTORE_PASSWORD,
   configDir,
   defaultConfigPath,
@@ -12025,4 +12142,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-TDXKG3EI.js.map