@caelo-cms/shared 0.11.10 → 0.11.11
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/dist/change-journal.d.ts.map +1 -1
- package/dist/change-journal.js +3 -0
- package/dist/change-journal.js.map +1 -1
- package/dist/database-url.d.ts +17 -0
- package/dist/database-url.d.ts.map +1 -1
- package/dist/database-url.js +24 -1
- package/dist/database-url.js.map +1 -1
- package/dist/live-events.d.ts.map +1 -1
- package/dist/live-events.js +6 -3
- package/dist/live-events.js.map +1 -1
- package/dist/media.d.ts +8 -0
- package/dist/media.d.ts.map +1 -1
- package/dist/media.js +11 -0
- package/dist/media.js.map +1 -1
- package/dist/pool-budget.d.ts +44 -8
- package/dist/pool-budget.d.ts.map +1 -1
- package/dist/pool-budget.js +45 -8
- package/dist/pool-budget.js.map +1 -1
- package/dist/version.d.ts +2 -2
- package/dist/version.js +1 -1
- package/package.json +1 -1
- package/src/change-journal.ts +5 -0
- package/src/database-url.test.ts +24 -0
- package/src/database-url.ts +37 -1
- package/src/live-events.ts +6 -3
- package/src/media.test.ts +27 -0
- package/src/media.ts +13 -0
- package/src/pool-budget.test.ts +36 -8
- package/src/pool-budget.ts +63 -9
- package/src/version.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-journal.d.ts","sourceRoot":"","sources":["../src/change-journal.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,aAAa,mdAkChB,CAAC;AAEX,uDAAuD;AACvD,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAIzD,iCAAiC;AACjC,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,WAAW,CAEjE;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,UAAU,GAAG,QAAQ,CAAC;AAExD,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,qEAAqE;IACrE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,mFAAmF;IACnF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,qDAAqD;IACrD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,iDAAiD;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAeD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAqDrE,CAAC;AAWF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"change-journal.d.ts","sourceRoot":"","sources":["../src/change-journal.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,aAAa,mdAkChB,CAAC;AAEX,uDAAuD;AACvD,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAIzD,iCAAiC;AACjC,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,WAAW,CAEjE;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,UAAU,GAAG,QAAQ,CAAC;AAExD,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,qEAAqE;IACrE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,mFAAmF;IACnF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,qDAAqD;IACrD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,iDAAiD;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAeD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAqDrE,CAAC;AAWF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2IlE,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,eAAe,yBAAyB,CAAC;AAEtD,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,sBAAsB,CAAC"}
|
package/dist/change-journal.js
CHANGED
|
@@ -216,11 +216,14 @@ export const JOURNAL_EXEMPT_TABLES = {
|
|
|
216
216
|
plugin_schema_provisions: "plugin DDL bookkeeping",
|
|
217
217
|
plugin_private_file_chunks: "the bytes of plugin_private_files rows, journaled through the file row",
|
|
218
218
|
public_projection_outbox: "the outbox of the cms_public projection, drained by its publisher",
|
|
219
|
+
projection_releases: "#1329: the frozen release state of a deploy run, written once by the deploy ops and read only by the projection publisher",
|
|
220
|
+
projection_release_pointers: "#1329: which frozen release each public database serves, moved by the deploy ops; a move marks the projection's outbox",
|
|
219
221
|
platform_update_agent: RUNTIME,
|
|
220
222
|
platform_update_notifications: RUNTIME,
|
|
221
223
|
platform_update_policy: "the Owner's update policy, read by the update scheduler",
|
|
222
224
|
platform_update_requests: "update requests, run by the upgrader job",
|
|
223
225
|
platform_update_scheduler: RUNTIME,
|
|
226
|
+
scheduled_tasks: RUNTIME,
|
|
224
227
|
import_runs: "site-import runs; reach editors as the op-classified `crawl` topic",
|
|
225
228
|
import_pages: "crawled pages of a site import, before they become pages",
|
|
226
229
|
import_run_links: "links found by a site import",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"change-journal.js","sourceRoot":"","sources":["../src/change-journal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"change-journal.js","sourceRoot":"","sources":["../src/change-journal.ts"],"names":[],"mappings":"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"}
|
package/dist/database-url.d.ts
CHANGED
|
@@ -37,4 +37,21 @@ export declare function cloudSqlIamDatabaseUrls(host: string, serviceAccountEmai
|
|
|
37
37
|
public: string;
|
|
38
38
|
user: string;
|
|
39
39
|
};
|
|
40
|
+
/**
|
|
41
|
+
* #1373 — {@link cloudSqlIamDatabaseUrls} for the instance's private IP,
|
|
42
|
+
* for the one connection that dials it: the converge job's, before the
|
|
43
|
+
* install's TLS step has given the instance a DNS name the clients can
|
|
44
|
+
* resolve. The URLs ask for `sslmode=verify-full` and name no trust anchor;
|
|
45
|
+
* the caller must pass the server checks itself (`DatabaseAdapter`'s
|
|
46
|
+
* `tls`, from provisioning converge-db-trust.ts), since a certificate
|
|
47
|
+
* never names an IP.
|
|
48
|
+
*
|
|
49
|
+
* @throws when `ip` is not an IP literal: a DNS host takes the verify-full
|
|
50
|
+
* URLs of {@link cloudSqlIamDatabaseUrls}
|
|
51
|
+
*/
|
|
52
|
+
export declare function cloudSqlIamIpDatabaseUrls(ip: string, serviceAccountEmail: string, accessToken: string): {
|
|
53
|
+
admin: string;
|
|
54
|
+
public: string;
|
|
55
|
+
user: string;
|
|
56
|
+
};
|
|
40
57
|
//# sourceMappingURL=database-url.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-url.d.ts","sourceRoot":"","sources":["../src/database-url.ts"],"names":[],"mappings":"AA6BA,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK1D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAiB,GACrB,MAAM,CAoBR;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"database-url.d.ts","sourceRoot":"","sources":["../src/database-url.ts"],"names":[],"mappings":"AA6BA,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK1D;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,SAAiB,GACrB,MAAM,CAoBR;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,SAAS,CAWpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAOjD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,MAAM,EACV,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM,GAClB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CASjD"}
|
package/dist/database-url.js
CHANGED
|
@@ -94,8 +94,31 @@ export function cloudSqlIamDatabaseUrls(host, serviceAccountEmail, accessToken)
|
|
|
94
94
|
if (isIpLiteral(host)) {
|
|
95
95
|
throw new Error(`the Cloud SQL host is the IP address ${host}, but the instance's certificate names only its DNS name, so a verify-full connection to it cannot succeed (#1338). Run the converge (\`cms-provision upgrade\`, or Install update for a cloud-setup release) — it moves the services onto the DNS name — then retry.`);
|
|
96
96
|
}
|
|
97
|
+
return iamUrls(host, serviceAccountEmail, accessToken, verifyFullQuery(CLOUD_SQL_CA_BUNDLE));
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* #1373 — {@link cloudSqlIamDatabaseUrls} for the instance's private IP,
|
|
101
|
+
* for the one connection that dials it: the converge job's, before the
|
|
102
|
+
* install's TLS step has given the instance a DNS name the clients can
|
|
103
|
+
* resolve. The URLs ask for `sslmode=verify-full` and name no trust anchor;
|
|
104
|
+
* the caller must pass the server checks itself (`DatabaseAdapter`'s
|
|
105
|
+
* `tls`, from provisioning converge-db-trust.ts), since a certificate
|
|
106
|
+
* never names an IP.
|
|
107
|
+
*
|
|
108
|
+
* @throws when `ip` is not an IP literal: a DNS host takes the verify-full
|
|
109
|
+
* URLs of {@link cloudSqlIamDatabaseUrls}
|
|
110
|
+
*/
|
|
111
|
+
export function cloudSqlIamIpDatabaseUrls(ip, serviceAccountEmail, accessToken) {
|
|
112
|
+
if (!isIpLiteral(ip)) {
|
|
113
|
+
throw new Error(`${ip} is a host name; connect to it with verify-full (cloudSqlIamDatabaseUrls), not with the IP-address checks`);
|
|
114
|
+
}
|
|
115
|
+
// An IPv6 literal goes into the URI authority in brackets (RFC 3986 §3.2.2).
|
|
116
|
+
const authority = ip.includes(":") && !ip.startsWith("[") ? `[${ip}]` : ip;
|
|
117
|
+
return iamUrls(authority, serviceAccountEmail, accessToken, verifyFullQuery());
|
|
118
|
+
}
|
|
119
|
+
function iamUrls(host, serviceAccountEmail, accessToken, tlsQuery) {
|
|
97
120
|
const user = serviceAccountEmail.replace(/\.gserviceaccount\.com$/, "");
|
|
98
|
-
const url = (db) => `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(accessToken)}@${host}:5432/${db}?${
|
|
121
|
+
const url = (db) => `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(accessToken)}@${host}:5432/${db}?${tlsQuery}`;
|
|
99
122
|
return { admin: url("cms_admin"), public: url("cms_public"), user };
|
|
100
123
|
}
|
|
101
124
|
//# sourceMappingURL=database-url.js.map
|
package/dist/database-url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-url.js","sourceRoot":"","sources":["../src/database-url.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,oEAAoE;AACpE,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;AACvD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAClC,GAAW,EACX,QAAgB,EAChB,KAAK,GAAG,cAAc;IAEtB,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,qBAAqB,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,2EAA2E,CACpF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,0CAA0C,CAAC,CAAC;IACtE,CAAC;IACD,uEAAuE;IACvE,yEAAyE;IACzE,qCAAqC;IACrC,MAAM,CAAC,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAA0B,EAC1B,MAAoD,OAAO,CAAC,GAAG;IAE/D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,GAAG,GAAG,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC;QAClC,OAAO,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,UAAU,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACjG,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAAY,EACZ,mBAA2B,EAC3B,WAAmB;IAEnB,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,uQAAuQ,CACpT,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,GAAG,GAAG,CAAC,EAAU,EAAE,EAAE,CACzB,gBAAgB,kBAAkB,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,WAAW,CAAC,IAAI,IAAI,SAAS,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"database-url.js","sourceRoot":"","sources":["../src/database-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events.d.ts","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,qDAAqD;AACrD,eAAO,MAAM,WAAW,uFAmBd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAIrD,gCAAgC;AAChC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,SAAS,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAQtE;
|
|
1
|
+
{"version":3,"file":"live-events.d.ts","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,qDAAqD;AACrD,eAAO,MAAM,WAAW,uFAmBd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAIrD,gCAAgC;AAChC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,SAAS,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAQtE;AAsED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,SAAS,EAAE,CAkBjF"}
|
package/dist/live-events.js
CHANGED
|
@@ -104,11 +104,12 @@ const EXACT = {
|
|
|
104
104
|
"imports.create_run": ["crawl"],
|
|
105
105
|
"imports.update_run_status": ["crawl"],
|
|
106
106
|
"imports.write_extracted_pages": ["crawl"],
|
|
107
|
-
"deploy.trigger": ["deploys"],
|
|
107
|
+
"deploy.trigger": ["deploys", "quality"],
|
|
108
108
|
// #1211 — the Stage's steps: its run appears, ends failed, ends recorded.
|
|
109
109
|
"deploy.start_trigger": ["deploys"],
|
|
110
110
|
"deploy.fail_run": ["deploys"],
|
|
111
|
-
|
|
111
|
+
// #1319 — a staging build's audit row is queued in this step.
|
|
112
|
+
"deploy.finish_trigger": ["deploys", "quality"],
|
|
112
113
|
"deploy.update_progress": ["deploys"],
|
|
113
114
|
"deploy.promote": ["deploys"],
|
|
114
115
|
// #1225 — Publish live's steps, and an approved card's claim and record.
|
|
@@ -117,7 +118,9 @@ const EXACT = {
|
|
|
117
118
|
"deploy.begin_execute_proposal": ["pending", "deploys"],
|
|
118
119
|
"deploy.end_execute_proposal": ["pending", "deploys"],
|
|
119
120
|
"deploy.rollback": ["deploys"],
|
|
120
|
-
|
|
121
|
+
// #1250 — the rollback's steps: its run appears, ends recorded.
|
|
122
|
+
"deploy.start_rollback": ["deploys"],
|
|
123
|
+
"deploy.finish_rollback": ["deploys"],
|
|
121
124
|
"deploy.build_plugin_data": ["deploys"],
|
|
122
125
|
// #1220 — the plugin-data build's steps that start and record a run.
|
|
123
126
|
"deploy.begin_plugin_data_run": ["deploys"],
|
package/dist/live-events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events.js","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"live-events.js","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"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"}
|
package/dist/media.d.ts
CHANGED
|
@@ -323,6 +323,14 @@ export declare const CHAT_IMAGE_PREFIX = "chat-images";
|
|
|
323
323
|
export declare function buildChatImageKey(day: string, sha256: string, ext: string): string;
|
|
324
324
|
/** True for keys under the chat-image prefix — the sweep's safety check. */
|
|
325
325
|
export declare function isChatImageKey(key: string): boolean;
|
|
326
|
+
/**
|
|
327
|
+
* True only for a key with exactly the shape {@link buildChatImageKey} writes
|
|
328
|
+
* for a raster image. The chat-image route serves a key read from a message
|
|
329
|
+
* row; checking the full shape (not just the prefix) means a tampered or
|
|
330
|
+
* legacy row can never point the route at `..`, another prefix, or a
|
|
331
|
+
* non-image object.
|
|
332
|
+
*/
|
|
333
|
+
export declare function isWellFormedChatImageKey(key: string): boolean;
|
|
326
334
|
/** Build the canonical storage key for a given asset variant. */
|
|
327
335
|
export declare function buildStorageKey(sha256: string, variant: MediaVariantTag | string, ext: string): string;
|
|
328
336
|
//# sourceMappingURL=media.d.ts.map
|
package/dist/media.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
|
package/dist/media.js
CHANGED
|
@@ -401,6 +401,17 @@ export function buildChatImageKey(day, sha256, ext) {
|
|
|
401
401
|
export function isChatImageKey(key) {
|
|
402
402
|
return key.startsWith(`${CHAT_IMAGE_PREFIX}/`);
|
|
403
403
|
}
|
|
404
|
+
const CHAT_IMAGE_KEY_SHAPE = /^chat-images\/\d{4}-\d{2}-\d{2}\/[0-9a-f]{64}\.(png|jpeg|webp|gif)$/;
|
|
405
|
+
/**
|
|
406
|
+
* True only for a key with exactly the shape {@link buildChatImageKey} writes
|
|
407
|
+
* for a raster image. The chat-image route serves a key read from a message
|
|
408
|
+
* row; checking the full shape (not just the prefix) means a tampered or
|
|
409
|
+
* legacy row can never point the route at `..`, another prefix, or a
|
|
410
|
+
* non-image object.
|
|
411
|
+
*/
|
|
412
|
+
export function isWellFormedChatImageKey(key) {
|
|
413
|
+
return CHAT_IMAGE_KEY_SHAPE.test(key);
|
|
414
|
+
}
|
|
404
415
|
/** Build the canonical storage key for a given asset variant. */
|
|
405
416
|
export function buildStorageKey(sha256, variant, ext) {
|
|
406
417
|
return `${sha256}/${variant}.${ext}`;
|
package/dist/media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../src/media.ts"],"names":[],"mappings":"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"}
|
package/dist/pool-budget.d.ts
CHANGED
|
@@ -45,6 +45,13 @@ export declare const MIN_POOL_MAX = 2;
|
|
|
45
45
|
export declare const ADMIN_POOL_FLOOR = 4;
|
|
46
46
|
/** The admin's cms_public pool: plugin-data reads and the gateway projection. */
|
|
47
47
|
export declare const ADMIN_PUBLIC_POOL_MAX = 4;
|
|
48
|
+
/**
|
|
49
|
+
* #1329 — the admin's cms_public_staging pool: the staging database's
|
|
50
|
+
* plugin schemas and its half of the two-target projection. Fixed at the
|
|
51
|
+
* minimum pool, set by the admin in code (no env var): its work is a few
|
|
52
|
+
* short DDL and publish transactions, one at a time per instance.
|
|
53
|
+
*/
|
|
54
|
+
export declare const ADMIN_PUBLIC_STAGING_POOL_MAX = 2;
|
|
48
55
|
/** The gateway's only pool (public_role on cms_public), per instance. */
|
|
49
56
|
export declare const GATEWAY_POOL_MAX = 2;
|
|
50
57
|
/**
|
|
@@ -76,6 +83,20 @@ export declare const LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE = 1;
|
|
|
76
83
|
* connect under load.
|
|
77
84
|
*/
|
|
78
85
|
export declare const GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
86
|
+
/**
|
|
87
|
+
* #1329 — public_staging_role's `CONNECTION LIMIT` (cms_admin migration
|
|
88
|
+
* 0530, bootstrap.sh): the same bound as the live gateway's login. The
|
|
89
|
+
* database refuses the staging gateway's connections beyond it.
|
|
90
|
+
*/
|
|
91
|
+
export declare const STAGING_GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
92
|
+
/**
|
|
93
|
+
* #1329 — staging gateway instances the stacks let start. Staging serves
|
|
94
|
+
* the team, the audit and the crawlers the Owner admits, never the public,
|
|
95
|
+
* so one instance (Cloud Run: 80 concurrent requests) carries it, and the
|
|
96
|
+
* budget leaves the admin its cms_admin pool on the default server
|
|
97
|
+
* (docs/dev/connection-budget.md has the numbers).
|
|
98
|
+
*/
|
|
99
|
+
export declare const DEFAULT_STAGING_GATEWAY_MAX_INSTANCES = 1;
|
|
79
100
|
/** What the budget is computed from: the server and the scale-out limits. */
|
|
80
101
|
export interface PoolBudgetInput {
|
|
81
102
|
/** The server's `max_connections`, as provisioning sets it. */
|
|
@@ -84,6 +105,11 @@ export interface PoolBudgetInput {
|
|
|
84
105
|
readonly adminMaxInstances: number;
|
|
85
106
|
/** Most gateway instances that may run at once. */
|
|
86
107
|
readonly gatewayMaxInstances: number;
|
|
108
|
+
/**
|
|
109
|
+
* #1329 — most staging gateway instances that may run at once (the same
|
|
110
|
+
* image on cms_public_staging, its own pool and LISTEN connection each).
|
|
111
|
+
*/
|
|
112
|
+
readonly stagingGatewayMaxInstances: number;
|
|
87
113
|
/**
|
|
88
114
|
* Static-generator subprocesses that may run at once across the install
|
|
89
115
|
* (a Stage, a Publish live and a plugin-data build can overlap).
|
|
@@ -108,7 +134,11 @@ export type PoolBudgetReserveName = "maintenance" | "migrations" | "jobs" | "gen
|
|
|
108
134
|
/** #1267 — one LISTEN connection per admin instance ({@link LISTEN_CONNECTIONS_PER_ADMIN_INSTANCE}). */
|
|
109
135
|
| "listen"
|
|
110
136
|
/** The gateway's settings LISTEN, one per gateway instance ({@link LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE}). */
|
|
111
|
-
| "gateway-listen" | "admin-public"
|
|
137
|
+
| "gateway-listen" | "admin-public"
|
|
138
|
+
/** #1329 — the staging gateway's pool + LISTEN, per staging gateway instance. */
|
|
139
|
+
| "staging-gateway"
|
|
140
|
+
/** #1329 — the admin's cms_public_staging pool ({@link ADMIN_PUBLIC_STAGING_POOL_MAX}), per admin instance. */
|
|
141
|
+
| "admin-public-staging";
|
|
112
142
|
/** One consumer of the server's connections the budget sets aside. */
|
|
113
143
|
export interface PoolBudgetReserve {
|
|
114
144
|
readonly name: PoolBudgetReserveName;
|
|
@@ -122,6 +152,8 @@ export interface PoolBudget {
|
|
|
122
152
|
readonly adminPublicPoolMax: number;
|
|
123
153
|
/** The gateway's cms_public pool ({@link DB_PUBLIC_POOL_MAX_ENV} on the gateway). */
|
|
124
154
|
readonly gatewayPoolMax: number;
|
|
155
|
+
/** #1329 — the admin's cms_public_staging pool (fixed, {@link ADMIN_PUBLIC_STAGING_POOL_MAX}). */
|
|
156
|
+
readonly adminPublicStagingPoolMax: number;
|
|
125
157
|
/** Each pool of a generator subprocess (the admin sets it on the child). */
|
|
126
158
|
readonly generatorPoolMax: number;
|
|
127
159
|
readonly reserves: readonly PoolBudgetReserve[];
|
|
@@ -136,24 +168,28 @@ export interface PoolBudget {
|
|
|
136
168
|
* `gateway = gatewayMaxInstances × GATEWAY_POOL_MAX`,
|
|
137
169
|
* `generator = concurrentBuilds × 2 × GENERATOR_POOL_MAX`,
|
|
138
170
|
* `listen = adminMaxInstances × LISTEN_CONNECTIONS_PER_ADMIN_INSTANCE`,
|
|
139
|
-
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE
|
|
140
|
-
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX
|
|
171
|
+
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE`,
|
|
172
|
+
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX`,
|
|
173
|
+
* `staging-gateway = stagingGatewayMaxInstances × (GATEWAY_POOL_MAX +
|
|
174
|
+
* LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE)` and
|
|
175
|
+
* `admin-public-staging = adminMaxInstances × ADMIN_PUBLIC_STAGING_POOL_MAX` (#1329).
|
|
141
176
|
*
|
|
142
177
|
* @throws Error naming what to change when the server cannot give every
|
|
143
178
|
* admin instance at least {@link ADMIN_POOL_FLOOR} cms_admin connections.
|
|
144
179
|
*
|
|
145
180
|
* @example
|
|
146
|
-
* computePoolBudget({ maxConnections: 100, adminMaxInstances:
|
|
147
|
-
* gatewayMaxInstances: 10,
|
|
148
|
-
* migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // →
|
|
181
|
+
* computePoolBudget({ maxConnections: 100, adminMaxInstances: 4,
|
|
182
|
+
* gatewayMaxInstances: 10, stagingGatewayMaxInstances: 1, concurrentBuilds: 2,
|
|
183
|
+
* maintenanceReserve: 5, migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // → 5
|
|
149
184
|
*/
|
|
150
185
|
export declare function computePoolBudget(input: PoolBudgetInput): PoolBudget;
|
|
151
186
|
/** Which service's pool env {@link poolBudgetEnv} returns. */
|
|
152
187
|
export type PoolBudgetService = "admin" | "gateway";
|
|
153
188
|
/**
|
|
154
189
|
* The env that sizes `service`'s pools from `budget`, for the stacks to set.
|
|
155
|
-
* The admin gets both pools
|
|
156
|
-
*
|
|
190
|
+
* The admin gets both pools (its cms_public_staging pool is fixed in code,
|
|
191
|
+
* #1329); a gateway, live or staging, whose only pool is its public
|
|
192
|
+
* database's, gets just that one.
|
|
157
193
|
*/
|
|
158
194
|
export declare function poolBudgetEnv(budget: PoolBudget, service: PoolBudgetService): {
|
|
159
195
|
readonly name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-budget.d.ts","sourceRoot":"","sources":["../src/pool-budget.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,iGAAiG;AACjG,eAAO,MAAM,eAAe,sBAAsB,CAAC;AAEnD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,6BAA6B,CAAC;AAEjE,mFAAmF;AACnF,eAAO,MAAM,YAAY,IAAI,CAAC;AAE9B;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,IAAI,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,uCAAuC,IAAI,CAAC;AAEzD;;;;;;;;GAQG;AACH,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAEhD,6EAA6E;AAC7E,MAAM,WAAW,eAAe;IAC9B,+DAA+D;IAC/D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,mFAAmF;IACnF,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,mDAAmD;IACnD,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,4DAA4D;IAC5D,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,4FAA4F;AAC5F,MAAM,MAAM,qBAAqB,GAC7B,aAAa,GACb,YAAY,GACZ,MAAM,GACN,WAAW,GACX,SAAS;AACX,wGAAwG;GACtG,QAAQ;AACV,iHAAiH;GAC/G,gBAAgB,GAChB,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"pool-budget.d.ts","sourceRoot":"","sources":["../src/pool-budget.ts"],"names":[],"mappings":"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"}
|
package/dist/pool-budget.js
CHANGED
|
@@ -46,6 +46,13 @@ export const MIN_POOL_MAX = 2;
|
|
|
46
46
|
export const ADMIN_POOL_FLOOR = 4;
|
|
47
47
|
/** The admin's cms_public pool: plugin-data reads and the gateway projection. */
|
|
48
48
|
export const ADMIN_PUBLIC_POOL_MAX = 4;
|
|
49
|
+
/**
|
|
50
|
+
* #1329 — the admin's cms_public_staging pool: the staging database's
|
|
51
|
+
* plugin schemas and its half of the two-target projection. Fixed at the
|
|
52
|
+
* minimum pool, set by the admin in code (no env var): its work is a few
|
|
53
|
+
* short DDL and publish transactions, one at a time per instance.
|
|
54
|
+
*/
|
|
55
|
+
export const ADMIN_PUBLIC_STAGING_POOL_MAX = 2;
|
|
49
56
|
/** The gateway's only pool (public_role on cms_public), per instance. */
|
|
50
57
|
export const GATEWAY_POOL_MAX = 2;
|
|
51
58
|
/**
|
|
@@ -77,6 +84,20 @@ export const LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE = 1;
|
|
|
77
84
|
* connect under load.
|
|
78
85
|
*/
|
|
79
86
|
export const GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
87
|
+
/**
|
|
88
|
+
* #1329 — public_staging_role's `CONNECTION LIMIT` (cms_admin migration
|
|
89
|
+
* 0530, bootstrap.sh): the same bound as the live gateway's login. The
|
|
90
|
+
* database refuses the staging gateway's connections beyond it.
|
|
91
|
+
*/
|
|
92
|
+
export const STAGING_GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
93
|
+
/**
|
|
94
|
+
* #1329 — staging gateway instances the stacks let start. Staging serves
|
|
95
|
+
* the team, the audit and the crawlers the Owner admits, never the public,
|
|
96
|
+
* so one instance (Cloud Run: 80 concurrent requests) carries it, and the
|
|
97
|
+
* budget leaves the admin its cms_admin pool on the default server
|
|
98
|
+
* (docs/dev/connection-budget.md has the numbers).
|
|
99
|
+
*/
|
|
100
|
+
export const DEFAULT_STAGING_GATEWAY_MAX_INSTANCES = 1;
|
|
80
101
|
function positiveInteger(value, name, min) {
|
|
81
102
|
if (!Number.isInteger(value) || value < min) {
|
|
82
103
|
throw new Error(`pool budget: ${name} must be an integer >= ${min} (got ${value})`);
|
|
@@ -90,21 +111,25 @@ function positiveInteger(value, name, min) {
|
|
|
90
111
|
* `gateway = gatewayMaxInstances × GATEWAY_POOL_MAX`,
|
|
91
112
|
* `generator = concurrentBuilds × 2 × GENERATOR_POOL_MAX`,
|
|
92
113
|
* `listen = adminMaxInstances × LISTEN_CONNECTIONS_PER_ADMIN_INSTANCE`,
|
|
93
|
-
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE
|
|
94
|
-
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX
|
|
114
|
+
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE`,
|
|
115
|
+
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX`,
|
|
116
|
+
* `staging-gateway = stagingGatewayMaxInstances × (GATEWAY_POOL_MAX +
|
|
117
|
+
* LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE)` and
|
|
118
|
+
* `admin-public-staging = adminMaxInstances × ADMIN_PUBLIC_STAGING_POOL_MAX` (#1329).
|
|
95
119
|
*
|
|
96
120
|
* @throws Error naming what to change when the server cannot give every
|
|
97
121
|
* admin instance at least {@link ADMIN_POOL_FLOOR} cms_admin connections.
|
|
98
122
|
*
|
|
99
123
|
* @example
|
|
100
|
-
* computePoolBudget({ maxConnections: 100, adminMaxInstances:
|
|
101
|
-
* gatewayMaxInstances: 10,
|
|
102
|
-
* migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // →
|
|
124
|
+
* computePoolBudget({ maxConnections: 100, adminMaxInstances: 4,
|
|
125
|
+
* gatewayMaxInstances: 10, stagingGatewayMaxInstances: 1, concurrentBuilds: 2,
|
|
126
|
+
* maintenanceReserve: 5, migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // → 5
|
|
103
127
|
*/
|
|
104
128
|
export function computePoolBudget(input) {
|
|
105
129
|
positiveInteger(input.maxConnections, "maxConnections", 1);
|
|
106
130
|
positiveInteger(input.adminMaxInstances, "adminMaxInstances", 1);
|
|
107
131
|
positiveInteger(input.gatewayMaxInstances, "gatewayMaxInstances", 0);
|
|
132
|
+
positiveInteger(input.stagingGatewayMaxInstances, "stagingGatewayMaxInstances", 0);
|
|
108
133
|
positiveInteger(input.concurrentBuilds, "concurrentBuilds", 0);
|
|
109
134
|
positiveInteger(input.maintenanceReserve, "maintenanceReserve", 0);
|
|
110
135
|
positiveInteger(input.migrationsReserve, "migrationsReserve", 0);
|
|
@@ -114,6 +139,11 @@ export function computePoolBudget(input) {
|
|
|
114
139
|
throw new Error(`pool budget: ${input.gatewayMaxInstances} gateway instances need ${gatewayConnections} connections, but the database lets the gateway's login (public_role) hold at most ${GATEWAY_ROLE_CONNECTION_LIMIT} (CONNECTION LIMIT, #1338). ` +
|
|
115
140
|
`Lower gatewayMaxInstances to at most ${Math.floor(GATEWAY_ROLE_CONNECTION_LIMIT / (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE))}.`);
|
|
116
141
|
}
|
|
142
|
+
const stagingGatewayConnections = input.stagingGatewayMaxInstances * (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE);
|
|
143
|
+
if (stagingGatewayConnections > STAGING_GATEWAY_ROLE_CONNECTION_LIMIT) {
|
|
144
|
+
throw new Error(`pool budget: ${input.stagingGatewayMaxInstances} staging gateway instances need ${stagingGatewayConnections} connections, but the database lets the staging gateway's login (public_staging_role) hold at most ${STAGING_GATEWAY_ROLE_CONNECTION_LIMIT} (CONNECTION LIMIT, #1329). ` +
|
|
145
|
+
`Lower stagingGatewayMaxInstances to at most ${Math.floor(STAGING_GATEWAY_ROLE_CONNECTION_LIMIT / (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE))}.`);
|
|
146
|
+
}
|
|
117
147
|
const reserves = [
|
|
118
148
|
{ name: "maintenance", connections: input.maintenanceReserve },
|
|
119
149
|
{ name: "migrations", connections: input.migrationsReserve },
|
|
@@ -129,6 +159,11 @@ export function computePoolBudget(input) {
|
|
|
129
159
|
connections: input.gatewayMaxInstances * LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE,
|
|
130
160
|
},
|
|
131
161
|
{ name: "admin-public", connections: input.adminMaxInstances * ADMIN_PUBLIC_POOL_MAX },
|
|
162
|
+
{ name: "staging-gateway", connections: stagingGatewayConnections },
|
|
163
|
+
{
|
|
164
|
+
name: "admin-public-staging",
|
|
165
|
+
connections: input.adminMaxInstances * ADMIN_PUBLIC_STAGING_POOL_MAX,
|
|
166
|
+
},
|
|
132
167
|
];
|
|
133
168
|
const reserved = reserves.reduce((sum, r) => sum + r.connections, 0);
|
|
134
169
|
const forAdmin = input.maxConnections - reserved;
|
|
@@ -138,12 +173,13 @@ export function computePoolBudget(input) {
|
|
|
138
173
|
const breakdown = reserves.map((r) => `${r.name} ${r.connections}`).join(", ");
|
|
139
174
|
throw new Error(`pool budget: max_connections ${input.maxConnections} cannot give each of ${input.adminMaxInstances} admin instances the minimum of ${ADMIN_POOL_FLOOR} cms_admin connections ` +
|
|
140
175
|
`(reserved: ${breakdown}; ${needed} needed). Raise maxConnections to at least ${needed} (a larger database tier may be required), ` +
|
|
141
|
-
"or lower adminMaxInstances / gatewayMaxInstances.");
|
|
176
|
+
"or lower adminMaxInstances / gatewayMaxInstances / stagingGatewayMaxInstances.");
|
|
142
177
|
}
|
|
143
178
|
return {
|
|
144
179
|
adminPoolMax,
|
|
145
180
|
adminPublicPoolMax: ADMIN_PUBLIC_POOL_MAX,
|
|
146
181
|
gatewayPoolMax: GATEWAY_POOL_MAX,
|
|
182
|
+
adminPublicStagingPoolMax: ADMIN_PUBLIC_STAGING_POOL_MAX,
|
|
147
183
|
generatorPoolMax: GENERATOR_POOL_MAX,
|
|
148
184
|
reserves,
|
|
149
185
|
unassigned: forAdmin - adminPoolMax * input.adminMaxInstances,
|
|
@@ -151,8 +187,9 @@ export function computePoolBudget(input) {
|
|
|
151
187
|
}
|
|
152
188
|
/**
|
|
153
189
|
* The env that sizes `service`'s pools from `budget`, for the stacks to set.
|
|
154
|
-
* The admin gets both pools
|
|
155
|
-
*
|
|
190
|
+
* The admin gets both pools (its cms_public_staging pool is fixed in code,
|
|
191
|
+
* #1329); a gateway, live or staging, whose only pool is its public
|
|
192
|
+
* database's, gets just that one.
|
|
156
193
|
*/
|
|
157
194
|
export function poolBudgetEnv(budget, service) {
|
|
158
195
|
if (service === "gateway") {
|
package/dist/pool-budget.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-budget.js","sourceRoot":"","sources":["../src/pool-budget.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,iGAAiG;AACjG,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AAEnD;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAC;AAEjE,mFAAmF;AACnF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,iFAAiF;AACjF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC,yEAAyE;AACzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CAAC,CAAC;AAEvD;;;;GAIG;AACH,MAAM,CAAC,MAAM,uCAAuC,GAAG,CAAC,CAAC;AAEzD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"pool-budget.js","sourceRoot":"","sources":["../src/pool-budget.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
* Format: SemVer 2.0.0. Pre-1.0 minor bumps are breaking; post-1.0
|
|
20
20
|
* follow standard SemVer.
|
|
21
21
|
*/
|
|
22
|
-
export declare const CAELO_VERSION = "0.11.
|
|
22
|
+
export declare const CAELO_VERSION = "0.11.11";
|
|
23
23
|
/**
|
|
24
24
|
* Deprecated alias for back-compat — early P17 work spelled this
|
|
25
25
|
* `CALEO_VERSION` (typo of "Caelo"). New code should import
|
|
@@ -31,7 +31,7 @@ export declare const CAELO_VERSION = "0.11.10";
|
|
|
31
31
|
*
|
|
32
32
|
* @deprecated use CAELO_VERSION
|
|
33
33
|
*/
|
|
34
|
-
export declare const CALEO_VERSION = "0.11.
|
|
34
|
+
export declare const CALEO_VERSION = "0.11.11";
|
|
35
35
|
/**
|
|
36
36
|
* Parsed shape — major/minor/patch + optional pre-release tag.
|
|
37
37
|
* Stable interface for callers that need to feature-gate (rare —
|
package/dist/version.js
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
* Format: SemVer 2.0.0. Pre-1.0 minor bumps are breaking; post-1.0
|
|
21
21
|
* follow standard SemVer.
|
|
22
22
|
*/
|
|
23
|
-
export const CAELO_VERSION = "0.11.
|
|
23
|
+
export const CAELO_VERSION = "0.11.11";
|
|
24
24
|
/**
|
|
25
25
|
* Deprecated alias for back-compat — early P17 work spelled this
|
|
26
26
|
* `CALEO_VERSION` (typo of "Caelo"). New code should import
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@caelo-cms/shared",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.11",
|
|
4
4
|
"private": false,
|
|
5
5
|
"license": "MPL-2.0",
|
|
6
6
|
"description": "Shared Zod schemas + types + the two-pass HTML composer used by every Caelo CMS workspace package. Stable enough for plugin authors and embedders to depend on directly.",
|
package/src/change-journal.ts
CHANGED
|
@@ -287,11 +287,16 @@ export const JOURNAL_EXEMPT_TABLES: Readonly<Record<string, string>> = {
|
|
|
287
287
|
plugin_private_file_chunks:
|
|
288
288
|
"the bytes of plugin_private_files rows, journaled through the file row",
|
|
289
289
|
public_projection_outbox: "the outbox of the cms_public projection, drained by its publisher",
|
|
290
|
+
projection_releases:
|
|
291
|
+
"#1329: the frozen release state of a deploy run, written once by the deploy ops and read only by the projection publisher",
|
|
292
|
+
projection_release_pointers:
|
|
293
|
+
"#1329: which frozen release each public database serves, moved by the deploy ops; a move marks the projection's outbox",
|
|
290
294
|
platform_update_agent: RUNTIME,
|
|
291
295
|
platform_update_notifications: RUNTIME,
|
|
292
296
|
platform_update_policy: "the Owner's update policy, read by the update scheduler",
|
|
293
297
|
platform_update_requests: "update requests, run by the upgrader job",
|
|
294
298
|
platform_update_scheduler: RUNTIME,
|
|
299
|
+
scheduled_tasks: RUNTIME,
|
|
295
300
|
|
|
296
301
|
import_runs: "site-import runs; reach editors as the op-classified `crawl` topic",
|
|
297
302
|
import_pages: "crawled pages of a site import, before they become pages",
|
package/src/database-url.test.ts
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import { describe, expect, it } from "bun:test";
|
|
4
4
|
import {
|
|
5
5
|
cloudSqlIamDatabaseUrls,
|
|
6
|
+
cloudSqlIamIpDatabaseUrls,
|
|
6
7
|
databasePasswordVar,
|
|
7
8
|
databaseUrlFromEnv,
|
|
8
9
|
withDatabasePassword,
|
|
@@ -145,6 +146,29 @@ describe("cloudSqlIamDatabaseUrls", () => {
|
|
|
145
146
|
});
|
|
146
147
|
});
|
|
147
148
|
|
|
149
|
+
describe("cloudSqlIamIpDatabaseUrls (#1373)", () => {
|
|
150
|
+
it("dials the IP with verify-full and no trust anchor: the caller passes the server checks", () => {
|
|
151
|
+
expect(cloudSqlIamIpDatabaseUrls("10.0.0.3", "job@p.iam.gserviceaccount.com", "t").admin).toBe(
|
|
152
|
+
"postgresql://job%40p.iam:t@10.0.0.3:5432/cms_admin?sslmode=verify-full",
|
|
153
|
+
);
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
it("brackets an IPv6 literal in the authority", () => {
|
|
157
|
+
for (const ip of ["fd00::3", "[fd00::3]"]) {
|
|
158
|
+
const url = cloudSqlIamIpDatabaseUrls(ip, "job@p.iam.gserviceaccount.com", "t").admin;
|
|
159
|
+
expect(url).toBe("postgresql://job%40p.iam:t@[fd00::3]:5432/cms_admin?sslmode=verify-full");
|
|
160
|
+
expect(new URL(url).hostname).toBe("[fd00::3]");
|
|
161
|
+
expect(new URL(url).port).toBe("5432");
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
it("refuses a host name, which takes the plain verify-full URLs", () => {
|
|
166
|
+
expect(() =>
|
|
167
|
+
cloudSqlIamIpDatabaseUrls("i1.p.europe-west1.sql-psa.goog", "job@p.iam", "t"),
|
|
168
|
+
).toThrow(/cloudSqlIamDatabaseUrls/);
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
|
|
148
172
|
describe("databaseUrlFromEnv TLS (#1338)", () => {
|
|
149
173
|
it("refuses a remote host without verify-full and names the variable", () => {
|
|
150
174
|
for (const mode of ["", "?sslmode=require", "?sslmode=verify-ca", "?sslmode=disable"]) {
|
package/src/database-url.ts
CHANGED
|
@@ -117,8 +117,44 @@ export function cloudSqlIamDatabaseUrls(
|
|
|
117
117
|
`the Cloud SQL host is the IP address ${host}, but the instance's certificate names only its DNS name, so a verify-full connection to it cannot succeed (#1338). Run the converge (\`cms-provision upgrade\`, or Install update for a cloud-setup release) — it moves the services onto the DNS name — then retry.`,
|
|
118
118
|
);
|
|
119
119
|
}
|
|
120
|
+
return iamUrls(host, serviceAccountEmail, accessToken, verifyFullQuery(CLOUD_SQL_CA_BUNDLE));
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* #1373 — {@link cloudSqlIamDatabaseUrls} for the instance's private IP,
|
|
125
|
+
* for the one connection that dials it: the converge job's, before the
|
|
126
|
+
* install's TLS step has given the instance a DNS name the clients can
|
|
127
|
+
* resolve. The URLs ask for `sslmode=verify-full` and name no trust anchor;
|
|
128
|
+
* the caller must pass the server checks itself (`DatabaseAdapter`'s
|
|
129
|
+
* `tls`, from provisioning converge-db-trust.ts), since a certificate
|
|
130
|
+
* never names an IP.
|
|
131
|
+
*
|
|
132
|
+
* @throws when `ip` is not an IP literal: a DNS host takes the verify-full
|
|
133
|
+
* URLs of {@link cloudSqlIamDatabaseUrls}
|
|
134
|
+
*/
|
|
135
|
+
export function cloudSqlIamIpDatabaseUrls(
|
|
136
|
+
ip: string,
|
|
137
|
+
serviceAccountEmail: string,
|
|
138
|
+
accessToken: string,
|
|
139
|
+
): { admin: string; public: string; user: string } {
|
|
140
|
+
if (!isIpLiteral(ip)) {
|
|
141
|
+
throw new Error(
|
|
142
|
+
`${ip} is a host name; connect to it with verify-full (cloudSqlIamDatabaseUrls), not with the IP-address checks`,
|
|
143
|
+
);
|
|
144
|
+
}
|
|
145
|
+
// An IPv6 literal goes into the URI authority in brackets (RFC 3986 §3.2.2).
|
|
146
|
+
const authority = ip.includes(":") && !ip.startsWith("[") ? `[${ip}]` : ip;
|
|
147
|
+
return iamUrls(authority, serviceAccountEmail, accessToken, verifyFullQuery());
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
function iamUrls(
|
|
151
|
+
host: string,
|
|
152
|
+
serviceAccountEmail: string,
|
|
153
|
+
accessToken: string,
|
|
154
|
+
tlsQuery: string,
|
|
155
|
+
): { admin: string; public: string; user: string } {
|
|
120
156
|
const user = serviceAccountEmail.replace(/\.gserviceaccount\.com$/, "");
|
|
121
157
|
const url = (db: string) =>
|
|
122
|
-
`postgresql://${encodeURIComponent(user)}:${encodeURIComponent(accessToken)}@${host}:5432/${db}?${
|
|
158
|
+
`postgresql://${encodeURIComponent(user)}:${encodeURIComponent(accessToken)}@${host}:5432/${db}?${tlsQuery}`;
|
|
123
159
|
return { admin: url("cms_admin"), public: url("cms_public"), user };
|
|
124
160
|
}
|
package/src/live-events.ts
CHANGED
|
@@ -113,11 +113,12 @@ const EXACT: Readonly<Record<string, readonly LiveTopic[]>> = {
|
|
|
113
113
|
"imports.create_run": ["crawl"],
|
|
114
114
|
"imports.update_run_status": ["crawl"],
|
|
115
115
|
"imports.write_extracted_pages": ["crawl"],
|
|
116
|
-
"deploy.trigger": ["deploys"],
|
|
116
|
+
"deploy.trigger": ["deploys", "quality"],
|
|
117
117
|
// #1211 — the Stage's steps: its run appears, ends failed, ends recorded.
|
|
118
118
|
"deploy.start_trigger": ["deploys"],
|
|
119
119
|
"deploy.fail_run": ["deploys"],
|
|
120
|
-
|
|
120
|
+
// #1319 — a staging build's audit row is queued in this step.
|
|
121
|
+
"deploy.finish_trigger": ["deploys", "quality"],
|
|
121
122
|
"deploy.update_progress": ["deploys"],
|
|
122
123
|
"deploy.promote": ["deploys"],
|
|
123
124
|
// #1225 — Publish live's steps, and an approved card's claim and record.
|
|
@@ -126,7 +127,9 @@ const EXACT: Readonly<Record<string, readonly LiveTopic[]>> = {
|
|
|
126
127
|
"deploy.begin_execute_proposal": ["pending", "deploys"],
|
|
127
128
|
"deploy.end_execute_proposal": ["pending", "deploys"],
|
|
128
129
|
"deploy.rollback": ["deploys"],
|
|
129
|
-
|
|
130
|
+
// #1250 — the rollback's steps: its run appears, ends recorded.
|
|
131
|
+
"deploy.start_rollback": ["deploys"],
|
|
132
|
+
"deploy.finish_rollback": ["deploys"],
|
|
130
133
|
"deploy.build_plugin_data": ["deploys"],
|
|
131
134
|
// #1220 — the plugin-data build's steps that start and record a run.
|
|
132
135
|
"deploy.begin_plugin_data_run": ["deploys"],
|
package/src/media.test.ts
CHANGED
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
import { describe, expect, it } from "bun:test";
|
|
4
4
|
import {
|
|
5
|
+
buildChatImageKey,
|
|
5
6
|
buildMediaUrl,
|
|
6
7
|
buildStorageKey,
|
|
7
8
|
extractMediaRefs,
|
|
9
|
+
isWellFormedChatImageKey,
|
|
8
10
|
MEDIA_ALLOWED_MIMES,
|
|
9
11
|
MEDIA_HARD_LIMIT_BYTES,
|
|
10
12
|
MEDIA_SIZE_CAPS,
|
|
@@ -197,3 +199,28 @@ describe("media schemas", () => {
|
|
|
197
199
|
expect(mediaSetCdnInputSchema.safeParse({ enabled: true, threshold: 0 }).success).toBe(false);
|
|
198
200
|
});
|
|
199
201
|
});
|
|
202
|
+
|
|
203
|
+
describe("chat image keys (#359)", () => {
|
|
204
|
+
const sha = "a".repeat(64);
|
|
205
|
+
|
|
206
|
+
it("accepts every key buildChatImageKey writes for a raster image", () => {
|
|
207
|
+
for (const ext of ["png", "jpeg", "webp", "gif"]) {
|
|
208
|
+
expect(isWellFormedChatImageKey(buildChatImageKey("2026-11-03", sha, ext))).toBe(true);
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
it("rejects traversal, foreign prefixes and non-image objects", () => {
|
|
213
|
+
for (const key of [
|
|
214
|
+
`chat-images/../${sha}.png`,
|
|
215
|
+
`chat-images/2026-11-03/../../secrets/${sha}.png`,
|
|
216
|
+
`${sha}/orig.png`,
|
|
217
|
+
`chat-images/2026-11-03/${sha}.svg`,
|
|
218
|
+
`chat-images/2026-11-03/${sha}.png/x`,
|
|
219
|
+
`chat-images/2026-11-03/${"A".repeat(64)}.png`,
|
|
220
|
+
`/chat-images/2026-11-03/${sha}.png`,
|
|
221
|
+
`chat-images/2026-11-03/${sha}.png\n`,
|
|
222
|
+
]) {
|
|
223
|
+
expect(isWellFormedChatImageKey(key)).toBe(false);
|
|
224
|
+
}
|
|
225
|
+
});
|
|
226
|
+
});
|
package/src/media.ts
CHANGED
|
@@ -502,6 +502,19 @@ export function isChatImageKey(key: string): boolean {
|
|
|
502
502
|
return key.startsWith(`${CHAT_IMAGE_PREFIX}/`);
|
|
503
503
|
}
|
|
504
504
|
|
|
505
|
+
const CHAT_IMAGE_KEY_SHAPE = /^chat-images\/\d{4}-\d{2}-\d{2}\/[0-9a-f]{64}\.(png|jpeg|webp|gif)$/;
|
|
506
|
+
|
|
507
|
+
/**
|
|
508
|
+
* True only for a key with exactly the shape {@link buildChatImageKey} writes
|
|
509
|
+
* for a raster image. The chat-image route serves a key read from a message
|
|
510
|
+
* row; checking the full shape (not just the prefix) means a tampered or
|
|
511
|
+
* legacy row can never point the route at `..`, another prefix, or a
|
|
512
|
+
* non-image object.
|
|
513
|
+
*/
|
|
514
|
+
export function isWellFormedChatImageKey(key: string): boolean {
|
|
515
|
+
return CHAT_IMAGE_KEY_SHAPE.test(key);
|
|
516
|
+
}
|
|
517
|
+
|
|
505
518
|
/** Build the canonical storage key for a given asset variant. */
|
|
506
519
|
export function buildStorageKey(
|
|
507
520
|
sha256: string,
|
package/src/pool-budget.test.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { describe, expect, it } from "bun:test";
|
|
|
6
6
|
import {
|
|
7
7
|
ADMIN_POOL_FLOOR,
|
|
8
8
|
ADMIN_PUBLIC_POOL_MAX,
|
|
9
|
+
ADMIN_PUBLIC_STAGING_POOL_MAX,
|
|
9
10
|
computePoolBudget,
|
|
10
11
|
DB_POOL_MAX_ENV,
|
|
11
12
|
DB_PUBLIC_POOL_MAX_ENV,
|
|
@@ -14,14 +15,17 @@ import {
|
|
|
14
15
|
GENERATOR_POOL_MAX,
|
|
15
16
|
LISTEN_CONNECTIONS_PER_ADMIN_INSTANCE,
|
|
16
17
|
LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE,
|
|
18
|
+
MIN_POOL_MAX,
|
|
17
19
|
type PoolBudgetInput,
|
|
18
20
|
poolBudgetEnv,
|
|
21
|
+
STAGING_GATEWAY_ROLE_CONNECTION_LIMIT,
|
|
19
22
|
} from "./pool-budget.js";
|
|
20
23
|
|
|
21
24
|
const GCP_DEFAULT: PoolBudgetInput = {
|
|
22
25
|
maxConnections: 100,
|
|
23
|
-
adminMaxInstances:
|
|
26
|
+
adminMaxInstances: 4,
|
|
24
27
|
gatewayMaxInstances: 10,
|
|
28
|
+
stagingGatewayMaxInstances: 1,
|
|
25
29
|
concurrentBuilds: 2,
|
|
26
30
|
maintenanceReserve: 5,
|
|
27
31
|
migrationsReserve: 2,
|
|
@@ -31,9 +35,10 @@ const GCP_DEFAULT: PoolBudgetInput = {
|
|
|
31
35
|
describe("computePoolBudget", () => {
|
|
32
36
|
it("splits what the reserves leave across the admin instances", () => {
|
|
33
37
|
const b = computePoolBudget(GCP_DEFAULT);
|
|
34
|
-
// 100 - (5 + 2 + 4 + 8 + 20 +
|
|
38
|
+
// 100 - (5 + 2 + 4 + 8 + 20 + 4 + 10 + 16 + 3 + 8) = 20 → floor(20 / 4) = 5, 0 left.
|
|
35
39
|
expect(b.adminPoolMax).toBe(5);
|
|
36
|
-
expect(b.unassigned).toBe(
|
|
40
|
+
expect(b.unassigned).toBe(0);
|
|
41
|
+
expect(b.adminPublicStagingPoolMax).toBe(ADMIN_PUBLIC_STAGING_POOL_MAX);
|
|
37
42
|
expect(b.adminPublicPoolMax).toBe(ADMIN_PUBLIC_POOL_MAX);
|
|
38
43
|
expect(b.gatewayPoolMax).toBe(GATEWAY_POOL_MAX);
|
|
39
44
|
expect(b.generatorPoolMax).toBe(GENERATOR_POOL_MAX);
|
|
@@ -65,13 +70,36 @@ describe("computePoolBudget", () => {
|
|
|
65
70
|
const r = new Map(computePoolBudget(GCP_DEFAULT).reserves.map((x) => [x.name, x.connections]));
|
|
66
71
|
expect(r.get("gateway")).toBe(10 * GATEWAY_POOL_MAX);
|
|
67
72
|
expect(r.get("generator")).toBe(2 * 2 * GENERATOR_POOL_MAX);
|
|
68
|
-
expect(r.get("admin-public")).toBe(
|
|
73
|
+
expect(r.get("admin-public")).toBe(4 * ADMIN_PUBLIC_POOL_MAX);
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
it("budgets the staging gateway and the admin's staging pool (#1329)", () => {
|
|
77
|
+
const r = new Map(computePoolBudget(GCP_DEFAULT).reserves.map((x) => [x.name, x.connections]));
|
|
78
|
+
expect(r.get("staging-gateway")).toBe(
|
|
79
|
+
1 * (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE),
|
|
80
|
+
);
|
|
81
|
+
expect(ADMIN_PUBLIC_STAGING_POOL_MAX).toBe(MIN_POOL_MAX);
|
|
82
|
+
expect(r.get("admin-public-staging")).toBe(4 * ADMIN_PUBLIC_STAGING_POOL_MAX);
|
|
83
|
+
// On today's default the five admin instances before #1329 no longer
|
|
84
|
+
// fit: the stacks lower their default to four (connection-budget.md).
|
|
85
|
+
expect(() => computePoolBudget({ ...GCP_DEFAULT, adminMaxInstances: 5 })).toThrow(
|
|
86
|
+
/minimum of 4 cms_admin connections/,
|
|
87
|
+
);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it("refuses a staging scale-out beyond public_staging_role's CONNECTION LIMIT (#1329)", () => {
|
|
91
|
+
expect(STAGING_GATEWAY_ROLE_CONNECTION_LIMIT).toBe(GATEWAY_ROLE_CONNECTION_LIMIT);
|
|
92
|
+
expect(() =>
|
|
93
|
+
computePoolBudget({ ...GCP_DEFAULT, maxConnections: 1000, stagingGatewayMaxInstances: 11 }),
|
|
94
|
+
).toThrow(
|
|
95
|
+
"11 staging gateway instances need 33 connections, but the database lets the staging gateway's login (public_staging_role) hold at most 30",
|
|
96
|
+
);
|
|
69
97
|
});
|
|
70
98
|
|
|
71
99
|
it("refuses a budget below the admin floor, naming the connections needed", () => {
|
|
72
100
|
// Ten gateway instances on 60 slots: 30 for the gateway leave too little.
|
|
73
101
|
expect(() => computePoolBudget({ ...GCP_DEFAULT, maxConnections: 60 })).toThrow(
|
|
74
|
-
/Raise maxConnections to at least
|
|
102
|
+
/Raise maxConnections to at least 96/,
|
|
75
103
|
);
|
|
76
104
|
expect(() => computePoolBudget({ ...GCP_DEFAULT, maxConnections: 50 })).toThrow(
|
|
77
105
|
new RegExp(`minimum of ${ADMIN_POOL_FLOOR}`),
|
|
@@ -91,9 +119,9 @@ describe("computePoolBudget", () => {
|
|
|
91
119
|
});
|
|
92
120
|
|
|
93
121
|
it("accepts exactly the floor", () => {
|
|
94
|
-
// reserves
|
|
95
|
-
expect(computePoolBudget({ ...GCP_DEFAULT, maxConnections:
|
|
96
|
-
expect(() => computePoolBudget({ ...GCP_DEFAULT, maxConnections:
|
|
122
|
+
// reserves 80 + 4 × 4 = 96.
|
|
123
|
+
expect(computePoolBudget({ ...GCP_DEFAULT, maxConnections: 96 }).adminPoolMax).toBe(4);
|
|
124
|
+
expect(() => computePoolBudget({ ...GCP_DEFAULT, maxConnections: 95 })).toThrow();
|
|
97
125
|
});
|
|
98
126
|
|
|
99
127
|
it("rejects malformed input instead of guessing", () => {
|
package/src/pool-budget.ts
CHANGED
|
@@ -53,6 +53,14 @@ export const ADMIN_POOL_FLOOR = 4;
|
|
|
53
53
|
/** The admin's cms_public pool: plugin-data reads and the gateway projection. */
|
|
54
54
|
export const ADMIN_PUBLIC_POOL_MAX = 4;
|
|
55
55
|
|
|
56
|
+
/**
|
|
57
|
+
* #1329 — the admin's cms_public_staging pool: the staging database's
|
|
58
|
+
* plugin schemas and its half of the two-target projection. Fixed at the
|
|
59
|
+
* minimum pool, set by the admin in code (no env var): its work is a few
|
|
60
|
+
* short DDL and publish transactions, one at a time per instance.
|
|
61
|
+
*/
|
|
62
|
+
export const ADMIN_PUBLIC_STAGING_POOL_MAX = 2;
|
|
63
|
+
|
|
56
64
|
/** The gateway's only pool (public_role on cms_public), per instance. */
|
|
57
65
|
export const GATEWAY_POOL_MAX = 2;
|
|
58
66
|
|
|
@@ -89,6 +97,22 @@ export const LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE = 1;
|
|
|
89
97
|
*/
|
|
90
98
|
export const GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
91
99
|
|
|
100
|
+
/**
|
|
101
|
+
* #1329 — public_staging_role's `CONNECTION LIMIT` (cms_admin migration
|
|
102
|
+
* 0530, bootstrap.sh): the same bound as the live gateway's login. The
|
|
103
|
+
* database refuses the staging gateway's connections beyond it.
|
|
104
|
+
*/
|
|
105
|
+
export const STAGING_GATEWAY_ROLE_CONNECTION_LIMIT = 30;
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* #1329 — staging gateway instances the stacks let start. Staging serves
|
|
109
|
+
* the team, the audit and the crawlers the Owner admits, never the public,
|
|
110
|
+
* so one instance (Cloud Run: 80 concurrent requests) carries it, and the
|
|
111
|
+
* budget leaves the admin its cms_admin pool on the default server
|
|
112
|
+
* (docs/dev/connection-budget.md has the numbers).
|
|
113
|
+
*/
|
|
114
|
+
export const DEFAULT_STAGING_GATEWAY_MAX_INSTANCES = 1;
|
|
115
|
+
|
|
92
116
|
/** What the budget is computed from: the server and the scale-out limits. */
|
|
93
117
|
export interface PoolBudgetInput {
|
|
94
118
|
/** The server's `max_connections`, as provisioning sets it. */
|
|
@@ -97,6 +121,11 @@ export interface PoolBudgetInput {
|
|
|
97
121
|
readonly adminMaxInstances: number;
|
|
98
122
|
/** Most gateway instances that may run at once. */
|
|
99
123
|
readonly gatewayMaxInstances: number;
|
|
124
|
+
/**
|
|
125
|
+
* #1329 — most staging gateway instances that may run at once (the same
|
|
126
|
+
* image on cms_public_staging, its own pool and LISTEN connection each).
|
|
127
|
+
*/
|
|
128
|
+
readonly stagingGatewayMaxInstances: number;
|
|
100
129
|
/**
|
|
101
130
|
* Static-generator subprocesses that may run at once across the install
|
|
102
131
|
* (a Stage, a Publish live and a plugin-data build can overlap).
|
|
@@ -128,7 +157,11 @@ export type PoolBudgetReserveName =
|
|
|
128
157
|
| "listen"
|
|
129
158
|
/** The gateway's settings LISTEN, one per gateway instance ({@link LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE}). */
|
|
130
159
|
| "gateway-listen"
|
|
131
|
-
| "admin-public"
|
|
160
|
+
| "admin-public"
|
|
161
|
+
/** #1329 — the staging gateway's pool + LISTEN, per staging gateway instance. */
|
|
162
|
+
| "staging-gateway"
|
|
163
|
+
/** #1329 — the admin's cms_public_staging pool ({@link ADMIN_PUBLIC_STAGING_POOL_MAX}), per admin instance. */
|
|
164
|
+
| "admin-public-staging";
|
|
132
165
|
|
|
133
166
|
/** One consumer of the server's connections the budget sets aside. */
|
|
134
167
|
export interface PoolBudgetReserve {
|
|
@@ -144,6 +177,8 @@ export interface PoolBudget {
|
|
|
144
177
|
readonly adminPublicPoolMax: number;
|
|
145
178
|
/** The gateway's cms_public pool ({@link DB_PUBLIC_POOL_MAX_ENV} on the gateway). */
|
|
146
179
|
readonly gatewayPoolMax: number;
|
|
180
|
+
/** #1329 — the admin's cms_public_staging pool (fixed, {@link ADMIN_PUBLIC_STAGING_POOL_MAX}). */
|
|
181
|
+
readonly adminPublicStagingPoolMax: number;
|
|
147
182
|
/** Each pool of a generator subprocess (the admin sets it on the child). */
|
|
148
183
|
readonly generatorPoolMax: number;
|
|
149
184
|
readonly reserves: readonly PoolBudgetReserve[];
|
|
@@ -165,21 +200,25 @@ function positiveInteger(value: number, name: string, min: number): void {
|
|
|
165
200
|
* `gateway = gatewayMaxInstances × GATEWAY_POOL_MAX`,
|
|
166
201
|
* `generator = concurrentBuilds × 2 × GENERATOR_POOL_MAX`,
|
|
167
202
|
* `listen = adminMaxInstances × LISTEN_CONNECTIONS_PER_ADMIN_INSTANCE`,
|
|
168
|
-
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE
|
|
169
|
-
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX
|
|
203
|
+
* `gateway-listen = gatewayMaxInstances × LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE`,
|
|
204
|
+
* `admin-public = adminMaxInstances × ADMIN_PUBLIC_POOL_MAX`,
|
|
205
|
+
* `staging-gateway = stagingGatewayMaxInstances × (GATEWAY_POOL_MAX +
|
|
206
|
+
* LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE)` and
|
|
207
|
+
* `admin-public-staging = adminMaxInstances × ADMIN_PUBLIC_STAGING_POOL_MAX` (#1329).
|
|
170
208
|
*
|
|
171
209
|
* @throws Error naming what to change when the server cannot give every
|
|
172
210
|
* admin instance at least {@link ADMIN_POOL_FLOOR} cms_admin connections.
|
|
173
211
|
*
|
|
174
212
|
* @example
|
|
175
|
-
* computePoolBudget({ maxConnections: 100, adminMaxInstances:
|
|
176
|
-
* gatewayMaxInstances: 10,
|
|
177
|
-
* migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // →
|
|
213
|
+
* computePoolBudget({ maxConnections: 100, adminMaxInstances: 4,
|
|
214
|
+
* gatewayMaxInstances: 10, stagingGatewayMaxInstances: 1, concurrentBuilds: 2,
|
|
215
|
+
* maintenanceReserve: 5, migrationsReserve: 2, jobsReserve: 4 }).adminPoolMax // → 5
|
|
178
216
|
*/
|
|
179
217
|
export function computePoolBudget(input: PoolBudgetInput): PoolBudget {
|
|
180
218
|
positiveInteger(input.maxConnections, "maxConnections", 1);
|
|
181
219
|
positiveInteger(input.adminMaxInstances, "adminMaxInstances", 1);
|
|
182
220
|
positiveInteger(input.gatewayMaxInstances, "gatewayMaxInstances", 0);
|
|
221
|
+
positiveInteger(input.stagingGatewayMaxInstances, "stagingGatewayMaxInstances", 0);
|
|
183
222
|
positiveInteger(input.concurrentBuilds, "concurrentBuilds", 0);
|
|
184
223
|
positiveInteger(input.maintenanceReserve, "maintenanceReserve", 0);
|
|
185
224
|
positiveInteger(input.migrationsReserve, "migrationsReserve", 0);
|
|
@@ -192,6 +231,14 @@ export function computePoolBudget(input: PoolBudgetInput): PoolBudget {
|
|
|
192
231
|
`Lower gatewayMaxInstances to at most ${Math.floor(GATEWAY_ROLE_CONNECTION_LIMIT / (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE))}.`,
|
|
193
232
|
);
|
|
194
233
|
}
|
|
234
|
+
const stagingGatewayConnections =
|
|
235
|
+
input.stagingGatewayMaxInstances * (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE);
|
|
236
|
+
if (stagingGatewayConnections > STAGING_GATEWAY_ROLE_CONNECTION_LIMIT) {
|
|
237
|
+
throw new Error(
|
|
238
|
+
`pool budget: ${input.stagingGatewayMaxInstances} staging gateway instances need ${stagingGatewayConnections} connections, but the database lets the staging gateway's login (public_staging_role) hold at most ${STAGING_GATEWAY_ROLE_CONNECTION_LIMIT} (CONNECTION LIMIT, #1329). ` +
|
|
239
|
+
`Lower stagingGatewayMaxInstances to at most ${Math.floor(STAGING_GATEWAY_ROLE_CONNECTION_LIMIT / (GATEWAY_POOL_MAX + LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE))}.`,
|
|
240
|
+
);
|
|
241
|
+
}
|
|
195
242
|
|
|
196
243
|
const reserves: PoolBudgetReserve[] = [
|
|
197
244
|
{ name: "maintenance", connections: input.maintenanceReserve },
|
|
@@ -208,6 +255,11 @@ export function computePoolBudget(input: PoolBudgetInput): PoolBudget {
|
|
|
208
255
|
connections: input.gatewayMaxInstances * LISTEN_CONNECTIONS_PER_GATEWAY_INSTANCE,
|
|
209
256
|
},
|
|
210
257
|
{ name: "admin-public", connections: input.adminMaxInstances * ADMIN_PUBLIC_POOL_MAX },
|
|
258
|
+
{ name: "staging-gateway", connections: stagingGatewayConnections },
|
|
259
|
+
{
|
|
260
|
+
name: "admin-public-staging",
|
|
261
|
+
connections: input.adminMaxInstances * ADMIN_PUBLIC_STAGING_POOL_MAX,
|
|
262
|
+
},
|
|
211
263
|
];
|
|
212
264
|
const reserved = reserves.reduce((sum, r) => sum + r.connections, 0);
|
|
213
265
|
const forAdmin = input.maxConnections - reserved;
|
|
@@ -218,13 +270,14 @@ export function computePoolBudget(input: PoolBudgetInput): PoolBudget {
|
|
|
218
270
|
throw new Error(
|
|
219
271
|
`pool budget: max_connections ${input.maxConnections} cannot give each of ${input.adminMaxInstances} admin instances the minimum of ${ADMIN_POOL_FLOOR} cms_admin connections ` +
|
|
220
272
|
`(reserved: ${breakdown}; ${needed} needed). Raise maxConnections to at least ${needed} (a larger database tier may be required), ` +
|
|
221
|
-
"or lower adminMaxInstances / gatewayMaxInstances.",
|
|
273
|
+
"or lower adminMaxInstances / gatewayMaxInstances / stagingGatewayMaxInstances.",
|
|
222
274
|
);
|
|
223
275
|
}
|
|
224
276
|
return {
|
|
225
277
|
adminPoolMax,
|
|
226
278
|
adminPublicPoolMax: ADMIN_PUBLIC_POOL_MAX,
|
|
227
279
|
gatewayPoolMax: GATEWAY_POOL_MAX,
|
|
280
|
+
adminPublicStagingPoolMax: ADMIN_PUBLIC_STAGING_POOL_MAX,
|
|
228
281
|
generatorPoolMax: GENERATOR_POOL_MAX,
|
|
229
282
|
reserves,
|
|
230
283
|
unassigned: forAdmin - adminPoolMax * input.adminMaxInstances,
|
|
@@ -236,8 +289,9 @@ export type PoolBudgetService = "admin" | "gateway";
|
|
|
236
289
|
|
|
237
290
|
/**
|
|
238
291
|
* The env that sizes `service`'s pools from `budget`, for the stacks to set.
|
|
239
|
-
* The admin gets both pools
|
|
240
|
-
*
|
|
292
|
+
* The admin gets both pools (its cms_public_staging pool is fixed in code,
|
|
293
|
+
* #1329); a gateway, live or staging, whose only pool is its public
|
|
294
|
+
* database's, gets just that one.
|
|
241
295
|
*/
|
|
242
296
|
export function poolBudgetEnv(
|
|
243
297
|
budget: PoolBudget,
|