@serfab/cadre-host 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +101 -0
- package/dist/auth/duration.d.ts +1 -0
- package/dist/auth/duration.js +32 -0
- package/dist/auth/duration.js.map +1 -0
- package/dist/auth/index.d.ts +9 -0
- package/dist/auth/index.js +8 -0
- package/dist/auth/index.js.map +1 -0
- package/dist/auth/trust-circle-store.d.ts +26 -0
- package/dist/auth/trust-circle-store.js +129 -0
- package/dist/auth/trust-circle-store.js.map +1 -0
- package/dist/auth/trust-circle.d.ts +91 -0
- package/dist/auth/trust-circle.js +230 -0
- package/dist/auth/trust-circle.js.map +1 -0
- package/dist/auth/types.d.ts +81 -0
- package/dist/auth/types.js +24 -0
- package/dist/auth/types.js.map +1 -0
- package/dist/bin/host.d.ts +13 -0
- package/dist/bin/host.js +826 -0
- package/dist/bin/host.js.map +1 -0
- package/dist/index.d.ts +32 -0
- package/dist/index.js +27 -0
- package/dist/index.js.map +1 -0
- package/dist/installer/browser.d.ts +14 -0
- package/dist/installer/browser.js +35 -0
- package/dist/installer/browser.js.map +1 -0
- package/dist/installer/config.d.ts +43 -0
- package/dist/installer/config.js +113 -0
- package/dist/installer/config.js.map +1 -0
- package/dist/installer/identity.d.ts +23 -0
- package/dist/installer/identity.js +36 -0
- package/dist/installer/identity.js.map +1 -0
- package/dist/installer/index.d.ts +83 -0
- package/dist/installer/index.js +204 -0
- package/dist/installer/index.js.map +1 -0
- package/dist/installer/paths.d.ts +33 -0
- package/dist/installer/paths.js +84 -0
- package/dist/installer/paths.js.map +1 -0
- package/dist/installer/platform.d.ts +9 -0
- package/dist/installer/platform.js +21 -0
- package/dist/installer/platform.js.map +1 -0
- package/dist/installer/service-host/index.d.ts +11 -0
- package/dist/installer/service-host/index.js +16 -0
- package/dist/installer/service-host/index.js.map +1 -0
- package/dist/installer/service-host/launchd.d.ts +16 -0
- package/dist/installer/service-host/launchd.js +79 -0
- package/dist/installer/service-host/launchd.js.map +1 -0
- package/dist/installer/service-host/nssm.d.ts +20 -0
- package/dist/installer/service-host/nssm.js +88 -0
- package/dist/installer/service-host/nssm.js.map +1 -0
- package/dist/installer/service-host/systemd.d.ts +16 -0
- package/dist/installer/service-host/systemd.js +78 -0
- package/dist/installer/service-host/systemd.js.map +1 -0
- package/dist/installer/service-host/template.d.ts +6 -0
- package/dist/installer/service-host/template.js +20 -0
- package/dist/installer/service-host/template.js.map +1 -0
- package/dist/installer/service-host/types.d.ts +40 -0
- package/dist/installer/service-host/types.js +6 -0
- package/dist/installer/service-host/types.js.map +1 -0
- package/dist/installer/wizard.d.ts +31 -0
- package/dist/installer/wizard.js +67 -0
- package/dist/installer/wizard.js.map +1 -0
- package/dist/nat/address-resolver.d.ts +22 -0
- package/dist/nat/address-resolver.js +31 -0
- package/dist/nat/address-resolver.js.map +1 -0
- package/dist/nat/ddns/duckdns.d.ts +12 -0
- package/dist/nat/ddns/duckdns.js +57 -0
- package/dist/nat/ddns/duckdns.js.map +1 -0
- package/dist/nat/ddns/index.d.ts +30 -0
- package/dist/nat/ddns/index.js +21 -0
- package/dist/nat/ddns/index.js.map +1 -0
- package/dist/nat/ddns/updater.d.ts +68 -0
- package/dist/nat/ddns/updater.js +194 -0
- package/dist/nat/ddns/updater.js.map +1 -0
- package/dist/nat/external-ip.d.ts +62 -0
- package/dist/nat/external-ip.js +114 -0
- package/dist/nat/external-ip.js.map +1 -0
- package/dist/nat/index.d.ts +22 -0
- package/dist/nat/index.js +16 -0
- package/dist/nat/index.js.map +1 -0
- package/dist/nat/nat-service.d.ts +101 -0
- package/dist/nat/nat-service.js +284 -0
- package/dist/nat/nat-service.js.map +1 -0
- package/dist/nat/nat-store.d.ts +19 -0
- package/dist/nat/nat-store.js +136 -0
- package/dist/nat/nat-store.js.map +1 -0
- package/dist/nat/port-mapper.d.ts +98 -0
- package/dist/nat/port-mapper.js +226 -0
- package/dist/nat/port-mapper.js.map +1 -0
- package/dist/nat/reachability.d.ts +19 -0
- package/dist/nat/reachability.js +29 -0
- package/dist/nat/reachability.js.map +1 -0
- package/dist/nat/secrets/file-store.d.ts +23 -0
- package/dist/nat/secrets/file-store.js +102 -0
- package/dist/nat/secrets/file-store.js.map +1 -0
- package/dist/nat/secrets/index.d.ts +36 -0
- package/dist/nat/secrets/index.js +56 -0
- package/dist/nat/secrets/index.js.map +1 -0
- package/dist/nat/secrets/keytar-store.d.ts +18 -0
- package/dist/nat/secrets/keytar-store.js +52 -0
- package/dist/nat/secrets/keytar-store.js.map +1 -0
- package/dist/nat/types.d.ts +120 -0
- package/dist/nat/types.js +24 -0
- package/dist/nat/types.js.map +1 -0
- package/dist/orchestrator/host-process-orchestrator.d.ts +87 -0
- package/dist/orchestrator/host-process-orchestrator.js +557 -0
- package/dist/orchestrator/host-process-orchestrator.js.map +1 -0
- package/dist/orchestrator/index.d.ts +3 -0
- package/dist/orchestrator/index.js +2 -0
- package/dist/orchestrator/index.js.map +1 -0
- package/dist/orchestrator/log-rotator.d.ts +25 -0
- package/dist/orchestrator/log-rotator.js +56 -0
- package/dist/orchestrator/log-rotator.js.map +1 -0
- package/dist/orchestrator/pid-liveness.d.ts +11 -0
- package/dist/orchestrator/pid-liveness.js +26 -0
- package/dist/orchestrator/pid-liveness.js.map +1 -0
- package/dist/orchestrator/port-allocator.d.ts +16 -0
- package/dist/orchestrator/port-allocator.js +38 -0
- package/dist/orchestrator/port-allocator.js.map +1 -0
- package/dist/orchestrator/state-store.d.ts +32 -0
- package/dist/orchestrator/state-store.js +44 -0
- package/dist/orchestrator/state-store.js.map +1 -0
- package/dist/orchestrator/types.d.ts +85 -0
- package/dist/orchestrator/types.js +31 -0
- package/dist/orchestrator/types.js.map +1 -0
- package/dist/server/error-handler.d.ts +26 -0
- package/dist/server/error-handler.js +95 -0
- package/dist/server/error-handler.js.map +1 -0
- package/dist/server/events/bus.d.ts +17 -0
- package/dist/server/events/bus.js +36 -0
- package/dist/server/events/bus.js.map +1 -0
- package/dist/server/events/sse-route.d.ts +22 -0
- package/dist/server/events/sse-route.js +65 -0
- package/dist/server/events/sse-route.js.map +1 -0
- package/dist/server/events/types.d.ts +25 -0
- package/dist/server/events/types.js +8 -0
- package/dist/server/events/types.js.map +1 -0
- package/dist/server/index.d.ts +67 -0
- package/dist/server/index.js +149 -0
- package/dist/server/index.js.map +1 -0
- package/dist/server/origin-guard.d.ts +24 -0
- package/dist/server/origin-guard.js +72 -0
- package/dist/server/origin-guard.js.map +1 -0
- package/dist/server/routes/nat.d.ts +16 -0
- package/dist/server/routes/nat.js +42 -0
- package/dist/server/routes/nat.js.map +1 -0
- package/dist/server/routes/nodes.d.ts +23 -0
- package/dist/server/routes/nodes.js +128 -0
- package/dist/server/routes/nodes.js.map +1 -0
- package/dist/server/routes/settings.d.ts +26 -0
- package/dist/server/routes/settings.js +97 -0
- package/dist/server/routes/settings.js.map +1 -0
- package/dist/server/routes/status.d.ts +42 -0
- package/dist/server/routes/status.js +76 -0
- package/dist/server/routes/status.js.map +1 -0
- package/dist/server/routes/trust-circle.d.ts +17 -0
- package/dist/server/routes/trust-circle.js +35 -0
- package/dist/server/routes/trust-circle.js.map +1 -0
- package/dist/server/routes/update.d.ts +16 -0
- package/dist/server/routes/update.js +29 -0
- package/dist/server/routes/update.js.map +1 -0
- package/dist/server/server.d.ts +40 -0
- package/dist/server/server.js +90 -0
- package/dist/server/server.js.map +1 -0
- package/dist/server/settings-store.d.ts +24 -0
- package/dist/server/settings-store.js +27 -0
- package/dist/server/settings-store.js.map +1 -0
- package/dist/server/static.d.ts +25 -0
- package/dist/server/static.js +177 -0
- package/dist/server/static.js.map +1 -0
- package/dist/ui/assets/index-BwU5mJGF.css +1 -0
- package/dist/ui/assets/index-C9uChk2P.js +14 -0
- package/dist/ui/assets/index-C9uChk2P.js.map +1 -0
- package/dist/ui/index.html +14 -0
- package/dist/update/apply.d.ts +37 -0
- package/dist/update/apply.js +102 -0
- package/dist/update/apply.js.map +1 -0
- package/dist/update/index.d.ts +101 -0
- package/dist/update/index.js +228 -0
- package/dist/update/index.js.map +1 -0
- package/dist/update/manifest.d.ts +48 -0
- package/dist/update/manifest.js +152 -0
- package/dist/update/manifest.js.map +1 -0
- package/dist/update/release-key.d.ts +24 -0
- package/dist/update/release-key.js +52 -0
- package/dist/update/release-key.js.map +1 -0
- package/dist/update/store.d.ts +22 -0
- package/dist/update/store.js +81 -0
- package/dist/update/store.js.map +1 -0
- package/dist/update/types.d.ts +90 -0
- package/dist/update/types.js +22 -0
- package/dist/update/types.js.map +1 -0
- package/dist/update/version.d.ts +18 -0
- package/dist/update/version.js +76 -0
- package/dist/update/version.js.map +1 -0
- package/package.json +80 -0
- package/service/README.md +86 -0
- package/service/cadre-host.service.tmpl +16 -0
- package/service/com.serfab.cadre-host.plist.tmpl +35 -0
- package/service/install-service.ps1 +98 -0
- package/service/uninstall-service.ps1 +19 -0
- package/src/__tests__/cli-invite.smoke.test.ts +187 -0
- package/src/__tests__/cli-nat.smoke.test.ts +207 -0
- package/src/__tests__/cli.smoke.test.ts +41 -0
- package/src/__tests__/orchestrator.test.ts +570 -0
- package/src/auth/__tests__/duration.test.ts +28 -0
- package/src/auth/__tests__/trust-circle-integration.test.ts +128 -0
- package/src/auth/__tests__/trust-circle-store.test.ts +115 -0
- package/src/auth/__tests__/trust-circle.test.ts +334 -0
- package/src/auth/duration.ts +33 -0
- package/src/auth/index.ts +19 -0
- package/src/auth/trust-circle-store.ts +155 -0
- package/src/auth/trust-circle.ts +304 -0
- package/src/auth/types.ts +96 -0
- package/src/bin/host.ts +905 -0
- package/src/index.ts +167 -0
- package/src/installer/__tests__/config.test.ts +86 -0
- package/src/installer/__tests__/identity.test.ts +34 -0
- package/src/installer/__tests__/installer.smoke.test.ts +124 -0
- package/src/installer/__tests__/paths.test.ts +47 -0
- package/src/installer/__tests__/service-host.test.ts +62 -0
- package/src/installer/__tests__/wizard.test.ts +60 -0
- package/src/installer/browser.ts +42 -0
- package/src/installer/config.ts +153 -0
- package/src/installer/identity.ts +49 -0
- package/src/installer/index.ts +303 -0
- package/src/installer/paths.ts +109 -0
- package/src/installer/platform.ts +27 -0
- package/src/installer/service-host/index.ts +21 -0
- package/src/installer/service-host/launchd.ts +90 -0
- package/src/installer/service-host/nssm.ts +100 -0
- package/src/installer/service-host/systemd.ts +88 -0
- package/src/installer/service-host/template.ts +21 -0
- package/src/installer/service-host/types.ts +48 -0
- package/src/installer/wizard.ts +92 -0
- package/src/nat/__tests__/address-resolver.test.ts +82 -0
- package/src/nat/__tests__/ddns-duckdns.test.ts +83 -0
- package/src/nat/__tests__/ddns-updater.test.ts +253 -0
- package/src/nat/__tests__/external-ip.test.ts +124 -0
- package/src/nat/__tests__/nat-service.test.ts +305 -0
- package/src/nat/__tests__/nat-store.test.ts +93 -0
- package/src/nat/__tests__/port-mapper.test.ts +191 -0
- package/src/nat/__tests__/reachability.test.ts +24 -0
- package/src/nat/__tests__/secrets.test.ts +156 -0
- package/src/nat/address-resolver.ts +51 -0
- package/src/nat/ddns/duckdns.ts +76 -0
- package/src/nat/ddns/index.ts +55 -0
- package/src/nat/ddns/updater.ts +243 -0
- package/src/nat/external-ip.ts +154 -0
- package/src/nat/index.ts +71 -0
- package/src/nat/nat-service.ts +375 -0
- package/src/nat/nat-store.ts +154 -0
- package/src/nat/port-mapper.ts +329 -0
- package/src/nat/reachability.ts +34 -0
- package/src/nat/secrets/file-store.ts +130 -0
- package/src/nat/secrets/index.ts +82 -0
- package/src/nat/secrets/keytar-store.ts +67 -0
- package/src/nat/types.ts +157 -0
- package/src/orchestrator/host-process-orchestrator.ts +626 -0
- package/src/orchestrator/index.ts +3 -0
- package/src/orchestrator/log-rotator.ts +53 -0
- package/src/orchestrator/pid-liveness.ts +24 -0
- package/src/orchestrator/port-allocator.ts +43 -0
- package/src/orchestrator/state-store.ts +72 -0
- package/src/orchestrator/types.ts +95 -0
- package/src/server/__tests__/bus.test.ts +38 -0
- package/src/server/__tests__/error-handler.test.ts +96 -0
- package/src/server/__tests__/nodes-route.test.ts +179 -0
- package/src/server/__tests__/origin-guard.test.ts +72 -0
- package/src/server/__tests__/publishers.test.ts +216 -0
- package/src/server/__tests__/server.smoke.test.ts +178 -0
- package/src/server/__tests__/settings-route.test.ts +177 -0
- package/src/server/__tests__/sse-route.test.ts +119 -0
- package/src/server/__tests__/status-route.test.ts +113 -0
- package/src/server/error-handler.ts +108 -0
- package/src/server/events/bus.ts +42 -0
- package/src/server/events/sse-route.ts +81 -0
- package/src/server/events/types.ts +22 -0
- package/src/server/index.ts +209 -0
- package/src/server/origin-guard.ts +84 -0
- package/src/server/routes/nat.ts +63 -0
- package/src/server/routes/nodes.ts +147 -0
- package/src/server/routes/settings.ts +115 -0
- package/src/server/routes/status.ts +108 -0
- package/src/server/routes/trust-circle.ts +49 -0
- package/src/server/routes/update.ts +43 -0
- package/src/server/server.ts +122 -0
- package/src/server/settings-store.ts +37 -0
- package/src/server/static.ts +191 -0
- package/src/update/__tests__/apply.test.ts +101 -0
- package/src/update/__tests__/manifest.test.ts +93 -0
- package/src/update/__tests__/store.test.ts +81 -0
- package/src/update/__tests__/update-service.integration.test.ts +221 -0
- package/src/update/__tests__/version.test.ts +31 -0
- package/src/update/apply.ts +148 -0
- package/src/update/index.ts +303 -0
- package/src/update/manifest.ts +172 -0
- package/src/update/release-key.ts +55 -0
- package/src/update/store.ts +101 -0
- package/src/update/types.ts +109 -0
- package/src/update/version.ts +80 -0
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
import debug from 'debug';
|
|
2
|
+
import { ddnsAccount } from '../secrets/index.js';
|
|
3
|
+
import { NatError } from '../types.js';
|
|
4
|
+
import { getProvider } from './index.js';
|
|
5
|
+
const log = debug('cadre:host:nat-ddns:updater');
|
|
6
|
+
/**
|
|
7
|
+
* DDNS update loop.
|
|
8
|
+
*
|
|
9
|
+
* Lifecycle:
|
|
10
|
+
* - `start()`: if a provider is configured AND not externally managed, runs
|
|
11
|
+
* an immediate update, then schedules `setInterval(intervalMs)`.
|
|
12
|
+
* - On each tick: re-evaluates the IP. If unchanged from the last successful
|
|
13
|
+
* update, no provider call. If changed, calls `provider.update`. Errors
|
|
14
|
+
* are recorded but the timer keeps ticking.
|
|
15
|
+
* - `stop()`: clears the timer. Idempotent.
|
|
16
|
+
* - `updateSettings(...)`: swap in new settings, re-starting if needed.
|
|
17
|
+
* - `forceUpdate()`: bypass the unchanged-IP check (used by `testReachability`).
|
|
18
|
+
*/
|
|
19
|
+
export class DdnsUpdater {
|
|
20
|
+
constructor(opts) {
|
|
21
|
+
this.timer = null;
|
|
22
|
+
this.lastPushedIp = null;
|
|
23
|
+
this.lastOutcome = null;
|
|
24
|
+
this.started = false;
|
|
25
|
+
this.settings = opts.settings;
|
|
26
|
+
this.secrets = opts.secrets;
|
|
27
|
+
this.getExternalIp = opts.getExternalIp;
|
|
28
|
+
this.fetchImpl = opts.fetch ?? fetch;
|
|
29
|
+
this.resolveProvider = opts.resolveProvider ?? getProvider;
|
|
30
|
+
this.nowFn = opts.now ?? (() => new Date());
|
|
31
|
+
this.setIntervalFn = opts.setInterval ?? ((fn, ms) => setInterval(fn, ms));
|
|
32
|
+
this.clearIntervalFn = opts.clearInterval ?? ((h) => clearInterval(h));
|
|
33
|
+
}
|
|
34
|
+
/** Current status (for the NatService snapshot). */
|
|
35
|
+
getStatus() {
|
|
36
|
+
return {
|
|
37
|
+
providerId: this.settings.providerId,
|
|
38
|
+
hostname: this.settings.hostname,
|
|
39
|
+
externallyManaged: this.settings.externallyManaged,
|
|
40
|
+
lastUpdateAt: this.lastOutcome?.at.toISOString() ?? null,
|
|
41
|
+
lastUpdateOk: this.lastOutcome?.ok ?? null,
|
|
42
|
+
lastError: this.lastOutcome?.error ?? null,
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
async start() {
|
|
46
|
+
if (this.started) {
|
|
47
|
+
return this.lastOutcome ?? notAttempted(this.nowFn());
|
|
48
|
+
}
|
|
49
|
+
this.started = true;
|
|
50
|
+
if (!this.shouldUpdate()) {
|
|
51
|
+
const outcome = notAttempted(this.nowFn());
|
|
52
|
+
// For an externally-managed entry we still report state, but never push.
|
|
53
|
+
return outcome;
|
|
54
|
+
}
|
|
55
|
+
const outcome = await this.runOnce();
|
|
56
|
+
this.scheduleNext();
|
|
57
|
+
return outcome;
|
|
58
|
+
}
|
|
59
|
+
stop() {
|
|
60
|
+
if (!this.started)
|
|
61
|
+
return;
|
|
62
|
+
this.started = false;
|
|
63
|
+
if (this.timer) {
|
|
64
|
+
this.clearIntervalFn(this.timer);
|
|
65
|
+
this.timer = null;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/** Replace settings; restart the loop with the new configuration. */
|
|
69
|
+
async updateSettings(next) {
|
|
70
|
+
const wasRunning = this.started;
|
|
71
|
+
this.stop();
|
|
72
|
+
this.settings = next;
|
|
73
|
+
this.lastPushedIp = null;
|
|
74
|
+
if (!wasRunning)
|
|
75
|
+
return this.lastOutcome ?? notAttempted(this.nowFn());
|
|
76
|
+
return await this.start();
|
|
77
|
+
}
|
|
78
|
+
/** Force an immediate update, bypassing the unchanged-IP skip. */
|
|
79
|
+
async forceUpdate() {
|
|
80
|
+
if (!this.shouldUpdate())
|
|
81
|
+
return notAttempted(this.nowFn());
|
|
82
|
+
this.lastPushedIp = null;
|
|
83
|
+
return await this.runOnce();
|
|
84
|
+
}
|
|
85
|
+
shouldUpdate() {
|
|
86
|
+
if (!this.settings.providerId)
|
|
87
|
+
return false;
|
|
88
|
+
if (!this.settings.hostname)
|
|
89
|
+
return false;
|
|
90
|
+
if (this.settings.externallyManaged)
|
|
91
|
+
return false;
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
scheduleNext() {
|
|
95
|
+
if (this.timer)
|
|
96
|
+
this.clearIntervalFn(this.timer);
|
|
97
|
+
this.timer = this.setIntervalFn(() => {
|
|
98
|
+
void this.runOnce().catch((err) => log('updater tick error: %s', err.message));
|
|
99
|
+
}, this.settings.intervalMs);
|
|
100
|
+
}
|
|
101
|
+
async runOnce() {
|
|
102
|
+
const ip = this.getExternalIp();
|
|
103
|
+
if (!ip) {
|
|
104
|
+
const outcome = {
|
|
105
|
+
attempted: false,
|
|
106
|
+
ok: false,
|
|
107
|
+
ip: null,
|
|
108
|
+
error: 'external IP unknown',
|
|
109
|
+
at: this.nowFn(),
|
|
110
|
+
};
|
|
111
|
+
this.lastOutcome = outcome;
|
|
112
|
+
return outcome;
|
|
113
|
+
}
|
|
114
|
+
if (ip === this.lastPushedIp) {
|
|
115
|
+
// Unchanged: no provider call (per DuckDNS guidance: don't re-push).
|
|
116
|
+
log('DDNS skip: IP unchanged (%s)', ip);
|
|
117
|
+
return this.lastOutcome ?? notAttempted(this.nowFn());
|
|
118
|
+
}
|
|
119
|
+
let provider;
|
|
120
|
+
try {
|
|
121
|
+
provider = this.resolveProvider(this.settings.providerId);
|
|
122
|
+
}
|
|
123
|
+
catch (err) {
|
|
124
|
+
const outcome = {
|
|
125
|
+
attempted: true,
|
|
126
|
+
ok: false,
|
|
127
|
+
ip,
|
|
128
|
+
error: err.message,
|
|
129
|
+
at: this.nowFn(),
|
|
130
|
+
};
|
|
131
|
+
this.lastOutcome = outcome;
|
|
132
|
+
return outcome;
|
|
133
|
+
}
|
|
134
|
+
let config;
|
|
135
|
+
try {
|
|
136
|
+
config = await this.loadConfig(provider);
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
const outcome = {
|
|
140
|
+
attempted: true,
|
|
141
|
+
ok: false,
|
|
142
|
+
ip,
|
|
143
|
+
error: err.message,
|
|
144
|
+
at: this.nowFn(),
|
|
145
|
+
};
|
|
146
|
+
this.lastOutcome = outcome;
|
|
147
|
+
return outcome;
|
|
148
|
+
}
|
|
149
|
+
try {
|
|
150
|
+
await provider.update(config, this.settings.hostname, ip, { fetch: this.fetchImpl });
|
|
151
|
+
this.lastPushedIp = ip;
|
|
152
|
+
const outcome = {
|
|
153
|
+
attempted: true,
|
|
154
|
+
ok: true,
|
|
155
|
+
ip,
|
|
156
|
+
error: null,
|
|
157
|
+
at: this.nowFn(),
|
|
158
|
+
};
|
|
159
|
+
this.lastOutcome = outcome;
|
|
160
|
+
log('DDNS update OK: %s → %s', this.settings.hostname, ip);
|
|
161
|
+
return outcome;
|
|
162
|
+
}
|
|
163
|
+
catch (err) {
|
|
164
|
+
const outcome = {
|
|
165
|
+
attempted: true,
|
|
166
|
+
ok: false,
|
|
167
|
+
ip,
|
|
168
|
+
error: err.message,
|
|
169
|
+
at: this.nowFn(),
|
|
170
|
+
};
|
|
171
|
+
this.lastOutcome = outcome;
|
|
172
|
+
log('DDNS update FAIL: %s', outcome.error);
|
|
173
|
+
return outcome;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
async loadConfig(provider) {
|
|
177
|
+
const result = {};
|
|
178
|
+
for (const field of provider.configFields) {
|
|
179
|
+
if (!field.secret)
|
|
180
|
+
continue;
|
|
181
|
+
const value = await this.secrets.get(ddnsAccount(provider.id, field.key));
|
|
182
|
+
if (value === null) {
|
|
183
|
+
throw new NatError('ddns_credentials_missing', `Missing DDNS credential for provider "${provider.id}", field "${field.key}". ` +
|
|
184
|
+
`Configure with \`cadre-host nat ddns set ${provider.id}\`.`);
|
|
185
|
+
}
|
|
186
|
+
result[field.key] = value;
|
|
187
|
+
}
|
|
188
|
+
return result;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
function notAttempted(at) {
|
|
192
|
+
return { attempted: false, ok: false, ip: null, error: null, at };
|
|
193
|
+
}
|
|
194
|
+
//# sourceMappingURL=updater.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"updater.js","sourceRoot":"","sources":["../../../src/nat/ddns/updater.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/** Result of an external-IP detection cycle. */
|
|
2
|
+
export interface ExternalIpResult {
|
|
3
|
+
/** IP reported by the upstream router (UPnP/NAT-PMP gateway), if reachable. */
|
|
4
|
+
routerIp: string | null;
|
|
5
|
+
/** IP reported by a public IP echo service. */
|
|
6
|
+
publicIp: string | null;
|
|
7
|
+
/**
|
|
8
|
+
* True when both probes succeeded AND returned different addresses, which
|
|
9
|
+
* is the textbook CGNAT signature: the router thinks its WAN address is
|
|
10
|
+
* private to the carrier.
|
|
11
|
+
*/
|
|
12
|
+
cgnat: boolean;
|
|
13
|
+
/** When this snapshot was taken. */
|
|
14
|
+
detectedAt: Date;
|
|
15
|
+
}
|
|
16
|
+
/** Abstract router-side probe (gateway WAN address). */
|
|
17
|
+
export type RouterIpProbe = () => Promise<string | null>;
|
|
18
|
+
export interface ExternalIpDetectorOptions {
|
|
19
|
+
/** Probe the local router's external IP (typically via the port mapper). */
|
|
20
|
+
routerProbe?: RouterIpProbe;
|
|
21
|
+
/** Public IP service endpoints. */
|
|
22
|
+
publicIpUrls?: ReadonlyArray<string>;
|
|
23
|
+
/** Fetch override (tests stub this). Defaults to global fetch. */
|
|
24
|
+
fetch?: typeof fetch;
|
|
25
|
+
/** Clock override for tests. */
|
|
26
|
+
now?: () => Date;
|
|
27
|
+
/** Per-request timeout in ms (default 5000). */
|
|
28
|
+
requestTimeoutMs?: number;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* External-IP detector.
|
|
32
|
+
*
|
|
33
|
+
* Two independent sources:
|
|
34
|
+
* - The router (queried via the port mapper's gateway interface). May be
|
|
35
|
+
* unavailable if UPnP is off or the upstream device doesn't expose
|
|
36
|
+
* WANIPConnection.
|
|
37
|
+
* - A public HTTPS echo service (api.ipify.org and friends). May be
|
|
38
|
+
* unreachable on a firewalled / offline machine.
|
|
39
|
+
*
|
|
40
|
+
* When both succeed AND disagree, we flag CGNAT. The check is heuristic — a
|
|
41
|
+
* fast-changing IP, a sliced VPN, or an IPv6-only public probe could all
|
|
42
|
+
* trigger a false positive. The verdict is informational, not enforced.
|
|
43
|
+
*/
|
|
44
|
+
export declare class ExternalIpDetector {
|
|
45
|
+
private readonly routerProbe;
|
|
46
|
+
private readonly publicIpUrls;
|
|
47
|
+
private readonly fetchImpl;
|
|
48
|
+
private readonly nowFn;
|
|
49
|
+
private readonly requestTimeoutMs;
|
|
50
|
+
constructor(opts?: ExternalIpDetectorOptions);
|
|
51
|
+
/** Run both probes in parallel and return the snapshot. */
|
|
52
|
+
detect(): Promise<ExternalIpResult>;
|
|
53
|
+
private runRouterProbe;
|
|
54
|
+
private runPublicProbe;
|
|
55
|
+
private tryPublicUrl;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Liberal IP validation — accepts both IPv4 and IPv6 in dotted/colon form.
|
|
59
|
+
* Tighter validation lives at the consumer (`nat-service` checks for IPv4
|
|
60
|
+
* before building an `/ip4/` multiaddr).
|
|
61
|
+
*/
|
|
62
|
+
export declare function isPlausibleIp(s: string): boolean;
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import debug from 'debug';
|
|
2
|
+
const log = debug('cadre:host:nat-external-ip');
|
|
3
|
+
/** Public IP echo endpoints. Tried in order; first success wins. */
|
|
4
|
+
const DEFAULT_PUBLIC_IP_URLS = [
|
|
5
|
+
'https://api.ipify.org',
|
|
6
|
+
'https://ifconfig.me/ip',
|
|
7
|
+
'https://icanhazip.com',
|
|
8
|
+
];
|
|
9
|
+
/**
|
|
10
|
+
* External-IP detector.
|
|
11
|
+
*
|
|
12
|
+
* Two independent sources:
|
|
13
|
+
* - The router (queried via the port mapper's gateway interface). May be
|
|
14
|
+
* unavailable if UPnP is off or the upstream device doesn't expose
|
|
15
|
+
* WANIPConnection.
|
|
16
|
+
* - A public HTTPS echo service (api.ipify.org and friends). May be
|
|
17
|
+
* unreachable on a firewalled / offline machine.
|
|
18
|
+
*
|
|
19
|
+
* When both succeed AND disagree, we flag CGNAT. The check is heuristic — a
|
|
20
|
+
* fast-changing IP, a sliced VPN, or an IPv6-only public probe could all
|
|
21
|
+
* trigger a false positive. The verdict is informational, not enforced.
|
|
22
|
+
*/
|
|
23
|
+
export class ExternalIpDetector {
|
|
24
|
+
constructor(opts = {}) {
|
|
25
|
+
this.routerProbe = opts.routerProbe;
|
|
26
|
+
this.publicIpUrls = opts.publicIpUrls ?? DEFAULT_PUBLIC_IP_URLS;
|
|
27
|
+
this.fetchImpl = opts.fetch ?? fetch;
|
|
28
|
+
this.nowFn = opts.now ?? (() => new Date());
|
|
29
|
+
this.requestTimeoutMs = opts.requestTimeoutMs ?? 5000;
|
|
30
|
+
}
|
|
31
|
+
/** Run both probes in parallel and return the snapshot. */
|
|
32
|
+
async detect() {
|
|
33
|
+
const [routerIp, publicIp] = await Promise.all([
|
|
34
|
+
this.runRouterProbe(),
|
|
35
|
+
this.runPublicProbe(),
|
|
36
|
+
]);
|
|
37
|
+
const cgnat = routerIp !== null && publicIp !== null && routerIp !== publicIp;
|
|
38
|
+
if (cgnat) {
|
|
39
|
+
log('CGNAT detected: routerIp=%s, publicIp=%s', routerIp, publicIp);
|
|
40
|
+
}
|
|
41
|
+
return {
|
|
42
|
+
routerIp,
|
|
43
|
+
publicIp,
|
|
44
|
+
cgnat,
|
|
45
|
+
detectedAt: this.nowFn(),
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
async runRouterProbe() {
|
|
49
|
+
if (!this.routerProbe)
|
|
50
|
+
return null;
|
|
51
|
+
try {
|
|
52
|
+
const ip = await this.routerProbe();
|
|
53
|
+
return ip && isPlausibleIp(ip) ? ip : null;
|
|
54
|
+
}
|
|
55
|
+
catch (err) {
|
|
56
|
+
log('routerProbe failed: %s', err.message);
|
|
57
|
+
return null;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
async runPublicProbe() {
|
|
61
|
+
for (const url of this.publicIpUrls) {
|
|
62
|
+
const ip = await this.tryPublicUrl(url);
|
|
63
|
+
if (ip)
|
|
64
|
+
return ip;
|
|
65
|
+
}
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
async tryPublicUrl(url) {
|
|
69
|
+
const controller = new AbortController();
|
|
70
|
+
const timer = setTimeout(() => controller.abort(), this.requestTimeoutMs);
|
|
71
|
+
try {
|
|
72
|
+
const res = await this.fetchImpl(url, { signal: controller.signal });
|
|
73
|
+
if (!res.ok) {
|
|
74
|
+
log('public IP probe %s returned %d', url, res.status);
|
|
75
|
+
return null;
|
|
76
|
+
}
|
|
77
|
+
const text = (await res.text()).trim();
|
|
78
|
+
if (!isPlausibleIp(text)) {
|
|
79
|
+
log('public IP probe %s returned non-IP: %s', url, text.slice(0, 64));
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
return text;
|
|
83
|
+
}
|
|
84
|
+
catch (err) {
|
|
85
|
+
log('public IP probe %s failed: %s', url, err.message);
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
clearTimeout(timer);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Liberal IP validation — accepts both IPv4 and IPv6 in dotted/colon form.
|
|
95
|
+
* Tighter validation lives at the consumer (`nat-service` checks for IPv4
|
|
96
|
+
* before building an `/ip4/` multiaddr).
|
|
97
|
+
*/
|
|
98
|
+
export function isPlausibleIp(s) {
|
|
99
|
+
if (!s || s.length > 45)
|
|
100
|
+
return false;
|
|
101
|
+
// IPv4: 4 dotted octets, 0-255 each.
|
|
102
|
+
const v4 = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(s);
|
|
103
|
+
if (v4) {
|
|
104
|
+
return v4.slice(1).every((octet) => {
|
|
105
|
+
const n = Number(octet);
|
|
106
|
+
return n >= 0 && n <= 255;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
// IPv6: very liberal — at least two colons, only hex/colon characters.
|
|
110
|
+
if (/^[0-9a-fA-F:]+$/.test(s) && s.split(':').length >= 3)
|
|
111
|
+
return true;
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=external-ip.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external-ip.js","sourceRoot":"","sources":["../../src/nat/external-ip.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* NAT / DDNS substrate for cadre-host.
|
|
3
|
+
*
|
|
4
|
+
* See ./nat-service.ts for the top-level orchestrator and `docs/cadre-host.md`
|
|
5
|
+
* for integration notes (the long-running process owner is `cadre-host-local-ui`).
|
|
6
|
+
*/
|
|
7
|
+
export { NatService, createNatHandlers } from './nat-service.js';
|
|
8
|
+
export type { NatServiceOptions, CadreNodeLike } from './nat-service.js';
|
|
9
|
+
export { NatStore } from './nat-store.js';
|
|
10
|
+
export { NatError, } from './types.js';
|
|
11
|
+
export type { NatStatusSnapshot, NatDdnsStatus, NatSettingsFile, NatDdnsSettings, NatHandlers, NatErrorCode, PortForwardMode, DirectReachability, DdnsProviderInfo, DdnsConfigField, } from './types.js';
|
|
12
|
+
export { ExternalIpDetector, isPlausibleIp, } from './external-ip.js';
|
|
13
|
+
export type { ExternalIpResult, RouterIpProbe, ExternalIpDetectorOptions, } from './external-ip.js';
|
|
14
|
+
export { PortMapperService, createDefaultPortMapper, DEFAULT_LEASE_TTL_MS, DEFAULT_REFRESH_MS, } from './port-mapper.js';
|
|
15
|
+
export type { PortMapper, PortMappingResult, PortMapOptions, PortMapperState, PortMapperServiceOptions, } from './port-mapper.js';
|
|
16
|
+
export { evaluateReachability } from './reachability.js';
|
|
17
|
+
export { buildInviteAddresses } from './address-resolver.js';
|
|
18
|
+
export type { BuildInviteAddressesInput } from './address-resolver.js';
|
|
19
|
+
export { BUILTIN_PROVIDERS, getProvider, listProviders, duckDnsProvider, DdnsUpdater, } from './ddns/index.js';
|
|
20
|
+
export type { DdnsProvider, DdnsProviderDeps, DdnsUpdaterOptions, DdnsUpdateOutcome, } from './ddns/index.js';
|
|
21
|
+
export { KeytarSecretsStore, FileSecretsStore, createSecretsStore, ddnsAccount, KEYTAR_SERVICE, } from './secrets/index.js';
|
|
22
|
+
export type { SecretsStore, KeytarLike } from './secrets/index.js';
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* NAT / DDNS substrate for cadre-host.
|
|
3
|
+
*
|
|
4
|
+
* See ./nat-service.ts for the top-level orchestrator and `docs/cadre-host.md`
|
|
5
|
+
* for integration notes (the long-running process owner is `cadre-host-local-ui`).
|
|
6
|
+
*/
|
|
7
|
+
export { NatService, createNatHandlers } from './nat-service.js';
|
|
8
|
+
export { NatStore } from './nat-store.js';
|
|
9
|
+
export { NatError, } from './types.js';
|
|
10
|
+
export { ExternalIpDetector, isPlausibleIp, } from './external-ip.js';
|
|
11
|
+
export { PortMapperService, createDefaultPortMapper, DEFAULT_LEASE_TTL_MS, DEFAULT_REFRESH_MS, } from './port-mapper.js';
|
|
12
|
+
export { evaluateReachability } from './reachability.js';
|
|
13
|
+
export { buildInviteAddresses } from './address-resolver.js';
|
|
14
|
+
export { BUILTIN_PROVIDERS, getProvider, listProviders, duckDnsProvider, DdnsUpdater, } from './ddns/index.js';
|
|
15
|
+
export { KeytarSecretsStore, FileSecretsStore, createSecretsStore, ddnsAccount, KEYTAR_SERVICE, } from './secrets/index.js';
|
|
16
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/nat/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EACL,QAAQ,GACT,MAAM,YAAY,CAAC;AAapB,OAAO,EACL,kBAAkB,EAClB,aAAa,GACd,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,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"}
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import { type DdnsProviderInfo, type NatHandlers, type NatSettingsFile, type NatStatusSnapshot } from './types.js';
|
|
2
|
+
import { NatStore } from './nat-store.js';
|
|
3
|
+
import { ExternalIpDetector } from './external-ip.js';
|
|
4
|
+
import { type PortMapper } from './port-mapper.js';
|
|
5
|
+
import { type SecretsStore } from './secrets/index.js';
|
|
6
|
+
/**
|
|
7
|
+
* Minimal slice of CadreNode that NatService needs — defined as an interface
|
|
8
|
+
* so tests can inject a mock without a real libp2p stack. Mirrors
|
|
9
|
+
* `CadreNodeLike` in `auth/trust-circle.ts`.
|
|
10
|
+
*/
|
|
11
|
+
export interface CadreNodeLike {
|
|
12
|
+
/** Returns this node's peer ID (libp2p) as a string. */
|
|
13
|
+
getPeerId(): string;
|
|
14
|
+
/** Returns the current observed multiaddrs from libp2p. */
|
|
15
|
+
getMultiaddrs(): string[];
|
|
16
|
+
}
|
|
17
|
+
export interface NatServiceOptions {
|
|
18
|
+
/** Cadre-host root directory (same one orchestrator + trust-circle use). */
|
|
19
|
+
rootDir: string;
|
|
20
|
+
/** libp2p node — used for peer ID and the libp2p multiaddrs fallback. */
|
|
21
|
+
cadreNode: CadreNodeLike;
|
|
22
|
+
/** Clock override for tests. */
|
|
23
|
+
now?: () => Date;
|
|
24
|
+
/** Fetch override for tests. */
|
|
25
|
+
fetch?: typeof fetch;
|
|
26
|
+
/** Test-only: stub the keytar/file-store. Default: createSecretsStore. */
|
|
27
|
+
secretsStore?: SecretsStore;
|
|
28
|
+
/** Test-only: stub the port mapper. Default: createDefaultPortMapper(). */
|
|
29
|
+
portMapper?: PortMapper;
|
|
30
|
+
/** Test-only: stub the external-IP detector. */
|
|
31
|
+
externalIpDetector?: ExternalIpDetector;
|
|
32
|
+
/** Optional: re-use an existing NatStore (mostly for tests). */
|
|
33
|
+
store?: NatStore;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* NatService — orchestrates port mapping, external-IP detection, DDNS updates,
|
|
37
|
+
* and address resolution for invites.
|
|
38
|
+
*
|
|
39
|
+
* Lifecycle:
|
|
40
|
+
* - `start()`: load settings, install port mapping (if upnpEnabled), detect
|
|
41
|
+
* external IP, kick off DDNS loop.
|
|
42
|
+
* - `stop()`: release port mapping, stop DDNS timer.
|
|
43
|
+
* - `getStatus()`: build a fresh status snapshot from internal state (cheap).
|
|
44
|
+
* - `testReachability()`: re-run the IP + verify cycle and the heuristic.
|
|
45
|
+
* - `getInviteAddresses()`: build the multiaddrs to embed in invites.
|
|
46
|
+
*
|
|
47
|
+
* NatService is library + lifecycle only. The long-running process that owns
|
|
48
|
+
* it is `cadre-host-local-ui` (see docs/cadre-host.md and the ticket header).
|
|
49
|
+
*/
|
|
50
|
+
export declare class NatService {
|
|
51
|
+
private readonly cadreNode;
|
|
52
|
+
private readonly store;
|
|
53
|
+
private readonly nowFn;
|
|
54
|
+
private readonly fetchImpl;
|
|
55
|
+
private secretsStore;
|
|
56
|
+
private portMapper;
|
|
57
|
+
/** Caller-supplied detector — used as-is when present (skips the auto router-probe stitch). */
|
|
58
|
+
private readonly injectedDetector;
|
|
59
|
+
private portService;
|
|
60
|
+
private ddnsUpdater;
|
|
61
|
+
private currentSettings;
|
|
62
|
+
private latestIp;
|
|
63
|
+
private lastTestedAt;
|
|
64
|
+
private started;
|
|
65
|
+
private readonly secretsRootDir;
|
|
66
|
+
constructor(opts: NatServiceOptions);
|
|
67
|
+
/** Initial start: port mapping → IP detect → DDNS. Idempotent. */
|
|
68
|
+
start(): Promise<void>;
|
|
69
|
+
/** Release the port mapping and clear timers. Idempotent. */
|
|
70
|
+
stop(): Promise<void>;
|
|
71
|
+
/** Cheap read of the current snapshot. */
|
|
72
|
+
getStatus(): NatStatusSnapshot;
|
|
73
|
+
/** Re-run the IP probe + port-mapper verify, then return a fresh snapshot. */
|
|
74
|
+
testReachability(): Promise<NatStatusSnapshot>;
|
|
75
|
+
/** Build the multiaddrs to embed in invites. */
|
|
76
|
+
getInviteAddresses(): Promise<string[]>;
|
|
77
|
+
/** Current settings (cheap read; for handlers to surface to UI). */
|
|
78
|
+
getSettings(): NatSettingsFile;
|
|
79
|
+
/** Replace settings; persists to disk and reconfigures the runtime. */
|
|
80
|
+
putSettings(patch: Partial<Omit<NatSettingsFile, 'version'>>): Promise<NatStatusSnapshot>;
|
|
81
|
+
/**
|
|
82
|
+
* Set DDNS configuration and persist secret values into the SecretsStore.
|
|
83
|
+
* Throws if the provider is unknown or required secrets are missing.
|
|
84
|
+
*/
|
|
85
|
+
putDdns(body: {
|
|
86
|
+
providerId: string;
|
|
87
|
+
hostname: string;
|
|
88
|
+
config: Record<string, string>;
|
|
89
|
+
externallyManaged?: boolean;
|
|
90
|
+
}): Promise<NatStatusSnapshot>;
|
|
91
|
+
/** List available DDNS providers (UI listing for configuration). */
|
|
92
|
+
listDdnsProviders(): DdnsProviderInfo[];
|
|
93
|
+
private startPortService;
|
|
94
|
+
private detectIp;
|
|
95
|
+
private disabledPortState;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Wrap a NatService into the typed handler shape consumed by
|
|
99
|
+
* `cadre-host-local-ui`. Mirrors `createTrustCircleHandlers`.
|
|
100
|
+
*/
|
|
101
|
+
export declare function createNatHandlers(service: NatService): NatHandlers;
|