@toon-protocol/client 0.14.0 → 0.14.2

package/dist/index.d.ts

@@ -404,13 +404,21 @@ interface SignedBalanceProof extends BalanceProofParams {
  *
  * ## FULFILL data contract
  *
- * For a successful single-packet (non-chunked) blob upload, the DVM provider
- * returns the Arweave transaction ID as a **UTF-8 string, base64-encoded** in
- * the ILP FULFILL `data` field (the connector validates that FULFILL data is
- * base64). An Arweave tx ID is a 43-character base64url string (32 raw bytes).
+ * The deployed connector is a payment-proxy (HTTP-in-ILP): a successful blob
+ * upload returns the DVM's verbatim **HTTP/1.1 response message** in the ILP
+ * FULFILL `data` field. For a single-packet (non-chunked) upload the body is a
+ * JSON object:
  *
- * So the decode is:
- *   `txId = utf8(base64decode(result.data))`
+ *   HTTP/1.1 200 OK\r\n
+ *   content-length: 189\r\n
+ *   \r\n
+ *   {"accept":true,"txId":"<43-char base64url>","data":"<base64 of txId>",...}
+ *
+ * We parse the HTTP envelope, fail on a non-2xx status (or `accept:false`), and
+ * read the Arweave tx ID from `txId` (falling back to base64-decoding `data`).
+ * An Arweave tx ID is a 43-character base64url string (32 raw bytes). A legacy
+ * fallback still accepts a bare `base64(utf8(txId))` FULFILL (no HTTP envelope)
+ * so non-proxy providers do not regress. See {@link extractArweaveTxId}.
  *
  * See `packages/sdk/src/arweave/arweave-dvm-handler.ts` for the server side and
  * `packages/client/tests/e2e/docker-arweave-dvm-e2e.test.ts` for the reference
@@ -1059,6 +1067,9 @@ declare class ToonClient {
         destination?: string;
         claim?: SignedBalanceProof;
         ilpAmount?: bigint;
+        /** HTTP request-target the payment-proxy replays (default '/write', the
+         *  relay; use '/store' for the Arweave store/DVM backend). */
+        proxyPath?: string;
     }): Promise<PublishEventResult>;
     /**
      * Payment-aware HTTP fetch over TOON (issue #50). A `fetch()`-like method that
@@ -2359,14 +2370,74 @@ declare function withRetry<T>(operation: () => Promise<T>, options: RetryOptions
  */
 
 /**
- * Wrap a signed Nostr event in the `POST /write` HTTP envelope the deployed
- * payment-proxy reverse-proxies to the relay store.
+ * Wrap a signed Nostr event in the HTTP envelope the deployed payment-proxy
+ * reverse-proxies to its backend. Defaults to the relay's `POST /write`; pass
+ * `requestTarget: '/store'` for the Arweave store/DVM backend.
  *
  * @param event - A finalized (signed) Nostr event — passed through to the store
  *   as the JSON `event` field verbatim (the store re-verifies the signature).
+ * @param requestTarget - HTTP request-target the proxy replays (default `/write`).
  * @returns The envelope bytes to use as the ILP PREPARE `data`.
  */
