@serfab/cadre-host 0.7.1 → 0.9.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.
- package/README.md +296 -101
- package/dist/auth/trust-circle.d.ts +45 -7
- package/dist/auth/trust-circle.js +116 -59
- package/dist/auth/trust-circle.js.map +1 -1
- package/dist/auth/types.d.ts +4 -1
- package/dist/auth/types.js.map +1 -1
- package/dist/bin/host.js +426 -112
- package/dist/bin/host.js.map +1 -1
- package/dist/donation/donation-service.d.ts +136 -0
- package/dist/donation/donation-service.js +306 -0
- package/dist/donation/donation-service.js.map +1 -0
- package/dist/donation/donation-store.d.ts +42 -0
- package/dist/donation/donation-store.js +141 -0
- package/dist/donation/donation-store.js.map +1 -0
- package/dist/donation/grant-service.d.ts +71 -0
- package/dist/donation/grant-service.js +163 -0
- package/dist/donation/grant-service.js.map +1 -0
- package/dist/donation/grant-store.d.ts +38 -0
- package/dist/donation/grant-store.js +135 -0
- package/dist/donation/grant-store.js.map +1 -0
- package/dist/donation/index.d.ts +18 -0
- package/dist/donation/index.js +16 -0
- package/dist/donation/index.js.map +1 -0
- package/dist/donation/types.d.ts +175 -0
- package/dist/donation/types.js +40 -0
- package/dist/donation/types.js.map +1 -0
- package/dist/index.d.ts +12 -6
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/installer/browser.js +16 -17
- package/dist/installer/browser.js.map +1 -1
- package/dist/installer/config.d.ts +51 -0
- package/dist/installer/config.js +14 -1
- package/dist/installer/config.js.map +1 -1
- package/dist/installer/index.d.ts +7 -2
- package/dist/installer/index.js +17 -10
- package/dist/installer/index.js.map +1 -1
- package/dist/installer/service-host/launchd.js +1 -1
- package/dist/installer/service-host/launchd.js.map +1 -1
- package/dist/installer/service-host/systemd.js +1 -1
- package/dist/installer/service-host/systemd.js.map +1 -1
- package/dist/installer/wizard.d.ts +4 -0
- package/dist/installer/wizard.js +5 -1
- package/dist/installer/wizard.js.map +1 -1
- package/dist/nat/index.d.ts +1 -1
- package/dist/nat/nat-service.d.ts +45 -3
- package/dist/nat/nat-service.js +116 -3
- package/dist/nat/nat-service.js.map +1 -1
- package/dist/nat/secrets/index.d.ts +7 -0
- package/dist/nat/secrets/index.js +28 -2
- package/dist/nat/secrets/index.js.map +1 -1
- package/dist/nat/types.d.ts +3 -1
- package/dist/nat/types.js.map +1 -1
- package/dist/orchestrator/host-process-orchestrator.d.ts +68 -1
- package/dist/orchestrator/host-process-orchestrator.js +272 -39
- package/dist/orchestrator/host-process-orchestrator.js.map +1 -1
- package/dist/orchestrator/index.d.ts +3 -2
- package/dist/orchestrator/index.js +1 -1
- package/dist/orchestrator/index.js.map +1 -1
- package/dist/orchestrator/state-store.d.ts +6 -5
- package/dist/orchestrator/state-store.js +10 -2
- package/dist/orchestrator/state-store.js.map +1 -1
- package/dist/orchestrator/types.d.ts +45 -10
- package/dist/orchestrator/types.js.map +1 -1
- package/dist/owner/index.d.ts +11 -0
- package/dist/owner/index.js +11 -0
- package/dist/owner/index.js.map +1 -0
- package/dist/owner/owner-node-client.d.ts +95 -0
- package/dist/owner/owner-node-client.js +167 -0
- package/dist/owner/owner-node-client.js.map +1 -0
- package/dist/push/index.d.ts +67 -0
- package/dist/push/index.js +101 -0
- package/dist/push/index.js.map +1 -0
- package/dist/server/error-handler.d.ts +17 -0
- package/dist/server/error-handler.js +45 -0
- package/dist/server/error-handler.js.map +1 -1
- package/dist/server/index.d.ts +26 -2
- package/dist/server/index.js +37 -16
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/grants-admin.d.ts +17 -0
- package/dist/server/routes/grants-admin.js +32 -0
- package/dist/server/routes/grants-admin.js.map +1 -0
- package/dist/server/routes/grants.d.ts +28 -0
- package/dist/server/routes/grants.js +163 -0
- package/dist/server/routes/grants.js.map +1 -0
- package/dist/server/routes/nodes.d.ts +5 -3
- package/dist/server/routes/nodes.js +39 -24
- package/dist/server/routes/nodes.js.map +1 -1
- package/dist/server/routes/settings.d.ts +6 -1
- package/dist/server/routes/settings.js +5 -2
- package/dist/server/routes/settings.js.map +1 -1
- package/dist/server/routes/status.d.ts +8 -4
- package/dist/server/routes/status.js +9 -4
- package/dist/server/routes/status.js.map +1 -1
- package/dist/server/static.d.ts +12 -0
- package/dist/server/static.js +24 -7
- package/dist/server/static.js.map +1 -1
- package/dist/ui/assets/index-BlMXQPSw.js +14 -0
- package/dist/ui/assets/{index-C9uChk2P.js.map → index-BlMXQPSw.js.map} +1 -1
- package/dist/ui/index.html +1 -1
- package/dist/update/apply.d.ts +23 -1
- package/dist/update/apply.js +46 -4
- package/dist/update/apply.js.map +1 -1
- package/dist/update/index.d.ts +14 -3
- package/dist/update/index.js +35 -2
- package/dist/update/index.js.map +1 -1
- package/dist/update/manifest.d.ts +28 -9
- package/dist/update/manifest.js +56 -29
- package/dist/update/manifest.js.map +1 -1
- package/dist/update/release-key.d.ts +18 -7
- package/dist/update/release-key.js +29 -14
- package/dist/update/release-key.js.map +1 -1
- package/dist/update/sign.d.ts +46 -0
- package/dist/update/sign.js +53 -0
- package/dist/update/sign.js.map +1 -0
- package/package.json +9 -4
- package/service/README.md +95 -86
- package/src/__tests__/cli-invite.smoke.test.ts +6 -1
- package/src/__tests__/cli-nat.smoke.test.ts +6 -1
- package/src/__tests__/cli.smoke.test.ts +6 -1
- package/src/__tests__/host-owner.smoke.test.ts +123 -0
- package/src/__tests__/orchestrator-owner.test.ts +198 -0
- package/src/__tests__/orchestrator-pin-keys.test.ts +153 -0
- package/src/__tests__/orchestrator-push.test.ts +145 -0
- package/src/auth/__tests__/trust-circle-integration.test.ts +44 -25
- package/src/auth/__tests__/trust-circle.test.ts +91 -24
- package/src/auth/trust-circle.ts +363 -304
- package/src/auth/types.ts +4 -1
- package/src/bin/host.ts +1258 -905
- package/src/donation/__tests__/donation-service.test.ts +290 -0
- package/src/donation/__tests__/grant-service.test.ts +213 -0
- package/src/donation/__tests__/grant-store.test.ts +113 -0
- package/src/donation/donation-service.ts +392 -0
- package/src/donation/donation-store.ts +164 -0
- package/src/donation/grant-service.ts +200 -0
- package/src/donation/grant-store.ts +152 -0
- package/src/donation/index.ts +49 -0
- package/src/donation/types.ts +220 -0
- package/src/index.ts +66 -3
- package/src/installer/__tests__/config.test.ts +27 -1
- package/src/installer/__tests__/installer.smoke.test.ts +94 -0
- package/src/installer/__tests__/wizard.test.ts +5 -1
- package/src/installer/browser.ts +40 -42
- package/src/installer/config.ts +61 -1
- package/src/installer/index.ts +23 -12
- package/src/installer/service-host/launchd.ts +1 -1
- package/src/installer/service-host/systemd.ts +1 -1
- package/src/installer/wizard.ts +12 -1
- package/src/nat/__tests__/ddns-updater.test.ts +1 -1
- package/src/nat/__tests__/nat-service.test.ts +192 -0
- package/src/nat/__tests__/port-mapper.test.ts +1 -1
- package/src/nat/__tests__/secrets.test.ts +23 -1
- package/src/nat/index.ts +1 -1
- package/src/nat/nat-service.ts +131 -5
- package/src/nat/secrets/index.ts +32 -2
- package/src/nat/types.ts +3 -1
- package/src/orchestrator/host-process-orchestrator.ts +322 -54
- package/src/orchestrator/index.ts +9 -2
- package/src/orchestrator/state-store.ts +21 -3
- package/src/orchestrator/types.ts +48 -2
- package/src/owner/__tests__/owner-node-client.test.ts +194 -0
- package/src/owner/index.ts +12 -0
- package/src/owner/owner-node-client.ts +233 -0
- package/src/push/__tests__/push.test.ts +90 -0
- package/src/push/index.ts +146 -0
- package/src/server/__tests__/error-handler.test.ts +26 -4
- package/src/server/__tests__/grants-admin-route.test.ts +73 -0
- package/src/server/__tests__/grants-route.test.ts +189 -0
- package/src/server/__tests__/nodes-route.test.ts +90 -10
- package/src/server/__tests__/publishers.test.ts +1 -1
- package/src/server/__tests__/server.smoke.test.ts +75 -0
- package/src/server/__tests__/settings-route.test.ts +17 -0
- package/src/server/__tests__/static.test.ts +145 -0
- package/src/server/__tests__/status-route.test.ts +23 -2
- package/src/server/error-handler.ts +47 -0
- package/src/server/index.ts +62 -17
- package/src/server/routes/grants-admin.ts +41 -0
- package/src/server/routes/grants.ts +186 -0
- package/src/server/routes/nodes.ts +49 -26
- package/src/server/routes/settings.ts +11 -3
- package/src/server/routes/status.ts +18 -8
- package/src/server/static.ts +24 -8
- package/src/update/__tests__/apply.test.ts +58 -1
- package/src/update/__tests__/manifest.test.ts +41 -6
- package/src/update/__tests__/release-key.test.ts +42 -0
- package/src/update/__tests__/sign.test.ts +78 -0
- package/src/update/__tests__/update-service.integration.test.ts +44 -9
- package/src/update/apply.ts +46 -4
- package/src/update/index.ts +41 -3
- package/src/update/manifest.ts +214 -172
- package/src/update/release-key.ts +31 -15
- package/src/update/sign.ts +74 -0
- package/dist/ui/assets/index-C9uChk2P.js +0 -14
|
@@ -9,11 +9,12 @@ import { TrustCircleService, createTrustCircleHandlers } from '../trust-circle.j
|
|
|
9
9
|
import { TrustCircleStore } from '../trust-circle-store.js';
|
|
10
10
|
import { TrustCircleError } from '../types.js';
|
|
11
11
|
import type { CadreNodeLike } from '../trust-circle.js';
|
|
12
|
+
import { OwnerNodeUnavailableError } from '../../owner/owner-node-client.js';
|
|
12
13
|
|
|
13
14
|
/**
|
|
14
|
-
* Minimal in-memory mock of
|
|
15
|
-
* assertions can verify the auth + redemption flow without standing up a
|
|
16
|
-
* real libp2p control network.
|
|
15
|
+
* Minimal in-memory mock of the owner-node channel adapter. Records calls
|
|
16
|
+
* so assertions can verify the auth + redemption flow without standing up a
|
|
17
|
+
* real libp2p control network or admin channel.
|
|
17
18
|
*/
|
|
18
19
|
class MockCadreNode implements CadreNodeLike {
|
|
19
20
|
readonly authorizedPeers = new Set<string>();
|
|
@@ -23,14 +24,14 @@ class MockCadreNode implements CadreNodeLike {
|
|
|
23
24
|
|
|
24
25
|
/** Toggle to make acceptPhone reject. */
|
|
25
26
|
acceptShouldThrow: Error | null = null;
|
|
26
|
-
/**
|
|
27
|
-
|
|
27
|
+
/** When false, membership calls throw OwnerNodeUnavailableError. */
|
|
28
|
+
nodeAvailable = true;
|
|
28
29
|
|
|
29
30
|
async createInvite(token?: string, expiresIn?: number) {
|
|
30
31
|
this.issuedInvites.push({ token, expiresIn });
|
|
31
32
|
const invite: CadreInvite = {
|
|
32
33
|
partyId: 'party-test',
|
|
33
|
-
|
|
34
|
+
ownerAddrs: ['/ip4/127.0.0.1/tcp/4001'],
|
|
34
35
|
token,
|
|
35
36
|
createdAt: Date.now(),
|
|
36
37
|
...(expiresIn ? { expiresAt: Date.now() + expiresIn } : {}),
|
|
@@ -53,21 +54,14 @@ class MockCadreNode implements CadreNodeLike {
|
|
|
53
54
|
return 'enc:' + JSON.stringify(invite);
|
|
54
55
|
}
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
if (!this.
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
if (peers.has(target)) yield { PeerId: target };
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
for (const p of peers) yield { PeerId: p };
|
|
68
|
-
},
|
|
69
|
-
}),
|
|
70
|
-
} as unknown as ReturnType<CadreNodeLike['getControlDatabase']>;
|
|
57
|
+
async listMembers(): Promise<Array<{ peerId: string; multiaddr: string | null }>> {
|
|
58
|
+
if (!this.nodeAvailable) throw new OwnerNodeUnavailableError('node down');
|
|
59
|
+
return [...this.authorizedPeers].map((peerId) => ({ peerId, multiaddr: null }));
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
async isMember(peerId: string): Promise<boolean> {
|
|
63
|
+
if (!this.nodeAvailable) throw new OwnerNodeUnavailableError('node down');
|
|
64
|
+
return this.authorizedPeers.has(peerId);
|
|
71
65
|
}
|
|
72
66
|
}
|
|
73
67
|
|
|
@@ -204,6 +198,71 @@ describe('TrustCircleService.redeemInvite', () => {
|
|
|
204
198
|
expect(cadreNode.authorizedPeers.has('pA')).toBe(true);
|
|
205
199
|
expect(cadreNode.authorizedPeers.has('pB')).toBe(false);
|
|
206
200
|
});
|
|
201
|
+
|
|
202
|
+
it('preserves the pending token when acceptPhone fails with node_unavailable', async () => {
|
|
203
|
+
const { token } = await service.issueInvite({ label: 'Transient' });
|
|
204
|
+
cadreNode.acceptShouldThrow = new OwnerNodeUnavailableError('node down');
|
|
205
|
+
|
|
206
|
+
await expect(service.redeemInvite({ token, peerId: 'pTrans' }))
|
|
207
|
+
.rejects.toMatchObject({ code: 'node_unavailable' });
|
|
208
|
+
|
|
209
|
+
// Token must still be redeemable.
|
|
210
|
+
expect(store.getPending(token)).toBeDefined();
|
|
211
|
+
expect(cadreNode.authorizedPeers.has('pTrans')).toBe(false);
|
|
212
|
+
|
|
213
|
+
// Retry after the node recovers.
|
|
214
|
+
cadreNode.acceptShouldThrow = null;
|
|
215
|
+
await expect(service.redeemInvite({ token, peerId: 'pTrans' }))
|
|
216
|
+
.resolves.toMatchObject({ peerId: 'pTrans', label: 'Transient' });
|
|
217
|
+
expect(cadreNode.authorizedPeers.has('pTrans')).toBe(true);
|
|
218
|
+
expect(store.getPending(token)).toBeUndefined();
|
|
219
|
+
});
|
|
220
|
+
|
|
221
|
+
it('concurrent redeem during a gated node_unavailable leaves the token re-redeemable', async () => {
|
|
222
|
+
const { token } = await service.issueInvite({ label: 'GatedFail' });
|
|
223
|
+
|
|
224
|
+
// Gate acceptPhone — reject on release with a transient error so the
|
|
225
|
+
// first redeem hits node_unavailable. The second redeem should still
|
|
226
|
+
// bounce synchronously while the gate is held.
|
|
227
|
+
let release!: () => void;
|
|
228
|
+
const gate = new Promise<void>((_, reject) => { release = () => reject(new OwnerNodeUnavailableError('node down')); });
|
|
229
|
+
cadreNode.acceptPhone = async () => {
|
|
230
|
+
await gate;
|
|
231
|
+
};
|
|
232
|
+
|
|
233
|
+
const first = service.redeemInvite({ token, peerId: 'pA' });
|
|
234
|
+
const second = service.redeemInvite({ token, peerId: 'pB' });
|
|
235
|
+
|
|
236
|
+
await expect(second).rejects.toMatchObject({ code: 'already_redeemed' });
|
|
237
|
+
|
|
238
|
+
release();
|
|
239
|
+
await expect(first).rejects.toMatchObject({ code: 'node_unavailable' });
|
|
240
|
+
|
|
241
|
+
// Pending row preserved; in-flight Set cleared via finally.
|
|
242
|
+
expect(store.getPending(token)).toBeDefined();
|
|
243
|
+
expect(cadreNode.authorizedPeers.has('pA')).toBe(false);
|
|
244
|
+
expect(cadreNode.authorizedPeers.has('pB')).toBe(false);
|
|
245
|
+
|
|
246
|
+
// Third redeem (after in-flight slot freed) succeeds against a healthy node.
|
|
247
|
+
cadreNode.acceptPhone = async (options) => {
|
|
248
|
+
cadreNode.authorizedPeers.add(options.phonePeerId);
|
|
249
|
+
};
|
|
250
|
+
await expect(service.redeemInvite({ token, peerId: 'pC' }))
|
|
251
|
+
.resolves.toMatchObject({ peerId: 'pC', label: 'GatedFail' });
|
|
252
|
+
expect(store.getPending(token)).toBeUndefined();
|
|
253
|
+
expect(cadreNode.authorizedPeers.has('pC')).toBe(true);
|
|
254
|
+
});
|
|
255
|
+
|
|
256
|
+
it('preserves the pending token on non-transient acceptPhone failures (admin must revoke)', async () => {
|
|
257
|
+
const { token } = await service.issueInvite({ label: 'OtherFail' });
|
|
258
|
+
cadreNode.acceptShouldThrow = new Error('cadre-core rejected the peer');
|
|
259
|
+
|
|
260
|
+
await expect(service.redeemInvite({ token, peerId: 'pX' }))
|
|
261
|
+
.rejects.toThrow('cadre-core rejected the peer');
|
|
262
|
+
|
|
263
|
+
expect(store.getPending(token)).toBeDefined();
|
|
264
|
+
expect(cadreNode.authorizedPeers.has('pX')).toBe(false);
|
|
265
|
+
});
|
|
207
266
|
});
|
|
208
267
|
|
|
209
268
|
describe('TrustCircleService.issueInvite — label length', () => {
|
|
@@ -290,16 +349,24 @@ describe('TrustCircleService.list', () => {
|
|
|
290
349
|
expect(store.getMember('orphan')).toBeUndefined();
|
|
291
350
|
});
|
|
292
351
|
|
|
293
|
-
it('falls back to local labels when
|
|
352
|
+
it('falls back to local labels when the owner node is unavailable', async () => {
|
|
294
353
|
store.addMember({ peerId: 'pZ', label: 'Zoe', addedAt: 't' });
|
|
295
|
-
cadreNode.
|
|
354
|
+
cadreNode.nodeAvailable = false;
|
|
296
355
|
|
|
297
356
|
const snap = await service.list();
|
|
298
357
|
expect(snap.members.some(m => m.peerId === 'pZ' && m.label === 'Zoe')).toBe(true);
|
|
299
|
-
// Orphan check is skipped when
|
|
358
|
+
// Orphan check is skipped when the node is unavailable.
|
|
300
359
|
expect(store.getMember('pZ')).toBeDefined();
|
|
301
360
|
});
|
|
302
361
|
|
|
362
|
+
it('issueInvite surfaces node_unavailable when the channel is down', async () => {
|
|
363
|
+
const downNode = new MockCadreNode();
|
|
364
|
+
downNode.createInvite = async () => { throw new OwnerNodeUnavailableError('refused'); };
|
|
365
|
+
const svc = new TrustCircleService({ cadreNode: downNode, store });
|
|
366
|
+
await expect(svc.issueInvite({ label: 'Nina' }))
|
|
367
|
+
.rejects.toMatchObject({ code: 'node_unavailable' });
|
|
368
|
+
});
|
|
369
|
+
|
|
303
370
|
it('shows unlabelled CadrePeer rows with peerId as label', async () => {
|
|
304
371
|
cadreNode.authorizedPeers.add('unlabeled-peer');
|
|
305
372
|
const snap = await service.list();
|