clinkx 1.1.2 → 1.3.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 +63 -0
- package/README.md +67 -14
- package/clinkx-workflows/dist/allowed-roots.js +2 -0
- package/clinkx-workflows/dist/allowed-roots.js.map +1 -1
- package/clinkx-workflows/dist/architecture-arena/admission.d.ts +16 -0
- package/clinkx-workflows/dist/architecture-arena/admission.js +107 -0
- package/clinkx-workflows/dist/architecture-arena/admission.js.map +1 -0
- package/clinkx-workflows/dist/architecture-arena/contract.d.ts +1368 -0
- package/clinkx-workflows/dist/architecture-arena/contract.js +254 -0
- package/clinkx-workflows/dist/architecture-arena/contract.js.map +1 -0
- package/clinkx-workflows/dist/architecture-arena/runtime.d.ts +53 -0
- package/clinkx-workflows/dist/architecture-arena/runtime.js +511 -0
- package/clinkx-workflows/dist/architecture-arena/runtime.js.map +1 -0
- package/clinkx-workflows/dist/architecture-comparison/admission.d.ts +17 -1
- package/clinkx-workflows/dist/architecture-comparison/admission.js +27 -4
- package/clinkx-workflows/dist/architecture-comparison/admission.js.map +1 -1
- package/clinkx-workflows/dist/architecture-comparison/contract.d.ts +59 -62
- package/clinkx-workflows/dist/architecture-comparison/contract.js +4 -21
- package/clinkx-workflows/dist/architecture-comparison/contract.js.map +1 -1
- package/clinkx-workflows/dist/architecture-comparison/runtime.d.ts +4 -3
- package/clinkx-workflows/dist/architecture-comparison/runtime.js +22 -67
- package/clinkx-workflows/dist/architecture-comparison/runtime.js.map +1 -1
- package/clinkx-workflows/dist/artifacts.d.ts +19 -4
- package/clinkx-workflows/dist/artifacts.js +16 -7
- package/clinkx-workflows/dist/artifacts.js.map +1 -1
- package/clinkx-workflows/dist/backend.d.ts +30 -0
- package/clinkx-workflows/dist/child-env.d.ts +3 -1
- package/clinkx-workflows/dist/child-env.js +6 -2
- package/clinkx-workflows/dist/child-env.js.map +1 -1
- package/clinkx-workflows/dist/clink-client.d.ts +8 -2
- package/clinkx-workflows/dist/clink-client.js +4 -2
- package/clinkx-workflows/dist/clink-client.js.map +1 -1
- package/clinkx-workflows/dist/config.d.ts +28 -5
- package/clinkx-workflows/dist/config.js +137 -20
- package/clinkx-workflows/dist/config.js.map +1 -1
- package/clinkx-workflows/dist/contained-file.js +9 -0
- package/clinkx-workflows/dist/contained-file.js.map +1 -1
- package/clinkx-workflows/dist/context-preflight.d.ts +6 -0
- package/clinkx-workflows/dist/context-preflight.js.map +1 -1
- package/clinkx-workflows/dist/council-execution-policy.d.ts +3 -1
- package/clinkx-workflows/dist/council-execution-policy.js +4 -0
- package/clinkx-workflows/dist/council-execution-policy.js.map +1 -1
- package/clinkx-workflows/dist/dashboard/contracts.d.ts +586 -586
- package/clinkx-workflows/dist/dashboard/progress-report-contract.d.ts +28 -28
- package/clinkx-workflows/dist/dashboard/session-log-contract.d.ts +32 -32
- package/clinkx-workflows/dist/dashboard/session-log-identity.js +2 -1
- package/clinkx-workflows/dist/dashboard/session-log-identity.js.map +1 -1
- package/clinkx-workflows/dist/dashboard-ui/assets/index-DRId2DVA.js +119 -0
- package/clinkx-workflows/dist/dashboard-ui/assets/style-CHAw57y5.css +1 -0
- package/clinkx-workflows/dist/dashboard-ui/index.html +2 -2
- package/clinkx-workflows/dist/delegate-signature.d.ts +4 -3
- package/clinkx-workflows/dist/delegate-signature.js +4 -3
- package/clinkx-workflows/dist/delegate-signature.js.map +1 -1
- package/clinkx-workflows/dist/durable-file.d.ts +69 -0
- package/clinkx-workflows/dist/durable-file.js +145 -0
- package/clinkx-workflows/dist/durable-file.js.map +1 -0
- package/clinkx-workflows/dist/engine.d.ts +42 -7
- package/clinkx-workflows/dist/engine.js +196 -24
- package/clinkx-workflows/dist/engine.js.map +1 -1
- package/clinkx-workflows/dist/ping-pong/admission.d.ts +127 -0
- package/clinkx-workflows/dist/ping-pong/admission.js +522 -0
- package/clinkx-workflows/dist/ping-pong/admission.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/contract.d.ts +2539 -0
- package/clinkx-workflows/dist/ping-pong/contract.js +819 -0
- package/clinkx-workflows/dist/ping-pong/contract.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/control.d.ts +67 -0
- package/clinkx-workflows/dist/ping-pong/control.js +12 -0
- package/clinkx-workflows/dist/ping-pong/control.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/runtime-handle.d.ts +24 -0
- package/clinkx-workflows/dist/ping-pong/runtime-handle.js +55 -0
- package/clinkx-workflows/dist/ping-pong/runtime-handle.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/runtime.d.ts +235 -0
- package/clinkx-workflows/dist/ping-pong/runtime.js +1183 -0
- package/clinkx-workflows/dist/ping-pong/runtime.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/settle.d.ts +57 -0
- package/clinkx-workflows/dist/ping-pong/settle.js +58 -0
- package/clinkx-workflows/dist/ping-pong/settle.js.map +1 -0
- package/clinkx-workflows/dist/ping-pong/sidecar.d.ts +65 -0
- package/clinkx-workflows/dist/ping-pong/sidecar.js +138 -0
- package/clinkx-workflows/dist/ping-pong/sidecar.js.map +1 -0
- package/clinkx-workflows/dist/plan-review/publication.d.ts +2 -1
- package/clinkx-workflows/dist/plan-review/publication.js +5 -6
- package/clinkx-workflows/dist/plan-review/publication.js.map +1 -1
- package/clinkx-workflows/dist/plan-review/snapshot.d.ts +3 -2
- package/clinkx-workflows/dist/plan-review/snapshot.js +8 -8
- package/clinkx-workflows/dist/plan-review/snapshot.js.map +1 -1
- package/clinkx-workflows/dist/recipe-host.d.ts +315 -0
- package/clinkx-workflows/dist/recipe-host.js +183 -0
- package/clinkx-workflows/dist/recipe-host.js.map +1 -0
- package/clinkx-workflows/dist/recipe-seats.d.ts +96 -0
- package/clinkx-workflows/dist/recipe-seats.js +163 -0
- package/clinkx-workflows/dist/recipe-seats.js.map +1 -0
- package/clinkx-workflows/dist/recipe-shared/evidence.d.ts +67 -0
- package/clinkx-workflows/dist/recipe-shared/evidence.js +111 -0
- package/clinkx-workflows/dist/recipe-shared/evidence.js.map +1 -0
- package/clinkx-workflows/dist/reducers/index.d.ts +9 -1
- package/clinkx-workflows/dist/reducers/index.js +30 -0
- package/clinkx-workflows/dist/reducers/index.js.map +1 -1
- package/clinkx-workflows/dist/root-path-validation.d.ts +12 -0
- package/clinkx-workflows/dist/root-path-validation.js +63 -0
- package/clinkx-workflows/dist/root-path-validation.js.map +1 -0
- package/clinkx-workflows/dist/rosters.d.ts +1 -0
- package/clinkx-workflows/dist/rosters.js +16 -6
- package/clinkx-workflows/dist/rosters.js.map +1 -1
- package/clinkx-workflows/dist/run-lock-reclaim.d.ts +44 -0
- package/clinkx-workflows/dist/run-lock-reclaim.js +86 -0
- package/clinkx-workflows/dist/run-lock-reclaim.js.map +1 -0
- package/clinkx-workflows/dist/server.js +5 -2
- package/clinkx-workflows/dist/server.js.map +1 -1
- package/clinkx-workflows/dist/state-schema.d.ts +24 -0
- package/clinkx-workflows/dist/state-schema.js +4 -1
- package/clinkx-workflows/dist/state-schema.js.map +1 -1
- package/clinkx-workflows/dist/state.d.ts +185 -4
- package/clinkx-workflows/dist/state.js +684 -88
- package/clinkx-workflows/dist/state.js.map +1 -1
- package/clinkx-workflows/dist/transport.d.ts +2 -1
- package/clinkx-workflows/dist/transport.js +5 -0
- package/clinkx-workflows/dist/transport.js.map +1 -1
- package/clinkx-workflows/dist/validators/architecture-arena.d.ts +6 -0
- package/clinkx-workflows/dist/validators/architecture-arena.js +16 -0
- package/clinkx-workflows/dist/validators/architecture-arena.js.map +1 -0
- package/clinkx-workflows/dist/validators/index.js +4 -0
- package/clinkx-workflows/dist/validators/index.js.map +1 -1
- package/clinkx-workflows/dist/validators/ping-pong.d.ts +6 -0
- package/clinkx-workflows/dist/validators/ping-pong.js +10 -0
- package/clinkx-workflows/dist/validators/ping-pong.js.map +1 -0
- package/clinkx-workflows/dist/workflow-completion.d.ts +83 -0
- package/clinkx-workflows/dist/workflow-completion.js +250 -0
- package/clinkx-workflows/dist/workflow-completion.js.map +1 -0
- package/clinkx-workflows/dist/workflow-tools.d.ts +53 -6
- package/clinkx-workflows/dist/workflow-tools.js +1123 -65
- package/clinkx-workflows/dist/workflow-tools.js.map +1 -1
- package/clinkx-workflows/dist/workflow-verification-contract.d.ts +4 -4
- package/clinkx-workflows/templates/architecture-arena/candidate.txt +39 -0
- package/clinkx-workflows/templates/architecture-arena/judge.txt +34 -0
- package/clinkx-workflows/templates/ping-pong/implement.txt +14 -0
- package/clinkx-workflows/templates/ping-pong/remediate.txt +14 -0
- package/clinkx-workflows/templates/ping-pong/review.txt +27 -0
- package/clinkx-workflows/workflows/architecture-arena.yaml +127 -0
- package/clinkx-workflows/workflows/ping-pong.yaml +158 -0
- package/dist/allowed-roots.d.ts +1 -1
- package/dist/allowed-roots.js +124 -14
- package/dist/allowed-roots.js.map +1 -1
- package/dist/context-builder/bundle.js +4 -3
- package/dist/context-builder/bundle.js.map +1 -1
- package/dist/context-builder/config.d.ts +1 -0
- package/dist/context-builder/config.js +21 -9
- package/dist/context-builder/config.js.map +1 -1
- package/dist/context-builder/delegate-packet.d.ts +1 -0
- package/dist/context-builder/delegate-packet.js +66 -7
- package/dist/context-builder/delegate-packet.js.map +1 -1
- package/dist/context-builder/delegate-validation.d.ts +12 -3
- package/dist/context-builder/delegate-validation.js +23 -13
- package/dist/context-builder/delegate-validation.js.map +1 -1
- package/dist/context-builder/external-gaps.d.ts +14 -3
- package/dist/context-builder/external-gaps.js +124 -18
- package/dist/context-builder/external-gaps.js.map +1 -1
- package/dist/context-builder/handler.js +108 -191
- package/dist/context-builder/handler.js.map +1 -1
- package/dist/context-builder/mutation-lock.d.ts +4 -0
- package/dist/context-builder/mutation-lock.js +7 -1
- package/dist/context-builder/mutation-lock.js.map +1 -1
- package/dist/context-builder/review-coverage.js +27 -1
- package/dist/context-builder/review-coverage.js.map +1 -1
- package/dist/context-builder/secrets.js +1 -1
- package/dist/context-builder/secrets.js.map +1 -1
- package/dist/context-builder/storage.d.ts +10 -2
- package/dist/context-builder/storage.js +213 -16
- package/dist/context-builder/storage.js.map +1 -1
- package/dist/context-builder/versions.d.ts +10 -4
- package/dist/context-builder/versions.js +10 -4
- package/dist/context-builder/versions.js.map +1 -1
- package/dist/context-builder/workflow-runner.js +33 -24
- package/dist/context-builder/workflow-runner.js.map +1 -1
- package/dist/dashboard-cli.d.ts +8 -0
- package/dist/dashboard-cli.js +155 -86
- package/dist/dashboard-cli.js.map +1 -1
- package/dist/dashboard-companion/client.d.ts +10 -0
- package/dist/dashboard-companion/client.js +43 -1
- package/dist/dashboard-companion/client.js.map +1 -1
- package/dist/dashboard-companion/config.d.ts +19 -1
- package/dist/dashboard-companion/config.js +104 -3
- package/dist/dashboard-companion/config.js.map +1 -1
- package/dist/dashboard-companion/protocol.d.ts +16 -0
- package/dist/dashboard-companion/protocol.js +38 -1
- package/dist/dashboard-companion/protocol.js.map +1 -1
- package/dist/dashboard-companion/workstation-binding.d.ts +69 -0
- package/dist/dashboard-companion/workstation-binding.js +192 -0
- package/dist/dashboard-companion/workstation-binding.js.map +1 -0
- package/dist/dashboard-gateway/admin-cli.d.ts +10 -0
- package/dist/dashboard-gateway/admin-cli.js +266 -0
- package/dist/dashboard-gateway/admin-cli.js.map +1 -0
- package/dist/dashboard-gateway/config.d.ts +50 -0
- package/dist/dashboard-gateway/config.js +235 -1
- package/dist/dashboard-gateway/config.js.map +1 -1
- package/dist/dashboard-gateway/connection-registry.d.ts +100 -0
- package/dist/dashboard-gateway/connection-registry.js +228 -0
- package/dist/dashboard-gateway/connection-registry.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/account-auth.d.ts +78 -0
- package/dist/dashboard-gateway/control-plane/account-auth.js +198 -0
- package/dist/dashboard-gateway/control-plane/account-auth.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/billing.d.ts +264 -0
- package/dist/dashboard-gateway/control-plane/billing.js +787 -0
- package/dist/dashboard-gateway/control-plane/billing.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/contracts.d.ts +1293 -0
- package/dist/dashboard-gateway/control-plane/contracts.js +280 -0
- package/dist/dashboard-gateway/control-plane/contracts.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/cookies.d.ts +13 -0
- package/dist/dashboard-gateway/control-plane/cookies.js +46 -0
- package/dist/dashboard-gateway/control-plane/cookies.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/credentials.d.ts +63 -0
- package/dist/dashboard-gateway/control-plane/credentials.js +66 -0
- package/dist/dashboard-gateway/control-plane/credentials.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/entitlements.d.ts +118 -0
- package/dist/dashboard-gateway/control-plane/entitlements.js +329 -0
- package/dist/dashboard-gateway/control-plane/entitlements.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/errors.d.ts +17 -0
- package/dist/dashboard-gateway/control-plane/errors.js +23 -0
- package/dist/dashboard-gateway/control-plane/errors.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/hosts.d.ts +6 -0
- package/dist/dashboard-gateway/control-plane/hosts.js +16 -0
- package/dist/dashboard-gateway/control-plane/hosts.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/http.d.ts +34 -0
- package/dist/dashboard-gateway/control-plane/http.js +331 -0
- package/dist/dashboard-gateway/control-plane/http.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/schema.d.ts +9 -0
- package/dist/dashboard-gateway/control-plane/schema.js +247 -0
- package/dist/dashboard-gateway/control-plane/schema.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/secrets.d.ts +20 -0
- package/dist/dashboard-gateway/control-plane/secrets.js +39 -0
- package/dist/dashboard-gateway/control-plane/secrets.js.map +1 -0
- package/dist/dashboard-gateway/control-plane/store.d.ts +579 -0
- package/dist/dashboard-gateway/control-plane/store.js +1115 -0
- package/dist/dashboard-gateway/control-plane/store.js.map +1 -0
- package/dist/dashboard-gateway/cookie-boundary.d.ts +60 -0
- package/dist/dashboard-gateway/cookie-boundary.js +205 -0
- package/dist/dashboard-gateway/cookie-boundary.js.map +1 -0
- package/dist/dashboard-gateway/index.js +271 -494
- package/dist/dashboard-gateway/index.js.map +1 -1
- package/dist/dashboard-gateway/main.js +7 -2
- package/dist/dashboard-gateway/main.js.map +1 -1
- package/dist/dashboard-gateway/routing.d.ts +43 -0
- package/dist/dashboard-gateway/routing.js +65 -0
- package/dist/dashboard-gateway/routing.js.map +1 -0
- package/dist/dashboard-gateway/tenant-gateway.d.ts +56 -0
- package/dist/dashboard-gateway/tenant-gateway.js +989 -0
- package/dist/dashboard-gateway/tenant-gateway.js.map +1 -0
- package/dist/dashboard-gateway/tenant-main.d.ts +41 -0
- package/dist/dashboard-gateway/tenant-main.js +303 -0
- package/dist/dashboard-gateway/tenant-main.js.map +1 -0
- package/dist/dashboard-gateway/tunnel-errors.d.ts +16 -0
- package/dist/dashboard-gateway/tunnel-errors.js +22 -0
- package/dist/dashboard-gateway/tunnel-errors.js.map +1 -0
- package/dist/dashboard-gateway/tunnel-http.d.ts +21 -0
- package/dist/dashboard-gateway/tunnel-http.js +175 -0
- package/dist/dashboard-gateway/tunnel-http.js.map +1 -0
- package/dist/handler.d.ts +6 -0
- package/dist/handler.js +17 -1
- package/dist/handler.js.map +1 -1
- package/dist/local-clink-backend.d.ts +2 -1
- package/dist/local-clink-backend.js +28 -4
- package/dist/local-clink-backend.js.map +1 -1
- package/dist/parsers/extract.d.ts +19 -1
- package/dist/parsers/extract.js +68 -3
- package/dist/parsers/extract.js.map +1 -1
- package/dist/pipeline.d.ts +17 -1
- package/dist/pipeline.js +34 -6
- package/dist/pipeline.js.map +1 -1
- package/dist/process-group.d.ts +65 -0
- package/dist/process-group.js +153 -0
- package/dist/process-group.js.map +1 -0
- package/dist/progress-report/schema.d.ts +23 -23
- package/dist/project-verification/files.js +1 -1
- package/dist/project-verification/files.js.map +1 -1
- package/dist/project-verification/process.js +23 -44
- package/dist/project-verification/process.js.map +1 -1
- package/dist/project-verification/service.js +9 -1
- package/dist/project-verification/service.js.map +1 -1
- package/dist/prompt.d.ts +7 -0
- package/dist/prompt.js +18 -1
- package/dist/prompt.js.map +1 -1
- package/dist/recipe-host/git-trust.d.ts +43 -0
- package/dist/recipe-host/git-trust.js +360 -0
- package/dist/recipe-host/git-trust.js.map +1 -0
- package/dist/recipe-host/git.d.ts +42 -0
- package/dist/recipe-host/git.js +207 -0
- package/dist/recipe-host/git.js.map +1 -0
- package/dist/recipe-host/native-recipe-host.d.ts +127 -0
- package/dist/recipe-host/native-recipe-host.js +880 -0
- package/dist/recipe-host/native-recipe-host.js.map +1 -0
- package/dist/recipe-host/seat-cwd.d.ts +16 -0
- package/dist/recipe-host/seat-cwd.js +170 -0
- package/dist/recipe-host/seat-cwd.js.map +1 -0
- package/dist/registry.d.ts +1 -1
- package/dist/registry.js +5 -1
- package/dist/registry.js.map +1 -1
- package/dist/runner.d.ts +43 -1
- package/dist/runner.js +234 -35
- package/dist/runner.js.map +1 -1
- package/dist/server.js +21 -6
- package/dist/server.js.map +1 -1
- package/docs/configuration.md +181 -15
- package/docs/engineering-recipes.md +291 -0
- package/docs/security.md +87 -0
- package/docs/verification/project-checks.md +24 -2
- package/package.json +5 -1
- package/scripts/provider-doctor-core.mjs +21 -5
- package/clinkx-workflows/dist/dashboard-ui/assets/index-BdpmbPps.js +0 -115
- package/clinkx-workflows/dist/dashboard-ui/assets/style-Im5i1iAs.css +0 -1
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
import { MAX_GATEWAY_V2_REQUEST_BODY_BYTES, } from "../dashboard-companion/protocol.js";
|
|
2
|
+
export const MAX_AGENT_FRAME_BYTES = 24 * 1024 * 1024;
|
|
3
|
+
export const MAX_FORWARD_PATH_BYTES = 2_048;
|
|
4
|
+
export const MAX_FORWARD_HEADER_BYTES = 64 * 1024;
|
|
5
|
+
export const MAX_V2_IN_FLIGHT = 8;
|
|
6
|
+
const MAX_V2_SMALL_POST_BYTES = 4 * 1024;
|
|
7
|
+
export const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
|
|
8
|
+
export const DEFAULT_PING_INTERVAL_MS = 10_000;
|
|
9
|
+
export const COMPANION_UNAVAILABLE = "dashboard_companion_unavailable";
|
|
10
|
+
export const PASSKEY_COMPANION_UNAVAILABLE = "dashboard_passkey_companion_unavailable";
|
|
11
|
+
export const OUTCOME_UNKNOWN = "outcome_unknown";
|
|
12
|
+
export function sendText(response, status, body) {
|
|
13
|
+
response.writeHead(status, {
|
|
14
|
+
"cache-control": "no-store",
|
|
15
|
+
"content-type": "text/plain; charset=utf-8",
|
|
16
|
+
});
|
|
17
|
+
response.end(body);
|
|
18
|
+
}
|
|
19
|
+
export function sendJson(response, status, error) {
|
|
20
|
+
const body = `${JSON.stringify({ error })}\n`;
|
|
21
|
+
response.writeHead(status, {
|
|
22
|
+
"cache-control": "no-store",
|
|
23
|
+
"content-type": "application/json; charset=utf-8",
|
|
24
|
+
"content-length": Buffer.byteLength(body),
|
|
25
|
+
});
|
|
26
|
+
response.end(body);
|
|
27
|
+
}
|
|
28
|
+
export function oneHeader(request, name) {
|
|
29
|
+
const values = request.headersDistinct[name];
|
|
30
|
+
if (values === undefined)
|
|
31
|
+
return undefined;
|
|
32
|
+
return values.length === 1 && values[0] !== undefined && values[0] !== ""
|
|
33
|
+
? values[0]
|
|
34
|
+
: null;
|
|
35
|
+
}
|
|
36
|
+
const V2_PROGRESS_REPORT_STATUS_OVERRIDE_PATH = /^\/api\/progress-reports\/[A-Za-z0-9][A-Za-z0-9_-]{0,63}\/status-override$/;
|
|
37
|
+
export function v2PostBodyLimit(path) {
|
|
38
|
+
return path === "/api/auth/register/options"
|
|
39
|
+
|| path === "/api/auth/login/options"
|
|
40
|
+
|| path === "/api/auth/logout"
|
|
41
|
+
|| V2_PROGRESS_REPORT_STATUS_OVERRIDE_PATH.test(path)
|
|
42
|
+
? MAX_V2_SMALL_POST_BYTES
|
|
43
|
+
: MAX_GATEWAY_V2_REQUEST_BODY_BYTES;
|
|
44
|
+
}
|
|
45
|
+
export function v2RequestHeaders(request, method, path, cookie) {
|
|
46
|
+
const host = oneHeader(request, "host");
|
|
47
|
+
const origin = oneHeader(request, "origin");
|
|
48
|
+
const contentType = oneHeader(request, "content-type");
|
|
49
|
+
const enrollmentCode = oneHeader(request, "x-enrollment-code");
|
|
50
|
+
if (host == null || origin === null || contentType === null || enrollmentCode === null) {
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
if (method === "POST") {
|
|
54
|
+
if (contentType === undefined || contentType.toLowerCase() !== "application/json")
|
|
55
|
+
return undefined;
|
|
56
|
+
if (enrollmentCode !== undefined
|
|
57
|
+
&& path !== "/api/auth/register/options"
|
|
58
|
+
&& path !== "/api/auth/register/verify")
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
else if (contentType !== undefined || enrollmentCode !== undefined) {
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
host,
|
|
66
|
+
...(origin === undefined ? {} : { origin }),
|
|
67
|
+
...(cookie === undefined ? {} : { cookie }),
|
|
68
|
+
...(contentType === undefined ? {} : { contentType }),
|
|
69
|
+
...(enrollmentCode === undefined ? {} : { enrollmentCode }),
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
export async function readV2RequestBody(request, maximumBytes, signal) {
|
|
73
|
+
return new Promise((resolve, reject) => {
|
|
74
|
+
const chunks = [];
|
|
75
|
+
let total = 0;
|
|
76
|
+
let settled = false;
|
|
77
|
+
const cleanup = () => {
|
|
78
|
+
request.off("data", onData);
|
|
79
|
+
request.off("end", onEnd);
|
|
80
|
+
request.off("error", onError);
|
|
81
|
+
request.off("aborted", onAborted);
|
|
82
|
+
signal.removeEventListener("abort", onAbort);
|
|
83
|
+
};
|
|
84
|
+
const finish = (body) => {
|
|
85
|
+
if (settled)
|
|
86
|
+
return;
|
|
87
|
+
settled = true;
|
|
88
|
+
cleanup();
|
|
89
|
+
resolve(body);
|
|
90
|
+
};
|
|
91
|
+
const onData = (chunk) => {
|
|
92
|
+
const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
|
|
93
|
+
total += bytes.byteLength;
|
|
94
|
+
if (total > maximumBytes) {
|
|
95
|
+
request.resume();
|
|
96
|
+
finish(undefined);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
chunks.push(bytes);
|
|
100
|
+
};
|
|
101
|
+
const onEnd = () => finish(Buffer.concat(chunks));
|
|
102
|
+
const onError = (error) => {
|
|
103
|
+
if (settled)
|
|
104
|
+
return;
|
|
105
|
+
settled = true;
|
|
106
|
+
cleanup();
|
|
107
|
+
reject(error);
|
|
108
|
+
};
|
|
109
|
+
const onAborted = () => finish(undefined);
|
|
110
|
+
const onAbort = () => {
|
|
111
|
+
request.resume();
|
|
112
|
+
finish(undefined);
|
|
113
|
+
};
|
|
114
|
+
if (signal.aborted) {
|
|
115
|
+
onAbort();
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
request.on("data", onData);
|
|
119
|
+
request.once("end", onEnd);
|
|
120
|
+
request.once("error", onError);
|
|
121
|
+
request.once("aborted", onAborted);
|
|
122
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
export function isAllowedApiTarget(path) {
|
|
126
|
+
if (Buffer.byteLength(path) > MAX_FORWARD_PATH_BYTES)
|
|
127
|
+
return false;
|
|
128
|
+
const rawPathname = path.split("?", 1)[0] ?? "";
|
|
129
|
+
if (/%(?:00|2e|2f|5c)/i.test(rawPathname) || rawPathname.includes("\\"))
|
|
130
|
+
return false;
|
|
131
|
+
try {
|
|
132
|
+
const parsed = new URL(path, "http://dashboard-gateway.invalid");
|
|
133
|
+
return parsed.origin === "http://dashboard-gateway.invalid"
|
|
134
|
+
&& `${parsed.pathname}${parsed.search}` === path
|
|
135
|
+
&& (parsed.pathname === "/api" || parsed.pathname.startsWith("/api/"));
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
export function rejectUpgrade(socket, status, reason) {
|
|
142
|
+
const body = `${reason}\n`;
|
|
143
|
+
socket.end(`HTTP/1.1 ${status} ${reason}\r\n` +
|
|
144
|
+
"Connection: close\r\n" +
|
|
145
|
+
"Cache-Control: no-store\r\n" +
|
|
146
|
+
"Content-Type: text/plain; charset=utf-8\r\n" +
|
|
147
|
+
`Content-Length: ${Buffer.byteLength(body)}\r\n\r\n${body}`);
|
|
148
|
+
}
|
|
149
|
+
const TUNNELED_VARY = ["Cookie", "X-Clinkx-Workstation"];
|
|
150
|
+
/** Tunneled bodies depend on the session cookie and the selected workstation, so no shared cache may key them on the URL alone. */
|
|
151
|
+
function tunneledVary(companionVary) {
|
|
152
|
+
const tokens = (companionVary ?? "").split(",").map((token) => token.trim()).filter((token) => token !== "");
|
|
153
|
+
if (tokens.includes("*"))
|
|
154
|
+
return "*";
|
|
155
|
+
const present = new Set(tokens.map((token) => token.toLowerCase()));
|
|
156
|
+
for (const name of TUNNELED_VARY) {
|
|
157
|
+
if (!present.has(name.toLowerCase()))
|
|
158
|
+
tokens.push(name);
|
|
159
|
+
}
|
|
160
|
+
return tokens.join(", ");
|
|
161
|
+
}
|
|
162
|
+
export function v2ResponseHeaders(headers, setCookies) {
|
|
163
|
+
return {
|
|
164
|
+
...(headers.allow === undefined ? {} : { allow: headers.allow }),
|
|
165
|
+
"cache-control": "no-store",
|
|
166
|
+
...(headers.contentLength === undefined ? {} : { "content-length": headers.contentLength }),
|
|
167
|
+
...(headers.contentType === undefined ? {} : { "content-type": headers.contentType }),
|
|
168
|
+
...(headers.etag === undefined ? {} : { etag: headers.etag }),
|
|
169
|
+
...(headers.retryAfter === undefined ? {} : { "retry-after": headers.retryAfter }),
|
|
170
|
+
...(setCookies === undefined ? {} : { "set-cookie": [...setCookies] }),
|
|
171
|
+
...(headers.validatorSchemaId === undefined ? {} : { "x-clinkx-validator-schema-id": headers.validatorSchemaId }),
|
|
172
|
+
vary: tunneledVary(headers.vary),
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=tunnel-http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnel-http.js","sourceRoot":"","sources":["../../src/dashboard-gateway/tunnel-http.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,iCAAiC,GAElC,MAAM,oCAAoC,CAAC;AAE5C,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC;AAC5C,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAC;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAClC,MAAM,uBAAuB,GAAG,CAAC,GAAG,IAAI,CAAC;AACzC,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AACjD,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AACvE,MAAM,CAAC,MAAM,6BAA6B,GAAG,yCAAyC,CAAC;AACvF,MAAM,CAAC,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAEjD,MAAM,UAAU,QAAQ,CAAC,QAAwB,EAAE,MAAc,EAAE,IAAY;IAC7E,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE;QACzB,eAAe,EAAE,UAAU;QAC3B,cAAc,EAAE,2BAA2B;KAC5C,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAAwB,EAAE,MAAc,EAAE,KAAa;IAC9E,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC;IAC9C,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE;QACzB,eAAe,EAAE,UAAU;QAC3B,cAAc,EAAE,iCAAiC;QACjD,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;KAC1C,CAAC,CAAC;IACH,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,OAAwB,EACxB,IAAY;IAEZ,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE;QACvE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,MAAM,uCAAuC,GAC3C,4EAA4E,CAAC;AAE/E,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,KAAK,4BAA4B;WACvC,IAAI,KAAK,yBAAyB;WAClC,IAAI,KAAK,kBAAkB;WAC3B,uCAAuC,CAAC,IAAI,CAAC,IAAI,CAAC;QACrD,CAAC,CAAC,uBAAuB;QACzB,CAAC,CAAC,iCAAiC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAwB,EACxB,MAA+B,EAC/B,IAAY,EACZ,MAA0B;IAE1B,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAC/D,IAAI,IAAI,IAAI,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,WAAW,KAAK,IAAI,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QACvF,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,kBAAkB;YAAE,OAAO,SAAS,CAAC;QACpG,IACE,cAAc,KAAK,SAAS;eACzB,IAAI,KAAK,4BAA4B;eACrC,IAAI,KAAK,2BAA2B;YACvC,OAAO,SAAS,CAAC;IACrB,CAAC;SAAM,IAAI,WAAW,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,IAAI;QACJ,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3C,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3C,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;QACrD,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAwB,EACxB,YAAoB,EACpB,MAAmB;IAEnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YAClC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAQ,EAAE;YAChD,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,KAAsB,EAAQ,EAAE;YAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClE,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC;YAC1B,IAAI,KAAK,GAAG,YAAY,EAAE,CAAC;gBACzB,OAAO,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,CAAC,SAAS,CAAC,CAAC;gBAClB,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,GAAS,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,SAAS,CAAC,CAAC;QACpB,CAAC,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/B,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACnC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB;QAAE,OAAO,KAAK,CAAC;IACnE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChD,IAAI,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACtF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,MAAM,KAAK,kCAAkC;eACtD,GAAG,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI;eAC7C,CAAC,MAAM,CAAC,QAAQ,KAAK,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,MAAc,EAAE,MAAc;IAC1E,MAAM,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC;IAC3B,MAAM,CAAC,GAAG,CACR,YAAY,MAAM,IAAI,MAAM,MAAM;QAChC,uBAAuB;QACvB,6BAA6B;QAC7B,6CAA6C;QAC7C,mBAAmB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAC9D,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,sBAAsB,CAAU,CAAC;AAElE,mIAAmI;AACnI,SAAS,YAAY,CAAC,aAAiC;IACrD,MAAM,MAAM,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;IAC7G,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAqC,EACrC,UAAyC;IAEzC,OAAO;QACL,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;QAChE,eAAe,EAAE,UAAU;QAC3B,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3F,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;QACrF,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC7D,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;QAClF,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC;QACtE,GAAG,CAAC,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAG,CAAC,CAAC,CAAC,EAAE,8BAA8B,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAClH,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACjC,CAAC;AACJ,CAAC"}
|
package/dist/handler.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type PipelineRecipeOptions } from "./pipeline.js";
|
|
1
2
|
import { AdapterRegistry } from "./registry.js";
|
|
2
3
|
import type { Server } from "@modelcontextprotocol/sdk/server/index.js";
|
|
3
4
|
import type { ActivityJournal } from "./activity-journal.js";
|
|
@@ -18,6 +19,11 @@ export declare function handleClink(rawInput: unknown, options?: {
|
|
|
18
19
|
registry?: AdapterRegistry;
|
|
19
20
|
activityJournal?: ActivityJournal;
|
|
20
21
|
sessionLogOwner?: SessionLogOwnerV1;
|
|
22
|
+
/**
|
|
23
|
+
* Internal recipe call (D-R2/D-R3); only LocalClinkBackend sets this. A
|
|
24
|
+
* `cwd` is validated here, before the semaphore or any spawn.
|
|
25
|
+
*/
|
|
26
|
+
recipe?: PipelineRecipeOptions;
|
|
21
27
|
}): Promise<{
|
|
22
28
|
content: Array<{
|
|
23
29
|
type: "text";
|
package/dist/handler.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ClinkInputSchema } from "./schema.js";
|
|
2
2
|
import { InvalidParamsError } from "./errors.js";
|
|
3
3
|
import { executePipeline } from "./pipeline.js";
|
|
4
|
+
import { validateRecipeSeatCwd } from "./recipe-host/seat-cwd.js";
|
|
4
5
|
import { AdapterRegistry } from "./registry.js";
|
|
5
6
|
import { logger } from "./logger.js";
|
|
6
7
|
function formatZodError(err) {
|
|
@@ -34,11 +35,25 @@ export async function handleClink(rawInput, options) {
|
|
|
34
35
|
}
|
|
35
36
|
const input = parseResult.data;
|
|
36
37
|
logger.debug({ cli_name: input.cli_name, role: input.role }, "clink invoked");
|
|
38
|
+
let recipe;
|
|
39
|
+
if (options?.recipe !== undefined) {
|
|
40
|
+
const cwd = options.recipe.cwd === undefined
|
|
41
|
+
? undefined
|
|
42
|
+
: await validateRecipeSeatCwd(options.recipe.cwd);
|
|
43
|
+
recipe = {
|
|
44
|
+
exitConfirm: true,
|
|
45
|
+
...(cwd !== undefined ? { cwd } : {}),
|
|
46
|
+
...(options.recipe.onProcessGroupExit !== undefined
|
|
47
|
+
? { onProcessGroupExit: options.recipe.onProcessGroupExit }
|
|
48
|
+
: {}),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
37
51
|
const effectiveRegistry = options?.registry ?? getRegistry();
|
|
38
52
|
const pipelineOptions = options?.signal != null ||
|
|
39
53
|
options?.progress != null ||
|
|
40
54
|
options?.activityJournal != null ||
|
|
41
|
-
options?.sessionLogOwner != null
|
|
55
|
+
options?.sessionLogOwner != null ||
|
|
56
|
+
recipe !== undefined
|
|
42
57
|
? {
|
|
43
58
|
...(options?.signal != null ? { signal: options.signal } : {}),
|
|
44
59
|
...(options?.progress != null ? { progress: options.progress } : {}),
|
|
@@ -48,6 +63,7 @@ export async function handleClink(rawInput, options) {
|
|
|
48
63
|
...(options?.sessionLogOwner != null
|
|
49
64
|
? { sessionLogOwner: options.sessionLogOwner }
|
|
50
65
|
: {}),
|
|
66
|
+
...(recipe !== undefined ? { recipe } : {}),
|
|
51
67
|
}
|
|
52
68
|
: undefined;
|
|
53
69
|
const result = await executePipeline(input, effectiveRegistry, pipelineOptions);
|
package/dist/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* in pipeline.ts handles concurrency; the engine's DispatchQueue provides
|
|
7
7
|
* the outer rate limit.
|
|
8
8
|
*/
|
|
9
|
-
import type { ClinkBackend, ToolCallResult } from "../clinkx-workflows/dist/backend.js";
|
|
9
|
+
import type { ClinkBackend, RecipeCallOptions, ToolCallResult } from "../clinkx-workflows/dist/backend.js";
|
|
10
10
|
import type { SessionLogOwnerV1 } from "../clinkx-workflows/dist/dashboard/session-log-contract.js";
|
|
11
11
|
import type { AdapterRegistry } from "./registry.js";
|
|
12
12
|
export interface LocalClinkBackendOptions {
|
|
@@ -28,6 +28,7 @@ export declare class LocalClinkBackend implements ClinkBackend {
|
|
|
28
28
|
signal?: AbortSignal;
|
|
29
29
|
timeoutMs?: number;
|
|
30
30
|
sessionLogOwner?: SessionLogOwnerV1;
|
|
31
|
+
recipe?: RecipeCallOptions | undefined;
|
|
31
32
|
}): Promise<ToolCallResult>;
|
|
32
33
|
terminate(): Promise<void>;
|
|
33
34
|
}
|
|
@@ -38,6 +38,13 @@ export class LocalClinkBackend {
|
|
|
38
38
|
if (this.terminated) {
|
|
39
39
|
throw new Error("LocalClinkBackend: already terminated");
|
|
40
40
|
}
|
|
41
|
+
// Recipe calls (D-R2/D-R3): every returned result carries the runner's
|
|
42
|
+
// process-group exit; unobserved (no child settled) reports unconfirmed.
|
|
43
|
+
const recipe = options?.recipe;
|
|
44
|
+
let observedExit;
|
|
45
|
+
const withExit = (result) => recipe === undefined
|
|
46
|
+
? result
|
|
47
|
+
: { ...result, processGroupExit: { exited: observedExit?.exited === true } };
|
|
41
48
|
// Compose timeout with existing signal for Layer 2 deadline enforcement.
|
|
42
49
|
// handleClink() only accepts AbortSignal, not a separate timeoutMs param,
|
|
43
50
|
// so we fold the deadline into a composite signal via AbortSignal.any().
|
|
@@ -62,8 +69,19 @@ export class LocalClinkBackend {
|
|
|
62
69
|
...(options?.sessionLogOwner != null
|
|
63
70
|
? { sessionLogOwner: options.sessionLogOwner }
|
|
64
71
|
: {}),
|
|
72
|
+
...(recipe !== undefined
|
|
73
|
+
? {
|
|
74
|
+
recipe: {
|
|
75
|
+
exitConfirm: true,
|
|
76
|
+
...(recipe.cwd !== undefined ? { cwd: recipe.cwd } : {}),
|
|
77
|
+
onProcessGroupExit: (exit) => {
|
|
78
|
+
observedExit = { exited: exit.exited };
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
}
|
|
82
|
+
: {}),
|
|
65
83
|
});
|
|
66
|
-
return result;
|
|
84
|
+
return withExit(result);
|
|
67
85
|
}
|
|
68
86
|
catch (error) {
|
|
69
87
|
// Translate root error types to workflow-engine-expected types.
|
|
@@ -81,15 +99,21 @@ export class LocalClinkBackend {
|
|
|
81
99
|
// Previously this threw a plain Error, which classifyFailureClass() in
|
|
82
100
|
// engine.ts treated as permanent — wrong for timeouts.
|
|
83
101
|
const timeoutText = `Per-call timeout exceeded (${String(options?.timeoutMs ?? "unknown")}ms)`;
|
|
84
|
-
return {
|
|
102
|
+
return withExit({
|
|
85
103
|
content: [
|
|
86
104
|
{ type: "text", text: timeoutText },
|
|
87
105
|
{ type: "text", text: JSON.stringify({ _debug: { termination_reason: "wall" } }) },
|
|
88
106
|
],
|
|
89
107
|
isError: true,
|
|
90
|
-
};
|
|
108
|
+
});
|
|
91
109
|
}
|
|
92
|
-
|
|
110
|
+
// A recipe call keeps the runner's exit result across a user cancel
|
|
111
|
+
// so the runtime can tell whether the seat's effects stopped.
|
|
112
|
+
throw recipe === undefined
|
|
113
|
+
? new WorkflowCancellationError()
|
|
114
|
+
: Object.assign(new WorkflowCancellationError(), {
|
|
115
|
+
processGroupExit: { exited: observedExit?.exited === true },
|
|
116
|
+
});
|
|
93
117
|
}
|
|
94
118
|
if (error instanceof InvalidParamsError) {
|
|
95
119
|
// clink-client.ts checks (err as any).code === -32602
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-clink-backend.js","sourceRoot":"","sources":["../src/local-clink-backend.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"local-clink-backend.js","sourceRoot":"","sources":["../src/local-clink-backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,28 @@ export interface ExtractInput extends ParseInput {
|
|
|
7
7
|
* When true, non-zero exits are tolerated if we can parse a valid payload.
|
|
8
8
|
*/
|
|
9
9
|
tolerateNonzeroExitForParse?: boolean;
|
|
10
|
+
/** The caller enforces a single JSON value (`isJsonEnforced`). */
|
|
11
|
+
enforceJson?: boolean;
|
|
12
|
+
/**
|
|
13
|
+
* Capture-layer stdout truncation. A truncated stdout is never a fallback
|
|
14
|
+
* source for a rejected result file; absent means unknown and is treated as
|
|
15
|
+
* truncated.
|
|
16
|
+
*/
|
|
17
|
+
stdoutTruncated?: boolean;
|
|
10
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* Why a present result file was rejected for a JSON-enforced call:
|
|
21
|
+
* `invalid_json` holds no JSON document, `salvage_only` holds one JSON block
|
|
22
|
+
* wrapped in other text.
|
|
23
|
+
*/
|
|
24
|
+
export type ResultContractRejection = "invalid_json" | "salvage_only";
|
|
11
25
|
export interface ExtractOutput {
|
|
12
26
|
result: ParseResult;
|
|
13
27
|
isError: boolean;
|
|
14
28
|
exitCode: number | null;
|
|
15
29
|
resultContractStatus?: ResultContractStatus;
|
|
30
|
+
/** Set only when a result file was replaced by the parser result. */
|
|
31
|
+
resultContractRejected?: ResultContractRejection;
|
|
16
32
|
}
|
|
17
33
|
export declare function parserByName(name: string): Parser | null;
|
|
18
34
|
/**
|
|
@@ -27,7 +43,9 @@ export declare function parseWithDeclaredParser(input: ParseInput): ParseResult
|
|
|
27
43
|
* Deterministically extract the final user-facing content from captured buffers.
|
|
28
44
|
*
|
|
29
45
|
* Order:
|
|
30
|
-
* 1) result contract file (if enabled + present)
|
|
46
|
+
* 1) result contract file (if enabled + present); for a JSON-enforced call a
|
|
47
|
+
* file that is not one complete JSON document yields to the adapter
|
|
48
|
+
* parser's result when that is one, from untruncated stdout
|
|
31
49
|
* 2) adapter-specific parser
|
|
32
50
|
* 3) generic json_extract
|
|
33
51
|
* 4) <SUMMARY> extraction
|
package/dist/parsers/extract.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { joinBuffers, preferredText } from "./utils.js";
|
|
1
|
+
import { findAllJsonBlocks, joinBuffers, preferredText } from "./utils.js";
|
|
2
2
|
import { textParser } from "./text.js";
|
|
3
3
|
import { jsonExtractParser } from "./json-extract.js";
|
|
4
4
|
import { codexJsonlParser } from "./codex-jsonl.js";
|
|
@@ -57,11 +57,49 @@ function rawStderrFallback(input) {
|
|
|
57
57
|
function hasValidPayload(result) {
|
|
58
58
|
return result.content.trim().length > 0;
|
|
59
59
|
}
|
|
60
|
+
/** Null when `text` is exactly one complete JSON document (surrounding whitespace allowed). */
|
|
61
|
+
function singleJsonDocumentDefect(text) {
|
|
62
|
+
const trimmed = text.trim();
|
|
63
|
+
if (trimmed.length > 0) {
|
|
64
|
+
try {
|
|
65
|
+
JSON.parse(trimmed);
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
// Fall through to classify the defect.
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return findAllJsonBlocks(text, { maxBlocks: 2 }).length === 1 ? "salvage_only" : "invalid_json";
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* For a JSON-enforced call whose result file is not one complete JSON
|
|
76
|
+
* document, return the declared parser's result when it is one, from an
|
|
77
|
+
* untruncated stdout. Otherwise null, and the result file stands.
|
|
78
|
+
*/
|
|
79
|
+
function parserJsonFallback(input, fileText) {
|
|
80
|
+
if (input.enforceJson !== true)
|
|
81
|
+
return null;
|
|
82
|
+
const rejection = singleJsonDocumentDefect(fileText);
|
|
83
|
+
if (rejection == null)
|
|
84
|
+
return null;
|
|
85
|
+
if (input.stdoutTruncated !== false)
|
|
86
|
+
return null;
|
|
87
|
+
const parsed = parserByName(input.adapter.parser)?.parse(input) ?? null;
|
|
88
|
+
if (parsed == null)
|
|
89
|
+
return null;
|
|
90
|
+
if (parsed.metadata?.["parse_status"] === "invalid")
|
|
91
|
+
return null;
|
|
92
|
+
if (singleJsonDocumentDefect(parsed.content) != null)
|
|
93
|
+
return null;
|
|
94
|
+
return { result: parsed, rejection };
|
|
95
|
+
}
|
|
60
96
|
/**
|
|
61
97
|
* Deterministically extract the final user-facing content from captured buffers.
|
|
62
98
|
*
|
|
63
99
|
* Order:
|
|
64
|
-
* 1) result contract file (if enabled + present)
|
|
100
|
+
* 1) result contract file (if enabled + present); for a JSON-enforced call a
|
|
101
|
+
* file that is not one complete JSON document yields to the adapter
|
|
102
|
+
* parser's result when that is one, from untruncated stdout
|
|
65
103
|
* 2) adapter-specific parser
|
|
66
104
|
* 3) generic json_extract
|
|
67
105
|
* 4) <SUMMARY> extraction
|
|
@@ -81,6 +119,27 @@ export async function extractResult(input) {
|
|
|
81
119
|
},
|
|
82
120
|
}
|
|
83
121
|
: null;
|
|
122
|
+
let resultContractRejected;
|
|
123
|
+
if (contractText != null) {
|
|
124
|
+
const fallback = parserJsonFallback(input, contractText);
|
|
125
|
+
if (fallback != null) {
|
|
126
|
+
resultContractRejected = fallback.rejection;
|
|
127
|
+
logger.warn({
|
|
128
|
+
adapter: input.adapter.name,
|
|
129
|
+
parser: input.adapter.parser,
|
|
130
|
+
filename: input.adapter.result_contract?.filename,
|
|
131
|
+
reason: fallback.rejection,
|
|
132
|
+
}, "result contract file is not one complete JSON document; using the parser's complete JSON result");
|
|
133
|
+
result = {
|
|
134
|
+
...fallback.result,
|
|
135
|
+
metadata: {
|
|
136
|
+
...(fallback.result.metadata ?? {}),
|
|
137
|
+
result_contract_rejected: fallback.rejection,
|
|
138
|
+
result_contract_status: contractOutcome.status,
|
|
139
|
+
},
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
}
|
|
84
143
|
// When the result contract is enabled but missing, hard fail on exit-0
|
|
85
144
|
// unless stdout carries a viable fallback payload.
|
|
86
145
|
if (result == null &&
|
|
@@ -176,6 +235,12 @@ export async function extractResult(input) {
|
|
|
176
235
|
: tolerate && hasValidPayload(effectiveResult)
|
|
177
236
|
? false
|
|
178
237
|
: true;
|
|
179
|
-
return {
|
|
238
|
+
return {
|
|
239
|
+
result: effectiveResult,
|
|
240
|
+
isError,
|
|
241
|
+
exitCode,
|
|
242
|
+
resultContractStatus: contractOutcome.status,
|
|
243
|
+
...(resultContractRejected !== undefined ? { resultContractRejected } : {}),
|
|
244
|
+
};
|
|
180
245
|
}
|
|
181
246
|
//# sourceMappingURL=extract.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../src/parsers/extract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../src/parsers/extract.ts"],"names":[],"mappings":"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"}
|
package/dist/pipeline.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ClinkInput } from "./schema.js";
|
|
2
2
|
import type { AdapterRegistry } from "./registry.js";
|
|
3
|
-
import { type RunResult } from "./runner.js";
|
|
3
|
+
import { type ProcessGroupExitResult, type RunResult } from "./runner.js";
|
|
4
4
|
import type { SessionLogOwnerV1 } from "../clinkx-workflows/dist/dashboard/session-log-contract.js";
|
|
5
5
|
import type { ObservedInvocationV1 } from "../clinkx-workflows/dist/dashboard/invocation-contract.js";
|
|
6
6
|
import type { Server } from "@modelcontextprotocol/sdk/server/index.js";
|
|
@@ -77,6 +77,21 @@ export interface PipelineJsonFidelityMetadata {
|
|
|
77
77
|
/** Primary semantic failure reason (e.g. "invalid_json_output"), if any. */
|
|
78
78
|
readonly semanticFailureReason: string | null;
|
|
79
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Internal recipe-call options (D-R2, D-R3). Never reachable from the public
|
|
82
|
+
* `clink` schema; only in-process callers (LocalClinkBackend) set them.
|
|
83
|
+
*/
|
|
84
|
+
export interface PipelineRecipeOptions {
|
|
85
|
+
/** Seat cwd, already validated by `validateRecipeSeatCwd`. */
|
|
86
|
+
readonly cwd?: string | undefined;
|
|
87
|
+
/** Recipe calls always confirm process-group exit. */
|
|
88
|
+
readonly exitConfirm: true;
|
|
89
|
+
/**
|
|
90
|
+
* Receives the runner's `processGroupExit` as soon as the subprocess
|
|
91
|
+
* settles, including when the pipeline later throws (e.g. cancellation).
|
|
92
|
+
*/
|
|
93
|
+
readonly onProcessGroupExit?: ((result: ProcessGroupExitResult) => void) | undefined;
|
|
94
|
+
}
|
|
80
95
|
export declare function executePipeline(input: ClinkInput, registry: AdapterRegistry, options?: {
|
|
81
96
|
signal?: AbortSignal;
|
|
82
97
|
progress?: {
|
|
@@ -89,6 +104,7 @@ export declare function executePipeline(input: ClinkInput, registry: AdapterRegi
|
|
|
89
104
|
minIdleStartupSeconds?: number;
|
|
90
105
|
activityJournal?: ActivityJournal;
|
|
91
106
|
sessionLogOwner?: SessionLogOwnerV1;
|
|
107
|
+
recipe?: PipelineRecipeOptions;
|
|
92
108
|
}): Promise<PipelineResult>;
|
|
93
109
|
/**
|
|
94
110
|
* Limit output to maxChars with JSON-aware truncation.
|