@serve.zone/interfaces 32.48.0 → 32.49.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 +47 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/appstore/catalog.d.ts +300 -0
- package/dist_ts/appstore/catalog.js +544 -0
- package/dist_ts/appstore/index.d.ts +2 -0
- package/dist_ts/appstore/index.js +3 -1
- package/dist_ts/appstore/types.d.ts +9 -0
- package/dist_ts/appstore/types.js +1 -1
- package/dist_ts/appstore/versionconfig.d.ts +21 -0
- package/dist_ts/appstore/versionconfig.js +685 -0
- package/dist_ts/private/keylist.d.ts +5 -0
- package/dist_ts/private/keylist.js +2 -0
- package/dist_ts/requests/appstore.d.ts +30 -1
- package/dist_ts/runtime.appstorecatalog.d.ts +46 -0
- package/dist_ts/runtime.appstorecatalog.js +142 -0
- package/dist_ts/runtime.d.ts +1 -0
- package/dist_ts/runtime.js +2 -1
- package/package.json +1 -1
- package/readme.md +57 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/appstore/catalog.ts +851 -0
- package/ts/appstore/index.ts +2 -0
- package/ts/appstore/types.ts +9 -0
- package/ts/appstore/versionconfig.ts +803 -0
- package/ts/private/keylist.ts +6 -0
- package/ts/requests/appstore.ts +38 -0
- package/ts/runtime.appstorecatalog.ts +195 -0
- package/ts/runtime.ts +1 -0
|
@@ -0,0 +1,544 @@
|
|
|
1
|
+
import { getDigestFromPinnedImageReference, isSha256Digest } from '../data/immutableimage.js';
|
|
2
|
+
import { canonicalizeStrictJson, compareWireTokens, createCanonicalJsonSha256Hex, } from '../private/canonicaljson.js';
|
|
3
|
+
import { hasExactKeys, readDataElements, readDataProperties } from '../private/dataproperties.js';
|
|
4
|
+
import { validateAppStoreVersionConfig } from './versionconfig.js';
|
|
5
|
+
/**
|
|
6
|
+
* The contract identity, digest domains and bounds every catalog producer and consumer shares.
|
|
7
|
+
*
|
|
8
|
+
* `major` changes when a catalog written against it cannot be read by a consumer of the previous
|
|
9
|
+
* major. `minor` changes when catalog-level structure is added; a consumer reads every catalog of
|
|
10
|
+
* its own major whose minor is not newer than its own, and refuses the rest as
|
|
11
|
+
* `contractUnsupported`. New version-config capabilities do not need a minor: they are gated per
|
|
12
|
+
* version through `requiresFeatures` (see `IAppStoreVersionConfig.requiresFeatures`).
|
|
13
|
+
*/
|
|
14
|
+
export const appStoreCatalogContract = Object.freeze({
|
|
15
|
+
id: 'serve.zone/appstore-catalog',
|
|
16
|
+
major: 1,
|
|
17
|
+
minor: 0,
|
|
18
|
+
digestAlgorithm: 'sha256',
|
|
19
|
+
signatureAlgorithm: 'ed25519',
|
|
20
|
+
configDigestDomain: 'serve.zone/appstore-catalog/version-config',
|
|
21
|
+
catalogDigestDomain: 'serve.zone/appstore-catalog/catalog',
|
|
22
|
+
signatureDomain: 'serve.zone/appstore-catalog/signature',
|
|
23
|
+
signingKeyIdDomain: 'serve.zone/appstore-catalog/signing-key',
|
|
24
|
+
maximumApps: 1024,
|
|
25
|
+
maximumVersionsPerApp: 1024,
|
|
26
|
+
maximumSignatures: 8,
|
|
27
|
+
maximumTags: 32,
|
|
28
|
+
maximumLinks: 32,
|
|
29
|
+
maximumConfigListEntries: 256,
|
|
30
|
+
maximumRequiredFeatures: 64,
|
|
31
|
+
});
|
|
32
|
+
const versionConfigKeyList = [
|
|
33
|
+
'image',
|
|
34
|
+
'port',
|
|
35
|
+
'containerArgs',
|
|
36
|
+
'targetPorts',
|
|
37
|
+
'domains',
|
|
38
|
+
'publicPortMappings',
|
|
39
|
+
'envVars',
|
|
40
|
+
'volumes',
|
|
41
|
+
'storageClasses',
|
|
42
|
+
'storageRequests',
|
|
43
|
+
'publishedPorts',
|
|
44
|
+
'platformRequirements',
|
|
45
|
+
'platformOidc',
|
|
46
|
+
'minOneboxVersion',
|
|
47
|
+
'minCloudlyVersion',
|
|
48
|
+
'changelog',
|
|
49
|
+
'breaking',
|
|
50
|
+
'requiresManualReview',
|
|
51
|
+
'migrationRequired',
|
|
52
|
+
'backupBeforeUpgrade',
|
|
53
|
+
'requiresFeatures',
|
|
54
|
+
'healthCheck',
|
|
55
|
+
];
|
|
56
|
+
/** Every member a catalog version config may carry; any other member is refused. */
|
|
57
|
+
export const appStoreCatalogVersionConfigKeys = Object.freeze(versionConfigKeyList);
|
|
58
|
+
const withdrawalReasonMaximumLength = 512;
|
|
59
|
+
const semverPattern = /^(0|[1-9][0-9]{0,14})\.(0|[1-9][0-9]{0,14})\.(0|[1-9][0-9]{0,14})$/;
|
|
60
|
+
const versionTokenPattern = /^[A-Za-z0-9][A-Za-z0-9._+-]{0,127}$/;
|
|
61
|
+
const appIdPattern = /^[a-z0-9][a-z0-9-]{0,62}$/;
|
|
62
|
+
const iconNamePattern = /^[a-z0-9][a-z0-9-]{0,63}$/;
|
|
63
|
+
const tagPattern = /^[a-z0-9][a-z0-9.-]{0,63}$/;
|
|
64
|
+
const linkLabelPattern = /^[A-Za-z][A-Za-z0-9 _-]{0,63}$/;
|
|
65
|
+
const featureIdPattern = /^(?=.{1,128}$)[a-z][a-z0-9-]*(?:\.[a-z][a-z0-9-]*)*$/;
|
|
66
|
+
const sourceRevisionPattern = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
|
|
67
|
+
const publicKeyPattern = /^[0-9a-f]{64}$/;
|
|
68
|
+
const signaturePattern = /^[0-9a-f]{128}$/;
|
|
69
|
+
const controlCharacterPattern = /[\u0000-\u001f\u007f]/;
|
|
70
|
+
const multilineControlCharacterPattern = /[\u0000-\u0008\u000b-\u001f\u007f]/;
|
|
71
|
+
const isNonNegativeSafeInteger = (valueArg) => typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg >= 0;
|
|
72
|
+
const isPort = (valueArg) => typeof valueArg === 'number' && Number.isSafeInteger(valueArg) && valueArg >= 1 && valueArg <= 65535;
|
|
73
|
+
const isLine = (valueArg, maximumLengthArg) => typeof valueArg === 'string'
|
|
74
|
+
&& valueArg.length > 0
|
|
75
|
+
&& valueArg.length <= maximumLengthArg
|
|
76
|
+
&& valueArg.trim() === valueArg
|
|
77
|
+
&& !controlCharacterPattern.test(valueArg);
|
|
78
|
+
const isText = (valueArg, maximumLengthArg) => typeof valueArg === 'string'
|
|
79
|
+
&& valueArg.length > 0
|
|
80
|
+
&& valueArg.length <= maximumLengthArg
|
|
81
|
+
&& !multilineControlCharacterPattern.test(valueArg);
|
|
82
|
+
const isHttpsUrl = (valueArg) => {
|
|
83
|
+
if (typeof valueArg !== 'string' || valueArg.length > 2048)
|
|
84
|
+
return false;
|
|
85
|
+
try {
|
|
86
|
+
const url = new URL(valueArg);
|
|
87
|
+
return url.protocol === 'https:' && url.username === '' && url.password === '';
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
const isCanonicalTimestamp = (valueArg) => {
|
|
94
|
+
if (typeof valueArg !== 'string')
|
|
95
|
+
return false;
|
|
96
|
+
const time = Date.parse(valueArg);
|
|
97
|
+
return Number.isFinite(time) && new Date(time).toISOString() === valueArg;
|
|
98
|
+
};
|
|
99
|
+
const compareSemver = (leftArg, rightArg) => {
|
|
100
|
+
const left = leftArg.split('.').map(Number);
|
|
101
|
+
const right = rightArg.split('.').map(Number);
|
|
102
|
+
for (let index = 0; index < 3; index++) {
|
|
103
|
+
if (left[index] !== right[index])
|
|
104
|
+
return left[index] < right[index] ? -1 : 1;
|
|
105
|
+
}
|
|
106
|
+
return 0;
|
|
107
|
+
};
|
|
108
|
+
/** True when a value is a canonical feature-id list: valid ids, strictly increasing. */
|
|
109
|
+
const isCanonicalFeatureIdList = (valueArg) => {
|
|
110
|
+
const entries = readDataElements(valueArg, appStoreCatalogContract.maximumRequiredFeatures);
|
|
111
|
+
if (entries === null)
|
|
112
|
+
return false;
|
|
113
|
+
let previous = null;
|
|
114
|
+
for (const entry of entries) {
|
|
115
|
+
if (typeof entry !== 'string' || !featureIdPattern.test(entry))
|
|
116
|
+
return false;
|
|
117
|
+
if (previous !== null && compareWireTokens(previous, entry) >= 0)
|
|
118
|
+
return false;
|
|
119
|
+
previous = entry;
|
|
120
|
+
}
|
|
121
|
+
return true;
|
|
122
|
+
};
|
|
123
|
+
/**
|
|
124
|
+
* The feature ids a version config requires that the consumer does not fulfil.
|
|
125
|
+
*
|
|
126
|
+
* Empty when the version is installable by this consumer. A malformed `requiresFeatures` is a
|
|
127
|
+
* schema error that `validateAppStoreCatalog` reports; here it yields no missing ids.
|
|
128
|
+
*/
|
|
129
|
+
export const getAppStoreCatalogMissingFeatureIds = (configArg, supportedFeatureIdsArg) => {
|
|
130
|
+
const config = readDataProperties(configArg);
|
|
131
|
+
if (config === null || !isCanonicalFeatureIdList(config.requiresFeatures))
|
|
132
|
+
return [];
|
|
133
|
+
const supported = new Set(supportedFeatureIdsArg);
|
|
134
|
+
return config.requiresFeatures.filter((featureIdArg) => !supported.has(featureIdArg));
|
|
135
|
+
};
|
|
136
|
+
/**
|
|
137
|
+
* Whether a catalog is written against a contract this consumer reads.
|
|
138
|
+
*
|
|
139
|
+
* `null` when it is. A malformed or absent `contract` member is `schemaInvalid`; a well-formed
|
|
140
|
+
* identity naming another id, another major or a newer minor is `contractUnsupported`.
|
|
141
|
+
*/
|
|
142
|
+
export const judgeAppStoreCatalogContract = (catalogArg) => {
|
|
143
|
+
const catalog = readDataProperties(catalogArg);
|
|
144
|
+
const identity = catalog === null ? null : readDataProperties(catalog.contract);
|
|
145
|
+
if (identity === null || !hasExactKeys(identity, ['id', 'major', 'minor'])
|
|
146
|
+
|| typeof identity.id !== 'string'
|
|
147
|
+
|| !isNonNegativeSafeInteger(identity.major) || !isNonNegativeSafeInteger(identity.minor)) {
|
|
148
|
+
return {
|
|
149
|
+
reason: 'schemaInvalid',
|
|
150
|
+
message: 'catalog.contract must be exactly { id, major, minor } with non-negative integers',
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
const supported = `${appStoreCatalogContract.id} ${appStoreCatalogContract.major}.${appStoreCatalogContract.minor}`;
|
|
154
|
+
if (identity.id !== appStoreCatalogContract.id
|
|
155
|
+
|| identity.major !== appStoreCatalogContract.major
|
|
156
|
+
|| identity.minor > appStoreCatalogContract.minor) {
|
|
157
|
+
return {
|
|
158
|
+
reason: 'contractUnsupported',
|
|
159
|
+
message: `catalog contract ${identity.id} ${identity.major}.${identity.minor} is not readable by this consumer (reads ${supported})`,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
return null;
|
|
163
|
+
};
|
|
164
|
+
const validateHealthCheck = (valueArg, labelArg, errorsArg) => {
|
|
165
|
+
const healthCheck = readDataProperties(valueArg);
|
|
166
|
+
if (healthCheck === null || !hasExactKeys(healthCheck, [], ['path', 'port', 'expectedStatus'])) {
|
|
167
|
+
errorsArg.push(`${labelArg} must be an object with only path, port and expectedStatus`);
|
|
168
|
+
return;
|
|
169
|
+
}
|
|
170
|
+
if (healthCheck.path !== undefined
|
|
171
|
+
&& (!isLine(healthCheck.path, 2048) || !healthCheck.path.startsWith('/'))) {
|
|
172
|
+
errorsArg.push(`${labelArg}.path must be an absolute request path`);
|
|
173
|
+
}
|
|
174
|
+
if (healthCheck.port !== undefined && !isPort(healthCheck.port)) {
|
|
175
|
+
errorsArg.push(`${labelArg}.port must be a port number`);
|
|
176
|
+
}
|
|
177
|
+
if (healthCheck.expectedStatus !== undefined
|
|
178
|
+
&& !(isNonNegativeSafeInteger(healthCheck.expectedStatus)
|
|
179
|
+
&& healthCheck.expectedStatus >= 100 && healthCheck.expectedStatus <= 599)) {
|
|
180
|
+
errorsArg.push(`${labelArg}.expectedStatus must be an HTTP status code`);
|
|
181
|
+
}
|
|
182
|
+
};
|
|
183
|
+
/**
|
|
184
|
+
* The contract's judgement of one version config: the catalog member set, image pinning, the
|
|
185
|
+
* gates and upgrade flags, and every member rule `validateAppStoreVersionConfig` applies.
|
|
186
|
+
*/
|
|
187
|
+
const validateCatalogVersionConfig = (configArg, labelArg, errorsArg) => {
|
|
188
|
+
if (!hasExactKeys(configArg, ['image'], appStoreCatalogVersionConfigKeys)) {
|
|
189
|
+
const unknown = Object.keys(configArg)
|
|
190
|
+
.filter((keyArg) => !appStoreCatalogVersionConfigKeys.some((knownArg) => knownArg === keyArg));
|
|
191
|
+
errorsArg.push(unknown.length > 0
|
|
192
|
+
? `${labelArg} has unknown field(s) ${unknown.sort().join(', ')}`
|
|
193
|
+
: `${labelArg}.image is required`);
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
if (typeof configArg.image !== 'string' || getDigestFromPinnedImageReference(configArg.image) === undefined) {
|
|
197
|
+
errorsArg.push(`${labelArg}.image must be a digest-pinned image reference (name@sha256:...)`);
|
|
198
|
+
}
|
|
199
|
+
for (const key of ['minOneboxVersion', 'minCloudlyVersion']) {
|
|
200
|
+
const value = configArg[key];
|
|
201
|
+
if (value !== undefined && (typeof value !== 'string' || !semverPattern.test(value))) {
|
|
202
|
+
errorsArg.push(`${labelArg}.${key} must be MAJOR.MINOR.PATCH`);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
if (configArg.changelog !== undefined && !isText(configArg.changelog, 65536)) {
|
|
206
|
+
errorsArg.push(`${labelArg}.changelog must be bounded text`);
|
|
207
|
+
}
|
|
208
|
+
for (const key of ['breaking', 'requiresManualReview', 'migrationRequired', 'backupBeforeUpgrade']) {
|
|
209
|
+
if (configArg[key] !== undefined && typeof configArg[key] !== 'boolean') {
|
|
210
|
+
errorsArg.push(`${labelArg}.${key} must be a boolean`);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
if (configArg.healthCheck !== undefined) {
|
|
214
|
+
validateHealthCheck(configArg.healthCheck, `${labelArg}.healthCheck`, errorsArg);
|
|
215
|
+
}
|
|
216
|
+
errorsArg.push(...validateAppStoreVersionConfig(configArg, labelArg));
|
|
217
|
+
};
|
|
218
|
+
const validateAppInfo = (valueArg, labelArg, errorsArg) => {
|
|
219
|
+
const info = readDataProperties(valueArg);
|
|
220
|
+
if (info === null
|
|
221
|
+
|| !hasExactKeys(info, ['id', 'name', 'description', 'category'], ['iconName', 'iconUrl', 'tags', 'maintainer', 'links'])) {
|
|
222
|
+
errorsArg.push(`${labelArg} must be exactly { id, name, description, category } plus optional iconName, iconUrl, tags, maintainer, links`);
|
|
223
|
+
return null;
|
|
224
|
+
}
|
|
225
|
+
const id = typeof info.id === 'string' && appIdPattern.test(info.id) ? info.id : null;
|
|
226
|
+
if (id === null)
|
|
227
|
+
errorsArg.push(`${labelArg}.id must be a lower-case app id`);
|
|
228
|
+
if (!isLine(info.name, 128))
|
|
229
|
+
errorsArg.push(`${labelArg}.name must be a single line`);
|
|
230
|
+
if (!isText(info.description, 4096))
|
|
231
|
+
errorsArg.push(`${labelArg}.description must be bounded text`);
|
|
232
|
+
if (!isLine(info.category, 64))
|
|
233
|
+
errorsArg.push(`${labelArg}.category must be a single line`);
|
|
234
|
+
if (info.iconName !== undefined && !(typeof info.iconName === 'string' && iconNamePattern.test(info.iconName))) {
|
|
235
|
+
errorsArg.push(`${labelArg}.iconName must be a lower-case icon name`);
|
|
236
|
+
}
|
|
237
|
+
if (info.iconUrl !== undefined && !isHttpsUrl(info.iconUrl)) {
|
|
238
|
+
errorsArg.push(`${labelArg}.iconUrl must be an https URL`);
|
|
239
|
+
}
|
|
240
|
+
if (info.maintainer !== undefined && !isLine(info.maintainer, 128)) {
|
|
241
|
+
errorsArg.push(`${labelArg}.maintainer must be a single line`);
|
|
242
|
+
}
|
|
243
|
+
if (info.tags !== undefined) {
|
|
244
|
+
const tags = readDataElements(info.tags, appStoreCatalogContract.maximumTags);
|
|
245
|
+
if (tags === null
|
|
246
|
+
|| tags.some((tagArg) => typeof tagArg !== 'string' || !tagPattern.test(tagArg))
|
|
247
|
+
|| new Set(tags).size !== tags.length) {
|
|
248
|
+
errorsArg.push(`${labelArg}.tags must be a bounded list of unique lower-case tags`);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
if (info.links !== undefined) {
|
|
252
|
+
const links = readDataProperties(info.links);
|
|
253
|
+
if (links === null
|
|
254
|
+
|| Object.keys(links).length > appStoreCatalogContract.maximumLinks
|
|
255
|
+
|| Object.entries(links).some(([labelKeyArg, urlArg]) => !linkLabelPattern.test(labelKeyArg) || !isHttpsUrl(urlArg))) {
|
|
256
|
+
errorsArg.push(`${labelArg}.links must map short labels to https URLs`);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
return id;
|
|
260
|
+
};
|
|
261
|
+
const validateWithdrawal = (valueArg, labelArg, publishedAtArg, errorsArg) => {
|
|
262
|
+
const withdrawal = readDataProperties(valueArg);
|
|
263
|
+
if (withdrawal === null || !hasExactKeys(withdrawal, ['at', 'reason'])) {
|
|
264
|
+
errorsArg.push(`${labelArg} must be exactly { at, reason }`);
|
|
265
|
+
return;
|
|
266
|
+
}
|
|
267
|
+
if (!isCanonicalTimestamp(withdrawal.at)) {
|
|
268
|
+
errorsArg.push(`${labelArg}.at must be a canonical UTC timestamp`);
|
|
269
|
+
}
|
|
270
|
+
else if (publishedAtArg !== null && Date.parse(withdrawal.at) > Date.parse(publishedAtArg)) {
|
|
271
|
+
errorsArg.push(`${labelArg}.at must not be later than catalog.publishedAt`);
|
|
272
|
+
}
|
|
273
|
+
if (!isLine(withdrawal.reason, withdrawalReasonMaximumLength)) {
|
|
274
|
+
errorsArg.push(`${labelArg}.reason must be a single line`);
|
|
275
|
+
}
|
|
276
|
+
};
|
|
277
|
+
const validateCatalogApp = (valueArg, labelArg, supportedFeatureIdsArg, publishedAtArg, errorsArg) => {
|
|
278
|
+
const app = readDataProperties(valueArg);
|
|
279
|
+
if (app === null || !hasExactKeys(app, ['info', 'latestVersion', 'versions'], ['upgradeStrategy'])) {
|
|
280
|
+
errorsArg.push(`${labelArg} must be exactly { info, latestVersion, versions } plus optional upgradeStrategy`);
|
|
281
|
+
return null;
|
|
282
|
+
}
|
|
283
|
+
const id = validateAppInfo(app.info, `${labelArg}.info`, errorsArg);
|
|
284
|
+
const strategy = app.upgradeStrategy ?? 'semver';
|
|
285
|
+
if (strategy !== 'semver' && strategy !== 'branch') {
|
|
286
|
+
errorsArg.push(`${labelArg}.upgradeStrategy must be semver or branch`);
|
|
287
|
+
return id;
|
|
288
|
+
}
|
|
289
|
+
const versionPattern = strategy === 'semver' ? semverPattern : versionTokenPattern;
|
|
290
|
+
const entries = readDataElements(app.versions, appStoreCatalogContract.maximumVersionsPerApp);
|
|
291
|
+
if (entries === null || entries.length === 0) {
|
|
292
|
+
errorsArg.push(`${labelArg}.versions must be a non-empty bounded array`);
|
|
293
|
+
return id;
|
|
294
|
+
}
|
|
295
|
+
const versions = [];
|
|
296
|
+
const withdrawnVersions = new Set();
|
|
297
|
+
entries.forEach((entryArg, indexArg) => {
|
|
298
|
+
const versionLabel = `${labelArg}.versions[${indexArg}]`;
|
|
299
|
+
const entry = readDataProperties(entryArg);
|
|
300
|
+
if (entry === null || !hasExactKeys(entry, ['version', 'config', 'configDigest'], ['withdrawn'])) {
|
|
301
|
+
errorsArg.push(`${versionLabel} must be exactly { version, config, configDigest } plus optional withdrawn`);
|
|
302
|
+
return;
|
|
303
|
+
}
|
|
304
|
+
if (typeof entry.version !== 'string' || !versionPattern.test(entry.version)) {
|
|
305
|
+
errorsArg.push(`${versionLabel}.version must be ${strategy === 'semver' ? 'MAJOR.MINOR.PATCH' : 'a version token'}`);
|
|
306
|
+
}
|
|
307
|
+
else if (versions.includes(entry.version)) {
|
|
308
|
+
errorsArg.push(`${versionLabel}.version '${entry.version}' is listed twice`);
|
|
309
|
+
}
|
|
310
|
+
else {
|
|
311
|
+
versions.push(entry.version);
|
|
312
|
+
if (entry.withdrawn !== undefined)
|
|
313
|
+
withdrawnVersions.add(entry.version);
|
|
314
|
+
}
|
|
315
|
+
if (entry.withdrawn !== undefined) {
|
|
316
|
+
validateWithdrawal(entry.withdrawn, `${versionLabel}.withdrawn`, publishedAtArg, errorsArg);
|
|
317
|
+
}
|
|
318
|
+
if (typeof entry.configDigest !== 'string' || !isSha256Digest(entry.configDigest)) {
|
|
319
|
+
errorsArg.push(`${versionLabel}.configDigest must be a canonical sha256 digest`);
|
|
320
|
+
}
|
|
321
|
+
const config = readDataProperties(entry.config);
|
|
322
|
+
if (config === null) {
|
|
323
|
+
errorsArg.push(`${versionLabel}.config must be an object`);
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
326
|
+
if (config.requiresFeatures !== undefined && !isCanonicalFeatureIdList(config.requiresFeatures)) {
|
|
327
|
+
errorsArg.push(`${versionLabel}.config.requiresFeatures must be a strictly increasing list of feature ids`);
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
const missing = isCanonicalFeatureIdList(config.requiresFeatures)
|
|
331
|
+
? config.requiresFeatures.filter((featureIdArg) => !supportedFeatureIdsArg.has(featureIdArg))
|
|
332
|
+
: [];
|
|
333
|
+
// A version gated on a feature this consumer lacks may use members this consumer does not
|
|
334
|
+
// know. It stays listed, is never installed here, and its config is not interpreted.
|
|
335
|
+
if (missing.length === 0)
|
|
336
|
+
validateCatalogVersionConfig(config, `${versionLabel}.config`, errorsArg);
|
|
337
|
+
});
|
|
338
|
+
// While any version is installable, latestVersion names one of those; a fully withdrawn app
|
|
339
|
+
// still names a listed version.
|
|
340
|
+
const availableVersions = versions.filter((versionArg) => !withdrawnVersions.has(versionArg));
|
|
341
|
+
const latestCandidates = availableVersions.length > 0 ? availableVersions : versions;
|
|
342
|
+
const latestVersion = typeof app.latestVersion === 'string' ? app.latestVersion : null;
|
|
343
|
+
if (latestVersion === null || !versions.includes(latestVersion)) {
|
|
344
|
+
errorsArg.push(`${labelArg}.latestVersion must name a listed version`);
|
|
345
|
+
}
|
|
346
|
+
else if (!latestCandidates.includes(latestVersion)) {
|
|
347
|
+
errorsArg.push(`${labelArg}.latestVersion must not name a withdrawn version while another is not withdrawn`);
|
|
348
|
+
}
|
|
349
|
+
else if (strategy === 'semver'
|
|
350
|
+
&& latestCandidates.some((versionArg) => compareSemver(versionArg, latestVersion) > 0)) {
|
|
351
|
+
errorsArg.push(`${labelArg}.latestVersion must be the highest listed version that is not withdrawn`);
|
|
352
|
+
}
|
|
353
|
+
return id;
|
|
354
|
+
};
|
|
355
|
+
/**
|
|
356
|
+
* Every reason a value is not a catalog this consumer can read; empty when it is.
|
|
357
|
+
*
|
|
358
|
+
* Exact keys at every level: a member this contract does not define is refused, because a
|
|
359
|
+
* consumer that silently ignored it could not be trusted to honour it. The one exception is the
|
|
360
|
+
* config of a version whose `requiresFeatures` names a feature the consumer does not fulfil.
|
|
361
|
+
*/
|
|
362
|
+
export const validateAppStoreCatalog = (catalogArg, optionsArg) => {
|
|
363
|
+
const catalog = readDataProperties(catalogArg);
|
|
364
|
+
if (catalog === null
|
|
365
|
+
|| !hasExactKeys(catalog, ['contract', 'revision', 'publishedAt', 'sourceRevision', 'apps'])) {
|
|
366
|
+
return ['catalog must be exactly { contract, revision, publishedAt, sourceRevision, apps }'];
|
|
367
|
+
}
|
|
368
|
+
const errors = [];
|
|
369
|
+
const contractRefusal = judgeAppStoreCatalogContract(catalog);
|
|
370
|
+
if (contractRefusal !== null)
|
|
371
|
+
errors.push(contractRefusal.message);
|
|
372
|
+
if (!isNonNegativeSafeInteger(catalog.revision) || catalog.revision < 1) {
|
|
373
|
+
errors.push('catalog.revision must be a positive integer');
|
|
374
|
+
}
|
|
375
|
+
if (!isCanonicalTimestamp(catalog.publishedAt)) {
|
|
376
|
+
errors.push('catalog.publishedAt must be a canonical UTC timestamp');
|
|
377
|
+
}
|
|
378
|
+
if (typeof catalog.sourceRevision !== 'string' || !sourceRevisionPattern.test(catalog.sourceRevision)) {
|
|
379
|
+
errors.push('catalog.sourceRevision must be a lower-case hex commit id');
|
|
380
|
+
}
|
|
381
|
+
const apps = readDataElements(catalog.apps, appStoreCatalogContract.maximumApps);
|
|
382
|
+
if (apps === null) {
|
|
383
|
+
errors.push('catalog.apps must be a bounded array');
|
|
384
|
+
return errors;
|
|
385
|
+
}
|
|
386
|
+
const supportedFeatureIds = new Set(optionsArg.supportedFeatureIds);
|
|
387
|
+
const publishedAt = isCanonicalTimestamp(catalog.publishedAt) ? catalog.publishedAt : null;
|
|
388
|
+
const ids = [];
|
|
389
|
+
apps.forEach((appArg, indexArg) => {
|
|
390
|
+
const id = validateCatalogApp(appArg, `catalog.apps[${indexArg}]`, supportedFeatureIds, publishedAt, errors);
|
|
391
|
+
if (id === null)
|
|
392
|
+
return;
|
|
393
|
+
if (ids.includes(id))
|
|
394
|
+
errors.push(`catalog.apps[${indexArg}].info.id '${id}' is listed twice`);
|
|
395
|
+
else
|
|
396
|
+
ids.push(id);
|
|
397
|
+
});
|
|
398
|
+
return errors;
|
|
399
|
+
};
|
|
400
|
+
/** The envelope's own members; the catalog inside is judged by `validateAppStoreCatalog`. */
|
|
401
|
+
export const validateAppStoreCatalogEnvelopeShape = (envelopeArg) => {
|
|
402
|
+
const envelope = readDataProperties(envelopeArg);
|
|
403
|
+
if (envelope === null || !hasExactKeys(envelope, ['catalog', 'catalogDigest', 'signatures'])) {
|
|
404
|
+
return ['envelope must be exactly { catalog, catalogDigest, signatures }'];
|
|
405
|
+
}
|
|
406
|
+
const errors = [];
|
|
407
|
+
if (readDataProperties(envelope.catalog) === null)
|
|
408
|
+
errors.push('envelope.catalog must be an object');
|
|
409
|
+
if (typeof envelope.catalogDigest !== 'string' || !isSha256Digest(envelope.catalogDigest)) {
|
|
410
|
+
errors.push('envelope.catalogDigest must be a canonical sha256 digest');
|
|
411
|
+
}
|
|
412
|
+
const signatures = readDataElements(envelope.signatures, appStoreCatalogContract.maximumSignatures);
|
|
413
|
+
if (signatures === null || signatures.length === 0) {
|
|
414
|
+
errors.push(`envelope.signatures must hold 1 to ${appStoreCatalogContract.maximumSignatures} signatures`);
|
|
415
|
+
return errors;
|
|
416
|
+
}
|
|
417
|
+
const keyIds = [];
|
|
418
|
+
signatures.forEach((signatureArg, indexArg) => {
|
|
419
|
+
const signature = readDataProperties(signatureArg);
|
|
420
|
+
if (signature === null || !hasExactKeys(signature, ['keyId', 'signature'])
|
|
421
|
+
|| typeof signature.keyId !== 'string' || !isSha256Digest(signature.keyId)
|
|
422
|
+
|| typeof signature.signature !== 'string' || !signaturePattern.test(signature.signature)) {
|
|
423
|
+
errors.push(`envelope.signatures[${indexArg}] must be { keyId: sha256 digest, signature: 128 lower-case hex }`);
|
|
424
|
+
return;
|
|
425
|
+
}
|
|
426
|
+
if (keyIds.includes(signature.keyId))
|
|
427
|
+
errors.push(`envelope.signatures[${indexArg}].keyId is listed twice`);
|
|
428
|
+
else
|
|
429
|
+
keyIds.push(signature.keyId);
|
|
430
|
+
});
|
|
431
|
+
return errors;
|
|
432
|
+
};
|
|
433
|
+
/** Every reason a value is not an envelope whose catalog this consumer can read. */
|
|
434
|
+
export const validateAppStoreCatalogEnvelope = (envelopeArg, optionsArg) => {
|
|
435
|
+
const shapeErrors = validateAppStoreCatalogEnvelopeShape(envelopeArg);
|
|
436
|
+
if (shapeErrors.length > 0)
|
|
437
|
+
return shapeErrors;
|
|
438
|
+
const envelope = readDataProperties(envelopeArg);
|
|
439
|
+
return envelope === null
|
|
440
|
+
? ['envelope must be an object']
|
|
441
|
+
: validateAppStoreCatalog(envelope.catalog, optionsArg);
|
|
442
|
+
};
|
|
443
|
+
/** Narrows a value `validateAppStoreCatalogEnvelope` accepts. */
|
|
444
|
+
export const isAppStoreCatalogEnvelope = (envelopeArg, optionsArg) => validateAppStoreCatalogEnvelope(envelopeArg, optionsArg).length === 0;
|
|
445
|
+
const failDigestInput = (reasonArg) => {
|
|
446
|
+
throw new Error(`App Store catalog digest input rejected: ${reasonArg}`);
|
|
447
|
+
};
|
|
448
|
+
/**
|
|
449
|
+
* SHA-256 over the strict canonical JSON of a domain-separated value: object keys in UTF-16 code
|
|
450
|
+
* unit order, no whitespace, safe integers only. A value canonical JSON cannot represent — a
|
|
451
|
+
* fractional number, an accessor, a cycle — throws.
|
|
452
|
+
*/
|
|
453
|
+
const computeDomainDigest = async (valueArg) => {
|
|
454
|
+
const hex = await createCanonicalJsonSha256Hex(canonicalizeStrictJson(valueArg, failDigestInput), failDigestInput);
|
|
455
|
+
return `sha256:${hex}`;
|
|
456
|
+
};
|
|
457
|
+
/** The digest a catalog version entry carries as `configDigest`. */
|
|
458
|
+
export const computeAppStoreCatalogConfigDigest = (configArg) => computeDomainDigest({ domain: appStoreCatalogContract.configDigestDomain, config: configArg });
|
|
459
|
+
/** The digest an envelope carries as `catalogDigest`. */
|
|
460
|
+
export const computeAppStoreCatalogDigest = (catalogArg) => computeDomainDigest({ domain: appStoreCatalogContract.catalogDigestDomain, catalog: catalogArg });
|
|
461
|
+
/** The key id of a raw Ed25519 public key (32 bytes, lower-case hex). */
|
|
462
|
+
export const computeAppStoreCatalogSigningKeyId = async (publicKeyArg) => {
|
|
463
|
+
if (!publicKeyPattern.test(publicKeyArg)) {
|
|
464
|
+
throw new Error('App Store catalog signing key must be 32 bytes of lower-case hex');
|
|
465
|
+
}
|
|
466
|
+
return computeDomainDigest({ domain: appStoreCatalogContract.signingKeyIdDomain, publicKey: publicKeyArg });
|
|
467
|
+
};
|
|
468
|
+
/** The exact bytes a catalog signature covers. */
|
|
469
|
+
export const createAppStoreCatalogSignaturePayload = (catalogDigestArg) => {
|
|
470
|
+
if (!isSha256Digest(catalogDigestArg)) {
|
|
471
|
+
throw new Error('App Store catalog digest must be a canonical sha256 digest');
|
|
472
|
+
}
|
|
473
|
+
return new TextEncoder().encode(canonicalizeStrictJson({ domain: appStoreCatalogContract.signatureDomain, catalogDigest: catalogDigestArg }, failDigestInput));
|
|
474
|
+
};
|
|
475
|
+
/**
|
|
476
|
+
* The first version entry whose `configDigest` does not match its config, or `null`.
|
|
477
|
+
*
|
|
478
|
+
* Judge the catalog with `validateAppStoreCatalog` first; an entry it would refuse is skipped.
|
|
479
|
+
*/
|
|
480
|
+
export const findAppStoreCatalogConfigDigestMismatch = async (catalogArg) => {
|
|
481
|
+
for (const app of catalogArg.apps) {
|
|
482
|
+
for (const version of app.versions) {
|
|
483
|
+
if (await computeAppStoreCatalogConfigDigest(version.config) !== version.configDigest) {
|
|
484
|
+
return `${app.info.id}@${version.version} configDigest does not match its config`;
|
|
485
|
+
}
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
return null;
|
|
489
|
+
};
|
|
490
|
+
/**
|
|
491
|
+
* Whether a consumer may install a listed version, or upgrade a service to it; `null` when it may.
|
|
492
|
+
* A withdrawn version and a version requiring a feature the consumer does not fulfil stay listed
|
|
493
|
+
* and are refused here, and nowhere else is a second answer needed.
|
|
494
|
+
*/
|
|
495
|
+
export const judgeAppStoreCatalogInstallTarget = (versionArg, supportedFeatureIdsArg) => {
|
|
496
|
+
if (versionArg.withdrawn !== undefined)
|
|
497
|
+
return { reason: 'versionWithdrawn', withdrawal: versionArg.withdrawn };
|
|
498
|
+
const missingFeatureIds = getAppStoreCatalogMissingFeatureIds(versionArg.config, supportedFeatureIdsArg);
|
|
499
|
+
return missingFeatureIds.length > 0 ? { reason: 'featuresUnsupported', missingFeatureIds } : null;
|
|
500
|
+
};
|
|
501
|
+
const sameWithdrawal = (leftArg, rightArg) => leftArg?.at === rightArg?.at && leftArg?.reason === rightArg?.reason;
|
|
502
|
+
/**
|
|
503
|
+
* Whether a verified candidate may replace the active verified catalog.
|
|
504
|
+
*
|
|
505
|
+
* The same digest is `unchanged`. Otherwise the revision must be greater, and the candidate must
|
|
506
|
+
* keep the active catalog's full history: every `app@version` it lists stays listed
|
|
507
|
+
* (`publishedVersionRemoved`) with its `configDigest` (`publishedVersionMutated`), and every
|
|
508
|
+
* withdrawal stays exactly as published (`publishedWithdrawalChanged`). A candidate may add apps
|
|
509
|
+
* and versions and withdraw versions; it cannot remove, rewrite or reinstate one.
|
|
510
|
+
*/
|
|
511
|
+
export const judgeAppStoreCatalogSuccession = (activeArg, candidateArg) => {
|
|
512
|
+
if (activeArg === null)
|
|
513
|
+
return { outcome: 'activate' };
|
|
514
|
+
if (activeArg.catalogDigest === candidateArg.catalogDigest)
|
|
515
|
+
return { outcome: 'unchanged' };
|
|
516
|
+
const refuse = (reasonArg, messageArg) => ({ outcome: 'refused', refusal: { reason: reasonArg, message: messageArg } });
|
|
517
|
+
if (candidateArg.catalog.revision <= activeArg.catalog.revision) {
|
|
518
|
+
return refuse('revisionRegressed', `catalog revision ${candidateArg.catalog.revision} is not greater than active revision ${activeArg.catalog.revision}`);
|
|
519
|
+
}
|
|
520
|
+
const candidateVersions = new Map();
|
|
521
|
+
for (const app of candidateArg.catalog.apps) {
|
|
522
|
+
for (const version of app.versions)
|
|
523
|
+
candidateVersions.set(`${app.info.id}@${version.version}`, version);
|
|
524
|
+
}
|
|
525
|
+
for (const app of activeArg.catalog.apps) {
|
|
526
|
+
for (const published of app.versions) {
|
|
527
|
+
const key = `${app.info.id}@${published.version}`;
|
|
528
|
+
const candidate = candidateVersions.get(key);
|
|
529
|
+
if (candidate === undefined) {
|
|
530
|
+
return refuse('publishedVersionRemoved', `${key} was published and is no longer listed`);
|
|
531
|
+
}
|
|
532
|
+
if (candidate.configDigest !== published.configDigest) {
|
|
533
|
+
return refuse('publishedVersionMutated', `${key} was published with ${published.configDigest} and now carries ${candidate.configDigest}`);
|
|
534
|
+
}
|
|
535
|
+
if (published.withdrawn !== undefined && !sameWithdrawal(published.withdrawn, candidate.withdrawn)) {
|
|
536
|
+
return refuse('publishedWithdrawalChanged', candidate.withdrawn === undefined
|
|
537
|
+
? `${key} was withdrawn and a withdrawal is final`
|
|
538
|
+
: `${key} was withdrawn at ${published.withdrawn.at} and its withdrawal record changed`);
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
}
|
|
542
|
+
return { outcome: 'activate' };
|
|
543
|
+
};
|
|
544
|
+
//# 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,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;AA4LxC,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;AAOF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,UAAmC,EACnC,sBAAwC,EACK,EAAE;IAC/C,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,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpG,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"}
|
|
@@ -1,2 +1,4 @@
|
|
|
1
1
|
export * from './types.js';
|
|
2
|
-
|
|
2
|
+
export * from './versionconfig.js';
|
|
3
|
+
export * from './catalog.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9hcHBzdG9yZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLFlBQVksQ0FBQztBQUMzQixjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsY0FBYyxDQUFDIn0=
|
|
@@ -244,6 +244,15 @@ export interface IAppStoreVersionConfig {
|
|
|
244
244
|
requiresManualReview?: boolean;
|
|
245
245
|
migrationRequired?: boolean;
|
|
246
246
|
backupBeforeUpgrade?: boolean;
|
|
247
|
+
/**
|
|
248
|
+
* Feature ids this version needs from the consumer that installs it, as a strictly increasing
|
|
249
|
+
* list (e.g. `appStoreStorageFeatureIds` values). A consumer advertises the ids it fulfils; a
|
|
250
|
+
* version naming any other id stays listed in the catalog but is refused for install and
|
|
251
|
+
* upgrade by that consumer ("requires a newer Onebox/Cloudly"), and its config is not
|
|
252
|
+
* interpreted there. A version that uses a member introduced after the catalog contract's
|
|
253
|
+
* current minor must name the feature id that introduced it, so older consumers keep loading
|
|
254
|
+
* the rest of the catalog.
|
|
255
|
+
*/
|
|
247
256
|
requiresFeatures?: string[];
|
|
248
257
|
healthCheck?: {
|
|
249
258
|
path?: string;
|