-declare function buildStoreWriteEnvelope(event: NostrEvent): Uint8Array;
+declare function buildStoreWriteEnvelope(event: NostrEvent, requestTarget?: string): Uint8Array;
+
+/**
+ * Shared parser for the HTTP-over-ILP response carried in an ILP **FULFILL**
+ * packet's `data` field.
+ *
+ * The deployed connector is a payment-proxy (HTTP-in-ILP): a paid write/upload
+ * is reverse-proxied to the relay/DVM origin and the origin's reply is returned
+ * **verbatim as a full HTTP/1.1 response message** inside the FULFILL `data`:
+ *
+ *   HTTP/1.1 200 OK\r\n
+ *   content-length: 189\r\n
+ *   \r\n
+ *   {"accept":true,"txId":"4QcRav...","data":"<base64-txid>",...}
+ *
+ * Callers (`ToonClient.publishEvent`, `requestBlobStorage`) previously treated
+ * this `data` as opaque success bytes — `publishEvent` reported success on ANY
+ * FULFILL even when the embedded HTTP status was `404 Not Found`, and
+ * `requestBlobStorage` base64-decoded the WHOLE response as if it were the bare
+ * Arweave tx id. This module makes the HTTP envelope first-class so both paths
+ * can read the real status and body.
+ *
+ * The full Web-`Response` reconstruction used by the h402 fetch path lives in
+ * `adapters/Http402Client.ts` (`parseHttpResponse`); this is a smaller,
+ * dependency-free helper that returns the status code + raw body string, which
+ * is all the publish/upload paths need.
+ *
+ * DEFENSIVE: not every FULFILL is HTTP-enveloped (e.g. Mill-swap raw-TOON
+ * FULFILLs go through `sendSwapPacket`, not these paths). If the decoded data
+ * does not begin with an `HTTP/<v>` status line, `isHttp` is `false` and the
+ * caller should fall back to its prior (non-HTTP) interpretation rather than
+ * fail. This keeps non-HTTP FULFILLs from regressing.
+ */
+/** Result of parsing FULFILL `data` as an HTTP/1.1 response. */
+interface ParsedFulfillHttp {
+    /** Whether the data looked like an HTTP/1.1 response (status line present). */
+    isHttp: boolean;
+    /** HTTP status code (e.g. 200, 404). Only meaningful when `isHttp` is true. */
+    status: number;
+    /** Reason phrase from the status line (may be empty). */
+    statusText: string;
+    /** Decoded response body as a UTF-8 string (empty when none). */
+    body: string;
+}
+/**
+ * Parse FULFILL `data` bytes as an HTTP/1.1 response.
+ *
+ * Returns `{ isHttp: false, ... }` (without throwing) when the payload does not
+ * start with an `HTTP/<v>` status line, so callers can fall back to their
+ * legacy non-HTTP interpretation. When it IS an HTTP response, the status code
+ * and body are extracted; a present-but-malformed status line yields
+ * `isHttp: false` as well (treated as non-HTTP rather than throwing).
+ */
+declare function parseFulfillHttpBytes(bytes: Uint8Array): ParsedFulfillHttp;
+/**
+ * Convenience wrapper: decode a base64 FULFILL `data` string (the shape carried
+ * on `IlpSendResult.data`) and parse it as an HTTP/1.1 response.
+ */
+declare function parseFulfillHttp(base64Data: string): ParsedFulfillHttp;
 
 /**
  * Settlement info produced by buildSettlementInfo().
@@ -3270,4 +3341,4 @@ declare function loadKeystore(path: string, password: string): string;
  */
 declare function writeKeystoreFile(path: string, keystore: EncryptedKeystore): void;
 
