@toon-protocol/client-mcp 0.2.0 → 0.3.0

package/dist/{chunk-L6F2B3GX.js → chunk-QFHCXJ2V.js}

@@ -13,10 +13,7 @@ import {
   isEventExpired,
   parseIlpPeerInfo,
   readConfigFile
-} from "./chunk-NP35YO5O.js";
-import {
-  startManagedAnonProxy
-} from "./chunk-SKQTKZIH.js";
+} from "./chunk-CQ2QIZ6Z.js";
 import {
   __require
 } from "./chunk-F22GNSF6.js";
@@ -33,10 +30,12 @@ function hasConfiguredIdentity(file) {
   );
 }
 var CONFIG_HELP = {
-  transport: "Point btpUrl/relayUrl at your apex. For an .anyone hidden service use ws://<host>.anyone:3000/btp + ws://<host>.anyone:7100 \u2014 the daemon auto-routes through a managed anon proxy. For a direct apex use ws://<host>:3000/btp + ws://<host>:7100.",
-  btpUrl: "REQUIRED. BTP WebSocket URL of the apex/connector for paid writes.",
+  transport: "Configure ONE uplink for paid writes: either `proxyUrl` (connector payment-proxy over ILP-over-HTTP, e.g. https://proxy.devnet.toonprotocol.dev) OR `btpUrl` (BTP WebSocket, e.g. ws://<host>:3000/btp). Reads are always free over relayUrl.",
+  proxyUrl: "Connector-proxy base URL (deployed devnet/testnet edge). When set, paid writes route through `POST /ilp` and no BTP socket is needed. Set `destination` to the apex ILP address (e.g. g.proxy for devnet).",
+  faucetUrl: "Devnet faucet base URL (e.g. https://faucet.devnet.toonprotocol.dev) used to drip test funds before publishing.",
+  btpUrl: "BTP WebSocket URL of the apex/connector for paid writes. Optional when `proxyUrl` is set.",
   relayUrl: "Town relay WebSocket URL for FREE reads. Default ws://localhost:7100.",
-  managedAnonProxy: "Optional override \u2014 leave unset to auto-infer from btpUrl (.anyone host \u2192 managed anon proxy, anything else \u2192 direct).",
+  destination: "Default ILP publish destination (apex address). Default g.townhouse.town; set to g.proxy for the deployed devnet proxy.",
   keystorePath: "Auto-generated encrypted identity. Do not hand-edit; back up your seed phrase."
 };
 async function scaffoldFirstRun(opts = {}) {
@@ -75,13 +74,14 @@ async function scaffoldFirstRun(opts = {}) {
   if (!existsSync(configPath)) {
     updated = {
       _help: CONFIG_HELP,
+      proxyUrl: "",
       btpUrl: "",
       relayUrl: "ws://localhost:7100",
       ...updated
     };
     changed = true;
     log(
-      `[toon-clientd] wrote starter config at ${configPath} \u2014 set "btpUrl" to your apex before publishing.`
+      `[toon-clientd] wrote starter config at ${configPath} \u2014 set "proxyUrl" (connector proxy, ILP-over-HTTP) or "btpUrl" (BTP) to your apex before publishing.`
     );
   }
   if (changed) writeConfigFile(configPath, updated);
@@ -124,7 +124,6 @@ var DEFAULT_MAX_MS = 3e4;
 var noop = () => void 0;
 var RelaySubscription = class {
   relayUrl;
-  socksProxy;
   bufferSize;
   reconnectBaseMs;
   reconnectMaxMs;
@@ -147,12 +146,11 @@ var RelaySubscription = class {
   reconnectTimer = null;
   constructor(opts) {
     this.relayUrl = opts.relayUrl;
-    this.socksProxy = opts.socksProxy;
     this.bufferSize = opts.bufferSize ?? DEFAULT_BUFFER;
     this.reconnectBaseMs = opts.reconnectBaseMs ?? DEFAULT_BASE_MS;
     this.reconnectMaxMs = opts.reconnectMaxMs ?? DEFAULT_MAX_MS;
     this.log = opts.logger ?? noop;
-    this.wsFactory = opts.wsFactory ?? defaultWebSocketFactory(this.socksProxy);
+    this.wsFactory = opts.wsFactory ?? defaultWebSocketFactory();
     this.decodeEvent = opts.decodeEvent;
     this.onEvent = opts.onEvent;
   }
@@ -347,15 +345,10 @@ function toText(data) {
 function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
-function defaultWebSocketFactory(socksProxy) {
+function defaultWebSocketFactory() {
   return (url) => {
     const WebSocketImpl = nodeRequire("ws");
-    let agent;
-    if (socksProxy) {
-      const { SocksProxyAgent } = nodeRequire("socks-proxy-agent");
-      agent = new SocksProxyAgent(socksProxy);
-    }
-    return new WebSocketImpl(url, agent ? { agent } : void 0);
+    return new WebSocketImpl(url);
   };
 }
 
@@ -1404,7 +1397,6 @@ var ClientRunner = class {
   config;
   createClient;
   createRelay;
-  startReadProxy;
   log;
   targetsPath;
   startedAt = Date.now();
@@ -1424,9 +1416,6 @@ var ClientRunner = class {
   subIdCounter = 0;
   defaultBtpUrl;
   defaultRelayUrl;
-  /** Teardown for the daemon-managed read proxy (btp-direct + relay-`.anyone`). */
-  stopReadProxy;
-  readProxyError;
   stopped = false;
   started = false;
   constructor(deps) {
@@ -1438,17 +1427,12 @@ var ClientRunner = class {
     this.defaultRelayUrl = deps.config.relayUrl;
     this.createRelay = deps.createRelay ?? ((opts) => new RelaySubscription({
       relayUrl: opts.relayUrl,
-      ...opts.socksProxy ? { socksProxy: opts.socksProxy } : {},
       ...opts.logger ? { logger: opts.logger } : {},
       onEvent: opts.onEvent,
       // The TOON relay sends events TOON-encoded (text) on reads, not JSON.
       decodeEvent: (raw) => decodeEventFromToon(new TextEncoder().encode(raw))
     }));
-    this.startReadProxy = deps.startReadProxy ?? ((opts) => startManagedAnonProxy({
-      socksPort: opts.socksPort,
-      ...opts.log ? { log: opts.log } : {}
-    }));
-    this.registerRelay(this.defaultRelayUrl, this.config.socksProxy);
+    this.registerRelay(this.defaultRelayUrl);
     const defaultApex = this.makeApex({
       btpUrl: this.defaultBtpUrl,
       client: this.createClient(this.config.toonClientConfig),
@@ -1470,13 +1454,13 @@ var ClientRunner = class {
   start() {
     if (this.started) return;
     this.started = true;
-    if (this.config.manageReadProxy) void this.bringUpReadProxy();
     for (const relay of this.relays.values()) relay.start();
     void this.bootstrap();
     this.replayPersistedTargets();
   }
   /** Await the default apex's bootstrap (kicking it off if not already running). */
   bootstrap() {
+    if (!this.config.hasUplink) return Promise.resolve();
     const apex = this.apexes.get(this.defaultBtpUrl);
     if (!apex) return Promise.resolve();
     return this.bootstrapApex(apex);
@@ -1487,12 +1471,11 @@ var ClientRunner = class {
    * merged buffer and replaying active fan-out subscriptions. Does NOT start the
    * socket — callers start it (so construction stays side-effect-free for tests).
    */
-  registerRelay(relayUrl, socksProxy) {
+  registerRelay(relayUrl) {
     const existing = this.relays.get(relayUrl);
     if (existing) return existing;
     const relay = this.createRelay({
       relayUrl,
-      ...socksProxy ? { socksProxy } : {},
       logger: this.log,
       onEvent: (subId, event) => this.pushMerged(relayUrl, subId, event)
     });
@@ -1502,17 +1485,11 @@ var ClientRunner = class {
     return relay;
   }
   /**
-   * Add a relay read target at runtime. `.anyone` relays reuse the managed read
-   * proxy (started here if needed). Persisted unless `persist` is false.
+   * Add a relay read target at runtime. Persisted unless `persist` is false.
    */
   async addRelay(relayUrl, persist = true) {
     if (this.relays.has(relayUrl)) return;
-    let socksProxy = this.config.socksProxy;
-    if (isAnyoneHost(relayUrl) && !socksProxy) {
-      await this.ensureReadProxy();
-      socksProxy = `socks5h://127.0.0.1:${this.config.readProxySocksPort ?? 9050}`;
-    }
-    const relay = this.registerRelay(relayUrl, socksProxy);
+    const relay = this.registerRelay(relayUrl);
     relay.start();
     if (persist) saveRelayTarget(relayUrl, this.targetsPath);
   }
@@ -1616,14 +1593,20 @@ var ClientRunner = class {
   async doBootstrapApex(apex) {
     apex.bootstrapping = true;
     try {
+      if (!apex.negotiation && this.config.proxyUrl) {
+        await this.discoverApexNegotiation(apex);
+      }
       await apex.client.start();
       this.injectApexNegotiation(apex);
-      apex.apexChannelId = await this.openOrResumeApexChannel(apex);
+      const deferOpen = Boolean(this.config.proxyUrl);
+      apex.apexChannelId = await this.openOrResumeApexChannel(apex, {
+        resumeOnly: deferOpen
+      });
       this.routeChildPeersThroughApexChannel(apex);
       apex.ready = true;
       apex.lastError = void 0;
       this.log(
-        `[runner] apex ${apex.btpUrl} ready; channel ${apex.apexChannelId}`
+        `[runner] apex ${apex.btpUrl || apex.destination} ready; channel ${apex.apexChannelId ?? "(deferred \u2014 open on first write)"}`
       );
     } catch (err) {
       apex.lastError = err instanceof Error ? err.message : String(err);
@@ -1752,37 +1735,15 @@ var ClientRunner = class {
       );
     }
   }
-  // ── Shared read proxy ──────────────────────────────────────────────────────
-  async ensureReadProxy() {
-    if (this.stopReadProxy) return;
-    await this.bringUpReadProxy();
-  }
-  async bringUpReadProxy() {
-    if (this.stopReadProxy) return;
-    const socksPort = this.config.readProxySocksPort ?? 9050;
-    try {
-      this.log(
-        `[runner] starting managed read proxy on 127.0.0.1:${socksPort}`
-      );
-      const proxy = await this.startReadProxy({
-        socksPort,
-        log: (m) => this.log(`[anon] ${m}`)
-      });
-      if (this.stopped) {
-        await proxy.stop();
-        return;
-      }
-      this.stopReadProxy = () => proxy.stop();
-      this.readProxyError = void 0;
-      this.log("[runner] managed read proxy ready");
-    } catch (err) {
-      this.readProxyError = err instanceof Error ? err.message : String(err);
-      this.log(`[runner] managed read proxy failed: ${this.readProxyError}`);
-    }
-  }
   // ── Channel / negotiation helpers (per-apex) ───────────────────────────────
-  /** Open the apex channel — or, on a restart, RESUME the existing one. */
-  async openOrResumeApexChannel(apex) {
+  /**
+   * Open the apex channel — or, on a restart, RESUME the existing one.
+   *
+   * With `resumeOnly`, only a persisted channel is resumed (no on-chain open);
+   * returns undefined when none exists so the caller can defer the open to the
+   * first write (funded-after-start demo flow, #69).
+   */
+  async openOrResumeApexChannel(apex, opts = {}) {
     const { destination, chain } = apex;
     const { apexChannelStorePath } = this.config;
     const saved = loadApexChannel(apexChannelStorePath, destination, chain);
@@ -1794,10 +1755,24 @@ var ClientRunner = class {
       );
       return saved.channelId;
     }
+    if (opts.resumeOnly) return void 0;
     const channelId = await apex.client.openChannel(destination);
-    if (apex.negotiation) {
-      const a = apex.negotiation;
-      saveApexChannel(apexChannelStorePath, destination, chain, {
+    this.persistApexChannel(apex, channelId);
+    return channelId;
+  }
+  /**
+   * Persist a (lazily- or eagerly-) opened apex channel so a restart RESUMES it
+   * (tracked, no re-deposit) rather than opening a second on-chain channel.
+   * No-op when the apex carries no negotiation (nothing to key the store on).
+   */
+  persistApexChannel(apex, channelId) {
+    const a = apex.negotiation;
+    if (!a) return;
+    saveApexChannel(
+      this.config.apexChannelStorePath,
+      apex.destination,
+      apex.chain,
+      {
         channelId,
         context: {
           chainType: a.chain,
@@ -1806,9 +1781,34 @@ var ClientRunner = class {
           ...a.tokenAddress ? { tokenAddress: a.tokenAddress } : {},
           recipient: a.settlementAddress
         }
-      });
+      }
+    );
+  }
+  /**
+   * Discover the apex's settlement negotiation from its kind:10032 on the
+   * default relay and attach it to the apex (proxy-mode fallback when no config
+   * negotiation was supplied, #69). Throws ApexDiscoveryError on timeout/missing
+   * settlement params so the apex's `lastError` reports exactly what is missing.
+   */
+  async discoverApexNegotiation(apex) {
+    const relay = this.relays.get(this.defaultRelayUrl);
+    if (!relay) {
+      throw new TargetError(
+        `Cannot discover apex "${apex.destination}": default relay ${this.defaultRelayUrl} is not registered.`
+      );
     }
-    return channelId;
+    relay.start();
+    const discovered = await discoverApex({
+      relay,
+      ilpAddress: apex.destination,
+      chain: apex.chain,
+      ...apex.childPeers.length > 0 ? { childPeers: apex.childPeers } : {}
+    });
+    apex.negotiation = discovered.negotiation;
+    if (discovered.apexChildPeers) apex.childPeers = discovered.apexChildPeers;
+    this.log(
+      `[runner] discovered apex negotiation for "${apex.destination}" (chain ${discovered.negotiation.chainKey}, settle ${discovered.negotiation.settlementAddress})`
+    );
   }
   /** Inject the apex settlement negotiation directly into its ToonClient. */
   injectApexNegotiation(apex) {
@@ -1892,16 +1892,14 @@ var ClientRunner = class {
         minaAddress: safe(() => client?.getMinaAddress())
       },
       transport: {
-        type: this.config.socksProxy ? "socks5" : "direct",
-        ...this.config.socksProxy ? { socksProxy: this.config.socksProxy } : {},
+        type: "direct",
         ...apex ? { btpUrl: apex.btpUrl } : {}
       },
       relay: {
         url: this.defaultRelayUrl,
         connected: relay?.isConnected() ?? false,
         buffered: relay?.bufferedCount() ?? 0,
-        subscriptions: relay?.activeSubscriptions() ?? [],
-        ...this.readProxyError ? { proxyError: this.readProxyError } : {}
+        subscriptions: relay?.activeSubscriptions() ?? []
       },
       ...network ? { network } : {},
       ...apex?.lastError ? { lastError: apex.lastError } : {}
@@ -1935,7 +1933,14 @@ var ClientRunner = class {
   async publish(req) {
     const apex = this.selectApex(req.btpUrl);
     this.assertApexReady(apex);
-    const channelId = apex.apexChannelId ?? await apex.client.openChannel(req.destination);
+    let channelId = apex.apexChannelId;
+    if (!channelId) {
+      channelId = await apex.client.openChannel(req.destination);
+      if (!req.destination || req.destination === apex.destination) {
+        apex.apexChannelId = channelId;
+        this.persistApexChannel(apex, channelId);
+      }
+    }
     const fee = req.fee !== void 0 ? BigInt(req.fee) : apex.feePerEvent;
     const claim = await apex.client.signBalanceProof(channelId, fee);
     const result = await apex.client.publishEvent(req.event, {
@@ -2059,7 +2064,9 @@ var ClientRunner = class {
       destination ?? apex.destination
     );
     if (!destination || destination === apex.destination) {
+      const firstOpen = apex.apexChannelId !== channelId;
       apex.apexChannelId = channelId;
+      if (firstOpen) this.persistApexChannel(apex, channelId);
     }
     return { channelId };
   }
@@ -2136,19 +2143,11 @@ var ClientRunner = class {
       body: await res.text()
     };
   }
-  /** Graceful teardown: close every relay + stop every apex client + read proxy. */
+  /** Graceful teardown: close every relay + stop every apex client. */
   async stop() {
     if (this.stopped) return;
     this.stopped = true;
     for (const relay of this.relays.values()) relay.close();
-    if (this.stopReadProxy) {
-      try {
-        await this.stopReadProxy();
-      } catch (err) {
-        this.log(`[runner] read proxy stop error: ${errMsg2(err)}`);
-      }
-      this.stopReadProxy = void 0;
-    }
     for (const apex of this.apexes.values()) {
       try {
         await apex.client.stop();
@@ -2169,9 +2168,14 @@ var ClientRunner = class {
     return def;
   }
   assertApexReady(apex) {
+    if (!this.config.hasUplink) {
+      throw new TargetError(
+        "No write uplink configured \u2014 this daemon is read-only. Set TOON_CLIENT_PROXY_URL (connector proxy) or TOON_CLIENT_BTP_URL to enable paid writes."
+      );
+    }
     if (!apex.ready) {
       throw new NotReadyError(
-        apex.bootstrapping ? "Apex is still bootstrapping (BTP/anon coming up) \u2014 retry shortly." : apex.lastError ?? "Apex is not ready."
+        apex.bootstrapping ? "Apex is still bootstrapping (transport/channel coming up) \u2014 retry shortly." : apex.lastError ?? "Apex is not ready."
       );
     }
   }
@@ -2259,13 +2263,6 @@ function errMsg2(err) {
 function sanitize(s) {
   return s.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80);
 }
-function isAnyoneHost(url) {
-  try {
-    return new URL(url).hostname.endsWith(".anyone");
-  } catch {
-    return false;
-  }
-}
 
 // src/daemon/routes.ts
 function registerRoutes(app, runner) {
@@ -2492,4 +2489,4 @@ export {
   PublishRejectedError,
   registerRoutes
 };
-//# sourceMappingURL=chunk-L6F2B3GX.js.map
+//# sourceMappingURL=chunk-QFHCXJ2V.js.map