@fibscope/agent 0.1.2 → 0.1.3

package/.env.example

@@ -5,3 +5,5 @@ FIBSCOPE_AGENT_CHAIN=testnet
 FIBSCOPE_AGENT_FIBER_RPC_URL=http://127.0.0.1:8227
 FIBSCOPE_AGENT_PUSH_INTERVAL_MS=15000
 FIBSCOPE_AGENT_PUBLIC_PROFILE=false
+# Optional override; by default the agent discovers its own public IPv4.
+# FIBSCOPE_AGENT_PUBLIC_IP=54.179.226.154

package/README.md

@@ -48,7 +48,7 @@ The agent also supports `.fiber/agent.json`:
 }
 ```
 
-The hosted gateway returns the public IPv4 it observes for the authenticated agent request. The agent combines that IP with the local FNN P2P port and reports the resulting public multiaddr. Loopback, wildcard, private, and documentation addresses are never published. Set `peerAddress` only when intentionally overriding automatic discovery with another publicly dialable multiaddr.
+The agent discovers its own public IPv4 through `https://api.ipify.org`, combines it with the local FNN P2P port, and includes both the IP and resulting public multiaddr in registration and report requests. Loopback, wildcard, private, and documentation addresses are never published. Set `FIBSCOPE_AGENT_PUBLIC_IP` only when intentionally overriding automatic discovery, or `FIBSCOPE_AGENT_PUBLIC_IP_URL` to use another compatible JSON or plain-text discovery endpoint.
 
 ## Commands
 
@@ -74,9 +74,11 @@ The agent pushes to `POST /agent/v1/report` with:
 
 ```json
 {
-  "agentVersion": "0.1.2",
+  "agentVersion": "0.1.3",
   "chain": "testnet",
   "collectedAt": 1710000000000,
+  "publicIp": "54.179.226.154",
+  "peerAddress": "/ip4/54.179.226.154/tcp/8228",
   "node": {},
   "peers": [],
   "channels": [],
@@ -117,7 +119,7 @@ The Agent Setup page generates this command from a masked password field. The `f
 ## NPM Usage
 
 ```bash
-npm install -g @fibscope/agent@0.1.2 pm2 && agent init && pm2 start "$(command -v agent)" --name fibscope-agent --interpreter node -- start && pm2 save
+npm install -g @fibscope/agent pm2 && agent init && pm2 start "$(command -v agent)" --name fibscope-agent --interpreter node -- start && pm2 save
 ```
 
 Or run without a global install:

package/index.mjs

@@ -31,15 +31,17 @@ import { createTelemetryCollector } from "./lib/observe/collector.mjs";
 import { recommend } from "./lib/bridge/recommendation.mjs";
 import { virtualizePayment } from "./lib/route/route.mjs";
 import { chooseFnnInstance, describeFnnInstance, discoverFnnInstances, rpcResponds } from "./lib/fnn-discovery.mjs";
-import { buildObservedPeerAddress, peerTcpPort, publishablePeerAddresses } from "./lib/public-peer-address.mjs";
+import { buildObservedPeerAddress, discoverPublicIpv4, publishablePeerAddresses } from "./lib/public-peer-address.mjs";
 
-const AGENT_VERSION = "0.1.2";
+const AGENT_VERSION = "0.1.3";
 const DEFAULT_CONFIG_PATH = ".fiber/agent.json";
 const DEFAULT_STATUS_PATH = ".fiber/agent-status.json";
 const DEFAULT_PUSH_INTERVAL_MS = 15_000;
 const MAX_BACKOFF_MS = 300_000;
 const DEFAULT_PULSE_MODULE = new URL("./lib/pulse/index.mjs", import.meta.url).href;
 const DEFAULT_FNN_PREFLIGHT_TIMEOUT_MS = 2_500;
+const DEFAULT_PUBLIC_IP_DISCOVERY_URL = "https://api.ipify.org?format=json";
+const DEFAULT_PUBLIC_IP_DISCOVERY_TIMEOUT_MS = 5_000;
 const DEFAULT_REPORT_URL = "https://ejchwtvdxpyojxsursmh.supabase.co/functions/v1/fibscope-gateway/agent/v1/report";
 const AGENT_ENV_PATHS = [resolve("agent/.env"), resolve(".env")];
 const ENV_REPORT_URL = "FIBGATE";
