staff-mcp 2.0.1 → 2.0.2
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 +7 -0
- package/README.md +24 -30
- package/README_zh.md +24 -30
- package/dist/src/data/HttpDataSession.d.ts +0 -1
- package/dist/src/data/HttpDataSession.js +0 -3
- package/dist/src/data/HttpDataSession.js.map +1 -1
- package/dist/src/extensions/config.d.ts +1 -15
- package/dist/src/extensions/config.js +2 -36
- package/dist/src/extensions/config.js.map +1 -1
- package/dist/src/extensions/runtime.js +0 -5
- package/dist/src/extensions/runtime.js.map +1 -1
- package/dist/src/file-manager/transfers.d.ts +0 -2
- package/dist/src/file-manager/transfers.js +0 -14
- package/dist/src/file-manager/transfers.js.map +1 -1
- package/dist/src/index.js +17 -57
- package/dist/src/index.js.map +1 -1
- package/dist/src/reverse/SseTransport.d.ts +8 -0
- package/dist/src/reverse/SseTransport.js +84 -26
- package/dist/src/reverse/SseTransport.js.map +1 -1
- package/dist/src/server.js +8 -6
- package/dist/src/server.js.map +1 -1
- package/dist/src/terminal/pty.d.ts +1 -1
- package/dist/src/terminal/pty.js +7 -9
- package/dist/src/terminal/pty.js.map +1 -1
- package/dist/src/terminal/session.d.ts +0 -2
- package/dist/src/terminal/session.js +0 -18
- package/dist/src/terminal/session.js.map +1 -1
- package/dist/src/transports/http.d.ts +1 -10
- package/dist/src/transports/http.js +3 -48
- package/dist/src/transports/http.js.map +1 -1
- package/dist/src/transports/reverse.js +4 -0
- package/dist/src/transports/reverse.js.map +1 -1
- package/docs/file-manager.md +8 -7
- package/docs/terminal.md +4 -5
- package/package.json +1 -1
- package/dist/src/utils/server-activity.d.ts +0 -6
- package/dist/src/utils/server-activity.js +0 -46
- package/dist/src/utils/server-activity.js.map +0 -1
|
@@ -1,6 +1,22 @@
|
|
|
1
1
|
import { JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
const MESSAGE_LIMIT = 4 * 1024 * 1024;
|
|
3
3
|
const QUEUE_LIMIT = 8 * 1024 * 1024;
|
|
4
|
+
/** Only fixed diagnostics, never remote bodies, URLs, headers or exception text. */
|
|
5
|
+
class ControlFailure extends Error {
|
|
6
|
+
detail;
|
|
7
|
+
constructor(detail) {
|
|
8
|
+
super(`Reverse control failed: ${detail.reason}`);
|
|
9
|
+
this.detail = detail;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
function networkCode(error) {
|
|
13
|
+
const cause = error;
|
|
14
|
+
const code = cause?.cause?.code ?? cause?.code;
|
|
15
|
+
return typeof code === 'string' &&
|
|
16
|
+
/^(?:ECONNRESET|ECONNREFUSED|ENOTFOUND|EAI_AGAIN|ETIMEDOUT|EPIPE|UND_ERR_(?:CONNECT_TIMEOUT|HEADERS_TIMEOUT|BODY_TIMEOUT|SOCKET|ABORTED))$/.test(code)
|
|
17
|
+
? code
|
|
18
|
+
: undefined;
|
|
19
|
+
}
|
|
4
20
|
/** Outbound-only reverse control: SSE receives JSON-RPC, POST sends JSON-RPC. No resume/replay. */
|
|
5
21
|
export class ReverseSseTransport {
|
|
6
22
|
base;
|
|
@@ -13,6 +29,7 @@ export class ReverseSseTransport {
|
|
|
13
29
|
onmessage;
|
|
14
30
|
closed;
|
|
15
31
|
sessionId;
|
|
32
|
+
failure;
|
|
16
33
|
resolveClosed;
|
|
17
34
|
abort = new AbortController();
|
|
18
35
|
stopped = false;
|
|
@@ -43,10 +60,15 @@ export class ReverseSseTransport {
|
|
|
43
60
|
this.readyReject = reject;
|
|
44
61
|
});
|
|
45
62
|
const timer = this.connectTimeout > 0
|
|
46
|
-
? setTimeout(() => this.fail(), this.connectTimeout)
|
|
63
|
+
? setTimeout(() => this.fail({ reason: 'connect-timeout' }), this.connectTimeout)
|
|
47
64
|
: undefined;
|
|
48
65
|
timer?.unref();
|
|
49
|
-
void this.read().catch(() => this.fail(
|
|
66
|
+
void this.read().catch((error) => this.fail(error instanceof ControlFailure
|
|
67
|
+
? error.detail
|
|
68
|
+
: {
|
|
69
|
+
reason: 'sse-read-failed',
|
|
70
|
+
networkCode: networkCode(error),
|
|
71
|
+
}));
|
|
50
72
|
try {
|
|
51
73
|
await ready;
|
|
52
74
|
}
|
|
@@ -66,7 +88,10 @@ export class ReverseSseTransport {
|
|
|
66
88
|
?.startsWith('text/event-stream') ||
|
|
67
89
|
!response.body) {
|
|
68
90
|
await response.body?.cancel();
|
|
69
|
-
throw new
|
|
91
|
+
throw new ControlFailure({
|
|
92
|
+
reason: 'sse-rejected',
|
|
93
|
+
status: response.status,
|
|
94
|
+
});
|
|
70
95
|
}
|
|
71
96
|
this.reader = response.body.getReader();
|
|
72
97
|
const decoder = new TextDecoder('utf-8', { fatal: true });
|
|
@@ -77,8 +102,16 @@ export class ReverseSseTransport {
|
|
|
77
102
|
let afterCR = false;
|
|
78
103
|
const completeLine = () => {
|
|
79
104
|
if (line === '') {
|
|
80
|
-
if (data.length)
|
|
81
|
-
|
|
105
|
+
if (data.length) {
|
|
106
|
+
try {
|
|
107
|
+
this.event(event, data.join('\n'));
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
throw new ControlFailure({
|
|
111
|
+
reason: 'sse-invalid-event',
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
}
|
|
82
115
|
event = 'message';
|
|
83
116
|
data = [];
|
|
84
117
|
blockBytes = 0;
|
|
@@ -100,7 +133,7 @@ export class ReverseSseTransport {
|
|
|
100
133
|
this.armReadTimeout();
|
|
101
134
|
const part = await this.reader.read();
|
|
102
135
|
if (part.done)
|
|
103
|
-
throw new
|
|
136
|
+
throw new ControlFailure({ reason: 'sse-ended' });
|
|
104
137
|
const text = decoder.decode(part.value, { stream: true });
|
|
105
138
|
// Bound complete and partial events before they can grow an unbounded JSON buffer.
|
|
106
139
|
for (const character of text) {
|
|
@@ -111,7 +144,10 @@ export class ReverseSseTransport {
|
|
|
111
144
|
afterCR = character === '\r';
|
|
112
145
|
blockBytes += Buffer.byteLength(character);
|
|
113
146
|
if (blockBytes > MESSAGE_LIMIT + 1024)
|
|
114
|
-
throw new
|
|
147
|
+
throw new ControlFailure({
|
|
148
|
+
reason: 'sse-too-large',
|
|
149
|
+
bytes: blockBytes,
|
|
150
|
+
});
|
|
115
151
|
if (character === '\r' || character === '\n')
|
|
116
152
|
completeLine();
|
|
117
153
|
else
|
|
@@ -153,29 +189,50 @@ export class ReverseSseTransport {
|
|
|
153
189
|
const body = JSON.stringify(message);
|
|
154
190
|
const bytes = Buffer.byteLength(body);
|
|
155
191
|
if (bytes > MESSAGE_LIMIT || this.queuedBytes + bytes > QUEUE_LIMIT) {
|
|
156
|
-
this.fail();
|
|
192
|
+
this.fail({ reason: 'control-queue-exceeded', bytes });
|
|
157
193
|
throw new Error('Reverse control queue exceeded');
|
|
158
194
|
}
|
|
159
195
|
this.queuedBytes += bytes;
|
|
160
196
|
const operation = this.queue.then(async () => {
|
|
161
197
|
if (this.stopped)
|
|
162
198
|
throw new Error('Reverse transport closed');
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
199
|
+
const startedAt = performance.now();
|
|
200
|
+
try {
|
|
201
|
+
const response = await this.fetch(this.endpoint, {
|
|
202
|
+
method: 'POST',
|
|
203
|
+
headers: {
|
|
204
|
+
...this.headers,
|
|
205
|
+
'Content-Type': 'application/json',
|
|
206
|
+
},
|
|
207
|
+
body,
|
|
208
|
+
signal: this.abort.signal,
|
|
209
|
+
redirect: 'manual',
|
|
210
|
+
});
|
|
211
|
+
const status = response.status;
|
|
212
|
+
await response.body?.cancel();
|
|
213
|
+
if (status !== 202) {
|
|
214
|
+
throw new ControlFailure({
|
|
215
|
+
reason: 'message-post-rejected',
|
|
216
|
+
status,
|
|
217
|
+
bytes,
|
|
218
|
+
elapsedMs: Math.round(performance.now() - startedAt),
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
throw error instanceof ControlFailure
|
|
224
|
+
? error
|
|
225
|
+
: new ControlFailure({
|
|
226
|
+
reason: 'message-post-failed',
|
|
227
|
+
bytes,
|
|
228
|
+
elapsedMs: Math.round(performance.now() - startedAt),
|
|
229
|
+
networkCode: networkCode(error),
|
|
230
|
+
});
|
|
231
|
+
}
|
|
177
232
|
});
|
|
178
|
-
this.queue = operation.catch(() => this.fail(
|
|
233
|
+
this.queue = operation.catch((error) => this.fail(error instanceof ControlFailure
|
|
234
|
+
? error.detail
|
|
235
|
+
: { reason: 'message-post-failed' }));
|
|
179
236
|
try {
|
|
180
237
|
await operation;
|
|
181
238
|
}
|
|
@@ -186,15 +243,16 @@ export class ReverseSseTransport {
|
|
|
186
243
|
armReadTimeout() {
|
|
187
244
|
clearTimeout(this.readTimer);
|
|
188
245
|
if (this.readTimeout > 0) {
|
|
189
|
-
this.readTimer = setTimeout(() => this.fail(), this.readTimeout);
|
|
246
|
+
this.readTimer = setTimeout(() => this.fail({ reason: 'read-timeout' }), this.readTimeout);
|
|
190
247
|
this.readTimer.unref();
|
|
191
248
|
}
|
|
192
249
|
}
|
|
193
|
-
fail() {
|
|
250
|
+
fail(detail) {
|
|
194
251
|
if (this.stopped)
|
|
195
252
|
return;
|
|
253
|
+
this.failure = detail;
|
|
196
254
|
try {
|
|
197
|
-
this.onerror?.(new
|
|
255
|
+
this.onerror?.(new ControlFailure(detail));
|
|
198
256
|
}
|
|
199
257
|
finally {
|
|
200
258
|
void this.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SseTransport.js","sourceRoot":"","sources":["../../../src/reverse/SseTransport.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AACtC,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"SseTransport.js","sourceRoot":"","sources":["../../../src/reverse/SseTransport.ts"],"names":[],"mappings":"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"}
|
package/dist/src/server.js
CHANGED
|
@@ -11,7 +11,6 @@ import { accessSync, constants, statSync } from 'node:fs';
|
|
|
11
11
|
import { FileCore } from './file-manager/file-core.js';
|
|
12
12
|
import { EXTENSIONS, manifest } from './extensions/protocol.js';
|
|
13
13
|
import { installExtensions } from './extensions/runtime.js';
|
|
14
|
-
import { installRequestActivity } from './utils/server-activity.js';
|
|
15
14
|
import { loadTerminalRuntime } from './terminal/pty.js';
|
|
16
15
|
import { registerFileResources } from './file-manager/extension.js';
|
|
17
16
|
import { readAppResource } from './extensions/apps.js';
|
|
@@ -28,7 +27,7 @@ import { resolveExtensionOptions } from './extensions/config.js';
|
|
|
28
27
|
* @returns An initialized McpServer instance.
|
|
29
28
|
*/
|
|
30
29
|
export function createServerFactory(name, version, workingDir, allowedDirs, profile = 'default', maxMcpSessions = 5, enableLsp = false, extensions = {}, privateDirectoryAliases = []) {
|
|
31
|
-
const options = resolveExtensionOptions(extensions
|
|
30
|
+
const options = resolveExtensionOptions(extensions);
|
|
32
31
|
const security = new SecurityManager(workingDir, allowedDirs);
|
|
33
32
|
const sandbox = security.getAllowedDirs();
|
|
34
33
|
const runtimeDirectory = path.join(security.getWorkingDir(), '.staff', 'file-manager');
|
|
@@ -48,7 +47,11 @@ export function createServerFactory(name, version, workingDir, allowedDirs, prof
|
|
|
48
47
|
let filesCore;
|
|
49
48
|
if (options.enabled.includes('files')) {
|
|
50
49
|
let rootsAvailable = true;
|
|
51
|
-
|
|
50
|
+
const fileRoots = sandbox.map((directory, index) => ({
|
|
51
|
+
rootId: index === 0 ? 'main' : `extra${index}`,
|
|
52
|
+
directory,
|
|
53
|
+
}));
|
|
54
|
+
for (const root of fileRoots) {
|
|
52
55
|
try {
|
|
53
56
|
if (!statSync(root.directory).isDirectory()) {
|
|
54
57
|
console.error(`[staff-mcp] Warning: Files extension unavailable: root "${root.rootId}" is not a directory.`);
|
|
@@ -69,14 +72,14 @@ export function createServerFactory(name, version, workingDir, allowedDirs, prof
|
|
|
69
72
|
}
|
|
70
73
|
}
|
|
71
74
|
if (rootsAvailable)
|
|
72
|
-
filesCore = new FileCore(
|
|
75
|
+
filesCore = new FileCore(fileRoots.map((root) => ({
|
|
73
76
|
...root,
|
|
74
77
|
name: root.rootId === 'main' ? 'Workspace' : root.rootId,
|
|
75
78
|
readOnly: false,
|
|
76
79
|
})), runtimeDirectory, standardCore);
|
|
77
80
|
}
|
|
78
81
|
const terminalRuntime = options.enabled.includes('terminal')
|
|
79
|
-
? loadTerminalRuntime(true
|
|
82
|
+
? loadTerminalRuntime(true)
|
|
80
83
|
: undefined;
|
|
81
84
|
const features = { files: !!filesCore, terminal: !!terminalRuntime };
|
|
82
85
|
return () => {
|
|
@@ -94,7 +97,6 @@ export function createServerFactory(name, version, workingDir, allowedDirs, prof
|
|
|
94
97
|
: {}),
|
|
95
98
|
},
|
|
96
99
|
});
|
|
97
|
-
installRequestActivity(server);
|
|
98
100
|
// Register all functional tool modules
|
|
99
101
|
registerFileTools(server, security, standardCore);
|
|
100
102
|
registerShellTools(server, security);
|
package/dist/src/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export interface TerminalRuntime {
|
|
|
7
7
|
spawn(cwd: string, cols: number, rows: number): LinuxPty;
|
|
8
8
|
}
|
|
9
9
|
/** Native loading is opt-in; unavailable runtimes leave standard MCP usable. */
|
|
10
|
-
export declare function loadTerminalRuntime(enabled: boolean
|
|
10
|
+
export declare function loadTerminalRuntime(enabled: boolean): TerminalRuntime | undefined;
|
|
11
11
|
/** Do not use node-pty.write(): its void API can hide an unbounded internal input queue. */
|
|
12
12
|
export declare function writeInput(pty: LinuxPty, data: Uint8Array, check: () => void): Promise<void>;
|
|
13
13
|
/** Host uid is inherited. Process-group cleanup cannot contain daemonized descendants. */
|
package/dist/src/terminal/pty.js
CHANGED
|
@@ -4,7 +4,7 @@ import { accessSync, constants, statSync, write } from 'node:fs';
|
|
|
4
4
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
5
5
|
import { extensionError } from '../extensions/protocol.js';
|
|
6
6
|
/** Native loading is opt-in; unavailable runtimes leave standard MCP usable. */
|
|
7
|
-
export function loadTerminalRuntime(enabled
|
|
7
|
+
export function loadTerminalRuntime(enabled) {
|
|
8
8
|
if (!enabled)
|
|
9
9
|
return undefined;
|
|
10
10
|
if (process.platform !== 'linux') {
|
|
@@ -20,15 +20,13 @@ export function loadTerminalRuntime(enabled, shell) {
|
|
|
20
20
|
throw new Error('Shell must be a file');
|
|
21
21
|
return candidate;
|
|
22
22
|
};
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
23
|
+
let selectedShell;
|
|
24
|
+
try {
|
|
25
|
+
selectedShell = executable(process.env.SHELL ?? '');
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
selectedShell = executable('/bin/bash');
|
|
30
29
|
}
|
|
31
|
-
const selectedShell = executable(shell);
|
|
32
30
|
const pty = createRequire(import.meta.url)('node-pty');
|
|
33
31
|
if (typeof pty.spawn !== 'function')
|
|
34
32
|
throw new Error('Missing PTY implementation');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/terminal/pty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAQ3D,gFAAgF;AAChF,MAAM,UAAU,mBAAmB,CAC/B,OAAgB
|
|
1
|
+
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/terminal/pty.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,6 @@ export declare class TerminalSession {
|
|
|
18
18
|
private closing?;
|
|
19
19
|
private readonly timer;
|
|
20
20
|
constructor(core: FileCore, runtime: TerminalRuntime, authorize: () => void);
|
|
21
|
-
/** PTY ownership and output draining remain active even with no new bytes. */
|
|
22
|
-
hasActivity(): boolean;
|
|
23
21
|
private sweep;
|
|
24
22
|
private check;
|
|
25
23
|
private view;
|
|
@@ -28,24 +28,6 @@ export class TerminalSession {
|
|
|
28
28
|
this.timer = setInterval(() => this.sweep(), 1000);
|
|
29
29
|
this.timer.unref();
|
|
30
30
|
}
|
|
31
|
-
/** PTY ownership and output draining remain active even with no new bytes. */
|
|
32
|
-
hasActivity() {
|
|
33
|
-
const now = performance.now();
|
|
34
|
-
for (const item of this.operations.values()) {
|
|
35
|
-
if (item.job ||
|
|
36
|
-
item.resolveExit ||
|
|
37
|
-
item.pumping ||
|
|
38
|
-
item.state === 'starting' ||
|
|
39
|
-
item.state === 'running' ||
|
|
40
|
-
item.state === 'closing' ||
|
|
41
|
-
(item.state === 'closed' &&
|
|
42
|
-
item.bound &&
|
|
43
|
-
!item.fenced &&
|
|
44
|
-
item.expires > now))
|
|
45
|
-
return true;
|
|
46
|
-
}
|
|
47
|
-
return false;
|
|
48
|
-
}
|
|
49
31
|
sweep() {
|
|
50
32
|
const now = performance.now();
|
|
51
33
|
for (const [operationId, item] of this.operations) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/terminal/session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/terminal/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAQzC,OAAO,EACH,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,aAAa,EACb,cAAc,GACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAiCnD,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC;AAC9B,MAAM,YAAY,GAAG,GAAG,GAAG,IAAI,CAAC;AAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;AAC5C,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;IACtB,KAAK,MAAM,OAAO,IAAI,QAAQ;QAAE,OAAO,CAAC,aAAa,EAAE,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEH,MAAM,OAAO,eAAe;IASH;IACA;IACA;IAVJ,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IACzC,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACjD,WAAW,GAAG,CAAC,CAAC;IAChB,QAAQ,GAAG,KAAK,CAAC;IACjB,OAAO,CAAiB;IACf,KAAK,CAAiB;IAEvC,YACqB,IAAc,EACd,OAAwB,EACxB,SAAqB;QAFrB,SAAI,GAAJ,IAAI,CAAU;QACd,YAAO,GAAP,OAAO,CAAiB;QACxB,cAAS,GAAT,SAAS,CAAY;QAEtC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK;QACT,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAChD,IACI,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU;gBACtB,IAAI,CAAC,KAAK,KAAK,SAAS;gBACxB,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,CAAC,OAAO,IAAI,GAAG;gBAEnB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACrC,IACI,IAAI,CAAC,QAAQ,KAAK,SAAS;gBAC3B,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,aAAa;gBACpC,CAAC,IAAI,CAAC,GAAG;gBACT,CAAC,IAAI,CAAC,OAAO,EACf,CAAC;gBACC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACpC,IAAI,IAAI,CAAC,UAAU;oBAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChE,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,IAAc;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ;YACb,cAAc,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACjC,cAAc,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAAC;QAC9D,CAAC;QACD,IACI,IAAI,CAAC,MAAM;YACX,CAAC,IAAI,CAAC,KAAK,KAAK,UAAU,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;YAEvD,cAAc,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;IACnE,CAAC;IAEO,IAAI,CAAC,IAAc;QACvB,MAAM,IAAI,GAAG;YACT,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC;QACF,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ;YACvB,OAAO;gBACH,GAAG,IAAI;gBACP,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,CAAC,IAAI,CAAC,gBAAgB;oBACrB,CAAC,CAAC;wBACI,KAAK,EAAE;4BACH,IAAI,EAAE,mBAAmB;4BACzB,OAAO,EACH,qEAAqE;yBAC5E;qBACJ;oBACH,CAAC,CAAC,EAAE,CAAC;aACZ,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ;YACvB,OAAO;gBACH,GAAG,IAAI;gBACP,KAAK,EAAE;oBACH,IAAI,EAAE,uBAAuB;oBAC7B,OAAO,EAAE,+BAA+B;iBAC3C;aACJ,CAAC;QACN,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,UAAU,CAAC,IAAc;QAC7B,OAAO;YACH,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS;gBACxB,CAAC,CAAC;oBACI,MAAM,EAAE,IAAI,CAAC,MAAO,CAAC,MAAM;oBAC3B,IAAI,EAAE,IAAI,CAAC,GAAI;oBACf,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;oBACzB,OAAO,EAAE,IAAI,CAAC,GAAG,CACb,CAAC,EACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,CAC9C;oBACD,WAAW,EAAE,aAAa;oBAC1B,IAAI,EAAE;wBACF,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,QAAQ;wBACjB,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,SAAS,EAAE,QAAQ;qBACtB;iBACJ;gBACH,CAAC,CAAC,EAAE,CAAC;SACZ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAsB;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,QAAQ;YACb,cAAc,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;YAC/B,MAAM,CAAC,MAAM;YACb,MAAM,CAAC,IAAI;YACX,MAAM,CAAC,IAAI;SACd,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACzD,IAAI,QAAQ,EAAE,CAAC;YACX,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW;gBAC5D,cAAc,CACV,sBAAsB,EACtB,sCAAsC,CACzC,CAAC;YACN,MAAM,QAAQ,CAAC,GAAG,CAAC;YACnB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,WAAW;YACnC,cAAc,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,CAAC;QACtE,IACI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1C,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAC1D,CAAC,MAAM,IAAI,CAAC;YAEb,cAAc,CACV,gBAAgB,EAChB,kDAAkD,CACrD,CAAC;QACN,MAAM,IAAI,GAAa;YACnB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,MAAM;YACN,WAAW;YACX,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ;YACrC,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,EAAE;YACjB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;SACrC,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,IAAc,EAAE,MAAsB;QACtD,IAAI,CAAC;YACD,6EAA6E;YAC7E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YACf,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE;gBACpC,cAAc,CACV,gBAAgB,EAChB,kCAAkC,CACrC,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC9D,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBACxC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,IAAI,CAAC,UAAU,GAAG,UAAU,EAAE,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,8EAA8E;gBAC9E,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAC7B,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBAC/B,GAAG,CAAC,KAAK,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACzD,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC;oBAChD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;oBAChC,OAAO;gBACX,CAAC;gBACD,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC;gBAChC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;gBAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,CAAC,CACL,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,CAAC,IAAI,GAAG;oBACR,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;oBAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;iBACrD,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtB,CAAC,CAAC,CACL,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACL,IAAI,IAAI,CAAC,GAAG;gBAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACzC,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;gBACjC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;gBACtB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,IAAc;QAC7B,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACzD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC3B,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,KAAK,EAAE,CAAC;oBACzD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ;wBAAE,OAAO;oBACzC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CACxC,CAAC;gBACN,CAAC;gBACD,6EAA6E;gBAC7E,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACzB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;oBACnB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;oBAC1B,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC;gBACpC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ;oBAAE,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;qBACjD,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;oBAAE,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;YAC1D,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACrC,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACzB,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,IAAc;QACzB,+EAA+E;QAC/E,sEAAsE;QACtE,IAAI,CAAC,gBAAgB;YACjB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QACpE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAClC,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa;YAAE,YAAY,CAAC,OAAO,EAAE,CAAC;QACtE,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,gBAAgB;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;aAC3D,IAAI,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;;YACxC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IACjC,CAAC;IAEO,WAAW,CAAC,IAAc;QAC9B,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEO,IAAI,CAAC,IAAc,EAAE,IAAY;QACrC,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAClE,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ;gBAAE,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;YACnD,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,GAAG,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;gBACpC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACzC,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,WAAmB;QACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,UAAkB,EAAE,IAAY,EAAE,IAAY;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YACxB,cAAc,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;QAC/D,IAAI,CAAC;YACD,IAAI,CAAC,GAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACL,cAAc,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,UAAkB;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC;QAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAED,cAAc,CAAC,WAAmB,EAAE,MAAc;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,WAAW;gBACnC,cAAc,CACV,gBAAgB,EAChB,+BAA+B,CAClC,CAAC;YACN,IAAI,GAAG;gBACH,WAAW;gBACX,KAAK,EAAE,QAAQ;gBACf,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE;gBAC3B,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,KAAK;gBACd,aAAa,EAAE,EAAE;gBACjB,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aACrC,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;;YAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAEO,QAAQ,CAAC,UAAkB;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI;YACL,cAAc,CACV,oBAAoB,EACpB,qCAAqC,CACxC,CAAC;QACN,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,aAAa,CACf,IAAiB,EACjB,OAAoB;QAEpB,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ;YACxD,cAAc,CAAC,gBAAgB,EAAE,iCAAiC,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YACtC,cAAc,CACV,iBAAiB,EACjB,iCAAiC,CACpC,CAAC;QACN,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,OAAO;YACH,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACjB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,IAAI,CAAC,UAAU,GAAG,EAAE,GAAG,IAAI;oBAC3B,cAAc,CACV,gBAAgB,EAChB,yCAAyC,CAC5C,CAAC;gBACN,IAAI,CAAC;oBACD,8DAA8D;oBAC9D,iEAAiE;oBACjE,KACI,IAAI,MAAM,GAAG,CAAC,EACd,MAAM,GAAG,IAAI,CAAC,UAAU,EACxB,MAAM,IAAI,WAAW,EACvB,CAAC;wBACC,MAAM,UAAU,CACZ,IAAI,CAAC,GAAI,EACT,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC,EAC3C,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CACzB,CAAC;oBACN,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACL,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;oBAChC,cAAc,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;gBAC7D,CAAC;YACL,CAAC;YACD,GAAG,EAAE,GAAG,EAAE;gBACN,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACnC,CAAC;YACD,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE;gBACd,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;YACjE,CAAC;SACJ,CAAC;IACN,CAAC;IAED,aAAa;QACT,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IACI,IAAI,CAAC,GAAG;gBACR,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC;gBAEtD,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACpC,kEAAkE;YAClE,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CACtB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC7C,MAAM,IAAI,CAAC,GAAG,CAAC;YACf,MAAM,IAAI,CAAC,MAAM,CAAC;QACtB,CAAC,CAAC,CACL,CAAC,IAAI,CAAC,GAAG,EAAE;YACR,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ"}
|
|
@@ -1,16 +1,7 @@
|
|
|
1
1
|
import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
2
2
|
export declare function getHttpAuthToken(token?: string): string | undefined;
|
|
3
3
|
export declare const HTTP_MAX_SESSIONS = 64;
|
|
4
|
-
export declare
|
|
5
|
-
export interface HttpSessionPolicy {
|
|
6
|
-
maxSessions?: number;
|
|
7
|
-
idleTimeoutMs?: number;
|
|
8
|
-
}
|
|
9
|
-
export declare function resolveHttpSessionPolicy(policy?: HttpSessionPolicy): {
|
|
10
|
-
maxSessions: number;
|
|
11
|
-
idleTimeoutMs: number;
|
|
12
|
-
};
|
|
13
|
-
export declare function startHttpServer(serverFactory: () => McpServer, port: number, host?: string, token?: string, policy?: HttpSessionPolicy): Promise<{
|
|
4
|
+
export declare function startHttpServer(serverFactory: () => McpServer, port: number, host?: string, token?: string): Promise<{
|
|
14
5
|
port: number;
|
|
15
6
|
stop: () => Promise<void>;
|
|
16
7
|
}>;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { HttpDataSession } from '../data/HttpDataSession.js';
|
|
2
2
|
import { handleNodeRequest } from '../data/node.js';
|
|
3
3
|
import { configureExtensionData } from '../extensions/runtime.js';
|
|
4
|
-
import { hasServerActivity } from '../utils/server-activity.js';
|
|
5
4
|
import express from 'express';
|
|
6
5
|
import cors from 'cors';
|
|
7
6
|
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
|
@@ -16,20 +15,7 @@ export function getHttpAuthToken(token) {
|
|
|
16
15
|
return token;
|
|
17
16
|
}
|
|
18
17
|
export const HTTP_MAX_SESSIONS = 64;
|
|
19
|
-
export
|
|
20
|
-
export function resolveHttpSessionPolicy(policy = {}) {
|
|
21
|
-
const maxSessions = policy.maxSessions ?? HTTP_MAX_SESSIONS;
|
|
22
|
-
const idleTimeoutMs = policy.idleTimeoutMs ?? HTTP_SESSION_IDLE_MS;
|
|
23
|
-
if (!Number.isSafeInteger(maxSessions) || maxSessions <= 0)
|
|
24
|
-
throw new Error('HTTP max sessions must be a positive safe integer.');
|
|
25
|
-
if (!Number.isInteger(idleTimeoutMs) ||
|
|
26
|
-
idleTimeoutMs <= 0 ||
|
|
27
|
-
idleTimeoutMs > 2_147_483_647)
|
|
28
|
-
throw new Error('HTTP session idle timeout must be 1..2147483647 ms.');
|
|
29
|
-
return { maxSessions, idleTimeoutMs };
|
|
30
|
-
}
|
|
31
|
-
export async function startHttpServer(serverFactory, port, host = '0.0.0.0', token, policy = {}) {
|
|
32
|
-
const { maxSessions, idleTimeoutMs } = resolveHttpSessionPolicy(policy);
|
|
18
|
+
export async function startHttpServer(serverFactory, port, host = '0.0.0.0', token) {
|
|
33
19
|
const authToken = getHttpAuthToken(token);
|
|
34
20
|
const app = express();
|
|
35
21
|
let stopping = false;
|
|
@@ -47,23 +33,6 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
47
33
|
const observeClose = (id, session) => {
|
|
48
34
|
void closeSession(id, session).catch(() => console.error('[staff-mcp] HTTP session cleanup failed.'));
|
|
49
35
|
};
|
|
50
|
-
const sweepIdle = () => {
|
|
51
|
-
const now = performance.now();
|
|
52
|
-
for (const [id, session] of sessions) {
|
|
53
|
-
if (session.closing)
|
|
54
|
-
continue;
|
|
55
|
-
if (session.initializing || hasServerActivity(session.server)) {
|
|
56
|
-
session.idleSince = undefined;
|
|
57
|
-
}
|
|
58
|
-
else if (session.idleSince === undefined) {
|
|
59
|
-
session.idleSince = now;
|
|
60
|
-
}
|
|
61
|
-
else if (now - session.idleSince >= idleTimeoutMs) {
|
|
62
|
-
// Fence synchronously; cleanup keeps its slot until it succeeds.
|
|
63
|
-
observeClose(id, session);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
};
|
|
67
36
|
const reject = (res, status, message) => {
|
|
68
37
|
if (!res.headersSent && !res.destroyed) {
|
|
69
38
|
res.status(status).json({
|
|
@@ -153,8 +122,7 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
153
122
|
// JSON body parsing can finish after shutdown has started.
|
|
154
123
|
if (stopping)
|
|
155
124
|
return reject(res, 503, 'Server is stopping');
|
|
156
|
-
|
|
157
|
-
if (sessions.size >= maxSessions)
|
|
125
|
+
if (sessions.size >= HTTP_MAX_SESSIONS)
|
|
158
126
|
return reject(res, 429, 'HTTP session capacity reached');
|
|
159
127
|
const id = randomUUID();
|
|
160
128
|
let session;
|
|
@@ -168,13 +136,8 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
168
136
|
sessionIdGenerator: () => id,
|
|
169
137
|
enableJsonResponse: true,
|
|
170
138
|
});
|
|
171
|
-
session = { server, transport
|
|
139
|
+
session = { server, transport };
|
|
172
140
|
const owned = session;
|
|
173
|
-
// The SDK calls this only after parsing/validating the control message.
|
|
174
|
-
// Neither an idle GET SSE stream nor invalid HTTP/data traffic renews it.
|
|
175
|
-
transport.onmessage = () => {
|
|
176
|
-
owned.idleSince = undefined;
|
|
177
|
-
};
|
|
178
141
|
// Include starting sessions in shutdown ownership before the first await.
|
|
179
142
|
sessions.set(id, session);
|
|
180
143
|
transport.onclose = () => observeClose(id, owned);
|
|
@@ -232,10 +195,6 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
232
195
|
reject(res, 500, 'Internal Server Error');
|
|
233
196
|
}
|
|
234
197
|
finally {
|
|
235
|
-
if (session) {
|
|
236
|
-
session.initializing = false;
|
|
237
|
-
session.idleSince = undefined;
|
|
238
|
-
}
|
|
239
198
|
res.removeListener('close', disconnected);
|
|
240
199
|
}
|
|
241
200
|
};
|
|
@@ -252,9 +211,6 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
252
211
|
});
|
|
253
212
|
const address = listener.address();
|
|
254
213
|
console.error(`[MCP HTTP] Server listening on http://${host}:${address.port}/mcp`);
|
|
255
|
-
// One bounded sweep per listener; no per-session timers or resource lease changes.
|
|
256
|
-
const idleTimer = setInterval(sweepIdle, Math.min(idleTimeoutMs, 60_000));
|
|
257
|
-
idleTimer.unref();
|
|
258
214
|
let stopped;
|
|
259
215
|
return {
|
|
260
216
|
port: address.port,
|
|
@@ -262,7 +218,6 @@ export async function startHttpServer(serverFactory, port, host = '0.0.0.0', tok
|
|
|
262
218
|
if (stopped)
|
|
263
219
|
return stopped;
|
|
264
220
|
stopping = true;
|
|
265
|
-
clearInterval(idleTimer);
|
|
266
221
|
// Stop accepting first, but keep the listener alive until owned cleanup settles.
|
|
267
222
|
const listenerClosed = new Promise((resolve, reject) => {
|
|
268
223
|
listener.close((error) => (error ? reject(error) : resolve()));
|