@serfab/cadre-host 0.10.0 → 0.11.0

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.
Files changed (138) hide show
  1. package/dist/server/static.js +38 -38
  2. package/dist/ui/assets/index-C-iks41M.js.map +1 -1
  3. package/dist/ui/index.html +12 -12
  4. package/package.json +4 -4
  5. package/service/cadre-host.service.tmpl +16 -16
  6. package/service/com.serfab.cadre-host.plist.tmpl +35 -35
  7. package/service/install-service.ps1 +98 -98
  8. package/service/uninstall-service.ps1 +19 -19
  9. package/src/__tests__/build-targets.test.ts +26 -26
  10. package/src/__tests__/cli-invite.smoke.test.ts +192 -192
  11. package/src/__tests__/cli-nat.smoke.test.ts +212 -212
  12. package/src/__tests__/cli.smoke.test.ts +46 -46
  13. package/src/__tests__/global-setup.ts +51 -51
  14. package/src/__tests__/host-owner.smoke.test.ts +123 -123
  15. package/src/__tests__/orchestrator-env-scrub.test.ts +140 -140
  16. package/src/__tests__/orchestrator-node-identity.test.ts +204 -204
  17. package/src/__tests__/orchestrator-owner.test.ts +198 -198
  18. package/src/__tests__/orchestrator-pin-keys.test.ts +153 -153
  19. package/src/__tests__/orchestrator-push.test.ts +145 -145
  20. package/src/__tests__/orchestrator.test.ts +951 -951
  21. package/src/auth/__tests__/duration.test.ts +28 -28
  22. package/src/auth/__tests__/self-label.test.ts +85 -85
  23. package/src/auth/__tests__/trust-circle-store.test.ts +115 -115
  24. package/src/auth/__tests__/trust-circle.test.ts +445 -445
  25. package/src/auth/duration.ts +33 -33
  26. package/src/auth/index.ts +21 -21
  27. package/src/auth/self-label.ts +74 -74
  28. package/src/auth/trust-circle-store.ts +155 -155
  29. package/src/auth/types.ts +99 -99
  30. package/src/donation/__tests__/donation-service.test.ts +1068 -1068
  31. package/src/donation/__tests__/donation-supervisor.test.ts +510 -510
  32. package/src/donation/__tests__/fake-orchestrator.test.ts +168 -168
  33. package/src/donation/__tests__/fake-orchestrator.ts +225 -225
  34. package/src/donation/__tests__/grant-service.test.ts +213 -213
  35. package/src/donation/__tests__/grant-store.test.ts +113 -113
  36. package/src/donation/donation-service.ts +962 -962
  37. package/src/donation/donation-store.ts +171 -171
  38. package/src/donation/donation-supervisor.ts +388 -388
  39. package/src/donation/grant-service.ts +200 -200
  40. package/src/donation/grant-store.ts +152 -152
  41. package/src/donation/index.ts +64 -64
  42. package/src/donation/types.ts +243 -243
  43. package/src/installer/__tests__/identity.test.ts +34 -34
  44. package/src/installer/__tests__/paths.test.ts +47 -47
  45. package/src/installer/__tests__/service-host.test.ts +62 -62
  46. package/src/installer/__tests__/wizard.test.ts +64 -64
  47. package/src/installer/identity.ts +49 -49
  48. package/src/installer/paths.ts +109 -109
  49. package/src/installer/platform.ts +27 -27
  50. package/src/installer/service-host/index.ts +21 -21
  51. package/src/installer/service-host/template.ts +21 -21
  52. package/src/installer/wizard.ts +103 -103
  53. package/src/nat/__tests__/address-resolver.test.ts +82 -82
  54. package/src/nat/__tests__/ddns-duckdns.test.ts +83 -83
  55. package/src/nat/__tests__/ddns-updater.test.ts +253 -253
  56. package/src/nat/__tests__/external-ip.test.ts +124 -124
  57. package/src/nat/__tests__/nat-service.test.ts +497 -497
  58. package/src/nat/__tests__/nat-store.test.ts +93 -93
  59. package/src/nat/__tests__/port-mapper.test.ts +191 -191
  60. package/src/nat/__tests__/reachability.test.ts +24 -24
  61. package/src/nat/__tests__/secrets.test.ts +178 -178
  62. package/src/nat/address-resolver.ts +51 -51
  63. package/src/nat/ddns/duckdns.ts +76 -76
  64. package/src/nat/ddns/index.ts +55 -55
  65. package/src/nat/ddns/updater.ts +243 -243
  66. package/src/nat/external-ip.ts +154 -154
  67. package/src/nat/index.ts +71 -71
  68. package/src/nat/nat-service.ts +501 -501
  69. package/src/nat/nat-store.ts +154 -154
  70. package/src/nat/port-mapper.ts +329 -329
  71. package/src/nat/reachability.ts +34 -34
  72. package/src/nat/secrets/file-store.ts +130 -130
  73. package/src/nat/secrets/index.ts +112 -112
  74. package/src/nat/secrets/keytar-store.ts +67 -67
  75. package/src/nat/types.ts +159 -159
  76. package/src/orchestrator/__tests__/node-identity.test.ts +62 -62
  77. package/src/orchestrator/host-process-orchestrator.ts +1133 -1133
  78. package/src/orchestrator/index.ts +10 -10
  79. package/src/orchestrator/log-rotator.ts +53 -53
  80. package/src/orchestrator/node-identity.ts +40 -40
  81. package/src/orchestrator/pid-liveness.ts +24 -24
  82. package/src/orchestrator/port-allocator.ts +91 -91
  83. package/src/orchestrator/state-store.ts +90 -90
  84. package/src/orchestrator/types.ts +141 -141
  85. package/src/owner/__tests__/owner-node-client.test.ts +194 -194
  86. package/src/owner/index.ts +12 -12
  87. package/src/owner/owner-node-client.ts +259 -259
  88. package/src/push/__tests__/push.test.ts +90 -90
  89. package/src/push/index.ts +146 -146
  90. package/src/server/__tests__/bus.test.ts +38 -38
  91. package/src/server/__tests__/error-handler.test.ts +118 -118
  92. package/src/server/__tests__/grants-admin-route.test.ts +73 -73
  93. package/src/server/__tests__/grants-route.test.ts +263 -263
  94. package/src/server/__tests__/nodes-route.test.ts +259 -259
  95. package/src/server/__tests__/origin-guard.test.ts +72 -72
  96. package/src/server/__tests__/publishers.test.ts +216 -216
  97. package/src/server/__tests__/server.smoke.test.ts +253 -253
  98. package/src/server/__tests__/settings-route.test.ts +194 -194
  99. package/src/server/__tests__/sse-route.test.ts +119 -119
  100. package/src/server/__tests__/static.test.ts +145 -145
  101. package/src/server/__tests__/status-route.test.ts +134 -134
  102. package/src/server/__tests__/strands-route.test.ts +233 -233
  103. package/src/server/error-handler.ts +178 -178
  104. package/src/server/events/bus.ts +42 -42
  105. package/src/server/events/sse-route.ts +81 -81
  106. package/src/server/events/types.ts +23 -23
  107. package/src/server/index.ts +267 -267
  108. package/src/server/origin-guard.ts +84 -84
  109. package/src/server/routes/grants-admin.ts +41 -41
  110. package/src/server/routes/grants.ts +210 -210
  111. package/src/server/routes/nat.ts +63 -63
  112. package/src/server/routes/nodes.ts +170 -170
  113. package/src/server/routes/settings.ts +123 -123
  114. package/src/server/routes/status.ts +118 -118
  115. package/src/server/routes/strands.ts +54 -54
  116. package/src/server/routes/trust-circle.ts +49 -49
  117. package/src/server/routes/update.ts +43 -43
  118. package/src/server/server.ts +122 -122
  119. package/src/server/settings-store.ts +37 -37
  120. package/src/server/static.ts +207 -207
  121. package/src/strands/__tests__/strand-service.test.ts +165 -165
  122. package/src/strands/index.ts +14 -14
  123. package/src/strands/strand-service.ts +135 -135
  124. package/src/strands/types.ts +102 -102
  125. package/src/update/__tests__/apply.test.ts +158 -158
  126. package/src/update/__tests__/manifest.test.ts +128 -128
  127. package/src/update/__tests__/release-key.test.ts +42 -42
  128. package/src/update/__tests__/sign.test.ts +78 -78
  129. package/src/update/__tests__/store.test.ts +81 -81
  130. package/src/update/__tests__/update-service.integration.test.ts +256 -256
  131. package/src/update/__tests__/version.test.ts +31 -31
  132. package/src/update/apply.ts +190 -190
  133. package/src/update/index.ts +341 -341
  134. package/src/update/release-key.ts +71 -71
  135. package/src/update/sign.ts +74 -74
  136. package/src/update/store.ts +101 -101
  137. package/src/update/types.ts +109 -109
  138. package/src/update/version.ts +80 -80
