@serfab/cadre-host 1.14.0 → 1.15.0

package/dist/installer/config.d.ts

@@ -35,6 +35,27 @@ export interface PushSettings {
     /** Per-strand burst-coalescing window (ms) forwarded into the node's push block. */
     debounceMs?: number;
 }
+/**
+ * Which addresses a hosted node's QR code carries (cadre-core's `selectNodeClaimAddresses`).
+ * Absent ⇒ `{ lan: 'auto' }`. Read on every claim-code request, so an edit applies to the
+ * next code shown.
+ */
+export interface ClaimAddressSettings {
+    /**
+     * The LAN address a phone at home dials: `'auto'` (the address on the router's subnet, else
+     * the machine's primary one; none in public-IP mode), `'none'` (public addresses only), or an
+     * IP address. Other private addresses (Docker bridges, VPNs) are left out either way.
+     */
+    lan?: string;
+    /**
+     * Exact addresses to put in every code instead, for an operator who knows better than the
+     * rule, such as one name behind a proxy. Each names no destination peer (a relay address ends
+     * at its `/p2p-circuit` hop); every node's code appends its own peer id.
+     */
+    addrs?: string[];
+}
+/** Why a `claimAddresses` value is unacceptable, naming the field; undefined when it is fine. */
+export declare function claimAddressSettingsProblem(value: unknown): string | undefined;
 export interface HostConfigFile {
     version: 3;
     /** A stable per-install id, for log correlation. */
@@ -57,6 +78,8 @@ export interface HostConfigFile {
      * they are read from the secret store at node-spawn time (`src/push/`).
      */
     push?: PushSettings;
+    /** Which addresses claim codes carry; absent ⇒ automatic. */
+    claimAddresses?: ClaimAddressSettings;
 }
 export declare function writeHostConfig(filePath: string, cfg: HostConfigFile): void;
 /** Apply a partial patch to the persisted config (read-modify-write). */

package/dist/installer/config.js

@@ -11,7 +11,50 @@
  * being silently misread.
  */
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { isIP } from 'node:net';
 import { dirname } from 'node:path';
+import { destinationPeerIdOf } from '@serfab/cadre-core';
+/** Why a `claimAddresses` value is unacceptable, naming the field; undefined when it is fine. */
+export function claimAddressSettingsProblem(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return '"claimAddresses" must be an object';
+    const o = value;
+    for (const key of Object.keys(o)) {
+        if (key !== 'lan' && key !== 'addrs')
+            return `Unknown setting "claimAddresses.${key}"`;
+    }
+    if (o.lan !== undefined) {
+        if (typeof o.lan !== 'string' || (o.lan !== 'auto' && o.lan !== 'none' && isIP(o.lan) === 0)) {
+            return '"claimAddresses.lan" must be "auto", "none" or an IP address';
+        }
+    }
+    if (o.addrs !== undefined) {
+        if (!Array.isArray(o.addrs) || !o.addrs.every((a) => typeof a === 'string')) {
+            return '"claimAddresses.addrs" must be a list of multiaddr strings';
+        }
+        for (const addr of o.addrs) {
+            const problem = exactClaimAddressProblem(addr);
+            if (problem)
+                return `"claimAddresses.addrs" entry "${addr}" ${problem}`;
+        }
+    }
+    return undefined;
+}
+/**
+ * Why one `claimAddresses.addrs` entry is unacceptable. It must not name its destination peer:
+ * the list is host-wide and each hosted node's code appends its own peer id, so a named one
+ * would be some other node's address in every code but that node's.
+ */
+function exactClaimAddressProblem(addr) {
+    let destination;
+    try {
+        destination = destinationPeerIdOf(addr.trim());
+    }
+    catch {
+        return 'is not a valid multiaddr';
+    }
+    return destination === null ? undefined : 'must not end in /p2p/<peer id>: each node\'s own id is appended';
+}
 const CURRENT_VERSION = 3;
 export function writeHostConfig(filePath, cfg) {
     if (cfg.version !== CURRENT_VERSION) {
@@ -51,6 +94,9 @@ export function readHostConfig(filePath) {
     if (!isHostConfigShape(obj)) {
         throw new Error(`host.config.json at ${filePath} is missing required fields`);
     }
+    const claimAddressesProblem = obj.claimAddresses === undefined ? undefined : claimAddressSettingsProblem(obj.claimAddresses);
+    if (claimAddressesProblem)
+        throw new Error(`host.config.json at ${filePath}: ${claimAddressesProblem}`);
     return obj;
 }
 function isHostConfigShape(v) {

package/dist/installer/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/installer/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqDpC,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,GAAmB;IACnE,IAAI,GAAG,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,mDAAmD,GAAG,CAAC,OAAO,cAAc,eAAe,GAAG,CAAC,CAAC;IAClH,CAAC;IACD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,KAA+C;IAE/C,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,IAAI,GAAmB;QAC3B,GAAG,OAAO;QACV,GAAG,KAAK;QACR,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE;QACzD,OAAO,EAAE,eAAe;KACzB,CAAC;IACF,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC3C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,uCAAuC,QAAQ,KAAM,GAAa,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IAChH,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,uBAAuB,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,GAAG,GAAG,MAAiC,CAAC;IAC9C,IAAI,GAAG,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CACb,uBAAuB,QAAQ,4BAA4B,GAAG,CAAC,OAAO,wBAAwB,eAAe,GAAG,CACjH,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,6BAA6B,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAU;IACnC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,CAAC,GAAG,CAA4B,CAAC;IACvC,IACE,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ;QAC/B,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ;QAC5B,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ;QAC7B,OAAO,CAAC,CAAC,WAAW,KAAK,SAAS;QAClC,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ;QACjC,OAAO,CAAC,CAAC,gBAAgB,KAAK,QAAQ,EACtC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,CAAC,OAA8C,CAAC;IACjE,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1D,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACzD,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/F,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/installer/config.ts"],"names":[],"mappings":"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"}

package/dist/installer/index.d.ts

@@ -40,6 +40,8 @@ export interface InstallOptions {
     serviceHost?: ServiceHost;
     /** Test-only: stub the interactive wizard. Production callers leave unset. */
     wizard?: (defaults: WizardDefaults) => Promise<WizardAnswers>;
+    /** Test-only: stub the interface read that decides whether to ask about UPnP. */
+    publicInterfaceAddress?: () => string | null;
 }
 export interface InstallResult {
     dataDir: string;

package/dist/installer/index.js

@@ -8,10 +8,11 @@
  * subsystem modules (wizard.ts, config.ts, service-host/{systemd,launchd,nssm}.ts,
  * browser.ts).
  */
-import { existsSync, mkdirSync, readFileSync, rmSync } from 'node:fs';
+import { existsSync, mkdirSync, rmSync } from 'node:fs';
 import { randomBytes } from 'node:crypto';
 import debug from 'debug';
-import { NatStore } from '../nat/index.js';
+import { NatStore, publicInterfaceAddress } from '../nat/index.js';
+import { packageVersion } from '../package-version.js';
 import { openBrowser } from './browser.js';
 import { writeHostConfig } from './config.js';
 import { configPath, defaultHostJs, defaultServiceDir, logsDir, } from './paths.js';
@@ -23,7 +24,7 @@ const log = debug('cadre:host:installer');
 export class Installer {
     constructor(opts = {}) {
         this.platform = opts.platform ?? detectPlatform();
-        this.installerVersion = opts.installerVersion ?? readPackageVersion();
+        this.installerVersion = opts.installerVersion ?? packageVersion;
     }
     async install(opts) {
         if (opts.system) {
@@ -112,7 +113,6 @@ export class Installer {
             dataDir: opts.dataDir ?? defaults.dataDir,
             uiPort: opts.uiPort ?? defaults.uiPort,
             upnpEnabled: opts.noUpnp ? false : defaults.upnpEnabled,
-            configureDdns: false,
         };
     }
     async resolveAnswers(opts) {
@@ -129,6 +129,9 @@ export class Installer {
             dataDir: opts.dataDir ?? platformDefaults.dataDir,
             uiPort: opts.uiPort ?? platformDefaults.uiPort,
             upnpEnabled: opts.noUpnp ? false : platformDefaults.upnpEnabled,
+            // A flag answers its question: the wizard asks only for what the command line left open.
+            given: { dataDir: opts.dataDir !== undefined, uiPort: opts.uiPort !== undefined, upnpEnabled: opts.noUpnp === true },
+            publicInterfaceIp: (opts.publicInterfaceAddress ?? publicInterfaceAddress)(),
         };
         const wizard = opts.wizard ?? runWizard;
         return await wizard(defaults);
@@ -143,18 +146,6 @@ function seedNatSettings(dataDir, upnpEnabled) {
 function randomInstallId() {
     return randomBytes(16).toString('hex');
 }
-function readPackageVersion() {
-    // Best-effort: read the package.json next to dist/ at runtime.
-    try {
-        const here = new URL('../../package.json', import.meta.url);
-        const raw = readFileSync(here, 'utf8');
-        const parsed = JSON.parse(raw);
-        return parsed.version ?? '0.0.0-unknown';
-    }
-    catch {
-        return '0.0.0-unknown';
-    }
-}
 // Exposed for tests that drive the wizard with a custom prompt fn.
 export { runWizard };
 //# sourceMappingURL=index.js.map

package/dist/installer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/installer/index.ts"],"names":[],"mappings":"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"}

package/dist/installer/wizard.d.ts

@@ -10,12 +10,22 @@ export interface WizardDefaults {
     dataDir: string;
     uiPort: number;
     upnpEnabled: boolean;
+    /** Values a command-line flag already supplied: the wizard does not ask for them again. */
+    given?: {
+        dataDir?: boolean;
+        uiPort?: boolean;
+        upnpEnabled?: boolean;
+    };
+    /**
+     * The public IPv4 an interface holds (`publicInterfaceAddress`), when one does: the machine is
+     * reached directly (a VPS), so there is no router to ask about UPnP.
+     */
+    publicInterfaceIp?: string | null;
 }
 export interface WizardAnswers {
     dataDir: string;
     uiPort: number;
     upnpEnabled: boolean;
-    configureDdns: boolean;
 }
 export declare const DEFAULT_UI_PORT = 8765;
 export declare function defaultsForPlatform(platform: SupportedPlatform): WizardDefaults;
@@ -23,6 +33,6 @@ export declare function defaultsForPlatform(platform: SupportedPlatform): Wizard
  * Drive the wizard with a function that returns the next user answer for
  * a prompt. Used both by the readline-backed `runWizard` and by tests.
  */
-export declare function runWizardWith(defaults: WizardDefaults, ask: (label: string, fallback: string) => Promise<string>): Promise<WizardAnswers>;
+export declare function runWizardWith(defaults: WizardDefaults, ask: (label: string, fallback: string) => Promise<string>, say?: (line: string) => void): Promise<WizardAnswers>;
 /** Production entrypoint — drives the wizard over stdin/stdout. */
 export declare function runWizard(defaults: WizardDefaults): Promise<WizardAnswers>;

package/dist/installer/wizard.js

@@ -19,18 +19,26 @@ export function defaultsForPlatform(platform) {
  * Drive the wizard with a function that returns the next user answer for
  * a prompt. Used both by the readline-backed `runWizard` and by tests.
  */
-export async function runWizardWith(defaults, ask) {
-    const dataDir = (await ask('Data directory', defaults.dataDir)).trim() || defaults.dataDir;
-    const uiPort = parsePort(await ask('UI port (localhost only)', String(defaults.uiPort)), defaults.uiPort);
-    const upnpEnabled = parseBool(await ask('Attempt UPnP port mapping on this network? [Y/n]', defaults.upnpEnabled ? 'Y' : 'n'), defaults.upnpEnabled);
-    const configureDdns = parseBool(await ask('Configure DDNS now? [y/N]', 'N'), false);
-    return { dataDir, uiPort, upnpEnabled, configureDdns };
+export async function runWizardWith(defaults, ask, say = () => { }) {
+    const given = defaults.given ?? {};
+    const dataDir = given.dataDir ? defaults.dataDir : (await ask('Data directory', defaults.dataDir)).trim() || defaults.dataDir;
+    const uiPort = given.uiPort
+        ? defaults.uiPort
+        : parsePort(await ask('UI port (localhost only)', String(defaults.uiPort)), defaults.uiPort);
+    let upnpEnabled = defaults.upnpEnabled;
+    if (defaults.publicInterfaceIp) {
+        say(`This machine has a public IP address (${defaults.publicInterfaceIp}), so it is reached directly: no router, no UPnP.`);
+    }
+    else if (!given.upnpEnabled) {
+        upnpEnabled = parseBool(await ask('This machine is behind a router. Ask it to map ports automatically (UPnP)? [Y/n]', defaults.upnpEnabled ? 'Y' : 'n'), defaults.upnpEnabled);
+    }
+    return { dataDir, uiPort, upnpEnabled };
 }
 /** Production entrypoint — drives the wizard over stdin/stdout. */
 export async function runWizard(defaults) {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     try {
-        return await runWizardWith(defaults, async (label, fallback) => prompt(rl, label, fallback));
+        return await runWizardWith(defaults, async (label, fallback) => prompt(rl, label, fallback), (line) => console.log(line));
     }
     finally {
         rl.close();

package/dist/installer/wizard.js.map

@@ -1 +1 @@
-{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/installer/wizard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/installer/wizard.ts"],"names":[],"mappings":"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"}

package/dist/nat/index.d.ts

@@ -10,7 +10,7 @@ export { NAT_ADDRESS_RESTART_MIN_INTERVAL_MS } from './address-watch.js';
 export type { NodeAddressesStaleListener } from './address-watch.js';
 export { NatStore } from './nat-store.js';
 export { NatError, } from './types.js';
-export type { NatStatusSnapshot, NatGatewayStatus, NatDdnsStatus, NatSettingsFile, NatDdnsSettings, NatHandlers, NatErrorCode, DirectReachability, NodeReachability, NodeVerdict, PortKind, PortRoute, PortRouteSource, ManualForward, ManualForwardPatch, DdnsProviderInfo, DdnsConfigField, } from './types.js';
+export type { NatStatusSnapshot, NatGatewayStatus, NatDdnsStatus, NatNetworkStatus, NetworkMode, NetworkSetting, NatSettingsFile, NatDdnsSettings, NatHandlers, NatErrorCode, DirectReachability, NodeReachability, NodeVerdict, PortKind, PortRoute, PortRouteSource, ManualForward, ManualForwardPatch, DdnsProviderInfo, DdnsConfigField, } from './types.js';
 export { ExternalIpDetector, isPlausibleIp, } from './external-ip.js';
 export type { ExternalIpResult, RouterIpProbe, ExternalIpDetectorOptions, } from './external-ip.js';
 export { UpnpPortMapper, pickLanAddress, DEFAULT_LEASE_TTL_MS, DEFAULT_REFRESH_MS, GATEWAY_DISCOVERY_TIMEOUT_MS, } from './port-mapper.js';
@@ -18,6 +18,7 @@ export type { PortMapper, GatewayInfo, PortMapRequest, PortMapResult, } from './
 export { evaluateNodeReachability, evaluateHostReachability } from './reachability.js';
 export type { NodeVerdictInput, NodeVerdictResult } from './reachability.js';
 export { buildPublicAddresses, isPublicIpv4 } from './address-resolver.js';
+export { publicInterfaceAddress, effectiveNetworkMode } from './network-mode.js';
 export type { PublicAddressInput } from './address-resolver.js';
 export { BUILTIN_PROVIDERS, getProvider, listProviders, duckDnsProvider, DdnsUpdater, } from './ddns/index.js';
 export type { DdnsProvider, DdnsProviderDeps, DdnsUpdaterOptions, DdnsUpdateOutcome, } from './ddns/index.js';

package/dist/nat/index.js

@@ -12,6 +12,7 @@ export { ExternalIpDetector, isPlausibleIp, } from './external-ip.js';
 export { UpnpPortMapper, pickLanAddress, DEFAULT_LEASE_TTL_MS, DEFAULT_REFRESH_MS, GATEWAY_DISCOVERY_TIMEOUT_MS, } from './port-mapper.js';
 export { evaluateNodeReachability, evaluateHostReachability } from './reachability.js';
 export { buildPublicAddresses, isPublicIpv4 } from './address-resolver.js';
+export { publicInterfaceAddress, effectiveNetworkMode } from './network-mode.js';
 export { BUILTIN_PROVIDERS, getProvider, listProviders, duckDnsProvider, DdnsUpdater, } from './ddns/index.js';
 export { KeytarSecretsStore, FileSecretsStore, createSecretsStore, ddnsAccount, KEYTAR_SERVICE, } from './secrets/index.js';
 //# sourceMappingURL=index.js.map

package/dist/nat/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/nat/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EACL,QAAQ,GACT,MAAM,YAAY,CAAC;AAoBpB,OAAO,EACL,kBAAkB,EAClB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EACL,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAO1B,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,eAAe,EACf,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,cAAc,GACf,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/nat/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mCAAmC,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EACL,QAAQ,GACT,MAAM,YAAY,CAAC;AAuBpB,OAAO,EACL,kBAAkB,EAClB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EACL,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAO1B,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEjF,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,eAAe,EACf,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,cAAc,GACf,MAAM,oBAAoB,CAAC"}

package/dist/nat/nat-service.d.ts

@@ -48,6 +48,8 @@ export interface NatServiceOptions {
     store?: NatStore;
     /** Lease TTL asked of the router. Default 1 h. */
     leaseTtlMs?: number;
+    /** Test-only: stub the interface read behind `network: auto`. Default: `publicInterfaceAddress()`. */
+    publicInterfaceAddress?: () => string | null;
 }
 /**
  * NatService — one mapping table for every node the host runs, keyed by node
@@ -92,6 +94,9 @@ export declare class NatService {
     private ddnsUpdater;
     private currentSettings;
     private gateway;
+    /** The public IPv4 an interface holds (`publicInterfaceAddress`), re-read at start and on every probe. */
+    private publicInterfaceIp;
+    private readonly readInterfaces;
     private latestIp;
     private lastTestedAt;
     private readonly table;
@@ -166,10 +171,11 @@ export declare class NatService {
      */
     renewMappings(): Promise<void>;
     /**
-     * The 5-minute probe pass: while UPnP is on and no router has answered,
-     * search again and map the running nodes as soon as one does — a host that
-     * boots before its network, or a router that comes up later, is found here
-     * rather than at the next restart; then re-detect the external IP.
+     * The 5-minute probe pass: re-read the interfaces and re-route every node when
+     * the mode `auto` lands on changes; while UPnP is in use and no router has
+     * answered, search again and map the running nodes as soon as one does — a
+     * host that boots before its network, or a router that comes up later, is
+     * found here rather than at the next restart; then re-detect the external IP.
      */
     redetect(): Promise<void>;
     /** Re-discover the router if needed, re-map everything, re-detect the IP, then return a fresh snapshot. */
@@ -244,8 +250,19 @@ export declare class NatService {
     private ipDetector;
     /** The detected external IP for display and DDNS: the public probe's, else the router's. */
     private detectedIp;
-    /** The IP used in `/ip4/` addresses: only a public IPv4 counts. */
+    /** The IP used in `/ip4/` addresses: only a public IPv4 counts. Public mode prefers the interface's own. */
     private publicIpv4;
+    /**
+     * Re-read the interfaces (a VPS gains an address, a laptop moves networks); true when that
+     * changed the mode in effect, so the caller re-routes every node in the same pass.
+     */
+    private refreshNetworkMode;
+    /** The mode in effect: the `network` setting, or what `auto` reads from the interfaces. */
+    private networkMode;
+    /** UPnP is asked for nothing in public mode: there is no router to ask. */
+    private usesUpnp;
+    /** An interface holding the public address rules out carrier-grade NAT, whatever the probes say. */
+    private cgnatDetected;
     private describeNode;
     private hostKnown;
     private addressesFor;

package/dist/nat/nat-service.js

@@ -7,6 +7,7 @@ import { evaluateHostReachability, evaluateNodeReachability } from './reachabili
 import { DdnsUpdater } from './ddns/updater.js';
 import { getProvider, listProviders } from './ddns/index.js';
 import { buildPublicAddresses, isPublicIpv4 } from './address-resolver.js';
+import { effectiveNetworkMode, publicInterfaceAddress } from './network-mode.js';
 import { createSecretsStore, ddnsAccount } from './secrets/index.js';
 import { AddressWatch } from './address-watch.js';
 const log = debug('cadre:host:nat-service');
@@ -27,6 +28,10 @@ const PORT_KINDS = ['tcp', 'ws'];
 function noRoute(internalPort) {
     return { internalPort, externalPort: null, source: null, leaseExpiresAt: null, error: null };
 }
+/** Public mode: the port is reached at its own number, with nothing to map. */
+function directRoute(internalPort) {
+    return { internalPort, externalPort: internalPort, source: 'direct', leaseExpiresAt: null, error: null };
+}
 function manualRoute(internalPort, externalPort) {
     return { internalPort, externalPort, source: 'manual', leaseExpiresAt: null, error: null };
 }
@@ -74,6 +79,8 @@ export class NatService {
         this.detector = null;
         this.ddnsUpdater = null;
         this.gateway = { found: false, lanAddress: null, routerExternalIp: null, lastError: null };
+        /** The public IPv4 an interface holds (`publicInterfaceAddress`), re-read at start and on every probe. */
+        this.publicInterfaceIp = null;
         this.latestIp = null;
         this.lastTestedAt = null;
         this.table = new Map();
@@ -94,6 +101,7 @@ export class NatService {
         this.secretsStore = opts.secretsStore ?? null;
         this.injectedDetector = opts.externalIpDetector ?? null;
         this.secretsRootDir = opts.rootDir;
+        this.readInterfaces = opts.publicInterfaceAddress ?? (() => publicInterfaceAddress());
         this.currentSettings = this.store.load();
         this.addressWatch = new AddressWatch(() => this.nowFn().getTime());
     }
@@ -110,7 +118,9 @@ export class NatService {
         if (!this.secretsStore) {
             this.secretsStore = await createSecretsStore(this.secretsRootDir);
         }
-        if (this.currentSettings.upnpEnabled)
+        this.publicInterfaceIp = this.readInterfaces();
+        log('network mode %s (setting %s, public interface address %s)', this.networkMode(), this.currentSettings.network, this.publicInterfaceIp ?? 'none');
+        if (this.usesUpnp())
             await this.discoverGateway();
         await this.detectIp();
         this.ddnsUpdater = new DdnsUpdater({
@@ -168,11 +178,12 @@ export class NatService {
     // --- reads ---
     /** Cheap read of the current snapshot. */
     getStatus() {
-        const cgnatDetected = this.latestIp?.cgnat ?? false;
+        const cgnatDetected = this.cgnatDetected();
         const nodes = [...this.table.values()]
             .sort((a, b) => a.nodeId.localeCompare(b.nodeId))
             .map((entry) => this.describeNode(entry, cgnatDetected));
         return {
+            network: { setting: this.currentSettings.network, mode: this.networkMode(), publicInterfaceIp: this.publicInterfaceIp },
             upnpEnabled: this.currentSettings.upnpEnabled,
             gateway: { ...this.gateway, routerExternalIp: this.latestIp?.routerIp ?? null },
             externalIp: this.detectedIp(),
@@ -247,19 +258,21 @@ export class NatService {
         return this.enqueue(() => this.renewOnce());
     }
     /**
-     * The 5-minute probe pass: while UPnP is on and no router has answered,
-     * search again and map the running nodes as soon as one does — a host that
-     * boots before its network, or a router that comes up later, is found here
-     * rather than at the next restart; then re-detect the external IP.
+     * The 5-minute probe pass: re-read the interfaces and re-route every node when
+     * the mode `auto` lands on changes; while UPnP is in use and no router has
+     * answered, search again and map the running nodes as soon as one does — a
+     * host that boots before its network, or a router that comes up later, is
+     * found here rather than at the next restart; then re-detect the external IP.
      */
     async redetect() {
-        if (this.currentSettings.upnpEnabled && !this.gateway.found) {
-            await this.enqueue(async () => {
+        await this.enqueue(async () => {
+            const modeChanged = this.refreshNetworkMode();
+            const gatewayWasFound = this.gateway.found;
+            if (this.usesUpnp() && !gatewayWasFound)
                 await this.discoverGateway();
-                if (this.gateway.found)
-                    await this.reconcileOnce({ mapMissing: true });
-            });
-        }
+            if (modeChanged || (!gatewayWasFound && this.gateway.found))
+                await this.reconcileOnce({ mapMissing: true });
+        });
         await this.detectIp();
         this.publish();
     }
@@ -267,7 +280,8 @@ export class NatService {
     /** Re-discover the router if needed, re-map everything, re-detect the IP, then return a fresh snapshot. */
     async testReachability() {
         await this.enqueue(async () => {
-            if (this.currentSettings.upnpEnabled && !this.gateway.found)
+            this.refreshNetworkMode();
+            if (this.usesUpnp() && !this.gateway.found)
                 await this.discoverGateway();
             await this.reconcileOnce({ mapMissing: false });
             await this.renewOnce();
@@ -283,7 +297,8 @@ export class NatService {
     /** Replace settings; persists to disk and reconfigures the runtime. */
     async putSettings(patch) {
         const next = this.store.update(patch);
-        const upnpChanged = next.upnpEnabled !== this.currentSettings.upnpEnabled;
+        const wasUsingUpnp = this.usesUpnp();
+        const modeBefore = this.networkMode();
         const ddnsChanged = next.ddns.providerId !== this.currentSettings.ddns.providerId ||
             next.ddns.hostname !== this.currentSettings.ddns.hostname ||
             next.ddns.externallyManaged !== this.currentSettings.ddns.externallyManaged ||
@@ -293,12 +308,12 @@ export class NatService {
             if (ddnsChanged && this.ddnsUpdater) {
                 await this.ddnsUpdater.updateSettings(next.ddns);
             }
-            if (upnpChanged) {
-                // Turning UPnP on with no gateway known yet: look for one before the
-                // pass, so the pass can map. Turning it off: the pass releases every
-                // `upnp` route and keeps the manual ones.
+            if (this.usesUpnp() !== wasUsingUpnp || this.networkMode() !== modeBefore) {
+                // UPnP coming into use (turned on, or leaving public mode) with no gateway known yet:
+                // look for one before the pass, so the pass can map. Going out of use: the pass
+                // releases every `upnp` route and keeps the manual ones; public mode adds `direct` ones.
                 await this.enqueue(async () => {
-                    if (next.upnpEnabled && !this.gateway.found)
+                    if (this.usesUpnp() && !this.gateway.found)
                         await this.discoverGateway();
                     await this.reconcileOnce({ mapMissing: true });
                 });
@@ -464,9 +479,15 @@ export class NatService {
                 entry.routes[kind] = manualRoute(route.internalPort, forward);
                 continue;
             }
-            if (route.source === 'manual') {
+            if (route.source === 'manual' || route.source === 'direct') {
                 entry.routes[kind] = noRoute(route.internalPort);
             }
+            if (this.networkMode() === 'public') {
+                if (route.source === 'upnp')
+                    await this.unmapRoute(entry, kind);
+                entry.routes[kind] = directRoute(route.internalPort);
+                continue;
+            }
             if (!this.currentSettings.upnpEnabled) {
                 if (entry.routes[kind].source === 'upnp')
                     await this.unmapRoute(entry, kind);
@@ -485,7 +506,7 @@ export class NatService {
     async renewOnce() {
         if (!this.started)
             return;
-        if (!this.currentSettings.upnpEnabled || !this.gateway.found)
+        if (!this.usesUpnp() || !this.gateway.found)
             return;
         for (const entry of this.table.values()) {
             if (!this.started)
@@ -493,7 +514,7 @@ export class NatService {
             if (!entry.running)
                 continue;
             for (const kind of this.kindsOf(entry)) {
-                if (entry.routes[kind].source === 'manual')
+                if (entry.routes[kind].source !== 'upnp' && entry.routes[kind].source !== null)
                     continue;
                 await this.mapRoute(entry, kind);
             }
@@ -614,11 +635,37 @@ export class NatService {
     detectedIp() {
         return this.latestIp?.publicIp ?? this.latestIp?.routerIp ?? null;
     }
-    /** The IP used in `/ip4/` addresses: only a public IPv4 counts. */
+    /** The IP used in `/ip4/` addresses: only a public IPv4 counts. Public mode prefers the interface's own. */
     publicIpv4() {
+        if (this.networkMode() === 'public' && this.publicInterfaceIp)
+            return this.publicInterfaceIp;
         const ip = this.detectedIp();
         return ip && isPublicIpv4(ip) ? ip : null;
     }
+    /**
+     * Re-read the interfaces (a VPS gains an address, a laptop moves networks); true when that
+     * changed the mode in effect, so the caller re-routes every node in the same pass.
+     */
+    refreshNetworkMode() {
+        const modeBefore = this.networkMode();
+        this.publicInterfaceIp = this.readInterfaces();
+        const changed = this.networkMode() !== modeBefore;
+        if (changed)
+            log('network mode changed to %s (public interface address %s)', this.networkMode(), this.publicInterfaceIp ?? 'none');
+        return changed;
+    }
+    /** The mode in effect: the `network` setting, or what `auto` reads from the interfaces. */
+    networkMode() {
+        return effectiveNetworkMode(this.currentSettings.network, this.publicInterfaceIp);
+    }
+    /** UPnP is asked for nothing in public mode: there is no router to ask. */
+    usesUpnp() {
+        return this.currentSettings.upnpEnabled && this.networkMode() === 'lan';
+    }
+    /** An interface holding the public address rules out carrier-grade NAT, whatever the probes say. */
+    cgnatDetected() {
+        return this.networkMode() === 'public' ? false : this.latestIp?.cgnat ?? false;
+    }
     // --- status assembly ---
     describeNode(entry, cgnatDetected) {
         const tcp = this.effectiveRoute(entry.routes.tcp);
@@ -628,7 +675,7 @@ export class NatService {
             ws,
             hostKnown: this.hostKnown(),
             cgnatDetected,
-            upnpEnabled: this.currentSettings.upnpEnabled,
+            upnpEnabled: this.usesUpnp(),
             gatewayFound: this.gateway.found,
             lanAddress: this.gateway.lanAddress,
         });
@@ -649,7 +696,7 @@ export class NatService {
         return buildPublicAddresses({
             ddnsHostname: this.currentSettings.ddns.hostname,
             externalIp: this.publicIpv4(),
-            cgnatDetected: this.latestIp?.cgnat ?? false,
+            cgnatDetected: this.cgnatDetected(),
             tcp,
             ws,
         });
@@ -658,13 +705,15 @@ export class NatService {
         const forward = this.currentSettings.forwards[nodeId]?.[kind];
         if (forward !== undefined)
             return manualRoute(internalPort, forward);
+        if (this.networkMode() === 'public')
+            return directRoute(internalPort);
         const existing = entry?.routes[kind];
         if (existing && existing.internalPort === internalPort) {
             const route = this.effectiveRoute(existing);
             if (route.source !== null || route.error !== null)
                 return route;
         }
-        if (this.currentSettings.upnpEnabled && this.gateway.found) {
+        if (this.usesUpnp() && this.gateway.found) {
             return { internalPort, externalPort: internalPort, source: 'upnp', leaseExpiresAt: null, error: null };
         }
         return noRoute(internalPort);