@toon-protocol/client 0.11.0 → 0.12.0

package/dist/index.js

@@ -1,10 +1,3 @@
-import {
-  ANON_ASSETS,
-  ANON_VERSION,
-  selectAnonAsset,
-  startManagedAnonProxy
-} from "./chunk-WHAEQLIW.js";
-
 // src/ToonClient.ts
 import { generateSecretKey as generateSecretKey3, getPublicKey as getPublicKey2, finalizeEvent } from "nostr-tools/pure";
 
@@ -263,26 +256,49 @@ function getNetworkStatus(config) {
   if (!network || network === "custom") return void 0;
   return resolveClientNetwork(network).status;
 }
+function proxyIlpEndpoint(proxyUrl) {
+  if (!proxyUrl) return void 0;
+  const trimmed = proxyUrl.replace(/\/+$/, "");
+  return /\/ilp$/i.test(trimmed) ? trimmed : `${trimmed}/ilp`;
+}
 function validateConfig(config) {
   if (config.connector !== void 0) {
     throw new ValidationError(
       "Embedded mode not yet implemented in ToonClient. Use connectorUrl for HTTP mode."
     );
   }
-  if (!config.connectorUrl) {
+  if (!config.connectorUrl && !config.proxyUrl) {
     throw new ValidationError(
-      'connectorUrl is required for HTTP mode. Example: "http://localhost:8080"'
+      'connectorUrl (or proxyUrl) is required for HTTP mode. Example: "http://localhost:8080"'
     );
   }
-  try {
-    const url = new URL(config.connectorUrl);
-    if (!url.protocol.startsWith("http")) {
-      throw new Error("Must be HTTP or HTTPS");
+  if (config.connectorUrl) {
+    try {
+      const url = new URL(config.connectorUrl);
+      if (!url.protocol.startsWith("http")) {
+        throw new Error("Must be HTTP or HTTPS");
+      }
+    } catch (error) {
+      throw new ValidationError(
+        `Invalid connectorUrl: must be a valid HTTP/HTTPS URL (e.g., "http://localhost:8080"). Error: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+  for (const [field, value] of [
+    ["proxyUrl", config.proxyUrl],
+    ["faucetUrl", config.faucetUrl]
+  ]) {
+    if (value === void 0) continue;
+    try {
+      const url = new URL(value);
+      if (!url.protocol.startsWith("http")) {
+        throw new Error("Must be HTTP or HTTPS");
+      }
+    } catch (error) {
+      throw new ValidationError(
+        `Invalid ${field}: must be a valid HTTP/HTTPS URL. Error: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
-  } catch (error) {
-    throw new ValidationError(
-      `Invalid connectorUrl: must be a valid HTTP/HTTPS URL (e.g., "http://localhost:8080"). Error: ${error instanceof Error ? error.message : String(error)}`
-    );
   }
   if (config.secretKey !== void 0) {
     if (!config.secretKey || config.secretKey.length !== 32) {
@@ -346,25 +362,6 @@ function validateConfig(config) {
       );
     }
   }
-  if (config.transport) {
-    if (config.transport.type === "socks5") {
-      if (!config.transport.socksProxy?.startsWith("socks5h://")) {
-        throw new ValidationError(
-          'transport.socksProxy must use socks5h:// scheme to prevent DNS leaks. The "h" suffix ensures .anyone hostnames are resolved by the proxy, not locally.'
-        );
-      }
-    } else if (config.transport.type === "gateway") {
-      if (!config.transport.gatewayUrl) {
-        throw new ValidationError(
-          "transport.gatewayUrl is required for gateway transport"
-        );
-      }
-    } else if (config.transport.type !== "direct") {
-      throw new ValidationError(
-        `Unknown transport type: "${config.transport.type}"`
-      );
-    }
-  }
   if (config.chainRpcUrls && config.supportedChains) {
     for (const chain of Object.keys(config.chainRpcUrls)) {
       if (!config.supportedChains.includes(chain)) {
@@ -381,19 +378,21 @@ function applyDefaults(rawConfig) {
     config.mnemonic,
     config.mnemonicAccountIndex ?? 0
   ).secretKey : generateSecretKey2());
+  const connectorHttpEndpoint = config.connectorHttpEndpoint ?? proxyIlpEndpoint(config.proxyUrl);
+  const connectorUrl = config.connectorUrl ?? config.proxyUrl?.replace(/\/+$/, "");
   let btpUrl = config.btpUrl;
-  if (!btpUrl && config.connectorUrl) {
+  if (!btpUrl && connectorUrl && !connectorHttpEndpoint) {
     try {
-      const url = new URL(config.connectorUrl);
+      const url = new URL(connectorUrl);
       const wsProtocol = url.protocol === "https:" ? "wss:" : "ws:";
       btpUrl = `${wsProtocol}//${url.hostname}:3000`;
     } catch {
     }
   }
   let destinationAddress = config.destinationAddress;
-  if (!destinationAddress && config.connectorUrl) {
+  if (!destinationAddress && connectorUrl) {
     try {
-      const url = new URL(config.connectorUrl);
+      const url = new URL(connectorUrl);
       if (url.hostname === "localhost" || url.hostname === "127.0.0.1") {
         if (url.port === "8080") {
           destinationAddress = "g.toon.genesis";
@@ -416,8 +415,10 @@ function applyDefaults(rawConfig) {
     ...config,
     secretKey,
     evmPrivateKey,
-    connectorUrl: config.connectorUrl,
-    // Already validated as required
+    // Satisfied by connectorUrl OR proxyUrl (validateConfig enforced one of them).
+    connectorUrl,
+    // Surface the derived `POST /ilp` endpoint so HTTP mode selects HttpIlpClient.
+    ...connectorHttpEndpoint ? { connectorHttpEndpoint } : {},
     relayUrl: config.relayUrl ?? "ws://localhost:7100",
     queryTimeout: config.queryTimeout ?? 3e4,
     maxRetries: config.maxRetries ?? 3,
@@ -480,6 +481,15 @@ function isBase64(str) {
   return /^[A-Za-z0-9+/]*={0,2}$/.test(str);
 }
 
+// src/utils/store-envelope.ts
+var REQUEST_LINE = "POST /write HTTP/1.1";
+var HEADERS = ["Host: relay", "Content-Type: application/json"];
+function buildStoreWriteEnvelope(event) {
+  const body = JSON.stringify({ event });
+  const head = [REQUEST_LINE, ...HEADERS].join("\r\n");
+  return encodeUtf8(head + "\r\n\r\n" + body);
+}
+
 // src/modes/http.ts
 import { BootstrapService, createDiscoveryTracker } from "@toon-protocol/core";
 
@@ -2698,82 +2708,10 @@ var EvmSigner = class {
   }
 };
 
-// src/transport/index.ts
-function isAnyoneHost(url) {
-  if (!url) return false;
-  try {
-    const withScheme = /:\/\//.test(url) ? url : `ws://${url}`;
-    const host = new URL(withScheme).hostname.toLowerCase();
-    return host.endsWith(".anyone");
-  } catch {
-    return false;
-  }
-}
-async function resolveTransport(transport, originalBtpUrl, originalConnectorUrl, managedProxyOptions) {
-  const hasExplicitProxy = !!transport && (transport.type === "socks5" || transport.type === "gateway");
-  const envProxy = process.env["ANYONE_PROXY_URLS"];
-  if (!hasExplicitProxy && managedProxyOptions?.managedAnonProxy !== false && !envProxy && isAnyoneHost(originalBtpUrl)) {
-    const { startManagedAnonProxy: startManagedAnonProxy2 } = await import("./anon-proxy-W3KMM7GU.js");
-    const { createSocks5WebSocketFactory, createSocks5Fetch } = await import("./socks5-WTJBYGME.js");
-    const proxy = await startManagedAnonProxy2({
-      ...managedProxyOptions?.managedAnonSocksPort !== void 0 ? { socksPort: managedProxyOptions.managedAnonSocksPort } : {}
-    });
-    try {
-      return {
-        createWebSocket: createSocks5WebSocketFactory(proxy.socksProxy),
-        httpClient: createSocks5Fetch(proxy.socksProxy),
-        stopManagedProxy: proxy.stop
-      };
-    } catch (err) {
-      await proxy.stop();
-      throw err;
-    }
-  }
-  if (!transport || transport.type === "direct") {
-    return {};
-  }
-  if (transport.type === "socks5") {
-    const {
-      createSocks5WebSocketFactory,
-      createSocks5Fetch,
-      probeSocks5Proxy
-    } = await import("./socks5-WTJBYGME.js");
-    await probeSocks5Proxy(transport.socksProxy);
-    return {
-      createWebSocket: createSocks5WebSocketFactory(transport.socksProxy),
-      httpClient: createSocks5Fetch(transport.socksProxy)
-    };
-  }
-  if (transport.type === "gateway") {
-    const { rewriteUrlsForGateway } = await import("./gateway-QOK47RKS.js");
-    const rewritten = rewriteUrlsForGateway(
-      transport.gatewayUrl,
-      originalBtpUrl,
-      originalConnectorUrl
-    );
-    return {
-      btpUrl: rewritten.btpUrl,
-      connectorUrl: rewritten.connectorUrl
-    };
-  }
-  throw new Error(
-    `Unknown transport type: "${transport.type}"`
-  );
-}
-
 // src/modes/http.ts
 async function initializeHttpMode(config) {
-  const transport = await resolveTransport(
-    config.transport,
-    config.btpUrl,
-    config.connectorUrl,
-    {
-      ...config.managedAnonProxy !== void 0 ? { managedAnonProxy: config.managedAnonProxy } : {},
-      ...config.managedAnonSocksPort !== void 0 ? { managedAnonSocksPort: config.managedAnonSocksPort } : {}
-    }
-  );
-  const effectiveBtpUrl = transport.btpUrl ?? config.btpUrl;
-  const effectiveConnectorUrl = transport.connectorUrl ?? config.connectorUrl;
+  const effectiveBtpUrl = config.btpUrl;
+  const effectiveConnectorUrl = config.connectorUrl;
   const settlementInfo = buildSettlementInfo(config);
   const discoveredPeer = readDiscoveredIlpPeer({
     btpEndpoint: effectiveBtpUrl,
@@ -2786,8 +2724,7 @@ async function initializeHttpMode(config) {
     btpClient = new BtpRuntimeClient({
       btpUrl: effectiveBtpUrl,
       peerId: config.btpPeerId ?? `client`,
-      authToken: config.btpAuthToken ?? "",
-      createWebSocket: transport.createWebSocket
+      authToken: config.btpAuthToken ?? ""
     });
     await btpClient.connect();
   }
@@ -2799,17 +2736,14 @@ async function initializeHttpMode(config) {
       ...config.btpAuthToken !== void 0 ? { authToken: config.btpAuthToken } : {},
       timeout: config.queryTimeout,
       maxRetries: config.maxRetries,
-      retryDelay: config.retryDelay,
-      ...transport.httpClient !== void 0 ? { httpClient: transport.httpClient } : {},
-      ...transport.createWebSocket !== void 0 ? { createWebSocket: transport.createWebSocket } : {}
+      retryDelay: config.retryDelay
     });
   }
   const runtimeClient = httpIlpClient ?? btpClient ?? new HttpRuntimeClient({
     connectorUrl: effectiveConnectorUrl,
     timeout: config.queryTimeout,
     maxRetries: config.maxRetries,
-    retryDelay: config.retryDelay,
-    httpClient: transport.httpClient
+    retryDelay: config.retryDelay
   });
   let onChainChannelClient = null;
   if (config.chainRpcUrls) {
@@ -2854,10 +2788,7 @@ async function initializeHttpMode(config) {
     runtimeClient,
     adminClient: null,
     btpClient,
-    onChainChannelClient,
-    // Teardown handle for a managed `anon` proxy this init STARTED (undefined
-    // for explicit-proxy/direct/gateway). ToonClient.stop() invokes it.
-    stopManagedProxy: transport.stopManagedProxy
+    onChainChannelClient
   };
 }
 
@@ -4023,13 +3954,7 @@ var ToonClient = class {
         }
       }
       const initialization = await initializeHttpMode(this.config);
-      const {
-        bootstrapService,
-        discoveryTracker,
-        runtimeClient,
-        btpClient,
-        stopManagedProxy
-      } = initialization;
+      const { bootstrapService, discoveryTracker, runtimeClient, btpClient } = initialization;
       if (this.channelManager) {
         const cm = this.channelManager;
         const nostrPubkey = this.getPublicKey();
@@ -4117,8 +4042,7 @@ var ToonClient = class {
         discoveryTracker,
         runtimeClient,
         peersDiscovered: bootstrapResults.length,
-        btpClient: btpClient ?? void 0,
-        ...stopManagedProxy ? { stopManagedProxy } : {}
+        btpClient: btpClient ?? void 0
       };
       return {
         peersDiscovered: bootstrapResults.length,
@@ -4154,13 +4078,9 @@ 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 destination = options?.destination ?? this.config.destinationAddress;
-      if (!this.state.btpClient) {
-        throw new ToonClientError(
-          "BTP client required for publishing. Configure btpUrl.",
-          "NO_BTP_CLIENT"
-        );
-      }
+      const transport = this.getClaimTransport();
       let claimMessage;
       if (options?.claim) {
         claimMessage = this.buildClaimMessageForProof(options.claim);
@@ -4189,13 +4109,11 @@ var ToonClient = class {
           "MISSING_CLAIM"
         );
       }
-      const response = await this.state.btpClient.sendIlpPacketWithClaim(
+      const response = await transport.sendIlpPacketWithClaim(
         {
           destination,
           amount,
-          data: toBase64(
-            toonData instanceof Uint8Array ? toonData : new Uint8Array(toonData)
-          )
+          data: toBase64(writeData)
         },
         claimMessage
       );
@@ -4275,7 +4193,7 @@ var ToonClient = class {
    *       matching `destination`,
    *   (c) neither -> throw MISSING_CLAIM.
    *
-   * @throws {ToonClientError} INVALID_STATE / NO_BTP_CLIENT / MISSING_CLAIM
+   * @throws {ToonClientError} INVALID_STATE / NO_ILP_TRANSPORT / MISSING_CLAIM
    */
   async sendSwapPacket(params) {
     if (!this.state) {
@@ -4284,18 +4202,13 @@ var ToonClient = class {
         "INVALID_STATE"
       );
     }
-    if (!this.state.btpClient) {
-      throw new ToonClientError(
-        "BTP client required for sending swap packets. Configure btpUrl.",
-        "NO_BTP_CLIENT"
-      );
-    }
+    const transport = this.getClaimTransport();
     const claimMessage = await this.resolveClaimForDestination(
       params.destination,
       params.amount,
       params.claim
     );
-    return this.state.btpClient.sendIlpPacketWithClaim(
+    return transport.sendIlpPacketWithClaim(
       {
         destination: params.destination,
         amount: String(params.amount),
@@ -4335,6 +4248,51 @@ var ToonClient = class {
     }
     return EvmSigner.buildClaimMessage(claim, this.getPublicKey());
   }
+  /**
+   * Resolve the ILP transport for a paid (claim-bearing) write.
+   *
+   * The connector is a payment-proxy: paid writes carry an ILP PREPARE plus the
+   * signed payment-channel claim. Either transport speaks the SAME claim
+   * contract — the BTP `payment-channel-claim` protocolData entry and the
+   * ILP-over-HTTP `ILP-Payment-Channel-Claim` header serialize the same claim
+   * JSON — so we route through whichever transport is ACTIVE rather than
+   * hard-requiring BTP.
+   *
+   * Selection (mirrors `modes/http.ts` runtime-client precedence):
+   *   1. `runtimeClient` when it implements `sendIlpPacketWithClaim` — this is
+   *      the HttpIlpClient (proxy `POST /ilp`) when a `proxyUrl`/
+   *      `connectorHttpEndpoint` is configured, else the BtpRuntimeClient.
+   *   2. `btpClient` as an explicit fallback (always present when `btpUrl` is set).
+   *
+   * The level-3 `HttpRuntimeClient` (connector-admin HTTP, no `btpUrl` AND no
+   * proxy) does NOT implement `sendIlpPacketWithClaim`; in that case there is no
+   * paid-write transport and we throw a clear, actionable error.
+   *
+   * @throws {ToonClientError} NO_ILP_TRANSPORT when no active transport can send
+   *   a packet+claim.
+   */
+  getClaimTransport() {
+    const state = this.state;
+    if (!state) {
+      throw new ToonClientError(
+        "Client not started. Call start() first.",
+        "INVALID_STATE"
+      );
+    }
+    const candidates = [
+      state.runtimeClient,
+      state.btpClient
+    ];
+    for (const candidate of candidates) {
+      if (candidate && typeof candidate.sendIlpPacketWithClaim === "function") {
+        return candidate;
+      }
+    }
+    throw new ToonClientError(
+      "No ILP transport for paid writes. Configure `proxyUrl`/`connectorHttpEndpoint` (route through the connector proxy over ILP-over-HTTP) or `btpUrl` (BTP socket).",
+      "NO_ILP_TRANSPORT"
+    );
+  }
   /**
    * Shared claim-resolution logic used by `publishEvent` and `sendSwapPacket`.
    * TODO(12.5 followup): also factor `publishEvent`'s inline claim resolution
@@ -4523,14 +4481,9 @@ var ToonClient = class {
         "MISSING_CLAIM"
       );
     }
-    if (!this.state.btpClient) {
-      throw new ToonClientError(
-        "BTP client required for sending payments. Configure btpUrl.",
-        "NO_BTP_CLIENT"
-      );
-    }
+    const transport = this.getClaimTransport();
     const claimMessage = this.buildClaimMessageForProof(params.claim);
-    return this.state.btpClient.sendIlpPacketWithClaim(
+    return transport.sendIlpPacketWithClaim(
       ilpParams,
       claimMessage
     );
@@ -4548,14 +4501,10 @@ var ToonClient = class {
     if (!this.state) {
       throw new ToonClientError("Client not started", "INVALID_STATE");
     }
-    const stopManagedProxy = this.state.stopManagedProxy;
     try {
       if (this.state.btpClient) {
         await this.state.btpClient.disconnect();
       }
-      if (stopManagedProxy) {
-        await stopManagedProxy();
-      }
       this.state = null;
     } catch (error) {
       throw new ToonClientError(
@@ -4603,26 +4552,6 @@ var ToonClient = class {
   }
 };
 
-// src/transport/hs-hostname.ts
-var HS_HOSTNAME_REGEX = /^[a-z2-7]+\.anyone$/;
-var HS_HOSTNAME_MAX_LENGTH = 80;
-function isRoutableHsHostname(s) {
-  return typeof s === "string" && s.length <= HS_HOSTNAME_MAX_LENGTH && HS_HOSTNAME_REGEX.test(s);
-}
-function assertRoutableHsHostname(hostname) {
-  if (typeof hostname === "string" && /\.anon$/.test(hostname)) {
-    throw new Error(
-      `"${hostname}" is not a routable hidden-service address; use the .anyone TLD (e.g. "${hostname.replace(/\.anon$/, ".anyone")}"). The anon daemon only resolves hidden services under .anyone \u2014 a .anon name is treated as a clearnet address and fails (HostUnreachable).`
-    );
-  }
-  if (!isRoutableHsHostname(hostname)) {
-    throw new Error(
-      `Invalid hidden-service hostname: ${JSON.stringify(hostname)}. Expected a base32 .anyone address matching ${HS_HOSTNAME_REGEX}.`
-    );
-  }
-  return hostname;
-}
-
 // src/adapters/HttpConnectorAdmin.ts
 var HttpConnectorAdmin = class {
   adminUrl;
@@ -5361,6 +5290,75 @@ function buildPetPurchaseRequest(params) {
   };
 }
 
+// src/faucet.ts
+function faucetPath(chain) {
+  switch (chain) {
+    case "evm":
+      return "/api/request";
+    case "solana":
+      return "/api/solana/request";
+    case "mina":
+      return "/api/mina/request";
+  }
+}
+async function fundWallet(faucetUrl, address, chain, options = {}) {
+  if (!faucetUrl) {
+    throw new Error("fundWallet: faucetUrl is required");
+  }
+  if (!address) {
+    throw new Error("fundWallet: address is required");
+  }
+  if (chain === "solana" || chain === "mina") {
+    throw new Error(
+      `fundWallet: ${chain} faucet funding is deferred (WS3) \u2014 not yet implemented`
+    );
+  }
+  const base = faucetUrl.replace(/\/+$/, "");
+  const url = `${base}${faucetPath(chain)}`;
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const timeout = options.timeout ?? 3e4;
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeout);
+  let response;
+  try {
+    response = await fetchImpl(url, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ address }),
+      signal: controller.signal
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === "AbortError") {
+      throw new NetworkError(
+        `Faucet request timed out after ${timeout}ms (${url})`,
+        error
+      );
+    }
+    throw new NetworkError(
+      `Faucet request failed (${url}): ${error instanceof Error ? error.message : String(error)}`,
+      error instanceof Error ? error : void 0
+    );
+  } finally {
+    clearTimeout(timeoutId);
+  }
+  if (!response.ok) {
+    const detail = await response.text().catch(() => "");
+    throw new NetworkError(
+      `Faucet responded ${response.status} ${response.statusText}${detail ? `: ${detail}` : ""} (${url})`
+    );
+  }
+  const body = await response.text().catch(() => "");
+  let parsed = body;
+  if (body) {
+    try {
+      parsed = JSON.parse(body);
+    } catch {
+      parsed = body;
+    }
+  }
+  return { chain, address, response: parsed };
+}
+
 // src/keys/KeyManager.ts
 import { finalizeEvent as finalizeEvent2 } from "nostr-tools/pure";
 import { nip19 } from "nostr-tools";
@@ -6401,14 +6399,10 @@ function writeKeystoreFile(path, keystore) {
   });
 }
 export {
-  ANON_ASSETS,
-  ANON_VERSION,
   BtpRuntimeClient,
   ChannelManager,
   ConnectorError,
   EvmSigner,
-  HS_HOSTNAME_MAX_LENGTH,
-  HS_HOSTNAME_REGEX,
   Http402Client,
   HttpConnectorAdmin,
   HttpIlpClient,
@@ -6426,13 +6420,13 @@ export {
   ValidationError,
   applyDefaults,
   applyNetworkPresets,
-  assertRoutableHsHostname,
   buildBackupEvent,
   buildBackupFilter,
   buildPetInteractionRequest,
   buildPetListingEvent,
   buildPetPurchaseRequest,
   buildSettlementInfo,
+  buildStoreWriteEnvelope,
   decryptMnemonic2 as decryptMnemonic,
   deriveFromNsec,
   deriveFullIdentity,
@@ -6440,6 +6434,7 @@ export {
   encryptMnemonic2 as encryptMnemonic,
   filterPetDvmProviders,
   filterPetListings,
+  fundWallet,
   generateKeystore,
   generateMnemonic,
   generateRandomIdentity,
@@ -6447,7 +6442,6 @@ export {
   httpEndpointToBtpUrl,
   importKeystore,
   isPrfSupported,
-  isRoutableHsHostname,
   loadKeystore,
   parseBackupPayload,
   parseHttpResponse,
@@ -6456,13 +6450,12 @@ export {
   parsePetListing,
   parseX402Body,
   parseX402Challenge,
+  proxyIlpEndpoint,
   readDiscoveredIlpPeer,
   readMinaDepositTotal,
   requestBlobStorage,
-  selectAnonAsset,
   selectIlpTransport,
   serializeHttpRequest,
-  startManagedAnonProxy,
   validateConfig,
   validateMnemonic,
   withRetry,