@@ -1,21 +1,21 @@
1
- /**
2
- * Pick the right service-host impl for the current platform.
3
- */
4
-
5
- import { detectPlatform, type SupportedPlatform } from '../platform.js';
6
- import { SystemdServiceHost } from './systemd.js';
7
- import { LaunchdServiceHost } from './launchd.js';
8
- import { NssmServiceHost } from './nssm.js';
9
- import type { ServiceHost } from './types.js';
10
-
11
- export type { ServiceHost, ServiceHostContext, ServiceHostStatus } from './types.js';
12
-
13
- export function createServiceHost(platform: SupportedPlatform = detectPlatform()): ServiceHost {
14
- switch (platform) {
15
- case 'linux': return new SystemdServiceHost();
16
- case 'darwin': return new LaunchdServiceHost();
17
- case 'win32': return new NssmServiceHost();
18
- }
19
- }
20
-
21
- export { SystemdServiceHost, LaunchdServiceHost, NssmServiceHost };
1
+ /**
2
+ * Pick the right service-host impl for the current platform.
3
+ */
4
+
5
+ import { detectPlatform, type SupportedPlatform } from '../platform.js';
6
+ import { SystemdServiceHost } from './systemd.js';
7
+ import { LaunchdServiceHost } from './launchd.js';
8
+ import { NssmServiceHost } from './nssm.js';
9
+ import type { ServiceHost } from './types.js';
10
+
11
+ export type { ServiceHost, ServiceHostContext, ServiceHostStatus } from './types.js';
12
+
13
+ export function createServiceHost(platform: SupportedPlatform = detectPlatform()): ServiceHost {
14
+ switch (platform) {
15
+ case 'linux': return new SystemdServiceHost();
16
+ case 'darwin': return new LaunchdServiceHost();
17
+ case 'win32': return new NssmServiceHost();
18
+ }
19
+ }
20
+
21
+ export { SystemdServiceHost, LaunchdServiceHost, NssmServiceHost };
@@ -1,21 +1,21 @@
1
- /**
2
- * Tiny `@TOKEN@` substitution. Used to render systemd / launchd unit
3
- * files. Throws if any tokens are left after substitution to catch
4
- * typos at install time rather than at service-startup time.
5
- */
6
-
7
- const TOKEN_RE = /@([A-Z][A-Z0-9_]*)@/g;
8
-
9
- export function renderTemplate(template: string, tokens: Readonly<Record<string, string>>): string {
10
- const rendered = template.replace(TOKEN_RE, (full, key: string) => {
11
- if (!Object.prototype.hasOwnProperty.call(tokens, key)) {
12
- throw new Error(`renderTemplate: missing value for token ${full}`);
13
- }
14
- return tokens[key];
15
- });
16
- const leftover = rendered.match(TOKEN_RE);
17
- if (leftover) {
18
- throw new Error(`renderTemplate: unresolved tokens: ${leftover.join(', ')}`);
19
- }
20
- return rendered;
21
- }
1
+ /**
2
+ * Tiny `@TOKEN@` substitution. Used to render systemd / launchd unit
3
+ * files. Throws if any tokens are left after substitution to catch
4
+ * typos at install time rather than at service-startup time.
5
+ */
6
+
7
+ const TOKEN_RE = /@([A-Z][A-Z0-9_]*)@/g;
8
+
9
+ export function renderTemplate(template: string, tokens: Readonly<Record<string, string>>): string {
10
+ const rendered = template.replace(TOKEN_RE, (full, key: string) => {
11
+ if (!Object.prototype.hasOwnProperty.call(tokens, key)) {
12
+ throw new Error(`renderTemplate: missing value for token ${full}`);
13
+ }
14
+ return tokens[key];
15
+ });
16
+ const leftover = rendered.match(TOKEN_RE);
17
+ if (leftover) {
18
+ throw new Error(`renderTemplate: unresolved tokens: ${leftover.join(', ')}`);
19
+ }
20
+ return rendered;
21
+ }
@@ -1,103 +1,103 @@
1
- /**
2
- * Interactive install wizard.
3
- *
4
- * Pure readline — no extra deps. Each prompt is decomposed into a small
5
- * `Prompt` so the test can drive the wizard with a scripted Iterable of
6
- * answers. Production code wires the prompts to stdin.
7
- */
8
-
9
- import { createInterface, type Interface as ReadlineInterface } from 'node:readline';
10
-
11
- import { defaultDataDir } from './paths.js';
12
- import type { SupportedPlatform } from './platform.js';
13
-
14
- export interface WizardDefaults {
15
- dataDir: string;
16
- uiPort: number;
17
- libp2pPort: number;
18
- upnpEnabled: boolean;
19
- /** Also run the host's own personal cadre here (founder persona). Default false. */
20
- ownCadre: boolean;
21
- }
22
-
23
- export interface WizardAnswers {
24
- dataDir: string;
25
- uiPort: number;
26
- libp2pPort: number;
27
- upnpEnabled: boolean;
28
- configureDdns: boolean;
29
- /** Also run the host's own personal cadre here (founder persona). */
30
- ownCadre: boolean;
31
- }
32
-
33
- export const DEFAULT_UI_PORT = 8765;
34
- export const DEFAULT_LIBP2P_PORT = 4001;
35
-
36
- export function defaultsForPlatform(platform: SupportedPlatform): WizardDefaults {
37
- return {
38
- dataDir: defaultDataDir(platform),
39
- uiPort: DEFAULT_UI_PORT,
40
- libp2pPort: DEFAULT_LIBP2P_PORT,
41
- upnpEnabled: true,
42
- ownCadre: false,
43
- };
44
- }
45
-
46
- /**
47
- * Drive the wizard with a function that returns the next user answer for
48
- * a prompt. Used both by the readline-backed `runWizard` and by tests.
49
- */
50
- export async function runWizardWith(
51
- defaults: WizardDefaults,
52
- ask: (label: string, fallback: string) => Promise<string>,
53
- ): Promise<WizardAnswers> {
54
- const dataDir = (await ask('Data directory', defaults.dataDir)).trim() || defaults.dataDir;
55
- const uiPort = parsePort(await ask('UI port (localhost only)', String(defaults.uiPort)), defaults.uiPort);
56
- const libp2pPort = parsePort(await ask('Cadre libp2p port', String(defaults.libp2pPort)), defaults.libp2pPort);
57
- const upnpEnabled = parseBool(
58
- await ask('Attempt UPnP port mapping on this network? [Y/n]', defaults.upnpEnabled ? 'Y' : 'n'),
59
- defaults.upnpEnabled,
60
- );
61
- const configureDdns = parseBool(await ask('Configure DDNS now? [y/N]', 'N'), false);
62
- // Founder persona (opt-in). Most installs just donate nodes to friends and
63
- // answer no — a no leaves cadre-host donor-only (no owner node, no /auth+/nat).
64
- const ownCadre = parseBool(
65
- await ask('Also run your own personal cadre on this machine? (most people just donating nodes to friends say no) [y/N]', defaults.ownCadre ? 'Y' : 'N'),
66
- defaults.ownCadre,
67
- );
68
- return { dataDir, uiPort, libp2pPort, upnpEnabled, configureDdns, ownCadre };
69
- }
70
-
71
- /** Production entrypoint — drives the wizard over stdin/stdout. */
72
- export async function runWizard(defaults: WizardDefaults): Promise<WizardAnswers> {
73
- const rl = createInterface({ input: process.stdin, output: process.stdout });
74
- try {
75
- return await runWizardWith(defaults, async (label, fallback) => prompt(rl, label, fallback));
76
- } finally {
77
- rl.close();
78
- }
79
- }
80
-
81
- function prompt(rl: ReadlineInterface, label: string, fallback: string): Promise<string> {
82
- return new Promise<string>((resolve) => {
83
- rl.question(`${label} [${fallback}]: `, (answer) => resolve(answer));
84
- });
85
- }
86
-
87
- function parsePort(input: string, fallback: number): number {
88
- const trimmed = input.trim();
89
- if (!trimmed) return fallback;
90
- const n = Number(trimmed);
91
- if (!Number.isInteger(n) || n <= 0 || n > 65535) {
92
- throw new Error(`Invalid port: ${input}`);
93
- }
94
- return n;
95
- }
96
-
97
- function parseBool(input: string, fallback: boolean): boolean {
98
- const trimmed = input.trim().toLowerCase();
99
- if (!trimmed) return fallback;
100
- if (['y', 'yes', 'true', '1'].includes(trimmed)) return true;
101
- if (['n', 'no', 'false', '0'].includes(trimmed)) return false;
102
- throw new Error(`Invalid yes/no answer: ${input}`);
103
- }
1
+ /**
2
+ * Interactive install wizard.
3
+ *
4
+ * Pure readline — no extra deps. Each prompt is decomposed into a small
5
+ * `Prompt` so the test can drive the wizard with a scripted Iterable of
6
+ * answers. Production code wires the prompts to stdin.
7
+ */
8
+
9
+ import { createInterface, type Interface as ReadlineInterface } from 'node:readline';
10
+
11
+ import { defaultDataDir } from './paths.js';
12
+ import type { SupportedPlatform } from './platform.js';
13
+
14
+ export interface WizardDefaults {
15
+ dataDir: string;
16
+ uiPort: number;
17
+ libp2pPort: number;
18
+ upnpEnabled: boolean;
19
+ /** Also run the host's own personal cadre here (founder persona). Default false. */
20
+ ownCadre: boolean;
21
+ }
22
+
23
+ export interface WizardAnswers {
24
+ dataDir: string;
25
+ uiPort: number;
26
+ libp2pPort: number;
27
+ upnpEnabled: boolean;
28
+ configureDdns: boolean;
29
+ /** Also run the host's own personal cadre here (founder persona). */
30
+ ownCadre: boolean;
31
+ }
32
+
33
+ export const DEFAULT_UI_PORT = 8765;
34
+ export const DEFAULT_LIBP2P_PORT = 4001;
35
+
36
+ export function defaultsForPlatform(platform: SupportedPlatform): WizardDefaults {
37
+ return {
38
+ dataDir: defaultDataDir(platform),
39
+ uiPort: DEFAULT_UI_PORT,
40
+ libp2pPort: DEFAULT_LIBP2P_PORT,
41
+ upnpEnabled: true,
42
+ ownCadre: false,
43
+ };
44
+ }
45
+
46
+ /**
47
+ * Drive the wizard with a function that returns the next user answer for
48
+ * a prompt. Used both by the readline-backed `runWizard` and by tests.
49
+ */
50
+ export async function runWizardWith(
51
+ defaults: WizardDefaults,
52
+ ask: (label: string, fallback: string) => Promise<string>,
53
+ ): Promise<WizardAnswers> {
54
+ const dataDir = (await ask('Data directory', defaults.dataDir)).trim() || defaults.dataDir;
55
+ const uiPort = parsePort(await ask('UI port (localhost only)', String(defaults.uiPort)), defaults.uiPort);
56
+ const libp2pPort = parsePort(await ask('Cadre libp2p port', String(defaults.libp2pPort)), defaults.libp2pPort);
57
+ const upnpEnabled = parseBool(
58
+ await ask('Attempt UPnP port mapping on this network? [Y/n]', defaults.upnpEnabled ? 'Y' : 'n'),
59
+ defaults.upnpEnabled,
60
+ );
61
+ const configureDdns = parseBool(await ask('Configure DDNS now? [y/N]', 'N'), false);
62
+ // Founder persona (opt-in). Most installs just donate nodes to friends and
63
+ // answer no — a no leaves cadre-host donor-only (no owner node, no /auth+/nat).
64
+ const ownCadre = parseBool(
65
+ await ask('Also run your own personal cadre on this machine? (most people just donating nodes to friends say no) [y/N]', defaults.ownCadre ? 'Y' : 'N'),
66
+ defaults.ownCadre,
67
+ );
68
+ return { dataDir, uiPort, libp2pPort, upnpEnabled, configureDdns, ownCadre };
69
+ }
70
+
71
+ /** Production entrypoint — drives the wizard over stdin/stdout. */
72
+ export async function runWizard(defaults: WizardDefaults): Promise<WizardAnswers> {
73
+ const rl = createInterface({ input: process.stdin, output: process.stdout });
74
+ try {
75
+ return await runWizardWith(defaults, async (label, fallback) => prompt(rl, label, fallback));
76
+ } finally {
77
+ rl.close();
78
+ }
79
+ }
80
+
81
+ function prompt(rl: ReadlineInterface, label: string, fallback: string): Promise<string> {
82
+ return new Promise<string>((resolve) => {
83
+ rl.question(`${label} [${fallback}]: `, (answer) => resolve(answer));
84
+ });
85
+ }
86
+
87
+ function parsePort(input: string, fallback: number): number {
88
+ const trimmed = input.trim();
89
+ if (!trimmed) return fallback;
90
+ const n = Number(trimmed);
91
+ if (!Number.isInteger(n) || n <= 0 || n > 65535) {
92
+ throw new Error(`Invalid port: ${input}`);
93
+ }
94
+ return n;
95
+ }
96
+
97
+ function parseBool(input: string, fallback: boolean): boolean {
98
+ const trimmed = input.trim().toLowerCase();
99
+ if (!trimmed) return fallback;
100
+ if (['y', 'yes', 'true', '1'].includes(trimmed)) return true;
101
+ if (['n', 'no', 'false', '0'].includes(trimmed)) return false;
102
+ throw new Error(`Invalid yes/no answer: ${input}`);
103
+ }
@@ -1,82 +1,82 @@
1
- import { describe, expect, it } from 'vitest';
2
-
3
- import { buildInviteAddresses } from '../address-resolver.js';
4
-
5
- const PEER = '12D3KooWHost';
6
-
7
- describe('buildInviteAddresses', () => {
8
- it('returns dns4 when reachable and a DDNS hostname is configured', () => {
9
- const addrs = buildInviteAddresses({
10
- peerId: PEER,
11
- externalPort: 4001,
12
- ddnsHostname: 'foo.duckdns.org',
13
- externalIp: '1.2.3.4',
14
- reachable: true,
15
- libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
16
- });
17
- expect(addrs).toEqual([`/dns4/foo.duckdns.org/tcp/4001/p2p/${PEER}`]);
18
- });
19
-
20
- it('falls back to ip4 when reachable but no DDNS hostname', () => {
21
- const addrs = buildInviteAddresses({
22
- peerId: PEER,
23
- externalPort: 4001,
24
- ddnsHostname: null,
25
- externalIp: '203.0.113.5',
26
- reachable: true,
27
- libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
28
- });
29
- expect(addrs).toEqual([`/ip4/203.0.113.5/tcp/4001/p2p/${PEER}`]);
30
- });
31
-
32
- it('falls back to libp2p addrs when not reachable', () => {
33
- const addrs = buildInviteAddresses({
34
- peerId: PEER,
35
- externalPort: 4001,
36
- ddnsHostname: 'foo.duckdns.org',
37
- externalIp: '1.2.3.4',
38
- reachable: false,
39
- libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001', '/p2p-circuit'],
40
- });
41
- expect(addrs.length).toBeGreaterThan(0);
42
- expect(addrs.some((a) => a.startsWith('/dns4/'))).toBe(false);
43
- expect(addrs.some((a) => a.startsWith('/ip4/'))).toBe(true);
44
- });
45
-
46
- it('appends peer suffix to libp2p addrs that lack one', () => {
47
- const addrs = buildInviteAddresses({
48
- peerId: PEER,
49
- externalPort: 4001,
50
- ddnsHostname: null,
51
- externalIp: null,
52
- reachable: false,
53
- libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
54
- });
55
- expect(addrs).toEqual([`/ip4/192.168.1.10/tcp/4001/p2p/${PEER}`]);
56
- });
57
-
58
- it('preserves libp2p addrs that already have a /p2p/ suffix', () => {
59
- const existing = `/ip4/192.168.1.10/tcp/4001/p2p/${PEER}`;
60
- const addrs = buildInviteAddresses({
61
- peerId: PEER,
62
- externalPort: 4001,
63
- ddnsHostname: null,
64
- externalIp: null,
65
- reachable: false,
66
- libp2pAddrs: [existing],
67
- });
68
- expect(addrs).toEqual([existing]);
69
- });
70
-
71
- it('does not emit /ip4/ for IPv6 external IP — falls back instead', () => {
72
- const addrs = buildInviteAddresses({
73
- peerId: PEER,
74
- externalPort: 4001,
75
- ddnsHostname: null,
76
- externalIp: '2001:db8::1',
77
- reachable: true,
78
- libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
79
- });
80
- expect(addrs.some((a) => a.startsWith('/ip4/192.168.1.10'))).toBe(true);
81
- });
82
- });
1
+ import { describe, expect, it } from 'vitest';
2
+
3
+ import { buildInviteAddresses } from '../address-resolver.js';
4
+
5
+ const PEER = '12D3KooWHost';
6
+
7
+ describe('buildInviteAddresses', () => {
8
+ it('returns dns4 when reachable and a DDNS hostname is configured', () => {
9
+ const addrs = buildInviteAddresses({
10
+ peerId: PEER,
11
+ externalPort: 4001,
12
+ ddnsHostname: 'foo.duckdns.org',
13
+ externalIp: '1.2.3.4',
14
+ reachable: true,
15
+ libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
16
+ });
17
+ expect(addrs).toEqual([`/dns4/foo.duckdns.org/tcp/4001/p2p/${PEER}`]);
18
+ });
19
+
20
+ it('falls back to ip4 when reachable but no DDNS hostname', () => {
21
+ const addrs = buildInviteAddresses({
22
+ peerId: PEER,
23
+ externalPort: 4001,
24
+ ddnsHostname: null,
25
+ externalIp: '203.0.113.5',
26
+ reachable: true,
27
+ libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
28
+ });
29
+ expect(addrs).toEqual([`/ip4/203.0.113.5/tcp/4001/p2p/${PEER}`]);
30
+ });
31
+
32
+ it('falls back to libp2p addrs when not reachable', () => {
33
+ const addrs = buildInviteAddresses({
34
+ peerId: PEER,
35
+ externalPort: 4001,
36
+ ddnsHostname: 'foo.duckdns.org',
37
+ externalIp: '1.2.3.4',
38
+ reachable: false,
39
+ libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001', '/p2p-circuit'],
40
+ });
41
+ expect(addrs.length).toBeGreaterThan(0);
42
+ expect(addrs.some((a) => a.startsWith('/dns4/'))).toBe(false);
43
+ expect(addrs.some((a) => a.startsWith('/ip4/'))).toBe(true);
44
+ });
45
+
46
+ it('appends peer suffix to libp2p addrs that lack one', () => {
47
+ const addrs = buildInviteAddresses({
48
+ peerId: PEER,
49
+ externalPort: 4001,
50
+ ddnsHostname: null,
51
+ externalIp: null,
52
+ reachable: false,
53
+ libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
54
+ });
55
+ expect(addrs).toEqual([`/ip4/192.168.1.10/tcp/4001/p2p/${PEER}`]);
56
+ });
57
+
58
+ it('preserves libp2p addrs that already have a /p2p/ suffix', () => {
59
+ const existing = `/ip4/192.168.1.10/tcp/4001/p2p/${PEER}`;
60
+ const addrs = buildInviteAddresses({
61
+ peerId: PEER,
62
+ externalPort: 4001,
63
+ ddnsHostname: null,
64
+ externalIp: null,
65
+ reachable: false,
66
+ libp2pAddrs: [existing],
67
+ });
68
+ expect(addrs).toEqual([existing]);
69
+ });
70
+
71
+ it('does not emit /ip4/ for IPv6 external IP — falls back instead', () => {
72
+ const addrs = buildInviteAddresses({
73
+ peerId: PEER,
74
+ externalPort: 4001,
75
+ ddnsHostname: null,
76
+ externalIp: '2001:db8::1',
77
+ reachable: true,
78
+ libp2pAddrs: ['/ip4/192.168.1.10/tcp/4001'],
79
+ });
80
+ expect(addrs.some((a) => a.startsWith('/ip4/192.168.1.10'))).toBe(true);
81
+ });
82
+ });
@@ -1,83 +1,83 @@
1
- import { describe, expect, it } from 'vitest';
2
-
3
- import { duckDnsProvider } from '../ddns/duckdns.js';
4
- import { NatError } from '../types.js';
5
-
6
- function makeFetch(responses: Array<{ ok: boolean; status?: number; body: string }>): {
7
- fetch: typeof fetch;
8
- calls: string[];
9
- } {
10
- const calls: string[] = [];
11
- let i = 0;
12
- const fetchImpl = (async (input: RequestInfo | URL) => {
13
- calls.push(String(input));
14
- const r = responses[i++] ?? { ok: false, body: '' };
15
- return {
16
- ok: r.ok,
17
- status: r.status ?? (r.ok ? 200 : 500),
18
- statusText: r.ok ? 'OK' : 'Server Error',
19
- async text() { return r.body; },
20
- } as unknown as Response;
21
- }) as typeof fetch;
22
- return { fetch: fetchImpl, calls };
23
- }
24
-
25
- describe('duckDnsProvider', () => {
26
- it('exposes metadata', () => {
27
- expect(duckDnsProvider.id).toBe('duckdns');
28
- expect(duckDnsProvider.displayName).toBe('DuckDNS');
29
- expect(duckDnsProvider.configFields).toHaveLength(1);
30
- expect(duckDnsProvider.configFields[0]).toMatchObject({ key: 'token', secret: true });
31
- });
32
-
33
- it('OK response → resolves', async () => {
34
- const f = makeFetch([{ ok: true, body: 'OK' }]);
35
- await expect(
36
- duckDnsProvider.update({ token: 'T' }, 'foo.duckdns.org', '1.2.3.4', { fetch: f.fetch }),
37
- ).resolves.toBeUndefined();
38
- expect(f.calls[0]).toContain('domains=foo');
39
- expect(f.calls[0]).toContain('token=T');
40
- expect(f.calls[0]).toContain('ip=1.2.3.4');
41
- });
42
-
43
- it('KO response → throws ddns_update_failed', async () => {
44
- const f = makeFetch([{ ok: true, body: 'KO' }]);
45
- await expect(
46
- duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f.fetch }),
47
- ).rejects.toMatchObject({ code: 'ddns_update_failed' });
48
- });
49
-
50
- it('HTTP error → throws ddns_update_failed', async () => {
51
- const f = makeFetch([{ ok: false, status: 503, body: '' }]);
52
- await expect(
53
- duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f.fetch }),
54
- ).rejects.toMatchObject({ code: 'ddns_update_failed' });
55
- });
56
-
57
- it('strips trailing .duckdns.org from hostname', async () => {
58
- const f = makeFetch([{ ok: true, body: 'OK' }]);
59
- await duckDnsProvider.update({ token: 'T' }, 'MyHost.DuckDNS.ORG', '1.2.3.4', { fetch: f.fetch });
60
- expect(f.calls[0]).toContain('domains=myhost');
61
- });
62
-
63
- it('missing token → ddns_credentials_missing', async () => {
64
- const f = makeFetch([]);
65
- await expect(
66
- duckDnsProvider.update({}, 'foo', '1.2.3.4', { fetch: f.fetch }),
67
- ).rejects.toMatchObject({ code: 'ddns_credentials_missing' });
68
- });
69
-
70
- it('empty hostname → invalid_config', async () => {
71
- const f = makeFetch([]);
72
- await expect(
73
- duckDnsProvider.update({ token: 'T' }, ' ', '1.2.3.4', { fetch: f.fetch }),
74
- ).rejects.toBeInstanceOf(NatError);
75
- });
76
-
77
- it('network error → ddns_update_failed', async () => {
78
- const f = (async () => { throw new Error('ENETUNREACH'); }) as typeof fetch;
79
- await expect(
80
- duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f }),
81
- ).rejects.toMatchObject({ code: 'ddns_update_failed' });
82
- });
83
- });
1
+ import { describe, expect, it } from 'vitest';
2
+
3
+ import { duckDnsProvider } from '../ddns/duckdns.js';
4
+ import { NatError } from '../types.js';
5
+
6
+ function makeFetch(responses: Array<{ ok: boolean; status?: number; body: string }>): {
7
+ fetch: typeof fetch;
8
+ calls: string[];
9
+ } {
10
+ const calls: string[] = [];
11
+ let i = 0;
12
+ const fetchImpl = (async (input: RequestInfo | URL) => {
13
+ calls.push(String(input));
14
+ const r = responses[i++] ?? { ok: false, body: '' };
15
+ return {
16
+ ok: r.ok,
17
+ status: r.status ?? (r.ok ? 200 : 500),
18
+ statusText: r.ok ? 'OK' : 'Server Error',
19
+ async text() { return r.body; },
20
+ } as unknown as Response;
21
+ }) as typeof fetch;
22
+ return { fetch: fetchImpl, calls };
23
+ }
24
+
25
+ describe('duckDnsProvider', () => {
26
+ it('exposes metadata', () => {
27
+ expect(duckDnsProvider.id).toBe('duckdns');
28
+ expect(duckDnsProvider.displayName).toBe('DuckDNS');
29
+ expect(duckDnsProvider.configFields).toHaveLength(1);
30
+ expect(duckDnsProvider.configFields[0]).toMatchObject({ key: 'token', secret: true });
31
+ });
32
+
33
+ it('OK response → resolves', async () => {
34
+ const f = makeFetch([{ ok: true, body: 'OK' }]);
35
+ await expect(
36
+ duckDnsProvider.update({ token: 'T' }, 'foo.duckdns.org', '1.2.3.4', { fetch: f.fetch }),
37
+ ).resolves.toBeUndefined();
38
+ expect(f.calls[0]).toContain('domains=foo');
39
+ expect(f.calls[0]).toContain('token=T');
40
+ expect(f.calls[0]).toContain('ip=1.2.3.4');
41
+ });
42
+
43
+ it('KO response → throws ddns_update_failed', async () => {
44
+ const f = makeFetch([{ ok: true, body: 'KO' }]);
45
+ await expect(
46
+ duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f.fetch }),
47
+ ).rejects.toMatchObject({ code: 'ddns_update_failed' });
48
+ });
49
+
50
+ it('HTTP error → throws ddns_update_failed', async () => {
51
+ const f = makeFetch([{ ok: false, status: 503, body: '' }]);
52
+ await expect(
53
+ duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f.fetch }),
54
+ ).rejects.toMatchObject({ code: 'ddns_update_failed' });
55
+ });
56
+
57
+ it('strips trailing .duckdns.org from hostname', async () => {
58
+ const f = makeFetch([{ ok: true, body: 'OK' }]);
59
+ await duckDnsProvider.update({ token: 'T' }, 'MyHost.DuckDNS.ORG', '1.2.3.4', { fetch: f.fetch });
60
+ expect(f.calls[0]).toContain('domains=myhost');
61
+ });
62
+
63
+ it('missing token → ddns_credentials_missing', async () => {
64
+ const f = makeFetch([]);
65
+ await expect(
66
+ duckDnsProvider.update({}, 'foo', '1.2.3.4', { fetch: f.fetch }),
67
+ ).rejects.toMatchObject({ code: 'ddns_credentials_missing' });
68
+ });
69
+
70
+ it('empty hostname → invalid_config', async () => {
71
+ const f = makeFetch([]);
72
+ await expect(
73
+ duckDnsProvider.update({ token: 'T' }, ' ', '1.2.3.4', { fetch: f.fetch }),
74
+ ).rejects.toBeInstanceOf(NatError);
75
+ });
76
+
77
+ it('network error → ddns_update_failed', async () => {
78
+ const f = (async () => { throw new Error('ENETUNREACH'); }) as typeof fetch;
79
+ await expect(
80
+ duckDnsProvider.update({ token: 'T' }, 'foo', '1.2.3.4', { fetch: f }),
81
+ ).rejects.toMatchObject({ code: 'ddns_update_failed' });
82
+ });
83
+ });