@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
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { randomBytes } from 'node:crypto';
|
|
2
2
|
import debug from 'debug';
|
|
3
|
+
import { OwnerNodeUnavailableError } from '../owner/owner-node-client.js';
|
|
3
4
|
import { TrustCircleError } from './types.js';
|
|
4
5
|
const log = debug('cadre:host:trust-circle');
|
|
5
6
|
/** Default invite lifetime: 24 hours. */
|
|
@@ -10,18 +11,28 @@ const TOKEN_BYTES = 32;
|
|
|
10
11
|
* TrustCircleService — orchestrates invite issuance, redemption, and
|
|
11
12
|
* membership management.
|
|
12
13
|
*
|
|
13
|
-
* Membership is canonical in the cadre control DB (`CadrePeer` table)
|
|
14
|
-
*
|
|
14
|
+
* Membership is canonical in the cadre control DB (`CadrePeer` table),
|
|
15
|
+
* reached over the owner node's admin channel; labels and pending tokens
|
|
16
|
+
* live in the host-local `TrustCircleStore`. When the node is unreachable,
|
|
17
|
+
* owner operations surface `node_unavailable` (→ 503) and `list()`
|
|
18
|
+
* degrades to the local labels file.
|
|
15
19
|
*/
|
|
16
20
|
export class TrustCircleService {
|
|
17
21
|
constructor(opts) {
|
|
22
|
+
/**
|
|
23
|
+
* In-flight redemption claims (by token). Serialises concurrent redeems
|
|
24
|
+
* for the same token without burning the durable pending row before
|
|
25
|
+
* `acceptPhone` succeeds. Intra-process only — the orchestrator enforces
|
|
26
|
+
* single-process ownership of a given rootDir, so no file lock is needed.
|
|
27
|
+
*/
|
|
28
|
+
this.inFlightRedemptions = new Set();
|
|
18
29
|
this.cadreNode = opts.cadreNode;
|
|
19
30
|
this.store = opts.store;
|
|
20
31
|
this.now = opts.now ?? (() => new Date());
|
|
21
32
|
}
|
|
22
33
|
/**
|
|
23
34
|
* Issue a new invite. Generates a token, persists a pending row, and
|
|
24
|
-
* delegates to cadre-core to embed the host's
|
|
35
|
+
* delegates to cadre-core to embed the host's owner addresses.
|
|
25
36
|
*/
|
|
26
37
|
async issueInvite(opts) {
|
|
27
38
|
const label = normaliseLabel(opts.label);
|
|
@@ -32,7 +43,9 @@ export class TrustCircleService {
|
|
|
32
43
|
const token = generateToken();
|
|
33
44
|
const created = this.now();
|
|
34
45
|
const expiresAt = new Date(created.getTime() + ttlMs);
|
|
35
|
-
const { invite, encodedInvite } = await this.cadreNode
|
|
46
|
+
const { invite, encodedInvite } = await this.cadreNode
|
|
47
|
+
.createInvite(token, ttlMs)
|
|
48
|
+
.catch((err) => this.toDomainError(err));
|
|
36
49
|
const pending = {
|
|
37
50
|
token,
|
|
38
51
|
label,
|
|
@@ -48,52 +61,79 @@ export class TrustCircleService {
|
|
|
48
61
|
* - cadre-core authorizes the peer (inserts CadrePeer row).
|
|
49
62
|
* - The pending row is consumed (one-time enforcement).
|
|
50
63
|
* - A labelled member row is written locally.
|
|
64
|
+
*
|
|
65
|
+
* Ordering: the synchronous *claim* against `inFlightRedemptions` serialises
|
|
66
|
+
* concurrent redeems for the same token (second concurrent caller rejects
|
|
67
|
+
* synchronously before its first await). The durable `removePending` only
|
|
68
|
+
* runs *after* `acceptPhone` succeeds — so a transient `node_unavailable`
|
|
69
|
+
* leaves the token re-redeemable rather than permanently burning it.
|
|
70
|
+
*
|
|
71
|
+
* Crash-safety tradeoff: if the host crashes between `acceptPhone` success
|
|
72
|
+
* and the durable `removePending`, a retry will dial in fine but the
|
|
73
|
+
* owner node's `acceptPhone` will reject the second `CadrePeer` insert
|
|
74
|
+
* with a PK constraint error (cadre-core does not upsert). That surfaces to
|
|
75
|
+
* the redeemer as a non-`node_unavailable` failure; the admin can revoke
|
|
76
|
+
* the lingering pending row. This is a narrower window than the prior
|
|
77
|
+
* behaviour, where *any* transient node outage burned the token.
|
|
51
78
|
*/
|
|
52
79
|
async redeemInvite(opts) {
|
|
53
80
|
const { token, peerId } = opts;
|
|
54
81
|
if (!token || !peerId) {
|
|
55
82
|
throw new TrustCircleError('invalid_token', 'token and peerId are required');
|
|
56
83
|
}
|
|
57
|
-
// Atomically claim the pending row before doing async work. This closes
|
|
58
|
-
// the race between two concurrent redemption requests for the same token —
|
|
59
|
-
// only the call that wins the synchronous removePending() proceeds; the
|
|
60
|
-
// other gets `already_redeemed`. The remove is durable (write-then-rename),
|
|
61
|
-
// so a crash after this point loses the token, which is the safe failure
|
|
62
|
-
// mode for a one-time credential.
|
|
63
84
|
const pending = this.store.getPending(token);
|
|
64
|
-
if (!pending
|
|
65
|
-
// Either never issued, or another concurrent caller just consumed it.
|
|
85
|
+
if (!pending) {
|
|
66
86
|
throw new TrustCircleError('already_redeemed', 'Invite not found or already redeemed');
|
|
67
87
|
}
|
|
68
88
|
if (pending.expiresAt) {
|
|
69
89
|
const expiresAt = new Date(pending.expiresAt);
|
|
70
90
|
if (Number.isFinite(expiresAt.getTime()) && this.now() > expiresAt) {
|
|
71
|
-
//
|
|
91
|
+
// Expiry is permanent — reap the pending row durably.
|
|
92
|
+
this.store.removePending(token);
|
|
72
93
|
throw new TrustCircleError('expired', 'Invite has expired');
|
|
73
94
|
}
|
|
74
95
|
}
|
|
75
|
-
//
|
|
76
|
-
//
|
|
77
|
-
//
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
96
|
+
// Synchronous in-memory claim. Closes the race between two concurrent
|
|
97
|
+
// redemption requests for the same token — the loser sees the token in
|
|
98
|
+
// the set and rejects synchronously before its first `await`.
|
|
99
|
+
if (this.inFlightRedemptions.has(token)) {
|
|
100
|
+
throw new TrustCircleError('already_redeemed', 'Invite not found or already redeemed');
|
|
101
|
+
}
|
|
102
|
+
this.inFlightRedemptions.add(token);
|
|
103
|
+
try {
|
|
104
|
+
// Reconstruct the CadreInvite that was originally issued. cadre-core's
|
|
105
|
+
// acceptPhone validates `issuedInvite.token === options.token` (already
|
|
106
|
+
// matches by construction) and re-checks expiration.
|
|
107
|
+
const reconstructed = {
|
|
108
|
+
partyId: '',
|
|
109
|
+
ownerAddrs: [],
|
|
110
|
+
token: pending.token,
|
|
111
|
+
createdAt: new Date(pending.createdAt).getTime(),
|
|
112
|
+
...(pending.expiresAt ? { expiresAt: new Date(pending.expiresAt).getTime() } : {}),
|
|
113
|
+
};
|
|
114
|
+
await this.cadreNode
|
|
115
|
+
.acceptPhone({ phonePeerId: peerId, token }, reconstructed)
|
|
116
|
+
.catch((err) => this.toDomainError(err));
|
|
117
|
+
// acceptPhone succeeded → durably consume the pending row. If we crash
|
|
118
|
+
// between here and the next line, the token stays pending (re-redeem
|
|
119
|
+
// would fail at acceptPhone with a duplicate-CadrePeer error, not
|
|
120
|
+
// node_unavailable, and the admin can revoke).
|
|
121
|
+
this.store.removePending(token);
|
|
122
|
+
// If the member write fails the peer is still authorized in CadrePeer —
|
|
123
|
+
// the next call to list() will pick it up unlabeled, which is the
|
|
124
|
+
// documented graceful degradation.
|
|
125
|
+
const member = {
|
|
126
|
+
peerId,
|
|
127
|
+
label: pending.label,
|
|
128
|
+
addedAt: this.now().toISOString(),
|
|
129
|
+
};
|
|
130
|
+
this.store.addMember(member);
|
|
131
|
+
log('redeemed invite for "%s" (peerId=%s, token=%s)', pending.label, peerId, token);
|
|
132
|
+
return { peerId, label: pending.label };
|
|
133
|
+
}
|
|
134
|
+
finally {
|
|
135
|
+
this.inFlightRedemptions.delete(token);
|
|
136
|
+
}
|
|
97
137
|
}
|
|
98
138
|
/** Revoke a pending invite by token. No-op if not found. */
|
|
99
139
|
async revokePending(token) {
|
|
@@ -113,7 +153,7 @@ export class TrustCircleService {
|
|
|
113
153
|
throw new TrustCircleError('not_found', `Unknown member: ${peerId}`);
|
|
114
154
|
}
|
|
115
155
|
if (inControl) {
|
|
116
|
-
await this.cadreNode.removePeer(peerId);
|
|
156
|
+
await this.cadreNode.removePeer(peerId).catch((err) => this.toDomainError(err));
|
|
117
157
|
}
|
|
118
158
|
if (inLocal) {
|
|
119
159
|
this.store.removeMember(peerId);
|
|
@@ -122,19 +162,18 @@ export class TrustCircleService {
|
|
|
122
162
|
}
|
|
123
163
|
/** Whether the peer is present in the cadre's CadrePeer table. */
|
|
124
164
|
async isMember(peerId) {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
return true;
|
|
132
|
-
}
|
|
133
|
-
return false;
|
|
165
|
+
try {
|
|
166
|
+
return await this.cadreNode.isMember(peerId);
|
|
167
|
+
}
|
|
168
|
+
catch (err) {
|
|
169
|
+
this.toDomainError(err);
|
|
170
|
+
}
|
|
134
171
|
}
|
|
135
172
|
/**
|
|
136
|
-
* UI snapshot. Joins the canonical CadrePeer list
|
|
137
|
-
* prunes any orphan labels (peer is no longer
|
|
173
|
+
* UI snapshot. Joins the canonical CadrePeer list (fetched over the admin
|
|
174
|
+
* channel) with local labels; prunes any orphan labels (peer is no longer
|
|
175
|
+
* authorised). When the owner node is unreachable, degrades to the
|
|
176
|
+
* local labels file so listing keeps working while the node is down.
|
|
138
177
|
*/
|
|
139
178
|
async list() {
|
|
140
179
|
const labels = new Map();
|
|
@@ -142,12 +181,21 @@ export class TrustCircleService {
|
|
|
142
181
|
labels.set(m.peerId, { label: m.label, addedAt: m.addedAt, ...(m.self ? { self: true } : {}) });
|
|
143
182
|
}
|
|
144
183
|
const members = [];
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
184
|
+
// Consult the control DB over the admin channel. A node-unavailable error
|
|
185
|
+
// is non-fatal — fall back to the local labels rather than 503-ing a
|
|
186
|
+
// read-only listing.
|
|
187
|
+
let controlMembers;
|
|
188
|
+
try {
|
|
189
|
+
controlMembers = await this.cadreNode.listMembers();
|
|
190
|
+
}
|
|
191
|
+
catch (err) {
|
|
192
|
+
if (!(err instanceof OwnerNodeUnavailableError))
|
|
193
|
+
throw err;
|
|
194
|
+
controlMembers = null;
|
|
195
|
+
}
|
|
196
|
+
if (controlMembers) {
|
|
197
|
+
const seenPeerIds = new Set();
|
|
198
|
+
for (const { peerId } of controlMembers) {
|
|
151
199
|
seenPeerIds.add(peerId);
|
|
152
200
|
const label = labels.get(peerId);
|
|
153
201
|
members.push({
|
|
@@ -157,11 +205,9 @@ export class TrustCircleService {
|
|
|
157
205
|
...(label?.self ? { self: true } : {}),
|
|
158
206
|
});
|
|
159
207
|
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
// we'd wipe labels for a transient connectivity issue.
|
|
164
|
-
if (db) {
|
|
208
|
+
// Prune labels for peers that no longer exist in CadrePeer. Only when we
|
|
209
|
+
// successfully consulted the node — otherwise a transient outage would
|
|
210
|
+
// wipe labels.
|
|
165
211
|
for (const peerId of labels.keys()) {
|
|
166
212
|
if (!seenPeerIds.has(peerId)) {
|
|
167
213
|
this.store.removeMember(peerId);
|
|
@@ -169,7 +215,7 @@ export class TrustCircleService {
|
|
|
169
215
|
}
|
|
170
216
|
}
|
|
171
217
|
else {
|
|
172
|
-
//
|
|
218
|
+
// Node down: return labels as-is (degradation; no pruning).
|
|
173
219
|
for (const [peerId, row] of labels) {
|
|
174
220
|
members.push({ peerId, ...row });
|
|
175
221
|
}
|
|
@@ -180,6 +226,17 @@ export class TrustCircleService {
|
|
|
180
226
|
pending.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
|
|
181
227
|
return { members, pending };
|
|
182
228
|
}
|
|
229
|
+
/**
|
|
230
|
+
* Translate an admin-channel transport failure into a `node_unavailable`
|
|
231
|
+
* TrustCircleError (→ 503). Re-throws anything else unchanged. Returns
|
|
232
|
+
* `never` so callers can `.catch(err => this.toDomainError(err))`.
|
|
233
|
+
*/
|
|
234
|
+
toDomainError(err) {
|
|
235
|
+
if (err instanceof OwnerNodeUnavailableError) {
|
|
236
|
+
throw new TrustCircleError('node_unavailable', `Owner node unavailable: ${err.message}`);
|
|
237
|
+
}
|
|
238
|
+
throw err instanceof Error ? err : new Error(String(err));
|
|
239
|
+
}
|
|
183
240
|
}
|
|
184
241
|
/**
|
|
185
242
|
* Wrap a TrustCircleService into the typed handler shape consumed by
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trust-circle.js","sourceRoot":"","sources":["../../src/auth/trust-circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"trust-circle.js","sourceRoot":"","sources":["../../src/auth/trust-circle.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/types.d.ts
CHANGED
|
@@ -57,6 +57,7 @@ export interface TrustCircleSnapshot {
|
|
|
57
57
|
* - `not_found` → 404 (unknown token / unknown peer)
|
|
58
58
|
* - `expired` → 410 (invite past expiresAt)
|
|
59
59
|
* - `already_redeemed` → 409 (token was used and is gone)
|
|
60
|
+
* - `node_unavailable` → 503 (owner node admin channel down/not ready)
|
|
60
61
|
* - default → 500
|
|
61
62
|
*/
|
|
62
63
|
export interface TrustCircleHandlers {
|
|
@@ -73,7 +74,9 @@ export interface TrustCircleHandlers {
|
|
|
73
74
|
listTrustCircle(): Promise<TrustCircleSnapshot>;
|
|
74
75
|
}
|
|
75
76
|
/** Error codes thrown by TrustCircleService. */
|
|
76
|
-
export type TrustCircleErrorCode = 'not_found' | 'expired' | 'already_redeemed' | 'invalid_label' | 'invalid_token' | 'storage_error'
|
|
77
|
+
export type TrustCircleErrorCode = 'not_found' | 'expired' | 'already_redeemed' | 'invalid_label' | 'invalid_token' | 'storage_error'
|
|
78
|
+
/** The owner node's admin channel is unreachable / not ready. */
|
|
79
|
+
| 'node_unavailable';
|
|
77
80
|
/** Typed error carrying a stable `code` for HTTP mapping. */
|
|
78
81
|
export declare class TrustCircleError extends Error {
|
|
79
82
|
readonly code: TrustCircleErrorCode;
|
package/dist/auth/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/auth/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/auth/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA2EH,6DAA6D;AAC7D,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAGzC,YAAY,IAA0B,EAAE,OAAe;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}
|