airlock-bot 0.0.1 → 0.2.1
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/LICENSE +21 -0
- package/README.md +336 -0
- package/airlock.service +27 -0
- package/dist/allowlist/engine.d.ts +9 -0
- package/dist/allowlist/engine.d.ts.map +1 -0
- package/dist/allowlist/engine.js +24 -0
- package/dist/allowlist/engine.js.map +1 -0
- package/dist/allowlist/pattern.d.ts +13 -0
- package/dist/allowlist/pattern.d.ts.map +1 -0
- package/dist/allowlist/pattern.js +33 -0
- package/dist/allowlist/pattern.js.map +1 -0
- package/dist/audit/api.d.ts +7 -0
- package/dist/audit/api.d.ts.map +1 -0
- package/dist/audit/api.js +31 -0
- package/dist/audit/api.js.map +1 -0
- package/dist/audit/db.d.ts +44 -0
- package/dist/audit/db.d.ts.map +1 -0
- package/dist/audit/db.js +121 -0
- package/dist/audit/db.js.map +1 -0
- package/dist/audit/logger.d.ts +25 -0
- package/dist/audit/logger.d.ts.map +1 -0
- package/dist/audit/logger.js +58 -0
- package/dist/audit/logger.js.map +1 -0
- package/dist/audit/redactor.d.ts +5 -0
- package/dist/audit/redactor.d.ts.map +1 -0
- package/dist/audit/redactor.js +27 -0
- package/dist/audit/redactor.js.map +1 -0
- package/dist/backend/cli/adapter.d.ts +23 -0
- package/dist/backend/cli/adapter.d.ts.map +1 -0
- package/dist/backend/cli/adapter.js +176 -0
- package/dist/backend/cli/adapter.js.map +1 -0
- package/dist/backend/cli/builder.d.ts +3 -0
- package/dist/backend/cli/builder.d.ts.map +1 -0
- package/dist/backend/cli/builder.js +52 -0
- package/dist/backend/cli/builder.js.map +1 -0
- package/dist/backend/cli/escaper.d.ts +2 -0
- package/dist/backend/cli/escaper.d.ts.map +1 -0
- package/dist/backend/cli/escaper.js +8 -0
- package/dist/backend/cli/escaper.js.map +1 -0
- package/dist/backend/exec-adapter.d.ts +13 -0
- package/dist/backend/exec-adapter.d.ts.map +1 -0
- package/dist/backend/exec-adapter.js +39 -0
- package/dist/backend/exec-adapter.js.map +1 -0
- package/dist/backend/factory.d.ts +9 -0
- package/dist/backend/factory.d.ts.map +1 -0
- package/dist/backend/factory.js +35 -0
- package/dist/backend/factory.js.map +1 -0
- package/dist/backend/http-adapter.d.ts +15 -0
- package/dist/backend/http-adapter.d.ts.map +1 -0
- package/dist/backend/http-adapter.js +39 -0
- package/dist/backend/http-adapter.js.map +1 -0
- package/dist/backend/mcp-adapter.d.ts +14 -0
- package/dist/backend/mcp-adapter.d.ts.map +1 -0
- package/dist/backend/mcp-adapter.js +38 -0
- package/dist/backend/mcp-adapter.js.map +1 -0
- package/dist/backend/openapi/adapter.d.ts +17 -0
- package/dist/backend/openapi/adapter.d.ts.map +1 -0
- package/dist/backend/openapi/adapter.js +144 -0
- package/dist/backend/openapi/adapter.js.map +1 -0
- package/dist/backend/openapi/parser.d.ts +21 -0
- package/dist/backend/openapi/parser.d.ts.map +1 -0
- package/dist/backend/openapi/parser.js +145 -0
- package/dist/backend/openapi/parser.js.map +1 -0
- package/dist/backend/types.d.ts +9 -0
- package/dist/backend/types.d.ts.map +1 -0
- package/dist/backend/types.js +2 -0
- package/dist/backend/types.js.map +1 -0
- package/dist/config/loader.d.ts +12 -0
- package/dist/config/loader.d.ts.map +1 -0
- package/dist/config/loader.js +178 -0
- package/dist/config/loader.js.map +1 -0
- package/dist/config/profiles.d.ts +12 -0
- package/dist/config/profiles.d.ts.map +1 -0
- package/dist/config/profiles.js +34 -0
- package/dist/config/profiles.js.map +1 -0
- package/dist/config/schema.d.ts +2034 -0
- package/dist/config/schema.d.ts.map +1 -0
- package/dist/config/schema.js +257 -0
- package/dist/config/schema.js.map +1 -0
- package/dist/config/watcher.d.ts +11 -0
- package/dist/config/watcher.d.ts.map +1 -0
- package/dist/config/watcher.js +39 -0
- package/dist/config/watcher.js.map +1 -0
- package/dist/discover/cli.d.ts +2 -0
- package/dist/discover/cli.d.ts.map +1 -0
- package/dist/discover/cli.js +97 -0
- package/dist/discover/cli.js.map +1 -0
- package/dist/discover/index.d.ts +19 -0
- package/dist/discover/index.d.ts.map +1 -0
- package/dist/discover/index.js +70 -0
- package/dist/discover/index.js.map +1 -0
- package/dist/discover/openapi.d.ts +9 -0
- package/dist/discover/openapi.d.ts.map +1 -0
- package/dist/discover/openapi.js +47 -0
- package/dist/discover/openapi.js.map +1 -0
- package/dist/discover/strategies/fig.d.ts +29 -0
- package/dist/discover/strategies/fig.d.ts.map +1 -0
- package/dist/discover/strategies/fig.js +82 -0
- package/dist/discover/strategies/fig.js.map +1 -0
- package/dist/discover/strategies/help-parser.d.ts +21 -0
- package/dist/discover/strategies/help-parser.d.ts.map +1 -0
- package/dist/discover/strategies/help-parser.js +121 -0
- package/dist/discover/strategies/help-parser.js.map +1 -0
- package/dist/discover/writer.d.ts +5 -0
- package/dist/discover/writer.d.ts.map +1 -0
- package/dist/discover/writer.js +14 -0
- package/dist/discover/writer.js.map +1 -0
- package/dist/gateway.d.ts +20 -0
- package/dist/gateway.d.ts.map +1 -0
- package/dist/gateway.js +125 -0
- package/dist/gateway.js.map +1 -0
- package/dist/hitl/api.d.ts +7 -0
- package/dist/hitl/api.d.ts.map +1 -0
- package/dist/hitl/api.js +35 -0
- package/dist/hitl/api.js.map +1 -0
- package/dist/hitl/batcher.d.ts +11 -0
- package/dist/hitl/batcher.d.ts.map +1 -0
- package/dist/hitl/batcher.js +37 -0
- package/dist/hitl/batcher.js.map +1 -0
- package/dist/hitl/engine.d.ts +36 -0
- package/dist/hitl/engine.d.ts.map +1 -0
- package/dist/hitl/engine.js +150 -0
- package/dist/hitl/engine.js.map +1 -0
- package/dist/hitl/formatter.d.ts +4 -0
- package/dist/hitl/formatter.d.ts.map +1 -0
- package/dist/hitl/formatter.js +31 -0
- package/dist/hitl/formatter.js.map +1 -0
- package/dist/hitl/parser.d.ts +7 -0
- package/dist/hitl/parser.d.ts.map +1 -0
- package/dist/hitl/parser.js +17 -0
- package/dist/hitl/parser.js.map +1 -0
- package/dist/hitl/provider-factory.d.ts +4 -0
- package/dist/hitl/provider-factory.d.ts.map +1 -0
- package/dist/hitl/provider-factory.js +42 -0
- package/dist/hitl/provider-factory.js.map +1 -0
- package/dist/hitl/providers/composite.d.ts +9 -0
- package/dist/hitl/providers/composite.d.ts.map +1 -0
- package/dist/hitl/providers/composite.js +23 -0
- package/dist/hitl/providers/composite.js.map +1 -0
- package/dist/hitl/providers/dashboard.d.ts +17 -0
- package/dist/hitl/providers/dashboard.d.ts.map +1 -0
- package/dist/hitl/providers/dashboard.js +210 -0
- package/dist/hitl/providers/dashboard.js.map +1 -0
- package/dist/hitl/providers/macos.d.ts +10 -0
- package/dist/hitl/providers/macos.d.ts.map +1 -0
- package/dist/hitl/providers/macos.js +65 -0
- package/dist/hitl/providers/macos.js.map +1 -0
- package/dist/hitl/providers/openclaw.d.ts +21 -0
- package/dist/hitl/providers/openclaw.d.ts.map +1 -0
- package/dist/hitl/providers/openclaw.js +106 -0
- package/dist/hitl/providers/openclaw.js.map +1 -0
- package/dist/hitl/providers/slack.d.ts +12 -0
- package/dist/hitl/providers/slack.d.ts.map +1 -0
- package/dist/hitl/providers/slack.js +24 -0
- package/dist/hitl/providers/slack.js.map +1 -0
- package/dist/hitl/providers/stdio.d.ts +12 -0
- package/dist/hitl/providers/stdio.d.ts.map +1 -0
- package/dist/hitl/providers/stdio.js +41 -0
- package/dist/hitl/providers/stdio.js.map +1 -0
- package/dist/hitl/providers/telegram.d.ts +22 -0
- package/dist/hitl/providers/telegram.d.ts.map +1 -0
- package/dist/hitl/providers/telegram.js +87 -0
- package/dist/hitl/providers/telegram.js.map +1 -0
- package/dist/hitl/providers/tui.d.ts +16 -0
- package/dist/hitl/providers/tui.d.ts.map +1 -0
- package/dist/hitl/providers/tui.js +169 -0
- package/dist/hitl/providers/tui.js.map +1 -0
- package/dist/hitl/providers/types.d.ts +18 -0
- package/dist/hitl/providers/types.d.ts.map +1 -0
- package/dist/hitl/providers/types.js +2 -0
- package/dist/hitl/providers/types.js.map +1 -0
- package/dist/hitl/providers/webhook.d.ts +13 -0
- package/dist/hitl/providers/webhook.d.ts.map +1 -0
- package/dist/hitl/providers/webhook.js +27 -0
- package/dist/hitl/providers/webhook.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +103 -0
- package/dist/index.js.map +1 -0
- package/dist/middleware/chain-builder.d.ts +16 -0
- package/dist/middleware/chain-builder.d.ts.map +1 -0
- package/dist/middleware/chain-builder.js +139 -0
- package/dist/middleware/chain-builder.js.map +1 -0
- package/dist/middleware/compose.d.ts +3 -0
- package/dist/middleware/compose.d.ts.map +1 -0
- package/dist/middleware/compose.js +15 -0
- package/dist/middleware/compose.js.map +1 -0
- package/dist/middleware/core/allowlist.d.ts +3 -0
- package/dist/middleware/core/allowlist.d.ts.map +1 -0
- package/dist/middleware/core/allowlist.js +23 -0
- package/dist/middleware/core/allowlist.js.map +1 -0
- package/dist/middleware/core/exec-policy.d.ts +3 -0
- package/dist/middleware/core/exec-policy.d.ts.map +1 -0
- package/dist/middleware/core/exec-policy.js +30 -0
- package/dist/middleware/core/exec-policy.js.map +1 -0
- package/dist/middleware/core/execute.d.ts +3 -0
- package/dist/middleware/core/execute.d.ts.map +1 -0
- package/dist/middleware/core/execute.js +35 -0
- package/dist/middleware/core/execute.js.map +1 -0
- package/dist/middleware/core/hitl-gate.d.ts +3 -0
- package/dist/middleware/core/hitl-gate.d.ts.map +1 -0
- package/dist/middleware/core/hitl-gate.js +38 -0
- package/dist/middleware/core/hitl-gate.js.map +1 -0
- package/dist/middleware/core/rate-limiter.d.ts +10 -0
- package/dist/middleware/core/rate-limiter.d.ts.map +1 -0
- package/dist/middleware/core/rate-limiter.js +32 -0
- package/dist/middleware/core/rate-limiter.js.map +1 -0
- package/dist/middleware/core/schema-validator.d.ts +3 -0
- package/dist/middleware/core/schema-validator.d.ts.map +1 -0
- package/dist/middleware/core/schema-validator.js +31 -0
- package/dist/middleware/core/schema-validator.js.map +1 -0
- package/dist/middleware/detectors/injection-detector.d.ts +12 -0
- package/dist/middleware/detectors/injection-detector.d.ts.map +1 -0
- package/dist/middleware/detectors/injection-detector.js +129 -0
- package/dist/middleware/detectors/injection-detector.js.map +1 -0
- package/dist/middleware/detectors/sensitivity-classifier.d.ts +12 -0
- package/dist/middleware/detectors/sensitivity-classifier.d.ts.map +1 -0
- package/dist/middleware/detectors/sensitivity-classifier.js +125 -0
- package/dist/middleware/detectors/sensitivity-classifier.js.map +1 -0
- package/dist/middleware/post/canary-token-injector.d.ts +10 -0
- package/dist/middleware/post/canary-token-injector.d.ts.map +1 -0
- package/dist/middleware/post/canary-token-injector.js +53 -0
- package/dist/middleware/post/canary-token-injector.js.map +1 -0
- package/dist/middleware/post/output-injection-detector.d.ts +7 -0
- package/dist/middleware/post/output-injection-detector.d.ts.map +1 -0
- package/dist/middleware/post/output-injection-detector.js +46 -0
- package/dist/middleware/post/output-injection-detector.js.map +1 -0
- package/dist/middleware/post/output-size-limiter.d.ts +7 -0
- package/dist/middleware/post/output-size-limiter.d.ts.map +1 -0
- package/dist/middleware/post/output-size-limiter.js +47 -0
- package/dist/middleware/post/output-size-limiter.js.map +1 -0
- package/dist/middleware/post/output-summarizer.d.ts +15 -0
- package/dist/middleware/post/output-summarizer.d.ts.map +1 -0
- package/dist/middleware/post/output-summarizer.js +38 -0
- package/dist/middleware/post/output-summarizer.js.map +1 -0
- package/dist/middleware/post/strip-query-params.d.ts +3 -0
- package/dist/middleware/post/strip-query-params.d.ts.map +1 -0
- package/dist/middleware/post/strip-query-params.js +22 -0
- package/dist/middleware/post/strip-query-params.js.map +1 -0
- package/dist/middleware/post/untrusted-envelope.d.ts +3 -0
- package/dist/middleware/post/untrusted-envelope.d.ts.map +1 -0
- package/dist/middleware/post/untrusted-envelope.js +10 -0
- package/dist/middleware/post/untrusted-envelope.js.map +1 -0
- package/dist/middleware/types.d.ts +32 -0
- package/dist/middleware/types.d.ts.map +1 -0
- package/dist/middleware/types.js +2 -0
- package/dist/middleware/types.js.map +1 -0
- package/dist/pool/http-client.d.ts +26 -0
- package/dist/pool/http-client.d.ts.map +1 -0
- package/dist/pool/http-client.js +108 -0
- package/dist/pool/http-client.js.map +1 -0
- package/dist/pool/oauth-provider.d.ts +34 -0
- package/dist/pool/oauth-provider.d.ts.map +1 -0
- package/dist/pool/oauth-provider.js +135 -0
- package/dist/pool/oauth-provider.js.map +1 -0
- package/dist/pool/pool.d.ts +30 -0
- package/dist/pool/pool.d.ts.map +1 -0
- package/dist/pool/pool.js +119 -0
- package/dist/pool/pool.js.map +1 -0
- package/dist/pool/required-mcps.d.ts +7 -0
- package/dist/pool/required-mcps.d.ts.map +1 -0
- package/dist/pool/required-mcps.js +18 -0
- package/dist/pool/required-mcps.js.map +1 -0
- package/dist/pool/sse-client.d.ts +22 -0
- package/dist/pool/sse-client.d.ts.map +1 -0
- package/dist/pool/sse-client.js +69 -0
- package/dist/pool/sse-client.js.map +1 -0
- package/dist/pool/stdio-client.d.ts +24 -0
- package/dist/pool/stdio-client.d.ts.map +1 -0
- package/dist/pool/stdio-client.js +76 -0
- package/dist/pool/stdio-client.js.map +1 -0
- package/dist/registry/registry.d.ts +19 -0
- package/dist/registry/registry.d.ts.map +1 -0
- package/dist/registry/registry.js +85 -0
- package/dist/registry/registry.js.map +1 -0
- package/dist/registry/sanitizer.d.ts +2 -0
- package/dist/registry/sanitizer.d.ts.map +1 -0
- package/dist/registry/sanitizer.js +31 -0
- package/dist/registry/sanitizer.js.map +1 -0
- package/dist/security/blocked-hosts.d.ts +6 -0
- package/dist/security/blocked-hosts.d.ts.map +1 -0
- package/dist/security/blocked-hosts.js +26 -0
- package/dist/security/blocked-hosts.js.map +1 -0
- package/dist/security/domain-allowlist.d.ts +7 -0
- package/dist/security/domain-allowlist.d.ts.map +1 -0
- package/dist/security/domain-allowlist.js +19 -0
- package/dist/security/domain-allowlist.js.map +1 -0
- package/dist/stdio-mode.d.ts +3 -0
- package/dist/stdio-mode.d.ts.map +1 -0
- package/dist/stdio-mode.js +130 -0
- package/dist/stdio-mode.js.map +1 -0
- package/dist/tools/exec.d.ts +20 -0
- package/dist/tools/exec.d.ts.map +1 -0
- package/dist/tools/exec.js +105 -0
- package/dist/tools/exec.js.map +1 -0
- package/dist/tools/http.d.ts +13 -0
- package/dist/tools/http.d.ts.map +1 -0
- package/dist/tools/http.js +99 -0
- package/dist/tools/http.js.map +1 -0
- package/dist/transport/agent-server.d.ts +26 -0
- package/dist/transport/agent-server.d.ts.map +1 -0
- package/dist/transport/agent-server.js +54 -0
- package/dist/transport/agent-server.js.map +1 -0
- package/dist/transport/mcp-normalizer.d.ts +9 -0
- package/dist/transport/mcp-normalizer.d.ts.map +1 -0
- package/dist/transport/mcp-normalizer.js +12 -0
- package/dist/transport/mcp-normalizer.js.map +1 -0
- package/dist/transport/sse-server.d.ts +7 -0
- package/dist/transport/sse-server.d.ts.map +1 -0
- package/dist/transport/sse-server.js +94 -0
- package/dist/transport/sse-server.js.map +1 -0
- package/dist/transport/stdio-server.d.ts +3 -0
- package/dist/transport/stdio-server.d.ts.map +1 -0
- package/dist/transport/stdio-server.js +12 -0
- package/dist/transport/stdio-server.js.map +1 -0
- package/dist/types.d.ts +15 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/dist/util/id.d.ts +5 -0
- package/dist/util/id.d.ts.map +1 -0
- package/dist/util/id.js +16 -0
- package/dist/util/id.js.map +1 -0
- package/dist/util/logger.d.ts +4 -0
- package/dist/util/logger.d.ts.map +1 -0
- package/dist/util/logger.js +24 -0
- package/dist/util/logger.js.map +1 -0
- package/examples/claude-code-setup.md +77 -0
- package/examples/gateway.yaml +118 -0
- package/examples/local-dev.yaml +41 -0
- package/examples/openclaw-setup.md +51 -0
- package/examples/profiles.yaml +103 -0
- package/package.json +80 -3
- package/schema.json +943 -0
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { childLogger } from '../../util/logger.js';
|
|
2
|
+
const log = childLogger('mw:output-summarizer');
|
|
3
|
+
const DEFAULT_THRESHOLD = 10_000;
|
|
4
|
+
/**
|
|
5
|
+
* Summarizes large tool outputs using the Vercel AI SDK.
|
|
6
|
+
* Requires `ai` package and a provider to be configured.
|
|
7
|
+
* The caller must pass a model string that the AI SDK can resolve.
|
|
8
|
+
* Falls back gracefully if the SDK or model is unavailable.
|
|
9
|
+
*/
|
|
10
|
+
export function outputSummarizerMiddleware(opts) {
|
|
11
|
+
const threshold = opts.threshold_chars ?? DEFAULT_THRESHOLD;
|
|
12
|
+
return async (ctx, next) => {
|
|
13
|
+
const response = await next();
|
|
14
|
+
if (response.text.length < threshold)
|
|
15
|
+
return response;
|
|
16
|
+
try {
|
|
17
|
+
// Dynamic import so this middleware doesn't hard-fail if `ai` isn't installed
|
|
18
|
+
const { generateText } = await import('ai');
|
|
19
|
+
const { text: summary } = await generateText({
|
|
20
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
|
|
21
|
+
model: opts.model, // provider-specific model reference
|
|
22
|
+
system: 'You are a concise technical summarizer. Summarize the following tool output, preserving key data, errors, and actionable information. Be brief.',
|
|
23
|
+
prompt: response.text.slice(0, 50_000), // cap input
|
|
24
|
+
maxOutputTokens: 1024,
|
|
25
|
+
});
|
|
26
|
+
response.text = `<summary>\n${summary}\n</summary>\n\n<original-length>${response.text.length} chars</original-length>`;
|
|
27
|
+
if (response.fullOutputPath) {
|
|
28
|
+
response.text += `\n<full-output>${response.fullOutputPath}</full-output>`;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
catch (err) {
|
|
32
|
+
log.warn({ err }, 'Output summarization failed, returning raw output');
|
|
33
|
+
// Fall through — return original response unchanged
|
|
34
|
+
}
|
|
35
|
+
return response;
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=output-summarizer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"output-summarizer.js","sourceRoot":"","sources":["../../../src/middleware/post/output-summarizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,GAAG,GAAG,WAAW,CAAC,sBAAsB,CAAC,CAAC;AAShD,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAA6B;IACtE,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,IAAI,iBAAiB,CAAC;IAE5D,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;QAE9B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,SAAS;YAAE,OAAO,QAAQ,CAAC;QAEtD,IAAI,CAAC;YACH,8EAA8E;YAC9E,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,YAAY,CAAC;gBAC3C,uGAAuG;gBACvG,KAAK,EAAE,IAAI,CAAC,KAAY,EAAE,oCAAoC;gBAC9D,MAAM,EACJ,iJAAiJ;gBACnJ,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,YAAY;gBACpD,eAAe,EAAE,IAAI;aACtB,CAAC,CAAC;YAEH,QAAQ,CAAC,IAAI,GAAG,cAAc,OAAO,oCAAoC,QAAQ,CAAC,IAAI,CAAC,MAAM,0BAA0B,CAAC;YACxH,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAC5B,QAAQ,CAAC,IAAI,IAAI,kBAAkB,QAAQ,CAAC,cAAc,gBAAgB,CAAC;YAC7E,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,mDAAmD,CAAC,CAAC;YACvE,oDAAoD;QACtD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strip-query-params.d.ts","sourceRoot":"","sources":["../../../src/middleware/post/strip-query-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,wBAAgB,0BAA0B,IAAI,UAAU,CAmBvD"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
const READ_ONLY_HTTP_TOOLS = new Set(['http/get', 'http/head']);
|
|
2
|
+
export function stripQueryParamsMiddleware() {
|
|
3
|
+
return async (ctx, next) => {
|
|
4
|
+
if (!READ_ONLY_HTTP_TOOLS.has(ctx.toolName))
|
|
5
|
+
return next();
|
|
6
|
+
const url = ctx.args['url'];
|
|
7
|
+
if (typeof url !== 'string')
|
|
8
|
+
return next();
|
|
9
|
+
try {
|
|
10
|
+
const parsed = new URL(url);
|
|
11
|
+
if (parsed.search) {
|
|
12
|
+
parsed.search = '';
|
|
13
|
+
ctx.args['url'] = parsed.toString();
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
// Invalid URL — let downstream handle it
|
|
18
|
+
}
|
|
19
|
+
return next();
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=strip-query-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"strip-query-params.js","sourceRoot":"","sources":["../../../src/middleware/post/strip-query-params.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;AAEhE,MAAM,UAAU,0BAA0B;IACxC,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,EAAE,CAAC;QAE3D,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,IAAI,EAAE,CAAC;QAE3C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;gBACnB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"untrusted-envelope.d.ts","sourceRoot":"","sources":["../../../src/middleware/post/untrusted-envelope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,wBAAgB,2BAA2B,IAAI,UAAU,CAcxD"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export function untrustedEnvelopeMiddleware() {
|
|
2
|
+
return async (ctx, next) => {
|
|
3
|
+
const response = await next();
|
|
4
|
+
const escapedTool = ctx.toolName.replace(/[&<>"]/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"' })[c]);
|
|
5
|
+
const escapedCallId = ctx.callId.replace(/[&<>"]/g, (c) => ({ '&': '&', '<': '<', '>': '>', '"': '"' })[c]);
|
|
6
|
+
response.text = `<untrusted-output tool="${escapedTool}" call-id="${escapedCallId}">\n${response.text}\n</untrusted-output>`;
|
|
7
|
+
return response;
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=untrusted-envelope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"untrusted-envelope.js","sourceRoot":"","sources":["../../../src/middleware/post/untrusted-envelope.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,2BAA2B;IACzC,OAAO,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CACtC,SAAS,EACT,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAE,CACvE,CAAC;QACF,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CACtC,SAAS,EACT,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAE,CACvE,CAAC;QACF,QAAQ,CAAC,IAAI,GAAG,2BAA2B,WAAW,cAAc,aAAa,OAAO,QAAQ,CAAC,IAAI,uBAAuB,CAAC;QAC7H,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { ToolRegistry } from '../registry/registry.js';
|
|
2
|
+
import type { AllowlistEngine } from '../allowlist/engine.js';
|
|
3
|
+
import type { HitlEngine } from '../hitl/engine.js';
|
|
4
|
+
import type { HitlBatcher } from '../hitl/batcher.js';
|
|
5
|
+
import type { AuditLogger } from '../audit/logger.js';
|
|
6
|
+
import type { AgentConfig, SecurityConfig } from '../config/schema.js';
|
|
7
|
+
export interface ToolCallContext {
|
|
8
|
+
callId: string;
|
|
9
|
+
agentId: string;
|
|
10
|
+
agentConfig: AgentConfig;
|
|
11
|
+
toolName: string;
|
|
12
|
+
args: Record<string, unknown>;
|
|
13
|
+
meta: Record<string, unknown>;
|
|
14
|
+
deps: MiddlewareDeps;
|
|
15
|
+
startedAt: number;
|
|
16
|
+
}
|
|
17
|
+
export interface ToolCallResponse {
|
|
18
|
+
result: unknown;
|
|
19
|
+
text: string;
|
|
20
|
+
truncated?: boolean;
|
|
21
|
+
fullOutputPath?: string;
|
|
22
|
+
}
|
|
23
|
+
export type Middleware = (ctx: ToolCallContext, next: () => Promise<ToolCallResponse>) => Promise<ToolCallResponse>;
|
|
24
|
+
export interface MiddlewareDeps {
|
|
25
|
+
registry: ToolRegistry;
|
|
26
|
+
allowlist: AllowlistEngine;
|
|
27
|
+
hitlEngine: HitlEngine;
|
|
28
|
+
hitlBatcher: HitlBatcher;
|
|
29
|
+
auditLogger: AuditLogger;
|
|
30
|
+
securityConfig: SecurityConfig;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middleware/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAClC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE/B,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,cAAc,EAAE,cAAc,CAAC;CAChC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/middleware/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
export declare class HttpMcpClient {
|
|
3
|
+
private id;
|
|
4
|
+
private url;
|
|
5
|
+
private headers?;
|
|
6
|
+
private oauth;
|
|
7
|
+
private oauthCallbackPort;
|
|
8
|
+
private client?;
|
|
9
|
+
private transport?;
|
|
10
|
+
private oauthProvider?;
|
|
11
|
+
private reconnectAttempt;
|
|
12
|
+
private stopped;
|
|
13
|
+
private ready;
|
|
14
|
+
private awaitingAuth;
|
|
15
|
+
constructor(id: string, url: string, headers?: Record<string, string> | undefined, oauth?: boolean, oauthCallbackPort?: number);
|
|
16
|
+
connect(): Promise<void>;
|
|
17
|
+
listTools(): Promise<Tool[]>;
|
|
18
|
+
callTool(name: string, args: Record<string, unknown>): Promise<unknown>;
|
|
19
|
+
getServerInfo(): {
|
|
20
|
+
name: string;
|
|
21
|
+
version: string;
|
|
22
|
+
} | undefined;
|
|
23
|
+
isReady(): boolean;
|
|
24
|
+
stop(): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=http-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAQ/D,qBAAa,aAAa;IAWtB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,iBAAiB;IAd3B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAC,CAAoB;IAC1C,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,YAAY,CAAS;gBAGnB,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAA,EAChC,KAAK,UAAQ,EACb,iBAAiB,SAAQ;IAO7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgExB,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAM5B,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAK7E,aAAa,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAI9D,OAAO,IAAI,OAAO;IAIZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
|
|
2
|
+
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
3
|
+
import { UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
4
|
+
import { FileOAuthProvider } from './oauth-provider.js';
|
|
5
|
+
import { childLogger } from '../util/logger.js';
|
|
6
|
+
const log = childLogger('http-client');
|
|
7
|
+
const BACKOFF_STEPS = [1000, 2000, 4000, 8000, 16000, 30000];
|
|
8
|
+
export class HttpMcpClient {
|
|
9
|
+
id;
|
|
10
|
+
url;
|
|
11
|
+
headers;
|
|
12
|
+
oauth;
|
|
13
|
+
oauthCallbackPort;
|
|
14
|
+
client;
|
|
15
|
+
transport;
|
|
16
|
+
oauthProvider;
|
|
17
|
+
reconnectAttempt = 0;
|
|
18
|
+
stopped = false;
|
|
19
|
+
ready = false;
|
|
20
|
+
awaitingAuth = false;
|
|
21
|
+
constructor(id, url, headers, oauth = false, oauthCallbackPort = 18432) {
|
|
22
|
+
this.id = id;
|
|
23
|
+
this.url = url;
|
|
24
|
+
this.headers = headers;
|
|
25
|
+
this.oauth = oauth;
|
|
26
|
+
this.oauthCallbackPort = oauthCallbackPort;
|
|
27
|
+
if (this.oauth) {
|
|
28
|
+
this.oauthProvider = new FileOAuthProvider(this.id, this.oauthCallbackPort);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
async connect() {
|
|
32
|
+
// Don't reconnect while waiting for the user to complete the browser OAuth flow
|
|
33
|
+
if (this.awaitingAuth) {
|
|
34
|
+
log.debug({ id: this.id }, 'Skipping connect — already awaiting OAuth');
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const transportOpts = {};
|
|
38
|
+
if (this.headers) {
|
|
39
|
+
transportOpts.requestInit = { headers: this.headers };
|
|
40
|
+
}
|
|
41
|
+
if (this.oauthProvider) {
|
|
42
|
+
transportOpts.authProvider = this.oauthProvider;
|
|
43
|
+
}
|
|
44
|
+
this.transport = new StreamableHTTPClientTransport(new URL(this.url), transportOpts);
|
|
45
|
+
this.client = new Client({ name: 'airlock', version: '0.1.0' });
|
|
46
|
+
this.transport.onclose = () => {
|
|
47
|
+
this.ready = false;
|
|
48
|
+
if (!this.stopped && !this.awaitingAuth) {
|
|
49
|
+
const delay = BACKOFF_STEPS[Math.min(this.reconnectAttempt, BACKOFF_STEPS.length - 1)];
|
|
50
|
+
log.warn({ id: this.id, attempt: this.reconnectAttempt, delay }, 'HTTP MCP disconnected, reconnecting');
|
|
51
|
+
this.reconnectAttempt++;
|
|
52
|
+
setTimeout(() => {
|
|
53
|
+
void this.connect().catch((err) => log.error({ err, id: this.id }, 'Reconnect failed'));
|
|
54
|
+
}, delay);
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
try {
|
|
58
|
+
await this.client.connect(this.transport);
|
|
59
|
+
this.reconnectAttempt = 0;
|
|
60
|
+
this.ready = true;
|
|
61
|
+
log.info({ id: this.id, url: this.url }, 'MCP HTTP client connected');
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
if (err instanceof UnauthorizedError && this.oauthProvider) {
|
|
65
|
+
this.awaitingAuth = true;
|
|
66
|
+
try {
|
|
67
|
+
log.info({ id: this.id }, 'OAuth authorization required, waiting for browser flow');
|
|
68
|
+
const code = await this.oauthProvider.waitForAuthCode();
|
|
69
|
+
await this.transport.finishAuth(code);
|
|
70
|
+
this.client = new Client({ name: 'airlock', version: '0.1.0' });
|
|
71
|
+
await this.client.connect(this.transport);
|
|
72
|
+
this.reconnectAttempt = 0;
|
|
73
|
+
this.ready = true;
|
|
74
|
+
log.info({ id: this.id, url: this.url }, 'MCP HTTP client connected (after OAuth)');
|
|
75
|
+
}
|
|
76
|
+
finally {
|
|
77
|
+
this.awaitingAuth = false;
|
|
78
|
+
}
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
log.error({ err, id: this.id }, 'MCP HTTP connect failed');
|
|
82
|
+
throw err;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
async listTools() {
|
|
86
|
+
if (!this.client || !this.ready)
|
|
87
|
+
throw new Error(`MCP ${this.id} not connected`);
|
|
88
|
+
const result = await this.client.listTools();
|
|
89
|
+
return result.tools;
|
|
90
|
+
}
|
|
91
|
+
async callTool(name, args) {
|
|
92
|
+
if (!this.client || !this.ready)
|
|
93
|
+
throw new Error(`MCP ${this.id} not connected`);
|
|
94
|
+
return this.client.callTool({ name, arguments: args });
|
|
95
|
+
}
|
|
96
|
+
getServerInfo() {
|
|
97
|
+
return this.client?.getServerVersion();
|
|
98
|
+
}
|
|
99
|
+
isReady() {
|
|
100
|
+
return this.ready;
|
|
101
|
+
}
|
|
102
|
+
async stop() {
|
|
103
|
+
this.stopped = true;
|
|
104
|
+
this.oauthProvider?.stopCallbackServer();
|
|
105
|
+
await this.transport?.close();
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=http-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/pool/http-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
|
|
2
|
+
import type { OAuthClientMetadata, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
|
|
3
|
+
/**
|
|
4
|
+
* File-backed OAuthClientProvider that persists tokens to ~/.airlock/oauth/<server-id>.json
|
|
5
|
+
* and opens the browser for authorization.
|
|
6
|
+
*/
|
|
7
|
+
export declare class FileOAuthProvider implements OAuthClientProvider {
|
|
8
|
+
private serverId;
|
|
9
|
+
private callbackPort;
|
|
10
|
+
private storePath;
|
|
11
|
+
private data;
|
|
12
|
+
private callbackServer?;
|
|
13
|
+
private authCodeResolve?;
|
|
14
|
+
private browserOpenedAt;
|
|
15
|
+
constructor(serverId: string, callbackPort: number);
|
|
16
|
+
get redirectUrl(): string;
|
|
17
|
+
get clientMetadata(): OAuthClientMetadata;
|
|
18
|
+
clientInformation(): Promise<OAuthClientInformationFull | undefined>;
|
|
19
|
+
saveClientInformation(info: OAuthClientInformationFull): Promise<void>;
|
|
20
|
+
tokens(): Promise<OAuthTokens | undefined>;
|
|
21
|
+
saveTokens(tokens: OAuthTokens): Promise<void>;
|
|
22
|
+
redirectToAuthorization(url: URL): Promise<void>;
|
|
23
|
+
saveCodeVerifier(verifier: string): Promise<void>;
|
|
24
|
+
codeVerifier(): Promise<string>;
|
|
25
|
+
/**
|
|
26
|
+
* Starts a temporary HTTP server to listen for the OAuth callback.
|
|
27
|
+
* Returns a promise that resolves with the authorization code.
|
|
28
|
+
*/
|
|
29
|
+
waitForAuthCode(): Promise<string>;
|
|
30
|
+
stopCallbackServer(): void;
|
|
31
|
+
private load;
|
|
32
|
+
private save;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=oauth-provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAWlD;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAQzD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;IARtB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,eAAe,CAAC,CAAyB;IACjD,OAAO,CAAC,eAAe,CAAK;gBAGlB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM;IAO9B,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,cAAc,IAAI,mBAAmB,CAQxC;IAEK,iBAAiB,IAAI,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC;IAKpE,qBAAqB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtE,MAAM,IAAI,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAK1C,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrC;;;OAGG;IACH,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAgDlC,kBAAkB,IAAI,IAAI;YAKZ,IAAI;YASJ,IAAI;CAKnB"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { readFile, writeFile, mkdir } from 'fs/promises';
|
|
2
|
+
import { join } from 'path';
|
|
3
|
+
import { execFile } from 'child_process';
|
|
4
|
+
import { createServer } from 'http';
|
|
5
|
+
import { childLogger } from '../util/logger.js';
|
|
6
|
+
const log = childLogger('oauth');
|
|
7
|
+
/**
|
|
8
|
+
* File-backed OAuthClientProvider that persists tokens to ~/.airlock/oauth/<server-id>.json
|
|
9
|
+
* and opens the browser for authorization.
|
|
10
|
+
*/
|
|
11
|
+
export class FileOAuthProvider {
|
|
12
|
+
serverId;
|
|
13
|
+
callbackPort;
|
|
14
|
+
storePath;
|
|
15
|
+
data = {};
|
|
16
|
+
callbackServer;
|
|
17
|
+
authCodeResolve;
|
|
18
|
+
browserOpenedAt = 0;
|
|
19
|
+
constructor(serverId, callbackPort) {
|
|
20
|
+
this.serverId = serverId;
|
|
21
|
+
this.callbackPort = callbackPort;
|
|
22
|
+
const home = process.env.HOME ?? process.env.USERPROFILE ?? '.';
|
|
23
|
+
const dir = join(home, '.airlock', 'oauth');
|
|
24
|
+
this.storePath = join(dir, `${serverId}.json`);
|
|
25
|
+
}
|
|
26
|
+
get redirectUrl() {
|
|
27
|
+
return `http://127.0.0.1:${this.callbackPort}/oauth/callback`;
|
|
28
|
+
}
|
|
29
|
+
get clientMetadata() {
|
|
30
|
+
return {
|
|
31
|
+
redirect_uris: [this.redirectUrl],
|
|
32
|
+
client_name: `Airlock (${this.serverId})`,
|
|
33
|
+
token_endpoint_auth_method: 'none',
|
|
34
|
+
grant_types: ['authorization_code', 'refresh_token'],
|
|
35
|
+
response_types: ['code'],
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
async clientInformation() {
|
|
39
|
+
await this.load();
|
|
40
|
+
return this.data.clientInfo;
|
|
41
|
+
}
|
|
42
|
+
async saveClientInformation(info) {
|
|
43
|
+
this.data.clientInfo = info;
|
|
44
|
+
await this.save();
|
|
45
|
+
}
|
|
46
|
+
async tokens() {
|
|
47
|
+
await this.load();
|
|
48
|
+
return this.data.tokens;
|
|
49
|
+
}
|
|
50
|
+
async saveTokens(tokens) {
|
|
51
|
+
this.data.tokens = tokens;
|
|
52
|
+
await this.save();
|
|
53
|
+
}
|
|
54
|
+
redirectToAuthorization(url) {
|
|
55
|
+
const now = Date.now();
|
|
56
|
+
if (now - this.browserOpenedAt < 30_000) {
|
|
57
|
+
log.debug({ serverId: this.serverId }, 'Skipping duplicate browser open (debounced)');
|
|
58
|
+
return Promise.resolve();
|
|
59
|
+
}
|
|
60
|
+
this.browserOpenedAt = now;
|
|
61
|
+
log.info({ serverId: this.serverId, url: url.toString() }, 'Opening browser for OAuth authorization');
|
|
62
|
+
const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
|
|
63
|
+
execFile(cmd, [url.toString()]);
|
|
64
|
+
return Promise.resolve();
|
|
65
|
+
}
|
|
66
|
+
async saveCodeVerifier(verifier) {
|
|
67
|
+
this.data.codeVerifier = verifier;
|
|
68
|
+
await this.save();
|
|
69
|
+
}
|
|
70
|
+
async codeVerifier() {
|
|
71
|
+
await this.load();
|
|
72
|
+
return this.data.codeVerifier ?? '';
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Starts a temporary HTTP server to listen for the OAuth callback.
|
|
76
|
+
* Returns a promise that resolves with the authorization code.
|
|
77
|
+
*/
|
|
78
|
+
waitForAuthCode() {
|
|
79
|
+
return new Promise((resolve, reject) => {
|
|
80
|
+
this.authCodeResolve = resolve;
|
|
81
|
+
this.callbackServer = createServer((req, res) => {
|
|
82
|
+
const url = new URL(req.url ?? '/', `http://127.0.0.1:${this.callbackPort}`);
|
|
83
|
+
if (url.pathname !== '/oauth/callback') {
|
|
84
|
+
res.writeHead(404);
|
|
85
|
+
res.end('Not found');
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const code = url.searchParams.get('code');
|
|
89
|
+
const error = url.searchParams.get('error');
|
|
90
|
+
if (error) {
|
|
91
|
+
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
92
|
+
res.end('<html><body><h2>Authorization failed</h2><p>You can close this tab.</p></body></html>');
|
|
93
|
+
this.stopCallbackServer();
|
|
94
|
+
reject(new Error(`OAuth error: ${error}`));
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
if (code) {
|
|
98
|
+
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
99
|
+
res.end('<html><body><h2>Authorized!</h2><p>You can close this tab.</p></body></html>');
|
|
100
|
+
this.stopCallbackServer();
|
|
101
|
+
this.authCodeResolve?.(code);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
res.writeHead(400);
|
|
105
|
+
res.end('Missing code parameter');
|
|
106
|
+
});
|
|
107
|
+
this.callbackServer.listen(this.callbackPort, '127.0.0.1', () => {
|
|
108
|
+
log.info({ port: this.callbackPort }, 'OAuth callback server listening');
|
|
109
|
+
});
|
|
110
|
+
this.callbackServer.on('error', (err) => {
|
|
111
|
+
log.error({ err }, 'OAuth callback server error');
|
|
112
|
+
reject(err);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
stopCallbackServer() {
|
|
117
|
+
this.callbackServer?.close();
|
|
118
|
+
this.callbackServer = undefined;
|
|
119
|
+
}
|
|
120
|
+
async load() {
|
|
121
|
+
try {
|
|
122
|
+
const data = await readFile(this.storePath, 'utf-8');
|
|
123
|
+
this.data = JSON.parse(data);
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
this.data = {};
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
async save() {
|
|
130
|
+
const dir = join(this.storePath, '..');
|
|
131
|
+
await mkdir(dir, { recursive: true });
|
|
132
|
+
await writeFile(this.storePath, JSON.stringify(this.data, null, 2));
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=oauth-provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-provider.js","sourceRoot":"","sources":["../../src/pool/oauth-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { McpServerConfig } from '../config/schema.js';
|
|
2
|
+
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
3
|
+
export type HealthStatus = 'ok' | 'degraded' | 'down';
|
|
4
|
+
export declare class ClientPool {
|
|
5
|
+
private mcps;
|
|
6
|
+
private options?;
|
|
7
|
+
private clients;
|
|
8
|
+
private healthTimer?;
|
|
9
|
+
private _onClientReady?;
|
|
10
|
+
constructor(mcps: Record<string, McpServerConfig>, options?: {
|
|
11
|
+
stdioStderr?: "inherit" | "ignore" | "pipe";
|
|
12
|
+
} | undefined);
|
|
13
|
+
onClientReady(cb: (id: string) => void): void;
|
|
14
|
+
initialize(): Promise<void>;
|
|
15
|
+
private connectClient;
|
|
16
|
+
private connectInBackground;
|
|
17
|
+
private createClient;
|
|
18
|
+
listTools(mcpId: string): Promise<Tool[]>;
|
|
19
|
+
callTool(mcpId: string, toolName: string, args: Record<string, unknown>): Promise<unknown>;
|
|
20
|
+
reload(newMcps: Record<string, McpServerConfig>): Promise<void>;
|
|
21
|
+
healthCheck(): Record<string, HealthStatus>;
|
|
22
|
+
getServerInfo(mcpId: string): {
|
|
23
|
+
name: string;
|
|
24
|
+
version: string;
|
|
25
|
+
} | undefined;
|
|
26
|
+
getMcpIds(): string[];
|
|
27
|
+
private startHealthCheck;
|
|
28
|
+
stop(): Promise<void>;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=pool.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/pool/pool.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAM/D,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAEtD,qBAAa,UAAU;IAMnB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO,CAAC;IANlB,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,WAAW,CAAC,CAAiB;IACrC,OAAO,CAAC,cAAc,CAAC,CAAuB;gBAGpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACrC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAA;KAAE,YAAA;IAGnE,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAIvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAMnB,aAAa;IAa3B,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,YAAY;IAWd,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAMzC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAO1F,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC;IAQ3C,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAI3E,SAAS,IAAI,MAAM,EAAE;IAIrB,OAAO,CAAC,gBAAgB;IAWlB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAI5B"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { StdioMcpClient } from './stdio-client.js';
|
|
2
|
+
import { SseMcpClient } from './sse-client.js';
|
|
3
|
+
import { HttpMcpClient } from './http-client.js';
|
|
4
|
+
import { childLogger } from '../util/logger.js';
|
|
5
|
+
const log = childLogger('pool');
|
|
6
|
+
export class ClientPool {
|
|
7
|
+
mcps;
|
|
8
|
+
options;
|
|
9
|
+
clients = new Map();
|
|
10
|
+
healthTimer;
|
|
11
|
+
_onClientReady;
|
|
12
|
+
constructor(mcps, options) {
|
|
13
|
+
this.mcps = mcps;
|
|
14
|
+
this.options = options;
|
|
15
|
+
}
|
|
16
|
+
onClientReady(cb) {
|
|
17
|
+
this._onClientReady = cb;
|
|
18
|
+
}
|
|
19
|
+
async initialize() {
|
|
20
|
+
const entries = Object.entries(this.mcps);
|
|
21
|
+
await Promise.allSettled(entries.map(([id, cfg]) => this.connectClient(id, cfg)));
|
|
22
|
+
this.startHealthCheck();
|
|
23
|
+
}
|
|
24
|
+
async connectClient(id, cfg) {
|
|
25
|
+
const client = this.createClient(id, cfg);
|
|
26
|
+
this.clients.set(id, client);
|
|
27
|
+
try {
|
|
28
|
+
await client.connect();
|
|
29
|
+
log.info({ id }, 'MCP connected');
|
|
30
|
+
this._onClientReady?.(id);
|
|
31
|
+
}
|
|
32
|
+
catch (err) {
|
|
33
|
+
log.error({ err, id }, 'Failed to connect MCP (will retry in background)');
|
|
34
|
+
this.connectInBackground(id, client);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
connectInBackground(id, client) {
|
|
38
|
+
client
|
|
39
|
+
.connect()
|
|
40
|
+
.then(() => {
|
|
41
|
+
log.info({ id }, 'MCP connected (background)');
|
|
42
|
+
this._onClientReady?.(id);
|
|
43
|
+
})
|
|
44
|
+
.catch(() => { });
|
|
45
|
+
}
|
|
46
|
+
createClient(id, cfg) {
|
|
47
|
+
switch (cfg.type) {
|
|
48
|
+
case 'stdio':
|
|
49
|
+
return new StdioMcpClient(id, cfg.command, cfg.args, cfg.env, this.options?.stdioStderr);
|
|
50
|
+
case 'sse':
|
|
51
|
+
return new SseMcpClient(id, cfg.url, cfg.headers);
|
|
52
|
+
case 'http':
|
|
53
|
+
return new HttpMcpClient(id, cfg.url, cfg.headers, cfg.oauth, cfg.oauth_callback_port);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
async listTools(mcpId) {
|
|
57
|
+
const client = this.clients.get(mcpId);
|
|
58
|
+
if (!client)
|
|
59
|
+
throw new Error(`Unknown MCP: ${mcpId}`);
|
|
60
|
+
return client.listTools();
|
|
61
|
+
}
|
|
62
|
+
async callTool(mcpId, toolName, args) {
|
|
63
|
+
const client = this.clients.get(mcpId);
|
|
64
|
+
if (!client)
|
|
65
|
+
throw new Error(`Unknown MCP: ${mcpId}`);
|
|
66
|
+
if (!client.isReady())
|
|
67
|
+
throw new Error(`MCP ${mcpId} is not connected`);
|
|
68
|
+
return client.callTool(toolName, args);
|
|
69
|
+
}
|
|
70
|
+
async reload(newMcps) {
|
|
71
|
+
const oldIds = new Set(this.clients.keys());
|
|
72
|
+
const newIds = new Set(Object.keys(newMcps));
|
|
73
|
+
// Remove MCPs that no longer exist
|
|
74
|
+
for (const id of oldIds) {
|
|
75
|
+
if (!newIds.has(id)) {
|
|
76
|
+
log.info({ id }, 'Removing MCP (no longer in config)');
|
|
77
|
+
const client = this.clients.get(id);
|
|
78
|
+
await client.stop().catch((err) => log.error({ err, id }, 'Error stopping removed MCP'));
|
|
79
|
+
this.clients.delete(id);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
// Add new MCPs
|
|
83
|
+
for (const [id, cfg] of Object.entries(newMcps)) {
|
|
84
|
+
if (!oldIds.has(id)) {
|
|
85
|
+
log.info({ id }, 'Adding new MCP from config reload');
|
|
86
|
+
void this.connectClient(id, cfg);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
this.mcps = newMcps;
|
|
90
|
+
}
|
|
91
|
+
healthCheck() {
|
|
92
|
+
const result = {};
|
|
93
|
+
for (const [id, client] of this.clients) {
|
|
94
|
+
result[id] = client.isReady() ? 'ok' : 'down';
|
|
95
|
+
}
|
|
96
|
+
return result;
|
|
97
|
+
}
|
|
98
|
+
getServerInfo(mcpId) {
|
|
99
|
+
return this.clients.get(mcpId)?.getServerInfo();
|
|
100
|
+
}
|
|
101
|
+
getMcpIds() {
|
|
102
|
+
return Array.from(this.clients.keys());
|
|
103
|
+
}
|
|
104
|
+
startHealthCheck() {
|
|
105
|
+
this.healthTimer = setInterval(() => {
|
|
106
|
+
const health = this.healthCheck();
|
|
107
|
+
const down = Object.entries(health).filter(([, s]) => s === 'down');
|
|
108
|
+
if (down.length > 0) {
|
|
109
|
+
log.warn({ down: down.map(([id]) => id) }, 'Some MCPs are down');
|
|
110
|
+
}
|
|
111
|
+
}, 30_000);
|
|
112
|
+
this.healthTimer.unref();
|
|
113
|
+
}
|
|
114
|
+
async stop() {
|
|
115
|
+
clearInterval(this.healthTimer);
|
|
116
|
+
await Promise.allSettled(Array.from(this.clients.values()).map((c) => c.stop()));
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=pool.js.map
|