@agent-vm/agent-vm 0.0.49 → 0.0.51
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/build/gondolin-image-build-child-entrypoint.d.ts +2 -0
- package/dist/build/gondolin-image-build-child-entrypoint.d.ts.map +1 -0
- package/dist/build/gondolin-image-build-child-entrypoint.js +52 -0
- package/dist/build/gondolin-image-build-child-entrypoint.js.map +1 -0
- package/dist/build/gondolin-image-builder.d.ts +14 -0
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +152 -7
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/build/managed-image-dockerfile.d.ts +11 -5
- package/dist/build/managed-image-dockerfile.d.ts.map +1 -1
- package/dist/build/managed-image-dockerfile.js +62 -13
- package/dist/build/managed-image-dockerfile.js.map +1 -1
- package/dist/build/stale-image-cleaner.d.ts +6 -0
- package/dist/build/stale-image-cleaner.d.ts.map +1 -1
- package/dist/build/stale-image-cleaner.js +32 -0
- package/dist/build/stale-image-cleaner.js.map +1 -1
- package/dist/build/zig-compatibility.d.ts +32 -0
- package/dist/build/zig-compatibility.d.ts.map +1 -0
- package/dist/build/zig-compatibility.js +148 -0
- package/dist/build/zig-compatibility.js.map +1 -0
- package/dist/cli/auth-interactive-command.d.ts +1 -1
- package/dist/cli/auth-interactive-command.d.ts.map +1 -1
- package/dist/cli/auth-interactive-command.js +12 -3
- package/dist/cli/auth-interactive-command.js.map +1 -1
- package/dist/cli/build-command.d.ts +10 -3
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +121 -36
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/cache-commands.d.ts +1 -5
- package/dist/cli/cache-commands.d.ts.map +1 -1
- package/dist/cli/cache-commands.js.map +1 -1
- package/dist/cli/commands/command-definition-support.d.ts +1 -4
- package/dist/cli/commands/command-definition-support.d.ts.map +1 -1
- package/dist/cli/commands/command-definition-support.js +4 -10
- package/dist/cli/commands/command-definition-support.js.map +1 -1
- package/dist/cli/commands/controller-definition.d.ts +2 -4
- package/dist/cli/commands/controller-definition.d.ts.map +1 -1
- package/dist/cli/commands/controller-definition.js +4 -6
- package/dist/cli/commands/controller-definition.js.map +1 -1
- package/dist/cli/commands/create-app.d.ts +2 -4
- package/dist/cli/commands/create-app.d.ts.map +1 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +29 -6
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/manual-templates.d.ts.map +1 -1
- package/dist/cli/manual-templates.js +5 -0
- package/dist/cli/manual-templates.js.map +1 -1
- package/dist/cli/ssh-commands.d.ts +6 -0
- package/dist/cli/ssh-commands.d.ts.map +1 -1
- package/dist/cli/ssh-commands.js +44 -22
- package/dist/cli/ssh-commands.js.map +1 -1
- package/dist/cli/vm-host-system-templates.d.ts.map +1 -1
- package/dist/cli/vm-host-system-templates.js +0 -6
- package/dist/cli/vm-host-system-templates.js.map +1 -1
- package/dist/config/system-cache-identifier.d.ts +5 -2
- package/dist/config/system-cache-identifier.d.ts.map +1 -1
- package/dist/config/system-cache-identifier.js +33 -3
- package/dist/config/system-cache-identifier.js.map +1 -1
- package/dist/config/system-config.d.ts +24 -0
- package/dist/config/system-config.d.ts.map +1 -1
- package/dist/config/system-config.js +22 -0
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/controller-runtime-operations.d.ts +9 -2
- package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
- package/dist/controller/controller-runtime-operations.js +75 -6
- package/dist/controller/controller-runtime-operations.js.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +1 -0
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/git-pull-default-operations.d.ts +1 -0
- package/dist/controller/git-pull-default-operations.d.ts.map +1 -1
- package/dist/controller/git-pull-default-operations.js +100 -43
- package/dist/controller/git-pull-default-operations.js.map +1 -1
- package/dist/controller/git-push-operations.d.ts +1 -0
- package/dist/controller/git-push-operations.d.ts.map +1 -1
- package/dist/controller/git-push-operations.js +50 -32
- package/dist/controller/git-push-operations.js.map +1 -1
- package/dist/controller/git-retry-support.d.ts +3 -2
- package/dist/controller/git-retry-support.d.ts.map +1 -1
- package/dist/controller/git-retry-support.js +16 -8
- package/dist/controller/git-retry-support.js.map +1 -1
- package/dist/controller/heartbeat-sender.d.ts.map +1 -1
- package/dist/controller/heartbeat-sender.js +6 -0
- package/dist/controller/heartbeat-sender.js.map +1 -1
- package/dist/controller/host-git-command.d.ts +6 -0
- package/dist/controller/host-git-command.d.ts.map +1 -0
- package/dist/controller/host-git-command.js +13 -0
- package/dist/controller/host-git-command.js.map +1 -0
- package/dist/controller/http/controller-client.d.ts +9 -2
- package/dist/controller/http/controller-client.d.ts.map +1 -1
- package/dist/controller/http/controller-client.js +13 -3
- package/dist/controller/http/controller-client.js.map +1 -1
- package/dist/controller/http/controller-http-route-support.d.ts +9 -2
- package/dist/controller/http/controller-http-route-support.d.ts.map +1 -1
- package/dist/controller/http/controller-http-route-support.js.map +1 -1
- package/dist/controller/http/controller-request-schemas.d.ts +9 -1
- package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
- package/dist/controller/http/controller-request-schemas.js +11 -2
- package/dist/controller/http/controller-request-schemas.js.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-zone-operation-routes.js +101 -24
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/controller/worker-task-runner.d.ts.map +1 -1
- package/dist/controller/worker-task-runner.js +42 -19
- package/dist/controller/worker-task-runner.js.map +1 -1
- package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts +10 -0
- package/dist/controller/zone-runtimes/zone-runtime-errors.d.ts.map +1 -1
- package/dist/controller/zone-runtimes/zone-runtime-errors.js +14 -0
- package/dist/controller/zone-runtimes/zone-runtime-errors.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js +1 -0
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/operations/doctor.d.ts +0 -3
- package/dist/operations/doctor.d.ts.map +1 -1
- package/dist/operations/doctor.js +8 -35
- package/dist/operations/doctor.js.map +1 -1
- package/dist/resources/repo-resource-contract-loader.d.ts +1 -1
- package/dist/resources/repo-resource-contract-loader.d.ts.map +1 -1
- package/dist/resources/repo-resource-contract-loader.js +2 -6
- package/dist/resources/repo-resource-contract-loader.js.map +1 -1
- package/dist/resources/repo-resource-provider-runner.d.ts +3 -1
- package/dist/resources/repo-resource-provider-runner.d.ts.map +1 -1
- package/dist/resources/repo-resource-provider-runner.js +24 -10
- package/dist/resources/repo-resource-provider-runner.js.map +1 -1
- package/managed-images.json +19 -0
- package/package.json +10 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-http-route-support.js","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAUlC,MAAM,OAAO,2BAA4B,SAAQ,KAAK;CAAG;AACzD,MAAM,OAAO,gCAAiC,SAAQ,KAAK;CAAG;
|
|
1
|
+
{"version":3,"file":"controller-http-route-support.js","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAUlC,MAAM,OAAO,2BAA4B,SAAQ,KAAK;CAAG;AACzD,MAAM,OAAO,gCAAiC,SAAQ,KAAK;CAAG;AAoE9D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,gBAAwB;IACrE,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC9C,KAAY,EACZ,eAA8D;IAa9D,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,GAAG,EAAE;YACJ,IAAI,EAAE,QAAQ,KAAK,CAAC,OAAO,UAAU;YACrC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY;gBACxC,CAAC,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC;gBACrD,CAAC,CAAC,EAAE;YACL,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM;SACpC;QACD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,OAAO;KAChB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,KAAY;IACzD,OAAO;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,EAAE;YACJ,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI;YAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI;YAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM;SACpC;QACD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC;AACH,CAAC"}
|
|
@@ -9,9 +9,17 @@ export declare const controllerLeaseCreateRequestSchema: z.ZodObject<{
|
|
|
9
9
|
export declare const controllerDestroyZoneRequestSchema: z.ZodObject<{
|
|
10
10
|
purge: z.ZodOptional<z.ZodBoolean>;
|
|
11
11
|
}, z.core.$strip>;
|
|
12
|
+
export declare const controllerEnableSshRequestSchema: z.ZodObject<{
|
|
13
|
+
adminToken: z.ZodOptional<z.ZodString>;
|
|
14
|
+
secretEnv: z.ZodDefault<z.ZodEnum<{
|
|
15
|
+
default: "default";
|
|
16
|
+
"with-secrets": "with-secrets";
|
|
17
|
+
}>>;
|
|
18
|
+
}, z.core.$strict>;
|
|
12
19
|
export declare const controllerExecuteCommandRequestSchema: z.ZodObject<{
|
|
20
|
+
adminToken: z.ZodOptional<z.ZodString>;
|
|
13
21
|
command: z.ZodString;
|
|
14
|
-
}, z.core.$
|
|
22
|
+
}, z.core.$strict>;
|
|
15
23
|
export declare const controllerWorkerTaskRequestSchema: z.ZodObject<{
|
|
16
24
|
prompt: z.ZodString;
|
|
17
25
|
repos: z.ZodDefault<z.ZodArray<z.ZodObject<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-request-schemas.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;kBAM7C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;iBAE7C,CAAC;AAEH,eAAO,MAAM,qCAAqC
|
|
1
|
+
{"version":3,"file":"controller-request-schemas.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;kBAM7C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;iBAE7C,CAAC;AAEH,eAAO,MAAM,gCAAgC;;;;;;kBAKnC,CAAC;AAEX,eAAO,MAAM,qCAAqC;;;kBAKxC,CAAC;AAEX,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;kBAAoC,CAAC;AAEnF,eAAO,MAAM,mCAAmC;;;;;iBAS9C,CAAC;AAcH,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiB/C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;iBAU7C,CAAC;AAkHH,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAI9C,CAAC"}
|
|
@@ -10,9 +10,18 @@ export const controllerLeaseCreateRequestSchema = z.strictObject({
|
|
|
10
10
|
export const controllerDestroyZoneRequestSchema = z.object({
|
|
11
11
|
purge: z.boolean().optional(),
|
|
12
12
|
});
|
|
13
|
-
export const
|
|
13
|
+
export const controllerEnableSshRequestSchema = z
|
|
14
|
+
.object({
|
|
15
|
+
adminToken: z.string().min(1).optional(),
|
|
16
|
+
secretEnv: z.enum(['default', 'with-secrets']).default('default'),
|
|
17
|
+
})
|
|
18
|
+
.strict();
|
|
19
|
+
export const controllerExecuteCommandRequestSchema = z
|
|
20
|
+
.object({
|
|
21
|
+
adminToken: z.string().min(1).optional(),
|
|
14
22
|
command: z.string().min(1),
|
|
15
|
-
})
|
|
23
|
+
})
|
|
24
|
+
.strict();
|
|
16
25
|
export const controllerWorkerTaskRequestSchema = workerTaskControllerRequestSchema;
|
|
17
26
|
export const controllerPushBranchesRequestSchema = z.object({
|
|
18
27
|
branches: z
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-request-schemas.js","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iCAAiC,EAAE,MAAM,0CAA0C,CAAC;AAE7F,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,CAAC,YAAY,CAAC;IAChE,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1D,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CAAC,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"controller-request-schemas.js","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-zone-operation-routes.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-zone-operation-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"controller-zone-operation-routes.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-zone-operation-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;AAoB/C,OAAO,EAGN,KAAK,yBAAyB,EAE9B,MAAM,oCAAoC,CAAC;AA8Q5C,wBAAgB,qCAAqC,CACpD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,yBAAyB,GACnC,IAAI,CA4SN"}
|
|
@@ -3,9 +3,9 @@ import { PullDefaultValidationError } from '../git-pull-default-operations.js';
|
|
|
3
3
|
import { PushBranchesValidationError } from '../git-push-operations.js';
|
|
4
4
|
import { buildTaskConfigFromPreparedInput } from '../task-config-builder.js';
|
|
5
5
|
import { writeTaskFailureSentinel } from '../task-state-reader.js';
|
|
6
|
-
import { ControllerZoneConfigurationError, ControllerZoneNotFoundError, ControllerZoneOperationUnsupportedError, ControllerZoneTaskNotFoundError, ControllerZoneTaskNotReadyError, ControllerZoneWorkerCloseAggregateError, ControllerZoneWorkerCloseError, ControllerZoneRuntimeStartError, ControllerZoneRuntimeUnavailableError, } from '../zone-runtimes/zone-runtime-errors.js';
|
|
6
|
+
import { ControllerZoneAdminAuthError, ControllerZoneConfigurationError, ControllerZoneNotFoundError, ControllerZoneOperationUnsupportedError, ControllerZoneTaskNotFoundError, ControllerZoneTaskNotReadyError, ControllerZoneWorkerCloseAggregateError, ControllerZoneWorkerCloseError, ControllerZoneRuntimeStartError, ControllerZoneRuntimeUnavailableError, } from '../zone-runtimes/zone-runtime-errors.js';
|
|
7
7
|
import { ControllerRuntimeAtCapacityError, ControllerTaskNotReadyError, } from './controller-http-route-support.js';
|
|
8
|
-
import { controllerDestroyZoneRequestSchema, controllerExecuteCommandRequestSchema, controllerPullDefaultRequestSchema, controllerPushBranchesRequestSchema, controllerWorkerTaskRequestSchema, } from './controller-request-schemas.js';
|
|
8
|
+
import { controllerDestroyZoneRequestSchema, controllerEnableSshRequestSchema, controllerExecuteCommandRequestSchema, controllerPullDefaultRequestSchema, controllerPushBranchesRequestSchema, controllerWorkerTaskRequestSchema, } from './controller-request-schemas.js';
|
|
9
9
|
class JsonBodyParseError extends Error {
|
|
10
10
|
constructor(cause) {
|
|
11
11
|
super('Request body must be valid JSON.', { cause });
|
|
@@ -52,7 +52,74 @@ async function parseJsonBodyWithSchema(context, schema, invalidRequestError) {
|
|
|
52
52
|
function writeControllerRouteLog(message) {
|
|
53
53
|
process.stderr.write(`[controller-zone-operation-routes] ${message}\n`);
|
|
54
54
|
}
|
|
55
|
+
function errorMessage(error, fallbackError) {
|
|
56
|
+
return error instanceof Error ? error.message : fallbackError;
|
|
57
|
+
}
|
|
58
|
+
function errorDetails(error) {
|
|
59
|
+
if (!(error instanceof AggregateError)) {
|
|
60
|
+
return undefined;
|
|
61
|
+
}
|
|
62
|
+
const details = collectErrorDetailMessages(error, new Set());
|
|
63
|
+
return details.length > 0 ? details : undefined;
|
|
64
|
+
}
|
|
65
|
+
function formatNonErrorDetail(error) {
|
|
66
|
+
if (typeof error === 'string') {
|
|
67
|
+
return error;
|
|
68
|
+
}
|
|
69
|
+
if (typeof error === 'number' || typeof error === 'boolean' || typeof error === 'bigint') {
|
|
70
|
+
return error.toString();
|
|
71
|
+
}
|
|
72
|
+
if (typeof error === 'symbol') {
|
|
73
|
+
return error.description ?? 'Symbol';
|
|
74
|
+
}
|
|
75
|
+
if (error === null) {
|
|
76
|
+
return 'null';
|
|
77
|
+
}
|
|
78
|
+
try {
|
|
79
|
+
return JSON.stringify(error) ?? 'undefined';
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return 'unserializable non-error value';
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
function collectErrorDetailMessages(error, seen) {
|
|
86
|
+
if (seen.has(error)) {
|
|
87
|
+
return [];
|
|
88
|
+
}
|
|
89
|
+
seen.add(error);
|
|
90
|
+
if (error instanceof AggregateError) {
|
|
91
|
+
const childMessages = error.errors.flatMap((innerError) => collectErrorDetailMessages(innerError, seen));
|
|
92
|
+
const causeMessages = collectErrorDetailMessages(error.cause, seen);
|
|
93
|
+
return [error.message, ...childMessages, ...causeMessages];
|
|
94
|
+
}
|
|
95
|
+
if (error instanceof Error) {
|
|
96
|
+
const causeMessages = collectErrorDetailMessages(error.cause, seen);
|
|
97
|
+
return causeMessages.length > 0 ? [error.message, ...causeMessages] : [error.message];
|
|
98
|
+
}
|
|
99
|
+
if (error === undefined) {
|
|
100
|
+
return [];
|
|
101
|
+
}
|
|
102
|
+
return [formatNonErrorDetail(error)];
|
|
103
|
+
}
|
|
104
|
+
function buildErrorResponseBody(error, fallbackError) {
|
|
105
|
+
const details = errorDetails(error);
|
|
106
|
+
return {
|
|
107
|
+
error: errorMessage(error, fallbackError),
|
|
108
|
+
...(details ? { details } : {}),
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
function scrubErrorResponseBody(responseBody) {
|
|
112
|
+
return {
|
|
113
|
+
error: scrubGithubTokenFromOutput(responseBody.error),
|
|
114
|
+
...(responseBody.details
|
|
115
|
+
? { details: responseBody.details.map((detail) => scrubGithubTokenFromOutput(detail)) }
|
|
116
|
+
: {}),
|
|
117
|
+
};
|
|
118
|
+
}
|
|
55
119
|
function zoneRuntimeErrorStatus(error) {
|
|
120
|
+
if (error instanceof ControllerZoneAdminAuthError) {
|
|
121
|
+
return error.httpStatus;
|
|
122
|
+
}
|
|
56
123
|
if (error instanceof ControllerZoneNotFoundError ||
|
|
57
124
|
error instanceof ControllerZoneTaskNotFoundError) {
|
|
58
125
|
return 404;
|
|
@@ -79,6 +146,13 @@ function zoneRuntimeErrorStatus(error) {
|
|
|
79
146
|
return 500;
|
|
80
147
|
}
|
|
81
148
|
function zoneRuntimeErrorBody(error) {
|
|
149
|
+
if (error instanceof ControllerZoneAdminAuthError) {
|
|
150
|
+
return {
|
|
151
|
+
code: error.code,
|
|
152
|
+
error: error.message,
|
|
153
|
+
zoneId: error.zoneId,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
82
156
|
if (error instanceof ControllerZoneOperationUnsupportedError) {
|
|
83
157
|
return {
|
|
84
158
|
error: error.message,
|
|
@@ -117,9 +191,7 @@ function zoneRuntimeErrorBody(error) {
|
|
|
117
191
|
zoneId: error.zoneId,
|
|
118
192
|
};
|
|
119
193
|
}
|
|
120
|
-
return
|
|
121
|
-
error: error instanceof Error ? error.message : 'zone-operation-failed',
|
|
122
|
-
};
|
|
194
|
+
return buildErrorResponseBody(error, 'zone-operation-failed');
|
|
123
195
|
}
|
|
124
196
|
export function registerControllerZoneOperationRoutes(app, operations) {
|
|
125
197
|
app.get('/controller-status', async (context) => context.json(await operations.getStatus()));
|
|
@@ -230,9 +302,7 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
230
302
|
error: error.message,
|
|
231
303
|
}, 409);
|
|
232
304
|
}
|
|
233
|
-
return context.json(
|
|
234
|
-
error: error instanceof Error ? error.message : 'worker-task-failed',
|
|
235
|
-
}, 500);
|
|
305
|
+
return context.json(buildErrorResponseBody(error, 'worker-task-failed'), 500);
|
|
236
306
|
}
|
|
237
307
|
});
|
|
238
308
|
}
|
|
@@ -251,8 +321,7 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
251
321
|
if (runtimeStatus !== 500) {
|
|
252
322
|
return context.json(zoneRuntimeErrorBody(error), runtimeStatus);
|
|
253
323
|
}
|
|
254
|
-
|
|
255
|
-
return context.json({ error: message }, 500);
|
|
324
|
+
return context.json(buildErrorResponseBody(error, 'get-task-state-failed'), 500);
|
|
256
325
|
}
|
|
257
326
|
});
|
|
258
327
|
}
|
|
@@ -267,11 +336,13 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
267
336
|
if (runtimeStatus !== 500) {
|
|
268
337
|
return context.json(zoneRuntimeErrorBody(error), runtimeStatus);
|
|
269
338
|
}
|
|
270
|
-
const message = error instanceof Error ? error.message : 'close-task-failed';
|
|
271
339
|
if (error instanceof ControllerTaskNotReadyError) {
|
|
272
|
-
return context.json({
|
|
340
|
+
return context.json({
|
|
341
|
+
status: 'not-ready',
|
|
342
|
+
...buildErrorResponseBody(error, 'close-task-failed'),
|
|
343
|
+
}, 409);
|
|
273
344
|
}
|
|
274
|
-
return context.json(
|
|
345
|
+
return context.json(buildErrorResponseBody(error, 'close-task-failed'), 500);
|
|
275
346
|
}
|
|
276
347
|
});
|
|
277
348
|
}
|
|
@@ -290,11 +361,9 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
290
361
|
if (runtimeStatus !== 500) {
|
|
291
362
|
return context.json(zoneRuntimeErrorBody(error), runtimeStatus);
|
|
292
363
|
}
|
|
293
|
-
const
|
|
294
|
-
writeControllerRouteLog(`push-branches failed for zone '${context.req.param('zoneId')}' task '${context.req.param('taskId')}': ${
|
|
295
|
-
return context.json(
|
|
296
|
-
error: message,
|
|
297
|
-
}, error instanceof PushBranchesValidationError ? 400 : 500);
|
|
364
|
+
const responseBody = buildErrorResponseBody(error, 'push-branches-failed');
|
|
365
|
+
writeControllerRouteLog(`push-branches failed for zone '${context.req.param('zoneId')}' task '${context.req.param('taskId')}': ${responseBody.error}`);
|
|
366
|
+
return context.json(responseBody, error instanceof PushBranchesValidationError ? 400 : 500);
|
|
298
367
|
}
|
|
299
368
|
});
|
|
300
369
|
}
|
|
@@ -314,24 +383,29 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
314
383
|
return context.json(zoneRuntimeErrorBody(error), runtimeStatus);
|
|
315
384
|
}
|
|
316
385
|
const isValidationError = error instanceof PullDefaultValidationError;
|
|
317
|
-
const message = scrubGithubTokenFromOutput(error instanceof Error ? error.message : 'pull-default-failed');
|
|
318
386
|
const logDetail = scrubGithubTokenFromOutput(error instanceof Error
|
|
319
387
|
? isValidationError
|
|
320
388
|
? error.message
|
|
321
389
|
: (error.stack ?? error.message)
|
|
322
390
|
: String(error));
|
|
323
391
|
writeControllerRouteLog(`pull-default failed for zone '${context.req.param('zoneId')}' task '${context.req.param('taskId')}': ${logDetail}`);
|
|
324
|
-
return context.json(
|
|
325
|
-
error: message,
|
|
326
|
-
}, isValidationError ? 400 : 500);
|
|
392
|
+
return context.json(scrubErrorResponseBody(buildErrorResponseBody(error, 'pull-default-failed')), isValidationError ? 400 : 500);
|
|
327
393
|
}
|
|
328
394
|
});
|
|
329
395
|
}
|
|
330
396
|
if (operations.enableSshForZone) {
|
|
331
397
|
const enableSshForZone = operations.enableSshForZone;
|
|
332
398
|
app.post('/zones/:zoneId/enable-ssh', async (context) => {
|
|
399
|
+
const parsedPayload = await parseJsonBodyWithSchema(context, controllerEnableSshRequestSchema, 'invalid-enable-ssh-request');
|
|
400
|
+
if (!parsedPayload.ok) {
|
|
401
|
+
return parsedPayload.response;
|
|
402
|
+
}
|
|
333
403
|
try {
|
|
334
|
-
|
|
404
|
+
const enableSshOptions = {
|
|
405
|
+
...(parsedPayload.data.adminToken ? { adminToken: parsedPayload.data.adminToken } : {}),
|
|
406
|
+
secretEnv: parsedPayload.data.secretEnv,
|
|
407
|
+
};
|
|
408
|
+
return context.json(await enableSshForZone(context.req.param('zoneId'), enableSshOptions));
|
|
335
409
|
}
|
|
336
410
|
catch (error) {
|
|
337
411
|
return context.json(zoneRuntimeErrorBody(error), zoneRuntimeErrorStatus(error));
|
|
@@ -346,8 +420,11 @@ export function registerControllerZoneOperationRoutes(app, operations) {
|
|
|
346
420
|
return parsedPayload.response;
|
|
347
421
|
}
|
|
348
422
|
const payload = parsedPayload.data;
|
|
423
|
+
const execOptions = payload.adminToken
|
|
424
|
+
? { adminToken: payload.adminToken }
|
|
425
|
+
: {};
|
|
349
426
|
try {
|
|
350
|
-
return context.json(await execInZone(context.req.param('zoneId'), payload.command));
|
|
427
|
+
return context.json(await execInZone(context.req.param('zoneId'), payload.command, execOptions));
|
|
351
428
|
}
|
|
352
429
|
catch (error) {
|
|
353
430
|
return context.json(zoneRuntimeErrorBody(error), zoneRuntimeErrorStatus(error));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-zone-operation-routes.js","sourceRoot":"","sources":["../../../src/controller/http/controller-zone-operation-routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"controller-zone-operation-routes.js","sourceRoot":"","sources":["../../../src/controller/http/controller-zone-operation-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-task-runner.d.ts","sourceRoot":"","sources":["../../src/controller/worker-task-runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAMN,KAAK,SAAS,EACd,KAAK,YAAY,EAEjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAKjE,OAAO,
|
|
1
|
+
{"version":3,"file":"worker-task-runner.d.ts","sourceRoot":"","sources":["../../src/controller/worker-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { z } from 'zod';
|
|
|
7
7
|
import { loadJsonConfigFile } from '../config/json-config-file.js';
|
|
8
8
|
import { workerTaskResourcesSchema, workerTaskControllerRequestSchema, } from '../config/resource-contracts/index.js';
|
|
9
9
|
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
10
|
-
import {
|
|
10
|
+
import { loadRepoResourceDescriptionContract } from '../resources/repo-resource-contract-loader.js';
|
|
11
11
|
import { startRepoResourceProviders, stopRepoResourceProviders, } from '../resources/repo-resource-provider-runner.js';
|
|
12
12
|
import { compileResourceOverlay } from '../resources/resource-compiler.js';
|
|
13
13
|
import { resolveTaskResources } from '../resources/resource-resolver.js';
|
|
@@ -35,6 +35,22 @@ function writeStderr(message) {
|
|
|
35
35
|
function toError(error) {
|
|
36
36
|
return error instanceof Error ? error : new Error(String(error));
|
|
37
37
|
}
|
|
38
|
+
function selectExternalResourcesForRepo(options) {
|
|
39
|
+
return Object.fromEntries(Object.keys(options.description.requires).flatMap((resourceName) => {
|
|
40
|
+
const externalResource = options.externalResources[resourceName];
|
|
41
|
+
return externalResource
|
|
42
|
+
? [
|
|
43
|
+
[
|
|
44
|
+
resourceName,
|
|
45
|
+
{
|
|
46
|
+
binding: externalResource.binding,
|
|
47
|
+
target: externalResource.target,
|
|
48
|
+
},
|
|
49
|
+
],
|
|
50
|
+
]
|
|
51
|
+
: [];
|
|
52
|
+
}));
|
|
53
|
+
}
|
|
38
54
|
const taskStatusResponseSchema = z
|
|
39
55
|
.object({
|
|
40
56
|
status: z.string(),
|
|
@@ -299,30 +315,34 @@ export async function preStartGateway(taskInput, zoneConfig, options = {}) {
|
|
|
299
315
|
configPath: zoneConfig.gateway.config,
|
|
300
316
|
});
|
|
301
317
|
const effectiveConfigDraft = workerConfigDraftSchema.parse(deepMerge(resolvedBaseConfig, projectConfig));
|
|
302
|
-
const repoResourceDescriptions = await Promise.all(clonedRepos.map(async (repo) => ({
|
|
303
|
-
repoId: repo.repoId,
|
|
304
|
-
repoUrl: repo.repoUrl,
|
|
305
|
-
hasContract: await hasRepoResourceDescriptionContract(repo.hostMetadataPath),
|
|
306
|
-
description: await loadRepoResourceDescriptionContract({
|
|
307
|
-
repoDir: repo.hostMetadataPath,
|
|
308
|
-
repoId: repo.repoId,
|
|
309
|
-
repoUrl: repo.repoUrl,
|
|
310
|
-
}),
|
|
311
|
-
})));
|
|
312
318
|
const resources = workerTaskResourcesSchema.parse(parsedTaskInput.resources);
|
|
319
|
+
const allowRepoResources = zoneConfig.resources?.allowRepoResources ?? true;
|
|
320
|
+
const loadedRepoResourceDescriptions = allowRepoResources === false
|
|
321
|
+
? []
|
|
322
|
+
: await Promise.all(clonedRepos.map(async (repo) => {
|
|
323
|
+
const description = await loadRepoResourceDescriptionContract({
|
|
324
|
+
repoDir: repo.hostMetadataPath,
|
|
325
|
+
repoId: repo.repoId,
|
|
326
|
+
repoUrl: repo.repoUrl,
|
|
327
|
+
});
|
|
328
|
+
return description
|
|
329
|
+
? {
|
|
330
|
+
repoId: repo.repoId,
|
|
331
|
+
repoUrl: repo.repoUrl,
|
|
332
|
+
description,
|
|
333
|
+
}
|
|
334
|
+
: null;
|
|
335
|
+
}));
|
|
336
|
+
const repoResourceDescriptions = loadedRepoResourceDescriptions.filter((description) => description !== null);
|
|
313
337
|
const resolvedResources = resolveTaskResources({
|
|
314
|
-
allowRepoResources
|
|
338
|
+
allowRepoResources,
|
|
315
339
|
externalResources: resources.externalResources,
|
|
316
340
|
repos: repoResourceDescriptions,
|
|
317
341
|
});
|
|
318
342
|
const repoById = new Map(clonedRepos.map((repo) => [repo.repoId, repo]));
|
|
319
343
|
const providerRun = await startRepoResourceProviders({
|
|
320
344
|
taskId,
|
|
321
|
-
repos: repoResourceDescriptions
|
|
322
|
-
.map((repoDescription) => {
|
|
323
|
-
if (!repoDescription.hasContract) {
|
|
324
|
-
return null;
|
|
325
|
-
}
|
|
345
|
+
repos: repoResourceDescriptions.map((repoDescription) => {
|
|
326
346
|
const repo = repoById.get(repoDescription.repoId);
|
|
327
347
|
if (!repo) {
|
|
328
348
|
throw new Error(`Resource setup references unknown repo '${repoDescription.repoId}'.`);
|
|
@@ -332,10 +352,13 @@ export async function preStartGateway(taskInput, zoneConfig, options = {}) {
|
|
|
332
352
|
repoUrl: repoDescription.repoUrl,
|
|
333
353
|
repoDir: repo.hostMetadataPath,
|
|
334
354
|
outputDir: path.join(agentVmDir, 'resources', repoDescription.repoId),
|
|
355
|
+
selectedExternalResources: selectExternalResourcesForRepo({
|
|
356
|
+
description: repoDescription.description,
|
|
357
|
+
externalResources: resolvedResources.externalResources,
|
|
358
|
+
}),
|
|
335
359
|
setupCommand: repoDescription.description.setupCommand,
|
|
336
360
|
};
|
|
337
|
-
})
|
|
338
|
-
.filter((repo) => repo !== null),
|
|
361
|
+
}),
|
|
339
362
|
providers: resolvedResources.selectedRepoProviders.map((provider) => {
|
|
340
363
|
const repo = repoById.get(provider.repoId);
|
|
341
364
|
if (!repo) {
|