admin_hg/cx-nexredirect
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

v0.1.10 — caddy reload via 'caddy reload' CLI (avoids admin API Origin 403)

Browse source
This commit is contained in:
Hendrik 2026-05-01 19:09:45 +02:00
parent ab47513dd9
commit 807911d026
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/caddy.ts
View file

@ -1,7 +1,11 @@
import fs from "fs/promises";
import path from "path";
import { exec } from "child_process";
import { promisify } from "util";
import { getDb, getSetting, type DomainRow, type DomainGroupRow } from "./db";
const execAsync = promisify(exec);
const CADDYFILE_PATH = process.env.NEXREDIRECT_CADDYFILE || "/etc/caddy/Caddyfile";
const CADDY_ADMIN = process.env.CADDY_ADMIN_URL || "http://localhost:2019";
const APP_PORT = process.env.PORT || "3000";
@ -62,17 +66,29 @@ export async function writeCaddyfile(): Promise<void> {
export async function reloadCaddy(): Promise<{ ok: boolean; error?: string }> {
try {
await writeCaddyfile();
const adapt = await fetch(`${CADDY_ADMIN}/load`, {
method: "POST",
headers: { "Content-Type": "text/caddyfile" },
body: buildCaddyfile(),
});
if (!adapt.ok) {
const text = await adapt.text().catch(() => "");
return { ok: false, error: `Caddy load failed: ${adapt.status} ${text}` };
}
} catch (e) {
return { ok: false, error: `write Caddyfile failed: ${e instanceof Error ? e.message : String(e)}` };
}
// Try shell `caddy reload` first — it talks to admin API as caddy itself, no Origin-header issues.
try {
await execAsync(`caddy reload --config ${CADDYFILE_PATH} --address localhost:2019`, { timeout: 30_000 });
return { ok: true };
} catch (e) {
return { ok: false, error: e instanceof Error ? e.message : String(e) };
// Fall back to direct admin API POST (older Caddy / different admin URL).
try {
const adapt = await fetch(`${CADDY_ADMIN}/load`, {
method: "POST",
headers: { "Content-Type": "text/caddyfile", Origin: "" },
body: buildCaddyfile(),
});
if (!adapt.ok) {
const text = await adapt.text().catch(() => "");
return { ok: false, error: `caddy reload failed: ${e instanceof Error ? e.message : String(e)} | api fallback: ${adapt.status} ${text}` };
}
return { ok: true };
} catch (e2) {
return { ok: false, error: `caddy reload + api fallback both failed: ${e instanceof Error ? e.message : String(e)} ; ${e2 instanceof Error ? e2.message : String(e2)}` };
}
}
}

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "corex-nexredirect",
"version": "0.1.9",
"version": "0.1.10",
"license": "MIT",
"overrides": {
"postcss": "^8.5.13",