@serfab/cadre-host 1.13.0 → 1.15.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 +347 -423
- package/dist/bin/host.d.ts +6 -3
- package/dist/bin/host.js +332 -524
- package/dist/bin/host.js.map +1 -1
- package/dist/bin/join-output.d.ts +56 -0
- package/dist/bin/join-output.js +92 -0
- package/dist/bin/join-output.js.map +1 -0
- package/dist/bin/nat-output.d.ts +54 -0
- package/dist/bin/nat-output.js +138 -0
- package/dist/bin/nat-output.js.map +1 -0
- package/dist/bin/ui-access.d.ts +22 -0
- package/dist/bin/ui-access.js +44 -0
- package/dist/bin/ui-access.js.map +1 -0
- package/dist/hosted/claim-details.d.ts +66 -0
- package/dist/hosted/claim-details.js +60 -0
- package/dist/hosted/claim-details.js.map +1 -0
- package/dist/hosted/hosted-node-service.d.ts +325 -0
- package/dist/hosted/hosted-node-service.js +678 -0
- package/dist/hosted/hosted-node-service.js.map +1 -0
- package/dist/hosted/hosted-node-store.d.ts +40 -0
- package/dist/hosted/hosted-node-store.js +126 -0
- package/dist/hosted/hosted-node-store.js.map +1 -0
- package/dist/{donation/donation-supervisor.d.ts → hosted/hosted-node-supervisor.d.ts} +70 -53
- package/dist/hosted/hosted-node-supervisor.js +396 -0
- package/dist/hosted/hosted-node-supervisor.js.map +1 -0
- package/dist/hosted/hosted-node-watcher.d.ts +95 -0
- package/dist/hosted/hosted-node-watcher.js +260 -0
- package/dist/hosted/hosted-node-watcher.js.map +1 -0
- package/dist/hosted/index.d.ts +16 -0
- package/dist/hosted/index.js +13 -0
- package/dist/hosted/index.js.map +1 -0
- package/dist/hosted/node-status.d.ts +51 -0
- package/dist/hosted/node-status.js +77 -0
- package/dist/hosted/node-status.js.map +1 -0
- package/dist/hosted/types.d.ts +141 -0
- package/dist/hosted/types.js +22 -0
- package/dist/hosted/types.js.map +1 -0
- package/dist/index.d.ts +12 -24
- package/dist/index.js +9 -19
- package/dist/index.js.map +1 -1
- package/dist/installer/config.d.ts +27 -34
- package/dist/installer/config.js +46 -15
- package/dist/installer/config.js.map +1 -1
- package/dist/installer/index.d.ts +9 -19
- package/dist/installer/index.js +21 -85
- package/dist/installer/index.js.map +1 -1
- package/dist/installer/paths.d.ts +0 -2
- package/dist/installer/paths.js +0 -4
- package/dist/installer/paths.js.map +1 -1
- package/dist/installer/wizard.d.ts +12 -9
- package/dist/installer/wizard.js +15 -14
- package/dist/installer/wizard.js.map +1 -1
- package/dist/nat/address-resolver.d.ts +18 -17
- package/dist/nat/address-resolver.js +79 -25
- package/dist/nat/address-resolver.js.map +1 -1
- package/dist/nat/address-watch.d.ts +37 -0
- package/dist/nat/address-watch.js +84 -0
- package/dist/nat/address-watch.js.map +1 -0
- package/dist/nat/ddns/duckdns.d.ts +2 -1
- package/dist/nat/ddns/duckdns.js +5 -1
- package/dist/nat/ddns/duckdns.js.map +1 -1
- package/dist/nat/ddns/index.d.ts +6 -0
- package/dist/nat/ddns/index.js.map +1 -1
- package/dist/nat/index.d.ts +13 -9
- package/dist/nat/index.js +7 -5
- package/dist/nat/index.js.map +1 -1
- package/dist/nat/nat-service.d.ts +220 -77
- package/dist/nat/nat-service.js +653 -239
- package/dist/nat/nat-service.js.map +1 -1
- package/dist/nat/nat-store.d.ts +12 -5
- package/dist/nat/nat-store.js +124 -29
- package/dist/nat/nat-store.js.map +1 -1
- package/dist/nat/network-mode.d.ts +19 -0
- package/dist/nat/network-mode.js +32 -0
- package/dist/nat/network-mode.js.map +1 -0
- package/dist/nat/port-mapper.d.ts +83 -79
- package/dist/nat/port-mapper.js +148 -189
- package/dist/nat/port-mapper.js.map +1 -1
- package/dist/nat/reachability.d.ts +32 -15
- package/dist/nat/reachability.js +110 -22
- package/dist/nat/reachability.js.map +1 -1
- package/dist/nat/types.d.ts +98 -27
- package/dist/nat/types.js +8 -5
- package/dist/nat/types.js.map +1 -1
- package/dist/orchestrator/host-process-orchestrator.d.ts +32 -74
- package/dist/orchestrator/host-process-orchestrator.js +84 -233
- package/dist/orchestrator/host-process-orchestrator.js.map +1 -1
- package/dist/{installer/identity.d.ts → orchestrator/identity-file.d.ts} +5 -5
- package/dist/{installer/identity.js → orchestrator/identity-file.js} +6 -6
- package/dist/orchestrator/identity-file.js.map +1 -0
- package/dist/orchestrator/index.d.ts +2 -3
- package/dist/orchestrator/index.js +1 -1
- package/dist/orchestrator/index.js.map +1 -1
- package/dist/orchestrator/node-identity.d.ts +6 -6
- package/dist/orchestrator/node-identity.js +7 -7
- package/dist/orchestrator/node-identity.js.map +1 -1
- package/dist/orchestrator/port-allocator.d.ts +5 -6
- package/dist/orchestrator/port-allocator.js +9 -11
- package/dist/orchestrator/port-allocator.js.map +1 -1
- package/dist/orchestrator/state-store.d.ts +3 -5
- package/dist/orchestrator/state-store.js +2 -10
- package/dist/orchestrator/state-store.js.map +1 -1
- package/dist/orchestrator/types.d.ts +33 -22
- package/dist/orchestrator/types.js.map +1 -1
- package/dist/package-version.d.ts +1 -0
- package/dist/package-version.js +4 -0
- package/dist/package-version.js.map +1 -0
- package/dist/server/error-handler.d.ts +5 -25
- package/dist/server/error-handler.js +11 -74
- package/dist/server/error-handler.js.map +1 -1
- package/dist/server/events/types.d.ts +7 -11
- package/dist/server/events/types.js +2 -1
- package/dist/server/events/types.js.map +1 -1
- package/dist/server/index.d.ts +11 -37
- package/dist/server/index.js +30 -48
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/hosted-nodes.d.ts +28 -0
- package/dist/server/routes/hosted-nodes.js +68 -0
- package/dist/server/routes/hosted-nodes.js.map +1 -0
- package/dist/server/routes/nat.d.ts +4 -1
- package/dist/server/routes/nat.js +13 -2
- package/dist/server/routes/nat.js.map +1 -1
- package/dist/server/routes/nodes.d.ts +6 -20
- package/dist/server/routes/nodes.js +7 -86
- package/dist/server/routes/nodes.js.map +1 -1
- package/dist/server/routes/settings.d.ts +3 -7
- package/dist/server/routes/settings.js +18 -8
- package/dist/server/routes/settings.js.map +1 -1
- package/dist/server/routes/status.d.ts +2 -25
- package/dist/server/routes/status.js +3 -43
- package/dist/server/routes/status.js.map +1 -1
- package/dist/server/server.js +8 -8
- package/dist/server/settings-store.d.ts +2 -2
- package/dist/server/settings-store.js +2 -2
- package/dist/server/static.js +1 -2
- package/dist/server/static.js.map +1 -1
- package/dist/ui/assets/index-BHd8CWZA.css +1 -0
- package/dist/ui/assets/index-Ccr2GjPT.js +23 -0
- package/dist/ui/assets/index-Ccr2GjPT.js.map +1 -0
- package/dist/ui/index.html +2 -2
- package/dist/update/index.d.ts +2 -2
- package/dist/update/index.js +2 -2
- package/dist/update/store.d.ts +1 -1
- package/dist/update/store.js +1 -1
- package/dist/update/types.d.ts +1 -1
- package/dist/update/types.js +1 -1
- package/package.json +5 -7
- package/src/__tests__/cli-nat.smoke.test.ts +219 -212
- package/src/__tests__/cli.smoke.test.ts +2 -2
- package/src/__tests__/global-setup.ts +2 -3
- package/src/__tests__/orchestrator-claim-secret.test.ts +111 -0
- package/src/__tests__/orchestrator-env-scrub.test.ts +160 -163
- package/src/__tests__/orchestrator-handle-contract.ts +134 -134
- package/src/__tests__/orchestrator-node-identity.test.ts +177 -203
- package/src/__tests__/orchestrator-ports.test.ts +124 -143
- package/src/__tests__/orchestrator-push.test.ts +138 -146
- package/src/__tests__/orchestrator.test.ts +1017 -1063
- package/src/__tests__/ui-access.test.ts +30 -0
- package/src/bin/host.ts +397 -572
- package/src/bin/join-output.ts +120 -0
- package/src/bin/nat-output.ts +188 -0
- package/src/bin/ui-access.ts +50 -0
- package/src/{donation → hosted}/__tests__/fake-orchestrator.test.ts +172 -173
- package/src/{donation → hosted}/__tests__/fake-orchestrator.ts +43 -23
- package/src/hosted/__tests__/hosted-node-service.test.ts +708 -0
- package/src/hosted/__tests__/hosted-node-supervisor.test.ts +475 -0
- package/src/hosted/__tests__/test-invitation.ts +33 -0
- package/src/hosted/claim-details.ts +103 -0
- package/src/hosted/hosted-node-service.ts +814 -0
- package/src/hosted/hosted-node-store.ts +144 -0
- package/src/hosted/hosted-node-supervisor.ts +439 -0
- package/src/hosted/hosted-node-watcher.ts +288 -0
- package/src/hosted/index.ts +53 -0
- package/src/hosted/node-status.ts +97 -0
- package/src/hosted/types.ts +160 -0
- package/src/index.ts +72 -91
- package/src/installer/__tests__/config.test.ts +15 -40
- package/src/installer/__tests__/installer.smoke.test.ts +184 -263
- package/src/installer/__tests__/wizard.test.ts +25 -13
- package/src/installer/config.ts +201 -175
- package/src/installer/index.ts +252 -327
- package/src/installer/paths.ts +104 -109
- package/src/installer/wizard.ts +24 -26
- package/src/nat/__tests__/address-resolver.test.ts +107 -82
- package/src/nat/__tests__/nat-service.test.ts +608 -515
- package/src/nat/__tests__/nat-store.test.ts +49 -12
- package/src/nat/__tests__/network-mode.test.ts +38 -0
- package/src/nat/__tests__/port-mapper.test.ts +30 -191
- package/src/nat/__tests__/reachability.test.ts +96 -13
- package/src/nat/address-resolver.ts +94 -52
- package/src/nat/address-watch.ts +92 -0
- package/src/nat/ddns/duckdns.ts +5 -1
- package/src/nat/ddns/index.ts +6 -0
- package/src/nat/index.ts +33 -13
- package/src/nat/nat-service.ts +942 -501
- package/src/nat/nat-store.ts +126 -31
- package/src/nat/network-mode.ts +36 -0
- package/src/nat/port-mapper.ts +241 -329
- package/src/nat/reachability.ts +155 -34
- package/src/nat/types.ts +110 -37
- package/src/{installer/__tests__/identity.test.ts → orchestrator/__tests__/identity-file.test.ts} +34 -34
- package/src/orchestrator/__tests__/node-identity.test.ts +62 -62
- package/src/orchestrator/host-process-orchestrator.ts +1089 -1260
- package/src/{installer/identity.ts → orchestrator/identity-file.ts} +56 -56
- package/src/orchestrator/index.ts +9 -10
- package/src/orchestrator/node-identity.ts +41 -41
- package/src/orchestrator/port-allocator.ts +71 -73
- package/src/orchestrator/state-store.ts +76 -90
- package/src/orchestrator/types.ts +34 -23
- package/src/package-version.ts +4 -0
- package/src/server/__tests__/bus.test.ts +38 -38
- package/src/server/__tests__/error-handler.test.ts +81 -118
- package/src/server/__tests__/fakes.ts +15 -18
- package/src/server/__tests__/hosted-nodes-route.test.ts +161 -0
- package/src/server/__tests__/nodes-route.test.ts +114 -283
- package/src/server/__tests__/publishers.test.ts +193 -180
- package/src/server/__tests__/server.smoke.test.ts +134 -223
- package/src/server/__tests__/settings-route.test.ts +210 -195
- package/src/server/__tests__/sse-route.test.ts +119 -119
- package/src/server/__tests__/status-route.test.ts +82 -121
- package/src/server/error-handler.ts +112 -178
- package/src/server/events/types.ts +20 -24
- package/src/server/index.ts +223 -267
- package/src/server/routes/hosted-nodes.ts +83 -0
- package/src/server/routes/nat.ts +75 -63
- package/src/server/routes/nodes.ts +96 -188
- package/src/server/routes/settings.ts +20 -15
- package/src/server/routes/status.ts +5 -67
- package/src/server/server.ts +8 -8
- package/src/server/settings-store.ts +2 -2
- package/src/server/static.ts +1 -2
- package/src/update/index.ts +2 -2
- package/src/update/store.ts +1 -1
- package/src/update/types.ts +1 -1
- package/dist/auth/duration.d.ts +0 -1
- package/dist/auth/duration.js +0 -32
- package/dist/auth/duration.js.map +0 -1
- package/dist/auth/index.d.ts +0 -11
- package/dist/auth/index.js +0 -9
- package/dist/auth/index.js.map +0 -1
- package/dist/auth/self-label.d.ts +0 -36
- package/dist/auth/self-label.js +0 -57
- package/dist/auth/self-label.js.map +0 -1
- package/dist/auth/trust-circle-store.d.ts +0 -26
- package/dist/auth/trust-circle-store.js +0 -129
- package/dist/auth/trust-circle-store.js.map +0 -1
- package/dist/auth/trust-circle.d.ts +0 -156
- package/dist/auth/trust-circle.js +0 -307
- package/dist/auth/trust-circle.js.map +0 -1
- package/dist/auth/types.d.ts +0 -84
- package/dist/auth/types.js +0 -24
- package/dist/auth/types.js.map +0 -1
- package/dist/donation/donation-service.d.ts +0 -389
- package/dist/donation/donation-service.js +0 -828
- package/dist/donation/donation-service.js.map +0 -1
- package/dist/donation/donation-store.d.ts +0 -51
- package/dist/donation/donation-store.js +0 -152
- package/dist/donation/donation-store.js.map +0 -1
- package/dist/donation/donation-supervisor.js +0 -364
- package/dist/donation/donation-supervisor.js.map +0 -1
- package/dist/donation/grant-service.d.ts +0 -80
- package/dist/donation/grant-service.js +0 -210
- package/dist/donation/grant-service.js.map +0 -1
- package/dist/donation/grant-store.d.ts +0 -38
- package/dist/donation/grant-store.js +0 -135
- package/dist/donation/grant-store.js.map +0 -1
- package/dist/donation/index.d.ts +0 -20
- package/dist/donation/index.js +0 -17
- package/dist/donation/index.js.map +0 -1
- package/dist/donation/types.d.ts +0 -224
- package/dist/donation/types.js +0 -40
- package/dist/donation/types.js.map +0 -1
- package/dist/installer/identity.js.map +0 -1
- package/dist/owner/index.d.ts +0 -11
- package/dist/owner/index.js +0 -11
- package/dist/owner/index.js.map +0 -1
- package/dist/owner/owner-node-client.d.ts +0 -110
- package/dist/owner/owner-node-client.js +0 -184
- package/dist/owner/owner-node-client.js.map +0 -1
- package/dist/server/routes/bootstrap-node-validation.d.ts +0 -115
- package/dist/server/routes/bootstrap-node-validation.js +0 -197
- package/dist/server/routes/bootstrap-node-validation.js.map +0 -1
- package/dist/server/routes/grants-admin.d.ts +0 -29
- package/dist/server/routes/grants-admin.js +0 -58
- package/dist/server/routes/grants-admin.js.map +0 -1
- package/dist/server/routes/grants.d.ts +0 -28
- package/dist/server/routes/grants.js +0 -165
- package/dist/server/routes/grants.js.map +0 -1
- package/dist/server/routes/provision-request-validation.d.ts +0 -45
- package/dist/server/routes/provision-request-validation.js +0 -97
- package/dist/server/routes/provision-request-validation.js.map +0 -1
- package/dist/server/routes/strands.d.ts +0 -20
- package/dist/server/routes/strands.js +0 -38
- package/dist/server/routes/strands.js.map +0 -1
- package/dist/server/routes/trust-circle.d.ts +0 -17
- package/dist/server/routes/trust-circle.js +0 -35
- package/dist/server/routes/trust-circle.js.map +0 -1
- package/dist/strands/index.d.ts +0 -7
- package/dist/strands/index.js +0 -6
- package/dist/strands/index.js.map +0 -1
- package/dist/strands/strand-service.d.ts +0 -50
- package/dist/strands/strand-service.js +0 -103
- package/dist/strands/strand-service.js.map +0 -1
- package/dist/strands/types.d.ts +0 -93
- package/dist/strands/types.js +0 -23
- package/dist/strands/types.js.map +0 -1
- package/dist/ui/assets/index-C6nELNfC.js +0 -23
- package/dist/ui/assets/index-C6nELNfC.js.map +0 -1
- package/dist/ui/assets/index-TtIYSeZO.css +0 -1
- package/src/__tests__/cli-invite.smoke.test.ts +0 -192
- package/src/__tests__/host-owner.smoke.test.ts +0 -123
- package/src/__tests__/orchestrator-owner.test.ts +0 -234
- package/src/__tests__/orchestrator-pin-keys.test.ts +0 -152
- package/src/auth/__tests__/duration.test.ts +0 -28
- package/src/auth/__tests__/self-label.test.ts +0 -85
- package/src/auth/__tests__/trust-circle-integration.test.ts +0 -152
- package/src/auth/__tests__/trust-circle-store.test.ts +0 -115
- package/src/auth/__tests__/trust-circle.test.ts +0 -445
- package/src/auth/duration.ts +0 -33
- package/src/auth/index.ts +0 -21
- package/src/auth/self-label.ts +0 -74
- package/src/auth/trust-circle-store.ts +0 -155
- package/src/auth/trust-circle.ts +0 -395
- package/src/auth/types.ts +0 -99
- package/src/donation/__tests__/donation-service.test.ts +0 -1193
- package/src/donation/__tests__/donation-supervisor.test.ts +0 -548
- package/src/donation/__tests__/grant-service.test.ts +0 -213
- package/src/donation/__tests__/grant-store.test.ts +0 -113
- package/src/donation/donation-service.ts +0 -1033
- package/src/donation/donation-store.ts +0 -176
- package/src/donation/donation-supervisor.ts +0 -411
- package/src/donation/grant-service.ts +0 -252
- package/src/donation/grant-store.ts +0 -152
- package/src/donation/index.ts +0 -65
- package/src/donation/types.ts +0 -260
- package/src/owner/__tests__/owner-node-client.test.ts +0 -194
- package/src/owner/index.ts +0 -12
- package/src/owner/owner-node-client.ts +0 -259
- package/src/server/__tests__/bootstrap-node-validation.test.ts +0 -138
- package/src/server/__tests__/grants-admin-route.test.ts +0 -171
- package/src/server/__tests__/grants-route.test.ts +0 -394
- package/src/server/__tests__/strands-route.test.ts +0 -234
- package/src/server/routes/bootstrap-node-validation.ts +0 -206
- package/src/server/routes/grants-admin.ts +0 -74
- package/src/server/routes/grants.ts +0 -193
- package/src/server/routes/provision-request-validation.ts +0 -105
- package/src/server/routes/strands.ts +0 -54
- package/src/server/routes/trust-circle.ts +0 -49
- package/src/strands/__tests__/strand-service.test.ts +0 -165
- package/src/strands/index.ts +0 -14
- package/src/strands/strand-service.ts +0 -135
- package/src/strands/types.ts +0 -102
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* The whole shape check for `POST /grants` — one call that either yields the
|
|
3
|
-
* typed {@link DonationProvisionRequest} the `DonationService` is handed, or the
|
|
4
|
-
* message the route answers 400 with.
|
|
5
|
-
*
|
|
6
|
-
* **Why a validator rather than a few more `if`s in the route.** Every field in
|
|
7
|
-
* this body is forwarded into a child process the requester cannot see:
|
|
8
|
-
* `partyId`, `bootstrapNodes` and `profile` are written into the child's
|
|
9
|
-
* `cadre.json` (`orchestrator/host-process-orchestrator.ts`) and `ownerKeys`
|
|
10
|
-
* become its cold-start seed-trust anchors. A field the route forgets to check is
|
|
11
|
-
* not a 400 — it is a donated node that dies at boot, or comes up subtly wrong,
|
|
12
|
-
* with a 201 already sent. Routing the body through one function that *constructs*
|
|
13
|
-
* the request object means a field can only reach the spawn path by having been
|
|
14
|
-
* through here; adding a field to `DonationProvisionRequest` without validating it
|
|
15
|
-
* stops compiling rather than silently shipping.
|
|
16
|
-
*
|
|
17
|
-
* **Division of labour with `DonationService.provision`.** The Ed25519 rule for
|
|
18
|
-
* `ownerKeys` stays in the service, where it is applied by cadre-core's own
|
|
19
|
-
* `requireEd25519PublicKeyB64` — the service is also reached by the respawn path,
|
|
20
|
-
* which replays a persisted record rather than an HTTP body, so the crypto rule
|
|
21
|
-
* has to live there to cover both. What this validator owns for `ownerKeys` is the
|
|
22
|
-
* *container* shape (present, non-empty, all strings), which the service's rule
|
|
23
|
-
* assumes: a number reaching it surfaces as an internal `.trim is not a function`
|
|
24
|
-
* rather than as a message naming what is wrong with the request.
|
|
25
|
-
*
|
|
26
|
-
* The multiaddr rule has no such home — it is duplicated in cadre-provider — so it
|
|
27
|
-
* lives in `bootstrap-node-validation.ts` next to the comment saying so.
|
|
28
|
-
*/
|
|
29
|
-
import type { DonationProvisionRequest } from '../../donation/donation-service.js';
|
|
30
|
-
/**
|
|
31
|
-
* Validate a `POST /grants` body and build the request `DonationService.provision`
|
|
32
|
-
* is handed.
|
|
33
|
-
*
|
|
34
|
-
* `grantToken` comes from the `Authorization` bearer rather than the body — a
|
|
35
|
-
* requester does not get to name which grant pays for this — so it is a
|
|
36
|
-
* parameter, not a validated field. Whether that grant is live and within quota is
|
|
37
|
-
* `provision`'s call, not this function's.
|
|
38
|
-
*
|
|
39
|
-
* @returns the typed provision request, or the message to answer `invalid_request` with.
|
|
40
|
-
*/
|
|
41
|
-
export declare function validateProvisionRequest(body: unknown, grantToken: string): {
|
|
42
|
-
request: DonationProvisionRequest;
|
|
43
|
-
} | {
|
|
44
|
-
error: string;
|
|
45
|
-
};
|
|
@@ -1,97 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* The whole shape check for `POST /grants` — one call that either yields the
|
|
3
|
-
* typed {@link DonationProvisionRequest} the `DonationService` is handed, or the
|
|
4
|
-
* message the route answers 400 with.
|
|
5
|
-
*
|
|
6
|
-
* **Why a validator rather than a few more `if`s in the route.** Every field in
|
|
7
|
-
* this body is forwarded into a child process the requester cannot see:
|
|
8
|
-
* `partyId`, `bootstrapNodes` and `profile` are written into the child's
|
|
9
|
-
* `cadre.json` (`orchestrator/host-process-orchestrator.ts`) and `ownerKeys`
|
|
10
|
-
* become its cold-start seed-trust anchors. A field the route forgets to check is
|
|
11
|
-
* not a 400 — it is a donated node that dies at boot, or comes up subtly wrong,
|
|
12
|
-
* with a 201 already sent. Routing the body through one function that *constructs*
|
|
13
|
-
* the request object means a field can only reach the spawn path by having been
|
|
14
|
-
* through here; adding a field to `DonationProvisionRequest` without validating it
|
|
15
|
-
* stops compiling rather than silently shipping.
|
|
16
|
-
*
|
|
17
|
-
* **Division of labour with `DonationService.provision`.** The Ed25519 rule for
|
|
18
|
-
* `ownerKeys` stays in the service, where it is applied by cadre-core's own
|
|
19
|
-
* `requireEd25519PublicKeyB64` — the service is also reached by the respawn path,
|
|
20
|
-
* which replays a persisted record rather than an HTTP body, so the crypto rule
|
|
21
|
-
* has to live there to cover both. What this validator owns for `ownerKeys` is the
|
|
22
|
-
* *container* shape (present, non-empty, all strings), which the service's rule
|
|
23
|
-
* assumes: a number reaching it surfaces as an internal `.trim is not a function`
|
|
24
|
-
* rather than as a message naming what is wrong with the request.
|
|
25
|
-
*
|
|
26
|
-
* The multiaddr rule has no such home — it is duplicated in cadre-provider — so it
|
|
27
|
-
* lives in `bootstrap-node-validation.ts` next to the comment saying so.
|
|
28
|
-
*/
|
|
29
|
-
import { validateBootstrapNodes } from './bootstrap-node-validation.js';
|
|
30
|
-
/** `partyId` becomes `controlNetwork.partyId` in the child's config. */
|
|
31
|
-
function validatePartyId(value) {
|
|
32
|
-
if (typeof value !== 'string' || value.trim().length === 0) {
|
|
33
|
-
return { error: 'partyId is required' };
|
|
34
|
-
}
|
|
35
|
-
return { partyId: value.trim() };
|
|
36
|
-
}
|
|
37
|
-
/**
|
|
38
|
-
* Container shape only — see the module comment: the per-key Ed25519 rule is
|
|
39
|
-
* `DonationService.provision`'s, so the respawn path gets it too.
|
|
40
|
-
*/
|
|
41
|
-
function validateOwnerKeys(value) {
|
|
42
|
-
if (!Array.isArray(value) || value.length === 0) {
|
|
43
|
-
return { error: 'ownerKeys is required' };
|
|
44
|
-
}
|
|
45
|
-
if (!value.every((key) => typeof key === 'string')) {
|
|
46
|
-
return { error: 'ownerKeys must be an array of strings' };
|
|
47
|
-
}
|
|
48
|
-
return { ownerKeys: value };
|
|
49
|
-
}
|
|
50
|
-
/** Absent means `storage` — see {@link DonationProvisionRequest.profile}. */
|
|
51
|
-
function validateProfile(value) {
|
|
52
|
-
if (value === undefined)
|
|
53
|
-
return {};
|
|
54
|
-
if (value !== 'storage' && value !== 'transaction') {
|
|
55
|
-
return { error: 'profile must be "storage" or "transaction"' };
|
|
56
|
-
}
|
|
57
|
-
return { profile: value };
|
|
58
|
-
}
|
|
59
|
-
/**
|
|
60
|
-
* Validate a `POST /grants` body and build the request `DonationService.provision`
|
|
61
|
-
* is handed.
|
|
62
|
-
*
|
|
63
|
-
* `grantToken` comes from the `Authorization` bearer rather than the body — a
|
|
64
|
-
* requester does not get to name which grant pays for this — so it is a
|
|
65
|
-
* parameter, not a validated field. Whether that grant is live and within quota is
|
|
66
|
-
* `provision`'s call, not this function's.
|
|
67
|
-
*
|
|
68
|
-
* @returns the typed provision request, or the message to answer `invalid_request` with.
|
|
69
|
-
*/
|
|
70
|
-
export function validateProvisionRequest(body, grantToken) {
|
|
71
|
-
if (typeof body !== 'object' || body === null || Array.isArray(body)) {
|
|
72
|
-
return { error: 'request body must be a JSON object' };
|
|
73
|
-
}
|
|
74
|
-
const fields = body;
|
|
75
|
-
const partyId = validatePartyId(fields.partyId);
|
|
76
|
-
if ('error' in partyId)
|
|
77
|
-
return partyId;
|
|
78
|
-
const bootstrap = validateBootstrapNodes(fields.bootstrapNodes);
|
|
79
|
-
if ('error' in bootstrap)
|
|
80
|
-
return bootstrap;
|
|
81
|
-
const ownerKeys = validateOwnerKeys(fields.ownerKeys);
|
|
82
|
-
if ('error' in ownerKeys)
|
|
83
|
-
return ownerKeys;
|
|
84
|
-
const profile = validateProfile(fields.profile);
|
|
85
|
-
if ('error' in profile)
|
|
86
|
-
return profile;
|
|
87
|
-
return {
|
|
88
|
-
request: {
|
|
89
|
-
grantToken,
|
|
90
|
-
partyId: partyId.partyId,
|
|
91
|
-
bootstrapNodes: bootstrap.nodes,
|
|
92
|
-
ownerKeys: ownerKeys.ownerKeys,
|
|
93
|
-
...(profile.profile ? { profile: profile.profile } : {}),
|
|
94
|
-
},
|
|
95
|
-
};
|
|
96
|
-
}
|
|
97
|
-
//# sourceMappingURL=provision-request-validation.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"provision-request-validation.js","sourceRoot":"","sources":["../../../src/server/routes/provision-request-validation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAGH,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE,wEAAwE;AACxE,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3D,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC1C,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;IAC5C,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC;QAClE,OAAO,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAC;IAC5D,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AAC9B,CAAC;AAED,6EAA6E;AAC7E,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;QACnD,OAAO,EAAE,KAAK,EAAE,4CAA4C,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,wBAAwB,CACtC,IAAa,EACb,UAAkB;IAElB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;IACzD,CAAC;IACD,MAAM,MAAM,GAAG,IAA+B,CAAC;IAE/C,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,OAAO,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAEvC,MAAM,SAAS,GAAG,sBAAsB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAChE,IAAI,OAAO,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC;IAE3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,OAAO,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC;IAE3C,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChD,IAAI,OAAO,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAEvC,OAAO;QACL,OAAO,EAAE;YACP,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,cAAc,EAAE,SAAS,CAAC,KAAK;YAC/B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Strand HTTP routes — thin adapters around `StrandHandlers`
|
|
3
|
-
* (`createStrandHandlers(service)`).
|
|
4
|
-
*
|
|
5
|
-
* Mount path: `/api/strands` — a UI-only surface with no CLI contract to
|
|
6
|
-
* preserve. (The `/auth/*` and `/nat/*` mounts sit outside `/api` only because
|
|
7
|
-
* the existing CLI already targets those URLs.) Envelope form therefore follows
|
|
8
|
-
* the other `/api/*` routes: `{ ok: true, data }`.
|
|
9
|
-
*
|
|
10
|
-
* A removal that actually issued a delete publishes `strands-changed` so other
|
|
11
|
-
* open tabs refresh. A call that found no row publishes nothing — nothing changed.
|
|
12
|
-
*/
|
|
13
|
-
import type { FastifyInstance } from 'fastify';
|
|
14
|
-
import type { StrandHandlers } from '../../strands/types.js';
|
|
15
|
-
import type { EventBus } from '../events/bus.js';
|
|
16
|
-
export interface StrandRoutesOptions {
|
|
17
|
-
handlers: StrandHandlers;
|
|
18
|
-
events: EventBus;
|
|
19
|
-
}
|
|
20
|
-
export declare function registerStrandRoutes(app: FastifyInstance, opts: StrandRoutesOptions): void;
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Strand HTTP routes — thin adapters around `StrandHandlers`
|
|
3
|
-
* (`createStrandHandlers(service)`).
|
|
4
|
-
*
|
|
5
|
-
* Mount path: `/api/strands` — a UI-only surface with no CLI contract to
|
|
6
|
-
* preserve. (The `/auth/*` and `/nat/*` mounts sit outside `/api` only because
|
|
7
|
-
* the existing CLI already targets those URLs.) Envelope form therefore follows
|
|
8
|
-
* the other `/api/*` routes: `{ ok: true, data }`.
|
|
9
|
-
*
|
|
10
|
-
* A removal that actually issued a delete publishes `strands-changed` so other
|
|
11
|
-
* open tabs refresh. A call that found no row publishes nothing — nothing changed.
|
|
12
|
-
*/
|
|
13
|
-
/**
|
|
14
|
-
* The only accepted `confirm` values — the same strict pair the admin channel
|
|
15
|
-
* accepts. Not a general truthiness parser: `yes`, `on` and an empty value all
|
|
16
|
-
* count as NOT confirmed, because a guessy parser here would turn a typo into a
|
|
17
|
-
* destroyed membership key.
|
|
18
|
-
*
|
|
19
|
-
* NOTE: deliberately duplicated from cadre-cli's `admin-server.ts` rather than
|
|
20
|
-
* imported — cadre-host depends on cadre-cli for its bin path only, never its
|
|
21
|
-
* source. Keep the two in step by hand; do not DRY them into an import.
|
|
22
|
-
*/
|
|
23
|
-
const CONFIRM_VALUES = new Set(['1', 'true']);
|
|
24
|
-
export function registerStrandRoutes(app, opts) {
|
|
25
|
-
const { handlers, events } = opts;
|
|
26
|
-
app.get('/api/strands', async () => {
|
|
27
|
-
return { ok: true, data: await handlers.listStrands() };
|
|
28
|
-
});
|
|
29
|
-
app.delete('/api/strands/:id', async (request) => {
|
|
30
|
-
const confirm = typeof request.query.confirm === 'string' && CONFIRM_VALUES.has(request.query.confirm);
|
|
31
|
-
const result = await handlers.removeStrand(request.params.id, { confirm });
|
|
32
|
-
if (result.removed) {
|
|
33
|
-
events.publish({ type: 'strands-changed', kind: 'removed' });
|
|
34
|
-
}
|
|
35
|
-
return { ok: true, data: result };
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
//# sourceMappingURL=strands.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"strands.js","sourceRoot":"","sources":["../../../src/server/routes/strands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAYH;;;;;;;;;GASG;AACH,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;AAE9C,MAAM,UAAU,oBAAoB,CAAC,GAAoB,EAAE,IAAyB;IAClF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAElC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CACR,kBAAkB,EAClB,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvG,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3E,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Trust-circle HTTP routes — thin adapters around `TrustCircleHandlers`
|
|
3
|
-
* (`createTrustCircleHandlers(service)`). Side-effects (invite issued,
|
|
4
|
-
* pending revoked, member removed) emit a `trust-circle-changed` bus
|
|
5
|
-
* event so the SPA can refresh without polling.
|
|
6
|
-
*
|
|
7
|
-
* Mount path: `/auth/*` — the existing CLI (cadre-host invite / trust)
|
|
8
|
-
* already targets these URLs; do not change them.
|
|
9
|
-
*/
|
|
10
|
-
import type { FastifyInstance } from 'fastify';
|
|
11
|
-
import type { TrustCircleHandlers } from '../../auth/types.js';
|
|
12
|
-
import type { EventBus } from '../events/bus.js';
|
|
13
|
-
export interface TrustCircleRoutesOptions {
|
|
14
|
-
handlers: TrustCircleHandlers;
|
|
15
|
-
events: EventBus;
|
|
16
|
-
}
|
|
17
|
-
export declare function registerTrustCircleRoutes(app: FastifyInstance, opts: TrustCircleRoutesOptions): void;
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Trust-circle HTTP routes — thin adapters around `TrustCircleHandlers`
|
|
3
|
-
* (`createTrustCircleHandlers(service)`). Side-effects (invite issued,
|
|
4
|
-
* pending revoked, member removed) emit a `trust-circle-changed` bus
|
|
5
|
-
* event so the SPA can refresh without polling.
|
|
6
|
-
*
|
|
7
|
-
* Mount path: `/auth/*` — the existing CLI (cadre-host invite / trust)
|
|
8
|
-
* already targets these URLs; do not change them.
|
|
9
|
-
*/
|
|
10
|
-
export function registerTrustCircleRoutes(app, opts) {
|
|
11
|
-
const { handlers, events } = opts;
|
|
12
|
-
app.get('/auth/trust-circle', async () => {
|
|
13
|
-
return handlers.listTrustCircle();
|
|
14
|
-
});
|
|
15
|
-
app.post('/auth/invites', async (request) => {
|
|
16
|
-
const body = (request.body ?? {});
|
|
17
|
-
const label = typeof body.label === 'string' ? body.label : '';
|
|
18
|
-
const ttlMs = typeof body.ttlMs === 'number' ? body.ttlMs : undefined;
|
|
19
|
-
const args = ttlMs !== undefined ? { label, ttlMs } : { label };
|
|
20
|
-
const result = await handlers.postInvite(args);
|
|
21
|
-
events.publish({ type: 'trust-circle-changed', kind: 'invited' });
|
|
22
|
-
return result;
|
|
23
|
-
});
|
|
24
|
-
app.delete('/auth/invites/:token', async (request) => {
|
|
25
|
-
await handlers.deleteInvite(request.params.token);
|
|
26
|
-
events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
|
|
27
|
-
return { ok: true };
|
|
28
|
-
});
|
|
29
|
-
app.delete('/auth/members/:peerId', async (request) => {
|
|
30
|
-
await handlers.deleteMember(request.params.peerId);
|
|
31
|
-
events.publish({ type: 'trust-circle-changed', kind: 'revoked' });
|
|
32
|
-
return { ok: true };
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
//# sourceMappingURL=trust-circle.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"trust-circle.js","sourceRoot":"","sources":["../../../src/server/routes/trust-circle.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAYH,MAAM,UAAU,yBAAyB,CAAC,GAAoB,EAAE,IAA8B;IAC5F,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAElC,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QACvC,OAAO,QAAQ,CAAC,eAAe,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAyC,CAAC;QAC1E,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,MAAM,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QAChE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAgC,sBAAsB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAClF,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAiC,uBAAuB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACpF,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/strands/index.d.ts
DELETED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Strand management for cadre-host. See ./strand-service.ts and ./types.ts.
|
|
3
|
-
*/
|
|
4
|
-
export { StrandService, createStrandHandlers } from './strand-service.js';
|
|
5
|
-
export type { StrandServiceOptions, CadreNodeLike } from './strand-service.js';
|
|
6
|
-
export { StrandError } from './types.js';
|
|
7
|
-
export type { StrandSummary, StrandListSnapshot, StrandRemovalResult, StrandHandlers, StrandErrorCode, } from './types.js';
|
package/dist/strands/index.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/strands/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import type { StrandHandlers, StrandListSnapshot, StrandRemovalResult } from './types.js';
|
|
2
|
-
/**
|
|
3
|
-
* Minimal slice of the owner node that StrandService uses. Declared here (rather
|
|
4
|
-
* than reaching into `OwnerNodeClient`) so unit tests can inject a fake without
|
|
5
|
-
* standing up an admin channel — the third such trimmed interface the client
|
|
6
|
-
* satisfies, alongside the trust-circle and NAT ones.
|
|
7
|
-
*/
|
|
8
|
-
export interface CadreNodeLike {
|
|
9
|
-
listStrands(): Promise<StrandListSnapshot>;
|
|
10
|
-
removeStrand(strandId: string, opts: {
|
|
11
|
-
confirm: boolean;
|
|
12
|
-
}): Promise<StrandRemovalResult>;
|
|
13
|
-
}
|
|
14
|
-
/** Constructor options. */
|
|
15
|
-
export interface StrandServiceOptions {
|
|
16
|
-
/** The owner node — provides listStrands / removeStrand over the admin channel. */
|
|
17
|
-
cadreNode: CadreNodeLike;
|
|
18
|
-
}
|
|
19
|
-
/**
|
|
20
|
-
* StrandService — validation and error translation over the owner node's strand
|
|
21
|
-
* admin routes.
|
|
22
|
-
*
|
|
23
|
-
* It owns no state and makes no policy. In particular it does NOT decide whether a
|
|
24
|
-
* closed strand needs confirmation: it never reads the row, so it could only guess.
|
|
25
|
-
* The node enforces that rule and answers `confirmation_required`; this layer
|
|
26
|
-
* forwards the caller's flag verbatim and surfaces the refusal as a distinct code
|
|
27
|
-
* so the UI can raise the right dialog.
|
|
28
|
-
*/
|
|
29
|
-
export declare class StrandService {
|
|
30
|
-
private readonly cadreNode;
|
|
31
|
-
constructor(opts: StrandServiceOptions);
|
|
32
|
-
/** This party's strands, plus the node's current control-connection count. */
|
|
33
|
-
list(): Promise<StrandListSnapshot>;
|
|
34
|
-
/**
|
|
35
|
-
* Remove this party's participation in one strand.
|
|
36
|
-
*
|
|
37
|
-
* `confirm` is forwarded exactly as given — never defaulted to true, never
|
|
38
|
-
* re-sent as true after a refusal. A closed strand's row carries this party's
|
|
39
|
-
* membership key for that network and is stored nowhere else, so an automatic
|
|
40
|
-
* retry would destroy it on the caller's behalf.
|
|
41
|
-
*/
|
|
42
|
-
remove(rawId: string, opts: {
|
|
43
|
-
confirm: boolean;
|
|
44
|
-
}): Promise<StrandRemovalResult>;
|
|
45
|
-
}
|
|
46
|
-
/**
|
|
47
|
-
* Wrap a StrandService into the typed handler shape the local UI server mounts.
|
|
48
|
-
* Errors propagate as StrandError; `server/error-handler.ts` maps `.code` → status.
|
|
49
|
-
*/
|
|
50
|
-
export declare function createStrandHandlers(service: StrandService): StrandHandlers;
|
|
@@ -1,103 +0,0 @@
|
|
|
1
|
-
import debug from 'debug';
|
|
2
|
-
import { OwnerNodeUnavailableError } from '../owner/owner-node-client.js';
|
|
3
|
-
import { StrandError } from './types.js';
|
|
4
|
-
const log = debug('cadre:host:strands');
|
|
5
|
-
/**
|
|
6
|
-
* StrandService — validation and error translation over the owner node's strand
|
|
7
|
-
* admin routes.
|
|
8
|
-
*
|
|
9
|
-
* It owns no state and makes no policy. In particular it does NOT decide whether a
|
|
10
|
-
* closed strand needs confirmation: it never reads the row, so it could only guess.
|
|
11
|
-
* The node enforces that rule and answers `confirmation_required`; this layer
|
|
12
|
-
* forwards the caller's flag verbatim and surfaces the refusal as a distinct code
|
|
13
|
-
* so the UI can raise the right dialog.
|
|
14
|
-
*/
|
|
15
|
-
export class StrandService {
|
|
16
|
-
constructor(opts) {
|
|
17
|
-
this.cadreNode = opts.cadreNode;
|
|
18
|
-
}
|
|
19
|
-
/** This party's strands, plus the node's current control-connection count. */
|
|
20
|
-
async list() {
|
|
21
|
-
return await this.cadreNode.listStrands().catch((err) => toDomainError(err));
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* Remove this party's participation in one strand.
|
|
25
|
-
*
|
|
26
|
-
* `confirm` is forwarded exactly as given — never defaulted to true, never
|
|
27
|
-
* re-sent as true after a refusal. A closed strand's row carries this party's
|
|
28
|
-
* membership key for that network and is stored nowhere else, so an automatic
|
|
29
|
-
* retry would destroy it on the caller's behalf.
|
|
30
|
-
*/
|
|
31
|
-
async remove(rawId, opts) {
|
|
32
|
-
const strandId = validateStrandId(rawId);
|
|
33
|
-
log('remove %s (confirm=%s)', strandId, opts.confirm);
|
|
34
|
-
return await this.cadreNode
|
|
35
|
-
.removeStrand(strandId, { confirm: opts.confirm })
|
|
36
|
-
.catch((err) => toDomainError(err));
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
/**
|
|
40
|
-
* Trim and reject an id this surface cannot act on. Blank is the only such id.
|
|
41
|
-
*
|
|
42
|
-
* A `/` is deliberately NOT refused. `/api/strands/:id` is one path segment, but a
|
|
43
|
-
* caller that percent-encodes the id reaches this layer with the `/` restored
|
|
44
|
-
* (Fastify decodes `params`), `OwnerNodeClient` re-encodes it, and the admin channel
|
|
45
|
-
* splits on the still-encoded `%2F` and decodes it back — so the whole chain carries
|
|
46
|
-
* it. Refusing here would break the only form that works, while doing nothing about
|
|
47
|
-
* an UNencoded `/`, which never reaches this handler at all (the router 404s it).
|
|
48
|
-
*/
|
|
49
|
-
function validateStrandId(rawId) {
|
|
50
|
-
const strandId = typeof rawId === 'string' ? rawId.trim() : '';
|
|
51
|
-
if (!strandId) {
|
|
52
|
-
throw new StrandError('invalid_id', 'A strand id is required');
|
|
53
|
-
}
|
|
54
|
-
return strandId;
|
|
55
|
-
}
|
|
56
|
-
/**
|
|
57
|
-
* Translate an owner-node failure into the strand error vocabulary.
|
|
58
|
-
*
|
|
59
|
-
* `OwnerNodeUnavailableError` is thrown for *every* non-ok admin response, not only
|
|
60
|
-
* for a node that is down — so read `nodeCode` first and fall back to
|
|
61
|
-
* `node_unavailable` only when nothing better fits. Reporting a 428 as "your node is
|
|
62
|
-
* down" would be actively misleading.
|
|
63
|
-
*
|
|
64
|
-
* Declared to return `never` so callers can `.catch((err) => toDomainError(err))`.
|
|
65
|
-
*
|
|
66
|
-
* NOTE: the trust-circle and NAT services translate the SAME error blanket-style —
|
|
67
|
-
* every `OwnerNodeUnavailableError` becomes `node_unavailable` — because neither has
|
|
68
|
-
* a code worth distinguishing yet. If a second surface ever needs a code-aware
|
|
69
|
-
* mapping, hoist this switch into a shared owner-error translator instead of growing
|
|
70
|
-
* a third copy.
|
|
71
|
-
*/
|
|
72
|
-
function toDomainError(err) {
|
|
73
|
-
if (!(err instanceof OwnerNodeUnavailableError)) {
|
|
74
|
-
throw err instanceof Error ? err : new Error(String(err));
|
|
75
|
-
}
|
|
76
|
-
switch (err.nodeCode) {
|
|
77
|
-
case 'confirmation_required':
|
|
78
|
-
throw new StrandError('confirmation_required', err.message);
|
|
79
|
-
case 'bad_request':
|
|
80
|
-
throw new StrandError('invalid_id', err.message);
|
|
81
|
-
case undefined:
|
|
82
|
-
case 'not_ready':
|
|
83
|
-
case 'not_authorized':
|
|
84
|
-
throw new StrandError('node_unavailable', `Owner node unavailable: ${err.message}`);
|
|
85
|
-
default:
|
|
86
|
-
throw new StrandError('internal', err.message);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* Wrap a StrandService into the typed handler shape the local UI server mounts.
|
|
91
|
-
* Errors propagate as StrandError; `server/error-handler.ts` maps `.code` → status.
|
|
92
|
-
*/
|
|
93
|
-
export function createStrandHandlers(service) {
|
|
94
|
-
return {
|
|
95
|
-
async listStrands() {
|
|
96
|
-
return await service.list();
|
|
97
|
-
},
|
|
98
|
-
async removeStrand(strandId, opts) {
|
|
99
|
-
return await service.remove(strandId, { confirm: opts.confirm === true });
|
|
100
|
-
},
|
|
101
|
-
};
|
|
102
|
-
}
|
|
103
|
-
//# sourceMappingURL=strand-service.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"strand-service.js","sourceRoot":"","sources":["../../src/strands/strand-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAO1E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,GAAG,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAmBxC;;;;;;;;;GASG;AACH,MAAM,OAAO,aAAa;IAGxB,YAAY,IAA0B;QACpC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAClC,CAAC;IAED,8EAA8E;IAC9E,KAAK,CAAC,IAAI;QACR,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IACxF,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,IAA0B;QACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACzC,GAAG,CAAC,wBAAwB,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,MAAM,IAAI,CAAC,SAAS;aACxB,YAAY,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;aACjD,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,CAAC;CACF;AAED;;;;;;;;;GASG;AACH,SAAS,gBAAgB,CAAC,KAAa;IACrC,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,WAAW,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAS,aAAa,CAAC,GAAY;IACjC,IAAI,CAAC,CAAC,GAAG,YAAY,yBAAyB,CAAC,EAAE,CAAC;QAChD,MAAM,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,QAAQ,GAAG,CAAC,QAAQ,EAAE,CAAC;QACrB,KAAK,uBAAuB;YAC1B,MAAM,IAAI,WAAW,CAAC,uBAAuB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9D,KAAK,aAAa;YAChB,MAAM,IAAI,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACnD,KAAK,SAAS,CAAC;QACf,KAAK,WAAW,CAAC;QACjB,KAAK,gBAAgB;YACnB,MAAM,IAAI,WAAW,CAAC,kBAAkB,EAAE,2BAA2B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACtF;YACE,MAAM,IAAI,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAsB;IACzD,OAAO;QACL,KAAK,CAAC,WAAW;YACf,OAAO,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI;YAC/B,OAAO,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC,CAAC;QAC5E,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/strands/types.d.ts
DELETED
|
@@ -1,93 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Strand-management types for cadre-host.
|
|
3
|
-
*
|
|
4
|
-
* A *strand* is a shared data network this party participates in. Membership is
|
|
5
|
-
* canonical in the cadre control network's `Strand` table, reached over the owner
|
|
6
|
-
* node's loopback admin channel (`GET /admin/strands`,
|
|
7
|
-
* `DELETE /admin/strands/:id?confirm=1`).
|
|
8
|
-
*
|
|
9
|
-
* Unlike the trust circle — which layers host-local labels and pending invites on
|
|
10
|
-
* top of the node's state — this layer holds **no host-local state at all**. There
|
|
11
|
-
* is no `strands.json`. It exists for id validation, for translating the admin
|
|
12
|
-
* channel's error codes into a stable vocabulary the management API can map to HTTP
|
|
13
|
-
* statuses, and for nothing else. Keep it small.
|
|
14
|
-
*/
|
|
15
|
-
/** One strand this party belongs to, as projected by the admin channel. */
|
|
16
|
-
export interface StrandSummary {
|
|
17
|
-
/** The `Strand` row id — what a removal takes. */
|
|
18
|
-
id: string;
|
|
19
|
-
/** `'o'` = open, `'c'` = closed (the row carries this party's membership key). */
|
|
20
|
-
type: 'o' | 'c';
|
|
21
|
-
/** Whether the owner node currently has a running instance for the id. */
|
|
22
|
-
running: boolean;
|
|
23
|
-
/**
|
|
24
|
-
* The instance's status when running, else `null`. Deliberately `string` rather
|
|
25
|
-
* than cadre-core's `StrandStatus`: this is a wire projection the manager only
|
|
26
|
-
* forwards, and widening it keeps cadre-host from tracking a cadre-core union it
|
|
27
|
-
* never inspects.
|
|
28
|
-
*/
|
|
29
|
-
status: string | null;
|
|
30
|
-
}
|
|
31
|
-
/** The result of listing this party's strands. */
|
|
32
|
-
export interface StrandListSnapshot {
|
|
33
|
-
strands: StrandSummary[];
|
|
34
|
-
/**
|
|
35
|
-
* Open control-network connections on the owner node; 0 ⇒ writes commit
|
|
36
|
-
* local-only. A snapshot at read time, not a subscription — treat it as advisory.
|
|
37
|
-
*/
|
|
38
|
-
controlConnections: number;
|
|
39
|
-
}
|
|
40
|
-
/** The result of removing this party's participation in one strand. */
|
|
41
|
-
export interface StrandRemovalResult {
|
|
42
|
-
/** The trimmed id the call was about. */
|
|
43
|
-
strandId: string;
|
|
44
|
-
/** Whether a row existed before the write. */
|
|
45
|
-
published: boolean;
|
|
46
|
-
/** The found row's type; `null` when no row was found. */
|
|
47
|
-
type: 'o' | 'c' | null;
|
|
48
|
-
/**
|
|
49
|
-
* Whether THIS call issued the delete — not that the row was observed to vanish.
|
|
50
|
-
* The node's read and write are not atomic, so a concurrent removal landing in
|
|
51
|
-
* between makes this a no-op that still reports `true`.
|
|
52
|
-
*/
|
|
53
|
-
removed: boolean;
|
|
54
|
-
/**
|
|
55
|
-
* The node saw 0 control connections at the end of the call. Sampled on EVERY
|
|
56
|
-
* call, including one that found no row and wrote nothing — read it as "this
|
|
57
|
-
* machine currently sees no siblings", and only as "your delete may not have
|
|
58
|
-
* travelled" when `removed` is also true.
|
|
59
|
-
*/
|
|
60
|
-
alone: boolean;
|
|
61
|
-
}
|
|
62
|
-
/** Error codes thrown by StrandService. */
|
|
63
|
-
export type StrandErrorCode =
|
|
64
|
-
/** The id was blank or whitespace-only, here or at the node. */
|
|
65
|
-
'invalid_id'
|
|
66
|
-
/** The node refused a closed-strand removal that carried no confirmation. */
|
|
67
|
-
| 'confirmation_required'
|
|
68
|
-
/** The owner node's admin channel is unreachable / not ready. */
|
|
69
|
-
| 'node_unavailable'
|
|
70
|
-
/** The node answered with a code this layer has no better word for. */
|
|
71
|
-
| 'internal';
|
|
72
|
-
/** Typed error carrying a stable `code` for HTTP mapping. */
|
|
73
|
-
export declare class StrandError extends Error {
|
|
74
|
-
readonly code: StrandErrorCode;
|
|
75
|
-
constructor(code: StrandErrorCode, message: string);
|
|
76
|
-
}
|
|
77
|
-
/**
|
|
78
|
-
* Typed handlers exposed to the local UI server for Fastify wiring.
|
|
79
|
-
*
|
|
80
|
-
* Handlers either return typed results or throw a `StrandError` whose `.code`
|
|
81
|
-
* `server/error-handler.ts` maps to an HTTP status:
|
|
82
|
-
*
|
|
83
|
-
* - `invalid_id` → 400
|
|
84
|
-
* - `confirmation_required` → 428
|
|
85
|
-
* - `node_unavailable` → 503
|
|
86
|
-
* - `internal` → 500
|
|
87
|
-
*/
|
|
88
|
-
export interface StrandHandlers {
|
|
89
|
-
listStrands(): Promise<StrandListSnapshot>;
|
|
90
|
-
removeStrand(strandId: string, opts: {
|
|
91
|
-
confirm: boolean;
|
|
92
|
-
}): Promise<StrandRemovalResult>;
|
|
93
|
-
}
|
package/dist/strands/types.js
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Strand-management types for cadre-host.
|
|
3
|
-
*
|
|
4
|
-
* A *strand* is a shared data network this party participates in. Membership is
|
|
5
|
-
* canonical in the cadre control network's `Strand` table, reached over the owner
|
|
6
|
-
* node's loopback admin channel (`GET /admin/strands`,
|
|
7
|
-
* `DELETE /admin/strands/:id?confirm=1`).
|
|
8
|
-
*
|
|
9
|
-
* Unlike the trust circle — which layers host-local labels and pending invites on
|
|
10
|
-
* top of the node's state — this layer holds **no host-local state at all**. There
|
|
11
|
-
* is no `strands.json`. It exists for id validation, for translating the admin
|
|
12
|
-
* channel's error codes into a stable vocabulary the management API can map to HTTP
|
|
13
|
-
* statuses, and for nothing else. Keep it small.
|
|
14
|
-
*/
|
|
15
|
-
/** Typed error carrying a stable `code` for HTTP mapping. */
|
|
16
|
-
export class StrandError extends Error {
|
|
17
|
-
constructor(code, message) {
|
|
18
|
-
super(message);
|
|
19
|
-
this.name = 'StrandError';
|
|
20
|
-
this.code = code;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
//# sourceMappingURL=types.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/strands/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AA+DH,6DAA6D;AAC7D,MAAM,OAAO,WAAY,SAAQ,KAAK;IAGpC,YAAY,IAAqB,EAAE,OAAe;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}
|