@@ -367,9 +369,8 @@ export async function createRuntime(options = {}) {
   const statusPath = resolve(options.status ?? DEFAULT_STATUS_PATH);
   const config = await loadConfig(configPath, options);
   await ensureFnnPreflight(config, statusPath, options);
+  await resolveAgentPublicIdentity(config);
   const remoteConfig = await fetchAgentConfig(config).catch(() => undefined);
-  config.observedPublicIp = remoteConfig?.observedPublicIp ?? config.observedPublicIp;
-  config.observedPeerAddress = remoteConfig?.observedPeerAddress ?? config.observedPeerAddress;
   if (!config.nodeDisplayName && remoteConfig?.node?.displayName) {
     config.nodeDisplayName = remoteConfig.node.displayName;
   }
@@ -481,6 +482,8 @@ export async function collectReport(config, previousReport = undefined) {
     agentVersion: AGENT_VERSION,
     chain: config.chain ?? "testnet",
     collectedAt,
+    publicIp: config.publicIp,
+    peerAddress: config.publicPeerAddress,
     node: state.node,
     peers: state.peers ?? [],
     channels: state.channels ?? [],
@@ -509,8 +512,8 @@ async function enrichReportNode(node, config) {
     ...await inferPeerAddressesFromLocalFnn(config),
   ]);
   const addresses = publishablePeerAddresses([
-    config.observedPeerAddress,
-    buildObservedPeerAddress(config.observedPublicIp, [config.fnnP2pListenAddr, ...candidates]),
+    config.publicPeerAddress,
+    buildObservedPeerAddress(config.publicIp, [config.fnnP2pListenAddr, ...candidates]),
     ...candidates,
   ]);
   const enriched = {
@@ -2294,6 +2297,8 @@ async function loadConfig(configPath, options = {}) {
       ckbIndexerUrl: process.env.FIBSCOPE_AGENT_CKB_INDEXER_URL,
       walletPath: process.env.FIBSCOPE_AGENT_WALLET_PATH ?? envValue(ENV_WALLET_PATH),
       peerAddress: process.env.FIBSCOPE_AGENT_PEER_ADDRESS,
+      publicIp: process.env.FIBSCOPE_AGENT_PUBLIC_IP,
+      publicIpDiscoveryUrl: process.env.FIBSCOPE_AGENT_PUBLIC_IP_URL,
     };
     label = "agent/.env";
   } else if (!existsSync(configPath)) {
@@ -2315,10 +2320,6 @@ function resolveReportUrl(config = {}) {
 
 async function fetchAgentConfig(config) {
   const configUrl = new URL(config.configUrl ?? config.reportUrl.replace(/\/report\/?$/, "/config"));
-  configUrl.searchParams.set("p2pPort", String(peerTcpPort([
-    config.fnnP2pListenAddr,
-    ...configuredPeerAddresses(config),
-  ], 8228)));
   const response = await fetch(configUrl, {
     headers: {
       "x-agent-token": config.agentToken,
@@ -2368,6 +2369,8 @@ async function registerAgentNode(config, report, remoteConfig) {
       displayName: config.nodeDisplayName ?? remoteConfig?.node?.displayName,
       publicProfileEnabled: Boolean(report.publicProfileEnabled),
       overwrite: Boolean(config.overwriteNodeRegistration),
+      publicIp: report.publicIp ?? config.publicIp,
+      peerAddress: report.peerAddress ?? config.publicPeerAddress,
       node: report.node ?? {},
     }),
   });
@@ -2505,6 +2508,8 @@ function normalizeConfig(config, label) {
     ckbRpcUrl: process.env.FIBSCOPE_AGENT_CKB_RPC_URL ?? envValue(ENV_CKB_RPC_URL) ?? config.ckbRpcUrl,
     ckbIndexerUrl: process.env.FIBSCOPE_AGENT_CKB_INDEXER_URL ?? config.ckbIndexerUrl,
     walletPath: process.env.FIBSCOPE_AGENT_WALLET_PATH ?? envValue(ENV_WALLET_PATH) ?? config.walletPath,
+    publicIp: process.env.FIBSCOPE_AGENT_PUBLIC_IP ?? config.publicIp,
+    publicIpDiscoveryUrl: process.env.FIBSCOPE_AGENT_PUBLIC_IP_URL ?? config.publicIpDiscoveryUrl,
     pushIntervalMs: positiveNumber(config.pushIntervalMs, DEFAULT_PUSH_INTERVAL_MS),
     commandPollMs: positiveNumber(config.commandPollMs, DEFAULT_COMMAND_POLL_MS),
     knownPeerReconnectMs: positiveNumber(config.knownPeerReconnectMs, DEFAULT_KNOWN_PEER_RECONNECT_MS),
@@ -2516,6 +2521,25 @@ function normalizeConfig(config, label) {
   return normalized;
 }
 
+async function resolveAgentPublicIdentity(config) {
+  try {
+    const publicIp = await discoverPublicIpv4({
+      publicIp: config.publicIp,
+      endpoint: config.publicIpDiscoveryUrl ?? DEFAULT_PUBLIC_IP_DISCOVERY_URL,
+      timeoutMs: config.publicIpDiscoveryTimeoutMs ?? DEFAULT_PUBLIC_IP_DISCOVERY_TIMEOUT_MS,
+    });
+    config.publicIp = publicIp;
+    config.publicPeerAddress = buildObservedPeerAddress(publicIp, [
+      config.fnnP2pListenAddr,
+      ...configuredPeerAddresses(config),
+    ]);
+  } catch (error) {
+    console.warn(`Fibscope agent public IP unavailable: ${message(error)}`);
+    config.publicIp = undefined;
+    config.publicPeerAddress = publishablePeerAddresses(configuredPeerAddresses(config))[0];
+  }
+}
+
 async function bindAgentConfigToFnn(config, label, options = {}) {
   const next = { ...config };
   if (options.fiberRpcUrl) {

package/lib/public-peer-address.mjs

@@ -5,6 +5,39 @@ export function buildObservedPeerAddress(observedPublicIp, candidates = [], fall
   return `/ip4/${ip}/tcp/${port}`;
 }
 
+export async function discoverPublicIpv4(options = {}) {
+  const configured = normalizePublicIpv4(options.publicIp);
+  if (configured) return configured;
+
+  const endpoint = String(options.endpoint ?? "https://api.ipify.org?format=json").trim();
+  if (!endpoint) throw new Error("Public IPv4 discovery endpoint is not configured.");
+  const timeoutMs = positiveTimeout(options.timeoutMs, 5_000);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await (options.fetchImpl ?? fetch)(endpoint, {
+      headers: { accept: "application/json, text/plain;q=0.9" },
+      signal: controller.signal,
+    });
+    if (!response.ok) throw new Error(`HTTP ${response.status}`);
+    const body = await response.text();
+    let candidate = body;
+    try {
+      candidate = JSON.parse(body)?.ip ?? body;
+    } catch {
+      // Configurable plain-text IP endpoints are supported too.
+    }
+    const publicIp = normalizePublicIpv4(candidate);
+    if (!publicIp) throw new Error("response did not contain a public IPv4 address");
+    return publicIp;
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(`Public IPv4 discovery failed at ${endpoint}: ${detail}`);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
 export function peerTcpPort(values, fallback = 8228) {
   for (const value of flatStrings(values)) {
     const match = value.match(/\/tcp\/(\d{1,5})(?:\/|$)/i);
@@ -52,3 +85,8 @@ function flatStrings(values) {
   const input = Array.isArray(values) ? values.flat(Infinity) : [values];
   return input.map((value) => String(value ?? "").trim()).filter(Boolean);
 }
+
+function positiveTimeout(value, fallback) {
+  const number = Number(value);
+  return Number.isFinite(number) && number > 0 ? number : fallback;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibscope/agent",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "description": "Fibscope Agent for Fiber node owners.",
   "bin": {