@serve.zone/interfaces 16.7.0 → 17.0.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 +17 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/data/deploymentoperation.d.ts +4 -0
- package/dist_ts/data/deploymentoperation.js +1 -1
- package/dist_ts/data/gateway.d.ts +123 -6
- package/dist_ts/data/settings.d.ts +0 -2
- package/dist_ts/requests/gateway.d.ts +76 -1
- package/dist_ts/requests/mail.d.ts +3 -3
- package/package.json +1 -1
- package/readme.md +41 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/data/deploymentoperation.ts +4 -0
- package/ts/data/gateway.ts +150 -6
- package/ts/data/settings.ts +0 -4
- package/ts/requests/gateway.ts +96 -0
- package/ts/requests/mail.ts +3 -3
package/changelog.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2026-07-21 - 17.0.0
|
|
4
|
+
|
|
5
|
+
### Breaking Changes
|
|
6
|
+
|
|
7
|
+
- make gateway-client credential handover explicitly two-phase (gateway)
|
|
8
|
+
- Provisioning now returns an unfinalized candidate credential without revoking existing credentials.
|
|
9
|
+
- Add candidate-authenticated finalization to activate credentials and revoke superseded client-bound credentials.
|
|
10
|
+
- Remove caller-selected gateway client finalization and provisioning-time revocation counts from the gateway API contract.
|
|
11
|
+
|
|
12
|
+
## 2026-07-21 - 16.8.0
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
- add explicit gateway-route DNS modes, reconciliation outcomes, replaced-record evidence, and deployment verification retry metadata
|
|
17
|
+
- add canonical gateway-client policy, provisioning credential, and mail-overview contracts
|
|
18
|
+
- remove the legacy dedicated dcrouter ops-token setting from the Cloudly settings contract
|
|
19
|
+
|
|
3
20
|
## 2026-07-21 - 16.7.0
|
|
4
21
|
|
|
5
22
|
### Features
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@serve.zone/interfaces',
|
|
6
|
-
version: '
|
|
6
|
+
version: '17.0.0',
|
|
7
7
|
description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { IDeploymentPreflightProposedConfiguration, IDeploymentPreflightRuntimeTask } from './deploymentpreflight.js';
|
|
2
|
+
import type { IGatewayRouteDnsResult } from './gateway.js';
|
|
2
3
|
import type { IImageRolloutStatus, IImmutableImageDeploymentPlan, TSha256Digest } from './immutableimage.js';
|
|
3
4
|
import type { IRegistryTarget } from './registry.js';
|
|
4
5
|
import type { TServiceTargetPortRef } from './serviceports.js';
|
|
@@ -58,6 +59,9 @@ interface IDeploymentRouteVerificationEvidenceBase {
|
|
|
58
59
|
rolloutId: string;
|
|
59
60
|
rolloutGeneration: number;
|
|
60
61
|
expectedDigest: TSha256Digest;
|
|
62
|
+
gatewayDns?: IGatewayRouteDnsResult;
|
|
63
|
+
verificationAttemptCount?: number;
|
|
64
|
+
verificationStartedAt?: number;
|
|
61
65
|
}
|
|
62
66
|
export interface IDeploymentRouteVerificationSuccessEvidence extends IDeploymentRouteVerificationEvidenceBase {
|
|
63
67
|
outcome: 'succeeded';
|
|
@@ -226,4 +226,4 @@ export const validateDeploymentReservationInput = (inputArg) => {
|
|
|
226
226
|
}
|
|
227
227
|
return errors;
|
|
228
228
|
};
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentoperation.js","sourceRoot":"","sources":["../../ts/data/deploymentoperation.ts"],"names":[],"mappings":"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"}
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentoperation.js","sourceRoot":"","sources":["../../ts/data/deploymentoperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE1F,OAAO,EAAE,4BAA4B,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAqEtH,MAAM,sBAAsB,GAAG,4FAA4F,CAAC;AAE5H,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,WAAoB,EAAsB,EAAE;IACzF,IAAI,OAAO,WAAW,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACtD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACrE,OAAO,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpE,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,WAAmB,EACsB,EAAE;IAC3C,MAAM,QAAQ,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/E,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,QAAiC,EACb,EAAE;IACtB,MAAM,MAAM,GAAG,6BAA6B,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,QAAQ,CAAC,oBAAoB,KAAK,SAAS;eAC7C,QAAQ,CAAC,oBAAoB,KAAK,MAAM,CAAC,QAAQ;YACpD,CAAC,CAAC,MAAM,CAAC,QAAQ;YACjB,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,oBAAoB;QAAE,OAAO,SAAS,CAAC;IACrD,MAAM,kBAAkB,GAAG,6BAA6B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACxF,OAAO,kBAAkB;WACpB,CAAC,kBAAkB,CAAC,QAAQ;WAC5B,kBAAkB,CAAC,cAAc,KAAK,MAAM,CAAC,cAAc;QAC9D,CAAC,CAAC,kBAAkB,CAAC,QAAQ;QAC7B,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC,OAAiB,EAAsB,EAAE;IACxF,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC3E,MAAM,IAAI,GAAG,OAAO,IAAI,GAAG,CAAC;IAC5B,OAAO,mDAAmD,CAAC,IAAI,CAAC,IAAI,CAAC;QACnE,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,qCAAqC,CAAC;AACxE,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAC9C,MAAM,oBAAoB,GAAG,4MAA4M,CAAC;AAE1O,MAAM,QAAQ,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAAC,CAC3E,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC9E,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,QAAiB,EACjB,WAAmB,EACnB,YAA2C,EACrB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;OAC7C,QAAQ,CAAC,MAAM,IAAI,WAAW;OAC9B,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ;WACrD,OAAO,CAAC,MAAM,GAAG,CAAC;WAClB,OAAO,CAAC,MAAM,IAAI,GAAG;WACrB,YAAY,CAAC,OAAO,CAAC,CAAC;OACxB,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,gBAAyB,EACf,EAAE;IACZ,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAAE,OAAO,CAAC,yCAAyC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,gBAAgB,CAAC,aAAa,KAAK,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACjF,IAAI,OAAO,gBAAgB,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,OAAO,gBAAgB,CAAC,WAAW,KAAK,QAAQ;WAC/C,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,EAAE;WACpC,gBAAgB,CAAC,WAAW,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAC7E,8CAA8C,CAAC,IAAI,CAAC,WAAW,CAAC,CACjE,CAAC,EAAE,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;IAC/E,CAAC;IACD,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAC1E,8BAA8B,CAAC,SAAS,CAAC,KAAK,SAAS,CACxD,CAAC,EAAE,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,wBAAwB,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CACpF,OAAO,CAAC,MAAM,IAAI,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAC5D,CAAC,EAAE,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAC3E,KAAK,CAAC,MAAM,IAAI,GAAG,IAAI,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CACnE,CAAC,EAAE,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CACpD,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CACzF,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,CAAC,IAAI,CAAC,GAAG,4BAA4B,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7E,MAAM,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC3F,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC;WAC1C,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAC9D,MAAM,sBAAsB,GAAG,IAAI,GAAG,CACpC,gBAAgB,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,CAC/E,OAAO,OAAO,KAAK,QAAQ,CAC5B,CAAC,CACH,CAAC;QACF,IAAI,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CACjD,QAAQ,CAAC,OAAO,CAAC;eACd,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;eACrC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CACjD,CAAC,EAAE,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC;WAC9C,gBAAgB,CAAC,cAAc,CAAC,MAAM,GAAG,EAAE;WAC3C,gBAAgB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC;eAC9E,OAAO,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,CAAC;WACjC,IAAI,GAAG,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,gBAAgB,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC9F,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;WAC5C,gBAAgB,CAAC,YAAY,CAAC,MAAM,GAAG,EAAE;WACzC,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;eAClE,OAAO,QAAQ,CAAC,SAAS,KAAK,QAAQ;eACtC,CAAC,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;eACtD,4BAA4B,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,SAAS;eACvE,CAAC,QAAQ,CAAC,YAAY,KAAK,WAAW,IAAI,QAAQ,CAAC,YAAY,KAAK,WAAW,CAAC;eAChF,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS;mBAChC,QAAQ,CAAC,UAAU,KAAK,UAAU;mBAClC,QAAQ,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;WACpD,gBAAgB,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;WAChD,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAC/D,aAAa,KAAK,UAAU,IAAI,aAAa,KAAK,eAAe,CAClE,CAAC;WACC,IAAI,GAAG,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,IAAI;gBAChD,gBAAgB,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,QAAiB,EAAY,EAAE;IAChF,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,CAAC,qCAAqC,CAAC,CAAC;IACxE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,QAAQ,CAAC,IAAI,KAAK,kBAAkB,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IACjF,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,CAAU,EAAE,CAAC;QAC/E,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,QAAQ;eAClC,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAW,CAAC,EAAE,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,yCAAyC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IACD,IAAI,OAAO,QAAQ,CAAC,cAAc,KAAK,QAAQ;WAC1C,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACzF,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,CAAC;QAC5D,CAAC,CAAC,QAAQ,CAAC,qBAAqB;QAChC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,CAAC,IAAI,CAAC,GAAG,uCAAuC,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACxF,MAAM,cAAc,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC;QACjF,CAAC,CAAC,aAAa,CAAC,cAAc;QAC9B,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,aAAa,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC;QAC/E,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,SAAS,EAAuB,EAAE,CAAC,CACvE,OAAO,SAAS,KAAK,QAAQ,CAC9B,CAAC;QACF,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,aAAa,EAAE,mBAAmB,KAAK,IAAI,EAAE,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,cAAc,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAC/C,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAC5F,CAAC,CAAC;IACH,IAAI,CAAC,MAAM;WACN,MAAM,CAAC,MAAM,GAAG,EAAE;WAClB,CAAC,cAAc;WACf,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM;WACtD,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;mBAClB,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;mBACrC,8BAA8B,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,QAAQ;mBACvE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC;mBACzC,QAAQ,CAAC,UAAqB,GAAG,CAAC;mBAClC,QAAQ,CAAC,UAAqB,GAAG,KAAK;mBACvC,CAAC,cAAc,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,UAAU,GAAG,QAA8C,CAAC;YAClE,OAAO,sCAAsC,CAAC,UAAU,CAAC,KAAK,SAAS;mBAClE,CAAC,QAAQ,CAAC,aAAa,KAAK,SAAS;uBACnC,CAAC,OAAO,QAAQ,CAAC,aAAa,KAAK,QAAQ;2BACzC,gCAAgC,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,QAAQ,CAAC,aAAa,CAAC,CAAC;mBACzF,CAAC,QAAQ,CAAC,mBAAmB,KAAK,SAAS;uBACzC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;2BAC3C,QAAQ,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC;2BACvC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,GAAG,EAAE;2BACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,mBAAmB,CAAC,MAAM;2BAClF,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC;+BAC/E,SAAS,GAAG,GAAG,IAAI,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;IAC1F,CAAC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACnC,IAAI,QAAQ,CAAC,yBAAyB,KAAK,SAAS;eAC/C,QAAQ,CAAC,wBAAwB,KAAK,SAAS,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QACjF,CAAC;QACD,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAsB,EAAE,CAAC,CACjF,OAAO,QAAQ,KAAK,QAAQ,CAC7B,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,yBAAyB,CAAC;eACvD,QAAQ,CAAC,yBAAoC,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,QAAQ,CAAC,wBAAwB,KAAK,SAAS;eAC9C,CAAC,OAAO,QAAQ,CAAC,wBAAwB,KAAK,QAAQ;mBACpD,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -7,6 +7,55 @@ export type TGatewayClientType = 'onebox' | 'cloudly' | 'custom';
|
|
|
7
7
|
* Canonical managed route purposes understood by gateways.
|
|
8
8
|
*/
|
|
9
9
|
export type TManagedRouteKind = 'letsencrypt-http01-forward';
|
|
10
|
+
/**
|
|
11
|
+
* DNS handling requested alongside a gateway route synchronization.
|
|
12
|
+
*
|
|
13
|
+
* - 'reconcile' claims or replaces exact-host manual A, AAAA, and CNAME
|
|
14
|
+
* records, including already-correct records, with gateway-managed state.
|
|
15
|
+
* - 'observe' reports DNS state without mutating it.
|
|
16
|
+
* - 'skip' bypasses DNS inspection and mutation and is the default when omitted.
|
|
17
|
+
*/
|
|
18
|
+
export type TGatewayRouteDnsMode = 'reconcile' | 'observe' | 'skip';
|
|
19
|
+
/**
|
|
20
|
+
* Detailed DNS outcome reported by a gateway route synchronization.
|
|
21
|
+
*/
|
|
22
|
+
export type TGatewayRouteDnsStatus = 'not-applicable' | 'skipped' | 'managed-created' | 'managed-updated' | 'managed-overwrote-manual' | 'managed-unchanged' | 'observed-satisfied' | 'managed-deleted' | 'managed-orphan-deleted' | 'record-missing' | 'target-invalid' | 'zone-unmanaged' | 'zone-unavailable' | 'record-conflict' | 'mutation-failed' | 'compensation-failed';
|
|
23
|
+
/**
|
|
24
|
+
* DNS record evidence attached to a gateway route synchronization result.
|
|
25
|
+
*/
|
|
26
|
+
export interface IGatewayRouteDnsRecord {
|
|
27
|
+
id?: string;
|
|
28
|
+
type: 'A' | 'AAAA' | 'CNAME';
|
|
29
|
+
name: string;
|
|
30
|
+
value: string;
|
|
31
|
+
ttl: number;
|
|
32
|
+
proxied?: boolean;
|
|
33
|
+
managed: boolean;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* DNS reconciliation or observation result for a gateway route.
|
|
37
|
+
*/
|
|
38
|
+
export interface IGatewayRouteDnsResult {
|
|
39
|
+
success: boolean;
|
|
40
|
+
retryable: boolean;
|
|
41
|
+
mode: TGatewayRouteDnsMode;
|
|
42
|
+
status: TGatewayRouteDnsStatus;
|
|
43
|
+
hostname?: string;
|
|
44
|
+
targetIp?: string;
|
|
45
|
+
/** Desired gateway-managed address record type. CNAME appears only in record evidence. */
|
|
46
|
+
recordType?: 'A' | 'AAAA';
|
|
47
|
+
zoneId?: string;
|
|
48
|
+
zoneName?: string;
|
|
49
|
+
nameservers?: string[];
|
|
50
|
+
records?: IGatewayRouteDnsRecord[];
|
|
51
|
+
/** Prior manual records replaced by this reconciliation, preserved as evidence. */
|
|
52
|
+
overwrittenRecords?: IGatewayRouteDnsRecord[];
|
|
53
|
+
/** Time at which the gateway checked the DNS state, as Unix epoch milliseconds. */
|
|
54
|
+
checkedAt: number;
|
|
55
|
+
/** Time at which authoritative DNS verified the desired state, as Unix epoch milliseconds. */
|
|
56
|
+
authoritativeVerifiedAt?: number;
|
|
57
|
+
message?: string;
|
|
58
|
+
}
|
|
10
59
|
/**
|
|
11
60
|
* Identity attached to gateway requests. Gateways run their own user/auth
|
|
12
61
|
* domain (e.g. dcrouter operator accounts), so role/type stay open strings;
|
|
@@ -64,8 +113,12 @@ export interface IGatewayCapabilities {
|
|
|
64
113
|
export interface IGatewayTokenCapabilities {
|
|
65
114
|
readDomains?: boolean;
|
|
66
115
|
readDnsRecords?: boolean;
|
|
116
|
+
readRoutes?: boolean;
|
|
67
117
|
syncRoutes?: boolean;
|
|
68
118
|
syncDnsRecords?: boolean;
|
|
119
|
+
readMail?: boolean;
|
|
120
|
+
manageMail?: boolean;
|
|
121
|
+
readCertificates?: boolean;
|
|
69
122
|
requestCertificates?: boolean;
|
|
70
123
|
}
|
|
71
124
|
/**
|
|
@@ -74,22 +127,84 @@ export interface IGatewayTokenCapabilities {
|
|
|
74
127
|
export interface IGatewayRouteTargetAllowance {
|
|
75
128
|
host: string;
|
|
76
129
|
ports: number[];
|
|
130
|
+
/** Allows every port for this host only; it never broadens another host allowance. */
|
|
131
|
+
allowAnyPort?: boolean;
|
|
132
|
+
}
|
|
133
|
+
/** Public gateway-client policy and lifecycle state. */
|
|
134
|
+
export interface IGatewayClient {
|
|
135
|
+
id: string;
|
|
136
|
+
type: TGatewayClientType;
|
|
137
|
+
name: string;
|
|
138
|
+
description?: string;
|
|
139
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
140
|
+
hostnamePatterns: string[];
|
|
141
|
+
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
142
|
+
capabilities: IGatewayTokenCapabilities;
|
|
143
|
+
enabled: boolean;
|
|
144
|
+
tokenCount?: number;
|
|
145
|
+
/** Generation of the durable live policy document. */
|
|
146
|
+
policyGeneration: number;
|
|
147
|
+
createdAt: number;
|
|
148
|
+
updatedAt: number;
|
|
149
|
+
createdBy: string;
|
|
150
|
+
}
|
|
151
|
+
/** Complete desired state used for idempotent gateway-client provisioning. */
|
|
152
|
+
export interface IGatewayClientProvisioningSpec {
|
|
153
|
+
id: string;
|
|
154
|
+
type: TGatewayClientType;
|
|
155
|
+
name: string;
|
|
156
|
+
description?: string;
|
|
157
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
158
|
+
hostnamePatterns: string[];
|
|
159
|
+
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
160
|
+
capabilities: IGatewayTokenCapabilities;
|
|
161
|
+
enabled?: boolean;
|
|
77
162
|
}
|
|
163
|
+
/**
|
|
164
|
+
* One-time credential material returned after durable token creation.
|
|
165
|
+
*
|
|
166
|
+
* Provisioning creates a candidate only. Existing client-bound credentials
|
|
167
|
+
* remain active until the candidate authenticates the explicit finalization
|
|
168
|
+
* request, preventing a lost provisioning response from locking out the
|
|
169
|
+
* gateway client.
|
|
170
|
+
*/
|
|
171
|
+
export interface IGatewayClientCredential {
|
|
172
|
+
tokenId: string;
|
|
173
|
+
tokenValue: string;
|
|
174
|
+
issuedAt: number;
|
|
175
|
+
state: 'candidate';
|
|
176
|
+
finalizationRequired: true;
|
|
177
|
+
}
|
|
178
|
+
export type TGatewayClientProvisioningAction = 'created' | 'updated' | 'unchanged';
|
|
78
179
|
/**
|
|
79
180
|
* Resolved auth context for a gateway client token, as reported by the gateway.
|
|
80
181
|
* Scopes are gateway-defined strings; the closed scope list lives in the gateway.
|
|
81
182
|
*/
|
|
82
|
-
|
|
83
|
-
role: TGatewayTokenRole;
|
|
183
|
+
interface IGatewayClientContextBase {
|
|
84
184
|
scopes: string[];
|
|
85
|
-
|
|
86
|
-
type: TGatewayClientType;
|
|
87
|
-
id: string;
|
|
88
|
-
};
|
|
185
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
89
186
|
hostnamePatterns: string[];
|
|
90
187
|
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
91
188
|
capabilities: IGatewayTokenCapabilities;
|
|
92
189
|
}
|
|
190
|
+
/**
|
|
191
|
+
* Resolved authorization context. A gateway-client role always proves the
|
|
192
|
+
* concrete credential, bound client, and current live policy generation.
|
|
193
|
+
* Admin/operator contexts remain unbound for backward compatibility.
|
|
194
|
+
*/
|
|
195
|
+
export type IGatewayClientContext = IGatewayClientContextBase & ({
|
|
196
|
+
role: 'gatewayClient';
|
|
197
|
+
credentialId: string;
|
|
198
|
+
gatewayClient: {
|
|
199
|
+
type: TGatewayClientType;
|
|
200
|
+
id: string;
|
|
201
|
+
policyGeneration: number;
|
|
202
|
+
};
|
|
203
|
+
} | {
|
|
204
|
+
role: 'admin' | 'operator';
|
|
205
|
+
credentialId?: never;
|
|
206
|
+
gatewayClient?: never;
|
|
207
|
+
});
|
|
93
208
|
/**
|
|
94
209
|
* Where a gateway-managed domain is sourced from.
|
|
95
210
|
*
|
|
@@ -260,5 +375,7 @@ export interface IGatewayRouteSyncResult {
|
|
|
260
375
|
success: boolean;
|
|
261
376
|
action?: 'created' | 'updated' | 'deleted' | 'unchanged';
|
|
262
377
|
routeId?: string;
|
|
378
|
+
dns?: IGatewayRouteDnsResult;
|
|
263
379
|
message?: string;
|
|
264
380
|
}
|
|
381
|
+
export {};
|
|
@@ -11,7 +11,6 @@ export interface ICloudlySettings {
|
|
|
11
11
|
backupNodeCacheKeepDays?: string;
|
|
12
12
|
dcrouterGatewayUrl?: string;
|
|
13
13
|
dcrouterGatewayApiToken?: string;
|
|
14
|
-
dcrouterOpsApiToken?: string;
|
|
15
14
|
dcrouterGatewayClientId?: string;
|
|
16
15
|
dcrouterTargetHost?: string;
|
|
17
16
|
dcrouterTargetPort?: string;
|
|
@@ -43,7 +42,6 @@ export interface ICloudlySettings {
|
|
|
43
42
|
scalewayAccessKey?: string;
|
|
44
43
|
scalewaySecretKey?: string;
|
|
45
44
|
scalewayOrganizationId?: string;
|
|
46
|
-
[key: string]: string | undefined;
|
|
47
45
|
}
|
|
48
46
|
/**
|
|
49
47
|
* Interface for masked settings (used in API responses)
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
import type { IGatewayCapabilities, IGatewayClientContext, IGatewayClientOwnership, IGatewayClientRoute, IGatewayDnsRecord, IGatewayDomain, IGatewayIdentity, IGatewayRouteConfig, IGatewayRouteSyncResult } from '../data/gateway.js';
|
|
2
|
+
import type { IGatewayCapabilities, IGatewayClient, IGatewayClientCredential, IGatewayClientProvisioningSpec, IGatewayClientContext, IGatewayClientOwnership, IGatewayClientRoute, IGatewayDnsRecord, IGatewayDomain, IGatewayIdentity, IGatewayRouteConfig, IGatewayRouteSyncResult, TGatewayRouteDnsMode, TGatewayClientProvisioningAction } from '../data/gateway.js';
|
|
3
|
+
import type { IMailOverviewDomain, IMailOverviewEmail } from './mail.js';
|
|
3
4
|
/**
|
|
4
5
|
* Gateway client contracts: the machine-facing API a gateway (dcrouter)
|
|
5
6
|
* serves to gateway clients (Onebox, Cloudly/Coreflow).
|
|
@@ -31,6 +32,74 @@ export interface IReq_GetGatewayClientContext extends plugins.typedrequestInterf
|
|
|
31
32
|
capabilities: IGatewayCapabilities;
|
|
32
33
|
};
|
|
33
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Admin-only gateway-client upsert and candidate credential issue.
|
|
37
|
+
* Provisioning never revokes prior client-bound credentials. The returned
|
|
38
|
+
* candidate must prove possession through finalizeGatewayClientCredential
|
|
39
|
+
* before the gateway activates it and revokes superseded siblings.
|
|
40
|
+
*/
|
|
41
|
+
export interface IReq_ProvisionGatewayClientCredential extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_ProvisionGatewayClientCredential> {
|
|
42
|
+
method: 'provisionGatewayClientCredential';
|
|
43
|
+
request: {
|
|
44
|
+
/** Admin authentication is intentionally kept at the deployed top level. */
|
|
45
|
+
identity?: IGatewayIdentity;
|
|
46
|
+
apiToken?: string;
|
|
47
|
+
provisioning: IGatewayClientProvisioningSpec;
|
|
48
|
+
credentialName?: string;
|
|
49
|
+
expiresInDays?: number | null;
|
|
50
|
+
};
|
|
51
|
+
response: {
|
|
52
|
+
success: true;
|
|
53
|
+
action: TGatewayClientProvisioningAction;
|
|
54
|
+
gatewayClient: IGatewayClient;
|
|
55
|
+
/** One-time, unfinalized credential material returned after durable creation. */
|
|
56
|
+
credential: IGatewayClientCredential;
|
|
57
|
+
message?: string;
|
|
58
|
+
} | {
|
|
59
|
+
success: false;
|
|
60
|
+
message: string;
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Candidate-authenticated completion of a gateway-client credential handover.
|
|
65
|
+
* The gateway resolves client ownership from the candidate token itself; the
|
|
66
|
+
* caller cannot select a gateway client or finalize another credential.
|
|
67
|
+
*/
|
|
68
|
+
export interface IReq_FinalizeGatewayClientCredential extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_FinalizeGatewayClientCredential> {
|
|
69
|
+
method: 'finalizeGatewayClientCredential';
|
|
70
|
+
request: {
|
|
71
|
+
/** The one-time candidate token value returned by provisioning. */
|
|
72
|
+
apiToken: string;
|
|
73
|
+
/** Must identify the same candidate credential as apiToken. */
|
|
74
|
+
tokenId: string;
|
|
75
|
+
/** Admin/operator identities cannot finalize a candidate by substitution. */
|
|
76
|
+
identity?: never;
|
|
77
|
+
};
|
|
78
|
+
response: {
|
|
79
|
+
success: true;
|
|
80
|
+
gatewayClientId: string;
|
|
81
|
+
tokenId: string;
|
|
82
|
+
revokedCredentialCount: number;
|
|
83
|
+
finalizedAt: number;
|
|
84
|
+
message?: string;
|
|
85
|
+
} | {
|
|
86
|
+
success: false;
|
|
87
|
+
message: string;
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
/** Gateway-client-scoped read-only email-domain and recent-email overview. */
|
|
91
|
+
export interface IReq_GetGatewayClientMailOverview extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetGatewayClientMailOverview> {
|
|
92
|
+
method: 'getGatewayClientMailOverview';
|
|
93
|
+
request: {
|
|
94
|
+
identity?: IGatewayIdentity;
|
|
95
|
+
apiToken?: string;
|
|
96
|
+
limit?: number;
|
|
97
|
+
};
|
|
98
|
+
response: {
|
|
99
|
+
domains: IMailOverviewDomain[];
|
|
100
|
+
emails: IMailOverviewEmail[];
|
|
101
|
+
};
|
|
102
|
+
}
|
|
34
103
|
export interface IReq_GetGatewayClientDomains extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_GetGatewayClientDomains> {
|
|
35
104
|
method: 'getGatewayClientDomains';
|
|
36
105
|
request: {
|
|
@@ -73,6 +142,12 @@ export interface IReq_SyncGatewayClientRoute extends plugins.typedrequestInterfa
|
|
|
73
142
|
route?: IGatewayRouteConfig;
|
|
74
143
|
enabled?: boolean;
|
|
75
144
|
delete?: boolean;
|
|
145
|
+
/**
|
|
146
|
+
* Omission means 'skip' for backward wire compatibility. Reconciliation
|
|
147
|
+
* claims or replaces exact-host manual A, AAAA, and CNAME records even
|
|
148
|
+
* when their current value already satisfies the desired address.
|
|
149
|
+
*/
|
|
150
|
+
dnsMode?: TGatewayRouteDnsMode;
|
|
76
151
|
/**
|
|
77
152
|
* Gateway source profile to bind the route to (by ref or name).
|
|
78
153
|
* Defaults to the gateway's public profile when omitted.
|
|
@@ -216,8 +216,8 @@ export interface IReq_EnqueueMail extends plugins.typedrequestInterfaces.impleme
|
|
|
216
216
|
};
|
|
217
217
|
}
|
|
218
218
|
/**
|
|
219
|
-
*
|
|
220
|
-
*
|
|
219
|
+
* Shared read-only mail overview used by the gateway-client API and Cloudly UI:
|
|
220
|
+
* configured email domains and recent queue entries.
|
|
221
221
|
*/
|
|
222
222
|
export interface IMailOverviewDomain {
|
|
223
223
|
domain: string;
|
|
@@ -239,7 +239,7 @@ export interface IReq_Any_Cloudly_GetMailOverview extends plugins.typedrequestIn
|
|
|
239
239
|
identity: IIdentity;
|
|
240
240
|
};
|
|
241
241
|
response: {
|
|
242
|
-
/** False when no dcrouter
|
|
242
|
+
/** False when no dcrouter gateway-client credential is configured. */
|
|
243
243
|
configured: boolean;
|
|
244
244
|
gatewayUrl?: string;
|
|
245
245
|
domains: IMailOverviewDomain[];
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -156,6 +156,46 @@ The immutable deployment workflow is:
|
|
|
156
156
|
|
|
157
157
|
Gateway request contracts include `getGatewayClientRoutes` (`requests.gateway.IReq_GetGatewayClientRoutes`) for listing owned `IGatewayClientRoute[]` route views, and `syncGatewayClientRoute` for idempotently syncing or deleting hostname-owned, routeRef-owned, and combined hostname-plus-routeRef routes. A client can label canonical intent with `managedRouteKind: 'letsencrypt-http01-forward'` and set a higher `priority` for a path-specific HTTP-01 route while retaining a separate normal route for the same hostname. Mail request contracts include `syncMailAddressBinding`, `deleteMailAddressBinding`, `rotateMailCredential`, and `getMailDeliveryStatus`. `IReq_GetMailDeliveryStatus` looks up a delivery spool item by `spoolItemId`, returns `data.IMailDeliveryStatus`, and accepts `IMailSubmissionRequestAuth` so service-mail credentials can query their own accepted, queued, deferred, delivered, or failed status. `TMailAddressBindingSync.outboundEnabled` explicitly controls whether a gateway should maintain a managed outbound SMTP credential for an address binding. Binding credential metadata is public; `rotateMailCredential` returns the new secret only in its one-time `IMailCredentialOneTimeSecret` response.
|
|
158
158
|
|
|
159
|
+
### Gateway Client Lifecycle and DNS
|
|
160
|
+
|
|
161
|
+
`syncGatewayClientRoute` accepts an optional `dnsMode`. Omission means `skip` for older clients. `observe` reports DNS without changing it. `reconcile` makes the gateway authoritative for the exact route hostname: it claims or replaces manual A, AAAA, and CNAME records, including already-correct manual values. Its optional `dns` result contains a closed status, retryability, the desired A/AAAA target, overwritten-record evidence, `checkedAt`, and `authoritativeVerifiedAt` once the provider or authoritative server confirms the state. Consumers can carry that evidence while retrying public propagation instead of treating an immediate recursive lookup miss as permanent.
|
|
162
|
+
|
|
163
|
+
Use `requests.gateway.IReq_ProvisionGatewayClientCredential` to replace an admin/bootstrap token with a first-class gateway-client credential. The admin-authenticated request idempotently upserts a `data.IGatewayClient`, durably creates a new bound credential, returns its raw value once, and then revokes older credentials bound to that client. It never revokes the bootstrap/admin credential. A successful response is discriminated with `success: true` and always includes the action, durable client, one-time credential, and revocation count.
|
|
164
|
+
|
|
165
|
+
```typescript
|
|
166
|
+
import { requests } from '@serve.zone/interfaces';
|
|
167
|
+
|
|
168
|
+
const provisioning: requests.gateway.IReq_ProvisionGatewayClientCredential['request'] = {
|
|
169
|
+
apiToken: 'admin-bootstrap-token',
|
|
170
|
+
provisioning: {
|
|
171
|
+
id: 'cloudly-main',
|
|
172
|
+
type: 'cloudly',
|
|
173
|
+
name: 'Cloudly main',
|
|
174
|
+
hostnamePatterns: ['*'],
|
|
175
|
+
allowedRouteTargets: [
|
|
176
|
+
{
|
|
177
|
+
host: 'coretraffic.internal',
|
|
178
|
+
ports: [],
|
|
179
|
+
allowAnyPort: true,
|
|
180
|
+
},
|
|
181
|
+
],
|
|
182
|
+
capabilities: {
|
|
183
|
+
readDomains: true,
|
|
184
|
+
readDnsRecords: true,
|
|
185
|
+
readRoutes: true,
|
|
186
|
+
syncRoutes: true,
|
|
187
|
+
syncDnsRecords: true,
|
|
188
|
+
readMail: true,
|
|
189
|
+
manageMail: true,
|
|
190
|
+
readCertificates: true,
|
|
191
|
+
requestCertificates: true,
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
};
|
|
195
|
+
```
|
|
196
|
+
|
|
197
|
+
`getGatewayClientContext` returns effective live policy. A `gatewayClient` role necessarily includes the credential ID, bound client ID/type, and `policyGeneration`; consumers should reject admin/operator or mismatched contexts rather than falling back to a caller-supplied owner ID. `getGatewayClientMailOverview` provides an owner-scoped domain and recent-message summary. Cloudly therefore uses only `dcrouterGatewayApiToken`; the former `dcrouterOpsApiToken` setting is not part of `data.ICloudlySettings`.
|
|
198
|
+
|
|
159
199
|
Request groups are exported by product area:
|
|
160
200
|
|
|
161
201
|
- `requests.admin`
|
|
@@ -267,7 +307,7 @@ Use of these trademarks must comply with Task Venture Capital GmbH's Trademark G
|
|
|
267
307
|
|
|
268
308
|
### Company Information
|
|
269
309
|
|
|
270
|
-
Task Venture Capital GmbH
|
|
310
|
+
Task Venture Capital GmbH<br>
|
|
271
311
|
Registered at District Court Bremen HRB 35230 HB, Germany
|
|
272
312
|
|
|
273
313
|
For any legal inquiries or further information, please contact us via email at hello@task.vc.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { IDeploymentPreflightProposedConfiguration, IDeploymentPreflightRuntimeTask } from './deploymentpreflight.js';
|
|
2
|
+
import type { IGatewayRouteDnsResult } from './gateway.js';
|
|
2
3
|
import type { IImageRolloutStatus, IImmutableImageDeploymentPlan, TSha256Digest } from './immutableimage.js';
|
|
3
4
|
import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
|
|
4
5
|
import type { IRegistryTarget } from './registry.js';
|
|
@@ -342,6 +343,9 @@ interface IDeploymentRouteVerificationEvidenceBase {
|
|
|
342
343
|
rolloutId: string;
|
|
343
344
|
rolloutGeneration: number;
|
|
344
345
|
expectedDigest: TSha256Digest;
|
|
346
|
+
gatewayDns?: IGatewayRouteDnsResult;
|
|
347
|
+
verificationAttemptCount?: number;
|
|
348
|
+
verificationStartedAt?: number;
|
|
345
349
|
}
|
|
346
350
|
|
|
347
351
|
export interface IDeploymentRouteVerificationSuccessEvidence
|
package/ts/data/gateway.ts
CHANGED
|
@@ -10,6 +10,75 @@ export type TGatewayClientType = 'onebox' | 'cloudly' | 'custom';
|
|
|
10
10
|
*/
|
|
11
11
|
export type TManagedRouteKind = 'letsencrypt-http01-forward';
|
|
12
12
|
|
|
13
|
+
/**
|
|
14
|
+
* DNS handling requested alongside a gateway route synchronization.
|
|
15
|
+
*
|
|
16
|
+
* - 'reconcile' claims or replaces exact-host manual A, AAAA, and CNAME
|
|
17
|
+
* records, including already-correct records, with gateway-managed state.
|
|
18
|
+
* - 'observe' reports DNS state without mutating it.
|
|
19
|
+
* - 'skip' bypasses DNS inspection and mutation and is the default when omitted.
|
|
20
|
+
*/
|
|
21
|
+
export type TGatewayRouteDnsMode = 'reconcile' | 'observe' | 'skip';
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Detailed DNS outcome reported by a gateway route synchronization.
|
|
25
|
+
*/
|
|
26
|
+
export type TGatewayRouteDnsStatus =
|
|
27
|
+
| 'not-applicable'
|
|
28
|
+
| 'skipped'
|
|
29
|
+
| 'managed-created'
|
|
30
|
+
| 'managed-updated'
|
|
31
|
+
| 'managed-overwrote-manual'
|
|
32
|
+
| 'managed-unchanged'
|
|
33
|
+
| 'observed-satisfied'
|
|
34
|
+
| 'managed-deleted'
|
|
35
|
+
| 'managed-orphan-deleted'
|
|
36
|
+
| 'record-missing'
|
|
37
|
+
| 'target-invalid'
|
|
38
|
+
| 'zone-unmanaged'
|
|
39
|
+
| 'zone-unavailable'
|
|
40
|
+
| 'record-conflict'
|
|
41
|
+
| 'mutation-failed'
|
|
42
|
+
| 'compensation-failed';
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* DNS record evidence attached to a gateway route synchronization result.
|
|
46
|
+
*/
|
|
47
|
+
export interface IGatewayRouteDnsRecord {
|
|
48
|
+
id?: string;
|
|
49
|
+
type: 'A' | 'AAAA' | 'CNAME';
|
|
50
|
+
name: string;
|
|
51
|
+
value: string;
|
|
52
|
+
ttl: number;
|
|
53
|
+
proxied?: boolean;
|
|
54
|
+
managed: boolean;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* DNS reconciliation or observation result for a gateway route.
|
|
59
|
+
*/
|
|
60
|
+
export interface IGatewayRouteDnsResult {
|
|
61
|
+
success: boolean;
|
|
62
|
+
retryable: boolean;
|
|
63
|
+
mode: TGatewayRouteDnsMode;
|
|
64
|
+
status: TGatewayRouteDnsStatus;
|
|
65
|
+
hostname?: string;
|
|
66
|
+
targetIp?: string;
|
|
67
|
+
/** Desired gateway-managed address record type. CNAME appears only in record evidence. */
|
|
68
|
+
recordType?: 'A' | 'AAAA';
|
|
69
|
+
zoneId?: string;
|
|
70
|
+
zoneName?: string;
|
|
71
|
+
nameservers?: string[];
|
|
72
|
+
records?: IGatewayRouteDnsRecord[];
|
|
73
|
+
/** Prior manual records replaced by this reconciliation, preserved as evidence. */
|
|
74
|
+
overwrittenRecords?: IGatewayRouteDnsRecord[];
|
|
75
|
+
/** Time at which the gateway checked the DNS state, as Unix epoch milliseconds. */
|
|
76
|
+
checkedAt: number;
|
|
77
|
+
/** Time at which authoritative DNS verified the desired state, as Unix epoch milliseconds. */
|
|
78
|
+
authoritativeVerifiedAt?: number;
|
|
79
|
+
message?: string;
|
|
80
|
+
}
|
|
81
|
+
|
|
13
82
|
/**
|
|
14
83
|
* Identity attached to gateway requests. Gateways run their own user/auth
|
|
15
84
|
* domain (e.g. dcrouter operator accounts), so role/type stay open strings;
|
|
@@ -70,8 +139,12 @@ export interface IGatewayCapabilities {
|
|
|
70
139
|
export interface IGatewayTokenCapabilities {
|
|
71
140
|
readDomains?: boolean;
|
|
72
141
|
readDnsRecords?: boolean;
|
|
142
|
+
readRoutes?: boolean;
|
|
73
143
|
syncRoutes?: boolean;
|
|
74
144
|
syncDnsRecords?: boolean;
|
|
145
|
+
readMail?: boolean;
|
|
146
|
+
manageMail?: boolean;
|
|
147
|
+
readCertificates?: boolean;
|
|
75
148
|
requestCertificates?: boolean;
|
|
76
149
|
}
|
|
77
150
|
|
|
@@ -81,24 +154,94 @@ export interface IGatewayTokenCapabilities {
|
|
|
81
154
|
export interface IGatewayRouteTargetAllowance {
|
|
82
155
|
host: string;
|
|
83
156
|
ports: number[];
|
|
157
|
+
/** Allows every port for this host only; it never broadens another host allowance. */
|
|
158
|
+
allowAnyPort?: boolean;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/** Public gateway-client policy and lifecycle state. */
|
|
162
|
+
export interface IGatewayClient {
|
|
163
|
+
id: string;
|
|
164
|
+
type: TGatewayClientType;
|
|
165
|
+
name: string;
|
|
166
|
+
description?: string;
|
|
167
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
168
|
+
hostnamePatterns: string[];
|
|
169
|
+
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
170
|
+
capabilities: IGatewayTokenCapabilities;
|
|
171
|
+
enabled: boolean;
|
|
172
|
+
tokenCount?: number;
|
|
173
|
+
/** Generation of the durable live policy document. */
|
|
174
|
+
policyGeneration: number;
|
|
175
|
+
createdAt: number;
|
|
176
|
+
updatedAt: number;
|
|
177
|
+
createdBy: string;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
/** Complete desired state used for idempotent gateway-client provisioning. */
|
|
181
|
+
export interface IGatewayClientProvisioningSpec {
|
|
182
|
+
id: string;
|
|
183
|
+
type: TGatewayClientType;
|
|
184
|
+
name: string;
|
|
185
|
+
description?: string;
|
|
186
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
187
|
+
hostnamePatterns: string[];
|
|
188
|
+
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
189
|
+
capabilities: IGatewayTokenCapabilities;
|
|
190
|
+
enabled?: boolean;
|
|
84
191
|
}
|
|
85
192
|
|
|
193
|
+
/**
|
|
194
|
+
* One-time credential material returned after durable token creation.
|
|
195
|
+
*
|
|
196
|
+
* Provisioning creates a candidate only. Existing client-bound credentials
|
|
197
|
+
* remain active until the candidate authenticates the explicit finalization
|
|
198
|
+
* request, preventing a lost provisioning response from locking out the
|
|
199
|
+
* gateway client.
|
|
200
|
+
*/
|
|
201
|
+
export interface IGatewayClientCredential {
|
|
202
|
+
tokenId: string;
|
|
203
|
+
tokenValue: string;
|
|
204
|
+
issuedAt: number;
|
|
205
|
+
state: 'candidate';
|
|
206
|
+
finalizationRequired: true;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
export type TGatewayClientProvisioningAction = 'created' | 'updated' | 'unchanged';
|
|
210
|
+
|
|
86
211
|
/**
|
|
87
212
|
* Resolved auth context for a gateway client token, as reported by the gateway.
|
|
88
213
|
* Scopes are gateway-defined strings; the closed scope list lives in the gateway.
|
|
89
214
|
*/
|
|
90
|
-
|
|
91
|
-
role: TGatewayTokenRole;
|
|
215
|
+
interface IGatewayClientContextBase {
|
|
92
216
|
scopes: string[];
|
|
93
|
-
|
|
94
|
-
type: TGatewayClientType;
|
|
95
|
-
id: string;
|
|
96
|
-
};
|
|
217
|
+
/** `*` matches any hostname under a managed zone; `*.zone` matches exactly one label. */
|
|
97
218
|
hostnamePatterns: string[];
|
|
98
219
|
allowedRouteTargets: IGatewayRouteTargetAllowance[];
|
|
99
220
|
capabilities: IGatewayTokenCapabilities;
|
|
100
221
|
}
|
|
101
222
|
|
|
223
|
+
/**
|
|
224
|
+
* Resolved authorization context. A gateway-client role always proves the
|
|
225
|
+
* concrete credential, bound client, and current live policy generation.
|
|
226
|
+
* Admin/operator contexts remain unbound for backward compatibility.
|
|
227
|
+
*/
|
|
228
|
+
export type IGatewayClientContext = IGatewayClientContextBase & (
|
|
229
|
+
| {
|
|
230
|
+
role: 'gatewayClient';
|
|
231
|
+
credentialId: string;
|
|
232
|
+
gatewayClient: {
|
|
233
|
+
type: TGatewayClientType;
|
|
234
|
+
id: string;
|
|
235
|
+
policyGeneration: number;
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
| {
|
|
239
|
+
role: 'admin' | 'operator';
|
|
240
|
+
credentialId?: never;
|
|
241
|
+
gatewayClient?: never;
|
|
242
|
+
}
|
|
243
|
+
);
|
|
244
|
+
|
|
102
245
|
/**
|
|
103
246
|
* Where a gateway-managed domain is sourced from.
|
|
104
247
|
*
|
|
@@ -280,5 +423,6 @@ export interface IGatewayRouteSyncResult {
|
|
|
280
423
|
success: boolean;
|
|
281
424
|
action?: 'created' | 'updated' | 'deleted' | 'unchanged';
|
|
282
425
|
routeId?: string;
|
|
426
|
+
dns?: IGatewayRouteDnsResult;
|
|
283
427
|
message?: string;
|
|
284
428
|
}
|
package/ts/data/settings.ts
CHANGED
|
@@ -29,7 +29,6 @@ export interface ICloudlySettings {
|
|
|
29
29
|
// static dcrouterTargetHost (e.g. {"worker-a":"192.0.2.10"}).
|
|
30
30
|
dcrouterGatewayUrl?: string;
|
|
31
31
|
dcrouterGatewayApiToken?: string;
|
|
32
|
-
dcrouterOpsApiToken?: string;
|
|
33
32
|
dcrouterGatewayClientId?: string;
|
|
34
33
|
dcrouterTargetHost?: string;
|
|
35
34
|
dcrouterTargetPort?: string;
|
|
@@ -84,9 +83,6 @@ export interface ICloudlySettings {
|
|
|
84
83
|
scalewayAccessKey?: string;
|
|
85
84
|
scalewaySecretKey?: string;
|
|
86
85
|
scalewayOrganizationId?: string;
|
|
87
|
-
|
|
88
|
-
// Other settings that might be added in the future
|
|
89
|
-
[key: string]: string | undefined;
|
|
90
86
|
}
|
|
91
87
|
|
|
92
88
|
/**
|
package/ts/requests/gateway.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
2
|
import type {
|
|
3
3
|
IGatewayCapabilities,
|
|
4
|
+
IGatewayClient,
|
|
5
|
+
IGatewayClientCredential,
|
|
6
|
+
IGatewayClientProvisioningSpec,
|
|
4
7
|
IGatewayClientContext,
|
|
5
8
|
IGatewayClientOwnership,
|
|
6
9
|
IGatewayClientRoute,
|
|
@@ -9,7 +12,10 @@ import type {
|
|
|
9
12
|
IGatewayIdentity,
|
|
10
13
|
IGatewayRouteConfig,
|
|
11
14
|
IGatewayRouteSyncResult,
|
|
15
|
+
TGatewayRouteDnsMode,
|
|
16
|
+
TGatewayClientProvisioningAction,
|
|
12
17
|
} from '../data/gateway.js';
|
|
18
|
+
import type { IMailOverviewDomain, IMailOverviewEmail } from './mail.js';
|
|
13
19
|
|
|
14
20
|
/**
|
|
15
21
|
* Gateway client contracts: the machine-facing API a gateway (dcrouter)
|
|
@@ -51,6 +57,90 @@ export interface IReq_GetGatewayClientContext extends plugins.typedrequestInterf
|
|
|
51
57
|
};
|
|
52
58
|
}
|
|
53
59
|
|
|
60
|
+
/**
|
|
61
|
+
* Admin-only gateway-client upsert and candidate credential issue.
|
|
62
|
+
* Provisioning never revokes prior client-bound credentials. The returned
|
|
63
|
+
* candidate must prove possession through finalizeGatewayClientCredential
|
|
64
|
+
* before the gateway activates it and revokes superseded siblings.
|
|
65
|
+
*/
|
|
66
|
+
export interface IReq_ProvisionGatewayClientCredential extends plugins.typedrequestInterfaces.implementsTR<
|
|
67
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
68
|
+
IReq_ProvisionGatewayClientCredential
|
|
69
|
+
> {
|
|
70
|
+
method: 'provisionGatewayClientCredential';
|
|
71
|
+
request: {
|
|
72
|
+
/** Admin authentication is intentionally kept at the deployed top level. */
|
|
73
|
+
identity?: IGatewayIdentity;
|
|
74
|
+
apiToken?: string;
|
|
75
|
+
provisioning: IGatewayClientProvisioningSpec;
|
|
76
|
+
credentialName?: string;
|
|
77
|
+
expiresInDays?: number | null;
|
|
78
|
+
};
|
|
79
|
+
response:
|
|
80
|
+
| {
|
|
81
|
+
success: true;
|
|
82
|
+
action: TGatewayClientProvisioningAction;
|
|
83
|
+
gatewayClient: IGatewayClient;
|
|
84
|
+
/** One-time, unfinalized credential material returned after durable creation. */
|
|
85
|
+
credential: IGatewayClientCredential;
|
|
86
|
+
message?: string;
|
|
87
|
+
}
|
|
88
|
+
| {
|
|
89
|
+
success: false;
|
|
90
|
+
message: string;
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Candidate-authenticated completion of a gateway-client credential handover.
|
|
96
|
+
* The gateway resolves client ownership from the candidate token itself; the
|
|
97
|
+
* caller cannot select a gateway client or finalize another credential.
|
|
98
|
+
*/
|
|
99
|
+
export interface IReq_FinalizeGatewayClientCredential extends plugins.typedrequestInterfaces.implementsTR<
|
|
100
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
101
|
+
IReq_FinalizeGatewayClientCredential
|
|
102
|
+
> {
|
|
103
|
+
method: 'finalizeGatewayClientCredential';
|
|
104
|
+
request: {
|
|
105
|
+
/** The one-time candidate token value returned by provisioning. */
|
|
106
|
+
apiToken: string;
|
|
107
|
+
/** Must identify the same candidate credential as apiToken. */
|
|
108
|
+
tokenId: string;
|
|
109
|
+
/** Admin/operator identities cannot finalize a candidate by substitution. */
|
|
110
|
+
identity?: never;
|
|
111
|
+
};
|
|
112
|
+
response:
|
|
113
|
+
| {
|
|
114
|
+
success: true;
|
|
115
|
+
gatewayClientId: string;
|
|
116
|
+
tokenId: string;
|
|
117
|
+
revokedCredentialCount: number;
|
|
118
|
+
finalizedAt: number;
|
|
119
|
+
message?: string;
|
|
120
|
+
}
|
|
121
|
+
| {
|
|
122
|
+
success: false;
|
|
123
|
+
message: string;
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/** Gateway-client-scoped read-only email-domain and recent-email overview. */
|
|
128
|
+
export interface IReq_GetGatewayClientMailOverview extends plugins.typedrequestInterfaces.implementsTR<
|
|
129
|
+
plugins.typedrequestInterfaces.ITypedRequest,
|
|
130
|
+
IReq_GetGatewayClientMailOverview
|
|
131
|
+
> {
|
|
132
|
+
method: 'getGatewayClientMailOverview';
|
|
133
|
+
request: {
|
|
134
|
+
identity?: IGatewayIdentity;
|
|
135
|
+
apiToken?: string;
|
|
136
|
+
limit?: number;
|
|
137
|
+
};
|
|
138
|
+
response: {
|
|
139
|
+
domains: IMailOverviewDomain[];
|
|
140
|
+
emails: IMailOverviewEmail[];
|
|
141
|
+
};
|
|
142
|
+
}
|
|
143
|
+
|
|
54
144
|
export interface IReq_GetGatewayClientDomains extends plugins.typedrequestInterfaces.implementsTR<
|
|
55
145
|
plugins.typedrequestInterfaces.ITypedRequest,
|
|
56
146
|
IReq_GetGatewayClientDomains
|
|
@@ -108,6 +198,12 @@ export interface IReq_SyncGatewayClientRoute extends plugins.typedrequestInterfa
|
|
|
108
198
|
route?: IGatewayRouteConfig;
|
|
109
199
|
enabled?: boolean;
|
|
110
200
|
delete?: boolean;
|
|
201
|
+
/**
|
|
202
|
+
* Omission means 'skip' for backward wire compatibility. Reconciliation
|
|
203
|
+
* claims or replaces exact-host manual A, AAAA, and CNAME records even
|
|
204
|
+
* when their current value already satisfies the desired address.
|
|
205
|
+
*/
|
|
206
|
+
dnsMode?: TGatewayRouteDnsMode;
|
|
111
207
|
/**
|
|
112
208
|
* Gateway source profile to bind the route to (by ref or name).
|
|
113
209
|
* Defaults to the gateway's public profile when omitted.
|
package/ts/requests/mail.ts
CHANGED
|
@@ -310,8 +310,8 @@ export interface IReq_EnqueueMail extends plugins.typedrequestInterfaces.impleme
|
|
|
310
310
|
}
|
|
311
311
|
|
|
312
312
|
/**
|
|
313
|
-
*
|
|
314
|
-
*
|
|
313
|
+
* Shared read-only mail overview used by the gateway-client API and Cloudly UI:
|
|
314
|
+
* configured email domains and recent queue entries.
|
|
315
315
|
*/
|
|
316
316
|
export interface IMailOverviewDomain {
|
|
317
317
|
domain: string;
|
|
@@ -338,7 +338,7 @@ export interface IReq_Any_Cloudly_GetMailOverview extends plugins.typedrequestIn
|
|
|
338
338
|
identity: IIdentity;
|
|
339
339
|
};
|
|
340
340
|
response: {
|
|
341
|
-
/** False when no dcrouter
|
|
341
|
+
/** False when no dcrouter gateway-client credential is configured. */
|
|
342
342
|
configured: boolean;
|
|
343
343
|
gatewayUrl?: string;
|
|
344
344
|
domains: IMailOverviewDomain[];
|