-export { type BackupPayload, type BalanceProofParams, BtpRuntimeClient, type BtpRuntimeClientConfig, type ChainMetadata, type ChainSigner, ChannelManager, type ClaimMessage, type ClaimResolver, ConnectorError, type DiscoveredIlpPeer, type EVMClaimMessage, type EncryptedKeystore, EvmSigner, type FaucetChain, type FundWalletOptions, type FundWalletResult, type H402FetchOptions, Http402Client, type Http402ClientConfig, HttpConnectorAdmin, type HttpConnectorAdminConfig, HttpIlpClient, type HttpIlpClientConfig, type HttpIlpClientFactory, HttpRuntimeClient, type HttpRuntimeClientConfig, ILP_CLAIM_HEADER, ILP_CLAIM_WRAPPED_HEADER, ILP_PEER_ID_HEADER, type IlpTransportChoice, type InteractionResultContent, KeyManager, type KeyManagerConfig, type MinaClaimMessage, type MinaDepositReader, MinaSigner, type MinaSignerOptions, NetworkError, OnChainChannelClient, type OnChainChannelClientConfig, type ParsedX402Challenge, type PasskeyInfo, type PetDvmProvider, type PetInteractionEventData, type PetInteractionRequestParams, type PetInteractionResultData, type PetListing, type PetListingFilterOptions, type PetListingParams, type PetPurchaseRequestParams, type ProofStatus, type PublishEventResult, type RequestBlobStorageParams, type RequestBlobStorageResult, type RetryOptions, type SelectIlpTransportOptions, type SignedBalanceProof, type SolanaChannelClientOptions, type SolanaClaimMessage, SolanaSigner, type StatValues, type ToonChannelAccept, ToonClient, type ToonClientConfig, ToonClientError, type ToonIdentity, type ToonSigners, type ToonStartResult, type UnsignedNostrEvent, ValidationError, type VaultData, applyDefaults, applyNetworkPresets, buildBackupEvent, buildBackupFilter, buildPetInteractionRequest, buildPetListingEvent, buildPetPurchaseRequest, buildSettlementInfo, buildStoreWriteEnvelope, decryptMnemonic, deriveFromNsec, deriveFullIdentity, deriveNostrKeyFromMnemonic, encryptMnemonic, filterPetDvmProviders, filterPetListings, fundWallet, generateKeystore, generateMnemonic, generateRandomIdentity, getNetworkStatus, httpEndpointToBtpUrl, importKeystore, isPrfSupported, loadKeystore, parseBackupPayload, parseHttpResponse, parsePetInteractionEvent, parsePetInteractionResult, parsePetListing, parseX402Body, parseX402Challenge, proxyIlpEndpoint, readDiscoveredIlpPeer, readMinaDepositTotal, requestBlobStorage, selectIlpTransport, serializeHttpRequest, validateConfig, validateMnemonic, withRetry, writeKeystoreFile };
+export { type BackupPayload, type BalanceProofParams, BtpRuntimeClient, type BtpRuntimeClientConfig, type ChainMetadata, type ChainSigner, ChannelManager, type ClaimMessage, type ClaimResolver, ConnectorError, type DiscoveredIlpPeer, type EVMClaimMessage, type EncryptedKeystore, EvmSigner, type FaucetChain, type FundWalletOptions, type FundWalletResult, type H402FetchOptions, Http402Client, type Http402ClientConfig, HttpConnectorAdmin, type HttpConnectorAdminConfig, HttpIlpClient, type HttpIlpClientConfig, type HttpIlpClientFactory, HttpRuntimeClient, type HttpRuntimeClientConfig, ILP_CLAIM_HEADER, ILP_CLAIM_WRAPPED_HEADER, ILP_PEER_ID_HEADER, type IlpTransportChoice, type InteractionResultContent, KeyManager, type KeyManagerConfig, type MinaClaimMessage, type MinaDepositReader, MinaSigner, type MinaSignerOptions, NetworkError, OnChainChannelClient, type OnChainChannelClientConfig, type ParsedFulfillHttp, type ParsedX402Challenge, type PasskeyInfo, type PetDvmProvider, type PetInteractionEventData, type PetInteractionRequestParams, type PetInteractionResultData, type PetListing, type PetListingFilterOptions, type PetListingParams, type PetPurchaseRequestParams, type ProofStatus, type PublishEventResult, type RequestBlobStorageParams, type RequestBlobStorageResult, type RetryOptions, type SelectIlpTransportOptions, type SignedBalanceProof, type SolanaChannelClientOptions, type SolanaClaimMessage, SolanaSigner, type StatValues, type ToonChannelAccept, ToonClient, type ToonClientConfig, ToonClientError, type ToonIdentity, type ToonSigners, type ToonStartResult, type UnsignedNostrEvent, ValidationError, type VaultData, applyDefaults, applyNetworkPresets, buildBackupEvent, buildBackupFilter, buildPetInteractionRequest, buildPetListingEvent, buildPetPurchaseRequest, buildSettlementInfo, buildStoreWriteEnvelope, decryptMnemonic, deriveFromNsec, deriveFullIdentity, deriveNostrKeyFromMnemonic, encryptMnemonic, filterPetDvmProviders, filterPetListings, fundWallet, generateKeystore, generateMnemonic, generateRandomIdentity, getNetworkStatus, httpEndpointToBtpUrl, importKeystore, isPrfSupported, loadKeystore, parseBackupPayload, parseFulfillHttp, parseFulfillHttpBytes, parseHttpResponse, parsePetInteractionEvent, parsePetInteractionResult, parsePetListing, parseX402Body, parseX402Challenge, proxyIlpEndpoint, readDiscoveredIlpPeer, readMinaDepositTotal, requestBlobStorage, selectIlpTransport, serializeHttpRequest, validateConfig, validateMnemonic, withRetry, writeKeystoreFile };

package/dist/index.js

@@ -510,14 +510,52 @@ function isBase64(str) {
 }
 
 // src/utils/store-envelope.ts
-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);
 }
 
+// src/utils/fulfill-http.ts
+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));
+}
+
 // src/modes/http.ts
 import { BootstrapService, createDiscoveryTracker } from "@toon-protocol/core";
 
@@ -2313,12 +2351,12 @@ var OnChainChannelClient = class {
    */
   parseChainId(chain) {
     const parts = chain.split(":");
-    if (parts.length < 3) {
+    if (parts.length < 2) {
       throw new Error(
-        `Invalid chain format: "${chain}". Expected "evm:{network}:{chainId}".`
+        `Invalid chain format: "${chain}". 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: "${chain}". Expected "evm:{network}:{chainId}".`
@@ -3544,7 +3582,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 {
@@ -3557,15 +3597,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 {
@@ -3574,6 +3616,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}"`
+  );
+}
 
 // src/adapters/Http402Client.ts
 var Http402Client = class {
@@ -3748,7 +3833,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);
@@ -3778,10 +3863,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;
@@ -3790,11 +3875,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(
@@ -4003,7 +4088,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,
@@ -4021,7 +4106,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,
@@ -4106,7 +4191,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;
@@ -4151,6 +4236,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,
@@ -4468,7 +4563,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];
@@ -6483,6 +6578,8 @@ export {
   isTrustDowngrade,
   loadKeystore,
   parseBackupPayload,
+  parseFulfillHttp,
+  parseFulfillHttpBytes,
   parseHttpResponse,
   parsePetInteractionEvent,
   parsePetInteractionResult,