@shravansunder/agent-vm 0.0.1 → 0.0.2
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/docker-image-builder.d.ts +3 -1
- package/dist/build/docker-image-builder.d.ts.map +1 -1
- package/dist/build/docker-image-builder.js +4 -4
- package/dist/build/docker-image-builder.js.map +1 -1
- package/dist/build/gondolin-image-builder.d.ts +2 -2
- package/dist/build/gondolin-image-builder.d.ts.map +1 -1
- package/dist/build/gondolin-image-builder.js +9 -9
- package/dist/build/gondolin-image-builder.js.map +1 -1
- package/dist/build/stale-image-cleaner.d.ts.map +1 -1
- package/dist/build/stale-image-cleaner.js +15 -11
- package/dist/build/stale-image-cleaner.js.map +1 -1
- package/dist/cli/agent-vm-cli-support.d.ts +3 -4
- package/dist/cli/agent-vm-cli-support.d.ts.map +1 -1
- package/dist/cli/agent-vm-cli-support.js +1 -1
- package/dist/cli/agent-vm-cli-support.js.map +1 -1
- package/dist/cli/agent-vm-entrypoint.js +0 -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 +2 -9
- package/dist/cli/auth-interactive-command.js.map +1 -1
- package/dist/cli/build-command.d.ts +1 -2
- package/dist/cli/build-command.d.ts.map +1 -1
- package/dist/cli/build-command.js +0 -9
- package/dist/cli/build-command.js.map +1 -1
- package/dist/cli/commands/controller-definition.d.ts.map +1 -1
- package/dist/cli/commands/controller-definition.js +7 -12
- package/dist/cli/commands/controller-definition.js.map +1 -1
- package/dist/cli/commands/create-app.js +1 -1
- package/dist/cli/init-command.d.ts +0 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +20 -40
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/ssh-commands.d.ts.map +1 -1
- package/dist/cli/ssh-commands.js +1 -11
- package/dist/cli/ssh-commands.js.map +1 -1
- package/dist/config/system-config.d.ts +1 -1
- package/dist/config/system-config.js +1 -1
- package/dist/config/system-config.js.map +1 -1
- package/dist/controller/controller-runtime-operations.d.ts +2 -2
- package/dist/controller/controller-runtime-operations.d.ts.map +1 -1
- package/dist/controller/controller-runtime-operations.js +6 -1
- package/dist/controller/controller-runtime-operations.js.map +1 -1
- package/dist/controller/controller-runtime-support.d.ts +2 -2
- package/dist/controller/controller-runtime-support.d.ts.map +1 -1
- package/dist/controller/controller-runtime-support.js +1 -1
- package/dist/controller/controller-runtime-support.js.map +1 -1
- package/dist/controller/controller-runtime-types.d.ts +5 -3
- package/dist/controller/controller-runtime-types.d.ts.map +1 -1
- package/dist/controller/controller-runtime.d.ts.map +1 -1
- package/dist/controller/controller-runtime.js +36 -14
- package/dist/controller/controller-runtime.js.map +1 -1
- package/dist/controller/docker-service-routing.d.ts +11 -0
- package/dist/controller/docker-service-routing.d.ts.map +1 -0
- package/dist/controller/docker-service-routing.js +148 -0
- package/dist/controller/docker-service-routing.js.map +1 -0
- package/dist/controller/http/controller-http-route-support.d.ts +8 -0
- 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-http-routes.d.ts +2 -0
- package/dist/controller/http/controller-http-routes.d.ts.map +1 -1
- package/dist/controller/http/controller-http-routes.js +20 -2
- package/dist/controller/http/controller-http-routes.js.map +1 -1
- package/dist/controller/http/controller-request-schemas.d.ts +8 -0
- package/dist/controller/http/controller-request-schemas.d.ts.map +1 -1
- package/dist/controller/http/controller-request-schemas.js +10 -0
- 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 +25 -1
- package/dist/controller/http/controller-zone-operation-routes.js.map +1 -1
- package/dist/controller/leases/lease-manager.d.ts +1 -1
- package/dist/controller/leases/lease-manager.d.ts.map +1 -1
- package/dist/controller/worker-task-runner.d.ts +39 -0
- package/dist/controller/worker-task-runner.d.ts.map +1 -0
- package/dist/controller/worker-task-runner.js +229 -0
- package/dist/controller/worker-task-runner.js.map +1 -0
- package/dist/gateway/credential-manager.d.ts +1 -1
- package/dist/gateway/credential-manager.d.ts.map +1 -1
- package/dist/gateway/credential-manager.js +9 -33
- package/dist/gateway/credential-manager.js.map +1 -1
- package/dist/gateway/gateway-image-builder.d.ts +1 -1
- package/dist/gateway/gateway-image-builder.d.ts.map +1 -1
- package/dist/gateway/gateway-lifecycle-loader.d.ts +1 -1
- package/dist/gateway/gateway-lifecycle-loader.d.ts.map +1 -1
- package/dist/gateway/gateway-lifecycle-loader.js +2 -2
- package/dist/gateway/gateway-lifecycle-loader.js.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.d.ts +2 -2
- package/dist/gateway/gateway-zone-orchestrator.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-orchestrator.js +7 -3
- package/dist/gateway/gateway-zone-orchestrator.js.map +1 -1
- package/dist/gateway/gateway-zone-support.d.ts +6 -4
- package/dist/gateway/gateway-zone-support.d.ts.map +1 -1
- package/dist/gateway/gateway-zone-support.js.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.d.ts.map +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js +1 -1
- package/dist/tool-vm/tool-vm-lifecycle.js.map +1 -1
- package/package.json +40 -40
- package/dist/cli/openclaw-plugin-bundle.d.ts +0 -3
- package/dist/cli/openclaw-plugin-bundle.d.ts.map +0 -1
- package/dist/cli/openclaw-plugin-bundle.js +0 -30
- package/dist/cli/openclaw-plugin-bundle.js.map +0 -1
package/dist/cli/init-command.js
CHANGED
|
@@ -3,9 +3,7 @@ import fs from 'node:fs/promises';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import readline from 'node:readline/promises';
|
|
5
5
|
import { getKeychainTokenSource, hasServiceAccountToken, storeServiceAccountToken, } from './keychain-credential.js';
|
|
6
|
-
import { openClawPluginVendorDirectory, syncBundledOpenClawPluginBundle, } from './openclaw-plugin-bundle.js';
|
|
7
6
|
const defaultGatewayIngressPort = 18791;
|
|
8
|
-
const defaultOpenClawExtensionsPath = '/home/openclaw/.openclaw/extensions';
|
|
9
7
|
function resolveGatewayConfigFileName(gatewayType) {
|
|
10
8
|
return gatewayType === 'coding' ? 'coding.json' : 'openclaw.json';
|
|
11
9
|
}
|
|
@@ -40,7 +38,7 @@ const defaultSystemConfig = (zoneId, gatewayType) => ({
|
|
|
40
38
|
stateDir: `./state/${zoneId}`,
|
|
41
39
|
workspaceDir: `./workspaces/${zoneId}`,
|
|
42
40
|
},
|
|
43
|
-
secrets: defaultSecretsForGatewayType(
|
|
41
|
+
secrets: defaultSecretsForGatewayType(gatewayType),
|
|
44
42
|
allowedHosts: defaultAllowedHostsForGatewayType(gatewayType),
|
|
45
43
|
websocketBypass: defaultWebsocketBypassForGatewayType(gatewayType),
|
|
46
44
|
toolProfile: 'standard',
|
|
@@ -58,17 +56,15 @@ const defaultSystemConfig = (zoneId, gatewayType) => ({
|
|
|
58
56
|
size: 5,
|
|
59
57
|
},
|
|
60
58
|
});
|
|
61
|
-
function defaultSecretsForGatewayType(
|
|
59
|
+
function defaultSecretsForGatewayType(gatewayType) {
|
|
62
60
|
if (gatewayType === 'coding') {
|
|
63
61
|
return {
|
|
64
62
|
ANTHROPIC_API_KEY: {
|
|
65
|
-
ref: `op://agent-vm/${zoneId}-anthropic/credential`,
|
|
66
63
|
source: '1password',
|
|
67
64
|
hosts: ['api.anthropic.com'],
|
|
68
65
|
injection: 'http-mediation',
|
|
69
66
|
},
|
|
70
67
|
OPENAI_API_KEY: {
|
|
71
|
-
ref: `op://agent-vm/${zoneId}-openai/credential`,
|
|
72
68
|
source: '1password',
|
|
73
69
|
hosts: ['api.openai.com'],
|
|
74
70
|
injection: 'http-mediation',
|
|
@@ -77,18 +73,15 @@ function defaultSecretsForGatewayType(zoneId, gatewayType) {
|
|
|
77
73
|
}
|
|
78
74
|
return {
|
|
79
75
|
DISCORD_BOT_TOKEN: {
|
|
80
|
-
ref: `op://agent-vm/${zoneId}-discord/bot-token`,
|
|
81
76
|
source: '1password',
|
|
82
77
|
injection: 'env',
|
|
83
78
|
},
|
|
84
79
|
PERPLEXITY_API_KEY: {
|
|
85
|
-
ref: `op://agent-vm/${zoneId}-perplexity/credential`,
|
|
86
80
|
source: '1password',
|
|
87
81
|
hosts: ['api.perplexity.ai'],
|
|
88
82
|
injection: 'http-mediation',
|
|
89
83
|
},
|
|
90
84
|
OPENCLAW_GATEWAY_TOKEN: {
|
|
91
|
-
ref: `op://agent-vm/${zoneId}-gateway-auth/password`,
|
|
92
85
|
source: '1password',
|
|
93
86
|
injection: 'env',
|
|
94
87
|
},
|
|
@@ -125,18 +118,26 @@ function defaultWebsocketBypassForGatewayType(gatewayType) {
|
|
|
125
118
|
'mmg.whatsapp.net:443',
|
|
126
119
|
];
|
|
127
120
|
}
|
|
128
|
-
function defaultEnvTemplateForGatewayType(
|
|
129
|
-
|
|
121
|
+
function defaultEnvTemplateForGatewayType(gatewayType) {
|
|
122
|
+
const header = `# agent-vm environment configuration
|
|
130
123
|
# 1Password token is stored in macOS Keychain by agent-vm init.
|
|
131
124
|
# Only set this for CI or non-macOS environments:
|
|
132
125
|
# OP_SERVICE_ACCOUNT_TOKEN=
|
|
126
|
+
|
|
127
|
+
# === Secret References (1Password op:// URIs) ===
|
|
128
|
+
`;
|
|
129
|
+
if (gatewayType === 'coding') {
|
|
130
|
+
return `${header}ANTHROPIC_API_KEY_REF=op://agent-vm/agent-anthropic/api-key
|
|
131
|
+
OPENAI_API_KEY_REF=op://agent-vm/agent-openai/api-key
|
|
132
|
+
`;
|
|
133
|
+
}
|
|
134
|
+
return `${header}DISCORD_BOT_TOKEN_REF=op://agent-vm/agent-discord-app/bot-token
|
|
135
|
+
PERPLEXITY_API_KEY_REF=op://agent-vm/agent-perplexity/credential
|
|
136
|
+
OPENCLAW_GATEWAY_TOKEN_REF=op://agent-vm/agent-shravan-claw-gateway/password
|
|
133
137
|
`;
|
|
134
138
|
}
|
|
135
139
|
const defaultGatewayDockerfile = `FROM node:24-slim
|
|
136
140
|
|
|
137
|
-
ENV PNPM_HOME=/pnpm
|
|
138
|
-
ENV PATH=\${PNPM_HOME}:\${PATH}
|
|
139
|
-
|
|
140
141
|
RUN apt-get update && \\
|
|
141
142
|
apt-get install -y --no-install-recommends \\
|
|
142
143
|
openssh-server \\
|
|
@@ -146,26 +147,15 @@ RUN apt-get update && \\
|
|
|
146
147
|
python3 && \\
|
|
147
148
|
rm -rf /var/lib/apt/lists/* && \\
|
|
148
149
|
update-ca-certificates && \\
|
|
149
|
-
|
|
150
|
-
pnpm add -g openclaw@2026.4.2 && \\
|
|
151
|
-
OPENCLAW_PACKAGE_ROOT="$(pnpm root -g)/openclaw" && \\
|
|
152
|
-
(cd "$OPENCLAW_PACKAGE_ROOT" && node scripts/postinstall-bundled-plugins.mjs) && \\
|
|
153
|
-
mkdir -p /opt/openclaw-sdk && \\
|
|
154
|
-
ln -sf "$OPENCLAW_PACKAGE_ROOT/dist/plugin-sdk/sandbox.js" /opt/openclaw-sdk/sandbox.js && \\
|
|
155
|
-
printf '#!/bin/sh\\nexec /pnpm/openclaw "$@"\\n' > /usr/local/bin/openclaw && \\
|
|
156
|
-
chmod 755 /usr/local/bin/openclaw && \\
|
|
150
|
+
npm install -g openclaw@2026.4.2 && \\
|
|
157
151
|
useradd -m -s /bin/bash openclaw && \\
|
|
158
|
-
mkdir -p
|
|
152
|
+
mkdir -p /home/openclaw/.openclaw /home/openclaw/workspace /run/sshd /root && \\
|
|
159
153
|
chown -R openclaw:openclaw /home/openclaw && \\
|
|
160
|
-
ln -sf /proc/self/fd /dev/fd 2>/dev/null || true
|
|
161
|
-
|
|
162
|
-
COPY vendor/gondolin ${defaultOpenClawExtensionsPath}/gondolin
|
|
154
|
+
ln -sf /proc/self/fd /dev/fd 2>/dev/null || true && \\
|
|
155
|
+
mkdir -p /usr/local/lib/node_modules/openclaw/dist/extensions/gondolin
|
|
163
156
|
`;
|
|
164
157
|
const defaultCodingGatewayDockerfile = `FROM node:24-slim
|
|
165
158
|
|
|
166
|
-
ENV PNPM_HOME=/pnpm
|
|
167
|
-
ENV PATH=\${PNPM_HOME}:\${PATH}
|
|
168
|
-
|
|
169
159
|
RUN apt-get update && \\
|
|
170
160
|
apt-get install -y --no-install-recommends \\
|
|
171
161
|
openssh-server \\
|
|
@@ -175,10 +165,7 @@ RUN apt-get update && \\
|
|
|
175
165
|
python3 && \\
|
|
176
166
|
rm -rf /var/lib/apt/lists/* && \\
|
|
177
167
|
update-ca-certificates && \\
|
|
178
|
-
|
|
179
|
-
pnpm add -g @openai/codex-cli && \\
|
|
180
|
-
printf '#!/bin/sh\\nexec /pnpm/codex "$@"\\n' > /usr/local/bin/codex && \\
|
|
181
|
-
chmod 755 /usr/local/bin/codex && \\
|
|
168
|
+
npm install -g @openai/codex-cli && \\
|
|
182
169
|
useradd -m -s /bin/bash coder && \\
|
|
183
170
|
mkdir -p /workspace /run/sshd /state && \\
|
|
184
171
|
chown -R coder:coder /workspace /state && \\
|
|
@@ -260,9 +247,6 @@ const defaultOpenClawConfig = (zoneId, gatewayIngressPort) => ({
|
|
|
260
247
|
},
|
|
261
248
|
tools: { elevated: { enabled: false } },
|
|
262
249
|
plugins: {
|
|
263
|
-
load: {
|
|
264
|
-
paths: [defaultOpenClawExtensionsPath],
|
|
265
|
-
},
|
|
266
250
|
entries: {
|
|
267
251
|
gondolin: {
|
|
268
252
|
enabled: true,
|
|
@@ -347,10 +331,6 @@ async function scaffoldAgentVmProjectInternal(options, dependencies = {}) {
|
|
|
347
331
|
const gatewayBuildConfigPath = path.join(options.targetDir, 'images', 'gateway', 'build-config.json');
|
|
348
332
|
const gatewayBuildConfigStatus = await writeFileIfMissing(gatewayBuildConfigPath, `${JSON.stringify(defaultGatewayBuildConfig(), null, '\t')}\n`);
|
|
349
333
|
(gatewayBuildConfigStatus === 'created' ? created : skipped).push('images/gateway/build-config.json');
|
|
350
|
-
if (gatewayType === 'openclaw') {
|
|
351
|
-
const pluginCopyStatus = await (dependencies.copyBundledOpenClawPlugin ?? syncBundledOpenClawPluginBundle)(options.targetDir);
|
|
352
|
-
(pluginCopyStatus === 'created' ? created : skipped).push(openClawPluginVendorDirectory);
|
|
353
|
-
}
|
|
354
334
|
const toolDockerfilePath = path.join(options.targetDir, 'images', 'tool', 'Dockerfile');
|
|
355
335
|
const toolDockerfileStatus = await writeFileIfMissing(toolDockerfilePath, defaultToolDockerfile);
|
|
356
336
|
(toolDockerfileStatus === 'created' ? created : skipped).push('images/tool/Dockerfile');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-command.js","sourceRoot":"","sources":["../../src/cli/init-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init-command.js","sourceRoot":"","sources":["../../src/cli/init-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-commands.d.ts","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,oBAAoB;IAC7B,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,eAAO,MAAM,2BAA2B;;;;;;iBAQzB,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ssh-commands.d.ts","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EACN,KAAK,eAAe,EACpB,KAAK,KAAK,EAIV,MAAM,2BAA2B,CAAC;AAEnC,UAAU,oBAAoB;IAC7B,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAC;IACvC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC;AAED,eAAO,MAAM,2BAA2B;;;;;;iBAQzB,CAAC;AAEhB,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4DhF"}
|
package/dist/cli/ssh-commands.js
CHANGED
|
@@ -10,14 +10,6 @@ export const zoneSshAccessResponseSchema = z
|
|
|
10
10
|
user: z.string().min(1).optional(),
|
|
11
11
|
})
|
|
12
12
|
.passthrough();
|
|
13
|
-
const openClawShellEnvFilePath = '/etc/profile.d/openclaw-env.sh';
|
|
14
|
-
function shellQuote(value) {
|
|
15
|
-
return `'${value.replace(/'/gu, `'\\''`)}'`;
|
|
16
|
-
}
|
|
17
|
-
function buildOpenClawAwareRemoteCommand(commandArguments) {
|
|
18
|
-
const quotedCommand = commandArguments.map((commandPart) => shellQuote(commandPart)).join(' ');
|
|
19
|
-
return `bash -lc ${shellQuote(`source ${openClawShellEnvFilePath} && exec ${quotedCommand}`)}`;
|
|
20
|
-
}
|
|
21
13
|
export async function runSshCommand(options) {
|
|
22
14
|
const controllerClient = options.dependencies.createControllerClient({
|
|
23
15
|
baseUrl: resolveControllerBaseUrl(options.systemConfig),
|
|
@@ -50,9 +42,7 @@ export async function runSshCommand(options) {
|
|
|
50
42
|
'-p',
|
|
51
43
|
String(sshResponse.port),
|
|
52
44
|
`${sshResponse.user ?? 'root'}@${sshResponse.host}`,
|
|
53
|
-
...
|
|
54
|
-
? [buildOpenClawAwareRemoteCommand(remoteCommandArguments)]
|
|
55
|
-
: []),
|
|
45
|
+
...remoteCommandArguments,
|
|
56
46
|
];
|
|
57
47
|
const runInteractiveProcess = options.dependencies.runInteractiveProcess ??
|
|
58
48
|
(async (command, arguments_) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-commands.js","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAGN,YAAY,EACZ,WAAW,EACX,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AASnC,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC;KAC1C,MAAM,CAAC;IACP,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAClC,CAAC;KACD,WAAW,EAAE,CAAC;AAIhB,MAAM,
|
|
1
|
+
{"version":3,"file":"ssh-commands.js","sourceRoot":"","sources":["../../src/cli/ssh-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ declare const systemConfigSchema: z.ZodObject<{
|
|
|
45
45
|
}, z.core.$strip>;
|
|
46
46
|
secrets: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
47
47
|
source: z.ZodLiteral<"1password">;
|
|
48
|
-
ref: z.ZodString
|
|
48
|
+
ref: z.ZodOptional<z.ZodString>;
|
|
49
49
|
injection: z.ZodDefault<z.ZodEnum<{
|
|
50
50
|
env: "env";
|
|
51
51
|
"http-mediation": "http-mediation";
|
|
@@ -3,7 +3,7 @@ import path from 'node:path';
|
|
|
3
3
|
import { z } from 'zod';
|
|
4
4
|
const secretReferenceSchema = z.object({
|
|
5
5
|
source: z.literal('1password'),
|
|
6
|
-
ref: z.string().min(1),
|
|
6
|
+
ref: z.string().min(1).optional(),
|
|
7
7
|
injection: z.enum(['env', 'http-mediation']).default('env'),
|
|
8
8
|
hosts: z.array(z.string().min(1)).optional(),
|
|
9
9
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-config.js","sourceRoot":"","sources":["../../src/config/system-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"system-config.js","sourceRoot":"","sources":["../../src/config/system-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { GatewayProcessSpec } from '@shravansunder/
|
|
2
|
-
import type { SecretResolver } from '@shravansunder/
|
|
1
|
+
import type { GatewayProcessSpec } from '@shravansunder/gateway-interface';
|
|
2
|
+
import type { SecretResolver } from '@shravansunder/gondolin-core';
|
|
3
3
|
import type { SystemConfig } from '../config/system-config.js';
|
|
4
4
|
import type { LeaseManager } from './leases/lease-manager.js';
|
|
5
5
|
interface GatewayZoneRuntime {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime-operations.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"controller-runtime-operations.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,9 @@ import { runControllerCredentialsRefresh } from '../operations/credentials-refre
|
|
|
4
4
|
import { runControllerDestroy } from '../operations/destroy-zone.js';
|
|
5
5
|
import { runControllerUpgrade } from '../operations/upgrade-zone.js';
|
|
6
6
|
import { runControllerLogs } from '../operations/zone-logs.js';
|
|
7
|
+
function writeStderr(message) {
|
|
8
|
+
process.stderr.write(`${message}\n`);
|
|
9
|
+
}
|
|
7
10
|
export function createControllerRuntimeOperations(options) {
|
|
8
11
|
const assertActiveZone = (targetZoneId) => {
|
|
9
12
|
if (targetZoneId !== options.activeZoneId) {
|
|
@@ -55,7 +58,9 @@ export function createControllerRuntimeOperations(options) {
|
|
|
55
58
|
.vm.exec(`cat ${options.getGateway().processSpec.logPath} 2>/dev/null || echo ""`);
|
|
56
59
|
return result.stdout;
|
|
57
60
|
}
|
|
58
|
-
catch {
|
|
61
|
+
catch (error) {
|
|
62
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
63
|
+
writeStderr(`[controller-runtime-operations] Failed to read gateway logs for ${targetZoneId}: ${message}`);
|
|
59
64
|
return '';
|
|
60
65
|
}
|
|
61
66
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime-operations.js","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AA2C/D,MAAM,UAAU,iCAAiC,CAAC,OASjD;IACA,MAAM,gBAAgB,GAAG,CAAC,YAAoB,EAAQ,EAAE;QACvD,IAAI,YAAY,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACd,+BAA+B,OAAO,CAAC,YAAY,WAAW,YAAY,yDAAyD,CACnI,CAAC;QACH,CAAC;IACF,CAAC,CAAC;IAEF,OAAO;QACN,gBAAgB,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YAChD,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;QAClD,CAAC;QACD,UAAU,EAAE,KAAK,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;YAC3D,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3D,OAAO;gBACN,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;aACrB,CAAC;QACH,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,YAAoB,EAAE,KAAc,EAAE,EAAE;YAC3D,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,oBAAoB,CAChC;gBACC,KAAK;gBACL,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,iBAAiB,EAAE,KAAK,IAAI,EAAE;oBAC7B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,YAAY;yBACtC,UAAU,EAAE;yBACZ,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,YAAY,CAAC,EAAE,CAAC;wBAChE,+FAA+F;wBAC/F,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACnD,CAAC;gBACF,CAAC;gBACD,eAAe,EAAE,OAAO,CAAC,eAAe;aACxC,CACD,CAAC;QACH,CAAC;QACD,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC;QAClE,WAAW,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YAC3C,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,iBAAiB,CAC7B;gBACC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,eAAe,EAAE,KAAK,IAAI,EAAE;oBAC3B,IAAI,CAAC;wBACJ,MAAM,MAAM,GAAG,MAAM,OAAO;6BAC1B,UAAU,EAAE;6BACZ,EAAE,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,OAAO,yBAAyB,CAAC,CAAC;wBACpF,OAAO,MAAM,CAAC,MAAM,CAAC;oBACtB,CAAC;oBAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"controller-runtime-operations.js","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AA2C/D,SAAS,WAAW,CAAC,OAAe;IACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,OASjD;IACA,MAAM,gBAAgB,GAAG,CAAC,YAAoB,EAAQ,EAAE;QACvD,IAAI,YAAY,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACd,+BAA+B,OAAO,CAAC,YAAY,WAAW,YAAY,yDAAyD,CACnI,CAAC;QACH,CAAC;IACF,CAAC,CAAC;IAEF,OAAO;QACN,gBAAgB,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YAChD,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;QAClD,CAAC;QACD,UAAU,EAAE,KAAK,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;YAC3D,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3D,OAAO;gBACN,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM;aACrB,CAAC;QACH,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,YAAoB,EAAE,KAAc,EAAE,EAAE;YAC3D,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,oBAAoB,CAChC;gBACC,KAAK;gBACL,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,iBAAiB,EAAE,KAAK,IAAI,EAAE;oBAC7B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,YAAY;yBACtC,UAAU,EAAE;yBACZ,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,YAAY,CAAC,EAAE,CAAC;wBAChE,+FAA+F;wBAC/F,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBACnD,CAAC;gBACF,CAAC;gBACD,eAAe,EAAE,OAAO,CAAC,eAAe;aACxC,CACD,CAAC;QACH,CAAC;QACD,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC;QAClE,WAAW,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YAC3C,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,iBAAiB,CAC7B;gBACC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,eAAe,EAAE,KAAK,IAAI,EAAE;oBAC3B,IAAI,CAAC;wBACJ,MAAM,MAAM,GAAG,MAAM,OAAO;6BAC1B,UAAU,EAAE;6BACZ,EAAE,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,OAAO,yBAAyB,CAAC,CAAC;wBACpF,OAAO,MAAM,CAAC,MAAM,CAAC;oBACtB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACvE,WAAW,CACV,mEAAmE,YAAY,KAAK,OAAO,EAAE,CAC7F,CAAC;wBACF,OAAO,EAAE,CAAC;oBACX,CAAC;gBACF,CAAC;aACD,CACD,CAAC;QACH,CAAC;QACD,sBAAsB,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YACtD,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,+BAA+B,CAC3C;gBACC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,kBAAkB,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE;oBAC5C,MAAM,kBAAkB,CAAC;wBACxB,cAAc,EAAE,OAAO,CAAC,cAAc;wBACtC,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,MAAM;qBACN,CAAC,CAAC;gBACJ,CAAC;gBACD,kBAAkB,EAAE,KAAK,IAAI,EAAE;oBAC9B,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;oBAChC,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC;gBACpC,CAAC;aACD,CACD,CAAC;QACH,CAAC;QACD,WAAW,EAAE,KAAK,EAAE,YAAoB,EAAE,EAAE;YAC3C,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC/B,OAAO,MAAM,oBAAoB,CAChC;gBACC,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,MAAM,EAAE,YAAY;aACpB,EACD;gBACC,mBAAmB,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;gBACnC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;gBAC9C,eAAe,EAAE,OAAO,CAAC,eAAe;aACxC,CACD,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,OAM7C;IACA,OAAO,KAAK,IAAoC,EAAE;QACjD,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;YACzC,+FAA+F;YAC/F,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC;gBAAS,CAAC;YACV,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAW,CAAC;IAC9B,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { SecretResolver } from '@shravansunder/
|
|
2
|
-
import { resolveServiceAccountToken } from '@shravansunder/
|
|
1
|
+
import type { SecretResolver } from '@shravansunder/gondolin-core';
|
|
2
|
+
import { resolveServiceAccountToken } from '@shravansunder/gondolin-core';
|
|
3
3
|
import type { SystemConfig } from '../config/system-config.js';
|
|
4
4
|
export declare function createSecretResolverFromSystemConfig(systemConfig: SystemConfig, createSecretResolverImpl: (options: {
|
|
5
5
|
readonly serviceAccountToken: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime-support.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"controller-runtime-support.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,wBAAsB,oCAAoC,CACzD,YAAY,EAAE,YAAY,EAC1B,wBAAwB,EAAE,CAAC,OAAO,EAAE;IACnC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACrC,KAAK,OAAO,CAAC,cAAc,CAAC,EAC7B,gBAAgB,GAAE,OAAO,0BAAuD,GAC9E,OAAO,CAAC,cAAc,CAAC,CAMzB;AAED,wBAAgB,kBAAkB,CACjC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACZ,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAM/B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolveServiceAccountToken } from '@shravansunder/
|
|
1
|
+
import { resolveServiceAccountToken } from '@shravansunder/gondolin-core';
|
|
2
2
|
export async function createSecretResolverFromSystemConfig(systemConfig, createSecretResolverImpl, resolveTokenImpl = resolveServiceAccountToken) {
|
|
3
3
|
const serviceAccountToken = await resolveTokenImpl(systemConfig.host.secretsProvider.tokenSource);
|
|
4
4
|
return await createSecretResolverImpl({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime-support.js","sourceRoot":"","sources":["../../src/controller/controller-runtime-support.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"controller-runtime-support.js","sourceRoot":"","sources":["../../src/controller/controller-runtime-support.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAI1E,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACzD,YAA0B,EAC1B,wBAE6B,EAC7B,mBAAsD,0BAA0B;IAEhF,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAElG,OAAO,MAAM,wBAAwB,CAAC;QACrC,mBAAmB;KACnB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CACjC,YAA0B,EAC1B,MAAc;IAEd,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;IACrF,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,IAAI,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import type { GatewayProcessSpec } from '@shravansunder/
|
|
2
|
-
import type { ManagedVm, SecretResolver } from '@shravansunder/
|
|
1
|
+
import type { GatewayProcessSpec } from '@shravansunder/gateway-interface';
|
|
2
|
+
import type { ManagedVm, SecretResolver } from '@shravansunder/gondolin-core';
|
|
3
3
|
import type { SystemConfig } from '../config/system-config.js';
|
|
4
4
|
import type { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
5
5
|
import type { RunTaskFn } from '../shared/run-task.js';
|
|
6
6
|
import type { createControllerService } from './http/controller-http-routes.js';
|
|
7
7
|
import type { ToolProfile } from './leases/lease-manager.js';
|
|
8
|
+
import type { runWorkerTask } from './worker-task-runner.js';
|
|
8
9
|
export interface ControllerRuntime {
|
|
9
10
|
readonly controllerPort: number;
|
|
10
|
-
readonly gateway
|
|
11
|
+
readonly gateway?: {
|
|
11
12
|
readonly ingress: {
|
|
12
13
|
readonly host: string;
|
|
13
14
|
readonly port: number;
|
|
@@ -29,6 +30,7 @@ export interface ControllerRuntimeDependencies {
|
|
|
29
30
|
readonly serviceAccountToken: string;
|
|
30
31
|
}) => Promise<SecretResolver>;
|
|
31
32
|
readonly now?: () => number;
|
|
33
|
+
readonly runWorkerTask?: typeof runWorkerTask;
|
|
32
34
|
readonly runTask?: RunTaskFn;
|
|
33
35
|
readonly setIntervalImpl?: (callback: () => void | Promise<void>, delayMs: number) => NodeJS.Timeout;
|
|
34
36
|
readonly startGatewayZone?: typeof startGatewayZone;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime-types.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"controller-runtime-types.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAClB,QAAQ,CAAC,OAAO,EAAE;YACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;QACzC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;KAC7C,CAAC;IACF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IAC7D,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE;QACxC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACzB,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,OAAO,EAAE;QACzC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;KACrC,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,aAAa,CAAC;IAC9C,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,CAC1B,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACpC,OAAO,EAAE,MAAM,KACX,MAAM,CAAC,OAAO,CAAC;IACpB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IACpD,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE;QACpC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;QACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACtB,KAAK,OAAO,CAAC;QACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KACvB,CAAC,CAAC;CACH;AAED,MAAM,WAAW,6BAA6B;IAC7C,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"controller-runtime.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"AAoBA,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,6BAA6B,EAClC,KAAK,6BAA6B,EAClC,MAAM,+BAA+B,CAAC;AAQvC,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,6BAA6B,EACtC,YAAY,EAAE,6BAA6B,GACzC,OAAO,CAAC,iBAAiB,CAAC,CAgL5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createOpCliSecretResolver } from '@shravansunder/
|
|
1
|
+
import { createOpCliSecretResolver, } from '@shravansunder/gondolin-core';
|
|
2
2
|
import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
|
|
3
3
|
import { runTaskWithResult } from '../shared/run-task.js';
|
|
4
4
|
import { cleanToolVmWorkspace, createToolVm, resolveToolVmWorkspaceDirectory, } from '../tool-vm/tool-vm-lifecycle.js';
|
|
@@ -9,6 +9,7 @@ import { startControllerHttpServer } from './http/controller-http-server.js';
|
|
|
9
9
|
import { createIdleReaper } from './leases/idle-reaper.js';
|
|
10
10
|
import { createLeaseManager } from './leases/lease-manager.js';
|
|
11
11
|
import { createTcpPool } from './leases/tcp-pool.js';
|
|
12
|
+
import { runWorkerTask as runWorkerTaskWithPerTaskVm } from './worker-task-runner.js';
|
|
12
13
|
export async function startControllerRuntime(options, dependencies) {
|
|
13
14
|
const now = dependencies.now ?? Date.now;
|
|
14
15
|
const runTaskStep = dependencies.runTask ?? (async (_title, fn) => await fn());
|
|
@@ -23,6 +24,7 @@ export async function startControllerRuntime(options, dependencies) {
|
|
|
23
24
|
zoneId: toolVmOptions.zoneId,
|
|
24
25
|
}));
|
|
25
26
|
const tcpPool = createTcpPool(options.systemConfig.tcpPool);
|
|
27
|
+
const activeZone = findConfiguredZone(options.systemConfig, options.zoneId);
|
|
26
28
|
const leaseManager = createLeaseManager({
|
|
27
29
|
cleanWorkspace: async ({ profile, tcpSlot, zoneId }) => {
|
|
28
30
|
await cleanToolVmWorkspace(resolveToolVmWorkspaceDirectory({
|
|
@@ -69,9 +71,11 @@ export async function startControllerRuntime(options, dependencies) {
|
|
|
69
71
|
}
|
|
70
72
|
return gateway;
|
|
71
73
|
};
|
|
72
|
-
|
|
73
|
-
gateway
|
|
74
|
-
|
|
74
|
+
if (activeZone.gateway.type !== 'coding') {
|
|
75
|
+
await runTaskStep('Starting gateway zone', async () => {
|
|
76
|
+
gateway = await startGateway();
|
|
77
|
+
});
|
|
78
|
+
}
|
|
75
79
|
const stopGatewayZone = async () => {
|
|
76
80
|
if (!gateway) {
|
|
77
81
|
return;
|
|
@@ -80,12 +84,13 @@ export async function startControllerRuntime(options, dependencies) {
|
|
|
80
84
|
};
|
|
81
85
|
const restartGatewayZone = async () => {
|
|
82
86
|
gateway = undefined;
|
|
83
|
-
gateway
|
|
87
|
+
if (activeZone.gateway.type !== 'coding') {
|
|
88
|
+
gateway = await startGateway();
|
|
89
|
+
}
|
|
84
90
|
};
|
|
85
91
|
const serverRef = {};
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
operations: {
|
|
92
|
+
const controllerOperations = activeZone.gateway.type !== 'coding'
|
|
93
|
+
? {
|
|
89
94
|
...createControllerRuntimeOperations({
|
|
90
95
|
activeZoneId: options.zoneId,
|
|
91
96
|
getGateway: () => requireGateway(),
|
|
@@ -103,7 +108,20 @@ export async function startControllerRuntime(options, dependencies) {
|
|
|
103
108
|
releaseLease: async (leaseId) => await leaseManager.releaseLease(leaseId),
|
|
104
109
|
stopGatewayZone,
|
|
105
110
|
}),
|
|
106
|
-
}
|
|
111
|
+
}
|
|
112
|
+
: undefined;
|
|
113
|
+
const workerTaskRunner = activeZone.gateway.type === 'coding'
|
|
114
|
+
? async (zoneId, input) => await (dependencies.runWorkerTask ?? runWorkerTaskWithPerTaskVm)({
|
|
115
|
+
input,
|
|
116
|
+
secretResolver,
|
|
117
|
+
systemConfig: options.systemConfig,
|
|
118
|
+
zoneId,
|
|
119
|
+
})
|
|
120
|
+
: undefined;
|
|
121
|
+
const controllerApp = createControllerService({
|
|
122
|
+
leaseManager,
|
|
123
|
+
...(controllerOperations ? { operations: controllerOperations } : {}),
|
|
124
|
+
...(workerTaskRunner ? { workerTaskRunner } : {}),
|
|
107
125
|
systemConfig: options.systemConfig,
|
|
108
126
|
});
|
|
109
127
|
await runTaskStep(`Controller API on :${options.systemConfig.host.controllerPort}`, async () => {
|
|
@@ -125,11 +143,15 @@ export async function startControllerRuntime(options, dependencies) {
|
|
|
125
143
|
}
|
|
126
144
|
},
|
|
127
145
|
controllerPort: options.systemConfig.host.controllerPort,
|
|
128
|
-
gateway
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
146
|
+
...(gateway
|
|
147
|
+
? {
|
|
148
|
+
gateway: {
|
|
149
|
+
ingress: requireGateway().ingress,
|
|
150
|
+
processSpec: requireGateway().processSpec,
|
|
151
|
+
vm: requireGateway().vm,
|
|
152
|
+
},
|
|
153
|
+
}
|
|
154
|
+
: {}),
|
|
133
155
|
};
|
|
134
156
|
}
|
|
135
157
|
//# sourceMappingURL=controller-runtime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller-runtime.js","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"controller-runtime.js","sourceRoot":"","sources":["../../src/controller/controller-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface DockerServiceRoutingResult {
|
|
2
|
+
readonly composeFilePaths: readonly string[];
|
|
3
|
+
readonly tcpHosts: Record<string, string>;
|
|
4
|
+
}
|
|
5
|
+
export declare class DockerServiceRoutingError extends Error {
|
|
6
|
+
readonly startedComposeFilePaths: readonly string[];
|
|
7
|
+
constructor(message: string, startedComposeFilePaths: readonly string[], cause?: unknown);
|
|
8
|
+
}
|
|
9
|
+
export declare function startDockerServicesForTask(workspaceDir: string, repoHostDirs?: readonly string[]): Promise<DockerServiceRoutingResult>;
|
|
10
|
+
export declare function stopDockerServicesForTask(composeFilePaths: readonly string[]): Promise<void>;
|
|
11
|
+
//# sourceMappingURL=docker-service-routing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"docker-service-routing.d.ts","sourceRoot":"","sources":["../../src/controller/docker-service-routing.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,qBAAa,yBAA0B,SAAQ,KAAK;IACnD,SAAgB,uBAAuB,EAAE,SAAS,MAAM,EAAE,CAAC;gBAExC,OAAO,EAAE,MAAM,EAAE,uBAAuB,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,OAAO;CAK/F;AAwGD,wBAAsB,0BAA0B,CAC/C,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,SAAS,MAAM,EAAO,GAClC,OAAO,CAAC,0BAA0B,CAAC,CA4DrC;AAED,wBAAsB,yBAAyB,CAC9C,gBAAgB,EAAE,SAAS,MAAM,EAAE,GACjC,OAAO,CAAC,IAAI,CAAC,CAsBf"}
|