@cat-factory/local-server 0.135.0 → 0.136.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/dist/LocalContainerRunnerTransport.d.ts +22 -0
- package/dist/LocalContainerRunnerTransport.d.ts.map +1 -1
- package/dist/LocalContainerRunnerTransport.js +107 -25
- package/dist/LocalContainerRunnerTransport.js.map +1 -1
- package/dist/LocalPreviewTransport.js +3 -3
- package/dist/LocalPreviewTransport.js.map +1 -1
- package/dist/harnessImage.d.ts +19 -1
- package/dist/harnessImage.d.ts.map +1 -1
- package/dist/harnessImage.js +21 -1
- package/dist/harnessImage.js.map +1 -1
- package/dist/runtimes/appleContainerRuntime.d.ts +21 -4
- package/dist/runtimes/appleContainerRuntime.d.ts.map +1 -1
- package/dist/runtimes/appleContainerRuntime.js +46 -15
- package/dist/runtimes/appleContainerRuntime.js.map +1 -1
- package/dist/runtimes/containerRuntime.d.ts +26 -14
- package/dist/runtimes/containerRuntime.d.ts.map +1 -1
- package/dist/runtimes/containerRuntime.js.map +1 -1
- package/dist/runtimes/dockerRuntime.d.ts +3 -3
- package/dist/runtimes/dockerRuntime.d.ts.map +1 -1
- package/dist/runtimes/dockerRuntime.js +22 -16
- package/dist/runtimes/dockerRuntime.js.map +1 -1
- package/package.json +13 -13
|
@@ -8,6 +8,15 @@ export type { ContainerExec } from './runtimes/index.js';
|
|
|
8
8
|
export interface LocalContainerRunnerTransportOptions {
|
|
9
9
|
/** The executor-harness image ref (a GHCR pull or a locally built tag). */
|
|
10
10
|
image: string;
|
|
11
|
+
/**
|
|
12
|
+
* The UI-TESTER image ref, for a job whose kind declares `image: 'ui'` (Playwright + a
|
|
13
|
+
* browser). Its own container, on its own image: a per-run container cannot change image
|
|
14
|
+
* mid-run, and the browser tooling is deliberately not in the image every other step pulls.
|
|
15
|
+
*
|
|
16
|
+
* Unset ⇒ such a job is REFUSED at dispatch rather than run on {@link image}, which has no
|
|
17
|
+
* browser. See `imageFor`.
|
|
18
|
+
*/
|
|
19
|
+
imageUi?: string;
|
|
11
20
|
/**
|
|
12
21
|
* The container runtime adapter (Docker-family or Apple). Defaults to the Docker-CLI
|
|
13
22
|
* adapter (`docker` binary) so existing callers/tests keep working.
|
|
@@ -106,6 +115,7 @@ export declare class LocalContainerRunnerTransport implements RunnerTransport {
|
|
|
106
115
|
readonly backend = "local-container";
|
|
107
116
|
private readonly adapter;
|
|
108
117
|
private readonly image;
|
|
118
|
+
private readonly imageUi;
|
|
109
119
|
private readonly sharedSecret;
|
|
110
120
|
private readonly network?;
|
|
111
121
|
private extraEnv;
|
|
@@ -168,6 +178,18 @@ export declare class LocalContainerRunnerTransport implements RunnerTransport {
|
|
|
168
178
|
private get poolingEnabled();
|
|
169
179
|
/** Whether a pool member is currently leased to this run (in-process lease state). */
|
|
170
180
|
private hasLeasedMember;
|
|
181
|
+
/**
|
|
182
|
+
* The image a job runs on, refusing a variant this transport cannot serve.
|
|
183
|
+
*
|
|
184
|
+
* Exhaustive over {@link RunnerImageVariant} rather than a single `ui` test, because the two
|
|
185
|
+
* unservable cases need DIFFERENT fixes and a fall-through gave both of them the default image.
|
|
186
|
+
* A `ui` job on it has no browser, which it discovers only after the checkout, the install and
|
|
187
|
+
* the model's first turns, and then reports as an `abort` a reader cannot tell apart from an app
|
|
188
|
+
* that would not start. A `deploy` job on it has no `kubectl`. One refused dispatch, naming what
|
|
189
|
+
* to correct, is the cheaper answer to either — and matches what the Worker's
|
|
190
|
+
* `agentContainerNamespace` answers for the same two inputs.
|
|
191
|
+
*/
|
|
192
|
+
private imageFor;
|
|
171
193
|
dispatch(ref: RunnerJobRef, spec: Record<string, unknown>, kind?: RunnerDispatchKind, options?: RunnerDispatchOptions): Promise<RunnerDispatchAck | undefined>;
|
|
172
194
|
private dispatchPerRun;
|
|
173
195
|
poll(ref: RunnerJobRef): Promise<RunnerJobView>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalContainerRunnerTransport.d.ts","sourceRoot":"","sources":["../src/LocalContainerRunnerTransport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,eAAe,EAChB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"LocalContainerRunnerTransport.d.ts","sourceRoot":"","sources":["../src/LocalContainerRunnerTransport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { execFile } from 'node:child_process';
|
|
2
2
|
import { randomBytes } from 'node:crypto';
|
|
3
3
|
import { promisify } from 'node:util';
|
|
4
|
-
import { composePostMortem, describeError, getErrorMessage, runBestEffort, } from '@cat-factory/kernel';
|
|
4
|
+
import { composePostMortem, containerKeyForRef, describeError, getErrorMessage, runBestEffort, runIdFromContainerKey, RUNNER_IMAGE_UNWIRED_REASON, UnavailableError, unservableImageVariant, } from '@cat-factory/kernel';
|
|
5
5
|
import { resolveDockerResources } from '@cat-factory/contracts';
|
|
6
6
|
import { logger } from '@cat-factory/server';
|
|
7
7
|
import { EVICTION_ERROR, delay, harnessHealthy, harnessUrl, pollInlineJob, pollHarnessJob, postHarnessJob, stopHarnessJob, waitForHarnessHealth, } from './harnessHttp.js';
|
|
8
8
|
import { createRuntimeAdapter, DockerRuntimeAdapter, resolveInstallId, } from './runtimes/index.js';
|
|
9
9
|
import { requireHarnessSharedSecret } from './config.js';
|
|
10
10
|
import { harnessAllowedHosts } from './vcsCredential.js';
|
|
11
|
-
import { RECOMMENDED_HARNESS_IMAGE, resolveHarnessImage } from './harnessImage.js';
|
|
11
|
+
import { RECOMMENDED_HARNESS_IMAGE, resolveHarnessImage, resolveUiHarnessImage, } from './harnessImage.js';
|
|
12
12
|
import { recommendedHarnessVersion, verifyHarnessVersion } from './harnessVersion.js';
|
|
13
13
|
const execFileAsync = promisify(execFile);
|
|
14
14
|
/**
|
|
@@ -36,6 +36,7 @@ export class LocalContainerRunnerTransport {
|
|
|
36
36
|
backend = 'local-container';
|
|
37
37
|
adapter;
|
|
38
38
|
image;
|
|
39
|
+
imageUi;
|
|
39
40
|
sharedSecret;
|
|
40
41
|
network;
|
|
41
42
|
// Mutable: the warm-pool sizing + checkout env are re-read live via `applySettings` when
|
|
@@ -83,6 +84,7 @@ export class LocalContainerRunnerTransport {
|
|
|
83
84
|
installId: resolveInstallId({ HARNESS_SHARED_SECRET: options.sharedSecret }),
|
|
84
85
|
});
|
|
85
86
|
this.image = options.image;
|
|
87
|
+
this.imageUi = options.imageUi;
|
|
86
88
|
this.sharedSecret = options.sharedSecret;
|
|
87
89
|
this.network = options.network;
|
|
88
90
|
this.extraEnv = options.env ?? {};
|
|
@@ -164,13 +166,56 @@ export class LocalContainerRunnerTransport {
|
|
|
164
166
|
hasLeasedMember(runId) {
|
|
165
167
|
return this.members.some((m) => m.leasedTo === runId);
|
|
166
168
|
}
|
|
169
|
+
/**
|
|
170
|
+
* The image a job runs on, refusing a variant this transport cannot serve.
|
|
171
|
+
*
|
|
172
|
+
* Exhaustive over {@link RunnerImageVariant} rather than a single `ui` test, because the two
|
|
173
|
+
* unservable cases need DIFFERENT fixes and a fall-through gave both of them the default image.
|
|
174
|
+
* A `ui` job on it has no browser, which it discovers only after the checkout, the install and
|
|
175
|
+
* the model's first turns, and then reports as an `abort` a reader cannot tell apart from an app
|
|
176
|
+
* that would not start. A `deploy` job on it has no `kubectl`. One refused dispatch, naming what
|
|
177
|
+
* to correct, is the cheaper answer to either — and matches what the Worker's
|
|
178
|
+
* `agentContainerNamespace` answers for the same two inputs.
|
|
179
|
+
*/
|
|
180
|
+
imageFor(ref) {
|
|
181
|
+
const variant = ref.image ?? 'default';
|
|
182
|
+
switch (variant) {
|
|
183
|
+
case 'default':
|
|
184
|
+
return this.image;
|
|
185
|
+
case 'ui':
|
|
186
|
+
// Unreachable via `createLocalContainerTransportFromEnv`, which always resolves the
|
|
187
|
+
// backend-matched UI tag: a local deployment CAN serve this variant, it just pays for the
|
|
188
|
+
// pull on first dispatch. It fires for a transport constructed without one.
|
|
189
|
+
if (this.imageUi)
|
|
190
|
+
return this.imageUi;
|
|
191
|
+
throw new UnavailableError('This step runs on the UI-tester executor image (Playwright + a browser), which this ' +
|
|
192
|
+
'transport was built without. Set LOCAL_HARNESS_IMAGE_UI to a published ' +
|
|
193
|
+
'cat-factory-executor-ui tag (or a locally built one) and restart. Until then, drop ' +
|
|
194
|
+
'the `tester-ui` step from the pipeline: the visual-confirmation gate still runs on ' +
|
|
195
|
+
'screenshots a person uploads.', RUNNER_IMAGE_UNWIRED_REASON, { image: variant, variable: 'LOCAL_HARNESS_IMAGE_UI' });
|
|
196
|
+
case 'deploy':
|
|
197
|
+
throw new UnavailableError('An agent step declared the `deploy` executor image, which the agent runner path does ' +
|
|
198
|
+
'not serve: deploy jobs run through the environment-provisioning adapter and its own ' +
|
|
199
|
+
'deploy-harness transport. Correct the agent kind’s registration.', RUNNER_IMAGE_UNWIRED_REASON, { image: variant });
|
|
200
|
+
default:
|
|
201
|
+
return unservableImageVariant(variant);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
167
204
|
async dispatch(ref, spec, kind = 'agent', options) {
|
|
205
|
+
// A non-default image is always per-run, never pooled: pool members are started on ONE
|
|
206
|
+
// image and reused across runs, so a leased member is by construction the wrong container
|
|
207
|
+
// for a job that asked for a different one. Checked BEFORE the lease/cache lookups, which
|
|
208
|
+
// key off the run and would otherwise hand a `tester-ui` job the run's ordinary container.
|
|
209
|
+
if (!isDefaultImage(ref))
|
|
210
|
+
return this.dispatchPerRun(ref, spec, kind, options);
|
|
168
211
|
// Route a run to the backend it ALREADY holds, regardless of the CURRENT pool mode
|
|
169
212
|
// (settings can flip pooling on/off live): a leased pool member re-attaches to the
|
|
170
213
|
// pool; an existing per-run container stays per-run. Only a BRAND-NEW run picks its
|
|
171
214
|
// mode from `poolingEnabled` — so a live resize never strands an in-flight run.
|
|
172
215
|
if (this.hasLeasedMember(ref.runId))
|
|
173
216
|
return this.dispatchPooled(ref, spec, kind);
|
|
217
|
+
// Past the guard above the container key IS the run id, so the pooled branches address
|
|
218
|
+
// the run directly.
|
|
174
219
|
if (this.cache.has(ref.runId))
|
|
175
220
|
return this.dispatchPerRun(ref, spec, kind, options);
|
|
176
221
|
if (this.poolingEnabled)
|
|
@@ -178,19 +223,24 @@ export class LocalContainerRunnerTransport {
|
|
|
178
223
|
return this.dispatchPerRun(ref, spec, kind, options);
|
|
179
224
|
}
|
|
180
225
|
async dispatchPerRun(ref, spec, kind, options) {
|
|
181
|
-
// The container is per-RUN: a run's first step
|
|
182
|
-
//
|
|
183
|
-
// `ref.jobId` carried in the spec body.
|
|
184
|
-
|
|
185
|
-
|
|
226
|
+
// The container is per-RUN and per IMAGE: a run's first step on a given image starts it,
|
|
227
|
+
// later steps on that image re-attach (resolved by the container key), and the harness keys
|
|
228
|
+
// each step's job by the per-step `ref.jobId` carried in the spec body. A step declaring a
|
|
229
|
+
// different image gets a second container beside the run's ordinary one, which is what the
|
|
230
|
+
// qualified key addresses.
|
|
231
|
+
const containerKey = containerKeyForRef(ref);
|
|
232
|
+
// Resolved BEFORE any container work so an unconfigured variant refuses without first
|
|
233
|
+
// removing a container or starting one.
|
|
234
|
+
const image = this.imageFor(ref);
|
|
235
|
+
let resolved = await this.resolve(containerKey);
|
|
186
236
|
if (!resolved) {
|
|
187
|
-
// A prior attempt may have left an exited/dead container under this
|
|
237
|
+
// A prior attempt may have left an exited/dead container under this key (resolve()
|
|
188
238
|
// returns undefined for one whose endpoint is gone). Remove any such container
|
|
189
239
|
// first so it can't shadow the fresh one in later lookups.
|
|
190
|
-
await this.adapter.removeRun(this.exec,
|
|
240
|
+
await this.adapter.removeRun(this.exec, containerKey);
|
|
191
241
|
const containerId = await this.adapter.run(this.exec, {
|
|
192
|
-
|
|
193
|
-
image
|
|
242
|
+
containerKey,
|
|
243
|
+
image,
|
|
194
244
|
sharedSecret: this.sharedSecret,
|
|
195
245
|
// The Tester stands its infra up with `docker compose` INSIDE the job container
|
|
196
246
|
// (Docker-in-Docker). The container is per-RUN and created by the run's FIRST step
|
|
@@ -207,7 +257,7 @@ export class LocalContainerRunnerTransport {
|
|
|
207
257
|
});
|
|
208
258
|
const endpoint = await this.waitForEndpoint(containerId);
|
|
209
259
|
resolved = { containerId, ...endpoint };
|
|
210
|
-
this.cache.set(
|
|
260
|
+
this.cache.set(containerKey, resolved);
|
|
211
261
|
await this.waitForHealth(endpoint, containerId);
|
|
212
262
|
}
|
|
213
263
|
// POST the job to the single harness endpoint, with the kind in the body. Idempotent:
|
|
@@ -216,9 +266,12 @@ export class LocalContainerRunnerTransport {
|
|
|
216
266
|
return this.postJob(resolved, { ...spec, kind });
|
|
217
267
|
}
|
|
218
268
|
async poll(ref) {
|
|
219
|
-
|
|
269
|
+
// A pooled member never serves a non-default image (dispatch routes those per-run), so the
|
|
270
|
+
// lease lookup is skipped for one: the run's leased member is a different container.
|
|
271
|
+
if (isDefaultImage(ref) && this.hasLeasedMember(ref.runId))
|
|
220
272
|
return this.pollPooled(ref);
|
|
221
|
-
const
|
|
273
|
+
const containerKey = containerKeyForRef(ref);
|
|
274
|
+
const resolved = await this.resolve(containerKey);
|
|
222
275
|
// No container for this run at all → it was evicted/reaped (or never started).
|
|
223
276
|
if (!resolved)
|
|
224
277
|
return { state: 'failed', error: EVICTION_ERROR, evicted: 'crash' };
|
|
@@ -238,7 +291,7 @@ export class LocalContainerRunnerTransport {
|
|
|
238
291
|
isDead: async () => {
|
|
239
292
|
if (await this.adapter.isRunning(this.exec, resolved.containerId))
|
|
240
293
|
return false;
|
|
241
|
-
this.cache.delete(
|
|
294
|
+
this.cache.delete(containerKey);
|
|
242
295
|
return true;
|
|
243
296
|
},
|
|
244
297
|
exitedCleanly: () => this.exitedCleanly(exitState),
|
|
@@ -262,10 +315,12 @@ export class LocalContainerRunnerTransport {
|
|
|
262
315
|
* member instead RETURNS it to the pool (or removes a transient/over-capacity one).
|
|
263
316
|
*/
|
|
264
317
|
async release(ref) {
|
|
265
|
-
if (this.hasLeasedMember(ref.runId))
|
|
318
|
+
if (isDefaultImage(ref) && this.hasLeasedMember(ref.runId))
|
|
266
319
|
return this.releasePooled(ref);
|
|
267
|
-
const
|
|
268
|
-
this.cache.
|
|
320
|
+
const containerKey = containerKeyForRef(ref);
|
|
321
|
+
const containerId = this.cache.get(containerKey)?.containerId ??
|
|
322
|
+
(await this.adapter.find(this.exec, containerKey));
|
|
323
|
+
this.cache.delete(containerKey);
|
|
269
324
|
if (!containerId)
|
|
270
325
|
return;
|
|
271
326
|
await this.adapter.remove(this.exec, containerId);
|
|
@@ -285,8 +340,11 @@ export class LocalContainerRunnerTransport {
|
|
|
285
340
|
* Deliberately NOT `release`: on the pooled path release does the opposite of stopping.
|
|
286
341
|
*/
|
|
287
342
|
async stopJob(ref) {
|
|
288
|
-
const
|
|
289
|
-
const
|
|
343
|
+
const containerKey = containerKeyForRef(ref);
|
|
344
|
+
const member = isDefaultImage(ref)
|
|
345
|
+
? this.members.find((m) => m.leasedTo === ref.runId)
|
|
346
|
+
: undefined;
|
|
347
|
+
const endpoint = member ?? (await this.resolve(containerKey));
|
|
290
348
|
// Nothing is serving this run: there is no job left to stop, which IS the stopped state.
|
|
291
349
|
if (!endpoint)
|
|
292
350
|
return 'stopped';
|
|
@@ -316,7 +374,10 @@ export class LocalContainerRunnerTransport {
|
|
|
316
374
|
await this.adapter.remove(this.exec, member.containerId);
|
|
317
375
|
}
|
|
318
376
|
else {
|
|
319
|
-
|
|
377
|
+
// Evict the entry for the container just destroyed, which for a non-default image is
|
|
378
|
+
// NOT the run id: `resolve` hands a cached handle back without probing liveness, so an
|
|
379
|
+
// entry left pointing at a removed container is served to the next poll as a live one.
|
|
380
|
+
this.cache.delete(containerKey);
|
|
320
381
|
await this.adapter.remove(this.exec, endpoint.containerId);
|
|
321
382
|
}
|
|
322
383
|
return 'stopped';
|
|
@@ -350,10 +411,13 @@ export class LocalContainerRunnerTransport {
|
|
|
350
411
|
const running = await this.adapter.listRunContainers(this.exec);
|
|
351
412
|
if (running.length === 0)
|
|
352
413
|
return 0;
|
|
353
|
-
|
|
354
|
-
|
|
414
|
+
// The adapter reports CONTAINER KEYS, which for a non-default image is the run id qualified
|
|
415
|
+
// by the variant. Ask about the RUN: passing the key through would report "no such run" for
|
|
416
|
+
// every UI-tester container and sweep one out from under a live run.
|
|
417
|
+
const live = new Set(await liveRunIds(running.map((c) => runIdFromContainerKey(c.containerKey))));
|
|
418
|
+
const orphans = running.filter((c) => !live.has(runIdFromContainerKey(c.containerKey)));
|
|
355
419
|
for (const c of orphans) {
|
|
356
|
-
this.cache.delete(c.
|
|
420
|
+
this.cache.delete(c.containerKey);
|
|
357
421
|
await this.adapter.remove(this.exec, c.containerId).catch(() => undefined);
|
|
358
422
|
}
|
|
359
423
|
return orphans.length;
|
|
@@ -548,7 +612,7 @@ export class LocalContainerRunnerTransport {
|
|
|
548
612
|
async startMember(transient) {
|
|
549
613
|
const id = `pool-${randomBytes(6).toString('hex')}`;
|
|
550
614
|
const containerId = await this.adapter.run(this.exec, {
|
|
551
|
-
|
|
615
|
+
containerKey: id,
|
|
552
616
|
image: this.image,
|
|
553
617
|
sharedSecret: this.sharedSecret,
|
|
554
618
|
// Pooled members are reused across runs (incl. Tester runs), so they run privileged
|
|
@@ -829,6 +893,19 @@ function checkoutExtraEnv(settings) {
|
|
|
829
893
|
}
|
|
830
894
|
return env;
|
|
831
895
|
}
|
|
896
|
+
/**
|
|
897
|
+
* Whether a ref runs on the DEFAULT executor image, which on this transport is the same question
|
|
898
|
+
* as "is this ref's container the run's ordinary one" (`containerKeyForRef` qualifies every other
|
|
899
|
+
* variant's key).
|
|
900
|
+
*
|
|
901
|
+
* Named once because four pooled branches ask it: a warm pool member is started on one image and
|
|
902
|
+
* re-leased across runs, so it can only ever serve this variant, and each branch spelling the test
|
|
903
|
+
* out as `containerKeyForRef(ref) === ref.runId` stated the rule by way of a coincidence and let
|
|
904
|
+
* the four drift apart.
|
|
905
|
+
*/
|
|
906
|
+
function isDefaultImage(ref) {
|
|
907
|
+
return !ref.image || ref.image === 'default';
|
|
908
|
+
}
|
|
832
909
|
/** The `owner/name` repo-affinity key from a dispatched job spec, when present. */
|
|
833
910
|
function repoKeyOf(spec) {
|
|
834
911
|
const repo = spec.repo;
|
|
@@ -858,6 +935,11 @@ export function createLocalContainerTransportFromEnv(env, settings, credential)
|
|
|
858
935
|
const extraEnv = checkoutExtraEnv(settings);
|
|
859
936
|
return new LocalContainerRunnerTransport({
|
|
860
937
|
image,
|
|
938
|
+
// Same rule as the base image, with one difference: the UI image is NOT pre-pulled at boot
|
|
939
|
+
// (it carries a browser and a JRE, so a stock local start would spend gigabytes on tooling
|
|
940
|
+
// most deployments never dispatch to). It is pulled by the runtime on the first `image: 'ui'
|
|
941
|
+
// dispatch, which is the first moment anything needs it.
|
|
942
|
+
imageUi: resolveUiHarnessImage(env),
|
|
861
943
|
adapter: createRuntimeAdapter(env),
|
|
862
944
|
sharedSecret: requireHarnessSharedSecret(env),
|
|
863
945
|
network: env.LOCAL_DOCKER_NETWORK?.trim() || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalContainerRunnerTransport.js","sourceRoot":"","sources":["../src/LocalContainerRunnerTransport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"LocalContainerRunnerTransport.js","sourceRoot":"","sources":["../src/LocalContainerRunnerTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAUrC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,aAAa,EACb,qBAAqB,EACrB,2BAA2B,EAC3B,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EACL,cAAc,EAId,KAAK,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,cAAc,EACd,cAAc,EACd,cAAc,EACd,oBAAoB,GACrB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAKL,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EAA2B,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACjF,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAErF,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAEzC;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,MAAc;IACjC,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,IAAI,CAAC;YACH,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAA;QAC3E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,GAA6D,CAAA;YACvE,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,eAAe,CAAA;YACrF,MAAM,IAAI,KAAK,CAAC,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,cAAc,MAAM,EAAE,CAAC,CAAA;QACrE,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAyJD,MAAM,OAAO,6BAA6B;IACxC,wEAAwE;IAC/D,OAAO,GAAG,iBAAiB,CAAA;IACnB,OAAO,CAAyB;IAChC,KAAK,CAAQ;IACb,OAAO,CAAoB;IAC3B,YAAY,CAAQ;IACpB,OAAO,CAAS;IACjC,yFAAyF;IACzF,uFAAuF;IAC/E,QAAQ,CAAwB;IACvB,eAAe,CAA4C;IAC3D,IAAI,CAAe;IACnB,SAAS,CAAc;IACvB,cAAc,CAAQ;IACtB,gBAAgB,CAAQ;IACxB,eAAe,CAAS;IACxB,oBAAoB,CAAS;IAC7B,gBAAgB,CAA4B;IAC7D,uFAAuF;IAC/E,eAAe,GAAG,KAAK,CAAA;IAC/B,sEAAsE;IACrD,oBAAoB,GAAG,GAAG,CAAA;IAC1B,kBAAkB,CAAS;IACpC,QAAQ,CAAQ;IAChB,OAAO,CAAQ;IACf,WAAW,CAAQ;IACnB,aAAa,CAAQ;IAE7B,qFAAqF;IACpE,KAAK,GAAG,IAAI,GAAG,EAAuD,CAAA;IAEvF,0FAA0F;IACzE,OAAO,GAAiB,EAAE,CAAA;IAE3C;;;;OAIG;IACK,aAAa,GAAG,CAAC,CAAA;IAEzB,YAAY,OAA6C;QACvD,IAAI,CAAC,OAAO;YACV,OAAO,CAAC,OAAO;gBACf,IAAI,oBAAoB,CAAC;oBACvB,EAAE,EAAE,QAAQ;oBACZ,MAAM,EAAE,QAAQ;oBAChB,SAAS,EAAE,sBAAsB;oBACjC,cAAc,EAAE,IAAI;oBACpB,SAAS,EAAE,IAAI;oBACf,OAAO,EAAE,IAAI;oBACb,0FAA0F;oBAC1F,kFAAkF;oBAClF,SAAS,EAAE,gBAAgB,CAAC,EAAE,qBAAqB,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC;iBAC7E,CAAC,CAAA;QACJ,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,IAAI,EAAE,CAAA;QACjC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,UAAU,CAAA;QACzC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC5D,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAA;QAC3C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAA;QACtD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAA;QAC1D,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAA;QAC9C,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,KAAK,CAAA;QACjE,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAA;QAChD,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,IAAI,CAAA;QAC5D,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;QAChB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAA;QAC5B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAC7B,CAAC;IAED;;;OAGG;IACK,aAAa,CAAC,IAKrB;QACC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAA;QAC3D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QACjF,qFAAqF;QACrF,uFAAuF;QACvF,kFAAkF;QAClF,uFAAuF;QACvF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC1F,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,CAAC,CAAC,CAAA;IAC7E,CAAC;IAED;;;;;;;;;OASG;IACH,aAAa,CAAC,QAAwB;QACpC,IAAI,CAAC,aAAa,CAAC;YACjB,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI;YAC9B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,SAAS;YACzC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO;YACpC,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS;SACzC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;QAC1C,4FAA4F;QAC5F,wDAAwD;QACxD,KAAK,aAAa,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA;IAC/E,CAAC;IAED;;;;;OAKG;IACK,YAAY;QAClB,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,EAAE,CAAA;IAC1D,CAAC;IAED,0FAA0F;IAClF,KAAK,CAAC,aAAa;QACzB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACrB,IAAI,IAAI,CAAC,cAAc;YAAE,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;IACnD,CAAC;IAED,4FAA4F;IAC5F,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;IAClC,CAAC;IAED,0FAA0F;IAC1F,IAAY,cAAc;QACxB,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAA;IAC/D,CAAC;IAED,sFAAsF;IAC9E,eAAe,CAAC,KAAa;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAA;IACvD,CAAC;IAED;;;;;;;;;;OAUG;IACK,QAAQ,CAAC,GAAiB;QAChC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,IAAI,SAAS,CAAA;QACtC,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,SAAS;gBACZ,OAAO,IAAI,CAAC,KAAK,CAAA;YACnB,KAAK,IAAI;gBACP,oFAAoF;gBACpF,0FAA0F;gBAC1F,4EAA4E;gBAC5E,IAAI,IAAI,CAAC,OAAO;oBAAE,OAAO,IAAI,CAAC,OAAO,CAAA;gBACrC,MAAM,IAAI,gBAAgB,CACxB,sFAAsF;oBACpF,yEAAyE;oBACzE,qFAAqF;oBACrF,qFAAqF;oBACrF,+BAA+B,EACjC,2BAA2B,EAC3B,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CACvD,CAAA;YACH,KAAK,QAAQ;gBACX,MAAM,IAAI,gBAAgB,CACxB,uFAAuF;oBACrF,sFAAsF;oBACtF,kEAAkE,EACpE,2BAA2B,EAC3B,EAAE,KAAK,EAAE,OAAO,EAAE,CACnB,CAAA;YACH;gBACE,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,GAAiB,EACjB,IAA6B,EAC7B,IAAI,GAAuB,OAAO,EAClC,OAA+B;QAE/B,uFAAuF;QACvF,0FAA0F;QAC1F,0FAA0F;QAC1F,2FAA2F;QAC3F,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QAC9E,mFAAmF;QACnF,mFAAmF;QACnF,oFAAoF;QACpF,gFAAgF;QAChF,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QAChF,uFAAuF;QACvF,oBAAoB;QACpB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QACnF,IAAI,IAAI,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;QACpE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,GAAiB,EACjB,IAA6B,EAC7B,IAAwB,EACxB,OAA+B;QAE/B,yFAAyF;QACzF,4FAA4F;QAC5F,2FAA2F;QAC3F,2FAA2F;QAC3F,2BAA2B;QAC3B,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC5C,sFAAsF;QACtF,wCAAwC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QAChC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,mFAAmF;YACnF,+EAA+E;YAC/E,2DAA2D;YAC3D,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;YACrD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;gBACpD,YAAY;gBACZ,KAAK;gBACL,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,gFAAgF;gBAChF,mFAAmF;gBACnF,mFAAmF;gBACnF,kFAAkF;gBAClF,sFAAsF;gBACtF,4EAA4E;gBAC5E,UAAU,EAAE,IAAI,CAAC,kBAAkB;gBACnC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE;gBACxB,YAAY,EAAE,OAAO,EAAE,YAAY;oBACjC,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC;oBAC9C,CAAC,CAAC,SAAS;aACd,CAAC,CAAA;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACxD,QAAQ,GAAG,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAA;YACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YACtC,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QACjD,CAAC;QAED,sFAAsF;QACtF,oFAAoF;QACpF,kCAAkC;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAiB;QAC1B,2FAA2F;QAC3F,qFAAqF;QACrF,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAEvF,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACjD,+EAA+E;QAC/E,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;QAElF,2FAA2F;QAC3F,iDAAiD;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC1D,uFAAuF;QACvF,mFAAmF;QACnF,sDAAsD;QACtD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC;oBAAE,OAAO,KAAK,CAAA;gBAC/E,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBAC/B,OAAO,IAAI,CAAA;YACb,CAAC;YACD,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;YAClD,yFAAyF;YACzF,yFAAyF;YACzF,sCAAsC;YACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;SAC5E,CAAC,CAAA;QACF,uFAAuF;QACvF,qFAAqF;QACrF,+DAA+D;QAC/D,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;SAC1F,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,GAAiB;QAC7B,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QAE1F,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,WAAW,GACf,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,WAAW;YACzC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;QACpD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC/B,IAAI,CAAC,WAAW;YAAE,OAAM;QACxB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACnD,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,OAAO,CAAC,GAAiB;QAC7B,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC;YAChC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC;YACpD,CAAC,CAAC,SAAS,CAAA;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;QAC7D,yFAAyF;QACzF,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC/B,IAAI,CAAC;YACH,MAAM,cAAc,CAAC;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ;gBACR,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,MAAM,EAAE,IAAI,CAAC,YAAY;gBACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;gBAChC,KAAK,EAAE,iBAAiB;aACzB,CAAC,CAAA;YACF,OAAO,SAAS,CAAA;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,0FAA0F;YAC1F,uFAAuF;YACvF,0FAA0F;YAC1F,8EAA8E;YAC9E,MAAM,CAAC,IAAI,CAAC,mEAAmE,EAAE;gBAC/E,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,GAAG,aAAa,CAAC,KAAK,CAAC;aACxB,CAAC,CAAA;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;gBACvB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;YAC1D,CAAC;iBAAM,CAAC;gBACN,qFAAqF;gBACrF,uFAAuF;gBACvF,uFAAuF;gBACvF,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;YAC5D,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,UAAU;QACd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC7B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QAC1B,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,gBAAgB,CAAC,UAAgD;QACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,CAAA;QAClC,4FAA4F;QAC5F,4FAA4F;QAC5F,qEAAqE;QACrE,MAAM,IAAI,GAAG,IAAI,GAAG,CAClB,MAAM,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAC5E,CAAA;QACD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACvF,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;YACjC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5E,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAA;IACvB,CAAC;IAED,4EAA4E;IAE5E;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,SAAS,CAAC,GAA2B;QACzC,sFAAsF;QACtF,2EAA2E;QAC3E,MAAM,KAAK,GAAG,UAAU,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;QACxD,MAAM,KAAK,GAAG,GAAG,KAAK,MAAM,CAAA;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACzD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACzB,IAAI,EAAE,QAAQ;gBACd,KAAK;gBACL,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,YAAY,EAAE,GAAG,CAAC,MAAM;gBACxB,UAAU,EAAE,GAAG,CAAC,MAAM;gBACtB,GAAG,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChF,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9E,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpF,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClD,CAAC,CAAA;YACF,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC1D,CAAC;gBAAS,CAAC;YACT,sFAAsF;YACtF,wFAAwF;YACxF,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACnE,CAAC;IACH,CAAC;IAED,kFAAkF;IAC1E,KAAK,CAAC,WAAW,CACvB,MAAkB,EAClB,KAAa,EACb,MAA+B;QAE/B,SAAS,CAAC;YACR,IAAI,MAAM,EAAE,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;YACpE,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ,EAAE,MAAM;gBAChB,KAAK;gBACL,MAAM,EAAE,IAAI,CAAC,YAAY;gBACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;gBAChC,MAAM,EAAE,KAAK,IAAI,EAAE;oBACjB,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC;wBAAE,OAAO,KAAK,CAAA;oBAC7E,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;oBACvB,OAAO,IAAI,CAAA;gBACb,CAAC;aACF,CAAC,CAAA;YACF,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM;oBAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;gBACjF,OAAO,IAAI,CAAC,MAAM,CAAA;YACpB,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,6BAA6B,CAAC,CAAA;YAC9D,CAAC;YACD,MAAM,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IAED,2EAA2E;IAEnE,KAAK,CAAC,cAAc,CAC1B,GAAiB,EACjB,IAA6B,EAC7B,IAAwB;QAExB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAC/B,qFAAqF;QACrF,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM;YAAE,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QAClE,IAAI,OAAO;YAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAAA;QAClC,wFAAwF;QACxF,sEAAsE;QACtE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IACK,OAAO,CACb,QAAyB,EACzB,IAA6B;QAE7B,OAAO,cAAc,CAAC;YACpB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,KAAK,EAAE,iBAAiB;SACzB,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,GAAiB;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC,CAAA;QACjE,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;QAChF,sFAAsF;QACtF,uFAAuF;QACvF,4FAA4F;QAC5F,4FAA4F;QAC5F,sFAAsF;QACtF,sFAAsF;QACtF,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACxD,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,IAAI,CAAC,YAAY;YACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,KAAK,EAAE,iBAAiB;YACxB,MAAM,EAAE,KAAK,IAAI,EAAE;gBACjB,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC;oBAAE,OAAO,KAAK,CAAA;gBAC7E,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;gBACvB,OAAO,IAAI,CAAA;YACb,CAAC;YACD,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;YAClD,kFAAkF;YAClF,sFAAsF;YACtF,uFAAuF;YACvF,oFAAoF;YACpF,mFAAmF;YACnF,sCAAsC;YACtC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC;SACnF,CAAC,CAAA;QACF,sFAAsF;QACtF,uFAAuF;QACvF,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;SACtF,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,GAAiB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,KAAK,CAAC,CAAA;QACjE,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAA;QAC3B,qFAAqF;QACrF,kFAAkF;QAClF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;YACxD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;IACvB,CAAC;IAED,oFAAoF;IAC5E,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,OAA2B;QACpE,oFAAoF;QACpF,sEAAsE;QACtE,SAAS,CAAC;YACR,MAAM,IAAI,GACR,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;YACvC,IAAI,CAAC,IAAI;gBAAE,MAAK;YAChB,4EAA4E;YAC5E,gFAAgF;YAChF,qFAAqF;YACrF,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;YACrB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;YAC5B,IAAI,MAAM,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC;gBAAE,OAAO,IAAI,CAAA;YAClF,6DAA6D;YAC7D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACrB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACxD,CAAC;QACD,uFAAuF;QACvF,0FAA0F;QAC1F,2FAA2F;QAC3F,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,CAAA;QAC1E,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,MAAkB,CAAA;QACtB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAC5C,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,aAAa,EAAE,CAAA;QACtB,CAAC;QACD,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAA;QACvB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,yEAAyE;IACjE,KAAK,CAAC,WAAW,CAAC,SAAkB;QAC1C,MAAM,EAAE,GAAG,QAAQ,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAA;QACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;YACpD,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,oFAAoF;YACpF,iFAAiF;YACjF,8EAA8E;YAC9E,UAAU,EAAE,IAAI,CAAC,kBAAkB;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE;YACxB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;QACxD,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAe,EAAE,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,CAAA;QACtE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzB,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,WAAW;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAA;QAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC,aAAa,CAAA;QAC5D,IAAI,OAAO,IAAI,CAAC;YAAE,OAAM;QACxB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,IAAI,EAAE;YACzC,IAAI,CAAC;gBACH,IAAI,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;YAC1D,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,gFAAgF;gBAChF,+EAA+E;gBAC/E,0EAA0E;gBAC1E,MAAM,CAAC,IAAI,CAAC,iDAAiD,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACtF,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,gBAAgB;QAC5B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;QACzE,KAAK,MAAM,WAAW,IAAI,GAAG,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAC1E,CAAC;IACH,CAAC;IAED,0FAA0F;IAClF,KAAK,CAAC,QAAQ;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAA;QACxC,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,MAAM,IAAI,CAAC;gBAAE,MAAK;YACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAA;YACxD,MAAM,EAAE,CAAA;QACV,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAI,IAAI,CAAC,aAAa,IAAI,CAAC;YAAE,OAAM;QACnC,MAAM,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YACjC,iDAAiD;YACjD,IAAI,MAAM,CAAC,QAAQ;gBAAE,OAAM;YAC3B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YACvB,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAChF,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;QACtB,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAA;IAC5B,CAAC;IAEO,iBAAiB,CAAC,MAAkB;QAC1C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC9B,MAAM,CAAC,SAAS,GAAG,SAAS,CAAA;QAC9B,CAAC;IACH,CAAC;IAED,8EAA8E;IACtE,UAAU,CAAC,MAAkB;QACnC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAC9B,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACzC,CAAC;IAED,2EAA2E;IAE3E,wFAAwF;IAChF,KAAK,CAAC,OAAO,CACnB,KAAa;QAEb,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACpC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAA;QACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC7D,IAAI,CAAC,WAAW;YAAE,OAAO,SAAS,CAAA;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;QACpE,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAA;QAC/B,MAAM,QAAQ,GAAG,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAA;QAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC/B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,WAAmB;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,CAAA;QACjD,IAAI,SAAkB,CAAA;QACtB,SAAS,CAAC;YACR,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjF,SAAS,GAAG,GAAG,CAAA;gBACf,OAAO,SAAS,CAAA;YAClB,CAAC,CAAC,CAAA;YACF,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAA;YAC7B,mFAAmF;YACnF,6EAA6E;YAC7E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAI,KAAK,CACb,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,qCAAqC,EAAE,SAAS,CAAC,CACzF,CAAA;YACH,CAAC;YACD,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CACb,MAAM,IAAI,CAAC,cAAc,CACvB,WAAW,EACX,sDAAsD,EACtD,SAAS,CACV,CACF,CAAA;YACH,CAAC;YACD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAA2B,EAAE,WAAmB;QAC1E,wFAAwF;QACxF,wFAAwF;QACxF,2FAA2F;QAC3F,wFAAwF;QACxF,4FAA4F;QAC5F,iFAAiF;QACjF,MAAM,oBAAoB,CAAC;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ;YACR,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,0FAA0F;YAC1F,4FAA4F;YAC5F,4FAA4F;YAC5F,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC3E,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,0CAA0C,CAAC;YAC7F,YAAY,EAAE,GAAG,EAAE,CACjB,IAAI,CAAC,cAAc,CACjB,WAAW,EACX,cAAc,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,kDAAkD,CAC/F;SACJ,CAAC,CAAA;QACF,2FAA2F;QAC3F,8FAA8F;QAC9F,yFAAyF;QACzF,sFAAsF;QACtF,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,oBAAoB,CAAC;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,QAAQ;gBACR,MAAM,EAAE,IAAI,CAAC,YAAY;gBACzB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,QAAQ,EAAE,IAAI,CAAC,eAAe;gBAC9B,MAAM,EAAE,IAAI,CAAC,oBAAoB;gBACjC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;gBAC1C,MAAM,EAAE,IAAI,CAAC,gBAAgB;aAC9B,CAAC,CAAA;YACF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA;QAC7B,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,cAAc,CAC1B,WAAmB,EACnB,IAAY,EACZ,SAAmB;QAEnB,MAAM,KAAK,GAAG,CAAC,aAAa,WAAW,IAAI,IAAI,GAAG,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1D,IAAI,MAAM,CAAC,IAAI,EAAE;YAAE,KAAK,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QAC7D,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACrE,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;QAChD,2FAA2F;QAC3F,qFAAqF;QACrF,4DAA4D;QAC5D,OAAO,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IACvC,CAAC;IAED;;;;;;;;;OASG;IACK,aAAa,CAAC,WAAmB;QACvC,IAAI,OAA4D,CAAA;QAChE,OAAO,GAAG,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,aAAa,CACzB,SAAwD;QAExD,OAAO,CAAC,MAAM,SAAS,EAAE,CAAC,EAAE,IAAI,KAAK,CAAC,CAAA;IACxC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACK,KAAK,CAAC,mBAAmB,CAC/B,WAAmB,EACnB,SAAwD;QAExD,MAAM,IAAI,GAAG,MAAM,SAAS,EAAE,CAAA;QAC9B,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QACrE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAA;QACpC,MAAM,KAAK,GAAG;YACZ,IAAI;gBACF,CAAC,CAAC,aAAa,WAAW,4CAA4C,IAAI,CAAC,WAAW,EAAE;gBACxF,CAAC,CAAC,aAAa,WAAW,+FAA+F;SAC5H,CAAA;QACD,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAA;QAChD,uFAAuF;QACvF,mFAAmF;QACnF,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,KAAK,CAAC,gBAAgB,CAC5B,WAAmB,EACnB,KAAoB,EACpB,SAAwD;QAExD,IAAI,KAAK,KAAK,aAAa;YAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QACpF,OAAO,CACL,eAAe,WAAW,+DAA+D;YACzF,wFAAwF;YACxF,yCAAyC,CAC1C,CAAA;IACH,CAAC;CACF;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,QAAwB;IAChD,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAA;IACnC,MAAM,GAAG,GAA2B,EAAE,CAAA;IACtC,IAAI,QAAQ,EAAE,aAAa;QAAE,GAAG,CAAC,sBAAsB,GAAG,QAAQ,CAAC,aAAa,CAAA;IAChF,IAAI,QAAQ,EAAE,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,kBAAkB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,cAAc,CAAC,GAAiB;IACvC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,CAAA;AAC9C,CAAC;AAED,mFAAmF;AACnF,SAAS,SAAS,CAAC,IAA6B;IAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACtB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,SAAS,CAAA;IAC/D,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAA2C,CAAA;IACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC9F,OAAO,GAAG,KAAK,IAAI,IAAI,EAAE,CAAA;AAC3B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,oCAAoC,CAClD,GAAsB,EACtB,QAAwB,EACxB,UAAiD;IAEjD,+FAA+F;IAC/F,8FAA8F;IAC9F,0FAA0F;IAC1F,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAA;IACtC,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAA;IAC3B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IAC3C,OAAO,IAAI,6BAA6B,CAAC;QACvC,KAAK;QACL,2FAA2F;QAC3F,2FAA2F;QAC3F,6FAA6F;QAC7F,yDAAyD;QACzD,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC;QACnC,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC;QAClC,YAAY,EAAE,0BAA0B,CAAC,GAAG,CAAC;QAC7C,OAAO,EAAE,GAAG,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,SAAS;QACtD,wFAAwF;QACxF,0FAA0F;QAC1F,kEAAkE;QAClE,eAAe,EAAE,yBAAyB,EAAE;QAC5C,oBAAoB,EAAE,KAAK,KAAK,yBAAyB;QACzD,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QACnD,kFAAkF;QAClF,+EAA+E;QAC/E,uDAAuD;QACvD,kBAAkB,EAAE,GAAG,CAAC,iCAAiC,EAAE,IAAI,EAAE,KAAK,OAAO;QAC7E,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,kFAAkF;QAClF,6FAA6F;QAC7F,2FAA2F;QAC3F,2FAA2F;QAC3F,gGAAgG;QAChG,UAAU,EAAE,GAA2B,EAAE;YACvC,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAA;YAC7D,OAAO,YAAY,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACnE,CAAC;QACD,oFAAoF;QACpF,uFAAuF;QACvF,GAAG,CAAC,IAAI;YACN,CAAC,CAAC;gBACE,QAAQ,EAAE,IAAI,CAAC,IAAI;gBACnB,WAAW,EAAE,IAAI,CAAC,OAAO;gBACzB,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,aAAa,EAAE,IAAI,CAAC,SAAS;aAC9B;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -71,9 +71,9 @@ export class LocalPreviewTransport {
|
|
|
71
71
|
this.requestTimeoutMs = options.requestTimeoutMs ?? 30_000;
|
|
72
72
|
}
|
|
73
73
|
async start(ref, spec, servePort) {
|
|
74
|
-
const
|
|
74
|
+
const containerKey = previewRunId(ref.frameId);
|
|
75
75
|
// Fresh container each start (a re-start replaces any prior preview for the frame).
|
|
76
|
-
await this.adapter.removeRun(this.exec,
|
|
76
|
+
await this.adapter.removeRun(this.exec, containerKey);
|
|
77
77
|
// On a localhost-publishing runtime (Docker family) PIN the host port to the serve port so
|
|
78
78
|
// the browsable origin is `http://localhost:<servePort>` — deterministic and knowable ahead
|
|
79
79
|
// of provision, matching the CORS origin a deployer injects (`frontendOriginsForService`).
|
|
@@ -82,7 +82,7 @@ export class LocalPreviewTransport {
|
|
|
82
82
|
let containerId;
|
|
83
83
|
try {
|
|
84
84
|
containerId = await this.adapter.run(this.exec, {
|
|
85
|
-
|
|
85
|
+
containerKey,
|
|
86
86
|
image: this.image,
|
|
87
87
|
sharedSecret: this.sharedSecret,
|
|
88
88
|
// A preview only builds + serves a static app (no Docker-in-Docker), so never privileged.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalPreviewTransport.js","sourceRoot":"","sources":["../src/LocalPreviewTransport.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LocalPreviewTransport.js","sourceRoot":"","sources":["../src/LocalPreviewTransport.ts"],"names":[],"mappings":"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"}
|
package/dist/harnessImage.d.ts
CHANGED
|
@@ -3,12 +3,30 @@
|
|
|
3
3
|
* `@cat-factory/executor-harness`'s version (the value CI tags the published image with, and
|
|
4
4
|
* the same tag `deploy/backend` pins). Bump it whenever the harness image bumps.
|
|
5
5
|
*/
|
|
6
|
-
export declare const RECOMMENDED_HARNESS_IMAGE = "ghcr.io/kibertoad/cat-factory-executor:1.
|
|
6
|
+
export declare const RECOMMENDED_HARNESS_IMAGE = "ghcr.io/kibertoad/cat-factory-executor:1.124.0";
|
|
7
|
+
/**
|
|
8
|
+
* The UI-TESTER image this backend release is matched to: the same harness plus Playwright +
|
|
9
|
+
* Chromium, pnpm/yarn, `serve` and a headless JRE + WireMock. It carries the executor harness's
|
|
10
|
+
* version, because it IS that harness with more tooling, so the two tags bump together.
|
|
11
|
+
*
|
|
12
|
+
* A step declaring `image: 'ui'` (the browser-driven `tester-ui` kind) dispatches to its own
|
|
13
|
+
* container on this image, alongside the run's ordinary one.
|
|
14
|
+
*/
|
|
15
|
+
export declare const RECOMMENDED_UI_HARNESS_IMAGE = "ghcr.io/kibertoad/cat-factory-executor-ui:1.124.0";
|
|
7
16
|
/**
|
|
8
17
|
* The effective harness image ref: an explicit `LOCAL_HARNESS_IMAGE` wins (a custom build, a
|
|
9
18
|
* different pin, or a mutable tag), else the backend-matched {@link RECOMMENDED_HARNESS_IMAGE}.
|
|
10
19
|
*/
|
|
11
20
|
export declare function resolveHarnessImage(env: NodeJS.ProcessEnv): string;
|
|
21
|
+
/**
|
|
22
|
+
* The effective UI-tester image ref, the `image: 'ui'` sibling of {@link resolveHarnessImage}:
|
|
23
|
+
* an explicit `LOCAL_HARNESS_IMAGE_UI` wins, else {@link RECOMMENDED_UI_HARNESS_IMAGE}.
|
|
24
|
+
*
|
|
25
|
+
* It has its OWN override rather than deriving a `-ui` suffix from `LOCAL_HARNESS_IMAGE`,
|
|
26
|
+
* because a developer pointing the base at a locally built tag has not thereby built a UI image
|
|
27
|
+
* too, and a derived ref would send them to a tag that does not exist with nothing saying why.
|
|
28
|
+
*/
|
|
29
|
+
export declare function resolveUiHarnessImage(env: NodeJS.ProcessEnv): string;
|
|
12
30
|
/**
|
|
13
31
|
* Resolve the boot-refresh mode from `LOCAL_HARNESS_IMAGE_REFRESH`. Any off-style value
|
|
14
32
|
* (`false`/`0`/`off`/`no`/`none`/`disabled`, matching the repo's other flags via
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harnessImage.d.ts","sourceRoot":"","sources":["../src/harnessImage.ts"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,mDAAmD,CAAA;AAEzF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAElE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,KAAK,CAEzE;AAED,oFAAoF;AACpF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAEvF,UAAU,eAAe;IACvB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,0BAA0B;IACzC,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAA;IACb,mFAAmF;IACnF,WAAW,EAAE,MAAM,CAAA;IACnB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAA;IACd,2FAA2F;IAC3F,SAAS,EAAE,MAAM,CAAA;IACjB,+EAA+E;IAC/E,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,eAAe,CAAA;CACrB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFzF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAMtD"}
|
|
1
|
+
{"version":3,"file":"harnessImage.d.ts","sourceRoot":"","sources":["../src/harnessImage.ts"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,mDAAmD,CAAA;AAEzF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,sDAAsD,CAAA;AAE/F;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAElE;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,KAAK,CAEzE;AAED,oFAAoF;AACpF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAEvF,UAAU,eAAe;IACvB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC/B,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAChC;AAED,MAAM,WAAW,0BAA0B;IACzC,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAA;IACb,mFAAmF;IACnF,WAAW,EAAE,MAAM,CAAA;IACnB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAA;IACd,2FAA2F;IAC3F,SAAS,EAAE,MAAM,CAAA;IACjB,+EAA+E;IAC/E,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,IAAI,EAAE,SAAS,CAAA;IACf,GAAG,EAAE,eAAe,CAAA;CACrB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFzF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,8FAA8F;AAC9F,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAMtD"}
|
package/dist/harnessImage.js
CHANGED
|
@@ -22,7 +22,16 @@ import { isOffValue } from './envFlags.js';
|
|
|
22
22
|
* `@cat-factory/executor-harness`'s version (the value CI tags the published image with, and
|
|
23
23
|
* the same tag `deploy/backend` pins). Bump it whenever the harness image bumps.
|
|
24
24
|
*/
|
|
25
|
-
export const RECOMMENDED_HARNESS_IMAGE = 'ghcr.io/kibertoad/cat-factory-executor:1.
|
|
25
|
+
export const RECOMMENDED_HARNESS_IMAGE = 'ghcr.io/kibertoad/cat-factory-executor:1.124.0';
|
|
26
|
+
/**
|
|
27
|
+
* The UI-TESTER image this backend release is matched to: the same harness plus Playwright +
|
|
28
|
+
* Chromium, pnpm/yarn, `serve` and a headless JRE + WireMock. It carries the executor harness's
|
|
29
|
+
* version, because it IS that harness with more tooling, so the two tags bump together.
|
|
30
|
+
*
|
|
31
|
+
* A step declaring `image: 'ui'` (the browser-driven `tester-ui` kind) dispatches to its own
|
|
32
|
+
* container on this image, alongside the run's ordinary one.
|
|
33
|
+
*/
|
|
34
|
+
export const RECOMMENDED_UI_HARNESS_IMAGE = 'ghcr.io/kibertoad/cat-factory-executor-ui:1.124.0';
|
|
26
35
|
/**
|
|
27
36
|
* The effective harness image ref: an explicit `LOCAL_HARNESS_IMAGE` wins (a custom build, a
|
|
28
37
|
* different pin, or a mutable tag), else the backend-matched {@link RECOMMENDED_HARNESS_IMAGE}.
|
|
@@ -30,6 +39,17 @@ export const RECOMMENDED_HARNESS_IMAGE = 'ghcr.io/kibertoad/cat-factory-executor
|
|
|
30
39
|
export function resolveHarnessImage(env) {
|
|
31
40
|
return env.LOCAL_HARNESS_IMAGE?.trim() || RECOMMENDED_HARNESS_IMAGE;
|
|
32
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* The effective UI-tester image ref, the `image: 'ui'` sibling of {@link resolveHarnessImage}:
|
|
44
|
+
* an explicit `LOCAL_HARNESS_IMAGE_UI` wins, else {@link RECOMMENDED_UI_HARNESS_IMAGE}.
|
|
45
|
+
*
|
|
46
|
+
* It has its OWN override rather than deriving a `-ui` suffix from `LOCAL_HARNESS_IMAGE`,
|
|
47
|
+
* because a developer pointing the base at a locally built tag has not thereby built a UI image
|
|
48
|
+
* too, and a derived ref would send them to a tag that does not exist with nothing saying why.
|
|
49
|
+
*/
|
|
50
|
+
export function resolveUiHarnessImage(env) {
|
|
51
|
+
return env.LOCAL_HARNESS_IMAGE_UI?.trim() || RECOMMENDED_UI_HARNESS_IMAGE;
|
|
52
|
+
}
|
|
33
53
|
/**
|
|
34
54
|
* Resolve the boot-refresh mode from `LOCAL_HARNESS_IMAGE_REFRESH`. Any off-style value
|
|
35
55
|
* (`false`/`0`/`off`/`no`/`none`/`disabled`, matching the repo's other flags via
|
package/dist/harnessImage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harnessImage.js","sourceRoot":"","sources":["../src/harnessImage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"harnessImage.js","sourceRoot":"","sources":["../src/harnessImage.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,23 +22,40 @@ export declare class AppleContainerRuntimeAdapter implements ContainerRuntimeAda
|
|
|
22
22
|
hostAlias: string;
|
|
23
23
|
installId: string;
|
|
24
24
|
});
|
|
25
|
-
/**
|
|
25
|
+
/**
|
|
26
|
+
* The deterministic container name (== id) for a CONTAINER KEY, scoped to this installation.
|
|
27
|
+
*
|
|
28
|
+
* The key is `<variant>:<runId>` for a non-default executor image, and `:` is not a legal
|
|
29
|
+
* container-name character — so the variant is re-encoded with a `.` rather than left to the
|
|
30
|
+
* sanitiser below. Sanitising it would map `ui:run-1` onto `ui-run-1`, which
|
|
31
|
+
* {@link listRunContainers} cannot tell from a run genuinely called `ui-run-1`: the orphan
|
|
32
|
+
* sweep then asks about a run that does not exist, finds nothing, and deletes a live UI-tester
|
|
33
|
+
* container mid-step. `.` round-trips because a run id uses `[a-zA-Z0-9_]` only.
|
|
34
|
+
*/
|
|
26
35
|
private runName;
|
|
36
|
+
/**
|
|
37
|
+
* The inverse of {@link runName}: the container key a managed container's name encodes.
|
|
38
|
+
*
|
|
39
|
+
* A leading `<variant>.` segment is decoded back to the `<variant>:` prefix
|
|
40
|
+
* `containerKeyForRef` produced, and ONLY when it names a variant this build knows — a run id
|
|
41
|
+
* that happened to contain a dot is left whole rather than split at it.
|
|
42
|
+
*/
|
|
43
|
+
private containerKeyFromName;
|
|
27
44
|
/** Whether a listed container is one THIS install manages (matched on either the id or the name). */
|
|
28
45
|
private isManaged;
|
|
29
46
|
run(exec: ContainerExec, spec: RunContainerSpec): Promise<string>;
|
|
30
|
-
find(exec: ContainerExec,
|
|
47
|
+
find(exec: ContainerExec, containerKey: string): Promise<string | undefined>;
|
|
31
48
|
endpoint(exec: ContainerExec, containerId: string, inContainerPort?: number): Promise<ContainerEndpoint | undefined>;
|
|
32
49
|
isRunning(exec: ContainerExec, containerId: string): Promise<boolean>;
|
|
33
50
|
exitState(exec: ContainerExec, containerId: string): Promise<ContainerExitState | undefined>;
|
|
34
51
|
logs(exec: ContainerExec, containerId: string): Promise<string>;
|
|
35
52
|
remove(exec: ContainerExec, containerId: string): Promise<void>;
|
|
36
|
-
removeRun(exec: ContainerExec,
|
|
53
|
+
removeRun(exec: ContainerExec, containerKey: string): Promise<void>;
|
|
37
54
|
reapExited(exec: ContainerExec): Promise<number>;
|
|
38
55
|
/** Apple `container` doesn't support the warm pool (see capabilities.pooling=false). */
|
|
39
56
|
listPoolMembers(): Promise<string[]>;
|
|
40
57
|
listRunContainers(exec: ContainerExec): Promise<Array<{
|
|
41
|
-
|
|
58
|
+
containerKey: string;
|
|
42
59
|
containerId: string;
|
|
43
60
|
}>>;
|
|
44
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appleContainerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/appleContainerRuntime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appleContainerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/appleContainerRuntime.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAG5B,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAA;AAgH9B,qBAAa,4BAA6B,YAAW,uBAAuB;IAC1E,QAAQ,CAAC,EAAE,EAAG,OAAO,CAAS;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAG1B,QAAQ,CAAC,oBAAoB,SAAQ;IAIrC,QAAQ,CAAC,YAAY;QAAK,SAAS;QAAS,OAAO;MAAS;IAE5D;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAElC,YAAY,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAK7E;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,OAAO;IAQf;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAU5B,qGAAqG;IACrG,OAAO,CAAC,SAAS;IAIX,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAuBtE;IAEK,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQjF;IAEK,QAAQ,CACZ,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,MAAqB,GACrC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAWxC;IAEK,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAM1E;IAEK,SAAS,CACb,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAWzC;IAEK,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQpE;IAEK,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;IAEK,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAExE;IAEK,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAYrD;IAED,wFAAwF;IAClF,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAEzC;IAEK,iBAAiB,CACrB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAiB/D;CACF"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { isRunnerImageVariant, parseContainerKey } from '@cat-factory/kernel';
|
|
1
2
|
import { formatContainerLogs, HARNESS_PORT, } from './containerRuntime.js';
|
|
2
3
|
// The Apple `container` adapter (macOS Containerization framework). It diverges from the
|
|
3
4
|
// Docker CLI in three ways that the seam absorbs:
|
|
4
5
|
// 1. Verbs: `container run | list | inspect | delete` (no `ps`/`rm`, no `--filter`,
|
|
5
6
|
// no `inspect -f` template) — so we list-all + filter client-side and parse JSON.
|
|
6
|
-
// 2. Identity: `--name` IS the container id, so a
|
|
7
|
-
// name (`cf-<
|
|
7
|
+
// 2. Identity: `--name` IS the container id, so a container is addressed by a deterministic
|
|
8
|
+
// name (`cf-<installId>-<containerKey>`); a managed label marks ours for reaping.
|
|
8
9
|
// 3. Networking: each container runs in its own VM with its own IP — there is no
|
|
9
10
|
// published-port-on-loopback, so the orchestrator connects to `<containerIP>:8080`
|
|
10
11
|
// directly (read from `container inspect`). There is no Docker-in-Docker, so
|
|
@@ -132,18 +133,46 @@ export class AppleContainerRuntimeAdapter {
|
|
|
132
133
|
this.installId = options.installId;
|
|
133
134
|
this.namePrefix = `${NAME_PREFIX}${options.installId}-`;
|
|
134
135
|
}
|
|
135
|
-
/**
|
|
136
|
-
|
|
136
|
+
/**
|
|
137
|
+
* The deterministic container name (== id) for a CONTAINER KEY, scoped to this installation.
|
|
138
|
+
*
|
|
139
|
+
* The key is `<variant>:<runId>` for a non-default executor image, and `:` is not a legal
|
|
140
|
+
* container-name character — so the variant is re-encoded with a `.` rather than left to the
|
|
141
|
+
* sanitiser below. Sanitising it would map `ui:run-1` onto `ui-run-1`, which
|
|
142
|
+
* {@link listRunContainers} cannot tell from a run genuinely called `ui-run-1`: the orphan
|
|
143
|
+
* sweep then asks about a run that does not exist, finds nothing, and deletes a live UI-tester
|
|
144
|
+
* container mid-step. `.` round-trips because a run id uses `[a-zA-Z0-9_]` only.
|
|
145
|
+
*/
|
|
146
|
+
runName(containerKey) {
|
|
147
|
+
const { runId, image } = parseContainerKey(containerKey);
|
|
137
148
|
// Container names allow [a-zA-Z0-9][a-zA-Z0-9_.-]*; run ids are already in that set,
|
|
138
149
|
// but sanitise defensively so an unusual id can't produce an invalid name.
|
|
139
|
-
|
|
150
|
+
const sanitised = runId.replace(/[^a-zA-Z0-9_.-]/g, '-');
|
|
151
|
+
return `${this.namePrefix}${image ? `${image}.${sanitised}` : sanitised}`;
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* The inverse of {@link runName}: the container key a managed container's name encodes.
|
|
155
|
+
*
|
|
156
|
+
* A leading `<variant>.` segment is decoded back to the `<variant>:` prefix
|
|
157
|
+
* `containerKeyForRef` produced, and ONLY when it names a variant this build knows — a run id
|
|
158
|
+
* that happened to contain a dot is left whole rather than split at it.
|
|
159
|
+
*/
|
|
160
|
+
containerKeyFromName(name) {
|
|
161
|
+
const rest = name.slice(this.namePrefix.length);
|
|
162
|
+
const dot = rest.indexOf('.');
|
|
163
|
+
if (dot <= 0)
|
|
164
|
+
return rest;
|
|
165
|
+
const prefix = rest.slice(0, dot);
|
|
166
|
+
return isRunnerImageVariant(prefix) && prefix !== 'default'
|
|
167
|
+
? `${prefix}:${rest.slice(dot + 1)}`
|
|
168
|
+
: rest;
|
|
140
169
|
}
|
|
141
170
|
/** Whether a listed container is one THIS install manages (matched on either the id or the name). */
|
|
142
171
|
isManaged(row) {
|
|
143
172
|
return row.id.startsWith(this.namePrefix) || (row.name?.startsWith(this.namePrefix) ?? false);
|
|
144
173
|
}
|
|
145
174
|
async run(exec, spec) {
|
|
146
|
-
const name = this.runName(spec.
|
|
175
|
+
const name = this.runName(spec.containerKey);
|
|
147
176
|
const args = [
|
|
148
177
|
'run',
|
|
149
178
|
'-d',
|
|
@@ -168,8 +197,8 @@ export class AppleContainerRuntimeAdapter {
|
|
|
168
197
|
// The name IS the container id; the transport addresses everything by it.
|
|
169
198
|
return name;
|
|
170
199
|
}
|
|
171
|
-
async find(exec,
|
|
172
|
-
const name = this.runName(
|
|
200
|
+
async find(exec, containerKey) {
|
|
201
|
+
const name = this.runName(containerKey);
|
|
173
202
|
const rows = parseList((await exec(['list', '--all', '--format', 'json'])).stdout);
|
|
174
203
|
// The deterministic name is the addressable handle (inspect/delete accept it). Match it
|
|
175
204
|
// against either the `id` or the `name` field, since `container list`'s `id` may be a
|
|
@@ -226,8 +255,8 @@ export class AppleContainerRuntimeAdapter {
|
|
|
226
255
|
async remove(exec, containerId) {
|
|
227
256
|
await exec(['delete', '--force', containerId]).catch(() => undefined);
|
|
228
257
|
}
|
|
229
|
-
async removeRun(exec,
|
|
230
|
-
await this.remove(exec, this.runName(
|
|
258
|
+
async removeRun(exec, containerKey) {
|
|
259
|
+
await this.remove(exec, this.runName(containerKey));
|
|
231
260
|
}
|
|
232
261
|
async reapExited(exec) {
|
|
233
262
|
// Reap only managed containers in a recognised TERMINAL state — never one whose status
|
|
@@ -246,17 +275,19 @@ export class AppleContainerRuntimeAdapter {
|
|
|
246
275
|
}
|
|
247
276
|
async listRunContainers(exec) {
|
|
248
277
|
// Running (non-terminal) managed VMs for THIS install. The deterministic name IS
|
|
249
|
-
// `cf-<installId>-<
|
|
250
|
-
//
|
|
251
|
-
//
|
|
278
|
+
// `cf-<installId>-<containerKey>` with the key's variant separator re-encoded, so
|
|
279
|
+
// `containerKeyFromName` recovers exactly what `runName` was given. Pooling is unsupported
|
|
280
|
+
// here, so every managed container is a per-run one. The port's `runId` field carries the
|
|
281
|
+
// CONTAINER KEY (the transport maps it back to a run); a lossy recovery here is what makes
|
|
282
|
+
// the orphan sweep delete a live container, so the two functions are exact inverses.
|
|
252
283
|
const rows = parseList((await exec(['list', '--all', '--format', 'json'])).stdout).filter((r) => this.isManaged(r) && !TERMINAL_STATUSES.has(r.status));
|
|
253
284
|
return rows
|
|
254
285
|
.map((r) => {
|
|
255
286
|
const handle = r.name ?? r.id;
|
|
256
287
|
const named = handle.startsWith(this.namePrefix) ? handle : (r.id ?? handle);
|
|
257
|
-
return {
|
|
288
|
+
return { containerKey: this.containerKeyFromName(named), containerId: handle };
|
|
258
289
|
})
|
|
259
|
-
.filter((c) => c.
|
|
290
|
+
.filter((c) => c.containerKey && c.containerId);
|
|
260
291
|
}
|
|
261
292
|
}
|
|
262
293
|
//# sourceMappingURL=appleContainerRuntime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appleContainerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/appleContainerRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,mBAAmB,EACnB,YAAY,GAEb,MAAM,uBAAuB,CAAA;AAE9B,yFAAyF;AACzF,kDAAkD;AAClD,sFAAsF;AACtF,uFAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"appleContainerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/appleContainerRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,12 +67,19 @@ export interface RuntimeCapabilities {
|
|
|
67
67
|
/** A container to start — per-run, or a reusable POOL member when `pool` is set. */
|
|
68
68
|
export interface RunContainerSpec {
|
|
69
69
|
/**
|
|
70
|
-
*
|
|
71
|
-
*
|
|
72
|
-
*
|
|
73
|
-
*
|
|
70
|
+
* The container's IDENTITY within this install (its name and/or label). For an ordinary
|
|
71
|
+
* per-run container this is the run id; for a step on a non-default executor image it is
|
|
72
|
+
* kernel's variant-qualified `containerKeyForRef` key, since such a step gets its OWN
|
|
73
|
+
* container beside the run's. For a POOL member it is a synthetic member id used only for
|
|
74
|
+
* the container name — the member is NOT labelled with it (lease state lives in the
|
|
75
|
+
* transport), so a label lookup never finds it; the transport tracks
|
|
76
|
+
* `containerId → {repo, leasedTo}` in-process instead.
|
|
77
|
+
*
|
|
78
|
+
* Named for what it IS rather than `runId`, because an adapter that reads it as a run id
|
|
79
|
+
* writes an encoding it cannot reverse: that is how the Apple adapter's name sanitiser came
|
|
80
|
+
* to fold `ui:<runId>` onto a name the orphan sweep then read as a dead run.
|
|
74
81
|
*/
|
|
75
|
-
|
|
82
|
+
containerKey: string;
|
|
76
83
|
image: string;
|
|
77
84
|
sharedSecret: string;
|
|
78
85
|
/** Run privileged (only the Tester `test` kind, only when the runtime supports DinD). */
|
|
@@ -132,8 +139,8 @@ export interface ContainerRuntimeAdapter {
|
|
|
132
139
|
readonly publishesToLocalhost: boolean;
|
|
133
140
|
/** Start a per-run container detached; resolves to its container id/name. */
|
|
134
141
|
run(exec: ContainerExec, spec: RunContainerSpec): Promise<string>;
|
|
135
|
-
/** The (running-or-exited) container for a
|
|
136
|
-
find(exec: ContainerExec,
|
|
142
|
+
/** The (running-or-exited) container for a {@link RunContainerSpec.containerKey}, if any. */
|
|
143
|
+
find(exec: ContainerExec, containerKey: string): Promise<string | undefined>;
|
|
137
144
|
/**
|
|
138
145
|
* The host+port the orchestrator should connect to reach the container's `inContainerPort`
|
|
139
146
|
* (default {@link HARNESS_PORT}), or undefined if not ready. The preview transport passes the
|
|
@@ -179,8 +186,8 @@ export interface ContainerRuntimeAdapter {
|
|
|
179
186
|
logs(exec: ContainerExec, containerId: string): Promise<string>;
|
|
180
187
|
/** Force-remove a single container (idempotent). */
|
|
181
188
|
remove(exec: ContainerExec, containerId: string): Promise<void>;
|
|
182
|
-
/** Force-remove every container
|
|
183
|
-
removeRun(exec: ContainerExec,
|
|
189
|
+
/** Force-remove every container under a container key (idempotent). */
|
|
190
|
+
removeRun(exec: ContainerExec, containerKey: string): Promise<void>;
|
|
184
191
|
/** Reap exited managed containers left by crashes; resolves to the count removed. */
|
|
185
192
|
reapExited(exec: ContainerExec): Promise<number>;
|
|
186
193
|
/**
|
|
@@ -190,13 +197,18 @@ export interface ContainerRuntimeAdapter {
|
|
|
190
197
|
*/
|
|
191
198
|
listPoolMembers(exec: ContainerExec): Promise<string[]>;
|
|
192
199
|
/**
|
|
193
|
-
* Every managed, still-RUNNING per-run container this runtime holds, tagged by
|
|
194
|
-
*
|
|
195
|
-
* `release()` never ran because the previous
|
|
196
|
-
* by {@link reapExited}; this covers the ones still
|
|
200
|
+
* Every managed, still-RUNNING per-run container this runtime holds, tagged by the
|
|
201
|
+
* {@link RunContainerSpec.containerKey} it was started under. Used at boot to reap containers
|
|
202
|
+
* whose run has since gone terminal/away (their `release()` never ran because the previous
|
|
203
|
+
* process crashed). Exited ones are handled by {@link reapExited}; this covers the ones still
|
|
204
|
+
* up.
|
|
205
|
+
*
|
|
206
|
+
* The key must round-trip EXACTLY: the caller maps it back to a run to ask whether that run is
|
|
207
|
+
* still live, so an adapter that cannot recover what it was given reports a live container's
|
|
208
|
+
* run as unknown and the sweep deletes it mid-step.
|
|
197
209
|
*/
|
|
198
210
|
listRunContainers(exec: ContainerExec): Promise<Array<{
|
|
199
|
-
|
|
211
|
+
containerKey: string;
|
|
200
212
|
containerId: string;
|
|
201
213
|
}>>;
|
|
202
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAcA,6DAA6D;AAC7D,eAAO,MAAM,YAAY,OAAO,CAAA;AAEhC,8EAA8E;AAC9E,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE3F;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,OAAQ,CAAA;AAE5C;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAO9F;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAED,0EAA0E;AAC1E,MAAM,WAAW,kBAAkB;IACjC,iGAAiG;IACjG,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,8EAA8E;AAC9E,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,oFAAoF;AACpF,MAAM,WAAW,gBAAgB;IAC/B
|
|
1
|
+
{"version":3,"file":"containerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAcA,6DAA6D;AAC7D,eAAO,MAAM,YAAY,OAAO,CAAA;AAEhC,8EAA8E;AAC9E,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE3F;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,OAAQ,CAAA;AAE5C;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAO9F;AAED,gEAAgE;AAChE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAED,0EAA0E;AAC1E,MAAM,WAAW,kBAAkB;IACjC,iGAAiG;IACjG,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,8EAA8E;AAC9E,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAA;IAClB;;;;;;;OAOG;IACH,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,oFAAoF;AACpF,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;;;;;;OAYG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,yFAAyF;IACzF,UAAU,EAAE,OAAO,CAAA;IACnB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,8EAA8E;IAC9E,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/C;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAA;IACd;;;;;;;;;OASG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC3D;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAA;IAC1C,4FAA4F;IAC5F,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;;;;;;;;OASG;IACH,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAA;IAEtC,6EAA6E;IAC7E,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACjE,6FAA6F;IAC7F,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC5E;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,QAAQ,CACN,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAA;IACzC,kDAAkD;IAClD,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACrE;;;;;;;;;OASG;IACH,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAA;IAC5F;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC/D,oDAAoD;IACpD,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/D,uEAAuE;IACvE,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnE,qFAAqF;IACrF,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAChD;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD;;;;;;;;;;OAUG;IACH,iBAAiB,CACf,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAA;CACjE;AAED,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAA;AAE7E,8FAA8F;AAC9F,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,SAAS,CAAA;IACb,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAA;IACd,6EAA6E;IAC7E,SAAS,EAAE,MAAM,CAAA;IACjB,gFAAgF;IAChF,cAAc,EAAE,OAAO,CAAA;IACvB,iFAAiF;IACjF,SAAS,EAAE,OAAO,CAAA;IAClB,oEAAoE;IACpE,OAAO,EAAE,OAAO,CAAA;IAChB,uDAAuD;IACvD,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAA;CAC3B;AAmED,uFAAuF;AACvF,eAAO,MAAM,WAAW,EAA4B,SAAS,EAAE,CAAA;AAE/D,uFAAuF;AACvF,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,GAAG,cAAc,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAIlE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,SAAS,CAIhF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAI/D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAO/D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,oFAAoF;AACpF,gFAAgF;AAChF,sFAAsF;AACtF,wFAAwF;AACxF,uFAAuF;AACvF,EAAE;AACF,kFAAkF;AAClF,+EAA+E;AAC/E,6DAA6D;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAE5D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAA;AAKhC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAA;AAE5C;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,MAAc,EAAE,SAAkB;IACpF,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAClF,OAAO,sBAAsB,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAA;AACrE,CAAC;
|
|
1
|
+
{"version":3,"file":"containerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/containerRuntime.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,oFAAoF;AACpF,gFAAgF;AAChF,sFAAsF;AACtF,wFAAwF;AACxF,uFAAuF;AACvF,EAAE;AACF,kFAAkF;AAClF,+EAA+E;AAC/E,6DAA6D;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAE5D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAA;AAKhC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAA;AAE5C;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,MAAc,EAAE,SAAkB;IACpF,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAClF,OAAO,sBAAsB,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAA;AACrE,CAAC;AAmND,MAAM,QAAQ,GAAsC;IAClD,gFAAgF;IAChF,gFAAgF;IAChF,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,uFAAuF;IACvF,8FAA8F;IAC9F,0EAA0E;IAC1E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,oFAAoF;IACpF,2EAA2E;IAC3E,QAAQ,EAAE;QACR,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,sBAAsB;QACjC,cAAc,EAAE,IAAI;QACpB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,4EAA4E;IAC5E,mFAAmF;IACnF,sFAAsF;IACtF,iFAAiF;IACjF,4EAA4E;IAC5E,MAAM,EAAE;QACN,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,oBAAoB;QAC/B,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,QAAQ;KACjB;IACD,qFAAqF;IACrF,oFAAoF;IACpF,wFAAwF;IACxF,uFAAuF;IACvF,oEAAoE;IACpE,KAAK,EAAE;QACL,EAAE,EAAE,OAAO;QACX,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,cAAc;QACzB,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,OAAO;KAChB;CACF,CAAA;AAED,uFAAuF;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAgB,CAAA;AAE/D,uFAAuF;AACvF,MAAM,UAAU,cAAc,CAAC,EAAa;IAC1C,OAAO,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAA;AACxC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACrD,MAAM,GAAG,GAAG,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;IAC7D,IAAI,GAAG,IAAK,WAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,GAAgB,CAAA;IAC3E,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAsB;IAC1D,MAAM,GAAG,GAAG,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAA;IAC/C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAA;IAC1B,OAAQ,WAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA;AAChF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,wBAAwB,EAAE,IAAI,EAAE,CAAA;IACrD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAA;IAC7B,OAAO,cAAc,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;AACxD,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAsB;IACrD,MAAM,IAAI,GACR,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE;QACjC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE;QACxB,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE;QACtB,SAAS,CAAA;IACX,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;AACrE,CAAC"}
|
|
@@ -26,17 +26,17 @@ export declare class DockerRuntimeAdapter implements ContainerRuntimeAdapter {
|
|
|
26
26
|
/** The `--filter` pair scoping a daemon-wide enumeration to THIS install's containers. */
|
|
27
27
|
private installFilter;
|
|
28
28
|
run(exec: ContainerExec, spec: RunContainerSpec): Promise<string>;
|
|
29
|
-
find(exec: ContainerExec,
|
|
29
|
+
find(exec: ContainerExec, containerKey: string): Promise<string | undefined>;
|
|
30
30
|
endpoint(exec: ContainerExec, containerId: string, inContainerPort?: number): Promise<ContainerEndpoint | undefined>;
|
|
31
31
|
isRunning(exec: ContainerExec, containerId: string): Promise<boolean>;
|
|
32
32
|
exitState(exec: ContainerExec, containerId: string): Promise<ContainerExitState | undefined>;
|
|
33
33
|
logs(exec: ContainerExec, containerId: string): Promise<string>;
|
|
34
34
|
remove(exec: ContainerExec, containerId: string): Promise<void>;
|
|
35
|
-
removeRun(exec: ContainerExec,
|
|
35
|
+
removeRun(exec: ContainerExec, containerKey: string): Promise<void>;
|
|
36
36
|
reapExited(exec: ContainerExec): Promise<number>;
|
|
37
37
|
listPoolMembers(exec: ContainerExec): Promise<string[]>;
|
|
38
38
|
listRunContainers(exec: ContainerExec): Promise<Array<{
|
|
39
|
-
|
|
39
|
+
containerKey: string;
|
|
40
40
|
containerId: string;
|
|
41
41
|
}>>;
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/dockerRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAG5B,KAAK,gBAAgB,EACrB,KAAK,SAAS,EACf,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"dockerRuntime.d.ts","sourceRoot":"","sources":["../../src/runtimes/dockerRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAG5B,KAAK,gBAAgB,EACrB,KAAK,SAAS,EACf,MAAM,uBAAuB,CAAA;AA2B9B,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,SAAS,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,mFAAmF;IACnF,cAAc,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,OAAO,CAAA;IAClB,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAA;IAChB,oGAAoG;IACpG,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,qBAAa,oBAAqB,YAAW,uBAAuB;IAClE,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,YAAY,EAAE;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAA;IAG/D,QAAQ,CAAC,oBAAoB,QAAO;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAElC,YAAY,OAAO,EAAE,2BAA2B,EAO/C;IAED,0FAA0F;IAC1F,OAAO,CAAC,aAAa;IAIf,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmCtE;IAEK,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAWjF;IAEK,QAAQ,CACZ,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,EACnB,eAAe,GAAE,MAAqB,GACrC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAuBxC;IAEK,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO1E;IAEK,SAAS,CACb,IAAI,EAAE,aAAa,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAqBzC;IAEK,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpE;IAEK,MAAM,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;IAEK,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxE;IAEK,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBrD;IAEK,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAe5D;IAEK,iBAAiB,CACrB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CA2B/D;CACF"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import { formatContainerLogs, HARNESS_PORT, } from './containerRuntime.js';
|
|
2
2
|
// The Docker-CLI adapter — covers Docker, Podman, OrbStack and Colima, which all speak
|
|
3
3
|
// the same `run/ps/port/inspect/rm` surface. It is the behaviour the transport had
|
|
4
|
-
// inline before the seam was extracted, parameterised by binary + networking. A
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
/**
|
|
4
|
+
// inline before the seam was extracted, parameterised by binary + networking. A container
|
|
5
|
+
// is labelled with its container key and a managed marker; the harness `:8080` is published
|
|
6
|
+
// to an ephemeral host port read back with `docker port`.
|
|
7
|
+
/**
|
|
8
|
+
* Labels a per-run container by its CONTAINER KEY: the run id for the ordinary one, and the
|
|
9
|
+
* variant-qualified `ui:<runId>` for a step on another executor image. The label NAME still says
|
|
10
|
+
* `runId` (it is written into live containers, so renaming it would orphan every one a running
|
|
11
|
+
* daemon holds); what it carries is the key, which round-trips verbatim through a label.
|
|
12
|
+
*/
|
|
8
13
|
const LABEL_RUN = 'cat-factory.runId';
|
|
9
14
|
const LABEL_MANAGED = 'cat-factory.managed=local-docker';
|
|
10
15
|
/** Marks a reusable warm-pool member (not bound to any run id; leased in-process). */
|
|
@@ -40,14 +45,14 @@ export class DockerRuntimeAdapter {
|
|
|
40
45
|
return ['--filter', `label=${LABEL_INSTALL}=${this.installId}`];
|
|
41
46
|
}
|
|
42
47
|
async run(exec, spec) {
|
|
43
|
-
// A pool member is labelled `pool=1` and NOT bound to a
|
|
44
|
-
// it in-process); a classic per-run container is labelled by its
|
|
48
|
+
// A pool member is labelled `pool=1` and NOT bound to a container key (the transport leases
|
|
49
|
+
// it in-process); a classic per-run container is labelled by its key. Every container also
|
|
45
50
|
// carries the per-install label so a neighbouring install can't adopt/reap/reuse it.
|
|
46
51
|
const args = [
|
|
47
52
|
'run',
|
|
48
53
|
'-d',
|
|
49
54
|
'--label',
|
|
50
|
-
spec.pool ? LABEL_POOL : `${LABEL_RUN}=${spec.
|
|
55
|
+
spec.pool ? LABEL_POOL : `${LABEL_RUN}=${spec.containerKey}`,
|
|
51
56
|
'--label',
|
|
52
57
|
LABEL_MANAGED,
|
|
53
58
|
'--label',
|
|
@@ -79,12 +84,12 @@ export class DockerRuntimeAdapter {
|
|
|
79
84
|
throw new Error(`${this.binary} run returned no container id`);
|
|
80
85
|
return containerId;
|
|
81
86
|
}
|
|
82
|
-
async find(exec,
|
|
87
|
+
async find(exec, containerKey) {
|
|
83
88
|
const { stdout } = await exec([
|
|
84
89
|
'ps',
|
|
85
90
|
'-aq',
|
|
86
91
|
'--filter',
|
|
87
|
-
`label=${LABEL_RUN}=${
|
|
92
|
+
`label=${LABEL_RUN}=${containerKey}`,
|
|
88
93
|
'--filter',
|
|
89
94
|
`label=${LABEL_MANAGED}`,
|
|
90
95
|
...this.installFilter(),
|
|
@@ -165,12 +170,12 @@ export class DockerRuntimeAdapter {
|
|
|
165
170
|
async remove(exec, containerId) {
|
|
166
171
|
await exec(['rm', '-f', containerId]).catch(() => undefined);
|
|
167
172
|
}
|
|
168
|
-
async removeRun(exec,
|
|
173
|
+
async removeRun(exec, containerKey) {
|
|
169
174
|
const { stdout } = await exec([
|
|
170
175
|
'ps',
|
|
171
176
|
'-aq',
|
|
172
177
|
'--filter',
|
|
173
|
-
`label=${LABEL_RUN}=${
|
|
178
|
+
`label=${LABEL_RUN}=${containerKey}`,
|
|
174
179
|
'--filter',
|
|
175
180
|
`label=${LABEL_MANAGED}`,
|
|
176
181
|
...this.installFilter(),
|
|
@@ -219,9 +224,10 @@ export class DockerRuntimeAdapter {
|
|
|
219
224
|
.filter(Boolean);
|
|
220
225
|
}
|
|
221
226
|
async listRunContainers(exec) {
|
|
222
|
-
// Running (not exited) per-run containers, printed as "<
|
|
223
|
-
// both the
|
|
224
|
-
// already handles; the
|
|
227
|
+
// Running (not exited) per-run containers, printed as "<containerKey>|<containerId>" so we
|
|
228
|
+
// get both the key label and the id in one call. `status=running` excludes what reapExited
|
|
229
|
+
// already handles; the key label excludes pool members (which carry `pool=1` instead). The
|
|
230
|
+
// key rides a LABEL, so it round-trips verbatim however it is spelled.
|
|
225
231
|
const { stdout } = await exec([
|
|
226
232
|
'ps',
|
|
227
233
|
'--filter',
|
|
@@ -241,9 +247,9 @@ export class DockerRuntimeAdapter {
|
|
|
241
247
|
.filter(Boolean)
|
|
242
248
|
.map((line) => {
|
|
243
249
|
const sep = line.indexOf('|');
|
|
244
|
-
return {
|
|
250
|
+
return { containerKey: line.slice(0, sep), containerId: line.slice(sep + 1) };
|
|
245
251
|
})
|
|
246
|
-
.filter((c) => c.
|
|
252
|
+
.filter((c) => c.containerKey && c.containerId);
|
|
247
253
|
}
|
|
248
254
|
}
|
|
249
255
|
//# sourceMappingURL=dockerRuntime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/dockerRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,mBAAmB,EACnB,YAAY,GAGb,MAAM,uBAAuB,CAAA;AAE9B,uFAAuF;AACvF,mFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"dockerRuntime.js","sourceRoot":"","sources":["../../src/runtimes/dockerRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,mBAAmB,EACnB,YAAY,GAGb,MAAM,uBAAuB,CAAA;AAE9B,uFAAuF;AACvF,mFAAmF;AACnF,0FAA0F;AAC1F,4FAA4F;AAC5F,0DAA0D;AAE1D;;;;;GAKG;AACH,MAAM,SAAS,GAAG,mBAAmB,CAAA;AACrC,MAAM,aAAa,GAAG,kCAAkC,CAAA;AACxD,sFAAsF;AACtF,MAAM,UAAU,GAAG,oBAAoB,CAAA;AACvC;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAe3C,MAAM,OAAO,oBAAoB;IACtB,EAAE,CAAW;IACb,MAAM,CAAQ;IACd,SAAS,CAAQ;IACjB,YAAY,CAA0C;IAC/D,uFAAuF;IACvF,sEAAsE;IAC7D,oBAAoB,GAAG,IAAI,CAAA;IACnB,cAAc,CAAS;IACvB,SAAS,CAAQ;IAElC,YAAY,OAAoC;QAC9C,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QAClC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;QAC5C,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;QAClC,IAAI,CAAC,YAAY,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAA;IAChF,CAAC;IAED,0FAA0F;IAClF,aAAa;QACnB,OAAO,CAAC,UAAU,EAAE,SAAS,aAAa,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IACjE,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAmB,EAAE,IAAsB;QACnD,4FAA4F;QAC5F,2FAA2F;QAC3F,qFAAqF;QACrF,MAAM,IAAI,GAAG;YACX,KAAK;YACL,IAAI;YACJ,SAAS;YACT,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE;YAC5D,SAAS;YACT,aAAa;YACb,SAAS;YACT,GAAG,aAAa,IAAI,IAAI,CAAC,SAAS,EAAE;YACpC,IAAI;YACJ,eAAe,YAAY,EAAE;YAC7B,IAAI;YACJ,yBAAyB,IAAI,CAAC,YAAY,EAAE;SAC7C,CAAA;QACD,wFAAwF;QACxF,6FAA6F;QAC7F,4EAA4E;QAC5E,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE;YACrC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAA;QAC5D,IAAI,IAAI,CAAC,YAAY;YACnB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACnF,IAAI,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,cAAc;YAAE,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS,eAAe,CAAC,CAAA;QAC/E,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC3E,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAErB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAA;QACpD,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,+BAA+B,CAAC,CAAA;QAChF,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAmB,EAAE,YAAoB;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC;YAC5B,IAAI;YACJ,KAAK;YACL,UAAU;YACV,SAAS,SAAS,IAAI,YAAY,EAAE;YACpC,UAAU;YACV,SAAS,aAAa,EAAE;YACxB,GAAG,IAAI,CAAC,aAAa,EAAE;SACxB,CAAC,CAAA;QACF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,SAAS,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,IAAmB,EACnB,WAAmB,EACnB,eAAe,GAAW,YAAY;QAEtC,mFAAmF;QACnF,wFAAwF;QACxF,wFAAwF;QACxF,mFAAmF;QACnF,qFAAqF;QACrF,uFAAuF;QACvF,oFAAoF;QACpF,iFAAiF;QACjF,IAAI,MAAc,CAAA;QAClB,IAAI,CAAC;YACH,CAAC;YAAA,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,MAAM,CAAC,CAAC,CAAC,CAAA;QAC7E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC;gBAAE,MAAM,GAAG,CAAA;YACtD,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,+EAA+E;QAC/E,qCAAqC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAA;QACjD,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAA;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;YAAE,OAAO,SAAS,CAAA;QACzD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAmB,EAAE,WAAmB;QACtD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,WAAW,CAAC,CAAC,CAAA;YACnF,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM,CAAA;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,IAAmB,EACnB,WAAmB;QAEnB,wFAAwF;QACxF,wFAAwF;QACxF,gFAAgF;QAChF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC;YAC3B,SAAS;YACT,IAAI;YACJ,6DAA6D;YAC7D,WAAW;SACZ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACzB,IAAI,CAAC,SAAS;YAAE,OAAO,SAAS,CAAA;QAChC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC3E,IAAI,OAAO,KAAK,OAAO;YAAE,OAAO,SAAS,CAAA;QACzC,2FAA2F;QAC3F,wFAAwF;QACxF,6DAA6D;QAC7D,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC7B,OAAO;YACL,WAAW,EAAE,aAAa,QAAQ,IAAI,SAAS,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,uCAAuC,CAAC,CAAC,CAAC,EAAE,EAAE;YACvH,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE,CAAA;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAmB,EAAE,WAAmB;QACjD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;YAC5E,OAAO,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC5C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAmB,EAAE,WAAmB;QACnD,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAmB,EAAE,YAAoB;QACvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC;YAC5B,IAAI;YACJ,KAAK;YACL,UAAU;YACV,SAAS,SAAS,IAAI,YAAY,EAAE;YACpC,UAAU;YACV,SAAS,aAAa,EAAE;YACxB,GAAG,IAAI,CAAC,aAAa,EAAE;SACxB,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,MAAM;aACf,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAA;QAClB,IAAI,GAAG,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACzE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAmB;QAClC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC;YAC5B,IAAI;YACJ,KAAK;YACL,UAAU;YACV,SAAS,aAAa,EAAE;YACxB,GAAG,IAAI,CAAC,aAAa,EAAE;YACvB,UAAU;YACV,eAAe;SAChB,CAAC,CAAA;QACF,MAAM,GAAG,GAAG,MAAM;aACf,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAA;QAClB,IAAI,GAAG,CAAC,MAAM;YAAE,MAAM,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACvE,OAAO,GAAG,CAAC,MAAM,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAmB;QACvC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC;YAC5B,IAAI;YACJ,KAAK;YACL,UAAU;YACV,SAAS,aAAa,EAAE;YACxB,GAAG,IAAI,CAAC,aAAa,EAAE;YACvB,UAAU;YACV,SAAS,UAAU,EAAE;SACtB,CAAC,CAAA;QACF,OAAO,MAAM;aACV,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACpB,MAAM,CAAC,OAAO,CAAC,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,IAAmB;QAEnB,2FAA2F;QAC3F,2FAA2F;QAC3F,2FAA2F;QAC3F,uEAAuE;QACvE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC;YAC5B,IAAI;YACJ,UAAU;YACV,SAAS,aAAa,EAAE;YACxB,GAAG,IAAI,CAAC,aAAa,EAAE;YACvB,UAAU;YACV,SAAS,SAAS,EAAE;YACpB,UAAU;YACV,gBAAgB;YAChB,UAAU;YACV,aAAa,SAAS,aAAa;SACpC,CAAC,CAAA;QACF,OAAO,MAAM;aACV,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACZ,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC7B,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAA;QAC/E,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,WAAW,CAAC,CAAA;IACnD,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/local-server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.136.1",
|
|
4
4
|
"description": "Local-mode runtime facade for the Agent Architecture Board: the @cat-factory/node-server stack with agent jobs run as local Docker/Podman containers and GitHub accessed via a personal access token — a developer can run the whole product on their own machine.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -27,25 +27,25 @@
|
|
|
27
27
|
"@hono/node-server": "^2.1.0",
|
|
28
28
|
"drizzle-orm": "1.0.0-rc.4",
|
|
29
29
|
"ws": "^8.21.3",
|
|
30
|
-
"@cat-factory/agents": "0.133.
|
|
31
|
-
"@cat-factory/binary-generators": "0.2.
|
|
30
|
+
"@cat-factory/agents": "0.133.3",
|
|
31
|
+
"@cat-factory/binary-generators": "0.2.2",
|
|
32
32
|
"@cat-factory/contracts": "0.317.0",
|
|
33
|
-
"@cat-factory/executor-harness": "1.
|
|
34
|
-
"@cat-factory/gitlab": "0.20.
|
|
35
|
-
"@cat-factory/integrations": "0.
|
|
36
|
-
"@cat-factory/kernel": "0.
|
|
37
|
-
"@cat-factory/node-server": "0.208.
|
|
38
|
-
"@cat-factory/orchestration": "0.
|
|
39
|
-
"@cat-factory/prompt-fragments": "1.0.
|
|
40
|
-
"@cat-factory/server": "0.
|
|
33
|
+
"@cat-factory/executor-harness": "1.124.0",
|
|
34
|
+
"@cat-factory/gitlab": "0.20.29",
|
|
35
|
+
"@cat-factory/integrations": "0.165.1",
|
|
36
|
+
"@cat-factory/kernel": "0.307.0",
|
|
37
|
+
"@cat-factory/node-server": "0.208.2",
|
|
38
|
+
"@cat-factory/orchestration": "0.277.0",
|
|
39
|
+
"@cat-factory/prompt-fragments": "1.0.83",
|
|
40
|
+
"@cat-factory/server": "0.292.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
43
|
"@types/node": "^26.2.0",
|
|
44
44
|
"@types/ws": "^8.18.1",
|
|
45
45
|
"typescript": "7.0.2",
|
|
46
46
|
"vitest": "^4.1.10",
|
|
47
|
-
"@cat-factory/conformance": "0.45.
|
|
48
|
-
"@cat-factory/gates": "0.10.
|
|
47
|
+
"@cat-factory/conformance": "0.45.9",
|
|
48
|
+
"@cat-factory/gates": "0.10.59"
|
|
49
49
|
},
|
|
50
50
|
"scripts": {
|
|
51
51
|
"build": "tsc -b tsconfig.build.json",
|