@serve.zone/interfaces 31.7.0 → 31.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/changelog.md +77 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/clusterruntime.d.ts +39 -0
- package/dist_ts/data/clusterruntime.js +11 -0
- package/dist_ts/data/index.d.ts +5 -0
- package/dist_ts/data/index.js +6 -1
- package/dist_ts/data/networkaddressplan.d.ts +78 -0
- package/dist_ts/data/networkaddressplan.js +114 -0
- package/dist_ts/data/networkauthority.js +5 -17
- package/dist_ts/data/networkcredential.d.ts +10 -4
- package/dist_ts/data/networkcredential.js +14 -8
- package/dist_ts/data/networkdelivery.d.ts +21 -0
- package/dist_ts/data/networkdelivery.js +35 -7
- package/dist_ts/data/networklease.d.ts +110 -0
- package/dist_ts/data/networklease.js +159 -0
- package/dist_ts/data/networknode.d.ts +37 -0
- package/dist_ts/data/networknode.js +6 -0
- package/dist_ts/data/networkprojection.d.ts +10 -5
- package/dist_ts/data/networkprojection.js +15 -22
- package/dist_ts/data/networksigning.js +5 -4
- package/dist_ts/data/runtimeconfig.js +14 -77
- package/dist_ts/data/serviceruntime.d.ts +128 -0
- package/dist_ts/data/serviceruntime.js +92 -0
- package/dist_ts/private/networkcontract.d.ts +20 -0
- package/dist_ts/private/networkcontract.js +45 -1
- package/dist_ts/private/producercontract.d.ts +11 -0
- package/dist_ts/private/producercontract.js +21 -0
- package/dist_ts/private/runtimepolicy.d.ts +31 -0
- package/dist_ts/private/runtimepolicy.js +90 -0
- package/dist_ts/requests/cluster.d.ts +53 -0
- package/dist_ts/requests/cluster.js +1 -1
- package/dist_ts/requests/network.d.ts +57 -1
- package/dist_ts/requests/runtimesession.d.ts +14 -0
- package/dist_ts/requests/service.d.ts +60 -0
- package/dist_ts/runtime.networkprojection.d.ts +14 -0
- package/dist_ts/runtime.networkprojection.js +68 -19
- package/package.json +2 -2
- package/readme.md +251 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/clusterruntime.ts +45 -0
- package/ts/data/index.ts +5 -0
- package/ts/data/networkaddressplan.ts +175 -0
- package/ts/data/networkauthority.ts +4 -16
- package/ts/data/networkcredential.ts +19 -9
- package/ts/data/networkdelivery.ts +49 -6
- package/ts/data/networklease.ts +229 -0
- package/ts/data/networknode.ts +37 -0
- package/ts/data/networkprojection.ts +28 -26
- package/ts/data/networksigning.ts +5 -4
- package/ts/data/runtimeconfig.ts +17 -76
- package/ts/data/serviceruntime.ts +208 -0
- package/ts/private/networkcontract.ts +48 -0
- package/ts/private/producercontract.ts +19 -0
- package/ts/private/runtimepolicy.ts +105 -0
- package/ts/requests/cluster.ts +65 -0
- package/ts/requests/network.ts +50 -1
- package/ts/requests/runtimesession.ts +17 -0
- package/ts/requests/service.ts +81 -0
- package/ts/runtime.networkprojection.ts +87 -20
package/changelog.md
CHANGED
|
@@ -1,5 +1,82 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-09-17 - 31.9.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- Add the contracts for Cloudly's runtime producer chain, the records and admin requests that turn
|
|
8
|
+
a service into Pallet runtime assignments and a node into a runtime network member. Nothing
|
|
9
|
+
existing changes: the new shapes carry no `schemaVersion` and no version suffix.
|
|
10
|
+
- `IClusterRuntime` records a cluster's runtime phase (`swarm`, `draining`, `switching`, `pallet`)
|
|
11
|
+
beside the cluster document. `getClusterRuntime` answers it with typed blockers that name the
|
|
12
|
+
node or service they are about.
|
|
13
|
+
- `IServiceRuntimeSpec` states placement, replicas per node, hold, execution profile and network
|
|
14
|
+
mode for one service. Its profile shares the runtime config's readiness timing, HTTP request,
|
|
15
|
+
log, CPU, memory and identity rules; only the service's target ports decide whether the readiness
|
|
16
|
+
target exists, which the producer refuses as `readiness-target-undeclared`.
|
|
17
|
+
`snapshotServiceRuntimeSpec` refuses unsorted, duplicate or empty pinned node lists, memory
|
|
18
|
+
below 16 MiB and replicas per node outside 1 to 64. `setServiceRuntimeSpec` carries
|
|
19
|
+
`expectedRevision`, and `getServiceRuntimeSpec` answers the spec with its status, never a status
|
|
20
|
+
without a spec.
|
|
21
|
+
- `IServiceRuntimeStatus` is the producer's verdict with closed reasons, each belonging to exactly
|
|
22
|
+
one state: waiting on `node-network-pending`, `conflict` or `failure-backoff`, or refused for one
|
|
23
|
+
of eleven causes.
|
|
24
|
+
- `getServiceRuntimeAssignments` and the paged `getClusterRuntimeAssignments` answer one
|
|
25
|
+
`IServiceRuntimeAssignmentView` per replica slot, with observation, terminal receipt count and
|
|
26
|
+
delivery state. A page holds at most `serviceRuntimeContract.maximumAssignmentPageSize` (256)
|
|
27
|
+
rows. `pushServiceRuntimeChanged` tells admin UIs to read them again.
|
|
28
|
+
- `getRuntimeNetworkNodeReadiness` answers `ready` or the missing conditions in the node
|
|
29
|
+
producer's order, naming the egress owners, at least one, whose protection receipts are pending.
|
|
30
|
+
`IRuntimeRouterIncarnation` and `reincarnateRuntimeNetworkRouter` give a node's router a fresh
|
|
31
|
+
handoff.
|
|
32
|
+
- Add the runtime network address plan. `IRuntimeNetworkAddressPlan` holds the prefixes, pools,
|
|
33
|
+
resolvers, platform endpoints and managed VPN the protected authority is composed from.
|
|
34
|
+
- `snapshotRuntimeNetworkAddressPlan` runs the protected authority's own validator over the plan
|
|
35
|
+
and over the plan with the VPN relay added, so overlapping pools, more than 16 resolvers and a
|
|
36
|
+
relay outside `prefixes` are refused there. It also refuses a VPN control prefix longer than
|
|
37
|
+
/30, outside `prefixes`, overlapping a pool or holding a resolver or endpoint.
|
|
38
|
+
- `composeRuntimeNetworkProtectedAuthority` composes that authority, digest included, inside the
|
|
39
|
+
protection producer's frame, so validator and producer compose the same way.
|
|
40
|
+
- `admitRuntimeNetworkAddressPlanChange` decides a plan write: `unchanged`, `accepted` with the
|
|
41
|
+
ids of the resolvers and endpoints the change removes or changes, or refused as
|
|
42
|
+
`plan-vpn-immutable`, `plan-pool-removed` or `plan-prefix-shrunk`.
|
|
43
|
+
`TRuntimeNetworkAddressPlanRefusal` also names Cloudly's `plan-resolver-referenced` and
|
|
44
|
+
`plan-endpoint-referenced`.
|
|
45
|
+
- `setRuntimeNetworkAddressPlan` carries `expectedRevision`; `getRuntimeNetworkAddressPlan`
|
|
46
|
+
answers `null` until the first plan.
|
|
47
|
+
|
|
48
|
+
## 2026-09-17 - 31.8.0
|
|
49
|
+
|
|
50
|
+
### Features
|
|
51
|
+
|
|
52
|
+
- Add signed DNS lease renewals, so a node's private DNS can outlive a projection's
|
|
53
|
+
fifteen-minute window without a new projection. Re-issuing the projection would restart the
|
|
54
|
+
node's data plane, and during a Cloudly outage nothing could sign one.
|
|
55
|
+
`IRuntimeNetworkDnsLeaseRenewal` names the exact admitted projection by reference and carries
|
|
56
|
+
only a `sequence` and a fresh `dns` window, so it never joins the projection chain.
|
|
57
|
+
- `signRuntimeNetworkDnsLeaseRenewal` and `verifyRuntimeNetworkDnsLeaseRenewal` use the
|
|
58
|
+
controller's existing projection-signing authority under a separate signature domain. A
|
|
59
|
+
renewal verifies only under the exact revision that signed the projection it renews, so
|
|
60
|
+
rotation still needs a newly signed projection for DNS.
|
|
61
|
+
- `admitRuntimeNetworkDnsLeaseRenewal` admits a renewal only for the current projection and
|
|
62
|
+
scope, with a higher sequence and a window that does not move back, ends later and is current
|
|
63
|
+
by the caller's qualified clock. A byte-identical replay is answered `replay` at any time. A
|
|
64
|
+
successor projection refuses every renewal of its predecessor.
|
|
65
|
+
- `applyRuntimeNetworkDnsLeaseRenewal` delivers one renewal to a Pallet node, bound to the
|
|
66
|
+
node's own current session, and its ACK names the exact renewal it admitted.
|
|
67
|
+
- `holdRuntimeNetworkDnsLeaseRenewals` lets Cloudly hand the cluster relay a pre-signed run,
|
|
68
|
+
bounded by `maximumEscrowedRenewals` (32) and `maximumEscrowHorizonMs` (four hours). The
|
|
69
|
+
relay releases only the renewal whose window is current, only while it has no Cloudly
|
|
70
|
+
session, and holds no key.
|
|
71
|
+
- `getRuntimeNetworkEffectiveDnsWindow` returns the window a node may use: the admitted
|
|
72
|
+
renewal's, else the projection's. It takes the bare renewal admission returns, and so does
|
|
73
|
+
`bindGetRuntimeManagedVpnCredentialResponseV1` as an optional trailing argument, so a newly
|
|
74
|
+
issued managed-VPN credential can be bound inside the renewed window.
|
|
75
|
+
- No existing shape or signature changes: `bindGetRuntimeManagedVpnCredentialResponseV1` only
|
|
76
|
+
gains an optional trailing argument, without which its rule is unchanged, and the projection's
|
|
77
|
+
`dns` window is now named `IRuntimeNetworkDnsWindow`. The new shapes carry no `schemaVersion`
|
|
78
|
+
and no version suffix.
|
|
79
|
+
|
|
3
80
|
## 2026-09-17 - 31.7.0
|
|
4
81
|
|
|
5
82
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '31.
|
|
6
|
+
version: '31.9.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
declare const clusterRuntimePhases: readonly ["swarm", "draining", "switching", "pallet"];
|
|
2
|
+
/**
|
|
3
|
+
* Which runtime owns a cluster's workloads.
|
|
4
|
+
*
|
|
5
|
+
* `swarm` is Coreflow's; `draining` stops every service while its volumes stay; `switching` lets the
|
|
6
|
+
* cluster's nodes join the runtime network while nothing runs; `pallet` is Pallet's alone.
|
|
7
|
+
*/
|
|
8
|
+
export type TClusterRuntimePhase = typeof clusterRuntimePhases[number];
|
|
9
|
+
/**
|
|
10
|
+
* The runtime phase of one cluster, stored beside the cluster document rather than inside it: a
|
|
11
|
+
* cluster update merges caller data, and no caller may move a phase with it.
|
|
12
|
+
*/
|
|
13
|
+
export interface IClusterRuntime {
|
|
14
|
+
/** The cluster id. */
|
|
15
|
+
id: string;
|
|
16
|
+
phase: TClusterRuntimePhase;
|
|
17
|
+
/** Compare-and-swap counter; every phase write advances it by one. */
|
|
18
|
+
generation: number;
|
|
19
|
+
/** Unix milliseconds on Cloudly's clock. */
|
|
20
|
+
changedAt: number;
|
|
21
|
+
/** The administrator or producer that made the change. */
|
|
22
|
+
changedBy: string;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Why a cluster cannot leave `swarm` yet. Each blocker names the node or service it is about, so an
|
|
26
|
+
* administrator can act on it without a second query.
|
|
27
|
+
*/
|
|
28
|
+
export type TClusterRuntimeBlocker = {
|
|
29
|
+
code: 'relay-not-enabled' | 'relay-not-registered' | 'address-plan-missing' | 'vpn-unconfigured';
|
|
30
|
+
} | {
|
|
31
|
+
code: 'node-without-pallet-credential' | 'node-arch-unsupported';
|
|
32
|
+
nodeId: string;
|
|
33
|
+
} | {
|
|
34
|
+
code: 'service-multi-cluster-scope' | 'service-authority-unsupported' | 'platform-binding-present';
|
|
35
|
+
serviceId: string;
|
|
36
|
+
};
|
|
37
|
+
/** Structural snapshot for exact persistence; which phase may follow which is the cutover's decision. */
|
|
38
|
+
export declare const snapshotClusterRuntime: (value: unknown) => IClusterRuntime;
|
|
39
|
+
export {};
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { captureNetwork, networkCounter, networkId, networkRecord, requireNetwork } from '../private/networkcontract.js';
|
|
2
|
+
import { isOneOf, producerSafe } from '../private/producercontract.js';
|
|
3
|
+
const clusterRuntimePhases = ['swarm', 'draining', 'switching', 'pallet'];
|
|
4
|
+
/** Structural snapshot for exact persistence; which phase may follow which is the cutover's decision. */
|
|
5
|
+
export const snapshotClusterRuntime = (value) => producerSafe(() => {
|
|
6
|
+
const item = networkRecord(captureNetwork(value), ['id', 'phase', 'generation', 'changedAt', 'changedBy']);
|
|
7
|
+
requireNetwork(isOneOf(clusterRuntimePhases, item.phase));
|
|
8
|
+
return { id: networkId(item.id), phase: item.phase, generation: networkCounter(item.generation),
|
|
9
|
+
changedAt: networkCounter(item.changedAt), changedBy: networkId(item.changedBy) };
|
|
10
|
+
});
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2x1c3RlcnJ1bnRpbWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2NsdXN0ZXJydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsY0FBYyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDekgsT0FBTyxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUV2RSxNQUFNLG9CQUFvQixHQUFHLENBQUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsUUFBUSxDQUFVLENBQUM7QUFtQ25GLHlHQUF5RztBQUN6RyxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLEtBQWMsRUFBbUIsRUFBRSxDQUFDLFlBQVksQ0FBQyxHQUFHLEVBQUU7SUFDM0YsTUFBTSxJQUFJLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFDO0lBQzNHLGNBQWMsQ0FBQyxPQUFPLENBQUMsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDMUQsT0FBTyxFQUFFLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLFVBQVUsRUFBRSxjQUFjLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUM3RixTQUFTLEVBQUUsY0FBYyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO0FBQ3RGLENBQUMsQ0FBQyxDQUFDIn0=
|
package/dist_ts/data/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './cloudlyconfig.js';
|
|
2
2
|
export * from './cluster.js';
|
|
3
|
+
export * from './clusterruntime.js';
|
|
3
4
|
export * from './clusteringress.js';
|
|
4
5
|
export * from './config.js';
|
|
5
6
|
export * from './corestore.js';
|
|
@@ -24,9 +25,12 @@ export * from './isolatedrestore.golden.js';
|
|
|
24
25
|
export * from './mail.js';
|
|
25
26
|
export * from './nodecredential.js';
|
|
26
27
|
export * from './nodeenrollment.js';
|
|
28
|
+
export * from './networkaddressplan.js';
|
|
27
29
|
export * from './networkauthority.js';
|
|
28
30
|
export * from './networkcredential.js';
|
|
29
31
|
export * from './networkdelivery.js';
|
|
32
|
+
export * from './networklease.js';
|
|
33
|
+
export * from './networknode.js';
|
|
30
34
|
export * from './networkprojection.js';
|
|
31
35
|
export type { IRuntimeNetworkRouterPacketGrantV1, IRuntimeNetworkRouterProjectionV1 } from './networkrouter.js';
|
|
32
36
|
export * from './networkprotection.js';
|
|
@@ -47,6 +51,7 @@ export * from './sparknodereport.js';
|
|
|
47
51
|
export * from './service.js';
|
|
48
52
|
export * from './servicecredential.js';
|
|
49
53
|
export * from './serviceports.js';
|
|
54
|
+
export * from './serviceruntime.js';
|
|
50
55
|
export * from './status.js';
|
|
51
56
|
export * from './taskexecution.js';
|
|
52
57
|
export * from './traffic.js';
|
package/dist_ts/data/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './cloudlyconfig.js';
|
|
2
2
|
export * from './cluster.js';
|
|
3
|
+
export * from './clusterruntime.js';
|
|
3
4
|
export * from './clusteringress.js';
|
|
4
5
|
export * from './config.js';
|
|
5
6
|
export * from './corestore.js';
|
|
@@ -24,9 +25,12 @@ export * from './isolatedrestore.golden.js';
|
|
|
24
25
|
export * from './mail.js';
|
|
25
26
|
export * from './nodecredential.js';
|
|
26
27
|
export * from './nodeenrollment.js';
|
|
28
|
+
export * from './networkaddressplan.js';
|
|
27
29
|
export * from './networkauthority.js';
|
|
28
30
|
export * from './networkcredential.js';
|
|
29
31
|
export * from './networkdelivery.js';
|
|
32
|
+
export * from './networklease.js';
|
|
33
|
+
export * from './networknode.js';
|
|
30
34
|
export * from './networkprojection.js';
|
|
31
35
|
export * from './networkprotection.js';
|
|
32
36
|
export * from './networksigning.js';
|
|
@@ -46,10 +50,11 @@ export * from './sparknodereport.js';
|
|
|
46
50
|
export * from './service.js';
|
|
47
51
|
export * from './servicecredential.js';
|
|
48
52
|
export * from './serviceports.js';
|
|
53
|
+
export * from './serviceruntime.js';
|
|
49
54
|
export * from './status.js';
|
|
50
55
|
export * from './taskexecution.js';
|
|
51
56
|
export * from './traffic.js';
|
|
52
57
|
export * from './user.js';
|
|
53
58
|
export * from './version.js';
|
|
54
59
|
export * from './webpush.js';
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9kYXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxVQUFVLENBQUM7QUFDekIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsV0FBVyxDQUFDO0FBQzFCLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHdCQUF3QixDQUFDO0FBRXZDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxnQkFBZ0IsQ0FBQztBQUMvQixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsY0FBYyxjQUFjLENBQUM7QUFDN0IsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLFdBQVcsQ0FBQztBQUMxQixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGNBQWMsQ0FBQyJ9
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import type { IRuntimeNetworkProtectedAuthorityV1 } from './networkauthority.js';
|
|
2
|
+
import type { IGetRuntimeManagedVpnCredentialResponseV1 } from './networkcredential.js';
|
|
3
|
+
/**
|
|
4
|
+
* The address space an administrator gives the runtime network, and the one input the protected
|
|
5
|
+
* authority is composed from. Cloudly keeps a single plan; pools and prefixes only grow, and the
|
|
6
|
+
* managed VPN never changes once set.
|
|
7
|
+
*/
|
|
8
|
+
export interface IRuntimeNetworkAddressPlan {
|
|
9
|
+
id: 'address-plan';
|
|
10
|
+
/** Compare-and-swap counter; every accepted change advances it by one. */
|
|
11
|
+
revision: number;
|
|
12
|
+
/** Every protected prefix: they cover the pools, resolvers, platform endpoints and the VPN. */
|
|
13
|
+
prefixes: string[];
|
|
14
|
+
pools: IRuntimeNetworkProtectedAuthorityV1['pools'];
|
|
15
|
+
resolvers: IRuntimeNetworkProtectedAuthorityV1['resolvers'];
|
|
16
|
+
/** Without the VPN relay, which the composed authority adds as a UDP platform endpoint. */
|
|
17
|
+
platformEndpoints: IRuntimeNetworkProtectedAuthorityV1['platformEndpoints'];
|
|
18
|
+
vpn: {
|
|
19
|
+
/** The private prefix VPN control addresses are allocated from. */
|
|
20
|
+
controlPrefix: string;
|
|
21
|
+
/** The endpoint every node dials for the managed VPN. */
|
|
22
|
+
relay: IGetRuntimeManagedVpnCredentialResponseV1['relay'];
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/** What an administrator writes; Cloudly supplies the id and the revision. */
|
|
26
|
+
export type TRuntimeNetworkAddressPlanWritableData = Omit<IRuntimeNetworkAddressPlan, 'id' | 'revision'>;
|
|
27
|
+
/** What a protection producer fixes around a plan: the authority's identity, revision chain and egress. */
|
|
28
|
+
export type TRuntimeNetworkProtectedAuthorityFrame = Pick<IRuntimeNetworkProtectedAuthorityV1, 'id' | 'generation' | 'controller' | 'previous' | 'egressAuthorities'>;
|
|
29
|
+
/** Refusals the pure change check decides from the two plans alone. */
|
|
30
|
+
export type TRuntimeNetworkAddressPlanChangeRefusal = 'plan-vpn-immutable' | 'plan-pool-removed' | 'plan-prefix-shrunk';
|
|
31
|
+
/**
|
|
32
|
+
* Every refusal of a plan write. Cloudly adds the two that need live references: a resolver or
|
|
33
|
+
* platform endpoint the change removes or changes while a router selection or a service still names it.
|
|
34
|
+
*/
|
|
35
|
+
export type TRuntimeNetworkAddressPlanRefusal = TRuntimeNetworkAddressPlanChangeRefusal | 'plan-resolver-referenced' | 'plan-endpoint-referenced';
|
|
36
|
+
export type TRuntimeNetworkAddressPlanChange = {
|
|
37
|
+
status: 'unchanged';
|
|
38
|
+
}
|
|
39
|
+
/** The ids the change removes or changes, which Cloudly checks against live references before it writes. */
|
|
40
|
+
| {
|
|
41
|
+
status: 'accepted';
|
|
42
|
+
removed: {
|
|
43
|
+
resolverIds: string[];
|
|
44
|
+
platformEndpointIds: string[];
|
|
45
|
+
};
|
|
46
|
+
} | {
|
|
47
|
+
status: 'refused';
|
|
48
|
+
reason: TRuntimeNetworkAddressPlanChangeRefusal;
|
|
49
|
+
};
|
|
50
|
+
export declare const runtimeNetworkAddressPlanContract: Readonly<{
|
|
51
|
+
readonly id: "address-plan";
|
|
52
|
+
/**
|
|
53
|
+
* SmartVPN needs its gateway and at least one member inside the control prefix. No minimum length
|
|
54
|
+
* is stated: the private-range rule already keeps the control prefix at /8 or longer.
|
|
55
|
+
*/
|
|
56
|
+
readonly maximumControlPrefixLength: 30;
|
|
57
|
+
readonly relayProtocol: "udp";
|
|
58
|
+
}>;
|
|
59
|
+
/**
|
|
60
|
+
* Structural snapshot for exact persistence and for a plan write. A plan passes only when both
|
|
61
|
+
* authorities it can describe pass the protected authority's own validator: its sets alone, and
|
|
62
|
+
* its sets with the relay added, so no plan can compose an authority that contract refuses.
|
|
63
|
+
*/
|
|
64
|
+
export declare const snapshotRuntimeNetworkAddressPlan: (value: unknown) => IRuntimeNetworkAddressPlan;
|
|
65
|
+
/**
|
|
66
|
+
* The protected authority a plan describes inside a producer's frame, digest included: the plan's
|
|
67
|
+
* sets with the VPN relay as the UDP platform endpoint every node dials. Both inputs are read before
|
|
68
|
+
* the digest is computed.
|
|
69
|
+
*/
|
|
70
|
+
export declare const composeRuntimeNetworkProtectedAuthority: (planValue: unknown, frameValue: unknown) => Promise<IRuntimeNetworkProtectedAuthorityV1>;
|
|
71
|
+
/**
|
|
72
|
+
* The pure decision for replacing `previousValue`, the stored plan or null, with `nextValue` at the
|
|
73
|
+
* following revision. Leases and the managed VPN outlive a plan revision, so every pool stays exactly
|
|
74
|
+
* as it was, the protected address space only grows, and the VPN never changes. Resolvers and platform
|
|
75
|
+
* endpoints may go or change; `accepted` names every one that did. Equal content is `unchanged`:
|
|
76
|
+
* Cloudly writes nothing and the stored revision stands.
|
|
77
|
+
*/
|
|
78
|
+
export declare const admitRuntimeNetworkAddressPlanChange: (previousValue: unknown | null, nextValue: unknown) => TRuntimeNetworkAddressPlanChange;
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { computeRuntimeNetworkProtectedAuthorityV1Digest, snapshotRuntimeNetworkProtectedAuthorityV1 } from './networkauthority.js';
|
|
2
|
+
import { captureNetwork, failNetwork, networkContains, networkCounter, networkEqual, networkId, networkIpv4, networkOverlaps, networkPrefixBounds, networkPrivatePrefix, networkRecord, networkSafe, requireNetwork } from '../private/networkcontract.js';
|
|
3
|
+
export const runtimeNetworkAddressPlanContract = Object.freeze({
|
|
4
|
+
id: 'address-plan',
|
|
5
|
+
/**
|
|
6
|
+
* SmartVPN needs its gateway and at least one member inside the control prefix. No minimum length
|
|
7
|
+
* is stated: the private-range rule already keeps the control prefix at /8 or longer.
|
|
8
|
+
*/
|
|
9
|
+
maximumControlPrefixLength: 30,
|
|
10
|
+
relayProtocol: 'udp',
|
|
11
|
+
});
|
|
12
|
+
/**
|
|
13
|
+
* The structural authority validator reads a frame's shape and nothing else, and a plan fixes none of
|
|
14
|
+
* the frame, so every valid frame decides a plan the same way. The digest is a well-formed
|
|
15
|
+
* placeholder: this candidate is never hashed or stored.
|
|
16
|
+
*/
|
|
17
|
+
const validationFrame = {
|
|
18
|
+
id: 'address-plan', generation: 1, controller: { kind: 'cloudly', id: 'address-plan', epoch: 'address-plan' },
|
|
19
|
+
previous: null, egressAuthorities: [{ nodeId: 'address-plan', runtimeNamespace: 'address-plan' }],
|
|
20
|
+
};
|
|
21
|
+
const unsealedDigest = `sha256:${'0'.repeat(64)}`;
|
|
22
|
+
/** Unvalidated sets and frame in, the protected authority validator's verdict out. */
|
|
23
|
+
const authorityOf = (sets, frame) => snapshotRuntimeNetworkProtectedAuthorityV1({ schemaVersion: 1, id: frame.id,
|
|
24
|
+
generation: frame.generation, controller: frame.controller, previous: frame.previous, egressAuthorities: frame.egressAuthorities,
|
|
25
|
+
prefixes: sets.prefixes, pools: sets.pools, resolvers: sets.resolvers, platformEndpoints: sets.platformEndpoints, digest: unsealedDigest });
|
|
26
|
+
const setsWithRelay = (plan) => ({
|
|
27
|
+
prefixes: plan.prefixes, pools: plan.pools, resolvers: plan.resolvers,
|
|
28
|
+
platformEndpoints: [...plan.platformEndpoints, { ...plan.vpn.relay, protocol: runtimeNetworkAddressPlanContract.relayProtocol }]
|
|
29
|
+
.sort((left, right) => left.id < right.id ? -1 : left.id > right.id ? 1 : 0),
|
|
30
|
+
});
|
|
31
|
+
const vpnOf = (value) => {
|
|
32
|
+
const item = networkRecord(value, ['controlPrefix', 'relay']);
|
|
33
|
+
const relay = networkRecord(item.relay, ['id', 'address', 'port']);
|
|
34
|
+
const controlPrefix = networkPrivatePrefix(item.controlPrefix);
|
|
35
|
+
requireNetwork(Number(controlPrefix.split('/')[1]) <= runtimeNetworkAddressPlanContract.maximumControlPrefixLength);
|
|
36
|
+
return { controlPrefix, relay: { id: networkId(relay.id), address: networkIpv4(relay.address), port: networkCounter(relay.port, 65535) } };
|
|
37
|
+
};
|
|
38
|
+
/** The control prefix is protected, and no pool, resolver or platform endpoint, the relay included, sits inside it. */
|
|
39
|
+
const requireVpnProtected = (authority, controlPrefix) => {
|
|
40
|
+
requireNetwork(authority.prefixes.some(prefix => networkContains(prefix, controlPrefix))
|
|
41
|
+
&& authority.pools.every(pool => !networkOverlaps(pool.prefix, controlPrefix))
|
|
42
|
+
&& [...authority.resolvers, ...authority.platformEndpoints].every(endpoint => !networkContains(controlPrefix, `${endpoint.address}/32`)));
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* Structural snapshot for exact persistence and for a plan write. A plan passes only when both
|
|
46
|
+
* authorities it can describe pass the protected authority's own validator: its sets alone, and
|
|
47
|
+
* its sets with the relay added, so no plan can compose an authority that contract refuses.
|
|
48
|
+
*/
|
|
49
|
+
export const snapshotRuntimeNetworkAddressPlan = (value) => networkSafe(() => {
|
|
50
|
+
const item = networkRecord(captureNetwork(value), ['id', 'revision', 'prefixes', 'pools', 'resolvers', 'platformEndpoints', 'vpn']);
|
|
51
|
+
requireNetwork(item.id === runtimeNetworkAddressPlanContract.id);
|
|
52
|
+
const own = authorityOf({ prefixes: item.prefixes, pools: item.pools, resolvers: item.resolvers,
|
|
53
|
+
platformEndpoints: item.platformEndpoints }, validationFrame);
|
|
54
|
+
const plan = { id: runtimeNetworkAddressPlanContract.id, revision: networkCounter(item.revision),
|
|
55
|
+
prefixes: own.prefixes, pools: own.pools, resolvers: own.resolvers, platformEndpoints: own.platformEndpoints, vpn: vpnOf(item.vpn) };
|
|
56
|
+
requireVpnProtected(authorityOf(setsWithRelay(plan), validationFrame), plan.vpn.controlPrefix);
|
|
57
|
+
return plan;
|
|
58
|
+
});
|
|
59
|
+
/**
|
|
60
|
+
* The protected authority a plan describes inside a producer's frame, digest included: the plan's
|
|
61
|
+
* sets with the VPN relay as the UDP platform endpoint every node dials. Both inputs are read before
|
|
62
|
+
* the digest is computed.
|
|
63
|
+
*/
|
|
64
|
+
export const composeRuntimeNetworkProtectedAuthority = async (planValue, frameValue) => {
|
|
65
|
+
try {
|
|
66
|
+
const plan = snapshotRuntimeNetworkAddressPlan(planValue);
|
|
67
|
+
const frame = networkRecord(captureNetwork(frameValue), ['id', 'generation', 'controller', 'previous', 'egressAuthorities']);
|
|
68
|
+
const authority = authorityOf(setsWithRelay(plan), frame);
|
|
69
|
+
return { ...authority, digest: await computeRuntimeNetworkProtectedAuthorityV1Digest(authority) };
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return failNetwork();
|
|
73
|
+
}
|
|
74
|
+
};
|
|
75
|
+
/** Whether the union of `prefixes`, which never overlap one another, covers every address of `prefix`. */
|
|
76
|
+
const coveredBy = (prefixes, prefix) => {
|
|
77
|
+
const [first, last] = networkPrefixBounds(prefix);
|
|
78
|
+
const covered = prefixes.reduce((sum, candidate) => {
|
|
79
|
+
const [low, high] = networkPrefixBounds(candidate);
|
|
80
|
+
return sum + Math.max(0, Math.min(last, high) - Math.max(first, low) + 1);
|
|
81
|
+
}, 0);
|
|
82
|
+
return covered === last - first + 1;
|
|
83
|
+
};
|
|
84
|
+
/**
|
|
85
|
+
* The entries of `previous` that `next` does not hold exactly as they were. An entry changed under its
|
|
86
|
+
* old id counts: whatever still names that id would now reach something else.
|
|
87
|
+
*/
|
|
88
|
+
const removedOrChanged = (previous, next) => previous.filter(item => !next.some(candidate => networkEqual(candidate, item)));
|
|
89
|
+
const idsOf = (entries) => entries.map(entry => entry.id);
|
|
90
|
+
/**
|
|
91
|
+
* The pure decision for replacing `previousValue`, the stored plan or null, with `nextValue` at the
|
|
92
|
+
* following revision. Leases and the managed VPN outlive a plan revision, so every pool stays exactly
|
|
93
|
+
* as it was, the protected address space only grows, and the VPN never changes. Resolvers and platform
|
|
94
|
+
* endpoints may go or change; `accepted` names every one that did. Equal content is `unchanged`:
|
|
95
|
+
* Cloudly writes nothing and the stored revision stands.
|
|
96
|
+
*/
|
|
97
|
+
export const admitRuntimeNetworkAddressPlanChange = (previousValue, nextValue) => networkSafe(() => {
|
|
98
|
+
const previous = previousValue === null ? null : snapshotRuntimeNetworkAddressPlan(previousValue);
|
|
99
|
+
const next = snapshotRuntimeNetworkAddressPlan(nextValue);
|
|
100
|
+
requireNetwork(next.revision === (previous?.revision ?? 0) + 1);
|
|
101
|
+
if (previous === null)
|
|
102
|
+
return { status: 'accepted', removed: { resolverIds: [], platformEndpointIds: [] } };
|
|
103
|
+
if (networkEqual({ ...previous, revision: next.revision }, next))
|
|
104
|
+
return { status: 'unchanged' };
|
|
105
|
+
if (!networkEqual(previous.vpn, next.vpn))
|
|
106
|
+
return { status: 'refused', reason: 'plan-vpn-immutable' };
|
|
107
|
+
if (removedOrChanged(previous.pools, next.pools).length > 0)
|
|
108
|
+
return { status: 'refused', reason: 'plan-pool-removed' };
|
|
109
|
+
if (!previous.prefixes.every(prefix => coveredBy(next.prefixes, prefix)))
|
|
110
|
+
return { status: 'refused', reason: 'plan-prefix-shrunk' };
|
|
111
|
+
return { status: 'accepted', removed: { resolverIds: idsOf(removedOrChanged(previous.resolvers, next.resolvers)),
|
|
112
|
+
platformEndpointIds: idsOf(removedOrChanged(previous.platformEndpoints, next.platformEndpoints)) } };
|
|
113
|
+
});
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkaddressplan.js","sourceRoot":"","sources":["../../ts/data/networkaddressplan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { canonicalizeStrictJson, createCanonicalJsonSha256Hex } from '../private/canonicaljson.js';
|
|
2
|
+
import { networkPrefix, networkPrivatePrefix } from '../private/networkcontract.js';
|
|
2
3
|
export const runtimeNetworkAuthorityV1Contract = Object.freeze({
|
|
3
4
|
protectedDigestDomain: 'serve.zone/runtime-network-protected-authority-v1',
|
|
4
5
|
handoffDigestDomain: 'serve.zone/runtime-network-handoff-lease-v1',
|
|
@@ -89,14 +90,6 @@ const endpointAddress = (value) => {
|
|
|
89
90
|
requireValue(first > 0 && first < 224 && first !== 127);
|
|
90
91
|
return result;
|
|
91
92
|
};
|
|
92
|
-
const prefix = (value) => {
|
|
93
|
-
requireValue(typeof value === 'string' && value.length <= 18);
|
|
94
|
-
const parts = value.split('/');
|
|
95
|
-
requireValue(parts.length === 2 && /^(?:[0-9]|[12][0-9]|3[0-2])$/.test(parts[1]));
|
|
96
|
-
const base = numericAddress(address(parts[0])), width = 2 ** (32 - Number(parts[1]));
|
|
97
|
-
requireValue(base % width === 0);
|
|
98
|
-
return value;
|
|
99
|
-
};
|
|
100
93
|
const bounds = (value) => {
|
|
101
94
|
const [base, bits] = value.split('/'), first = numericAddress(base);
|
|
102
95
|
return [first, first + 2 ** (32 - Number(bits)) - 1];
|
|
@@ -109,11 +102,6 @@ const overlaps = (left, right) => {
|
|
|
109
102
|
const [a, b] = bounds(left), [c, d] = bounds(right);
|
|
110
103
|
return a <= d && c <= b;
|
|
111
104
|
};
|
|
112
|
-
const privatePrefix = (value) => {
|
|
113
|
-
const result = prefix(value);
|
|
114
|
-
requireValue(['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16'].some(range => contains(range, result)));
|
|
115
|
-
return result;
|
|
116
|
-
};
|
|
117
105
|
const nonoverlapping = (values) => {
|
|
118
106
|
for (let index = 0; index < values.length; index++)
|
|
119
107
|
for (let other = 0; other < index; other++) {
|
|
@@ -130,7 +118,7 @@ export const snapshotRuntimeNetworkProtectedAuthorityV1 = (value) => safe(() =>
|
|
|
130
118
|
const identity = id(item.id), generation = integer(item.generation);
|
|
131
119
|
const previous = item.previous === null ? null : reference(item.previous);
|
|
132
120
|
requireValue(generation === 1 ? previous === null : previous?.id === identity && previous.generation === generation - 1);
|
|
133
|
-
const prefixes = sorted(list(item.prefixes, runtimeNetworkAuthorityV1Contract.maximumPrefixes,
|
|
121
|
+
const prefixes = sorted(list(item.prefixes, runtimeNetworkAuthorityV1Contract.maximumPrefixes, networkPrefix), value => value);
|
|
134
122
|
requireValue(prefixes.length > 0);
|
|
135
123
|
nonoverlapping(prefixes);
|
|
136
124
|
const protectedPrefix = (value) => requireValue(prefixes.some(range => contains(range, value)));
|
|
@@ -138,7 +126,7 @@ export const snapshotRuntimeNetworkProtectedAuthorityV1 = (value) => safe(() =>
|
|
|
138
126
|
const pool = record(value, ['id', 'purpose', 'prefix']);
|
|
139
127
|
requireValue(pool.purpose === 'workload' || pool.purpose === 'transit');
|
|
140
128
|
const result = {
|
|
141
|
-
id: id(pool.id), purpose: pool.purpose, prefix:
|
|
129
|
+
id: id(pool.id), purpose: pool.purpose, prefix: networkPrivatePrefix(pool.prefix),
|
|
142
130
|
};
|
|
143
131
|
protectedPrefix(result.prefix);
|
|
144
132
|
return result;
|
|
@@ -169,7 +157,7 @@ export const snapshotRuntimeNetworkHandoffLeaseV1 = (value) => safe(() => {
|
|
|
169
157
|
'protectedAuthority', 'routerIncarnationId', 'transit', 'sourcePortRanges', 'conntrackZone', 'conntrackLabel', 'digest']);
|
|
170
158
|
requireValue(item.schemaVersion === 1);
|
|
171
159
|
const transit = record(item.transit, ['poolId', 'prefix', 'routerAddress', 'hostAddress']);
|
|
172
|
-
const transitPrefix =
|
|
160
|
+
const transitPrefix = networkPrivatePrefix(transit.prefix), [first, last] = bounds(transitPrefix);
|
|
173
161
|
const routerAddress = endpointAddress(transit.routerAddress), hostAddress = endpointAddress(transit.hostAddress);
|
|
174
162
|
requireValue(first !== last && routerAddress !== hostAddress);
|
|
175
163
|
for (const value of [routerAddress, hostAddress]) {
|
|
@@ -241,4 +229,4 @@ export const snapshotRuntimeNetworkHandoffLedgerV1 = async (value) => {
|
|
|
241
229
|
}
|
|
242
230
|
return leases;
|
|
243
231
|
};
|
|
244
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkauthority.js","sourceRoot":"","sources":["../../ts/data/networkauthority.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AA4CnG,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7D,qBAAqB,EAAE,mDAAmD;IAC1E,mBAAmB,EAAE,6CAA6C;IAClE,eAAe,EAAE,GAAG;IACpB,YAAY,EAAE,EAAE;IAChB,gBAAgB,EAAE,EAAE;IACpB,wBAAwB,EAAE,EAAE;IAC5B,wBAAwB,EAAE,GAAG;IAC7B,iBAAiB,EAAE,EAAE;IACrB,4BAA4B,EAAE,GAAG;IACjC,UAAU,EAAE,sEAAsE;IAClF,UAAU,EAAE,oEAAoE;IAChF,QAAQ,EAAE,WAAW;CACb,CAAC,CAAC;AAEZ,MAAM,IAAI,GAAG,GAAU,EAAE,GAAG,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/F,SAAS,YAAY,CAAC,KAAc,IAAmB,IAAI,CAAC,KAAK;IAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5E,MAAM,IAAI,GAAG,CAAI,SAAkB,EAAK,EAAE,GAAG,IAAI,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;AAAC,CAAC;AAAC,MAAM,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;AAAC,CAAC,CAAC,CAAC,CAAC;AACpG,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,IAAc,EAA2B,EAAE;IACzE,YAAY,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,YAAY,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACtC,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvF,MAAM,MAAM,GAA4B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/D,YAAY,CAAC,UAAU,EAAE,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC;IACjC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,IAAI,GAAG,CAAI,KAAc,EAAE,OAAe,EAAE,IAA0B,EAAO,EAAE;IACnF,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;IACvE,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC;IAChH,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzE,YAAY,CAAC,UAAU,EAAE,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,EAAE,GAAG,CAAC,KAAc,EAAU,EAAE;IACpC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7F,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAE,OAAO,GAAG,MAAM,CAAC,gBAAgB,GAAG,CAAC,EAAU,EAAE;IAChF,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,OAAO,CAAC,CAAC;IACxG,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAC,KAAc,EAAiB,EAAE;IAC/C,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,OAAO,KAAsB,CAAC;AAChC,CAAC,CAAC;AACF,MAAM,UAAU,GAAG,CAAC,KAAc,EAAwB,EAAE;IAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpD,YAAY,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IAChE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;AACrE,CAAC,CAAC;AACF,MAAM,SAAS,GAAG,CAAC,KAAc,EAAgC,EAAE;IACjE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;AAChG,CAAC,CAAC;AACF,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAiB,EAAE;IACjD,YAAY,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,KAAK,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAI,MAAW,EAAE,GAAyB,EAAO,EAAE;IAChE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjG,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAU,EAAE;IACzC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACrH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AACtH,MAAM,eAAe,GAAG,CAAC,KAAc,EAAU,EAAE;IACjD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,YAAY,CAAC,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAC,KAAc,EAAU,EAAE;IACxC,YAAY,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrF,YAAY,CAAC,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AACF,MAAM,MAAM,GAAG,CAAC,KAAa,EAAoB,EAAE;IACjD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACpE,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC;AACF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,KAAa,EAAW,EAAE;IACzD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AACF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,KAAa,EAAW,EAAE;IACxD,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC,CAAC;AACF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAU,EAAE;IAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,YAAY,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IACvG,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,MAAM,cAAc,GAAG,CAAC,MAAgB,EAAQ,EAAE;IAChD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE;QAAE,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;YAC/F,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;AACH,CAAC,CAAC;AACF,MAAM,SAAS,GAAG,CAAC,KAAc,EAAU,EAAE,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAClF,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,KAAc,EAAW,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,KAAK,CAAC,CAAC;AAEhG,yGAAyG;AACzG,MAAM,CAAC,MAAM,0CAA0C,GAAG,CAAC,KAAc,EAAuC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3H,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU;QACnG,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC7E,YAAY,CAAC,IAAI,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1E,YAAY,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,KAAK,QAAQ,IAAI,QAAQ,CAAC,UAAU,KAAK,UAAU,GAAG,CAAC,CAAC,CAAC;IACzH,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iCAAiC,CAAC,eAAe,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACxH,YAAY,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzB,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACxG,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,iCAAiC,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE;QAC5F,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxD,YAAY,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QACxE,MAAM,MAAM,GAAyD;YACnE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;SAC3E,CAAC;QACF,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvB,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,CAAC,KAAc,EAAE,YAAqB,EAAE,EAAE;QAC7D,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACjH,MAAM,MAAM,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QACxH,eAAe,CAAC,GAAG,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC;QACxC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClF,OAAO,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACtF,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iCAAiC,CAAC,gBAAgB,EAC9F,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3D,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,iCAAiC,CAAC,wBAAwB,EACtH,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAqE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9H,MAAM,eAAe,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC,CAAC;QACpI,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzF,YAAY,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,iCAAiC,CAAC,wBAAwB,EAAE,KAAK,CAAC,EAAE;QAChI,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAChE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;IAC5F,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAChE,YAAY,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3C,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,QAAQ;QACpG,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;AACpG,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAAC,KAAc,EAAiC,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC/G,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB;QACzG,oBAAoB,EAAE,qBAAqB,EAAE,SAAS,EAAE,kBAAkB,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC5H,YAAY,CAAC,IAAI,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;IAC3F,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3F,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjH,YAAY,CAAC,KAAK,KAAK,IAAI,IAAI,aAAa,KAAK,WAAW,CAAC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QACrC,YAAY,CAAC,MAAM,IAAI,KAAK,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,iCAAiC,CAAC,iBAAiB,EAAE,KAAK,CAAC,EAAE;QAChH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC5H,YAAY,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,YAAY,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC7D,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAChF,YAAY,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAClI,CAAC;IACD,YAAY,CAAC,OAAO,IAAI,CAAC,cAAc,KAAK,QAAQ,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;WAC7F,IAAI,CAAC,cAAc,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;QACvH,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,EAAE,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAC5H,mBAAmB,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE;QAC7I,gBAAgB,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;AAC5I,CAAC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAE,KAAgC,EAA0B,EAAE;IACvG,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,KAAK,CAAC;IAC9C,OAAO,UAAU,MAAM,4BAA4B,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;AAC9F,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,+CAA+C,GAAG,CAAC,KAA0C,EAA0B,EAAE,CACpI,aAAa,CAAC,iCAAiC,CAAC,qBAAqB,EAAE,0CAA0C,CAAC,KAAK,CAAC,CAAC,CAAC;AAC5H,MAAM,CAAC,MAAM,yCAAyC,GAAG,CAAC,KAAoC,EAA0B,EAAE,CACxH,aAAa,CAAC,iCAAiC,CAAC,mBAAmB,EAAE,oCAAoC,CAAC,KAAK,CAAC,CAAC,CAAC;AAEpH,8GAA8G;AAC9G,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,UAAmB,EAAE,cAAuB,EAEhG,EAAE;IACH,MAAM,KAAK,GAAG,oCAAoC,CAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,0CAA0C,CAAC,cAAc,CAAC,CAAC;IAC7E,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,yCAAyC,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,YAAY,CAAC,SAAS,CAAC,MAAM,KAAK,MAAM,+CAA+C,CAAC,SAAS,CAAC,CAAC,CAAC;IACpG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC;WACtD,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC;WAClH,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,gBAAgB,KAAK,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACpI,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9E,YAAY,CAAC,IAAI,EAAE,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACzF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,KAAK,EAAE,KAAc,EAA4C,EAAE;IACtH,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,iCAAiC,CAAC,4BAA4B,EAClG,oCAAoC,CAAC,CAAC,CAAC;IACzC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,yCAAyC,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YAChG,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,IAAI,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU,CAAC,CAAC;YACnF,IAAI,KAAK,CAAC,gBAAgB,KAAK,QAAQ,CAAC,gBAAgB,IAAI,KAAK,CAAC,mBAAmB,KAAK,QAAQ,CAAC,mBAAmB,EAAE,CAAC;gBACvH,YAAY,CAAC,KAAK,CAAC,aAAa,KAAK,QAAQ,CAAC,aAAa,IAAI,KAAK,CAAC,cAAc,KAAK,QAAQ,CAAC,cAAc,CAAC,CAAC;YACnH,CAAC;YACD,uFAAuF;YACvF,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;gBACnE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,gBAAgB;oBAAE,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,gBAAgB,EAAE,CAAC;wBACzF,YAAY,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;oBACvG,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"networkauthority.js","sourceRoot":"","sources":["../../ts/data/networkauthority.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,10 @@ export interface IGetRuntimeManagedVpnCredentialResponseV1 extends IGetRuntimeMa
|
|
|
18
18
|
serverPublicKey: string;
|
|
19
19
|
clientPublicKey: string;
|
|
20
20
|
clientPrivateKey: string;
|
|
21
|
-
/**
|
|
21
|
+
/**
|
|
22
|
+
* Unix milliseconds; cannot outlive the referenced projection's effective DNS window: its
|
|
23
|
+
* admitted lease renewal's, else its own.
|
|
24
|
+
*/
|
|
22
25
|
expiresAt: number;
|
|
23
26
|
}
|
|
24
27
|
export declare const snapshotGetRuntimeManagedVpnCredentialRequestV1: (value: unknown) => IGetRuntimeManagedVpnCredentialRequestV1;
|
|
@@ -27,6 +30,9 @@ export declare const snapshotGetRuntimeManagedVpnCredentialResponseV1: (value: u
|
|
|
27
30
|
* and authenticate/fence the current physical peer before and after native work. */
|
|
28
31
|
export declare const bindGetRuntimeManagedVpnCredentialRequestV1: (value: unknown, projectionValue: unknown, trustedSessionValue: unknown) => Promise<IGetRuntimeManagedVpnCredentialRequestV1>;
|
|
29
32
|
/** Bind the secret response to the original request and exact selected router
|
|
30
|
-
* UDP endpoint
|
|
31
|
-
*
|
|
32
|
-
|
|
33
|
+
* UDP endpoint, inside the projection's effective DNS window. renewalValue is the
|
|
34
|
+
* bare lease renewal the caller already verified and admitted for this exact
|
|
35
|
+
* projection, or null; this helper verifies no signature. Time is caller-qualified;
|
|
36
|
+
* this helper does not sample a clock, authenticate a transport, admit policy or
|
|
37
|
+
* prove a running managed connection. */
|
|
38
|
+
export declare const bindGetRuntimeManagedVpnCredentialResponseV1: (value: unknown, requestValue: unknown, projectionValue: unknown, trustedSessionValue: unknown, nowValue: unknown, renewalValue?: unknown | null) => Promise<IGetRuntimeManagedVpnCredentialResponseV1>;
|