authoravatarclover caruso<git@paperclover.net>2026-11-21 17:04:38-08:00
committeravatarclover caruso<git@paperclover.net>2026-11-22 00:44:03-08:00
logb952d99332a054941ad27516c5e83e7222f66c85
tree0b32a14491884bddfc442c3c72a9b4d446dbda22
parent34f9a93d24e461d4dff64d1f1314e7b70b48fb82
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Spacebar: run the fork from Shale and redeploy on push

Replace the pinned upstream image with a Node supervisor that watches shale.paperclover.net/discord-server.git, builds with the repo's tsc, starts the new server beside the old one and switches its TCP listener once /api/ping answers. A push is live in about 4 s; a failed build or start leaves the previous server running. Assisted-by: claude-sonnet-5.5

4 files changed, 263 insertions(+), 2 deletions(-)

service/spacebar/build/Dockerfile created+3
...@@ -0,0 +1,3 @@
1FROM docker.io/library/node:26.13.1-bookworm@sha256:b7087bc4d973034b30854b378ba107f9fab622b47514cb7e2592e41b8bab8d49
2COPY supervisor.mjs /supervisor.mjs
3CMD ["node", "/supervisor.mjs"]
service/spacebar/build/supervisor.mjs created+208
...@@ -0,0 +1,208 @@
1import { execFile, spawn } from "node:child_process";
2import { createHash } from "node:crypto";
3import { copyFileSync, existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
4import { connect, createServer } from "node:net";
5import { basename } from "node:path";
6import { setTimeout as sleep } from "node:timers/promises";
7import { promisify } from "node:util";
8
9const { SOURCE_URL, BRANCH, PORT } = process.env;
10const WORK = "/work";
11const REPO = `${WORK}/repo.git`;
12const POLL_MS = 500;
13const DRAIN_MS = 500;
14const RETRY_FAILED_MS = 15000;
15
16const out = promisify(execFile);
17const log = (...args) => console.log("[deploy]", ...args);
18const run = (cmd, args, opts = {}, ok = [0]) =>
19 new Promise((resolve, reject) =>
20 spawn(cmd, args, { stdio: "inherit", ...opts })
21 .once("error", reject)
22 .once("exit", (code) => (ok.includes(code) ? resolve() : reject(new Error(`${basename(cmd)} ${args[0]} exited with ${code}`)))),
23 );
24const git = (...args) => out("git", ["--git-dir", REPO, ...args]).then((result) => result.stdout.trim());
25
26let live = null;
27let wanted = null;
28let recentModules = null;
29const releases = new Set();
30let failed = { rev: null, at: 0 };
31
32createServer((client) => {
33 const target = live;
34 if (!target) return client.destroy();
35 const upstream = connect(target.port, "127.0.0.1");
36 target.sockets.add(client);
37 client.setNoDelay(true);
38 upstream.setNoDelay(true);
39 const end = () => {
40 client.destroy();
41 upstream.destroy();
42 target.sockets.delete(client);
43 };
44 client.pipe(upstream).pipe(client);
45 client.on("error", end).on("close", end);
46 upstream.on("error", end).on("close", end);
47}).listen(Number(PORT));
48
49async function remoteHead() {
50 const response = await fetch(`${SOURCE_URL}/info/refs?service=git-upload-pack`, { signal: AbortSignal.timeout(5000) });
51 if (!response.ok) throw new Error(`${SOURCE_URL} answered ${response.status}`);
52 return (await response.text()).match(new RegExp(`([0-9a-f]{40}) refs/heads/${BRANCH}(?=\\0|\\n)`))?.[1] ?? null;
53}
54
55async function install(dir, modules) {
56 const staging = `${modules}.partial`;
57 rmSync(staging, { recursive: true, force: true });
58 mkdirSync(staging, { recursive: true });
59 for (const file of ["package.json", "package-lock.json"]) copyFileSync(`${dir}/${file}`, `${staging}/${file}`);
60 await run("npm", ["ci", "--ignore-scripts", "--no-audit", "--no-fund", "--loglevel=error"], { cwd: staging });
61 const { packages } = JSON.parse(readFileSync(`${staging}/package-lock.json`));
62 const native = Object.entries(packages)
63 .filter(([path, pkg]) => path && pkg.hasInstallScript)
64 .map(([path]) => path.split("node_modules/").pop());
65 if (native.length) await run("npm", ["rebuild", "--loglevel=error", ...native], { cwd: staging });
66 renameSync(staging, modules);
67}
68
69async function healthy(port, proc, current) {
70 for (const deadline = Date.now() + 90000; Date.now() < deadline; await sleep(100)) {
71 if (proc.exitCode !== null || proc.signalCode !== null) throw new Error("server exited during startup");
72 current();
73 const ok = await fetch(`http://127.0.0.1:${port}/api/ping`, { signal: AbortSignal.timeout(1000) }).then((response) => response.ok, () => false);
74 if (ok) return;
75 }
76 throw new Error("server did not become healthy");
77}
78
79const freePort = () =>
80 new Promise((resolve) => {
81 const probe = createServer().listen(0, "127.0.0.1", () => {
82 const { port } = probe.address();
83 probe.close(() => resolve(port));
84 });
85 });
86
87function sweep() {
88 const used = { rel: new Set(), modules: new Set([recentModules]) };
89 for (const release of releases) {
90 used.rel.add(release.rev);
91 if (release.modules) used.modules.add(basename(release.modules)).add(`${basename(release.modules)}.partial`);
92 }
93 for (const [name, keep] of Object.entries(used)) {
94 for (const entry of readdirSync(`${WORK}/${name}`)) if (!keep.has(entry)) rmSync(`${WORK}/${name}/${entry}`, { recursive: true, force: true });
95 }
96}
97
98function retire(old) {
99 setTimeout(() => {
100 for (const socket of old.sockets) socket.destroy();
101 old.proc.kill("SIGTERM");
102 setTimeout(() => old.proc.kill("SIGKILL"), 5000).unref();
103 }, DRAIN_MS);
104}
105
106async function deploy() {
107 const target = wanted;
108 const current = () => {
109 if (wanted !== target) throw new Error("superseded by a newer push");
110 };
111 let release;
112 let last = performance.now();
113 const start = last;
114 const laps = [];
115 const lap = (name) => {
116 const now = performance.now();
117 laps.push(`${name} ${Math.round(now - last)}ms`);
118 last = now;
119 };
120
121 try {
122 await run("git", ["--git-dir", REPO, "fetch", "--quiet", "--depth", "1", "--no-tags", SOURCE_URL, `refs/heads/${BRANCH}`]);
123 const rev = await git("rev-parse", "FETCH_HEAD");
124 if (rev === live?.rev) return;
125 const [committedAt, subject] = (await git("log", "-1", "--format=%ct%n%s", rev)).split("\n");
126 log(`deploying ${rev.slice(0, 7)} ${subject}`);
127 lap("fetch");
128
129 release = { rev, dir: `${WORK}/rel/${rev}`, modules: null, port: 0, proc: null, sockets: new Set() };
130 releases.add(release);
131 rmSync(release.dir, { recursive: true, force: true });
132 mkdirSync(release.dir, { recursive: true });
133 await run("bash", ["-c", 'set -o pipefail; git --git-dir "$0" archive "$1" | tar -x -C "$2"', REPO, rev, release.dir]);
134 lap("extract");
135
136 const lock = createHash("sha256");
137 for (const file of ["package.json", "package-lock.json"]) lock.update(readFileSync(`${release.dir}/${file}`));
138 release.modules = `${WORK}/modules/${lock.digest("hex").slice(0, 16)}`;
139 const cached = existsSync(release.modules);
140 if (!cached) await install(release.dir, release.modules);
141 symlinkSync(`${release.modules}/node_modules`, `${release.dir}/node_modules`);
142 lap(cached ? "deps cached" : "deps installed");
143
144 await run(`${release.dir}/node_modules/.bin/tsc`, ["-p", "tsconfig.json", "--declaration", "false", "--declarationMap", "false", "--incremental", "false"], { cwd: release.dir });
145 writeFileSync(`${release.dir}/.rev`, JSON.stringify({ rev, shortRev: rev.slice(0, 7), lastModified: Number(committedAt) }));
146 lap("build");
147
148 current();
149 release.port = await freePort();
150 // The server keeps jwt.key and other state in its working directory.
151 release.proc = spawn(process.execPath, ["--enable-source-maps", `${release.dir}/dist/bundle/start.js`], {
152 cwd: "/data",
153 stdio: "inherit",
154 env: { ...process.env, PORT: String(release.port) },
155 });
156 release.proc.once("exit", (code, signal) => {
157 if (live === release) {
158 live = null;
159 log(`server ${rev.slice(0, 7)} exited (${code ?? signal})`);
160 }
161 releases.delete(release);
162 sweep();
163 });
164 try {
165 await healthy(release.port, release.proc, current);
166 } catch (error) {
167 release.proc.kill("SIGKILL");
168 throw error;
169 }
170 lap("start");
171
172 const old = live;
173 live = release;
174 recentModules = basename(release.modules);
175 if (old) retire(old);
176 log(`live ${rev.slice(0, 7)} in ${((performance.now() - start) / 1000).toFixed(1)}s: ${laps.join(", ")}`);
177 } catch (error) {
178 log(`${target.slice(0, 7)} failed: ${error.message}`);
179 failed = { rev: target, at: Date.now() };
180 if (release) releases.delete(release);
181 sweep();
182 }
183}
184
185mkdirSync(`${WORK}/rel`, { recursive: true });
186mkdirSync(`${WORK}/modules`, { recursive: true });
187await run("git", ["init", "--quiet", "--bare", REPO]);
188process.on("SIGTERM", () => process.exit(0));
189
190(async () => {
191 let problem = "";
192 for (;; await sleep(POLL_MS)) {
193 try {
194 const head = await remoteHead();
195 if (!head) throw new Error(`${SOURCE_URL} has no branch ${BRANCH}`);
196 wanted = head;
197 problem = "";
198 } catch (error) {
199 if (error.message !== problem) log((problem = error.message));
200 }
201 }
202})();
203
204for (;;) {
205 const retry = wanted === failed.rev && !live && Date.now() - failed.at > RETRY_FAILED_MS;
206 if (wanted && wanted !== live?.rev && (wanted !== failed.rev || retry)) await deploy();
207 else await sleep(100);
208}
service/spacebar/service.pkl+8-2
...@@ -21,8 +21,10 @@ secrets {...@@ -21,8 +21,10 @@ secrets {
21}21}
2222
23container {23container {
24 image = "ghcr.io/spacebarchat/server@sha256:f50099777cee98d2d92290c792825ad02d705263253fae60d7b7e1f74fce46bb"24 build = "build"
25 cpu = 30025 cpu = 1000
26 memory = 3072
27 extraHosts { "shale.paperclover.net:host-gateway" }
2628
27 http {29 http {
28 containerPort = 300130 containerPort = 3001
...@@ -34,8 +36,12 @@ container {...@@ -34,8 +36,12 @@ container {
34 volumes {36 volumes {
35 ["/data"] {}37 ["/data"] {}
36 }38 }
39 tmpfs { "/work:rw,exec,size=3g" }
3740
38 env {41 env {
42 ["SOURCE_URL"] = "https://shale.paperclover.net/discord-server.git"
43 ["BRANCH"] = "main"
44 ["HOME"] = "/work"
39 ["CONFIG_PATH"] = "/spacebar/config.json"45 ["CONFIG_PATH"] = "/spacebar/config.json"
40 ["CONFIG_READONLY"] = "true"46 ["CONFIG_READONLY"] = "true"
41 ["STORAGE_LOCATION"] = "/data/files"47 ["STORAGE_LOCATION"] = "/data/files"
tools/spacebar.md created+44
...@@ -0,0 +1,44 @@
1# Spacebar
2
3`https://spacebar.paperclover.net` runs Clover's fork of
4[spacebarchat/server](https://github.com/spacebarchat/server) from branch `main` of
5`https://shale.paperclover.net/discord-server.git`. Pushing to that branch is the
6deploy; `tools/deploy.py` is only needed to change the service definition.
7
8```
9~/dev/discord-server jj checkout, remotes: origin = Shale, upstream = GitHub
10 (`master` mirrors upstream, `main` is what runs)
11jj bookmark set main -r @- && jj git push -b main
12curl https://spacebar.paperclover.net/_spacebar/api/version # commit that is live
13```
14
15A push is live about 4 seconds later (3.5 to 4.6 s measured from the start of the push). Dependency changes
16(`package.json` or the lockfile) add an `npm ci`, about 5 s. Previews run the same
17supervisor against the same branch with a fresh database.
18
19## How it works
20
21[`supervisor.mjs`](../service/spacebar/build/supervisor.mjs) is the container's
22only process, on a stock Node image with its working files in tmpfs `/work`.
23
241. Every 500 ms it reads the branch tip from Shale's `info/refs`.
252. On a new tip it shallow-fetches, extracts the tree, installs `node_modules`
26 only when the dependency files changed, and builds with the repo's own
27 `node_modules/.bin/tsc` (TypeScript 7, about 1 s).
283. It starts the new server on a free port, waits for `/api/ping`, then points its
29 TCP listener on 3001 at the new one. The old server is stopped 500 ms later, so
30 open gateway sockets drop and clients reconnect.
31
32A tsc error, a crash, or a server that never answers `/api/ping` leaves the
33previous server running; the reason is in the service log. A newer push cancels a
34start that is still waiting. Rolling back is pushing the old commit again.
35
36- `assets/schemas.json` and `assets/openapi.json` deploy as committed. After
37 changing request or response schemas, run `npm run generate:schema` and
38 `npm run generate:openapi` and commit the results, as upstream does.
39- The server runs with `/data` as its working directory, so `jwt.key`, uploads and
40 sessions survive deploys.
41- All revisions share one database. A migration in a pushed commit runs on first
42 start and a revert does not undo it. The old and new server briefly overlap.
43- Changing the supervisor, image or environment redeploys the container, which
44 takes about 9 s to rebuild and start from the branch.