@winstonsayno/mcp-gateway 7.3.0 → 7.5.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 +20 -0
- package/README.md +14 -0
- package/dist/config/loader.d.ts +6 -6
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +4 -0
- package/dist/config/loader.js.map +1 -1
- package/dist/features/api-upstreams.d.ts +4 -4
- package/dist/features/identity.d.ts +4 -4
- package/dist/features/index.d.ts +2 -0
- package/dist/features/index.d.ts.map +1 -1
- package/dist/features/index.js +2 -0
- package/dist/features/index.js.map +1 -1
- package/dist/features/rollouts.d.ts +264 -0
- package/dist/features/rollouts.d.ts.map +1 -0
- package/dist/features/rollouts.js +216 -0
- package/dist/features/rollouts.js.map +1 -0
- package/dist/features/sanitize.d.ts +6 -6
- package/dist/features/semantic-cache.d.ts +158 -0
- package/dist/features/semantic-cache.d.ts.map +1 -0
- package/dist/features/semantic-cache.js +303 -0
- package/dist/features/semantic-cache.js.map +1 -0
- package/dist/gateway/control-plane.d.ts +2 -2
- package/dist/gateway/features.d.ts +1 -1
- package/dist/gateway/features.d.ts.map +1 -1
- package/dist/gateway/features.js +1 -1
- package/dist/gateway/features.js.map +1 -1
- package/dist/gateway/hooks.d.ts +3 -0
- package/dist/gateway/hooks.d.ts.map +1 -1
- package/dist/gateway/hooks.js.map +1 -1
- package/dist/gateway/invoker.d.ts.map +1 -1
- package/dist/gateway/invoker.js +14 -1
- package/dist/gateway/invoker.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/utils/types.d.ts +4 -0
- package/dist/utils/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool versioning and gradual rollout (7.5): send a share of a tool's traffic to a new upstream version.
|
|
3
|
+
*
|
|
4
|
+
* A rollout names a **stable** server and a **canary** server (the new version, same tool names). Calls to the stable
|
|
5
|
+
* server's matching tools go to the canary for `percent` % of callers (sticky per client: the same client always gets
|
|
6
|
+
* the same version), for every client matching `clients`, and never for clients matching `exclude`. The canary's
|
|
7
|
+
* error rate is watched: above `autoRollback.maxErrorRate` (after `minCalls` canary calls in the window) the rollout
|
|
8
|
+
* is rolled back automatically.
|
|
9
|
+
*
|
|
10
|
+
* ```yaml
|
|
11
|
+
* rollouts:
|
|
12
|
+
* - id: search-v2
|
|
13
|
+
* stable: search # server id clients call
|
|
14
|
+
* canary: search-v2 # server id of the new version
|
|
15
|
+
* tools: ["*"] # tool globs on the stable server (default all)
|
|
16
|
+
* percent: 10
|
|
17
|
+
* clients: ["key:beta-*"] # always canary
|
|
18
|
+
* autoRollback: { maxErrorRate: 0.2, minCalls: 20, window: 200 }
|
|
19
|
+
* ```
|
|
20
|
+
*
|
|
21
|
+
* Results routed to the canary carry `_meta["mcp-gateway/rollout"]` (`id`, `version: canary`).
|
|
22
|
+
*
|
|
23
|
+
* - `GET /admin/rollouts` — each rollout: effective percent, state (`active` | `promoted` | `rolled-back`), calls and
|
|
24
|
+
* error rates per version.
|
|
25
|
+
* - `POST /admin/rollouts/:id/percent` `{ percent }`, `/promote` (100 %), `/rollback` (0 %), `/reset` (back to config).
|
|
26
|
+
* Runtime overrides; `?persist=true` also writes `percent` into the config (`controlPlane.configApi: true`).
|
|
27
|
+
*
|
|
28
|
+
* @module features/rollouts
|
|
29
|
+
*/
|
|
30
|
+
import { z } from 'zod';
|
|
31
|
+
declare const RolloutSchema: z.ZodEffects<z.ZodObject<{
|
|
32
|
+
id: z.ZodString;
|
|
33
|
+
stable: z.ZodString;
|
|
34
|
+
canary: z.ZodString;
|
|
35
|
+
tools: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
36
|
+
percent: z.ZodDefault<z.ZodNumber>;
|
|
37
|
+
clients: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
38
|
+
exclude: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
39
|
+
autoRollback: z.ZodOptional<z.ZodObject<{
|
|
40
|
+
maxErrorRate: z.ZodDefault<z.ZodNumber>;
|
|
41
|
+
minCalls: z.ZodDefault<z.ZodNumber>;
|
|
42
|
+
window: z.ZodDefault<z.ZodNumber>;
|
|
43
|
+
}, "strict", z.ZodTypeAny, {
|
|
44
|
+
maxErrorRate: number;
|
|
45
|
+
minCalls: number;
|
|
46
|
+
window: number;
|
|
47
|
+
}, {
|
|
48
|
+
maxErrorRate?: number | undefined;
|
|
49
|
+
minCalls?: number | undefined;
|
|
50
|
+
window?: number | undefined;
|
|
51
|
+
}>>;
|
|
52
|
+
}, "strict", z.ZodTypeAny, {
|
|
53
|
+
id: string;
|
|
54
|
+
tools: string[];
|
|
55
|
+
stable: string;
|
|
56
|
+
canary: string;
|
|
57
|
+
percent: number;
|
|
58
|
+
clients: string[];
|
|
59
|
+
exclude: string[];
|
|
60
|
+
autoRollback?: {
|
|
61
|
+
maxErrorRate: number;
|
|
62
|
+
minCalls: number;
|
|
63
|
+
window: number;
|
|
64
|
+
} | undefined;
|
|
65
|
+
}, {
|
|
66
|
+
id: string;
|
|
67
|
+
stable: string;
|
|
68
|
+
canary: string;
|
|
69
|
+
tools?: string[] | undefined;
|
|
70
|
+
percent?: number | undefined;
|
|
71
|
+
clients?: string[] | undefined;
|
|
72
|
+
exclude?: string[] | undefined;
|
|
73
|
+
autoRollback?: {
|
|
74
|
+
maxErrorRate?: number | undefined;
|
|
75
|
+
minCalls?: number | undefined;
|
|
76
|
+
window?: number | undefined;
|
|
77
|
+
} | undefined;
|
|
78
|
+
}>, {
|
|
79
|
+
id: string;
|
|
80
|
+
tools: string[];
|
|
81
|
+
stable: string;
|
|
82
|
+
canary: string;
|
|
83
|
+
percent: number;
|
|
84
|
+
clients: string[];
|
|
85
|
+
exclude: string[];
|
|
86
|
+
autoRollback?: {
|
|
87
|
+
maxErrorRate: number;
|
|
88
|
+
minCalls: number;
|
|
89
|
+
window: number;
|
|
90
|
+
} | undefined;
|
|
91
|
+
}, {
|
|
92
|
+
id: string;
|
|
93
|
+
stable: string;
|
|
94
|
+
canary: string;
|
|
95
|
+
tools?: string[] | undefined;
|
|
96
|
+
percent?: number | undefined;
|
|
97
|
+
clients?: string[] | undefined;
|
|
98
|
+
exclude?: string[] | undefined;
|
|
99
|
+
autoRollback?: {
|
|
100
|
+
maxErrorRate?: number | undefined;
|
|
101
|
+
minCalls?: number | undefined;
|
|
102
|
+
window?: number | undefined;
|
|
103
|
+
} | undefined;
|
|
104
|
+
}>;
|
|
105
|
+
export declare const RolloutsSchema: z.ZodEffects<z.ZodArray<z.ZodEffects<z.ZodObject<{
|
|
106
|
+
id: z.ZodString;
|
|
107
|
+
stable: z.ZodString;
|
|
108
|
+
canary: z.ZodString;
|
|
109
|
+
tools: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
110
|
+
percent: z.ZodDefault<z.ZodNumber>;
|
|
111
|
+
clients: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
112
|
+
exclude: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
|
|
113
|
+
autoRollback: z.ZodOptional<z.ZodObject<{
|
|
114
|
+
maxErrorRate: z.ZodDefault<z.ZodNumber>;
|
|
115
|
+
minCalls: z.ZodDefault<z.ZodNumber>;
|
|
116
|
+
window: z.ZodDefault<z.ZodNumber>;
|
|
117
|
+
}, "strict", z.ZodTypeAny, {
|
|
118
|
+
maxErrorRate: number;
|
|
119
|
+
minCalls: number;
|
|
120
|
+
window: number;
|
|
121
|
+
}, {
|
|
122
|
+
maxErrorRate?: number | undefined;
|
|
123
|
+
minCalls?: number | undefined;
|
|
124
|
+
window?: number | undefined;
|
|
125
|
+
}>>;
|
|
126
|
+
}, "strict", z.ZodTypeAny, {
|
|
127
|
+
id: string;
|
|
128
|
+
tools: string[];
|
|
129
|
+
stable: string;
|
|
130
|
+
canary: string;
|
|
131
|
+
percent: number;
|
|
132
|
+
clients: string[];
|
|
133
|
+
exclude: string[];
|
|
134
|
+
autoRollback?: {
|
|
135
|
+
maxErrorRate: number;
|
|
136
|
+
minCalls: number;
|
|
137
|
+
window: number;
|
|
138
|
+
} | undefined;
|
|
139
|
+
}, {
|
|
140
|
+
id: string;
|
|
141
|
+
stable: string;
|
|
142
|
+
canary: string;
|
|
143
|
+
tools?: string[] | undefined;
|
|
144
|
+
percent?: number | undefined;
|
|
145
|
+
clients?: string[] | undefined;
|
|
146
|
+
exclude?: string[] | undefined;
|
|
147
|
+
autoRollback?: {
|
|
148
|
+
maxErrorRate?: number | undefined;
|
|
149
|
+
minCalls?: number | undefined;
|
|
150
|
+
window?: number | undefined;
|
|
151
|
+
} | undefined;
|
|
152
|
+
}>, {
|
|
153
|
+
id: string;
|
|
154
|
+
tools: string[];
|
|
155
|
+
stable: string;
|
|
156
|
+
canary: string;
|
|
157
|
+
percent: number;
|
|
158
|
+
clients: string[];
|
|
159
|
+
exclude: string[];
|
|
160
|
+
autoRollback?: {
|
|
161
|
+
maxErrorRate: number;
|
|
162
|
+
minCalls: number;
|
|
163
|
+
window: number;
|
|
164
|
+
} | undefined;
|
|
165
|
+
}, {
|
|
166
|
+
id: string;
|
|
167
|
+
stable: string;
|
|
168
|
+
canary: string;
|
|
169
|
+
tools?: string[] | undefined;
|
|
170
|
+
percent?: number | undefined;
|
|
171
|
+
clients?: string[] | undefined;
|
|
172
|
+
exclude?: string[] | undefined;
|
|
173
|
+
autoRollback?: {
|
|
174
|
+
maxErrorRate?: number | undefined;
|
|
175
|
+
minCalls?: number | undefined;
|
|
176
|
+
window?: number | undefined;
|
|
177
|
+
} | undefined;
|
|
178
|
+
}>, "many">, {
|
|
179
|
+
id: string;
|
|
180
|
+
tools: string[];
|
|
181
|
+
stable: string;
|
|
182
|
+
canary: string;
|
|
183
|
+
percent: number;
|
|
184
|
+
clients: string[];
|
|
185
|
+
exclude: string[];
|
|
186
|
+
autoRollback?: {
|
|
187
|
+
maxErrorRate: number;
|
|
188
|
+
minCalls: number;
|
|
189
|
+
window: number;
|
|
190
|
+
} | undefined;
|
|
191
|
+
}[], {
|
|
192
|
+
id: string;
|
|
193
|
+
stable: string;
|
|
194
|
+
canary: string;
|
|
195
|
+
tools?: string[] | undefined;
|
|
196
|
+
percent?: number | undefined;
|
|
197
|
+
clients?: string[] | undefined;
|
|
198
|
+
exclude?: string[] | undefined;
|
|
199
|
+
autoRollback?: {
|
|
200
|
+
maxErrorRate?: number | undefined;
|
|
201
|
+
minCalls?: number | undefined;
|
|
202
|
+
window?: number | undefined;
|
|
203
|
+
} | undefined;
|
|
204
|
+
}[]>;
|
|
205
|
+
export type RolloutsConfig = z.input<typeof RolloutsSchema>;
|
|
206
|
+
type Rollout = z.output<typeof RolloutSchema>;
|
|
207
|
+
/** Sticky bucket 0..99.99 for a client in a rollout. */
|
|
208
|
+
export declare const bucketOf: (rolloutId: string, client: string) => number;
|
|
209
|
+
interface Arm {
|
|
210
|
+
calls: number;
|
|
211
|
+
errors: number;
|
|
212
|
+
recent: boolean[];
|
|
213
|
+
}
|
|
214
|
+
interface State {
|
|
215
|
+
override?: number;
|
|
216
|
+
state: 'active' | 'promoted' | 'rolled-back';
|
|
217
|
+
reason?: string;
|
|
218
|
+
stable: Arm;
|
|
219
|
+
canary: Arm;
|
|
220
|
+
}
|
|
221
|
+
export declare class RolloutManager {
|
|
222
|
+
readonly states: Map<string, State>;
|
|
223
|
+
private st;
|
|
224
|
+
percent(r: Rollout): number;
|
|
225
|
+
/** Version for a call by `client`. */
|
|
226
|
+
pick(r: Rollout, client: string): 'stable' | 'canary';
|
|
227
|
+
record(r: Rollout, version: 'stable' | 'canary', error: boolean): void;
|
|
228
|
+
set(id: string, percent: number, state: State['state'], reason?: string): void;
|
|
229
|
+
reset(id: string): void;
|
|
230
|
+
view(r: Rollout): {
|
|
231
|
+
versions: {
|
|
232
|
+
stable: {
|
|
233
|
+
calls: number;
|
|
234
|
+
errors: number;
|
|
235
|
+
errorRate: number;
|
|
236
|
+
windowErrorRate: number;
|
|
237
|
+
};
|
|
238
|
+
canary: {
|
|
239
|
+
calls: number;
|
|
240
|
+
errors: number;
|
|
241
|
+
errorRate: number;
|
|
242
|
+
windowErrorRate: number;
|
|
243
|
+
};
|
|
244
|
+
};
|
|
245
|
+
reason?: string | undefined;
|
|
246
|
+
configuredPercent: number;
|
|
247
|
+
percent: number;
|
|
248
|
+
state: "active" | "promoted" | "rolled-back";
|
|
249
|
+
id: string;
|
|
250
|
+
tools: string[];
|
|
251
|
+
stable: string;
|
|
252
|
+
canary: string;
|
|
253
|
+
clients: string[];
|
|
254
|
+
exclude: string[];
|
|
255
|
+
autoRollback?: {
|
|
256
|
+
maxErrorRate: number;
|
|
257
|
+
minCalls: number;
|
|
258
|
+
window: number;
|
|
259
|
+
} | undefined;
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
export declare const rolloutManager: RolloutManager;
|
|
263
|
+
export {};
|
|
264
|
+
//# sourceMappingURL=rollouts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollouts.d.ts","sourceRoot":"","sources":["../../src/features/rollouts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYoF,CAAC;AACxG,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IASzB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAC5D,KAAK,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAO9C,wDAAwD;AACxD,eAAO,MAAM,QAAQ,GAAI,WAAW,MAAM,EAAE,QAAQ,MAAM,WAAwD,CAAC;AAEnH,UAAU,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB;AACD,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,QAAQ,GAAG,UAAU,GAAG,aAAa,CAAC;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;CACb;AAED,qBAAa,cAAc;IACzB,QAAQ,CAAC,MAAM,qBAA4B;IAC3C,OAAO,CAAC,EAAE;IAKV,OAAO,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM;IAI3B,sCAAsC;IACtC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ;IAMrD,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAmBtE,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAO9E,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAOvB,IAAI,CAAC,CAAC,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKhB;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
|
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tool versioning and gradual rollout (7.5): send a share of a tool's traffic to a new upstream version.
|
|
3
|
+
*
|
|
4
|
+
* A rollout names a **stable** server and a **canary** server (the new version, same tool names). Calls to the stable
|
|
5
|
+
* server's matching tools go to the canary for `percent` % of callers (sticky per client: the same client always gets
|
|
6
|
+
* the same version), for every client matching `clients`, and never for clients matching `exclude`. The canary's
|
|
7
|
+
* error rate is watched: above `autoRollback.maxErrorRate` (after `minCalls` canary calls in the window) the rollout
|
|
8
|
+
* is rolled back automatically.
|
|
9
|
+
*
|
|
10
|
+
* ```yaml
|
|
11
|
+
* rollouts:
|
|
12
|
+
* - id: search-v2
|
|
13
|
+
* stable: search # server id clients call
|
|
14
|
+
* canary: search-v2 # server id of the new version
|
|
15
|
+
* tools: ["*"] # tool globs on the stable server (default all)
|
|
16
|
+
* percent: 10
|
|
17
|
+
* clients: ["key:beta-*"] # always canary
|
|
18
|
+
* autoRollback: { maxErrorRate: 0.2, minCalls: 20, window: 200 }
|
|
19
|
+
* ```
|
|
20
|
+
*
|
|
21
|
+
* Results routed to the canary carry `_meta["mcp-gateway/rollout"]` (`id`, `version: canary`).
|
|
22
|
+
*
|
|
23
|
+
* - `GET /admin/rollouts` — each rollout: effective percent, state (`active` | `promoted` | `rolled-back`), calls and
|
|
24
|
+
* error rates per version.
|
|
25
|
+
* - `POST /admin/rollouts/:id/percent` `{ percent }`, `/promote` (100 %), `/rollback` (0 %), `/reset` (back to config).
|
|
26
|
+
* Runtime overrides; `?persist=true` also writes `percent` into the config (`controlPlane.configApi: true`).
|
|
27
|
+
*
|
|
28
|
+
* @module features/rollouts
|
|
29
|
+
*/
|
|
30
|
+
import { z } from 'zod';
|
|
31
|
+
import { registerFeature, objectBody, badRequest } from '../gateway/features.js';
|
|
32
|
+
import { registerCallHook } from '../gateway/hooks.js';
|
|
33
|
+
import { portableConfig } from '../gateway/admin.js';
|
|
34
|
+
import { globToRegExp } from '../utils/tool-filter.js';
|
|
35
|
+
import { logger } from '../utils/logger.js';
|
|
36
|
+
const RolloutSchema = z
|
|
37
|
+
.object({
|
|
38
|
+
id: z.string().min(1).regex(/^[A-Za-z0-9._-]+$/),
|
|
39
|
+
stable: z.string().min(1),
|
|
40
|
+
canary: z.string().min(1),
|
|
41
|
+
tools: z.array(z.string().min(1)).default(['*']),
|
|
42
|
+
percent: z.number().min(0).max(100).default(0),
|
|
43
|
+
clients: z.array(z.string().min(1)).default([]),
|
|
44
|
+
exclude: z.array(z.string().min(1)).default([]),
|
|
45
|
+
autoRollback: z.object({ maxErrorRate: z.number().min(0).max(1).default(0.2), minCalls: z.number().int().min(1).default(20), window: z.number().int().min(10).max(100_000).default(200) }).strict().optional(),
|
|
46
|
+
})
|
|
47
|
+
.strict()
|
|
48
|
+
.refine((r) => r.stable !== r.canary, { message: '`stable` and `canary` must be different servers' });
|
|
49
|
+
export const RolloutsSchema = z.array(RolloutSchema).superRefine((rs, ctx) => {
|
|
50
|
+
const ids = new Set();
|
|
51
|
+
const stables = new Set();
|
|
52
|
+
for (const r of rs) {
|
|
53
|
+
if (ids.has(r.id))
|
|
54
|
+
ctx.addIssue({ code: 'custom', message: `duplicate rollout id "${r.id}"` });
|
|
55
|
+
if (stables.has(r.stable))
|
|
56
|
+
ctx.addIssue({ code: 'custom', message: `server "${r.stable}" has more than one rollout` });
|
|
57
|
+
ids.add(r.id);
|
|
58
|
+
stables.add(r.stable);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
const fnv = (s) => {
|
|
62
|
+
let h = 0x811c9dc5;
|
|
63
|
+
for (let i = 0; i < s.length; i++)
|
|
64
|
+
h = Math.imul(h ^ s.charCodeAt(i), 0x01000193);
|
|
65
|
+
return h >>> 0;
|
|
66
|
+
};
|
|
67
|
+
/** Sticky bucket 0..99.99 for a client in a rollout. */
|
|
68
|
+
export const bucketOf = (rolloutId, client) => (fnv(`${rolloutId}\u0000${client}`) % 10_000) / 100;
|
|
69
|
+
export class RolloutManager {
|
|
70
|
+
states = new Map();
|
|
71
|
+
st(id) {
|
|
72
|
+
let s = this.states.get(id);
|
|
73
|
+
if (!s)
|
|
74
|
+
this.states.set(id, (s = { state: 'active', stable: { calls: 0, errors: 0, recent: [] }, canary: { calls: 0, errors: 0, recent: [] } }));
|
|
75
|
+
return s;
|
|
76
|
+
}
|
|
77
|
+
percent(r) {
|
|
78
|
+
const s = this.st(r.id);
|
|
79
|
+
return s.override ?? r.percent;
|
|
80
|
+
}
|
|
81
|
+
/** Version for a call by `client`. */
|
|
82
|
+
pick(r, client) {
|
|
83
|
+
if (r.exclude.some((p) => globToRegExp(p).test(client)))
|
|
84
|
+
return 'stable';
|
|
85
|
+
if (this.st(r.id).state === 'rolled-back')
|
|
86
|
+
return 'stable';
|
|
87
|
+
if (r.clients.some((p) => globToRegExp(p).test(client)))
|
|
88
|
+
return 'canary';
|
|
89
|
+
return bucketOf(r.id, client) < this.percent(r) ? 'canary' : 'stable';
|
|
90
|
+
}
|
|
91
|
+
record(r, version, error) {
|
|
92
|
+
const s = this.st(r.id);
|
|
93
|
+
const arm = s[version];
|
|
94
|
+
arm.calls++;
|
|
95
|
+
if (error)
|
|
96
|
+
arm.errors++;
|
|
97
|
+
arm.recent.push(error);
|
|
98
|
+
const win = r.autoRollback?.window ?? 200;
|
|
99
|
+
if (arm.recent.length > win)
|
|
100
|
+
arm.recent.splice(0, arm.recent.length - win);
|
|
101
|
+
const ar = r.autoRollback;
|
|
102
|
+
if (ar && version === 'canary' && s.state !== 'rolled-back' && arm.recent.length >= ar.minCalls) {
|
|
103
|
+
const rate = arm.recent.filter(Boolean).length / arm.recent.length;
|
|
104
|
+
if (rate > ar.maxErrorRate) {
|
|
105
|
+
s.state = 'rolled-back';
|
|
106
|
+
s.override = 0;
|
|
107
|
+
s.reason = `canary error rate ${(rate * 100).toFixed(1)}% > ${(ar.maxErrorRate * 100).toFixed(1)}% over ${arm.recent.length} calls`;
|
|
108
|
+
logger.warn(`Rollout ${r.id}: rolled back automatically (${s.reason})`);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
set(id, percent, state, reason) {
|
|
113
|
+
const s = this.st(id);
|
|
114
|
+
s.override = percent;
|
|
115
|
+
s.state = state;
|
|
116
|
+
s.reason = reason;
|
|
117
|
+
for (const arm of [s.stable, s.canary])
|
|
118
|
+
arm.recent = [];
|
|
119
|
+
}
|
|
120
|
+
reset(id) {
|
|
121
|
+
const s = this.st(id);
|
|
122
|
+
delete s.override;
|
|
123
|
+
delete s.reason;
|
|
124
|
+
s.state = 'active';
|
|
125
|
+
for (const arm of [s.stable, s.canary])
|
|
126
|
+
arm.recent = [];
|
|
127
|
+
}
|
|
128
|
+
view(r) {
|
|
129
|
+
const s = this.st(r.id);
|
|
130
|
+
const arm = (a) => ({ calls: a.calls, errors: a.errors, errorRate: a.calls ? Math.round((a.errors / a.calls) * 1000) / 1000 : 0, windowErrorRate: a.recent.length ? Math.round((a.recent.filter(Boolean).length / a.recent.length) * 1000) / 1000 : 0 });
|
|
131
|
+
return { ...r, configuredPercent: r.percent, percent: this.percent(r), state: s.state, ...(s.reason ? { reason: s.reason } : {}), versions: { stable: arm(s.stable), canary: arm(s.canary) } };
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
export const rolloutManager = new RolloutManager();
|
|
135
|
+
const list = (cfg) => (cfg.rollouts ? RolloutsSchema.parse(cfg.rollouts) : []);
|
|
136
|
+
const MARK = 'mcp-gateway/rollout';
|
|
137
|
+
registerCallHook({
|
|
138
|
+
id: 'rollouts',
|
|
139
|
+
before: (call, cfg) => {
|
|
140
|
+
const r = list(cfg).find((x) => x.stable === call.serverId && x.tools.some((p) => globToRegExp(p).test(call.tool)));
|
|
141
|
+
if (!r)
|
|
142
|
+
return;
|
|
143
|
+
if (rolloutManager.pick(r, call.clientId ?? 'anonymous') === 'canary')
|
|
144
|
+
return { serverId: r.canary };
|
|
145
|
+
},
|
|
146
|
+
after: (call, result, cfg) => {
|
|
147
|
+
const rs = list(cfg);
|
|
148
|
+
const canary = rs.find((x) => x.canary === call.serverId && x.tools.some((p) => globToRegExp(p).test(call.tool)));
|
|
149
|
+
const stable = canary ? undefined : rs.find((x) => x.stable === call.serverId && x.tools.some((p) => globToRegExp(p).test(call.tool)));
|
|
150
|
+
const r = canary ?? stable;
|
|
151
|
+
if (!r)
|
|
152
|
+
return;
|
|
153
|
+
const isError = !result.success || result.result?.isError === true;
|
|
154
|
+
rolloutManager.record(r, canary ? 'canary' : 'stable', isError);
|
|
155
|
+
if (canary && result.success && result.result && typeof result.result === 'object' && !Array.isArray(result.result)) {
|
|
156
|
+
const o = result.result;
|
|
157
|
+
return { ...result, result: { ...o, _meta: { ...(o._meta ?? {}), [MARK]: { id: r.id, version: 'canary', server: r.canary } } } };
|
|
158
|
+
}
|
|
159
|
+
},
|
|
160
|
+
});
|
|
161
|
+
registerFeature({
|
|
162
|
+
id: 'rollouts',
|
|
163
|
+
since: '7.5.0',
|
|
164
|
+
summary: 'Tool versioning and gradual rollout: sticky percentage canaries per server with automatic rollback',
|
|
165
|
+
mount: (router, ctx) => {
|
|
166
|
+
const find = (id) => list(ctx.config()).find((r) => r.id === id);
|
|
167
|
+
router.get('/', (_req, res) => {
|
|
168
|
+
res.json({ rollouts: list(ctx.config()).map((r) => rolloutManager.view(r)) });
|
|
169
|
+
});
|
|
170
|
+
router.get('/:id', (req, res) => {
|
|
171
|
+
const r = find(req.params.id);
|
|
172
|
+
if (!r)
|
|
173
|
+
return void res.status(404).json({ error: 'Not Found', message: `No rollout "${req.params.id}"` });
|
|
174
|
+
res.json(rolloutManager.view(r));
|
|
175
|
+
});
|
|
176
|
+
const action = (name) => router.post(`/:id/${name}`, async (req, res) => {
|
|
177
|
+
const r = find(req.params.id);
|
|
178
|
+
if (!r)
|
|
179
|
+
return void res.status(404).json({ error: 'Not Found', message: `No rollout "${req.params.id}"` });
|
|
180
|
+
let percent;
|
|
181
|
+
if (name === 'percent') {
|
|
182
|
+
const b = objectBody(req, res);
|
|
183
|
+
if (!b)
|
|
184
|
+
return;
|
|
185
|
+
if (typeof b.percent !== 'number' || b.percent < 0 || b.percent > 100)
|
|
186
|
+
return badRequest(res, 'Body must be { "percent": 0..100 }');
|
|
187
|
+
percent = b.percent;
|
|
188
|
+
rolloutManager.set(r.id, percent, 'active', 'set over the admin API');
|
|
189
|
+
}
|
|
190
|
+
else if (name === 'promote')
|
|
191
|
+
rolloutManager.set(r.id, (percent = 100), 'promoted', 'promoted over the admin API');
|
|
192
|
+
else if (name === 'rollback')
|
|
193
|
+
rolloutManager.set(r.id, (percent = 0), 'rolled-back', 'rolled back over the admin API');
|
|
194
|
+
else
|
|
195
|
+
rolloutManager.reset(r.id);
|
|
196
|
+
if (req.query.persist === 'true' && percent !== undefined) {
|
|
197
|
+
if (ctx.config().controlPlane?.configApi !== true || !ctx.applyConfig)
|
|
198
|
+
return void res.status(403).json({ error: 'Forbidden', message: 'persist=true needs controlPlane.configApi: true' });
|
|
199
|
+
const p = portableConfig(ctx.config());
|
|
200
|
+
const next = (p.rollouts ?? []).map((x) => (x.id === r.id ? { ...x, percent } : x));
|
|
201
|
+
try {
|
|
202
|
+
await ctx.applyConfig({ ...p, rollouts: next });
|
|
203
|
+
}
|
|
204
|
+
catch (err) {
|
|
205
|
+
return badRequest(res, err instanceof Error ? err.message : String(err));
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
res.json(rolloutManager.view(find(r.id)));
|
|
209
|
+
});
|
|
210
|
+
action('percent');
|
|
211
|
+
action('promote');
|
|
212
|
+
action('rollback');
|
|
213
|
+
action('reset');
|
|
214
|
+
},
|
|
215
|
+
});
|
|
216
|
+
//# sourceMappingURL=rollouts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollouts.js","sourceRoot":"","sources":["../../src/features/rollouts.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,11 +46,11 @@ export declare const SanitizeSchema: z.ZodObject<{
|
|
|
46
46
|
action: z.ZodDefault<z.ZodEnum<["off", "flag", "mark", "block"]>>;
|
|
47
47
|
threshold: z.ZodDefault<z.ZodNumber>;
|
|
48
48
|
}, "strict", z.ZodTypeAny, {
|
|
49
|
-
action: "off" | "flag" | "mark" | "block";
|
|
50
49
|
threshold: number;
|
|
50
|
+
action: "off" | "flag" | "mark" | "block";
|
|
51
51
|
}, {
|
|
52
|
-
action?: "off" | "flag" | "mark" | "block" | undefined;
|
|
53
52
|
threshold?: number | undefined;
|
|
53
|
+
action?: "off" | "flag" | "mark" | "block" | undefined;
|
|
54
54
|
}>>;
|
|
55
55
|
inbound: z.ZodDefault<z.ZodEnum<["off", "block"]>>;
|
|
56
56
|
spotlight: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -61,11 +61,11 @@ export declare const SanitizeSchema: z.ZodObject<{
|
|
|
61
61
|
invisible: boolean;
|
|
62
62
|
ansi: boolean;
|
|
63
63
|
html: boolean;
|
|
64
|
-
images: "
|
|
64
|
+
images: "strip" | "keep";
|
|
65
65
|
allowedImageHosts: string[];
|
|
66
66
|
injection: {
|
|
67
|
-
action: "off" | "flag" | "mark" | "block";
|
|
68
67
|
threshold: number;
|
|
68
|
+
action: "off" | "flag" | "mark" | "block";
|
|
69
69
|
};
|
|
70
70
|
inbound: "off" | "block";
|
|
71
71
|
spotlight: boolean;
|
|
@@ -77,12 +77,12 @@ export declare const SanitizeSchema: z.ZodObject<{
|
|
|
77
77
|
invisible?: boolean | undefined;
|
|
78
78
|
ansi?: boolean | undefined;
|
|
79
79
|
html?: boolean | undefined;
|
|
80
|
-
images?: "
|
|
80
|
+
images?: "strip" | "keep" | undefined;
|
|
81
81
|
allowedImageHosts?: string[] | undefined;
|
|
82
82
|
maxChars?: number | undefined;
|
|
83
83
|
injection?: {
|
|
84
|
-
action?: "off" | "flag" | "mark" | "block" | undefined;
|
|
85
84
|
threshold?: number | undefined;
|
|
85
|
+
action?: "off" | "flag" | "mark" | "block" | undefined;
|
|
86
86
|
} | undefined;
|
|
87
87
|
inbound?: "off" | "block" | undefined;
|
|
88
88
|
spotlight?: boolean | undefined;
|