@serve.zone/interfaces 32.51.0 → 32.53.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 +93 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/catalog.d.ts +92 -12
- package/dist_ts/appstore/catalog.js +119 -5
- package/dist_ts/appstore/types.d.ts +28 -4
- package/dist_ts/appstore/types.js +1 -1
- package/dist_ts/appstore/versionconfig.d.ts +1 -1
- package/dist_ts/data/cluster.d.ts +1 -1
- package/dist_ts/data/clusteringress.d.ts +4 -4
- package/dist_ts/data/clusteringressdesignation.d.ts +2 -2
- package/dist_ts/data/clusternode.d.ts +13 -6
- package/dist_ts/data/clusternode.js +1 -1
- package/dist_ts/data/clusternodehostname.d.ts +63 -0
- package/dist_ts/data/clusternodehostname.js +122 -0
- package/dist_ts/data/clusterrelaycredential.d.ts +3 -3
- package/dist_ts/data/clusterruntime.d.ts +1 -1
- package/dist_ts/data/clustervpn.d.ts +4 -4
- package/dist_ts/data/coremail.d.ts +11 -11
- package/dist_ts/data/coremail.runtime.d.ts +6 -6
- package/dist_ts/data/coremail.runtime.js +1 -1
- package/dist_ts/data/corestorecontroltoken.d.ts +1 -1
- package/dist_ts/data/corestorelegacyadoption.d.ts +2 -2
- package/dist_ts/data/deploymentmachineuser.d.ts +1 -1
- package/dist_ts/data/deploymentpreflight.d.ts +26 -1
- package/dist_ts/data/fleetcutover.d.ts +28 -28
- package/dist_ts/data/hostedapp.d.ts +4 -4
- package/dist_ts/data/immutableimage.d.ts +3 -3
- package/dist_ts/data/index.d.ts +1 -0
- package/dist_ts/data/index.js +2 -1
- package/dist_ts/data/isolatedrestore.d.ts +7 -7
- package/dist_ts/data/isolatedrestore.js +1 -1
- package/dist_ts/data/networkaddressplan.d.ts +2 -2
- package/dist_ts/data/networkapplication.d.ts +9 -9
- package/dist_ts/data/networkauthority.d.ts +5 -5
- package/dist_ts/data/networkcredential.js +1 -1
- package/dist_ts/data/networkegressretirement.d.ts +3 -3
- package/dist_ts/data/networkegressretirement.js +1 -1
- package/dist_ts/data/networkhost.d.ts +3 -3
- package/dist_ts/data/networklease.d.ts +9 -9
- package/dist_ts/data/networkprojection.d.ts +7 -7
- package/dist_ts/data/networkprojectionretirement.d.ts +6 -6
- package/dist_ts/data/networkprotection.d.ts +9 -9
- package/dist_ts/data/networksigning.d.ts +6 -6
- package/dist_ts/data/networkworkloadingress.d.ts +3 -3
- package/dist_ts/data/nodeenrollment.d.ts +8 -8
- package/dist_ts/data/noderetirement.d.ts +1 -1
- package/dist_ts/data/noderuntimebinding.d.ts +11 -11
- package/dist_ts/data/privatenetwork.d.ts +3 -3
- package/dist_ts/data/runtimeassignment.d.ts +9 -9
- package/dist_ts/data/runtimeassignment.js +1 -1
- package/dist_ts/data/runtimeassignmentexec.d.ts +2 -2
- package/dist_ts/data/runtimeassignmentlogs.d.ts +4 -4
- package/dist_ts/data/runtimeassignmentstats.d.ts +2 -2
- package/dist_ts/data/runtimeconfig.d.ts +1 -1
- package/dist_ts/data/runtimelocalstorageclaim.d.ts +4 -4
- package/dist_ts/data/runtimelocalvolumearchive.d.ts +5 -5
- package/dist_ts/data/runtimesession.d.ts +5 -5
- package/dist_ts/data/runtimesession.js +1 -1
- package/dist_ts/data/runtimestorageclaim.d.ts +4 -4
- package/dist_ts/data/runtimeterminalreceipt.d.ts +2 -2
- package/dist_ts/data/runtimeterminalreceipt.js +1 -1
- package/dist_ts/data/secret.d.ts +4 -4
- package/dist_ts/data/secret.js +1 -1
- package/dist_ts/data/service.d.ts +10 -3
- package/dist_ts/data/serviceplatformownership.d.ts +1 -1
- package/dist_ts/data/serviceports.js +1 -1
- package/dist_ts/data/serviceruntime.d.ts +3 -3
- package/dist_ts/data/servicevolumeinitialization.d.ts +1 -1
- package/dist_ts/data/settings.d.ts +37 -31
- package/dist_ts/data/settings.js +1 -1
- package/dist_ts/data/sparklegacyretirement.d.ts +4 -4
- package/dist_ts/data/sparknodereport.d.ts +61 -1
- package/dist_ts/data/sparknodereport.js +66 -3
- package/dist_ts/platform/storage.d.ts +1 -1
- package/dist_ts/platform/storagemigration.d.ts +6 -6
- package/dist_ts/platform/storagemigration.golden.d.ts +13 -13
- package/dist_ts/platform/types.d.ts +1 -1
- package/dist_ts/private/canonicaljson.d.ts +6 -6
- package/dist_ts/private/canonicaljson.js +1 -1
- package/dist_ts/private/dataproperties.js +1 -1
- package/dist_ts/private/networkcontract.js +1 -1
- package/dist_ts/private/storagecontract.d.ts +1 -1
- package/dist_ts/private/storagecontract.js +1 -1
- package/dist_ts/protocol.d.ts +1 -1
- package/dist_ts/requests/appstore.d.ts +18 -0
- package/dist_ts/requests/hostedapp.d.ts +6 -0
- package/dist_ts/requests/hostedapp.js +1 -1
- package/dist_ts/requests/node.d.ts +59 -0
- package/dist_ts/runtime.appstorecatalog.d.ts +17 -0
- package/dist_ts/runtime.appstorecatalog.js +84 -12
- package/dist_ts/runtime.assignmentsecret.d.ts +3 -3
- package/dist_ts/runtime.assignmentsecret.js +1 -1
- package/dist_ts/runtime.corestore.d.ts +13 -13
- package/dist_ts/runtime.d.ts +1 -1
- package/dist_ts/runtime.workloadinit.d.ts +11 -11
- package/package.json +4 -3
- package/readme.md +27 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/catalog.ts +175 -5
- package/ts/appstore/types.ts +25 -0
- package/ts/data/clusternode.ts +8 -0
- package/ts/data/clusternodehostname.ts +153 -0
- package/ts/data/index.ts +1 -0
- package/ts/data/service.ts +10 -2
- package/ts/data/settings.ts +6 -0
- package/ts/data/sparknodereport.ts +112 -2
- package/ts/requests/appstore.ts +22 -0
- package/ts/requests/hostedapp.ts +6 -0
- package/ts/requests/node.ts +67 -0
- package/ts/runtime.appstorecatalog.ts +91 -11
package/changelog.md
CHANGED
|
@@ -1,5 +1,98 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-10-08 - 32.53.0
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
- App Store catalog signing keys have a stable file form (`./runtime`, `node:crypto`):
|
|
8
|
+
`importAppStoreCatalogSigningKeyPem` reads one unencrypted PKCS#8 PEM Ed25519 private key (as
|
|
9
|
+
`openssl genpkey -algorithm ed25519` writes it) and derives its public key and key id;
|
|
10
|
+
`exportAppStoreCatalogSigningKeyPem` writes it back. `getAppStoreCatalogTrustedKey` gives the
|
|
11
|
+
trusted-key record a consumer ships for a signing key, and `importAppStoreCatalogTrustedKeyPem`
|
|
12
|
+
and `exportAppStoreCatalogTrustedKeyPem` convert a trusted key from and to an SPKI PEM public key
|
|
13
|
+
(`openssl pkey -pubout`). Each refuses any other block label, key type or a key id that does not
|
|
14
|
+
match its public key, and no error quotes its input.
|
|
15
|
+
- `judgeAppStoreCatalogInstallTarget(version, supportedFeatureIds, consumer)` takes the consumer
|
|
16
|
+
(`IAppStoreCatalogConsumer`: `kind` `onebox` or `cloudly`, its own `version`) and refuses a
|
|
17
|
+
version whose `minOneboxVersion` or `minCloudlyVersion` is newer than the consumer's release as
|
|
18
|
+
`consumerVersionTooOld` (with `consumerKind`, `consumerVersion` and `minimumVersion`), after
|
|
19
|
+
`versionWithdrawn` and `featuresUnsupported`. Components compare as numbers. The argument is
|
|
20
|
+
optional for existing callers; a host passes it on every call, and a consumer version that is not
|
|
21
|
+
`MAJOR.MINOR.PATCH` throws.
|
|
22
|
+
- `IAppStoreApp` and `IAppStoreAppMeta` take an optional `versionStates`
|
|
23
|
+
(`IAppStoreAppVersionState`: `version`, `installRefusal`): every version the catalog lists,
|
|
24
|
+
withdrawn and feature-gated ones included, with the `judgeAppStoreCatalogInstallTarget` answer,
|
|
25
|
+
so a view shows the versions `versions` leaves out and why.
|
|
26
|
+
- A service records the App Store version it runs as a server-managed snapshot:
|
|
27
|
+
`IService.data.appStoreTemplate` (`appstore.IAppStoreServiceTemplateSnapshot`: `appId`,
|
|
28
|
+
`version`, `configDigest`, `config`, `catalogRevision`), which `TServiceWritableData` excludes, so
|
|
29
|
+
only the host's install, upgrade and catalog adoption write it. Onebox carries the same type on its
|
|
30
|
+
own service record. `appstore.createAppStoreServiceTemplateSnapshot(catalog, appId, version)` takes
|
|
31
|
+
it from a verified catalog (withdrawn versions included) or answers `null` when the version is not
|
|
32
|
+
listed.
|
|
33
|
+
- `IReq_Any_ImportAppStoreCatalog` (`importAppStoreCatalog`) takes an operator's signed envelope
|
|
34
|
+
text and answers the catalog status after judging it like a fetched one (origin
|
|
35
|
+
`operatorImport`), so an air-gapped host becomes ready without a registry.
|
|
36
|
+
- An `unavailable` catalog status states a machine-readable `cause`
|
|
37
|
+
(`TAppStoreCatalogUnavailableCause`: `loading`, `failed`, `refused`) next to the operator's
|
|
38
|
+
`reason`, and a host refuses App Store install, upgrade and upgrade preview while no catalog is
|
|
39
|
+
active with `TypedResponseError` code `APPSTORE_CATALOG_UNAVAILABLE`
|
|
40
|
+
(`appstore.appStoreCatalogUnavailableErrorCode`, `IAppStoreCatalogUnavailableErrorData`,
|
|
41
|
+
retryable).
|
|
42
|
+
- One rule for the registries a consumer loads the catalog from:
|
|
43
|
+
`appstore.validateAppStoreCatalogRegistries(list)` admits `https:` base URLs without credentials,
|
|
44
|
+
query or fragment, each registry once, at most 16, and names refused entries by index without
|
|
45
|
+
quoting them; `appstore.resolveAppStoreCatalogRegistries(list)` answers the canonical list, or
|
|
46
|
+
`appstore.appStoreCatalogDefaultRegistries` (npmjs) when it is absent or empty. Cloudly's
|
|
47
|
+
operators set it as `ICloudlySettings.appStoreCatalogRegistries`.
|
|
48
|
+
- `IReq_GetHostedAppAccessConfiguration` app entries take an optional `unavailableReason`: an app
|
|
49
|
+
whose roles and OIDC capability the host cannot read is listed with it instead of failing the
|
|
50
|
+
whole listing.
|
|
51
|
+
|
|
52
|
+
### Documentation
|
|
53
|
+
|
|
54
|
+
- The cluster node hostname doc comments and tests use neutral example node names.
|
|
55
|
+
|
|
56
|
+
### Maintenance
|
|
57
|
+
|
|
58
|
+
- Release tooling: `@git.zone/tsbuild` 5.1.2 → 6.0.0 (TypeScript 7, `7.1.0-dev.20260928.1`; the tsconfig uses none of the options TypeScript 7 removed). The contract-name rules (`test/contractnames.rules.ts`) read the classic compiler API from `typescript` ^6.0.3 directly, which tsbuild 6 no longer re-exports. `@types/node` stays at 26.6.3 until 26.6.4 is seven days old.
|
|
59
|
+
|
|
60
|
+
## 2026-10-07 - 32.52.0
|
|
61
|
+
|
|
62
|
+
### Features
|
|
63
|
+
|
|
64
|
+
- A cluster node's static hostname is Cloudly-owned desired state, with a default scheme
|
|
65
|
+
`cloudly-worker-<name>` (`data/clusternodehostname.ts`). `clusterNodeHostnameContract` states the
|
|
66
|
+
prefix and bounds: a hostname is one lowercase RFC 1123 label of at most 63 characters
|
|
67
|
+
(`isClusterNodeHostname`), a node name at most the 48 characters the prefix leaves
|
|
68
|
+
(`isClusterNodeName`). `deriveDefaultClusterNodeHostname` builds the default and
|
|
69
|
+
`proposeClusterNodeName` reads a name out of an observed hostname without guessing one from
|
|
70
|
+
another scheme. `IClusterNode.data.hostnameIntent` (`IClusterNodeHostnameIntent`: `name`,
|
|
71
|
+
`hostname`, `generation`, `requestedAt`, `requestedBy`) records it, read exactly by
|
|
72
|
+
`snapshotClusterNodeHostnameIntent`; `isDefaultClusterNodeHostname` tells whether it is the
|
|
73
|
+
default.
|
|
74
|
+
- `IReq_Any_Cloudly_SetClusterNodeHostname` renames a node and
|
|
75
|
+
`IReq_Any_Cloudly_ResetClusterNodeHostname` resets it to the default, optionally under a new
|
|
76
|
+
name; both name the intent generation they replace and refuse by one of
|
|
77
|
+
`clusterNodeHostnameRefusals` (`TClusterNodeHostnameRefusalCode`). A rename keeps the name of the
|
|
78
|
+
node's intent; a node without one takes `proposeClusterNodeName` of the requested hostname and is
|
|
79
|
+
refused `name-invalid` when that proposes none. A new intent may replace one the node has not
|
|
80
|
+
converged to; the generation fence alone serializes changes, and Spark applies the latest
|
|
81
|
+
generation.
|
|
82
|
+
`IReq_Any_Cloudly_CreateNodeJumpCommand` takes an optional `nodeName`, so a new host enrolls under
|
|
83
|
+
its default hostname.
|
|
84
|
+
- Spark reads the desired hostname on its own route, `sparkNodeHostContract` (`/spark/nodes/host`):
|
|
85
|
+
`ISparkNodeHostRequest` in, `ISparkNodeDesiredHost` out (`hostname: null` with generation 0 when
|
|
86
|
+
Cloudly holds no intent), read by `snapshotSparkNodeHostRequest` and
|
|
87
|
+
`snapshotSparkNodeDesiredHost`. `ISparkNodeReport` takes an optional `hostApply`
|
|
88
|
+
(`ISparkNodeHostApply`, `TSparkNodeHostApplyOutcome`, `sparkNodeHostApplyContract`) stating the
|
|
89
|
+
outcome of the last attempt to apply it; a Spark that sends it raises its `minimumPeerVersion` to
|
|
90
|
+
this minor, so it reaches only a Cloudly that reads it.
|
|
91
|
+
|
|
92
|
+
### Maintenance
|
|
93
|
+
|
|
94
|
+
- Release tooling: pnpm 12.8.1 → 12.8.2. `@types/node` stays at 26.6.3 until 26.6.4 is seven days old (2026-10-08 22:39 UTC).
|
|
95
|
+
|
|
3
96
|
## 2026-10-06 - 32.51.0
|
|
4
97
|
|
|
5
98
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '32.
|
|
6
|
+
version: '32.53.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -23,15 +23,15 @@ import type { IAppStoreVersionConfig, IServezoneAppStoreAppInfo, TAppStoreUpgrad
|
|
|
23
23
|
* version through `requiresFeatures` (see `IAppStoreVersionConfig.requiresFeatures`).
|
|
24
24
|
*/
|
|
25
25
|
export declare const appStoreCatalogContract: Readonly<{
|
|
26
|
-
readonly id:
|
|
26
|
+
readonly id: 'serve.zone/appstore-catalog';
|
|
27
27
|
readonly major: 1;
|
|
28
28
|
readonly minor: 0;
|
|
29
|
-
readonly digestAlgorithm:
|
|
30
|
-
readonly signatureAlgorithm:
|
|
31
|
-
readonly configDigestDomain:
|
|
32
|
-
readonly catalogDigestDomain:
|
|
33
|
-
readonly signatureDomain:
|
|
34
|
-
readonly signingKeyIdDomain:
|
|
29
|
+
readonly digestAlgorithm: 'sha256';
|
|
30
|
+
readonly signatureAlgorithm: 'ed25519';
|
|
31
|
+
readonly configDigestDomain: 'serve.zone/appstore-catalog/version-config';
|
|
32
|
+
readonly catalogDigestDomain: 'serve.zone/appstore-catalog/catalog';
|
|
33
|
+
readonly signatureDomain: 'serve.zone/appstore-catalog/signature';
|
|
34
|
+
readonly signingKeyIdDomain: 'serve.zone/appstore-catalog/signing-key';
|
|
35
35
|
readonly maximumApps: 1024;
|
|
36
36
|
readonly maximumVersionsPerApp: 1024;
|
|
37
37
|
readonly maximumSignatures: 8;
|
|
@@ -55,7 +55,7 @@ export interface IAppStoreCatalogContractIdentity {
|
|
|
55
55
|
* the app states its upgrade strategy once and the version entry names its own version.
|
|
56
56
|
*/
|
|
57
57
|
export type TAppStoreCatalogVersionConfig = Omit<IAppStoreVersionConfig, 'source' | 'resolvedSource' | 'resolvedImageDigest' | 'upgradeStrategy' | 'appStoreVersion'>;
|
|
58
|
-
declare const versionConfigKeyList: readonly [
|
|
58
|
+
declare const versionConfigKeyList: readonly ['image', 'port', 'containerArgs', 'targetPorts', 'domains', 'publicPortMappings', 'envVars', 'volumes', 'storageClasses', 'storageRequests', 'publishedPorts', 'platformRequirements', 'platformOidc', 'minOneboxVersion', 'minCloudlyVersion', 'changelog', 'breaking', 'requiresManualReview', 'migrationRequired', 'backupBeforeUpgrade', 'requiresFeatures', 'healthCheck'];
|
|
59
59
|
/** Every member a catalog version config may carry; any other member is refused. */
|
|
60
60
|
export declare const appStoreCatalogVersionConfigKeys: TCompleteKeyList<TAppStoreCatalogVersionConfig, typeof versionConfigKeyList>;
|
|
61
61
|
/** Why and when a publisher withdrew a published version. */
|
|
@@ -203,13 +203,35 @@ export interface IAppStoreCatalogReadyStatus extends IAppStoreCatalogStatusBase
|
|
|
203
203
|
active: IAppStoreCatalogActiveState;
|
|
204
204
|
reason?: never;
|
|
205
205
|
}
|
|
206
|
+
/**
|
|
207
|
+
* Why no verified catalog is active, for programs; `reason` says it for operators.
|
|
208
|
+
*
|
|
209
|
+
* - `loading`: no attempt has ended since start and no last-known-good catalog was restored.
|
|
210
|
+
* - `failed`: the last attempt read no candidate (transport, integrity or packaging failed).
|
|
211
|
+
* - `refused`: the last attempt read a candidate and refused it (`refused` holds the record).
|
|
212
|
+
*/
|
|
213
|
+
export type TAppStoreCatalogUnavailableCause = 'loading' | 'failed' | 'refused';
|
|
206
214
|
/** No verified catalog is active, neither a last-known-good one nor a fetched one. */
|
|
207
215
|
export interface IAppStoreCatalogUnavailableStatus extends IAppStoreCatalogStatusBase {
|
|
208
216
|
availability: 'unavailable';
|
|
209
|
-
/** Why no catalog is active, e.g. the last attempt's failure. */
|
|
217
|
+
/** Why no catalog is active, e.g. the last attempt's failure. For operators; never parse it. */
|
|
210
218
|
reason: string;
|
|
219
|
+
/** Why no catalog is active, for programs. Every host that loads the catalog at runtime states it. */
|
|
220
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
211
221
|
active?: never;
|
|
212
222
|
}
|
|
223
|
+
/**
|
|
224
|
+
* The code a host answers, as `TypedResponseError.errorData` (`IAppStoreCatalogUnavailableErrorData`),
|
|
225
|
+
* when it refuses an App Store install, upgrade or upgrade preview because no verified catalog is
|
|
226
|
+
* active. Retryable: the same request succeeds once a catalog is active.
|
|
227
|
+
*/
|
|
228
|
+
export declare const appStoreCatalogUnavailableErrorCode: 'APPSTORE_CATALOG_UNAVAILABLE';
|
|
229
|
+
export interface IAppStoreCatalogUnavailableErrorData {
|
|
230
|
+
code: typeof appStoreCatalogUnavailableErrorCode;
|
|
231
|
+
retryable: true;
|
|
232
|
+
/** The status `cause` when the host states one. */
|
|
233
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
234
|
+
}
|
|
213
235
|
/**
|
|
214
236
|
* The App Store domain's state as an operator sees it, discriminated by `availability`.
|
|
215
237
|
*
|
|
@@ -265,6 +287,53 @@ export declare const createAppStoreCatalogSignaturePayload: (catalogDigestArg: T
|
|
|
265
287
|
* Judge the catalog with `validateAppStoreCatalog` first; an entry it would refuse is skipped.
|
|
266
288
|
*/
|
|
267
289
|
export declare const findAppStoreCatalogConfigDigestMismatch: (catalogArg: IAppStoreCatalog) => Promise<string | null>;
|
|
290
|
+
/** The registries a consumer loads the catalog from when it configures none. */
|
|
291
|
+
export declare const appStoreCatalogDefaultRegistries: readonly string[];
|
|
292
|
+
/**
|
|
293
|
+
* The errors of a configured registry list; empty when a consumer may load from it. Every entry is
|
|
294
|
+
* an `https:` base URL without credentials, query or fragment, no two name the same registry, and
|
|
295
|
+
* an empty list means `appStoreCatalogDefaultRegistries`. Errors name entries by index and never
|
|
296
|
+
* quote them, so a URL carrying credentials does not reach a log.
|
|
297
|
+
*/
|
|
298
|
+
export declare const validateAppStoreCatalogRegistries: (listArg: unknown) => string[];
|
|
299
|
+
/**
|
|
300
|
+
* The registry base URLs a consumer asks, in order: the configured list in canonical form (no
|
|
301
|
+
* trailing slash), or `appStoreCatalogDefaultRegistries` when it is absent or empty. Throws the
|
|
302
|
+
* `validateAppStoreCatalogRegistries` errors for a list it refuses.
|
|
303
|
+
*/
|
|
304
|
+
export declare const resolveAppStoreCatalogRegistries: (listArg: readonly string[] | undefined) => string[];
|
|
305
|
+
/**
|
|
306
|
+
* The App Store version a service runs, as its host took it from a verified catalog.
|
|
307
|
+
*
|
|
308
|
+
* Server-managed: a host writes it when it installs or upgrades the service and when it adopts an
|
|
309
|
+
* existing service on catalog activation, and every runtime path reads this snapshot, never the
|
|
310
|
+
* live catalog. Published versions never change (`judgeAppStoreCatalogSuccession`), so a snapshot
|
|
311
|
+
* stays equal to its catalog entry for as long as the entry is listed.
|
|
312
|
+
*/
|
|
313
|
+
export interface IAppStoreServiceTemplateSnapshot {
|
|
314
|
+
appId: string;
|
|
315
|
+
version: string;
|
|
316
|
+
/** The catalog entry's `configDigest`: `computeAppStoreCatalogConfigDigest(config)`. */
|
|
317
|
+
configDigest: TSha256Digest;
|
|
318
|
+
config: TAppStoreCatalogVersionConfig;
|
|
319
|
+
/** The `revision` of the catalog the snapshot was taken from. */
|
|
320
|
+
catalogRevision: number;
|
|
321
|
+
}
|
|
322
|
+
/**
|
|
323
|
+
* The snapshot of `appId@version` from a verified catalog, or `null` when the catalog does not list
|
|
324
|
+
* it. Withdrawn versions are listed and snapshot like any other: a host adopting an installed
|
|
325
|
+
* service records the version it runs; whether a version is an install or upgrade target is
|
|
326
|
+
* `judgeAppStoreCatalogInstallTarget`. The config is a copy the caller owns.
|
|
327
|
+
*/
|
|
328
|
+
export declare const createAppStoreServiceTemplateSnapshot: (catalogArg: IAppStoreCatalog, appIdArg: string, versionArg: string) => IAppStoreServiceTemplateSnapshot | null;
|
|
329
|
+
/** The hosts that consume the catalog; each version names its minimum release of each. */
|
|
330
|
+
export type TAppStoreCatalogConsumerKind = 'onebox' | 'cloudly';
|
|
331
|
+
/** The consumer judging a version: which host it is and the release it runs. */
|
|
332
|
+
export interface IAppStoreCatalogConsumer {
|
|
333
|
+
kind: TAppStoreCatalogConsumerKind;
|
|
334
|
+
/** The host's own release, `MAJOR.MINOR.PATCH`. */
|
|
335
|
+
version: string;
|
|
336
|
+
}
|
|
268
337
|
/** Why a listed version is not an install or upgrade target for this consumer. */
|
|
269
338
|
export type TAppStoreCatalogInstallTargetRefusal = {
|
|
270
339
|
reason: 'versionWithdrawn';
|
|
@@ -272,13 +341,24 @@ export type TAppStoreCatalogInstallTargetRefusal = {
|
|
|
272
341
|
} | {
|
|
273
342
|
reason: 'featuresUnsupported';
|
|
274
343
|
missingFeatureIds: string[];
|
|
344
|
+
}
|
|
345
|
+
/** The version names a minimum release of this host (`minOneboxVersion`, `minCloudlyVersion`) newer than it runs. */
|
|
346
|
+
| {
|
|
347
|
+
reason: 'consumerVersionTooOld';
|
|
348
|
+
consumerKind: TAppStoreCatalogConsumerKind;
|
|
349
|
+
consumerVersion: string;
|
|
350
|
+
minimumVersion: string;
|
|
275
351
|
};
|
|
276
352
|
/**
|
|
277
353
|
* Whether a consumer may install a listed version, or upgrade a service to it; `null` when it may.
|
|
278
|
-
* A withdrawn version
|
|
279
|
-
* and are refused here,
|
|
354
|
+
* A withdrawn version, a version requiring a feature the consumer does not fulfil and a version
|
|
355
|
+
* requiring a newer release of the consumer stay listed and are refused here, in that order, and
|
|
356
|
+
* nowhere else is a second answer needed.
|
|
357
|
+
*
|
|
358
|
+
* A host passes `consumerArg` on every call; without it the minimum release is not judged. A
|
|
359
|
+
* consumer version that is not `MAJOR.MINOR.PATCH` throws: it is the host's own constant.
|
|
280
360
|
*/
|
|
281
|
-
export declare const judgeAppStoreCatalogInstallTarget: (versionArg: IAppStoreCatalogVersion, supportedFeatureIdsArg: Iterable<string
|
|
361
|
+
export declare const judgeAppStoreCatalogInstallTarget: (versionArg: IAppStoreCatalogVersion, supportedFeatureIdsArg: Iterable<string>, consumerArg?: IAppStoreCatalogConsumer) => TAppStoreCatalogInstallTargetRefusal | null;
|
|
282
362
|
export type TAppStoreCatalogSuccession = {
|
|
283
363
|
outcome: 'activate';
|
|
284
364
|
} | {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getDigestFromPinnedImageReference, isSha256Digest } from '../data/immutableimage.js';
|
|
2
|
+
import { compareReleaseVersions, parseReleaseVersion } from '../data/releaseversion.js';
|
|
2
3
|
import { canonicalizeStrictJson, compareWireTokens, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
3
4
|
import { hasExactKeys, readDataElements, readDataProperties } from '../private/dataproperties.js';
|
|
4
5
|
import { validateAppStoreVersionConfig } from './versionconfig.js';
|
|
@@ -55,6 +56,12 @@ const versionConfigKeyList = [
|
|
|
55
56
|
];
|
|
56
57
|
/** Every member a catalog version config may carry; any other member is refused. */
|
|
57
58
|
export const appStoreCatalogVersionConfigKeys = Object.freeze(versionConfigKeyList);
|
|
59
|
+
/**
|
|
60
|
+
* The code a host answers, as `TypedResponseError.errorData` (`IAppStoreCatalogUnavailableErrorData`),
|
|
61
|
+
* when it refuses an App Store install, upgrade or upgrade preview because no verified catalog is
|
|
62
|
+
* active. Retryable: the same request succeeds once a catalog is active.
|
|
63
|
+
*/
|
|
64
|
+
export const appStoreCatalogUnavailableErrorCode = 'APPSTORE_CATALOG_UNAVAILABLE';
|
|
58
65
|
const withdrawalReasonMaximumLength = 512;
|
|
59
66
|
const semverPattern = /^(0|[1-9][0-9]{0,14})\.(0|[1-9][0-9]{0,14})\.(0|[1-9][0-9]{0,14})$/;
|
|
60
67
|
const versionTokenPattern = /^[A-Za-z0-9][A-Za-z0-9._+-]{0,127}$/;
|
|
@@ -487,16 +494,123 @@ export const findAppStoreCatalogConfigDigestMismatch = async (catalogArg) => {
|
|
|
487
494
|
}
|
|
488
495
|
return null;
|
|
489
496
|
};
|
|
497
|
+
/** The registries a consumer loads the catalog from when it configures none. */
|
|
498
|
+
export const appStoreCatalogDefaultRegistries = Object.freeze(['https://registry.npmjs.org']);
|
|
499
|
+
const maximumRegistries = 16;
|
|
500
|
+
const maximumRegistryUrlLength = 2048;
|
|
501
|
+
/** The canonical base URL of one registry entry, or `null` when the entry is not admissible. */
|
|
502
|
+
const readRegistryBaseUrl = (entryArg) => {
|
|
503
|
+
if (typeof entryArg !== 'string' || entryArg.length > maximumRegistryUrlLength)
|
|
504
|
+
return null;
|
|
505
|
+
let url;
|
|
506
|
+
try {
|
|
507
|
+
url = new URL(entryArg);
|
|
508
|
+
}
|
|
509
|
+
catch {
|
|
510
|
+
return null;
|
|
511
|
+
}
|
|
512
|
+
if (url.protocol !== 'https:' || url.username !== '' || url.password !== '' || url.search !== ''
|
|
513
|
+
|| url.hash !== '' || entryArg.includes('?') || entryArg.includes('#')) {
|
|
514
|
+
return null;
|
|
515
|
+
}
|
|
516
|
+
return url.toString().replace(/\/+$/, '');
|
|
517
|
+
};
|
|
518
|
+
/**
|
|
519
|
+
* The errors of a configured registry list; empty when a consumer may load from it. Every entry is
|
|
520
|
+
* an `https:` base URL without credentials, query or fragment, no two name the same registry, and
|
|
521
|
+
* an empty list means `appStoreCatalogDefaultRegistries`. Errors name entries by index and never
|
|
522
|
+
* quote them, so a URL carrying credentials does not reach a log.
|
|
523
|
+
*/
|
|
524
|
+
export const validateAppStoreCatalogRegistries = (listArg) => {
|
|
525
|
+
const entries = readDataElements(listArg, maximumRegistries);
|
|
526
|
+
if (entries === null)
|
|
527
|
+
return [`registries must be a list of at most ${maximumRegistries} URLs`];
|
|
528
|
+
const errors = [];
|
|
529
|
+
const seen = new Set();
|
|
530
|
+
entries.forEach((entryArg, indexArg) => {
|
|
531
|
+
const baseUrl = readRegistryBaseUrl(entryArg);
|
|
532
|
+
if (baseUrl === null) {
|
|
533
|
+
errors.push(`registries[${indexArg}] must be an https base URL without credentials, query or fragment`);
|
|
534
|
+
}
|
|
535
|
+
else if (seen.has(baseUrl)) {
|
|
536
|
+
errors.push(`registries[${indexArg}] names a registry listed before it`);
|
|
537
|
+
}
|
|
538
|
+
else {
|
|
539
|
+
seen.add(baseUrl);
|
|
540
|
+
}
|
|
541
|
+
});
|
|
542
|
+
return errors;
|
|
543
|
+
};
|
|
544
|
+
/**
|
|
545
|
+
* The registry base URLs a consumer asks, in order: the configured list in canonical form (no
|
|
546
|
+
* trailing slash), or `appStoreCatalogDefaultRegistries` when it is absent or empty. Throws the
|
|
547
|
+
* `validateAppStoreCatalogRegistries` errors for a list it refuses.
|
|
548
|
+
*/
|
|
549
|
+
export const resolveAppStoreCatalogRegistries = (listArg) => {
|
|
550
|
+
const errors = validateAppStoreCatalogRegistries(listArg ?? []);
|
|
551
|
+
if (errors.length > 0)
|
|
552
|
+
throw new Error(`App Store catalog registries refused: ${errors.join('; ')}`);
|
|
553
|
+
const configured = (listArg ?? []).map((entryArg) => readRegistryBaseUrl(entryArg))
|
|
554
|
+
.filter((entryArg) => entryArg !== null);
|
|
555
|
+
return configured.length > 0 ? configured : [...appStoreCatalogDefaultRegistries];
|
|
556
|
+
};
|
|
557
|
+
/**
|
|
558
|
+
* The snapshot of `appId@version` from a verified catalog, or `null` when the catalog does not list
|
|
559
|
+
* it. Withdrawn versions are listed and snapshot like any other: a host adopting an installed
|
|
560
|
+
* service records the version it runs; whether a version is an install or upgrade target is
|
|
561
|
+
* `judgeAppStoreCatalogInstallTarget`. The config is a copy the caller owns.
|
|
562
|
+
*/
|
|
563
|
+
export const createAppStoreServiceTemplateSnapshot = (catalogArg, appIdArg, versionArg) => {
|
|
564
|
+
const entry = catalogArg.apps.find((appArg) => appArg.info.id === appIdArg)
|
|
565
|
+
?.versions.find((candidateArg) => candidateArg.version === versionArg);
|
|
566
|
+
if (entry === undefined)
|
|
567
|
+
return null;
|
|
568
|
+
return {
|
|
569
|
+
appId: appIdArg,
|
|
570
|
+
version: entry.version,
|
|
571
|
+
configDigest: entry.configDigest,
|
|
572
|
+
config: structuredClone(entry.config),
|
|
573
|
+
catalogRevision: catalogArg.revision,
|
|
574
|
+
};
|
|
575
|
+
};
|
|
576
|
+
const consumerMinimumVersionKeys = Object.freeze({
|
|
577
|
+
onebox: 'minOneboxVersion',
|
|
578
|
+
cloudly: 'minCloudlyVersion',
|
|
579
|
+
});
|
|
490
580
|
/**
|
|
491
581
|
* Whether a consumer may install a listed version, or upgrade a service to it; `null` when it may.
|
|
492
|
-
* A withdrawn version
|
|
493
|
-
* and are refused here,
|
|
582
|
+
* A withdrawn version, a version requiring a feature the consumer does not fulfil and a version
|
|
583
|
+
* requiring a newer release of the consumer stay listed and are refused here, in that order, and
|
|
584
|
+
* nowhere else is a second answer needed.
|
|
585
|
+
*
|
|
586
|
+
* A host passes `consumerArg` on every call; without it the minimum release is not judged. A
|
|
587
|
+
* consumer version that is not `MAJOR.MINOR.PATCH` throws: it is the host's own constant.
|
|
494
588
|
*/
|
|
495
|
-
export const judgeAppStoreCatalogInstallTarget = (versionArg, supportedFeatureIdsArg) => {
|
|
589
|
+
export const judgeAppStoreCatalogInstallTarget = (versionArg, supportedFeatureIdsArg, consumerArg) => {
|
|
590
|
+
const consumerVersion = consumerArg === undefined ? null : parseReleaseVersion(consumerArg.version);
|
|
591
|
+
if (consumerArg !== undefined && consumerVersion === null) {
|
|
592
|
+
throw new Error('App Store catalog consumer version must be MAJOR.MINOR.PATCH');
|
|
593
|
+
}
|
|
496
594
|
if (versionArg.withdrawn !== undefined)
|
|
497
595
|
return { reason: 'versionWithdrawn', withdrawal: versionArg.withdrawn };
|
|
498
596
|
const missingFeatureIds = getAppStoreCatalogMissingFeatureIds(versionArg.config, supportedFeatureIdsArg);
|
|
499
|
-
|
|
597
|
+
if (missingFeatureIds.length > 0)
|
|
598
|
+
return { reason: 'featuresUnsupported', missingFeatureIds };
|
|
599
|
+
if (consumerArg === undefined || consumerVersion === null)
|
|
600
|
+
return null;
|
|
601
|
+
const minimumVersion = versionArg.config[consumerMinimumVersionKeys[consumerArg.kind]];
|
|
602
|
+
if (minimumVersion === undefined)
|
|
603
|
+
return null;
|
|
604
|
+
const minimum = parseReleaseVersion(minimumVersion);
|
|
605
|
+
if (minimum === null || compareReleaseVersions(consumerVersion, minimum) < 0) {
|
|
606
|
+
return {
|
|
607
|
+
reason: 'consumerVersionTooOld',
|
|
608
|
+
consumerKind: consumerArg.kind,
|
|
609
|
+
consumerVersion: consumerArg.version,
|
|
610
|
+
minimumVersion,
|
|
611
|
+
};
|
|
612
|
+
}
|
|
613
|
+
return null;
|
|
500
614
|
};
|
|
501
615
|
const sameWithdrawal = (leftArg, rightArg) => leftArg?.at === rightArg?.at && leftArg?.reason === rightArg?.reason;
|
|
502
616
|
/**
|
|
@@ -541,4 +655,4 @@ export const judgeAppStoreCatalogSuccession = (activeArg, candidateArg) => {
|
|
|
541
655
|
}
|
|
542
656
|
return { outcome: 'activate' };
|
|
543
657
|
};
|
|
544
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../ts/appstore/catalog.ts"],"names":[],"mappings":"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"}
|
|
658
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../ts/appstore/catalog.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,iCAAiC,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,4BAA4B,GAC7B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElG,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAOnE;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC;IACnD,EAAE,EAAE,6BAA6B;IACjC,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,eAAe,EAAE,QAAQ;IACzB,kBAAkB,EAAE,SAAS;IAC7B,kBAAkB,EAAE,4CAA4C;IAChE,mBAAmB,EAAE,qCAAqC;IAC1D,eAAe,EAAE,uCAAuC;IACxD,kBAAkB,EAAE,yCAAyC;IAC7D,WAAW,EAAE,IAAI;IACjB,qBAAqB,EAAE,IAAI;IAC3B,iBAAiB,EAAE,CAAC;IACpB,WAAW,EAAE,EAAE;IACf,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,GAAG;IAC7B,uBAAuB,EAAE,EAAE;CACnB,CAAC,CAAC;AAsBZ,MAAM,oBAAoB,GAAG;IAC3B,OAAO;IACP,MAAM;IACN,eAAe;IACf,aAAa;IACb,SAAS;IACT,oBAAoB;IACpB,SAAS;IACT,SAAS;IACT,gBAAgB;IAChB,iBAAiB;IACjB,gBAAgB;IAChB,sBAAsB;IACtB,cAAc;IACd,kBAAkB;IAClB,mBAAmB;IACnB,WAAW;IACX,UAAU;IACV,sBAAsB;IACtB,mBAAmB;IACnB,qBAAqB;IACrB,kBAAkB;IAClB,aAAa;CACL,CAAC;AAEX,oFAAoF;AACpF,MAAM,CAAC,MAAM,gCAAgC,GAGzC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAwLxC;;;;GAIG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,8BAAuC,CAAC;AAwB3F,MAAM,6BAA6B,GAAG,GAAG,CAAC;AAC1C,MAAM,aAAa,GAAG,oEAAoE,CAAC;AAC3F,MAAM,mBAAmB,GAAG,qCAAqC,CAAC;AAClE,MAAM,YAAY,GAAG,2BAA2B,CAAC;AACjD,MAAM,eAAe,GAAG,2BAA2B,CAAC;AACpD,MAAM,UAAU,GAAG,4BAA4B,CAAC;AAChD,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC1D,MAAM,gBAAgB,GAAG,sDAAsD,CAAC;AAChF,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AAChE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAC1C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAC3C,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;AACxD,MAAM,gCAAgC,GAAG,oCAAoC,CAAC;AAE9E,MAAM,wBAAwB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CACzE,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC,CAAC;AAElF,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAsB,EAAE,CACvD,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC,IAAI,QAAQ,IAAI,KAAK,CAAC;AAEvG,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAE,gBAAwB,EAAsB,EAAE,CACjF,OAAO,QAAQ,KAAK,QAAQ;OACzB,QAAQ,CAAC,MAAM,GAAG,CAAC;OACnB,QAAQ,CAAC,MAAM,IAAI,gBAAgB;OACnC,QAAQ,CAAC,IAAI,EAAE,KAAK,QAAQ;OAC5B,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAE7C,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAE,gBAAwB,EAAsB,EAAE,CACjF,OAAO,QAAQ,KAAK,QAAQ;OACzB,QAAQ,CAAC,MAAM,GAAG,CAAC;OACnB,QAAQ,CAAC,MAAM,IAAI,gBAAgB;OACnC,CAAC,gCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAEtD,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAsB,EAAE;IAC3D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI;QAAE,OAAO,KAAK,CAAC;IACzE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,QAAiB,EAAsB,EAAE;IACrE,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;AAC5E,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAU,EAAE;IAClE,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACvC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,wFAAwF;AACxF,MAAM,wBAAwB,GAAG,CAAC,QAAiB,EAAwB,EAAE;IAC3E,MAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,EAAE,uBAAuB,CAAC,uBAAuB,CAAC,CAAC;IAC5F,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACnC,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7E,IAAI,QAAQ,KAAK,IAAI,IAAI,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAC/E,QAAQ,GAAG,KAAK,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAAG,CACjD,SAAkB,EAClB,sBAAwC,EAC9B,EAAE;IACZ,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAAE,OAAO,EAAE,CAAC;IACrF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAClD,OAAO,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,UAAmB,EAAkC,EAAE;IAClG,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;WACrE,OAAO,QAAQ,CAAC,EAAE,KAAK,QAAQ;WAC/B,CAAC,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5F,OAAO;YACL,MAAM,EAAE,eAAe;YACvB,OAAO,EAAE,kFAAkF;SAC5F,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,uBAAuB,CAAC,EAAE,IAAI,uBAAuB,CAAC,KAAK,IAAI,uBAAuB,CAAC,KAAK,EAAE,CAAC;IACpH,IAAI,QAAQ,CAAC,EAAE,KAAK,uBAAuB,CAAC,EAAE;WACzC,QAAQ,CAAC,KAAK,KAAK,uBAAuB,CAAC,KAAK;WAChD,QAAQ,CAAC,KAAK,GAAG,uBAAuB,CAAC,KAAK,EAAE,CAAC;QACpD,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,oBAAoB,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,4CAA4C,SAAS,GAAG;SACrI,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,QAAiB,EAAE,QAAgB,EAAE,SAAmB,EAAQ,EAAE;IAC7F,MAAM,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACjD,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC;QAC/F,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,4DAA4D,CAAC,CAAC;QACxF,OAAO;IACT,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS;WAC7B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC5E,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,wCAAwC,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,6BAA6B,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,WAAW,CAAC,cAAc,KAAK,SAAS;WACvC,CAAC,CAAC,wBAAwB,CAAC,WAAW,CAAC,cAAc,CAAC;eACpD,WAAW,CAAC,cAAc,IAAI,GAAG,IAAI,WAAW,CAAC,cAAc,IAAI,GAAG,CAAC,EAAE,CAAC;QAC/E,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,6CAA6C,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,4BAA4B,GAAG,CACnC,SAAkC,EAClC,QAAgB,EAChB,SAAmB,EACb,EAAE;IACR,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,gCAAgC,CAAC,EAAE,CAAC;QAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;aACnC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC;QACjG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAC/B,CAAC,CAAC,GAAG,QAAQ,yBAAyB,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjE,CAAC,CAAC,GAAG,QAAQ,oBAAoB,CAAC,CAAC;QACrC,OAAO;IACT,CAAC;IACD,IAAI,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ,IAAI,iCAAiC,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;QAC5G,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,kEAAkE,CAAC,CAAC;IAChG,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAU,EAAE,CAAC;QACrE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACrF,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,GAAG,4BAA4B,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QAC7E,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,iCAAiC,CAAC,CAAC;IAC/D,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,qBAAqB,CAAU,EAAE,CAAC;QAC5G,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACxE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,GAAG,oBAAoB,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACxC,mBAAmB,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,QAAQ,cAAc,EAAE,SAAS,CAAC,CAAC;IACnF,CAAC;IACD,SAAS,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,QAAiB,EAAE,QAAgB,EAAE,SAAmB,EAAiB,EAAE;IAClG,MAAM,IAAI,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,IAAI;WACZ,CAAC,YAAY,CACd,IAAI,EACJ,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,CAAC,EACzC,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CACvD,EAAE,CAAC;QACJ,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,+GAA+G,CAAC,CAAC;QAC3I,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,EAAE,GAAG,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACtF,IAAI,EAAE,KAAK,IAAI;QAAE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,iCAAiC,CAAC,CAAC;IAC9E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;QAAE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,6BAA6B,CAAC,CAAC;IACtF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;QAAE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,mCAAmC,CAAC,CAAC;IACpG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QAAE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,iCAAiC,CAAC,CAAC;IAC7F,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/G,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,0CAA0C,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,+BAA+B,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC;QACnE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,mCAAmC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;QAC9E,IAAI,IAAI,KAAK,IAAI;eACZ,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;eAC7E,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YACxC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,wDAAwD,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,IAAI;eACb,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,uBAAuB,CAAC,YAAY;eAChE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACvH,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,4CAA4C,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,QAAiB,EACjB,QAAgB,EAChB,cAA6B,EAC7B,SAAmB,EACb,EAAE;IACR,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;QACvE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,iCAAiC,CAAC,CAAC;QAC7D,OAAO;IACT,CAAC;IACD,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;QACzC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,uCAAuC,CAAC,CAAC;IACrE,CAAC;SAAM,IAAI,cAAc,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAC7F,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,gDAAgD,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,6BAA6B,CAAC,EAAE,CAAC;QAC9D,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,+BAA+B,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,QAAiB,EACjB,QAAgB,EAChB,sBAA2C,EAC3C,cAA6B,EAC7B,SAAmB,EACJ,EAAE;IACjB,MAAM,GAAG,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;QACnG,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,kFAAkF,CAAC,CAAC;QAC9G,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,QAAQ,OAAO,EAAE,SAAS,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,GAAG,CAAC,eAAe,IAAI,QAAQ,CAAC;IACjD,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACnD,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,2CAA2C,CAAC,CAAC;QACvE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,cAAc,GAAG,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC;IACnF,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,qBAAqB,CAAC,CAAC;IAC9F,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,6CAA6C,CAAC,CAAC;QACzE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QACrC,MAAM,YAAY,GAAG,GAAG,QAAQ,aAAa,QAAQ,GAAG,CAAC;QACzD,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YACjG,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,4EAA4E,CAAC,CAAC;YAC5G,OAAO;QACT,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7E,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,oBAAoB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACvH,CAAC;aAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,aAAa,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7B,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;gBAAE,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClC,kBAAkB,CAAC,KAAK,CAAC,SAAS,EAAE,GAAG,YAAY,YAAY,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YAClF,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,iDAAiD,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,2BAA2B,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAChG,SAAS,CAAC,IAAI,CAAC,GAAG,YAAY,4EAA4E,CAAC,CAAC;YAC5G,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAC/D,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC7F,CAAC,CAAC,EAAE,CAAC;QACP,0FAA0F;QAC1F,qFAAqF;QACrF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,4BAA4B,CAAC,MAAM,EAAE,GAAG,YAAY,SAAS,EAAE,SAAS,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IACH,4FAA4F;IAC5F,gCAAgC;IAChC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9F,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrF,MAAM,aAAa,GAAG,OAAO,GAAG,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IACvF,IAAI,aAAa,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAChE,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,2CAA2C,CAAC,CAAC;IACzE,CAAC;SAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,iFAAiF,CAAC,CAAC;IAC/G,CAAC;SAAM,IAAI,QAAQ,KAAK,QAAQ;WAC3B,gBAAgB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACzF,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,yEAAyE,CAAC,CAAC;IACvG,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,UAAmB,EACnB,UAA6C,EACnC,EAAE;IACZ,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,OAAO,KAAK,IAAI;WACf,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QAC/F,OAAO,CAAC,mFAAmF,CAAC,CAAC;IAC/F,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,eAAe,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAI,eAAe,KAAK,IAAI;QAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACnE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;QACxE,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACtG,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;IAC3E,CAAC;IACD,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACjF,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;IACpE,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;QAChC,MAAM,EAAE,GAAG,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,QAAQ,GAAG,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC7G,IAAI,EAAE,KAAK,IAAI;YAAE,OAAO;QACxB,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,QAAQ,cAAc,EAAE,mBAAmB,CAAC,CAAC;;YAC1F,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,6FAA6F;AAC7F,MAAM,CAAC,MAAM,oCAAoC,GAAG,CAAC,WAAoB,EAAY,EAAE;IACrF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;QAC7F,OAAO,CAAC,iEAAiE,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,IAAI;QAAE,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IACrG,IAAI,OAAO,QAAQ,CAAC,aAAa,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC1F,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;IACpG,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,sCAAsC,uBAAuB,CAAC,iBAAiB,aAAa,CAAC,CAAC;QAC1G,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,UAAU,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE;QAC5C,MAAM,SAAS,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;QACnD,IAAI,SAAS,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;eACrE,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;eACvE,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5F,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,mEAAmE,CAAC,CAAC;YAChH,OAAO;QACT,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,yBAAyB,CAAC,CAAC;;YACvG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,oFAAoF;AACpF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAC7C,WAAoB,EACpB,UAA6C,EACnC,EAAE;IACZ,MAAM,WAAW,GAAG,oCAAoC,CAAC,WAAW,CAAC,CAAC;IACtE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,WAAW,CAAC;IAC/C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACjD,OAAO,QAAQ,KAAK,IAAI;QACtB,CAAC,CAAC,CAAC,4BAA4B,CAAC;QAChC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,iEAAiE;AACjE,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,WAAoB,EACpB,UAA6C,EACJ,EAAE,CAAC,+BAA+B,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAEpH,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAS,EAAE;IACnD,MAAM,IAAI,KAAK,CAAC,4CAA4C,SAAS,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,mBAAmB,GAAG,KAAK,EAAE,QAAiC,EAA0B,EAAE;IAC9F,MAAM,GAAG,GAAG,MAAM,4BAA4B,CAC5C,sBAAsB,CAAC,QAAQ,EAAE,eAAe,CAAC,EACjD,eAAe,CAChB,CAAC;IACF,OAAO,UAAU,GAAG,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF,oEAAoE;AACpE,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,SAAkB,EAA0B,EAAE,CAC/F,mBAAmB,CAAC,EAAE,MAAM,EAAE,uBAAuB,CAAC,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AAEjG,yDAAyD;AACzD,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,UAAmB,EAA0B,EAAE,CAC1F,mBAAmB,CAAC,EAAE,MAAM,EAAE,uBAAuB,CAAC,mBAAmB,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;AAEpG,yEAAyE;AACzE,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,YAAoB,EAA0B,EAAE;IACvG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,mBAAmB,CAAC,EAAE,MAAM,EAAE,uBAAuB,CAAC,kBAAkB,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;AAC9G,CAAC,CAAC;AAEF,kDAAkD;AAClD,MAAM,CAAC,MAAM,qCAAqC,GAAG,CAAC,gBAA+B,EAAc,EAAE;IACnG,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,sBAAsB,CACpD,EAAE,MAAM,EAAE,uBAAuB,CAAC,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,EACpF,eAAe,CAChB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,uCAAuC,GAAG,KAAK,EAC1D,UAA4B,EACJ,EAAE;IAC1B,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QAClC,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACnC,IAAI,MAAM,kCAAkC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;gBACtF,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,OAAO,yCAAyC,CAAC;YACpF,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,gFAAgF;AAChF,MAAM,CAAC,MAAM,gCAAgC,GAAsB,MAAM,CAAC,MAAM,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAEjH,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAEtC,gGAAgG;AAChG,MAAM,mBAAmB,GAAG,CAAC,QAAiB,EAAiB,EAAE;IAC/D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,wBAAwB;QAAE,OAAO,IAAI,CAAC;IAC5F,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE;WAC3F,GAAG,CAAC,IAAI,KAAK,EAAE,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,OAAgB,EAAY,EAAE;IAC9E,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAC7D,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,CAAC,wCAAwC,iBAAiB,OAAO,CAAC,CAAC;IAChG,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,oEAAoE,CAAC,CAAC;QAC1G,CAAC;aAAM,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,qCAAqC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,OAAsC,EAAY,EAAE;IACnG,MAAM,MAAM,GAAG,iCAAiC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAChE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrG,MAAM,UAAU,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;SAChF,MAAM,CAAC,CAAC,QAAQ,EAAsB,EAAE,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;IAC/D,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,gCAAgC,CAAC,CAAC;AACpF,CAAC,CAAC;AAoBF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CACnD,UAA4B,EAC5B,QAAgB,EAChB,UAAkB,EACuB,EAAE;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,QAAQ,CAAC;QACzE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC;IACzE,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO;QACL,KAAK,EAAE,QAAQ;QACf,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC;QACrC,eAAe,EAAE,UAAU,CAAC,QAAQ;KACrC,CAAC;AACJ,CAAC,CAAC;AAYF,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,MAAM,EAAE,kBAAkB;IAC1B,OAAO,EAAE,mBAAmB;CACpB,CAAC,CAAC;AAcZ;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,UAAmC,EACnC,sBAAwC,EACxC,WAAsC,EACO,EAAE;IAC/C,MAAM,eAAe,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpG,IAAI,WAAW,KAAK,SAAS,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,UAAU,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC,SAAS,EAAE,CAAC;IAChH,MAAM,iBAAiB,GAAG,mCAAmC,CAAC,UAAU,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACzG,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,CAAC;IAC9F,IAAI,WAAW,KAAK,SAAS,IAAI,eAAe,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACvE,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,0BAA0B,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACvF,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC9C,MAAM,OAAO,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACpD,IAAI,OAAO,KAAK,IAAI,IAAI,sBAAsB,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7E,OAAO;YACL,MAAM,EAAE,uBAAuB;YAC/B,YAAY,EAAE,WAAW,CAAC,IAAI;YAC9B,eAAe,EAAE,WAAW,CAAC,OAAO;YACpC,cAAc;SACf,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAOF,MAAM,cAAc,GAAG,CACrB,OAA+C,EAC/C,QAAgD,EACvC,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,QAAQ,EAAE,EAAE,IAAI,OAAO,EAAE,MAAM,KAAK,QAAQ,EAAE,MAAM,CAAC;AAEnF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,SAA0C,EAC1C,YAAsC,EACV,EAAE;IAC9B,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACvD,IAAI,SAAS,CAAC,aAAa,KAAK,YAAY,CAAC,aAAa;QAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAC5F,MAAM,MAAM,GAAG,CAAC,SAAwC,EAAE,UAAkB,EAA8B,EAAE,CAC1G,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAChF,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,IAAI,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChE,OAAO,MAAM,CACX,mBAAmB,EACnB,oBAAoB,YAAY,CAAC,OAAO,CAAC,QAAQ,wCAAwC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CACtH,CAAC;IACJ,CAAC;IACD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAmC,CAAC;IACrE,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5C,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,QAAQ;YAAE,iBAAiB,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1G,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACzC,KAAK,MAAM,SAAS,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YAClD,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC,yBAAyB,EAAE,GAAG,GAAG,wCAAwC,CAAC,CAAC;YAC3F,CAAC;YACD,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,CAAC,YAAY,EAAE,CAAC;gBACtD,OAAO,MAAM,CACX,yBAAyB,EACzB,GAAG,GAAG,uBAAuB,SAAS,CAAC,YAAY,oBAAoB,SAAS,CAAC,YAAY,EAAE,CAChG,CAAC;YACJ,CAAC;YACD,IAAI,SAAS,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;gBACnG,OAAO,MAAM,CACX,4BAA4B,EAC5B,SAAS,CAAC,SAAS,KAAK,SAAS;oBAC/B,CAAC,CAAC,GAAG,GAAG,0CAA0C;oBAClD,CAAC,CAAC,GAAG,GAAG,qBAAqB,SAAS,CAAC,SAAS,CAAC,EAAE,oCAAoC,CAC1F,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACjC,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { type TSecretDelivery, type TSecretGeneratedEncoding, type IActiveSecret
|
|
|
2
2
|
import { type IHostedAppRoleDefinition } from '../data/hostedapp.js';
|
|
3
3
|
import type { IServiceDomainRoute, IServicePublicPortMapping, IServiceTargetPort } from '../data/serviceports.js';
|
|
4
4
|
import type { IStorageCapacityRequest, IStorageClassRequirement, TFilesystemStorageAccessMode, TObjectStorageAccessMode, TObjectStorageDelivery, TStorageReclaimPolicy, TStorageResourceKind, TStorageSnapshotMode } from '../platform/storage.js';
|
|
5
|
+
import type { TAppStoreCatalogInstallTargetRefusal } from './catalog.js';
|
|
5
6
|
export type TAppStorePlatformRequirement = 'mongodb' | 's3' | 'clickhouse' | 'valkey' | 'mariadb' | 'mail';
|
|
6
7
|
export interface IAppStorePlatformRequirements {
|
|
7
8
|
mongodb?: boolean;
|
|
@@ -24,10 +25,10 @@ export type TAppStoreSourceType = 'inline' | 'repoManifest' | 'dockerImage';
|
|
|
24
25
|
export type TAppStoreTrackingMode = 'tag' | 'digest';
|
|
25
26
|
export type TAppStoreUpgradeStrategy = 'semver' | 'branch' | 'dockerDigest';
|
|
26
27
|
export declare const appStoreStorageFeatureIds: {
|
|
27
|
-
readonly bindings:
|
|
28
|
-
readonly filesystem:
|
|
29
|
-
readonly objectStorage:
|
|
30
|
-
readonly objectStorageFile:
|
|
28
|
+
readonly bindings: 'storage.bindings';
|
|
29
|
+
readonly filesystem: 'storage.filesystem';
|
|
30
|
+
readonly objectStorage: 'storage.object-storage';
|
|
31
|
+
readonly objectStorageFile: 'storage.object-storage.file';
|
|
31
32
|
};
|
|
32
33
|
export type TAppStoreStorageFeatureId = typeof appStoreStorageFeatureIds[keyof typeof appStoreStorageFeatureIds];
|
|
33
34
|
export type TAppStoreStoragePurpose = 'runtime' | 'database' | 'registry' | 'backup';
|
|
@@ -164,6 +165,17 @@ export interface IAppStorePlatformOidcCapability {
|
|
|
164
165
|
}
|
|
165
166
|
export declare const validateAppStorePlatformOidcCapability: (capabilityArg: unknown) => string[];
|
|
166
167
|
export declare const validateAppStoreVersionPlatformOidc: (configArg: unknown) => string[];
|
|
168
|
+
/** One listed version of an app as a host shows it: an install target, or why it is not one. */
|
|
169
|
+
export interface IAppStoreAppVersionState {
|
|
170
|
+
version: string;
|
|
171
|
+
/**
|
|
172
|
+
* `null` when the host may install the version or upgrade a service to it; otherwise
|
|
173
|
+
* `versionWithdrawn` with the withdrawal, `featuresUnsupported` with the feature ids the host
|
|
174
|
+
* does not fulfil or `consumerVersionTooOld` with the host release the version requires, as
|
|
175
|
+
* `judgeAppStoreCatalogInstallTarget` answers it.
|
|
176
|
+
*/
|
|
177
|
+
installRefusal: TAppStoreCatalogInstallTargetRefusal | null;
|
|
178
|
+
}
|
|
167
179
|
export interface IAppStoreApp {
|
|
168
180
|
id: string;
|
|
169
181
|
name: string;
|
|
@@ -173,6 +185,12 @@ export interface IAppStoreApp {
|
|
|
173
185
|
iconUrl?: string;
|
|
174
186
|
latestVersion: string;
|
|
175
187
|
versions?: string[];
|
|
188
|
+
/**
|
|
189
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
190
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
191
|
+
* reads this member to show the others and why they are not offered.
|
|
192
|
+
*/
|
|
193
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
176
194
|
tags?: string[];
|
|
177
195
|
channel?: string;
|
|
178
196
|
upgradeStrategy?: TAppStoreUpgradeStrategy;
|
|
@@ -194,6 +212,12 @@ export interface IAppStoreAppMeta {
|
|
|
194
212
|
iconName?: string;
|
|
195
213
|
latestVersion: string;
|
|
196
214
|
versions: string[];
|
|
215
|
+
/**
|
|
216
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
217
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
218
|
+
* reads this member to show the others and why they are not offered.
|
|
219
|
+
*/
|
|
220
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
197
221
|
maintainer?: string;
|
|
198
222
|
links?: Record<string, string>;
|
|
199
223
|
tags?: string[];
|