Multiplayer agent harness for work.
fix: run the docker daemon probe from the server entry point
Joshua Franceb384c6548eb0
diff --git a/src/deploy/docker-deploy-provider.ts b/src/deploy/docker-deploy-provider.tsindex 4aa911eac..21239bec0 100644--- a/src/deploy/docker-deploy-provider.ts+++ b/src/deploy/docker-deploy-provider.ts@@ -14,11 +14,19 @@ export interface DockerDeployProviderOptions {dockerExec?: DockerExec;}-export async function dockerDaemonUnreachable(opts: DockerDeployProviderOptions = {}): Promise<string | null> {+export interface DockerDaemonProbeOptions {+ docker?: string;+ dockerExec?: DockerExec;+}++export async function dockerDaemonFailure(opts: DockerDaemonProbeOptions = {}): Promise<string | null> {const dexec = opts.dockerExec ?? spawnDockerExec(opts.docker ?? "docker");try {const r = await dexec(["version", "-f", "{{.Server.Version}}"], DAEMON_PROBE_TIMEOUT_MS);- return r.code === 0 ? null : r.stderr.trim() || `exit ${r.code}`;+ if (r.code === 0) return null;+ const stderr = r.stderr.trim();+ if (stderr) return stderr;+ return r.code < 0 ? `no response within ${DAEMON_PROBE_TIMEOUT_MS / 1000}s` : `exit ${r.code}`;} catch (e) {return errMessage(e);}diff --git a/src/index.ts b/src/index.tsindex 635753204..112835997 100644--- a/src/index.ts+++ b/src/index.ts@@ -1,6 +1,7 @@import { loadConfig } from "./config.ts";import { buildApp, serverDeps, stopWithBackstop } from "./wiring.ts";import { createServer } from "./api/server.ts";+import { dockerDaemonFailure } from "./deploy/docker-deploy-provider.ts";import { errMessage } from "./util/errors.ts";import { slackPluginConfigFromEnv, startSlackPlugin } from "./slack/index.ts";import { createSlackRuntimeReconciler } from "./surfaces/slack-runtime.ts";@@ -30,6 +31,15 @@ server.listen(config.port, () => {);});+if (config.deployProvider === "docker") {+ void dockerDaemonFailure().then((failure) => {+ if (failure)+ console.warn(+ `[qm] publishing is unavailable: the docker deploy provider is selected but no Docker daemon is reachable from core (${failure}) — make a daemon reachable, or set DEPLOY_PROVIDER to fly or aws`,+ );+ });+}+if (config.backgroundWorkEnabled) {built.scheduler.start(1000);} else {diff --git a/src/wiring.ts b/src/wiring.tsindex 72f26eec1..181cd9fcb 100644--- a/src/wiring.ts+++ b/src/wiring.ts@@ -82,7 +82,7 @@ import { createPgBossCronQueue } from "./cron/job-queue.ts";import { createWebhookStore, disableLegacyWebhookRows } from "./webhooks/webhook-store.ts";import { createWebhookReceiver, type WebhookReceiver } from "./webhooks/webhook-receiver.ts";import { createDeployStore, type Deployment } from "./deploy/deploy-store.ts";-import { createDockerDeployProvider, dockerDaemonUnreachable } from "./deploy/docker-deploy-provider.ts";+import { createDockerDeployProvider } from "./deploy/docker-deploy-provider.ts";import { createAwsDeployProvider, type StoredDeployBody } from "./deploy/aws-deploy-provider.ts";import { createFlyDeployProvider } from "./deploy/fly-deploy-provider.ts";import type { DeployProvider } from "./deploy/deploy-provider.ts";@@ -992,14 +992,6 @@ export function buildApp(if (config.deployProvider === "fly") return createFlyDeployProvider(config.flyDeploy);return createDockerDeployProvider();})();- if (config.deployProvider === "docker") {- void dockerDaemonUnreachable().then((reason) => {- if (reason)- console.warn(- `[wiring] docker deploy: DEPLOY_PROVIDER is docker (the default when unset) but no Docker daemon is reachable from core (${reason}) — every publish will fail until a daemon is reachable or DEPLOY_PROVIDER selects fly or aws`,- );- });- }if (config.deployProvider === "aws" && !config.awsDeploy.dataBucket && !config.awsSandbox.s3Bucket) {console.warn("[wiring] aws deploy: no data bucket resolved (AWS_DEPLOY_DATA_BUCKET unset, sandbox is not aws) — deployed apps have NO durable /data",diff --git a/test/docker-deploy-provider.test.ts b/test/docker-deploy-provider.test.tsindex 1056d6921..bf63ad8b1 100644--- a/test/docker-deploy-provider.test.ts+++ b/test/docker-deploy-provider.test.ts@@ -1,6 +1,6 @@import assert from "node:assert/strict";import { test } from "node:test";-import { createDockerDeployProvider, dockerDaemonUnreachable } from "../src/deploy/docker-deploy-provider.ts";+import { createDockerDeployProvider, dockerDaemonFailure } from "../src/deploy/docker-deploy-provider.ts";import { createDeployStore } from "../src/deploy/deploy-store.ts";import type { DockerExec } from "../src/sandbox/docker-exec.ts";import { scopeId } from "../src/types.ts";@@ -152,7 +152,7 @@ test("the daemon probe reports nothing when Docker answers", async () => {return { code: 0, stdout: "29.1.3\n", stderr: "" };};- assert.equal(await dockerDaemonUnreachable({ dockerExec }), null);+ assert.equal(await dockerDaemonFailure({ dockerExec }), null);assert.deepEqual(calls, [["version", "-f", "{{.Server.Version}}"]]);});@@ -164,7 +164,7 @@ test("the daemon probe reports why Docker is unreachable", async () => {});assert.equal(- await dockerDaemonUnreachable({ dockerExec }),+ await dockerDaemonFailure({ dockerExec }),"dial unix /var/run/docker.sock: connect: no such file or directory",);});@@ -174,11 +174,17 @@ test("the daemon probe reports a failed probe rather than throwing", async () =>throw new Error("spawn docker ENOENT");};- assert.equal(await dockerDaemonUnreachable({ dockerExec }), "spawn docker ENOENT");+ assert.equal(await dockerDaemonFailure({ dockerExec }), "spawn docker ENOENT");});test("the daemon probe reports the exit code when Docker is silent", async () => {const dockerExec: DockerExec = async () => ({ code: 7, stdout: "", stderr: "" });- assert.equal(await dockerDaemonUnreachable({ dockerExec }), "exit 7");+ assert.equal(await dockerDaemonFailure({ dockerExec }), "exit 7");+});++test("the daemon probe reports a hung daemon as a timeout", async () => {+ const dockerExec: DockerExec = async () => ({ code: -1, stdout: "", stderr: "" });++ assert.equal(await dockerDaemonFailure({ dockerExec }), "no response within 10s");});