fix supervised and local regressions

Rhys Sullivan committed 5 months ago

Commit 831bfbd1 parent 498e4a614 files · +997 −52Browse files

Showing the changes to apps/cli/src (3 of 14 files). Show all

Unified · Split

3 files

apps/cli/src/daemon.ts +2 −2
apps/cli/src/main.ts +2 −2
apps/cli/src/service.ts +18 −5

@@ -89,8 +89,8 @@ export const isExecutorServerReachable = ( · 88 unmodified lines
89	89	// misconfigured base URL can't leak the bearer token to a third-party host.
90	90	const url = new URL("/api/health", input.baseUrl);
91	91	const response = await fetch(url, { signal: AbortSignal.timeout(2000) });
92		− await response.body?.cancel();
93		− return response.ok;
	92	+ const body = await response.text();
	93	+ return response.ok && body.trim() === "ok";
94	94	}).pipe(Effect.catchCause(() => Effect.succeed(false)));
95	95
96	96	// ---------------------------------------------------------------------------

apps/cli/src/main.ts+2−2

@@ -2270,8 +2270,8 @@ const openInBrowser = (url: string): Effect.Effect<void> => · 2269 unmodified lines
2270	2270	*/
2271	2271	const openCommand = Command.make("open", {}, () =>
2272	2272	Effect.gen(function* () {
2273		− const manifest = yield* readLocalServerManifest();
2274		− if (!manifest \|\| !isPidAlive(manifest.pid)) {
	2273	+ const manifest = yield* readActiveLocalServerManifest().pipe(Effect.orElseSucceed(() => null));
	2274	+ if (!manifest) {
2275	2275	console.log("No local Executor server is running.");
2276	2276	console.log(`Start one with: ${cliPrefix} web`);
2277	2277	return;

apps/cli/src/service.ts+18−5

@@ -340,11 +340,24 @@ export interface SystemdUnitOptions { · 339 unmodified lines
340	340	readonly stderrPath: string;
341	341	}
342	342
	343	+const SYSTEMD_BARE_VALUE = /^[A-Za-z0-9_@%+=:,./-]+$/;
	344	+
	345	+const systemdQuote = (value: string): string => {
	346	+ if (SYSTEMD_BARE_VALUE.test(value)) return value;
	347	+ const escaped = value
	348	+ .replaceAll("\\", "\\\\")
	349	+ .replaceAll('"', '\\"')
	350	+ .replaceAll("\n", "\\n")
	351	+ .replaceAll("\r", "\\r")
	352	+ .replaceAll("\t", "\\t");
	353	+ return `"${escaped}"`;
	354	+};
	355	+
343	356	/** Render a systemd --user unit. Pure (snapshot-tested). */
344	357	export const generateSystemdUnit = (options: SystemdUnitOptions): string => {
345		− const execStart = options.execStart.map((arg) => (/\s/.test(arg) ? `"${arg}"` : arg)).join(" ");
	358	+ const execStart = options.execStart.map(systemdQuote).join(" ");
346	359	const env = Object.entries(options.environment)
347		− .map(([key, value]) => `Environment=${key}=${value}`)
	360	+ .map(([key, value]) => `Environment=${systemdQuote(`${key}=${value}`)}`)
348	361	.join("\n");
349	362	return `[Unit]
350	363	Description=Executor supervised daemon
@@ -354,9 +367,9 @@ After=default.target · 3 unmodified lines
354	367	Type=simple
355	368	ExecStart=${execStart}
356	369	${env}
357		−WorkingDirectory=${options.workingDirectory}
358		−StandardOutput=append:${options.stdoutPath}
359		−StandardError=append:${options.stderrPath}
	370	+WorkingDirectory=${systemdQuote(options.workingDirectory)}
	371	+StandardOutput=${systemdQuote(`append:${options.stdoutPath}`)}
	372	+StandardError=${systemdQuote(`append:${options.stderrPath}`)}
360	373	Restart=on-failure
361	374	RestartSec=5s
362	375

fix supervised and local regressions

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code