fest-gateway 0.5.2 → 0.7.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/README.md +26 -1
- package/dist/cli/claude.js +10 -4
- package/dist/cli/claude.js.map +1 -1
- package/dist/cli/codex.js +8 -4
- package/dist/cli/codex.js.map +1 -1
- package/dist/cli/copilot.js +11 -5
- package/dist/cli/copilot.js.map +1 -1
- package/dist/cli/tags.js +258 -0
- package/dist/cli/tags.js.map +1 -0
- package/dist/server/api/auth.js +6 -5
- package/dist/server/api/auth.js.map +1 -1
- package/dist/server/api/live.js +1 -0
- package/dist/server/api/live.js.map +1 -1
- package/dist/server/api/routes.js +23 -2
- package/dist/server/api/routes.js.map +1 -1
- package/dist/server/auth/posture.js +39 -10
- package/dist/server/auth/posture.js.map +1 -1
- package/dist/server/bin/fest.js +171 -39
- package/dist/server/bin/fest.js.map +1 -1
- package/dist/server/cluster/messages.js +35 -0
- package/dist/server/cluster/messages.js.map +1 -0
- package/dist/server/cluster/primary.js +178 -0
- package/dist/server/cluster/primary.js.map +1 -0
- package/dist/server/cluster/worker.js +82 -0
- package/dist/server/cluster/worker.js.map +1 -0
- package/dist/server/config.js +15 -0
- package/dist/server/config.js.map +1 -1
- package/dist/server/http/server.js +4 -1
- package/dist/server/http/server.js.map +1 -1
- package/dist/server/ingest/sink.js +9 -7
- package/dist/server/ingest/sink.js.map +1 -1
- package/dist/server/log.js +4 -1
- package/dist/server/log.js.map +1 -1
- package/dist/server/pipeline/dispatch.js +1 -0
- package/dist/server/pipeline/dispatch.js.map +1 -1
- package/dist/server/pipeline/passthrough.js +1 -0
- package/dist/server/pipeline/passthrough.js.map +1 -1
- package/dist/server/pipeline/record.js +1 -0
- package/dist/server/pipeline/record.js.map +1 -1
- package/dist/server/store/db.js +42 -4
- package/dist/server/store/db.js.map +1 -1
- package/dist/server/store/migrations/007-tags.sql +94 -0
- package/dist/server/store/queries.js +112 -6
- package/dist/server/store/queries.js.map +1 -1
- package/dist/server/store/seed.js +17 -0
- package/dist/server/store/seed.js.map +1 -1
- package/dist/server/store/write.js +10 -3
- package/dist/server/store/write.js.map +1 -1
- package/dist/server/usage/prices/refresh.js +9 -3
- package/dist/server/usage/prices/refresh.js.map +1 -1
- package/dist/shared/tags.js +155 -0
- package/dist/shared/tags.js.map +1 -0
- package/dist/web/dist/assets/index-AJc39GYv.js +56 -0
- package/dist/web/dist/assets/index-AJc39GYv.js.map +1 -0
- package/dist/web/dist/assets/index-BgK6vcz0.css +2 -0
- package/dist/web/dist/index.html +2 -2
- package/package.json +3 -3
- package/dist/web/dist/assets/index-C7n3_lX2.css +0 -2
- package/dist/web/dist/assets/index-DJb4NfM5.js +0 -56
- package/dist/web/dist/assets/index-DJb4NfM5.js.map +0 -1
|
@@ -45,6 +45,22 @@ const MODELS = [
|
|
|
45
45
|
"claude-haiku-4-5-20251001",
|
|
46
46
|
];
|
|
47
47
|
const SEED_USERS = ["ada@corp.test", "grace@corp.test", "alan@corp.test"];
|
|
48
|
+
const DEMO_TEAMS = ["platform", "data", "platform"];
|
|
49
|
+
const DEMO_PROJECTS = ["fest", "website", "fest", "infra"];
|
|
50
|
+
/**
|
|
51
|
+
* Tags for a demo row, derived from its index and developer rather than drawn
|
|
52
|
+
* from the PRNG: drawing would shift every later random value, and with it
|
|
53
|
+
* every number the seed tests pin. A team per developer, a rotating project,
|
|
54
|
+
* and a slice of untagged traffic so the "none" bucket is visible too.
|
|
55
|
+
*/
|
|
56
|
+
function demoTags(i, userIndex) {
|
|
57
|
+
if (i % 7 === 0)
|
|
58
|
+
return {};
|
|
59
|
+
const project = DEMO_PROJECTS[i % DEMO_PROJECTS.length];
|
|
60
|
+
if (userIndex < 0)
|
|
61
|
+
return { project };
|
|
62
|
+
return { team: DEMO_TEAMS[userIndex % DEMO_TEAMS.length], project };
|
|
63
|
+
}
|
|
48
64
|
export function generateRecords(opts) {
|
|
49
65
|
const count = opts.requests ?? 400;
|
|
50
66
|
const hours = opts.hours ?? 48;
|
|
@@ -154,6 +170,7 @@ export function generateRecords(opts) {
|
|
|
154
170
|
}
|
|
155
171
|
: null,
|
|
156
172
|
clientVersion: "2.1.278",
|
|
173
|
+
tags: demoTags(i, userId === null ? -1 : opts.userIds.indexOf(userId)),
|
|
157
174
|
pipeline: credentialOrigin === "fallback_server" ? "substitute" : "passthrough",
|
|
158
175
|
routeId: credentialOrigin === "fallback_server" ? "demo-substitute" : null,
|
|
159
176
|
credentialsConsidered: credentialOrigin === "fallback_server"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../server/store/seed.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEvD,iEAAiE;AACjE,SAAS,IAAI,CAAC,IAAY;IACxB,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC;IACnB,OAAO,GAAG,EAAE;QACV,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3B,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG;IACb,eAAe;IACf,iBAAiB;IACjB,2BAA2B;CACnB,CAAC;AAEX,MAAM,UAAU,GAAG,CAAC,eAAe,EAAE,iBAAiB,EAAE,gBAAgB,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"seed.js","sourceRoot":"","sources":["../../../server/store/seed.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* The metering write path.
|
|
3
3
|
*
|
|
4
4
|
* Called from the flush side of the usage queue, never from a proxied request
|
|
5
|
-
* (see the constraint comment in db.ts — `
|
|
5
|
+
* (see the constraint comment in db.ts — `node:sqlite` blocks the event loop).
|
|
6
6
|
* One batch is one transaction, and inside it each record writes both its raw
|
|
7
7
|
* `requests` row and its `usage_hourly` rollups, so the rollups can never
|
|
8
8
|
* disagree with the rows they summarise.
|
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
* distinction survives aggregation.
|
|
20
20
|
*/
|
|
21
21
|
import { isErrorStatus } from "../../shared/types.js";
|
|
22
|
+
import { canonicalTags } from "../../shared/tags.js";
|
|
22
23
|
import { log } from "../log.js";
|
|
23
24
|
const HOUR_MS = 3_600_000;
|
|
24
25
|
/** Epoch ms truncated to the start of its UTC hour. */
|
|
@@ -62,7 +63,7 @@ INSERT INTO requests (
|
|
|
62
63
|
rl_status, rl_5h_utilization, rl_5h_status, rl_5h_reset_at,
|
|
63
64
|
rl_7d_utilization, rl_7d_status, rl_7d_reset_at,
|
|
64
65
|
rl_claim, rl_overage_status, rl_overage_reason,
|
|
65
|
-
client_version, client,
|
|
66
|
+
client_version, client, tags_json,
|
|
66
67
|
pipeline, route_id, credentials_considered
|
|
67
68
|
) VALUES (
|
|
68
69
|
:id, :org_id, :user_id, :token_id,
|
|
@@ -79,7 +80,7 @@ INSERT INTO requests (
|
|
|
79
80
|
:rl_status, :rl_5h_utilization, :rl_5h_status, :rl_5h_reset_at,
|
|
80
81
|
:rl_7d_utilization, :rl_7d_status, :rl_7d_reset_at,
|
|
81
82
|
:rl_claim, :rl_overage_status, :rl_overage_reason,
|
|
82
|
-
:client_version, :client,
|
|
83
|
+
:client_version, :client, :tags_json,
|
|
83
84
|
:pipeline, :route_id, :credentials_considered
|
|
84
85
|
)`;
|
|
85
86
|
const ADDITIVE_COLUMNS = [
|
|
@@ -113,6 +114,7 @@ const KEY_COLUMNS = [
|
|
|
113
114
|
"served_model",
|
|
114
115
|
"credential_origin",
|
|
115
116
|
"cost_basis",
|
|
117
|
+
"tags",
|
|
116
118
|
];
|
|
117
119
|
const ROLLUP_COLUMNS = [...KEY_COLUMNS, ...ADDITIVE_COLUMNS, "duration_ms_max"];
|
|
118
120
|
const UPSERT_ROLLUP = `
|
|
@@ -184,6 +186,8 @@ function requestParams(orgId, record) {
|
|
|
184
186
|
rl_overage_reason: nullable(rl?.overageDisabledReason),
|
|
185
187
|
client_version: nullable(record.clientVersion),
|
|
186
188
|
client: nullable(record.client),
|
|
189
|
+
// NULL rather than '' for untagged, matching `client`: "nothing declared".
|
|
190
|
+
tags_json: canonicalTags(record.tags) || null,
|
|
187
191
|
pipeline: record.pipeline,
|
|
188
192
|
route_id: nullable(record.routeId),
|
|
189
193
|
// Serialised here rather than in the request path: the array is small, but
|
|
@@ -236,6 +240,9 @@ function rollupParams(orgId, record) {
|
|
|
236
240
|
hour_start: hourStart(record.startedAt),
|
|
237
241
|
credential_origin: record.credentialOrigin,
|
|
238
242
|
cost_basis: record.costBasis,
|
|
243
|
+
// The whole tag set is one cube dimension — see migration 007. Same
|
|
244
|
+
// canonical string as `requests.tags_json`, so both sides filter alike.
|
|
245
|
+
tags: canonicalTags(record.tags),
|
|
239
246
|
requests: 1,
|
|
240
247
|
// Shared with the raw-range predicate in `queries.ts`; see NON_ERROR_STATUSES.
|
|
241
248
|
errors: isErrorStatus(record.status) ? 1 : 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../server/store/write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"write.js","sourceRoot":"","sources":["../../../server/store/write.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,15 +105,21 @@ export async function refreshPricesOnce(opts) {
|
|
|
105
105
|
* exit, and a short-lived CLI command that happens to load the table should not
|
|
106
106
|
* hang for 24 hours waiting for a tick.
|
|
107
107
|
*/
|
|
108
|
-
export function startPriceRefresh(opts) {
|
|
108
|
+
export function startPriceRefresh(opts, onRefreshed) {
|
|
109
109
|
if (!opts.refreshEnabled) {
|
|
110
110
|
log.info("price refresh disabled", { reason: "FEST_PRICING_REFRESH" });
|
|
111
111
|
return { stop: () => { } };
|
|
112
112
|
}
|
|
113
113
|
const timers = [];
|
|
114
114
|
// Deferred rather than awaited: boot must not wait on GitHub.
|
|
115
|
-
|
|
116
|
-
|
|
115
|
+
// `onRefreshed` is how a cluster primary tells its workers to re-read the
|
|
116
|
+
// cache this just wrote; each worker prices its own requests.
|
|
117
|
+
const tick = () => void refreshPricesOnce(opts).then((ok) => {
|
|
118
|
+
if (ok)
|
|
119
|
+
onRefreshed?.();
|
|
120
|
+
});
|
|
121
|
+
timers.push(setTimeout(tick, 0).unref());
|
|
122
|
+
timers.push(setInterval(tick, DAY_MS).unref());
|
|
117
123
|
return {
|
|
118
124
|
stop: () => {
|
|
119
125
|
for (const t of timers)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../server/usage/prices/refresh.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAShC,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1E,OAAO;QACL,uEAAuE;QACvE,gCAAgC;QAChC,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc;QAC3C,cAAc,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC1D,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,WAAW;KAChE,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,IAAuC;IAChE,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAEhC,IAAI,MAAM,GAAwB,IAAI,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAiB,CAAC;IAC5E,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;IAC5E,CAAC;IAED,MAAM,MAAM,GACV,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS;QAC9F,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,QAAQ,CAAC;IAEf,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE;QACxB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM;QACzC,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;QACnD,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO;KACjD,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,GAAW;IACrC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC7C,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE;KACxC,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AACpF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAoB;IAC1D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7C,oEAAoE;QACpE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,MAAM,CAAC;QACnD,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhC,eAAe,CAAC,OAAO,CAAC,CAAC;QACzB,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,6CAA6C,EAAE;YACtD,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACxD,CAAC,CAAC;QACH,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAMD;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAoB;
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../server/usage/prices/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Request tags: free-form `key=value` pairs a client declares about its own
|
|
3
|
+
* traffic (`team=platform,project=fest`), so usage can be grouped and filtered
|
|
4
|
+
* by something other than who sent it.
|
|
5
|
+
*
|
|
6
|
+
* Tags are self-declared, like `x-fest-client`. They are labels for reporting,
|
|
7
|
+
* never an input to authorisation or routing — a client that lies about its
|
|
8
|
+
* project mislabels its own usage and nothing else.
|
|
9
|
+
*
|
|
10
|
+
* Two carriers, one format:
|
|
11
|
+
* - header `x-fest-tags: team=platform,project=fest`
|
|
12
|
+
* - path `/t/<tok>/~team=platform,project=fest/v1/messages`
|
|
13
|
+
* The path form exists because Copilot on its own login can set a base URL but
|
|
14
|
+
* no headers. Both are stripped before anything reaches upstream.
|
|
15
|
+
*
|
|
16
|
+
* Shared by the server (parsing what arrives) and the CLI (building what it
|
|
17
|
+
* sends), so the two cannot disagree about what a valid tag is.
|
|
18
|
+
*/
|
|
19
|
+
export const MAX_TAGS = 8;
|
|
20
|
+
export const MAX_TAG_VALUE_LENGTH = 64;
|
|
21
|
+
const KEY = /^[a-z0-9_.-]{1,32}$/;
|
|
22
|
+
/**
|
|
23
|
+
* No `,` `=` `%` or `/` survives decoding: `,` and `=` are the separators, and
|
|
24
|
+
* a `/` in a stored value would be ambiguous in the path form. Spaces are
|
|
25
|
+
* allowed for human labels ("Platform team"); the URL form percent-encodes them.
|
|
26
|
+
*/
|
|
27
|
+
const VALUE = /^[A-Za-z0-9 ._:@-]+$/;
|
|
28
|
+
function decode(s) {
|
|
29
|
+
try {
|
|
30
|
+
return decodeURIComponent(s);
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* `team=platform,project=fest` → pairs, in order, duplicates kept (last wins
|
|
38
|
+
* when folded). Each half is URL-decoded. Invalid pairs are dropped silently:
|
|
39
|
+
* a malformed tag must never fail the request it rides on.
|
|
40
|
+
*
|
|
41
|
+
* An empty value is kept here (the CLI uses `project=` to suppress a default);
|
|
42
|
+
* {@link parseTags} drops it.
|
|
43
|
+
*/
|
|
44
|
+
export function parseTagPairs(raw) {
|
|
45
|
+
const pairs = [];
|
|
46
|
+
for (const part of raw.split(",")) {
|
|
47
|
+
const eq = part.indexOf("=");
|
|
48
|
+
if (eq <= 0)
|
|
49
|
+
continue;
|
|
50
|
+
const key = decode(part.slice(0, eq).trim())?.trim().toLowerCase();
|
|
51
|
+
const value = decode(part.slice(eq + 1).trim())?.trim();
|
|
52
|
+
if (key === undefined || value === undefined)
|
|
53
|
+
continue;
|
|
54
|
+
if (!KEY.test(key))
|
|
55
|
+
continue;
|
|
56
|
+
if (value !== "" && (value.length > MAX_TAG_VALUE_LENGTH || !VALUE.test(value)))
|
|
57
|
+
continue;
|
|
58
|
+
pairs.push({ key, value });
|
|
59
|
+
}
|
|
60
|
+
return pairs;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Fold pairs into tags: last wins per key, and an empty value removes the key.
|
|
64
|
+
* Layers merge by concatenating their pairs lowest-precedence first, so a
|
|
65
|
+
* higher layer's `project=` suppresses a lower layer's `project=fest`.
|
|
66
|
+
*/
|
|
67
|
+
export function tagsFromPairs(pairs) {
|
|
68
|
+
const out = {};
|
|
69
|
+
for (const { key, value } of pairs) {
|
|
70
|
+
if (value === "") {
|
|
71
|
+
delete out[key];
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (!(key in out) && Object.keys(out).length >= MAX_TAGS)
|
|
75
|
+
continue;
|
|
76
|
+
out[key] = value;
|
|
77
|
+
}
|
|
78
|
+
return out;
|
|
79
|
+
}
|
|
80
|
+
export function parseTags(raw) {
|
|
81
|
+
return tagsFromPairs(parseTagPairs(raw));
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* The one stored form: a JSON object with sorted keys, or `""` for no tags.
|
|
85
|
+
*
|
|
86
|
+
* Sorted, because the rollup keys on this string — `{"a":"1","b":"2"}` and
|
|
87
|
+
* `{"b":"2","a":"1"}` must land in the same bucket.
|
|
88
|
+
*/
|
|
89
|
+
export function canonicalTags(tags) {
|
|
90
|
+
if (tags === null || tags === undefined)
|
|
91
|
+
return "";
|
|
92
|
+
const keys = Object.keys(tags).sort();
|
|
93
|
+
if (keys.length === 0)
|
|
94
|
+
return "";
|
|
95
|
+
const sorted = {};
|
|
96
|
+
for (const k of keys)
|
|
97
|
+
sorted[k] = tags[k];
|
|
98
|
+
return JSON.stringify(sorted);
|
|
99
|
+
}
|
|
100
|
+
/** Inverse of {@link canonicalTags}; anything unreadable is no tags. */
|
|
101
|
+
export function tagsFromCanonical(s) {
|
|
102
|
+
if (s === null || s === undefined || s === "")
|
|
103
|
+
return {};
|
|
104
|
+
try {
|
|
105
|
+
const parsed = JSON.parse(s);
|
|
106
|
+
if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed))
|
|
107
|
+
return {};
|
|
108
|
+
const out = {};
|
|
109
|
+
for (const [k, v] of Object.entries(parsed))
|
|
110
|
+
if (typeof v === "string")
|
|
111
|
+
out[k] = v;
|
|
112
|
+
return out;
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return {};
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
/** `team=platform,project=fest` with each half URL-encoded — the wire form. */
|
|
119
|
+
export function formatTags(tags) {
|
|
120
|
+
return Object.keys(tags)
|
|
121
|
+
.sort()
|
|
122
|
+
.map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(tags[k])}`)
|
|
123
|
+
.join(",");
|
|
124
|
+
}
|
|
125
|
+
/** The path segment, `~team=platform,project=fest`, or `""` for no tags. */
|
|
126
|
+
export function tagPathSegment(tags) {
|
|
127
|
+
const s = formatTags(tags);
|
|
128
|
+
return s === "" ? "" : `~${s}`;
|
|
129
|
+
}
|
|
130
|
+
/** `["team:platform", "project:fest"]` → filter. Invalid entries dropped. */
|
|
131
|
+
export function parseTagFilter(values) {
|
|
132
|
+
const out = {};
|
|
133
|
+
for (const v of values) {
|
|
134
|
+
const colon = v.indexOf(":");
|
|
135
|
+
if (colon <= 0)
|
|
136
|
+
continue;
|
|
137
|
+
const key = v.slice(0, colon).trim().toLowerCase();
|
|
138
|
+
const value = v.slice(colon + 1).trim();
|
|
139
|
+
if (!KEY.test(key) || value === "" || value.length > MAX_TAG_VALUE_LENGTH || !VALUE.test(value))
|
|
140
|
+
continue;
|
|
141
|
+
if (!(key in out) && Object.keys(out).length >= MAX_TAGS)
|
|
142
|
+
continue;
|
|
143
|
+
out[key] = value;
|
|
144
|
+
}
|
|
145
|
+
return out;
|
|
146
|
+
}
|
|
147
|
+
export function formatTagFilter(filter) {
|
|
148
|
+
return Object.keys(filter)
|
|
149
|
+
.sort()
|
|
150
|
+
.map((k) => `${k}:${filter[k]}`);
|
|
151
|
+
}
|
|
152
|
+
export function isValidTagKey(key) {
|
|
153
|
+
return KEY.test(key);
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=tags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../shared/tags.ts"],"names":[],"mappings":"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"}
|