@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
|
@@ -426,4 +426,4 @@ export const bindGetRuntimeAssignmentSecretMaterialResponse = async (valueArg, r
|
|
|
426
426
|
return fail();
|
|
427
427
|
}
|
|
428
428
|
};
|
|
429
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.assignmentsecret.js","sourceRoot":"","sources":["../ts/runtime.assignmentsecret.ts"],"names":[],"mappings":"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"}
|
|
429
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"runtime.assignmentsecret.js","sourceRoot":"","sources":["../ts/runtime.assignmentsecret.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,13 @@ import type { IObjectStorageRetentionIntent, IObjectStorageRetentionEvidenceExpe
|
|
|
5
5
|
import type { IPlatformDatabaseEndpoint } from './platform/database.js';
|
|
6
6
|
export type TCorestoreCredentialCapability = 'database' | 'objectstorage';
|
|
7
7
|
export declare const corestoreProviderConfigIds: Readonly<{
|
|
8
|
-
readonly database:
|
|
9
|
-
readonly objectstorage:
|
|
8
|
+
readonly database: 'cloudly-corestore-database';
|
|
9
|
+
readonly objectstorage: 'cloudly-corestore-objectstorage';
|
|
10
10
|
}>;
|
|
11
|
-
export declare const corestoreControlUrl:
|
|
12
|
-
export declare const corestoreCredentialManagementScope:
|
|
13
|
-
export declare const corestoreControlCredentialKey:
|
|
14
|
-
export declare const corestoreCredentialEnvironment:
|
|
11
|
+
export declare const corestoreControlUrl: 'http://corestore:3000';
|
|
12
|
+
export declare const corestoreCredentialManagementScope: 'platform:cloudly-corestore';
|
|
13
|
+
export declare const corestoreControlCredentialKey: 'CORESTORE_API_TOKEN';
|
|
14
|
+
export declare const corestoreCredentialEnvironment: 'production';
|
|
15
15
|
export declare const corestoreCredentialRuntimeLimits: Readonly<{
|
|
16
16
|
maximumIdentifierLength: 200;
|
|
17
17
|
maximumPublicationGrants: 256;
|
|
@@ -22,7 +22,7 @@ export declare const corestoreCredentialRuntimeLimits: Readonly<{
|
|
|
22
22
|
maximumControlTokenBytes: 4096;
|
|
23
23
|
maximumSealedControlCredentialBytes: number;
|
|
24
24
|
}>;
|
|
25
|
-
export declare const getCorestoreProviderConfigId: (capabilityArg: TCorestoreCredentialCapability) =>
|
|
25
|
+
export declare const getCorestoreProviderConfigId: (capabilityArg: TCorestoreCredentialCapability) => typeof corestoreProviderConfigIds[TCorestoreCredentialCapability];
|
|
26
26
|
export interface ICorestoreControlCredentialPlaintext {
|
|
27
27
|
key: typeof corestoreControlCredentialKey;
|
|
28
28
|
environment: typeof corestoreCredentialEnvironment;
|
|
@@ -92,7 +92,7 @@ interface ICorestoreCredentialBindingRequestBase {
|
|
|
92
92
|
managementScope: typeof corestoreCredentialManagementScope;
|
|
93
93
|
environment: typeof corestoreCredentialEnvironment;
|
|
94
94
|
}
|
|
95
|
-
export type TCorestoreCredentialBindingRequest = ICorestoreCredentialBindingRequestBase & {
|
|
95
|
+
export type TCorestoreCredentialBindingRequest = (ICorestoreCredentialBindingRequestBase & {
|
|
96
96
|
capability: 'database';
|
|
97
97
|
/**
|
|
98
98
|
* Where a workload reaches the database: the `corestoreDatabase` of the node the binding is
|
|
@@ -102,11 +102,11 @@ export type TCorestoreCredentialBindingRequest = ICorestoreCredentialBindingRequ
|
|
|
102
102
|
* is admitted is the provider's decision, never a default this contract supplies.
|
|
103
103
|
*/
|
|
104
104
|
endpoint?: IPlatformDatabaseEndpoint;
|
|
105
|
-
} | ICorestoreCredentialBindingRequestBase & {
|
|
105
|
+
}) | (ICorestoreCredentialBindingRequestBase & {
|
|
106
106
|
capability: 'objectstorage';
|
|
107
107
|
bucketName: string;
|
|
108
108
|
objectstorageRetention?: IObjectStorageRetentionIntent;
|
|
109
|
-
};
|
|
109
|
+
});
|
|
110
110
|
export declare const validateCorestoreCredentialBindingRequest: (requestArg: unknown) => string[];
|
|
111
111
|
export declare const createCorestoreCredentialBindingRequestDigestInput: (requestArg: TCorestoreCredentialBindingRequest) => string;
|
|
112
112
|
export declare const computeCorestoreCredentialBindingRequestSha256: (requestArg: TCorestoreCredentialBindingRequest) => Promise<string>;
|
|
@@ -209,7 +209,7 @@ export interface IReq_PublishCorestoreCredentialMaterial extends plugins.typedre
|
|
|
209
209
|
receipt: ICorestoreCredentialPublicationReceipt;
|
|
210
210
|
};
|
|
211
211
|
}
|
|
212
|
-
export declare const createPublishCorestoreCredentialMaterialEnvelopeContext: (requestArg: Omit<IPublishCorestoreCredentialMaterialRequest,
|
|
212
|
+
export declare const createPublishCorestoreCredentialMaterialEnvelopeContext: (requestArg: Omit<IPublishCorestoreCredentialMaterialRequest, 'identity' | 'envelope'>) => Uint8Array;
|
|
213
213
|
export declare const validatePublishCorestoreCredentialMaterialRequest: (requestArg: unknown, expectedGrantArg: ICorestoreCredentialPublicationGrant, activeRecipientArg: IActiveSecretRecipientMetadata, trustedNowArg: number) => Promise<string[]>;
|
|
214
214
|
export interface ICorestoreCredentialPublicationReceiptExpectation {
|
|
215
215
|
request: IPublishCorestoreCredentialMaterialRequest;
|
|
@@ -312,9 +312,9 @@ export interface ICorestoreDatabaseBackupClosureReceipt {
|
|
|
312
312
|
* is a transfer that fails at the last hop instead of at the first. Every one of them imports this
|
|
313
313
|
* constant rather than writing the bytes again.
|
|
314
314
|
*/
|
|
315
|
-
export declare const corestoreDatabaseBackupMediaType:
|
|
315
|
+
export declare const corestoreDatabaseBackupMediaType: 'application/vnd.serve-zone.corestore-database-backup';
|
|
316
316
|
/** The format a backup receipt states, which is this media type's payload contract. */
|
|
317
|
-
export declare const corestoreDatabaseBackupFormat:
|
|
317
|
+
export declare const corestoreDatabaseBackupFormat: 'corestore.database.backup';
|
|
318
318
|
export interface ICorestoreDatabaseBackupReceipt {
|
|
319
319
|
format: typeof corestoreDatabaseBackupFormat;
|
|
320
320
|
backupId: string;
|
package/dist_ts/runtime.d.ts
CHANGED
|
@@ -144,7 +144,7 @@ export interface ICoreflowSecretRuntimeRegistrationExpectation {
|
|
|
144
144
|
activeRecipient: IActiveSecretRecipientMetadata;
|
|
145
145
|
}
|
|
146
146
|
/** Dedicated TypedSocket tag carrying ICoreflowSecretRuntimeRegistration. */
|
|
147
|
-
export declare const coreflowSecretRuntimeRegistrationTagId:
|
|
147
|
+
export declare const coreflowSecretRuntimeRegistrationTagId: 'coreflowSecretRuntimeRegistration';
|
|
148
148
|
export type TCoreflowSecretRuntimeRegistrationExpectationResponse = {
|
|
149
149
|
status: 'available';
|
|
150
150
|
expectation: ICoreflowSecretRuntimeRegistrationExpectation;
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import type { TSha256Digest, TImmutableContainerPlatform } from './data/immutableimage.js';
|
|
2
2
|
export declare const workloadInitReleaseContract: Readonly<{
|
|
3
|
-
readonly packageName:
|
|
4
|
-
readonly sourceRepository:
|
|
5
|
-
readonly imageRegistry:
|
|
6
|
-
readonly imageRepository:
|
|
7
|
-
readonly imageIndexMediaType:
|
|
8
|
-
readonly statementType:
|
|
9
|
-
readonly predicateType:
|
|
10
|
-
readonly buildType:
|
|
11
|
-
readonly builderId:
|
|
12
|
-
readonly signatureFormat:
|
|
13
|
-
readonly signatureAlgorithm:
|
|
3
|
+
readonly packageName: '@serve.zone/workloadinit';
|
|
4
|
+
readonly sourceRepository: 'https://code.foss.global/serve.zone/workloadinit.git';
|
|
5
|
+
readonly imageRegistry: 'code.foss.global';
|
|
6
|
+
readonly imageRepository: 'serve.zone/workloadinit';
|
|
7
|
+
readonly imageIndexMediaType: 'application/vnd.oci.image.index.v1+json';
|
|
8
|
+
readonly statementType: 'https://in-toto.io/Statement/v1';
|
|
9
|
+
readonly predicateType: 'https://slsa.dev/provenance/v1';
|
|
10
|
+
readonly buildType: 'https://serve.zone/buildtypes/workloadinit-gitzone-tsdocker';
|
|
11
|
+
readonly builderId: 'https://serve.zone/builders/workloadinit-manual-release';
|
|
12
|
+
readonly signatureFormat: 'cosign-dsse-bundle-v0.3';
|
|
13
|
+
readonly signatureAlgorithm: 'ecdsa-p256-sha256';
|
|
14
14
|
}>;
|
|
15
15
|
export interface IWorkloadInitBuildToolVersions {
|
|
16
16
|
dockerBuildx: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@serve.zone/interfaces",
|
|
3
|
-
"version": "32.
|
|
3
|
+
"version": "32.53.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
|
|
6
6
|
"exports": {
|
|
@@ -27,11 +27,12 @@
|
|
|
27
27
|
"@tsclass/tsclass": "^9.5.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@git.zone/tsbuild": "^
|
|
30
|
+
"@git.zone/tsbuild": "^6.0.0",
|
|
31
31
|
"@git.zone/tsdoc": "^3.0.2",
|
|
32
32
|
"@git.zone/tsrun": "^3.0.2",
|
|
33
33
|
"@git.zone/tstest": "^7.2.0",
|
|
34
|
-
"@types/node": "26.6.3"
|
|
34
|
+
"@types/node": "26.6.3",
|
|
35
|
+
"typescript": "^6.0.3"
|
|
35
36
|
},
|
|
36
37
|
"files": [
|
|
37
38
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -203,6 +203,19 @@ current authority or workload readiness. Persist only the report and receipt in
|
|
|
203
203
|
`IClusterNode.data.sparkNodeReport`, never the bearer. Keep legacy reporting
|
|
204
204
|
separate. This endpoint does not deliver or acknowledge operator actions.
|
|
205
205
|
|
|
206
|
+
`data.sparkNodeHostContract` defines the node's desired-host route,
|
|
207
|
+
`/spark/nodes/host`, with 1024-byte request and response bounds, authenticated and
|
|
208
|
+
judged in the same order as the heartbeat. `ISparkNodeHostRequest` carries the
|
|
209
|
+
Spark bearer and the sender's offer; `ISparkNodeDesiredHost` answers with the whole
|
|
210
|
+
desired value of `IClusterNode.data.hostnameIntent` — the hostname and its
|
|
211
|
+
generation — never a change, and `hostname: null` with generation `0` states that
|
|
212
|
+
Cloudly holds no intent, so Spark leaves the host's hostname as it is. Spark applies
|
|
213
|
+
the latest generation and states the outcome of its last attempt as the optional
|
|
214
|
+
`ISparkNodeReport.hostApply` (`applied`, or `failed` with a bounded reason) on its
|
|
215
|
+
next heartbeat; the node has converged when `runtime.hostname` states the intent's
|
|
216
|
+
hostname. A Spark that sends `hostApply` raises its `minimumPeerVersion` so it
|
|
217
|
+
reaches only a Cloudly that reads it.
|
|
218
|
+
|
|
206
219
|
The snapshot functions reject unknown keys, accessors, malformed identities and
|
|
207
220
|
nonfinite/out-of-range numbers, then return detached frozen records. Transports
|
|
208
221
|
own byte limits, timeouts and cancellation. These contracts do not implement a
|
|
@@ -2921,6 +2934,11 @@ Common data contracts include:
|
|
|
2921
2934
|
|
|
2922
2935
|
- `ICluster` and `IClusterNode` for cluster membership and provisioning state, including the
|
|
2923
2936
|
optional `ICluster.data.relay` block described below.
|
|
2937
|
+
- `clusternodehostname` for the static hostname Cloudly wants a node to carry:
|
|
2938
|
+
`IClusterNodeHostnameIntent` on `IClusterNode.data.hostnameIntent`, the default scheme
|
|
2939
|
+
`cloudly-worker-<name>` (`clusterNodeHostnameContract`, `deriveDefaultClusterNodeHostname`,
|
|
2940
|
+
`proposeClusterNodeName`) and the named `clusterNodeHostnameRefusals` of
|
|
2941
|
+
`setClusterNodeHostname` and `resetClusterNodeHostname`.
|
|
2924
2942
|
- `IService`, `IDeployment`, `IImage`, `IRegistryTarget`, and `IExternalRegistry` for workload delivery.
|
|
2925
2943
|
- Service port contracts including `IServiceTargetPort`, `IServiceDomainRoute`, and `IServicePublicPortMapping` for canonical backend targets, domain target references, and edge/Coretraffic TCP/UDP public exposure.
|
|
2926
2944
|
- `IDomain`, `IDnsEntry`, and traffic contracts for routing and DNS management.
|
|
@@ -3541,6 +3559,7 @@ Compatibility rules:
|
|
|
3541
3559
|
- Every level has exact keys; an unknown member is `schemaInvalid` (`appstore.validateAppStoreCatalog`).
|
|
3542
3560
|
- `requiresFeatures` gates one version: a consumer passes the feature ids it fulfils (`supportedFeatureIds`, e.g. `appStoreStorageFeatureIds` values). A version naming any other id stays listed, is refused for install and upgrade there, and its config is not interpreted, so a new config capability ships under a feature id without refusing the rest of the catalog (`appstore.getAppStoreCatalogMissingFeatureIds`).
|
|
3543
3561
|
- A published `app@version` stays in every later catalog and never changes (`appstore.judgeAppStoreCatalogSuccession`): a later catalog that no longer lists it is `publishedVersionRemoved`, one that lists it with another `configDigest` is `publishedVersionMutated`, and a revision that does not increase is `revisionRegressed`.
|
|
3562
|
+
- A version names the oldest host releases that run it (`minOneboxVersion`, `minCloudlyVersion`). A host passes itself to `appstore.judgeAppStoreCatalogInstallTarget` as `{ kind: 'onebox' | 'cloudly', version }` (`IAppStoreCatalogConsumer`), which refuses a version needing a newer release of it as `consumerVersionTooOld`; the version stays listed and installs once the host is upgraded.
|
|
3544
3563
|
- A publisher retires a version by withdrawing it, never by removing it. A withdrawn version keeps its entry, config and digest, so services installed from it keep reading it, and is refused as an install or upgrade target, like a version gated on a feature the consumer lacks (`appstore.judgeAppStoreCatalogInstallTarget`). A withdrawal is final: a later catalog that revokes or rewrites it is `publishedWithdrawalChanged`; a version withdrawn by mistake is republished under a new version.
|
|
3545
3564
|
|
|
3546
3565
|
Digests are SHA-256 over strict canonical JSON (keys in UTF-16 code-unit order, safe integers only) of a domain-separated value: `computeAppStoreCatalogConfigDigest`, `computeAppStoreCatalogDigest` and `computeAppStoreCatalogSigningKeyId`. A signature covers `createAppStoreCatalogSignaturePayload(catalogDigest)`. These helpers use Web Crypto and are safe in the browser entry.
|
|
@@ -3565,6 +3584,14 @@ if (!verification.accepted) {
|
|
|
3565
3584
|
|
|
3566
3585
|
`verifyAppStoreCatalogEnvelope` authenticates before it interprets: envelope shape, `catalogDigest`, one valid signature by a trusted key (a failing signature by a trusted key refuses the envelope), then contract, schema and every `configDigest`. The consumer then judges succession against its active catalog.
|
|
3567
3586
|
|
|
3587
|
+
A publisher keeps its signing key as a file: `importAppStoreCatalogSigningKeyPem(text)` reads one unencrypted PKCS#8 PEM Ed25519 private key (`openssl genpkey -algorithm ed25519`) into an `IAppStoreCatalogSigningKey` with its public key and key id, and `exportAppStoreCatalogSigningKeyPem(key)` writes one. `getAppStoreCatalogTrustedKey(key)` is the `IAppStoreCatalogTrustedKey` a consumer ships for it. A trusted key also converts from and to an SPKI PEM public key (`openssl pkey -pubout`) with `importAppStoreCatalogTrustedKeyPem` and `exportAppStoreCatalogTrustedKeyPem`. Each refuses another PEM label or key type and a key id that does not match its public key, and no error quotes its input.
|
|
3588
|
+
|
|
3589
|
+
A service records the App Store version it runs as `IService.data.appStoreTemplate` (`IAppStoreServiceTemplateSnapshot`: `appId`, `version`, `configDigest`, `config`, `catalogRevision`), taken from a verified catalog by `appstore.createAppStoreServiceTemplateSnapshot`. It is server-managed (`TServiceWritableData` excludes it): the host writes it at install, upgrade and catalog adoption, and runtime paths read it, never the live catalog. While no catalog is active, an `unavailable` status states its `cause` (`loading`, `failed`, `refused`) for programs next to the operator's `reason`, and App Store install, upgrade and upgrade preview are refused with the retryable code `APPSTORE_CATALOG_UNAVAILABLE` (`IAppStoreCatalogUnavailableErrorData`). `IReq_Any_ImportAppStoreCatalog` imports an operator's envelope text (origin `operatorImport`) and answers the status after it, so an air-gapped host needs no registry.
|
|
3590
|
+
|
|
3591
|
+
A host loads the catalog from the npm registries `appstore.resolveAppStoreCatalogRegistries(list)` answers: the configured list (Cloudly's `ICloudlySettings.appStoreCatalogRegistries`, an Onebox setting) in canonical form, or `appStoreCatalogDefaultRegistries` (npmjs) when it is empty. `appstore.validateAppStoreCatalogRegistries` is the one rule for a configured list: `https:` base URLs without credentials, query or fragment, each registry once.
|
|
3592
|
+
|
|
3593
|
+
A host's App Store views carry the listing as `IAppStoreApp` and `IAppStoreAppMeta`: `versions` names the install targets, and the optional `versionStates` (`IAppStoreAppVersionState`) states every listed version, withdrawn and feature-gated ones included, with its `judgeAppStoreCatalogInstallTarget` answer as `installRefusal`.
|
|
3594
|
+
|
|
3568
3595
|
`TAppStoreCatalogStatus` is the operator's view, discriminated by `availability`: `ready` (`IAppStoreCatalogReadyStatus`) always carries the `active` catalog's revision, digest, key and origin, including a restored last-known-good catalog; `unavailable` (`IAppStoreCatalogUnavailableStatus`) always carries a `reason` and no active catalog. Both state `supportedContract`, `supportedFeatureIds`, `lastAttempt`, `nextAttemptAt` and the last `refused` catalog. Loading a catalog never gates the boot, readiness or health of anything else; while none is active only App Store install, upgrade and upgrade-preview are refused. `requests.appstore.IReq_Any_GetAppStoreCatalogStatus` reads it, `IReq_Any_RefreshAppStoreCatalog` runs one attempt now and answers the state after it, and `IReq_Any_GetAppStoreTemplates` may answer it as `catalogStatus`.
|
|
3569
3596
|
|
|
3570
3597
|
The catalog validator judges every supported version config in full; no consumer needs a second validator. Besides the catalog's own rules (member set, image pinning, the feature gate, minimum versions, upgrade flags, `healthCheck`) it applies `appstore.validateAppStoreVersionConfig`, the member rules a host applies before it installs a version, in this order:
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts/appstore/catalog.ts
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import type { TSha256Digest } from '../data/immutableimage.js';
|
|
14
14
|
import { getDigestFromPinnedImageReference, isSha256Digest } from '../data/immutableimage.js';
|
|
15
|
+
import { compareReleaseVersions, parseReleaseVersion } from '../data/releaseversion.js';
|
|
15
16
|
import {
|
|
16
17
|
canonicalizeStrictJson,
|
|
17
18
|
compareWireTokens,
|
|
@@ -268,14 +269,39 @@ export interface IAppStoreCatalogReadyStatus extends IAppStoreCatalogStatusBase
|
|
|
268
269
|
reason?: never;
|
|
269
270
|
}
|
|
270
271
|
|
|
272
|
+
/**
|
|
273
|
+
* Why no verified catalog is active, for programs; `reason` says it for operators.
|
|
274
|
+
*
|
|
275
|
+
* - `loading`: no attempt has ended since start and no last-known-good catalog was restored.
|
|
276
|
+
* - `failed`: the last attempt read no candidate (transport, integrity or packaging failed).
|
|
277
|
+
* - `refused`: the last attempt read a candidate and refused it (`refused` holds the record).
|
|
278
|
+
*/
|
|
279
|
+
export type TAppStoreCatalogUnavailableCause = 'loading' | 'failed' | 'refused';
|
|
280
|
+
|
|
271
281
|
/** No verified catalog is active, neither a last-known-good one nor a fetched one. */
|
|
272
282
|
export interface IAppStoreCatalogUnavailableStatus extends IAppStoreCatalogStatusBase {
|
|
273
283
|
availability: 'unavailable';
|
|
274
|
-
/** Why no catalog is active, e.g. the last attempt's failure. */
|
|
284
|
+
/** Why no catalog is active, e.g. the last attempt's failure. For operators; never parse it. */
|
|
275
285
|
reason: string;
|
|
286
|
+
/** Why no catalog is active, for programs. Every host that loads the catalog at runtime states it. */
|
|
287
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
276
288
|
active?: never;
|
|
277
289
|
}
|
|
278
290
|
|
|
291
|
+
/**
|
|
292
|
+
* The code a host answers, as `TypedResponseError.errorData` (`IAppStoreCatalogUnavailableErrorData`),
|
|
293
|
+
* when it refuses an App Store install, upgrade or upgrade preview because no verified catalog is
|
|
294
|
+
* active. Retryable: the same request succeeds once a catalog is active.
|
|
295
|
+
*/
|
|
296
|
+
export const appStoreCatalogUnavailableErrorCode = 'APPSTORE_CATALOG_UNAVAILABLE' as const;
|
|
297
|
+
|
|
298
|
+
export interface IAppStoreCatalogUnavailableErrorData {
|
|
299
|
+
code: typeof appStoreCatalogUnavailableErrorCode;
|
|
300
|
+
retryable: true;
|
|
301
|
+
/** The status `cause` when the host states one. */
|
|
302
|
+
cause?: TAppStoreCatalogUnavailableCause;
|
|
303
|
+
}
|
|
304
|
+
|
|
279
305
|
/**
|
|
280
306
|
* The App Store domain's state as an operator sees it, discriminated by `availability`.
|
|
281
307
|
*
|
|
@@ -768,23 +794,167 @@ export const findAppStoreCatalogConfigDigestMismatch = async (
|
|
|
768
794
|
return null;
|
|
769
795
|
};
|
|
770
796
|
|
|
797
|
+
/** The registries a consumer loads the catalog from when it configures none. */
|
|
798
|
+
export const appStoreCatalogDefaultRegistries: readonly string[] = Object.freeze(['https://registry.npmjs.org']);
|
|
799
|
+
|
|
800
|
+
const maximumRegistries = 16;
|
|
801
|
+
const maximumRegistryUrlLength = 2048;
|
|
802
|
+
|
|
803
|
+
/** The canonical base URL of one registry entry, or `null` when the entry is not admissible. */
|
|
804
|
+
const readRegistryBaseUrl = (entryArg: unknown): string | null => {
|
|
805
|
+
if (typeof entryArg !== 'string' || entryArg.length > maximumRegistryUrlLength) return null;
|
|
806
|
+
let url: URL;
|
|
807
|
+
try {
|
|
808
|
+
url = new URL(entryArg);
|
|
809
|
+
} catch {
|
|
810
|
+
return null;
|
|
811
|
+
}
|
|
812
|
+
if (url.protocol !== 'https:' || url.username !== '' || url.password !== '' || url.search !== ''
|
|
813
|
+
|| url.hash !== '' || entryArg.includes('?') || entryArg.includes('#')) {
|
|
814
|
+
return null;
|
|
815
|
+
}
|
|
816
|
+
return url.toString().replace(/\/+$/, '');
|
|
817
|
+
};
|
|
818
|
+
|
|
819
|
+
/**
|
|
820
|
+
* The errors of a configured registry list; empty when a consumer may load from it. Every entry is
|
|
821
|
+
* an `https:` base URL without credentials, query or fragment, no two name the same registry, and
|
|
822
|
+
* an empty list means `appStoreCatalogDefaultRegistries`. Errors name entries by index and never
|
|
823
|
+
* quote them, so a URL carrying credentials does not reach a log.
|
|
824
|
+
*/
|
|
825
|
+
export const validateAppStoreCatalogRegistries = (listArg: unknown): string[] => {
|
|
826
|
+
const entries = readDataElements(listArg, maximumRegistries);
|
|
827
|
+
if (entries === null) return [`registries must be a list of at most ${maximumRegistries} URLs`];
|
|
828
|
+
const errors: string[] = [];
|
|
829
|
+
const seen = new Set<string>();
|
|
830
|
+
entries.forEach((entryArg, indexArg) => {
|
|
831
|
+
const baseUrl = readRegistryBaseUrl(entryArg);
|
|
832
|
+
if (baseUrl === null) {
|
|
833
|
+
errors.push(`registries[${indexArg}] must be an https base URL without credentials, query or fragment`);
|
|
834
|
+
} else if (seen.has(baseUrl)) {
|
|
835
|
+
errors.push(`registries[${indexArg}] names a registry listed before it`);
|
|
836
|
+
} else {
|
|
837
|
+
seen.add(baseUrl);
|
|
838
|
+
}
|
|
839
|
+
});
|
|
840
|
+
return errors;
|
|
841
|
+
};
|
|
842
|
+
|
|
843
|
+
/**
|
|
844
|
+
* The registry base URLs a consumer asks, in order: the configured list in canonical form (no
|
|
845
|
+
* trailing slash), or `appStoreCatalogDefaultRegistries` when it is absent or empty. Throws the
|
|
846
|
+
* `validateAppStoreCatalogRegistries` errors for a list it refuses.
|
|
847
|
+
*/
|
|
848
|
+
export const resolveAppStoreCatalogRegistries = (listArg: readonly string[] | undefined): string[] => {
|
|
849
|
+
const errors = validateAppStoreCatalogRegistries(listArg ?? []);
|
|
850
|
+
if (errors.length > 0) throw new Error(`App Store catalog registries refused: ${errors.join('; ')}`);
|
|
851
|
+
const configured = (listArg ?? []).map((entryArg) => readRegistryBaseUrl(entryArg))
|
|
852
|
+
.filter((entryArg): entryArg is string => entryArg !== null);
|
|
853
|
+
return configured.length > 0 ? configured : [...appStoreCatalogDefaultRegistries];
|
|
854
|
+
};
|
|
855
|
+
|
|
856
|
+
/**
|
|
857
|
+
* The App Store version a service runs, as its host took it from a verified catalog.
|
|
858
|
+
*
|
|
859
|
+
* Server-managed: a host writes it when it installs or upgrades the service and when it adopts an
|
|
860
|
+
* existing service on catalog activation, and every runtime path reads this snapshot, never the
|
|
861
|
+
* live catalog. Published versions never change (`judgeAppStoreCatalogSuccession`), so a snapshot
|
|
862
|
+
* stays equal to its catalog entry for as long as the entry is listed.
|
|
863
|
+
*/
|
|
864
|
+
export interface IAppStoreServiceTemplateSnapshot {
|
|
865
|
+
appId: string;
|
|
866
|
+
version: string;
|
|
867
|
+
/** The catalog entry's `configDigest`: `computeAppStoreCatalogConfigDigest(config)`. */
|
|
868
|
+
configDigest: TSha256Digest;
|
|
869
|
+
config: TAppStoreCatalogVersionConfig;
|
|
870
|
+
/** The `revision` of the catalog the snapshot was taken from. */
|
|
871
|
+
catalogRevision: number;
|
|
872
|
+
}
|
|
873
|
+
|
|
874
|
+
/**
|
|
875
|
+
* The snapshot of `appId@version` from a verified catalog, or `null` when the catalog does not list
|
|
876
|
+
* it. Withdrawn versions are listed and snapshot like any other: a host adopting an installed
|
|
877
|
+
* service records the version it runs; whether a version is an install or upgrade target is
|
|
878
|
+
* `judgeAppStoreCatalogInstallTarget`. The config is a copy the caller owns.
|
|
879
|
+
*/
|
|
880
|
+
export const createAppStoreServiceTemplateSnapshot = (
|
|
881
|
+
catalogArg: IAppStoreCatalog,
|
|
882
|
+
appIdArg: string,
|
|
883
|
+
versionArg: string,
|
|
884
|
+
): IAppStoreServiceTemplateSnapshot | null => {
|
|
885
|
+
const entry = catalogArg.apps.find((appArg) => appArg.info.id === appIdArg)
|
|
886
|
+
?.versions.find((candidateArg) => candidateArg.version === versionArg);
|
|
887
|
+
if (entry === undefined) return null;
|
|
888
|
+
return {
|
|
889
|
+
appId: appIdArg,
|
|
890
|
+
version: entry.version,
|
|
891
|
+
configDigest: entry.configDigest,
|
|
892
|
+
config: structuredClone(entry.config),
|
|
893
|
+
catalogRevision: catalogArg.revision,
|
|
894
|
+
};
|
|
895
|
+
};
|
|
896
|
+
|
|
897
|
+
/** The hosts that consume the catalog; each version names its minimum release of each. */
|
|
898
|
+
export type TAppStoreCatalogConsumerKind = 'onebox' | 'cloudly';
|
|
899
|
+
|
|
900
|
+
/** The consumer judging a version: which host it is and the release it runs. */
|
|
901
|
+
export interface IAppStoreCatalogConsumer {
|
|
902
|
+
kind: TAppStoreCatalogConsumerKind;
|
|
903
|
+
/** The host's own release, `MAJOR.MINOR.PATCH`. */
|
|
904
|
+
version: string;
|
|
905
|
+
}
|
|
906
|
+
|
|
907
|
+
const consumerMinimumVersionKeys = Object.freeze({
|
|
908
|
+
onebox: 'minOneboxVersion',
|
|
909
|
+
cloudly: 'minCloudlyVersion',
|
|
910
|
+
} as const);
|
|
911
|
+
|
|
771
912
|
/** Why a listed version is not an install or upgrade target for this consumer. */
|
|
772
913
|
export type TAppStoreCatalogInstallTargetRefusal =
|
|
773
914
|
| { reason: 'versionWithdrawn'; withdrawal: IAppStoreCatalogWithdrawal }
|
|
774
|
-
| { reason: 'featuresUnsupported'; missingFeatureIds: string[] }
|
|
915
|
+
| { reason: 'featuresUnsupported'; missingFeatureIds: string[] }
|
|
916
|
+
/** The version names a minimum release of this host (`minOneboxVersion`, `minCloudlyVersion`) newer than it runs. */
|
|
917
|
+
| {
|
|
918
|
+
reason: 'consumerVersionTooOld';
|
|
919
|
+
consumerKind: TAppStoreCatalogConsumerKind;
|
|
920
|
+
consumerVersion: string;
|
|
921
|
+
minimumVersion: string;
|
|
922
|
+
};
|
|
775
923
|
|
|
776
924
|
/**
|
|
777
925
|
* Whether a consumer may install a listed version, or upgrade a service to it; `null` when it may.
|
|
778
|
-
* A withdrawn version
|
|
779
|
-
* and are refused here,
|
|
926
|
+
* A withdrawn version, a version requiring a feature the consumer does not fulfil and a version
|
|
927
|
+
* requiring a newer release of the consumer stay listed and are refused here, in that order, and
|
|
928
|
+
* nowhere else is a second answer needed.
|
|
929
|
+
*
|
|
930
|
+
* A host passes `consumerArg` on every call; without it the minimum release is not judged. A
|
|
931
|
+
* consumer version that is not `MAJOR.MINOR.PATCH` throws: it is the host's own constant.
|
|
780
932
|
*/
|
|
781
933
|
export const judgeAppStoreCatalogInstallTarget = (
|
|
782
934
|
versionArg: IAppStoreCatalogVersion,
|
|
783
935
|
supportedFeatureIdsArg: Iterable<string>,
|
|
936
|
+
consumerArg?: IAppStoreCatalogConsumer,
|
|
784
937
|
): TAppStoreCatalogInstallTargetRefusal | null => {
|
|
938
|
+
const consumerVersion = consumerArg === undefined ? null : parseReleaseVersion(consumerArg.version);
|
|
939
|
+
if (consumerArg !== undefined && consumerVersion === null) {
|
|
940
|
+
throw new Error('App Store catalog consumer version must be MAJOR.MINOR.PATCH');
|
|
941
|
+
}
|
|
785
942
|
if (versionArg.withdrawn !== undefined) return { reason: 'versionWithdrawn', withdrawal: versionArg.withdrawn };
|
|
786
943
|
const missingFeatureIds = getAppStoreCatalogMissingFeatureIds(versionArg.config, supportedFeatureIdsArg);
|
|
787
|
-
|
|
944
|
+
if (missingFeatureIds.length > 0) return { reason: 'featuresUnsupported', missingFeatureIds };
|
|
945
|
+
if (consumerArg === undefined || consumerVersion === null) return null;
|
|
946
|
+
const minimumVersion = versionArg.config[consumerMinimumVersionKeys[consumerArg.kind]];
|
|
947
|
+
if (minimumVersion === undefined) return null;
|
|
948
|
+
const minimum = parseReleaseVersion(minimumVersion);
|
|
949
|
+
if (minimum === null || compareReleaseVersions(consumerVersion, minimum) < 0) {
|
|
950
|
+
return {
|
|
951
|
+
reason: 'consumerVersionTooOld',
|
|
952
|
+
consumerKind: consumerArg.kind,
|
|
953
|
+
consumerVersion: consumerArg.version,
|
|
954
|
+
minimumVersion,
|
|
955
|
+
};
|
|
956
|
+
}
|
|
957
|
+
return null;
|
|
788
958
|
};
|
|
789
959
|
|
|
790
960
|
export type TAppStoreCatalogSuccession =
|
package/ts/appstore/types.ts
CHANGED
|
@@ -27,6 +27,7 @@ import type {
|
|
|
27
27
|
TStorageResourceKind,
|
|
28
28
|
TStorageSnapshotMode,
|
|
29
29
|
} from '../platform/storage.js';
|
|
30
|
+
import type { TAppStoreCatalogInstallTargetRefusal } from './catalog.js';
|
|
30
31
|
|
|
31
32
|
export type TAppStorePlatformRequirement =
|
|
32
33
|
| 'mongodb'
|
|
@@ -314,6 +315,18 @@ export const validateAppStoreVersionPlatformOidc = (
|
|
|
314
315
|
return errors;
|
|
315
316
|
};
|
|
316
317
|
|
|
318
|
+
/** One listed version of an app as a host shows it: an install target, or why it is not one. */
|
|
319
|
+
export interface IAppStoreAppVersionState {
|
|
320
|
+
version: string;
|
|
321
|
+
/**
|
|
322
|
+
* `null` when the host may install the version or upgrade a service to it; otherwise
|
|
323
|
+
* `versionWithdrawn` with the withdrawal, `featuresUnsupported` with the feature ids the host
|
|
324
|
+
* does not fulfil or `consumerVersionTooOld` with the host release the version requires, as
|
|
325
|
+
* `judgeAppStoreCatalogInstallTarget` answers it.
|
|
326
|
+
*/
|
|
327
|
+
installRefusal: TAppStoreCatalogInstallTargetRefusal | null;
|
|
328
|
+
}
|
|
329
|
+
|
|
317
330
|
export interface IAppStoreApp {
|
|
318
331
|
id: string;
|
|
319
332
|
name: string;
|
|
@@ -323,6 +336,12 @@ export interface IAppStoreApp {
|
|
|
323
336
|
iconUrl?: string;
|
|
324
337
|
latestVersion: string;
|
|
325
338
|
versions?: string[];
|
|
339
|
+
/**
|
|
340
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
341
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
342
|
+
* reads this member to show the others and why they are not offered.
|
|
343
|
+
*/
|
|
344
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
326
345
|
tags?: string[];
|
|
327
346
|
channel?: string;
|
|
328
347
|
upgradeStrategy?: TAppStoreUpgradeStrategy;
|
|
@@ -346,6 +365,12 @@ export interface IAppStoreAppMeta {
|
|
|
346
365
|
iconName?: string;
|
|
347
366
|
latestVersion: string;
|
|
348
367
|
versions: string[];
|
|
368
|
+
/**
|
|
369
|
+
* Every version the catalog lists, withdrawn and feature-gated ones included, in catalog order,
|
|
370
|
+
* each with whether this host may install it. `versions` names only the install targets; a view
|
|
371
|
+
* reads this member to show the others and why they are not offered.
|
|
372
|
+
*/
|
|
373
|
+
versionStates?: IAppStoreAppVersionState[];
|
|
349
374
|
maintainer?: string;
|
|
350
375
|
links?: Record<string, string>;
|
|
351
376
|
tags?: string[];
|
package/ts/data/clusternode.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import { isSha256Digest, type TSha256Digest, type TImmutableContainerPlatform } from './immutableimage.js';
|
|
3
3
|
import type { ISparkNodeReportRecord } from './sparknodereport.js';
|
|
4
|
+
import type { IClusterNodeHostnameIntent } from './clusternodehostname.js';
|
|
4
5
|
import type { IPlatformObjectStorageEndpoint } from '../platform/objectstorage.js';
|
|
5
6
|
import type { IPlatformDatabaseEndpoint } from '../platform/database.js';
|
|
6
7
|
import {
|
|
@@ -1765,6 +1766,13 @@ export interface IClusterNode {
|
|
|
1765
1766
|
|
|
1766
1767
|
/** Separately accepted Pallet-era host report; never grants workload readiness. */
|
|
1767
1768
|
sparkNodeReport?: ISparkNodeReportRecord;
|
|
1769
|
+
|
|
1770
|
+
/**
|
|
1771
|
+
* The static hostname Cloudly wants this node to carry, which Spark applies on the host. The
|
|
1772
|
+
* node has converged when `sparkNodeReport` states the same hostname. Absent until enrollment
|
|
1773
|
+
* or a migration records one; Spark then leaves the host's hostname as it is.
|
|
1774
|
+
*/
|
|
1775
|
+
hostnameIntent?: IClusterNodeHostnameIntent;
|
|
1768
1776
|
|
|
1769
1777
|
/**
|
|
1770
1778
|
* Docker swarm node ID if part of swarm
|