@structured-world/gitlab-mcp 13.3.0 → 13.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -5
- package/README.md.in +3 -2
- package/dist/src/configuration/call-scope.d.ts +3 -0
- package/dist/src/configuration/call-scope.js +27 -0
- package/dist/src/configuration/call-scope.js.map +1 -0
- package/dist/src/configuration/operator-projects.js +1 -0
- package/dist/src/configuration/operator-projects.js.map +1 -1
- package/dist/src/configuration/policy.d.ts +1 -0
- package/dist/src/configuration/policy.js.map +1 -1
- package/dist/src/entities/pipelines/job-log-sections.d.ts +36 -0
- package/dist/src/entities/pipelines/job-log-sections.js +79 -0
- package/dist/src/entities/pipelines/job-log-sections.js.map +1 -0
- package/dist/src/entities/pipelines/line-grep-worker.d.ts +18 -0
- package/dist/src/entities/pipelines/line-grep-worker.js +296 -0
- package/dist/src/entities/pipelines/line-grep-worker.js.map +1 -0
- package/dist/src/entities/pipelines/line-grep.d.ts +165 -0
- package/dist/src/entities/pipelines/line-grep.js +785 -0
- package/dist/src/entities/pipelines/line-grep.js.map +1 -0
- package/dist/src/entities/pipelines/log-sections.d.ts +57 -0
- package/dist/src/entities/pipelines/log-sections.js +156 -0
- package/dist/src/entities/pipelines/log-sections.js.map +1 -0
- package/dist/src/entities/pipelines/pipeline-grep.d.ts +49 -0
- package/dist/src/entities/pipelines/pipeline-grep.js +327 -0
- package/dist/src/entities/pipelines/pipeline-grep.js.map +1 -0
- package/dist/src/entities/pipelines/registry.js +31 -15
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +55 -0
- package/dist/src/entities/pipelines/schema-readonly.js +152 -5
- package/dist/src/entities/pipelines/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/section-markers.d.ts +89 -0
- package/dist/src/entities/pipelines/section-markers.js +491 -0
- package/dist/src/entities/pipelines/section-markers.js.map +1 -0
- package/dist/src/entities/pipelines/trace-open.d.ts +1 -0
- package/dist/src/entities/pipelines/trace-open.js +23 -0
- package/dist/src/entities/pipelines/trace-open.js.map +1 -0
- package/dist/src/entities/pipelines/trace.d.ts +6 -1
- package/dist/src/entities/pipelines/trace.js +14 -11
- package/dist/src/entities/pipelines/trace.js.map +1 -1
- package/dist/src/handlers.js +3 -1
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/server.js +7 -0
- package/dist/src/server.js.map +1 -1
- package/dist/src/utils/re2-compile.d.ts +4 -0
- package/dist/src/utils/re2-compile.js +58 -0
- package/dist/src/utils/re2-compile.js.map +1 -0
- package/dist/src/utils/re2-pattern.d.ts +7 -0
- package/dist/src/utils/re2-pattern.js +16 -0
- package/dist/src/utils/re2-pattern.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +16 -16
- package/skills/gitlab-ci/SKILL.md +2 -2
package/README.md
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
[](https://www.npmjs.com/package/@structured-world/gitlab-mcp) [](https://www.npmjs.com/package/@structured-world/gitlab-mcp) [](https://github.com/structured-world/gitlab-mcp/blob/HEAD/LICENSE) [](https://github.com/structured-world/gitlab-mcp/actions) [](https://codecov.io/gh/structured-world/gitlab-mcp) [](https://gitlab-mcp.sw.foundation/coverage/)
|
|
4
4
|
|
|
5
|
-
Advanced GitLab MCP server: 66 tools across 27 registry groups, including 60 CQRS tools with
|
|
5
|
+
Advanced GitLab MCP server: 66 tools across 27 registry groups, including 60 CQRS tools with 244 typed actions and 6 setup helpers. The tool catalog and parameters are filtered to each instance's GitLab version, tier, and token scopes, so the agent sees only what the connected instance actually supports.
|
|
6
6
|
|
|
7
|
-
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-13.
|
|
7
|
+
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-13.4.0.mcpb)
|
|
8
8
|
[](https://gitlab-mcp.sw.foundation/guide/installation/codex#install-from-a-release)
|
|
9
9
|
[](vscode:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
10
10
|
[](vscode-insiders:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
@@ -63,8 +63,9 @@ HTTP MCP server. The local plugin requires Node.js 24+; credentials are entered
|
|
|
63
63
|
its private panel. See the installation guide for marketplace setup and authentication.
|
|
64
64
|
|
|
65
65
|
The [shared sw.foundation marketplace](https://repo.sw.foundation/plugins/) lists
|
|
66
|
-
verified releases. Add it once with
|
|
67
|
-
|
|
66
|
+
verified releases, including GitLab MCP. Add it once with
|
|
67
|
+
`codex plugin marketplace add structured-world/repo --sparse .agents/plugins`, then
|
|
68
|
+
install GitLab MCP from that catalog in the Codex Plugins Directory.
|
|
68
69
|
|
|
69
70
|
Download the ready-made [Codex marketplace ZIP](https://github.com/structured-world/gitlab-mcp/releases/latest/download/gitlab-mcp-codex.zip)
|
|
70
71
|
and its [SHA-256 checksum](https://github.com/structured-world/gitlab-mcp/releases/latest/download/gitlab-mcp-codex.zip.sha256)
|
|
@@ -101,7 +102,7 @@ for all setup guides.
|
|
|
101
102
|
|
|
102
103
|
GitLab exposes hundreds of API operations. Giving each its own MCP tool floods an
|
|
103
104
|
agent's context; a thin API wrapper pushes that complexity back onto the agent. This
|
|
104
|
-
server takes a third path: 60 CQRS tools expose
|
|
105
|
+
server takes a third path: 60 CQRS tools expose 244 typed
|
|
105
106
|
actions, with 6 additional helpers for account, connection and settings work.
|
|
106
107
|
The complete catalog contains 66 tools across 27 registry groups.
|
|
107
108
|
This total includes core and account/context tools. Settings expose a different
|
package/README.md.in
CHANGED
|
@@ -63,8 +63,9 @@ HTTP MCP server. The local plugin requires Node.js 24+; credentials are entered
|
|
|
63
63
|
its private panel. See the installation guide for marketplace setup and authentication.
|
|
64
64
|
|
|
65
65
|
The [shared sw.foundation marketplace](https://repo.sw.foundation/plugins/) lists
|
|
66
|
-
verified releases. Add it once with
|
|
67
|
-
|
|
66
|
+
verified releases, including GitLab MCP. Add it once with
|
|
67
|
+
`codex plugin marketplace add structured-world/repo --sparse .agents/plugins`, then
|
|
68
|
+
install GitLab MCP from that catalog in the Codex Plugins Directory.
|
|
68
69
|
|
|
69
70
|
Download the ready-made [Codex marketplace ZIP](https://github.com/structured-world/gitlab-mcp/releases/latest/download/gitlab-mcp-codex.zip)
|
|
70
71
|
and its [SHA-256 checksum](https://github.com/structured-world/gitlab-mcp/releases/latest/download/gitlab-mcp-codex.zip.sha256)
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runInCallScope = runInCallScope;
|
|
4
|
+
exports.projectInCallScope = projectInCallScope;
|
|
5
|
+
const node_async_hooks_1 = require("node:async_hooks");
|
|
6
|
+
const config_1 = require("../config");
|
|
7
|
+
const api_path_1 = require("../utils/api-path");
|
|
8
|
+
const scope_ids_1 = require("./scope-ids");
|
|
9
|
+
const storage = new node_async_hooks_1.AsyncLocalStorage();
|
|
10
|
+
function runInCallScope(workingScope, fn) {
|
|
11
|
+
return storage.run(workingScope, fn);
|
|
12
|
+
}
|
|
13
|
+
async function projectInCallScope(projectId) {
|
|
14
|
+
const working = storage.getStore();
|
|
15
|
+
const operator = config_1.GITLAB_ALLOWED_PROJECT_IDS.map((entry) => (0, api_path_1.canonicalProjectPath)(entry).toLowerCase());
|
|
16
|
+
const checkOperator = operator.length > 0 && !operator.includes(projectId);
|
|
17
|
+
const checkWorking = working !== undefined && working.hasRestrictions() && !working.listsId(projectId, 'project');
|
|
18
|
+
if (!checkOperator && !checkWorking)
|
|
19
|
+
return true;
|
|
20
|
+
const resolved = String((await (0, scope_ids_1.withTargetPaths)({ project_id: projectId })).project_id);
|
|
21
|
+
if (/^\d+$/.test(resolved))
|
|
22
|
+
return false;
|
|
23
|
+
if (checkOperator && !operator.includes((0, api_path_1.canonicalProjectPath)(resolved).toLowerCase()))
|
|
24
|
+
return false;
|
|
25
|
+
return !checkWorking || working.isAllowed(resolved);
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=call-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"call-scope.js","sourceRoot":"","sources":["../../../src/configuration/call-scope.ts"],"names":[],"mappings":";;AAmBA,wCAEC;AAQD,gDAcC;AApCD,uDAAqD;AACrD,sCAAuD;AAEvD,gDAAyD;AACzD,2CAA8C;AAE9C,MAAM,OAAO,GAAG,IAAI,oCAAiB,EAA6B,CAAC;AAMnE,SAAgB,cAAc,CAAI,YAAuC,EAAE,EAAW;IACpF,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAQM,KAAK,UAAU,kBAAkB,CAAC,SAAiB;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,mCAA0B,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACxD,IAAA,+BAAoB,EAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAC1C,CAAC;IACF,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC3E,MAAM,YAAY,GAChB,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/F,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,MAAM,IAAA,2BAAe,EAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACvF,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACzC,IAAI,aAAa,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAA,+BAAoB,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACnF,OAAO,KAAK,CAAC;IACf,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -112,6 +112,7 @@ async function withOperatorProjects(configured, read = (path) => gitlab_api_1.gi
|
|
|
112
112
|
projects: selected.flatMap((project) => [project.id, project.path]),
|
|
113
113
|
}),
|
|
114
114
|
operatorProjectIds: new Set(selected.map((project) => project.id)),
|
|
115
|
+
workingScope: policy.scopeEnforcer,
|
|
115
116
|
};
|
|
116
117
|
}
|
|
117
118
|
//# sourceMappingURL=operator-projects.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator-projects.js","sourceRoot":"","sources":["../../../src/configuration/operator-projects.ts"],"names":[],"mappings":";;AAiBA,gDAiCC;AAGD,gEAgBC;AAGD,4DAWC;AAMD,
|
|
1
|
+
{"version":3,"file":"operator-projects.js","sourceRoot":"","sources":["../../../src/configuration/operator-projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export interface EffectivePolicy {
|
|
|
17
17
|
deniedActions: ReadonlyMap<string, ReadonlySet<string>>;
|
|
18
18
|
scope?: ScopeConfig;
|
|
19
19
|
scopeEnforcer?: ScopeEnforcer;
|
|
20
|
+
workingScope?: ScopeEnforcer;
|
|
20
21
|
}
|
|
21
22
|
export declare const CONFIGURATION_TOOLS: ReadonlySet<string>;
|
|
22
23
|
export declare function isExemptFromSettings(name: string): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/configuration/policy.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/configuration/policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import type { LogSection, SectionBounds, SectionTarget } from './log-sections';
|
|
2
|
+
import { type TracePage } from './trace';
|
|
3
|
+
import type { BrowsePipelinesInput } from './schema-readonly';
|
|
4
|
+
type LogsInput = Extract<BrowsePipelinesInput, {
|
|
5
|
+
action: 'logs';
|
|
6
|
+
}>;
|
|
7
|
+
type SectionsInput = Extract<BrowsePipelinesInput, {
|
|
8
|
+
action: 'log_sections';
|
|
9
|
+
}>;
|
|
10
|
+
export interface LogSectionsResult {
|
|
11
|
+
sections: LogSection[];
|
|
12
|
+
sections_truncated: boolean;
|
|
13
|
+
sections_unread_from_line: number | null;
|
|
14
|
+
total_lines: number | null;
|
|
15
|
+
complete: boolean;
|
|
16
|
+
}
|
|
17
|
+
export declare function listLogSections(input: SectionsInput): Promise<LogSectionsResult>;
|
|
18
|
+
type KnownBounds = SectionBounds & {
|
|
19
|
+
end_line: number;
|
|
20
|
+
line_count: number;
|
|
21
|
+
};
|
|
22
|
+
export declare function locateSection(projectId: string, jobId: string, target: SectionTarget): Promise<KnownBounds>;
|
|
23
|
+
export interface SectionLogsPage {
|
|
24
|
+
trace: string;
|
|
25
|
+
section: SectionBounds;
|
|
26
|
+
totalLines: number;
|
|
27
|
+
shownLines: number;
|
|
28
|
+
startLine: number;
|
|
29
|
+
hasMore: boolean;
|
|
30
|
+
nextStart: number | null;
|
|
31
|
+
truncation?: NonNullable<TracePage['truncation']>;
|
|
32
|
+
}
|
|
33
|
+
export declare function readSectionLogs(input: LogsInput & {
|
|
34
|
+
section: string;
|
|
35
|
+
}): Promise<SectionLogsPage>;
|
|
36
|
+
export {};
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.listLogSections = listLogSections;
|
|
4
|
+
exports.locateSection = locateSection;
|
|
5
|
+
exports.readSectionLogs = readSectionLogs;
|
|
6
|
+
const line_grep_worker_1 = require("./line-grep-worker");
|
|
7
|
+
const pipeline_grep_1 = require("./pipeline-grep");
|
|
8
|
+
const trace_1 = require("./trace");
|
|
9
|
+
const trace_open_1 = require("./trace-open");
|
|
10
|
+
const DEFAULT_LOG_LINES = 200;
|
|
11
|
+
const markerScan = (extra) => ({
|
|
12
|
+
patterns: [],
|
|
13
|
+
before: 0,
|
|
14
|
+
after: 0,
|
|
15
|
+
maxMatches: 1,
|
|
16
|
+
invert: false,
|
|
17
|
+
startLine: 0,
|
|
18
|
+
normalize: true,
|
|
19
|
+
budgetMs: pipeline_grep_1.LOG_GREP_BUDGET_MS,
|
|
20
|
+
outputBytes: trace_1.TRACE_PAGE_BYTES,
|
|
21
|
+
...extra,
|
|
22
|
+
});
|
|
23
|
+
async function listLogSections(input) {
|
|
24
|
+
const result = await (0, line_grep_worker_1.grepStream)(markerScan({ listSections: true }), () => (0, trace_open_1.openTrace)(input.project_id, input.job_id));
|
|
25
|
+
const listing = result.sections;
|
|
26
|
+
if (!listing)
|
|
27
|
+
throw new Error('The log sections could not be read within the processing time limit; read the log with logs instead');
|
|
28
|
+
return {
|
|
29
|
+
sections: listing.sections,
|
|
30
|
+
sections_truncated: listing.truncated,
|
|
31
|
+
sections_unread_from_line: listing.unread_from_line,
|
|
32
|
+
total_lines: result.total_lines,
|
|
33
|
+
complete: result.truncated === null,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
async function locateSection(projectId, jobId, target) {
|
|
37
|
+
const result = await (0, line_grep_worker_1.grepStream)(markerScan({ section: target }), () => (0, trace_open_1.openTrace)(projectId, jobId));
|
|
38
|
+
const bounds = result.section;
|
|
39
|
+
if (typeof bounds?.end_line !== 'number')
|
|
40
|
+
throw new Error(`Section '${target.name}' could not be located within the processing budget; read the log with start instead`);
|
|
41
|
+
return bounds;
|
|
42
|
+
}
|
|
43
|
+
async function readSectionLogs(input) {
|
|
44
|
+
const { project_id, job_id, per_page, start } = input;
|
|
45
|
+
const bounds = await locateSection(project_id, job_id, {
|
|
46
|
+
name: input.section,
|
|
47
|
+
index: input.section_index ?? 0,
|
|
48
|
+
});
|
|
49
|
+
const count = bounds.line_count;
|
|
50
|
+
const perPage = per_page ?? DEFAULT_LOG_LINES;
|
|
51
|
+
const fromStart = start !== undefined && start >= 0;
|
|
52
|
+
const wanted = fromStart || start === undefined ? perPage : Math.min(perPage, -start);
|
|
53
|
+
const offset = fromStart ? start : Math.max(0, count - wanted);
|
|
54
|
+
const shown = Math.max(0, Math.min(wanted, count - offset));
|
|
55
|
+
const first = bounds.start_line + offset;
|
|
56
|
+
let page = null;
|
|
57
|
+
if (shown > 0)
|
|
58
|
+
page = await (0, trace_1.readTracePage)(await (0, trace_open_1.openTrace)(project_id, job_id), shown, first, first + shown);
|
|
59
|
+
const lines = page?.lines ?? [];
|
|
60
|
+
const notes = [];
|
|
61
|
+
if (page?.truncation)
|
|
62
|
+
notes.push(`[LOG CONTENT TRUNCATED: ${page.truncation.lines.length} source lines are incomplete due to byte limits. See truncation.lines; line pagination cannot recover omitted bytes.]`);
|
|
63
|
+
if (shown === 0)
|
|
64
|
+
notes.push(`[OUT OF BOUNDS: Start position ${offset} exceeds the ${count} lines of section '${bounds.name}'. Available range: 0-${count - 1}]`);
|
|
65
|
+
else
|
|
66
|
+
notes.push(`[SECTION ${bounds.name}: lines ${first}-${first + lines.length - 1} of the log, ${offset}-${offset + lines.length - 1} of the section's ${count}]`);
|
|
67
|
+
const hasMore = offset + lines.length < count;
|
|
68
|
+
return {
|
|
69
|
+
trace: [...notes, ...lines].join('\n'),
|
|
70
|
+
section: bounds,
|
|
71
|
+
totalLines: count,
|
|
72
|
+
shownLines: lines.length,
|
|
73
|
+
startLine: first,
|
|
74
|
+
hasMore,
|
|
75
|
+
nextStart: hasMore ? offset + lines.length : null,
|
|
76
|
+
...(page?.truncation ? { truncation: page.truncation } : {}),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=job-log-sections.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"job-log-sections.js","sourceRoot":"","sources":["../../../../src/entities/pipelines/job-log-sections.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { LineGrepOptions, LineGrepResult } from './line-grep';
|
|
2
|
+
export declare function closeLineGrepWorkers(): Promise<void>;
|
|
3
|
+
export declare function grepStream(options: LineGrepOptions, open: () => Promise<ReadableStream<Uint8Array> | null>): Promise<LineGrepResult>;
|
|
4
|
+
export declare function checkPatterns(options: LineGrepOptions): Promise<void>;
|
|
5
|
+
export interface GrepTask {
|
|
6
|
+
options: LineGrepOptions;
|
|
7
|
+
open: () => Promise<ReadableStream<Uint8Array> | null>;
|
|
8
|
+
}
|
|
9
|
+
export type GrepOutcome = {
|
|
10
|
+
status: 'done';
|
|
11
|
+
result: LineGrepResult;
|
|
12
|
+
} | {
|
|
13
|
+
status: 'failed';
|
|
14
|
+
error: unknown;
|
|
15
|
+
} | {
|
|
16
|
+
status: 'not_started';
|
|
17
|
+
};
|
|
18
|
+
export declare function grepAll(tasks: readonly GrepTask[], concurrency: number, admit: () => boolean): Promise<GrepOutcome[]>;
|
|
@@ -0,0 +1,296 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.closeLineGrepWorkers = closeLineGrepWorkers;
|
|
4
|
+
exports.grepStream = grepStream;
|
|
5
|
+
exports.checkPatterns = checkPatterns;
|
|
6
|
+
exports.grepAll = grepAll;
|
|
7
|
+
const node_os_1 = require("node:os");
|
|
8
|
+
const node_util_1 = require("node:util");
|
|
9
|
+
const node_worker_threads_1 = require("node:worker_threads");
|
|
10
|
+
const MAX_WORKERS = Math.max(1, Math.min(4, (0, node_os_1.availableParallelism)() - 1));
|
|
11
|
+
const START_TIMEOUT_MS = 5000;
|
|
12
|
+
const LINE_GRACE_MS = 2000;
|
|
13
|
+
const CHUNK_BYTES = 64 * 1024;
|
|
14
|
+
const WORKER_SOURCE = `
|
|
15
|
+
const { parentPort, workerData } = require('node:worker_threads');
|
|
16
|
+
if (workerData.typescript) {
|
|
17
|
+
require('node:module').registerHooks({
|
|
18
|
+
resolve(specifier, context, nextResolve) {
|
|
19
|
+
try {
|
|
20
|
+
return nextResolve(specifier, context);
|
|
21
|
+
} catch (error) {
|
|
22
|
+
if (!specifier.startsWith('.')) throw error;
|
|
23
|
+
return nextResolve(specifier + '.ts', context);
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
require(workerData.module).serveLineGrep(parentPort);
|
|
29
|
+
`;
|
|
30
|
+
const SCANNER_MODULE = require.resolve('./line-grep');
|
|
31
|
+
class WorkerTimeoutError extends Error {
|
|
32
|
+
}
|
|
33
|
+
class GrepWorker {
|
|
34
|
+
worker;
|
|
35
|
+
failure;
|
|
36
|
+
busy = false;
|
|
37
|
+
waiting;
|
|
38
|
+
constructor() {
|
|
39
|
+
this.worker = new node_worker_threads_1.Worker(WORKER_SOURCE, {
|
|
40
|
+
eval: true,
|
|
41
|
+
workerData: { module: SCANNER_MODULE, typescript: SCANNER_MODULE.endsWith('.ts') },
|
|
42
|
+
resourceLimits: { maxOldGenerationSizeMb: 64, maxYoungGenerationSizeMb: 16, stackSizeMb: 4 },
|
|
43
|
+
});
|
|
44
|
+
this.worker.on('message', (reply) => {
|
|
45
|
+
const waiting = this.waiting;
|
|
46
|
+
if (!waiting)
|
|
47
|
+
return;
|
|
48
|
+
this.waiting = undefined;
|
|
49
|
+
clearTimeout(waiting.timer);
|
|
50
|
+
waiting.resolve(reply);
|
|
51
|
+
});
|
|
52
|
+
this.worker.on('error', (error) => this.fail(error));
|
|
53
|
+
this.worker.on('exit', (code) => this.fail(new Error(`Log search worker exited (${code})`)));
|
|
54
|
+
this.worker.unref();
|
|
55
|
+
}
|
|
56
|
+
request(message, timeoutMs, transfer) {
|
|
57
|
+
if (this.failure)
|
|
58
|
+
return Promise.reject(this.failure);
|
|
59
|
+
return new Promise((resolve, reject) => {
|
|
60
|
+
const timer = setTimeout(() => this.fail(new WorkerTimeoutError('Log search worker exceeded its time limit')), timeoutMs);
|
|
61
|
+
this.waiting = { resolve, reject, timer };
|
|
62
|
+
try {
|
|
63
|
+
this.worker.postMessage(message, transfer);
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
this.fail(error);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
lease() {
|
|
71
|
+
this.busy = true;
|
|
72
|
+
this.worker.ref();
|
|
73
|
+
}
|
|
74
|
+
release() {
|
|
75
|
+
this.busy = false;
|
|
76
|
+
this.worker.unref();
|
|
77
|
+
}
|
|
78
|
+
fail(error) {
|
|
79
|
+
const message = typeof error === 'object' &&
|
|
80
|
+
error !== null &&
|
|
81
|
+
typeof Reflect.get(error, 'message') === 'string'
|
|
82
|
+
? Reflect.get(error, 'message')
|
|
83
|
+
: (0, node_util_1.inspect)(error);
|
|
84
|
+
this.failure ??=
|
|
85
|
+
error instanceof Error
|
|
86
|
+
? error
|
|
87
|
+
: new Error(`Log search worker failed: ${message}`, { cause: error });
|
|
88
|
+
const waiting = this.waiting;
|
|
89
|
+
if (!waiting)
|
|
90
|
+
return;
|
|
91
|
+
this.waiting = undefined;
|
|
92
|
+
clearTimeout(waiting.timer);
|
|
93
|
+
waiting.reject(this.failure);
|
|
94
|
+
}
|
|
95
|
+
async terminate() {
|
|
96
|
+
this.fail(new Error('Log search worker closed'));
|
|
97
|
+
await this.worker.terminate();
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
const workers = [];
|
|
101
|
+
function discard(worker) {
|
|
102
|
+
const index = workers.indexOf(worker);
|
|
103
|
+
if (index !== -1)
|
|
104
|
+
workers.splice(index, 1);
|
|
105
|
+
void worker.terminate();
|
|
106
|
+
}
|
|
107
|
+
function acquireWorker() {
|
|
108
|
+
for (let index = workers.length - 1; index >= 0; index--) {
|
|
109
|
+
const worker = workers[index];
|
|
110
|
+
if (!worker.busy && worker.failure)
|
|
111
|
+
discard(worker);
|
|
112
|
+
}
|
|
113
|
+
let worker = workers.find((candidate) => !candidate.busy);
|
|
114
|
+
if (!worker) {
|
|
115
|
+
if (workers.length >= MAX_WORKERS)
|
|
116
|
+
return null;
|
|
117
|
+
worker = new GrepWorker();
|
|
118
|
+
workers.push(worker);
|
|
119
|
+
}
|
|
120
|
+
worker.lease();
|
|
121
|
+
return worker;
|
|
122
|
+
}
|
|
123
|
+
function tryLeaseWorker() {
|
|
124
|
+
try {
|
|
125
|
+
return acquireWorker();
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
return null;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
function leaseWorker() {
|
|
132
|
+
const worker = acquireWorker();
|
|
133
|
+
if (!worker)
|
|
134
|
+
throw new Error('Log search is at capacity; retry shortly');
|
|
135
|
+
return worker;
|
|
136
|
+
}
|
|
137
|
+
function giveBack(worker) {
|
|
138
|
+
if (worker.failure)
|
|
139
|
+
discard(worker);
|
|
140
|
+
else
|
|
141
|
+
worker.release();
|
|
142
|
+
}
|
|
143
|
+
async function closeLineGrepWorkers() {
|
|
144
|
+
await Promise.all(workers.splice(0).map((worker) => worker.terminate()));
|
|
145
|
+
}
|
|
146
|
+
function expectReply(reply, type) {
|
|
147
|
+
if (reply.type === type)
|
|
148
|
+
return reply;
|
|
149
|
+
if (reply.type === 'invalid' || reply.type === 'failed')
|
|
150
|
+
throw new Error(reply.message);
|
|
151
|
+
throw new Error(`Log search worker sent ${reply.type} instead of ${type}`);
|
|
152
|
+
}
|
|
153
|
+
async function grepStream(options, open) {
|
|
154
|
+
const worker = leaseWorker();
|
|
155
|
+
try {
|
|
156
|
+
return await scanOn(worker, options, open);
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
giveBack(worker);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
class InvalidPatternsError extends Error {
|
|
163
|
+
}
|
|
164
|
+
async function checkPatterns(options) {
|
|
165
|
+
const worker = leaseWorker();
|
|
166
|
+
try {
|
|
167
|
+
const started = await worker.request({ type: 'start', options }, START_TIMEOUT_MS);
|
|
168
|
+
if (started.type === 'invalid')
|
|
169
|
+
throw new InvalidPatternsError(started.message);
|
|
170
|
+
expectReply(started, 'ready');
|
|
171
|
+
await worker.request({ type: 'reset' }, LINE_GRACE_MS);
|
|
172
|
+
}
|
|
173
|
+
finally {
|
|
174
|
+
giveBack(worker);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
async function grepAll(tasks, concurrency, admit) {
|
|
178
|
+
const outcomes = tasks.map(() => ({ status: 'not_started' }));
|
|
179
|
+
if (tasks.length === 0)
|
|
180
|
+
return outcomes;
|
|
181
|
+
const leased = [leaseWorker()];
|
|
182
|
+
for (let slot = 1; slot < Math.min(concurrency, tasks.length); slot++) {
|
|
183
|
+
const worker = tryLeaseWorker();
|
|
184
|
+
if (!worker)
|
|
185
|
+
break;
|
|
186
|
+
leased.push(worker);
|
|
187
|
+
}
|
|
188
|
+
let next = 0;
|
|
189
|
+
let invalid;
|
|
190
|
+
const drain = async (first) => {
|
|
191
|
+
let worker = first;
|
|
192
|
+
try {
|
|
193
|
+
while (worker && next < tasks.length && !invalid && admit()) {
|
|
194
|
+
const index = next++;
|
|
195
|
+
const task = tasks[index];
|
|
196
|
+
try {
|
|
197
|
+
outcomes[index] = {
|
|
198
|
+
status: 'done',
|
|
199
|
+
result: await scanOn(worker, task.options, task.open),
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
catch (error) {
|
|
203
|
+
if (error instanceof InvalidPatternsError)
|
|
204
|
+
invalid = error;
|
|
205
|
+
outcomes[index] = { status: 'failed', error };
|
|
206
|
+
}
|
|
207
|
+
if (worker.failure) {
|
|
208
|
+
discard(worker);
|
|
209
|
+
worker = tryLeaseWorker();
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
finally {
|
|
214
|
+
if (worker)
|
|
215
|
+
giveBack(worker);
|
|
216
|
+
}
|
|
217
|
+
};
|
|
218
|
+
await Promise.all(leased.map(drain));
|
|
219
|
+
if (invalid)
|
|
220
|
+
throw invalid;
|
|
221
|
+
return outcomes;
|
|
222
|
+
}
|
|
223
|
+
async function scanOn(worker, options, open) {
|
|
224
|
+
let idle = false;
|
|
225
|
+
try {
|
|
226
|
+
const started = await worker.request({ type: 'start', options }, START_TIMEOUT_MS);
|
|
227
|
+
if (started.type === 'invalid') {
|
|
228
|
+
idle = true;
|
|
229
|
+
throw new InvalidPatternsError(started.message);
|
|
230
|
+
}
|
|
231
|
+
expectReply(started, 'ready');
|
|
232
|
+
const body = await open();
|
|
233
|
+
if (!body)
|
|
234
|
+
throw new Error('GitLab trace response has no readable body');
|
|
235
|
+
const result = await pump(worker, options, body);
|
|
236
|
+
idle = result.truncated !== 'worker_timeout';
|
|
237
|
+
return result;
|
|
238
|
+
}
|
|
239
|
+
finally {
|
|
240
|
+
try {
|
|
241
|
+
if (!idle && !worker.failure)
|
|
242
|
+
await worker.request({ type: 'reset' }, LINE_GRACE_MS);
|
|
243
|
+
}
|
|
244
|
+
catch {
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
async function pump(worker, options, body) {
|
|
249
|
+
const reader = body.getReader({ mode: 'byob' });
|
|
250
|
+
const timeout = options.budgetMs + LINE_GRACE_MS;
|
|
251
|
+
const hunks = [];
|
|
252
|
+
let last;
|
|
253
|
+
let buffer = new ArrayBuffer(CHUNK_BYTES);
|
|
254
|
+
let eof = false;
|
|
255
|
+
try {
|
|
256
|
+
for (;;) {
|
|
257
|
+
const { value, done } = await reader.read(new Uint8Array(buffer));
|
|
258
|
+
if (done) {
|
|
259
|
+
eof = true;
|
|
260
|
+
break;
|
|
261
|
+
}
|
|
262
|
+
const reply = await worker.request({ type: 'chunk', buffer: value.buffer, offset: value.byteOffset, length: value.byteLength }, timeout, [value.buffer]);
|
|
263
|
+
const progress = expectReply(reply, 'progress');
|
|
264
|
+
hunks.push(...progress.progress.hunks);
|
|
265
|
+
last = progress.progress;
|
|
266
|
+
buffer = progress.buffer;
|
|
267
|
+
if (last.exhausted)
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
270
|
+
const done = expectReply(await worker.request({ type: 'end' }, timeout), 'done').result;
|
|
271
|
+
return { ...done, hunks: hunks.concat(done.hunks) };
|
|
272
|
+
}
|
|
273
|
+
catch (error) {
|
|
274
|
+
if (!(error instanceof WorkerTimeoutError))
|
|
275
|
+
throw error;
|
|
276
|
+
if (options.spent)
|
|
277
|
+
Atomics.add(options.spent, 0, timeout * 1000);
|
|
278
|
+
return {
|
|
279
|
+
hunks,
|
|
280
|
+
match_count: last?.match_count ?? 0,
|
|
281
|
+
match_count_complete: false,
|
|
282
|
+
scanned_lines: last?.scanned_lines ?? 0,
|
|
283
|
+
total_lines: null,
|
|
284
|
+
truncated: 'worker_timeout',
|
|
285
|
+
resume_from: last?.safe_resume ?? options.startLine,
|
|
286
|
+
...(options.preset ? { preset_index: options.patterns.length } : {}),
|
|
287
|
+
...(options.section ? { section: last?.section ?? null } : {}),
|
|
288
|
+
};
|
|
289
|
+
}
|
|
290
|
+
finally {
|
|
291
|
+
if (!eof)
|
|
292
|
+
await reader.cancel().catch(() => undefined);
|
|
293
|
+
reader.releaseLock();
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
//# sourceMappingURL=line-grep-worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"line-grep-worker.js","sourceRoot":"","sources":["../../../../src/entities/pipelines/line-grep-worker.ts"],"names":[],"mappings":";;AAyKA,oDAEC;AAgBD,gCAUC;AAMD,sCAUC;AAmBD,0BA0CC;AAlRD,qCAA+C;AAC/C,yCAAoC;AACpC,6DAA6C;AAW7C,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAA,8BAAoB,GAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAEzE,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAE9B,MAAM,aAAa,GAAG,IAAI,CAAC;AAC3B,MAAM,WAAW,GAAG,EAAE,GAAG,IAAI,CAAC;AAK9B,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;CAerB,CAAC;AACF,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAEtD,MAAM,kBAAmB,SAAQ,KAAK;CAAG;AAGzC,MAAM,UAAU;IACG,MAAM,CAAS;IAChC,OAAO,CAAS;IAChB,IAAI,GAAG,KAAK,CAAC;IACL,OAAO,CAIb;IAEF;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,4BAAM,CAAC,aAAa,EAAE;YACtC,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClF,cAAc,EAAE,EAAE,sBAAsB,EAAE,EAAE,EAAE,wBAAwB,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE;SAC7F,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,KAAgB,EAAE,EAAE;YAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7B,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YACzB,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,6BAA6B,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,OAAoB,EAAE,SAAiB,EAAE,QAAwB;QACvE,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAAG,UAAU,CACtB,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,2CAA2C,CAAC,CAAC,EACpF,SAAS,CACV,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC1C,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC7C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,KAAc;QAEjB,MAAM,OAAO,GACX,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,QAAQ;YAC/C,CAAC,CAAE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAY;YAC3C,CAAC,CAAC,IAAA,mBAAO,EAAC,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,OAAO;YACV,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,IAAI,KAAK,CAAC,6BAA6B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,GAAiB,EAAE,CAAC;AAEjC,SAAS,OAAO,CAAC,MAAkB;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC3C,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;AAC1B,CAAC;AAGD,SAAS,aAAa;IAEpB,KAAK,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACzD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,OAAO;YAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IACD,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,MAAM,IAAI,WAAW;YAAE,OAAO,IAAI,CAAC;QAC/C,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC1B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,CAAC,KAAK,EAAE,CAAC;IACf,OAAO,MAAM,CAAC;AAChB,CAAC;AAGD,SAAS,cAAc;IACrB,IAAI,CAAC;QACH,OAAO,aAAa,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,WAAW;IAClB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACzE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,QAAQ,CAAC,MAAkB;IAClC,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,CAAC,MAAM,CAAC,CAAC;;QAC/B,MAAM,CAAC,OAAO,EAAE,CAAC;AACxB,CAAC;AAGM,KAAK,UAAU,oBAAoB;IACxC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,SAAS,WAAW,CAClB,KAAgB,EAChB,IAAO;IAEP,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,KAAwC,CAAC;IACzE,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,CAAC,IAAI,eAAe,IAAI,EAAE,CAAC,CAAC;AAC7E,CAAC;AAOM,KAAK,UAAU,UAAU,CAC9B,OAAwB,EACxB,IAAsD;IAEtD,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;IAC7B,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAGD,MAAM,oBAAqB,SAAQ,KAAK;CAAG;AAGpC,KAAK,UAAU,aAAa,CAAC,OAAwB;IAC1D,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACnF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;YAAE,MAAM,IAAI,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChF,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;IACzD,CAAC;YAAS,CAAC;QACT,QAAQ,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAmBM,KAAK,UAAU,OAAO,CAC3B,KAA0B,EAC1B,WAAmB,EACnB,KAAoB;IAEpB,MAAM,QAAQ,GAAkB,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC7E,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxC,MAAM,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/B,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;QACtE,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM;YAAE,MAAM;QACnB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,OAAyC,CAAC;IAC9C,MAAM,KAAK,GAAG,KAAK,EAAE,KAAiB,EAAiB,EAAE;QACvD,IAAI,MAAM,GAAsB,KAAK,CAAC;QACtC,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE,EAAE,CAAC;gBAC5D,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC1B,IAAI,CAAC;oBACH,QAAQ,CAAC,KAAK,CAAC,GAAG;wBAChB,MAAM,EAAE,MAAM;wBACd,MAAM,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC;qBACtD,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,KAAK,YAAY,oBAAoB;wBAAE,OAAO,GAAG,KAAK,CAAC;oBAC3D,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;gBAChD,CAAC;gBACD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,CAAC,MAAM,CAAC,CAAC;oBAChB,MAAM,GAAG,cAAc,EAAE,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,MAAM;gBAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IACrC,IAAI,OAAO;QAAE,MAAM,OAAO,CAAC;IAC3B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAGD,KAAK,UAAU,MAAM,CACnB,MAAkB,EAClB,OAAwB,EACxB,IAAsD;IAEtD,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACnF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,GAAG,IAAI,CAAC;YACZ,MAAM,IAAI,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QACD,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,GAAG,MAAM,CAAC,SAAS,KAAK,gBAAgB,CAAC;QAC7C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO;gBAAE,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;QACvF,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI,CACjB,MAAkB,EAClB,OAAwB,EACxB,IAAgC;IAEhC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC;IACjD,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,IAAkC,CAAC;IACvC,IAAI,MAAM,GAAG,IAAI,WAAW,CAAC,WAAW,CAAC,CAAC;IAC1C,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,IAAI,CAAC;QACH,SAAS,CAAC;YACR,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,IAAI,IAAI,EAAE,CAAC;gBACT,GAAG,GAAG,IAAI,CAAC;gBACX,MAAM;YACR,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAChC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,EAC3F,OAAO,EACP,CAAC,KAAK,CAAC,MAAM,CAAC,CACf,CAAC;YACF,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC;YACzB,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,IAAI,IAAI,CAAC,SAAS;gBAAE,MAAM;QAC5B,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC;QACxF,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,kBAAkB,CAAC;YAAE,MAAM,KAAK,CAAC;QAGxD,IAAI,OAAO,CAAC,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;QAEjE,OAAO;YACL,KAAK;YACL,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,CAAC;YACnC,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,IAAI,EAAE,aAAa,IAAI,CAAC;YACvC,WAAW,EAAE,IAAI;YACjB,SAAS,EAAE,gBAAgB;YAC3B,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,OAAO,CAAC,SAAS;YACnD,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC/D,CAAC;IACJ,CAAC;YAAS,CAAC;QAGT,IAAI,CAAC,GAAG;YAAE,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;AACH,CAAC"}
|