@evomap/evolver 1.69.15 → 1.69.19

package/src/atp/hubClient.js

@@ -1,8 +1,70 @@
 // ATP (Agent Transaction Protocol) Hub Client
 // Wraps /a2a/atp/* endpoints for evolver-based agents.
-// Uses the same _hubPost/_hubGet pattern as a2aProtocol.js.
+//
+// Routing rules (#460 Bug 2):
+//   - When EVOMAP_PROXY=1 (or A2A_TRANSPORT=mailbox) AND a local proxy is
+//     running (settings.json contains proxy.url), all ATP requests are
+//     forwarded to the proxy's /atp/* passthrough routes so the proxy is the
+//     single egress point (matches mailbox/task/session behavior).
+//   - Otherwise, requests go directly to the Hub via the legacy _hubPost /
+//     _hubGet path, preserving the 1.69.x and earlier behavior for users who
+//     never started the proxy.
+//
+// The proxy overrides sender_id with its own node_id, so callers must be on
+// the same node as the running proxy. This is enforced server-side (proxy is
+// bound to 127.0.0.1).
 
+const http = require('http');
 const { getHubUrl, buildHubHeaders, getNodeId } = require('../gep/a2aProtocol');
+const { getProxyUrl } = require('../proxy/server/settings');
+
+function _isProxyMode() {
+  if (process.env.EVOMAP_PROXY === '1') return true;
+  if (process.env.A2A_TRANSPORT === 'mailbox') return true;
+  return false;
+}
+
+function _proxyRequest(method, path, body, timeoutMs) {
+  const proxyUrl = getProxyUrl();
+  if (!proxyUrl) return Promise.resolve({ ok: false, error: 'proxy_not_running' });
+
+  const url = new URL(path, proxyUrl);
+  const timeout = timeoutMs || require('../config').HTTP_TRANSPORT_TIMEOUT_MS;
+
+  return new Promise(function (resolve) {
+    const payload = body ? JSON.stringify(body) : '';
+    const headers = { 'Content-Type': 'application/json' };
+    if (payload) headers['Content-Length'] = Buffer.byteLength(payload);
+
+    const req = http.request(
+      {
+        hostname: url.hostname,
+        port: url.port,
+        path: url.pathname + (url.search || ''),
+        method: method,
+        headers: headers,
+        timeout: timeout,
+      },
+      function (res) {
+        const chunks = [];
+        res.on('data', function (c) { chunks.push(c); });
+        res.on('end', function () {
+          const raw = Buffer.concat(chunks).toString();
+          if (res.statusCode >= 200 && res.statusCode < 300) {
+            try { resolve({ ok: true, data: JSON.parse(raw) }); }
+            catch (_) { resolve({ ok: true, data: { raw: raw } }); }
+          } else {
+            resolve({ ok: false, status: res.statusCode, error: raw.slice(0, 400) });
+          }
+        });
+      }
+    );
+    req.on('error', function (err) { resolve({ ok: false, error: err.message }); });
+    req.on('timeout', function () { req.destroy(); resolve({ ok: false, error: 'proxy_timeout' }); });
+    if (payload) req.write(payload);
+    req.end();
+  });
+}
 
 function _hubPost(pathSuffix, body, timeoutMs) {
   const hubUrl = getHubUrl();
@@ -39,6 +101,23 @@ function _hubGet(pathSuffix, timeoutMs) {
     .catch(function (err) { return { ok: false, error: err.message }; });
 }
 
+// Dispatcher: choose proxy or direct hub based on env + proxy availability.
+// proxyPath is the path relative to proxy root (e.g. '/atp/order').
+// hubPath is the path relative to hub root (e.g. '/a2a/atp/order').
+function _post(proxyPath, hubPath, body, timeoutMs) {
+  if (_isProxyMode() && getProxyUrl()) {
+    return _proxyRequest('POST', proxyPath, body, timeoutMs);
+  }
+  return _hubPost(hubPath, body, timeoutMs);
+}
+
+function _get(proxyPath, hubPath, timeoutMs) {
+  if (_isProxyMode() && getProxyUrl()) {
+    return _proxyRequest('GET', proxyPath, null, timeoutMs);
+  }
+  return _hubGet(hubPath, timeoutMs);
+}
+
 /**
  * POST /a2a/atp/order -- place an ATP order with routing
  * @param {object} opts
@@ -52,7 +131,7 @@ function _hubGet(pathSuffix, timeoutMs) {
  */
 function placeOrder(opts) {
   const nodeId = getNodeId();
-  return _hubPost('/a2a/atp/order', {
+  return _post('/atp/order', '/a2a/atp/order', {
     sender_id: nodeId,
     capabilities: opts.capabilities,
     budget: Math.max(1, Math.round(Number(opts.budget) || 10)),
@@ -71,7 +150,7 @@ function placeOrder(opts) {
  */
 function submitDelivery(orderId, proofPayload) {
   const nodeId = getNodeId();
-  return _hubPost('/a2a/atp/deliver', {
+  return _post('/atp/deliver', '/a2a/atp/deliver', {
     sender_id: nodeId,
     order_id: orderId,
     proof_payload: proofPayload || {},
@@ -85,7 +164,7 @@ function submitDelivery(orderId, proofPayload) {
  */
 function verifyDelivery(orderId, action) {
   const nodeId = getNodeId();
-  return _hubPost('/a2a/atp/verify', {
+  return _post('/atp/verify', '/a2a/atp/verify', {
     sender_id: nodeId,
     order_id: orderId,
     action: action || 'confirm',
@@ -98,7 +177,7 @@ function verifyDelivery(orderId, action) {
  */
 function settleOrder(orderId) {
   const nodeId = getNodeId();
-  return _hubPost('/a2a/atp/settle', {
+  return _post('/atp/settle', '/a2a/atp/settle', {
     sender_id: nodeId,
     order_id: orderId,
   });
@@ -111,7 +190,7 @@ function settleOrder(orderId) {
  */
 function disputeOrder(orderId, reason) {
   const nodeId = getNodeId();
-  return _hubPost('/a2a/atp/dispute', {
+  return _post('/atp/dispute', '/a2a/atp/dispute', {
     sender_id: nodeId,
     order_id: orderId,
     reason: reason,
@@ -124,7 +203,8 @@ function disputeOrder(orderId, reason) {
  */
 function getMerchantTier(nodeId) {
   const nid = nodeId || getNodeId();
-  return _hubGet('/a2a/atp/merchant/tier?node_id=' + encodeURIComponent(nid));
+  const q = '?node_id=' + encodeURIComponent(nid);
+  return _get('/atp/merchant/tier' + q, '/a2a/atp/merchant/tier' + q);
 }
 
 /**
@@ -132,7 +212,8 @@ function getMerchantTier(nodeId) {
  * @param {string} orderId
  */
 function getOrderStatus(orderId) {
-  return _hubGet('/a2a/atp/order/' + encodeURIComponent(orderId));
+  const suffix = '/' + encodeURIComponent(orderId);
+  return _get('/atp/order' + suffix, '/a2a/atp/order' + suffix);
 }
 
 /**
@@ -148,14 +229,15 @@ function listProofs(opts) {
   if (opts && opts.role) params.set('role', opts.role);
   if (opts && opts.status) params.set('status', opts.status);
   if (opts && opts.limit) params.set('limit', String(opts.limit));
-  return _hubGet('/a2a/atp/proofs?' + params.toString());
+  const q = '?' + params.toString();
+  return _get('/atp/proofs' + q, '/a2a/atp/proofs' + q);
 }
 
 /**
  * GET /a2a/atp/policy -- get ATP policy config
  */
 function getAtpPolicy() {
-  return _hubGet('/a2a/atp/policy');
+  return _get('/atp/policy', '/a2a/atp/policy');
 }
 
 module.exports = {
@@ -168,4 +250,6 @@ module.exports = {
   getOrderStatus,
   listProofs,
   getAtpPolicy,
+  // exported for tests only
+  _isProxyMode: _isProxyMode,
 };

package/src/atp/index.js

@@ -7,12 +7,16 @@
 //   consumerAgent   - ready-to-use consumer agent template
 //   serviceHelper   - service publishing helper
 //   defaultHandler  - default order handler + config helpers for auto-ATP
+//   autoBuyer       - opt-in capability-gap auto order helper with budget caps
+//   cli             - parsers and runners for the `buy`/`orders`/`verify` subcommands
 
 const hubClient = require('./hubClient');
 const merchantAgent = require('./merchantAgent');
 const consumerAgent = require('./consumerAgent');
 const serviceHelper = require('./serviceHelper');
 const defaultHandler = require('./defaultHandler');
+const autoBuyer = require('./autoBuyer');
+const cli = require('./cli');
 
 module.exports = {
   hubClient,
@@ -20,4 +24,6 @@ module.exports = {
   consumerAgent,
   serviceHelper,
   defaultHandler,
+  autoBuyer,
+  cli,
 };