proxitor 0.10.1 → 0.11.0

package/dist/cli.mjs

@@ -7,7 +7,7 @@ import tty, { ReadStream } from "node:tty";
 import { formatWithOptions, styleText } from "node:util";
 import * as l$1 from "node:readline";
 import l__default from "node:readline";
-import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, readdirSync, unwatchFile, watchFile, writeFileSync } from "node:fs";
 import { dirname, join, resolve, sep } from "node:path";
 import { createServer } from "node:net";
 import { STATUS_CODES, createServer as createServer$1 } from "node:http";
@@ -19244,7 +19244,7 @@ async function runConfigMenu(client) {
 }
 //#endregion
 //#region src/version.ts
-const version = "0.10.1";
+const version = "0.11.0";
 //#endregion
 //#region src/commands/doctor.ts
 const DEFAULT_TIMEOUT_MS = 3e3;
@@ -19482,6 +19482,142 @@ async function doctorCommand(opts = {}) {
 	return exitCode;
 }
 //#endregion
+//#region src/config-source.ts
+/** Default watcher: fs.watchFile polling; returns a stop function. */
+const watchStat = (filename, pollIntervalMs, onChange) => {
+	watchFile(filename, {
+		interval: pollIntervalMs,
+		persistent: false
+	}, onChange);
+	return () => unwatchFile(filename);
+};
+function fmt(value) {
+	if (value === void 0) return "unset";
+	if (value === true) return "on";
+	if (value === false) return "off";
+	return String(value);
+}
+const SCALAR_KEYS = [
+	"cacheControl",
+	"cacheControlTtl",
+	"sessionId",
+	"normalizeVolatileSystem",
+	"authType",
+	"verbose",
+	"bodyLimit",
+	"openrouterBaseUrl"
+];
+function canonicalEntries(record) {
+	if (!record) return "";
+	return JSON.stringify(Object.keys(record).sort().map((key) => [key, record[key]]));
+}
+/** Diff of cache-relevant fields; '' if nothing changed. */
+function summarizeChanges(prev, next) {
+	const parts = [];
+	for (const key of SCALAR_KEYS) if (prev[key] !== next[key]) parts.push(`${key}: ${fmt(prev[key])}→${fmt(next[key])}`);
+	if (JSON.stringify(buildProviderRouting(prev.provider)) !== JSON.stringify(buildProviderRouting(next.provider))) parts.push("provider routing");
+	if (canonicalEntries(prev.modelOverrides) !== canonicalEntries(next.modelOverrides)) {
+		const prevCount = prev.modelOverrides ? Object.keys(prev.modelOverrides).length : 0;
+		const nextCount = next.modelOverrides ? Object.keys(next.modelOverrides).length : 0;
+		parts.push(`modelOverrides: ${prevCount}→${nextCount}`);
+	}
+	if (canonicalEntries(prev.headers) !== canonicalEntries(next.headers)) parts.push("headers");
+	return parts.join(", ");
+}
+function createConfigSource(options) {
+	return new FileWatchingConfigSource(options);
+}
+var FileWatchingConfigSource = class {
+	current;
+	loadOptions;
+	load;
+	pollIntervalMs;
+	watch;
+	boundHost;
+	boundPort;
+	resolvedPath;
+	stopWatch;
+	loading = false;
+	pending = false;
+	watching = false;
+	constructor(options) {
+		this.current = options.initial;
+		this.loadOptions = options.loadOptions;
+		this.load = options.load ?? loadConfig;
+		this.pollIntervalMs = options.pollIntervalMs ?? 1e3;
+		this.watch = options.watch ?? watchStat;
+		this.boundHost = options.initial.host;
+		this.boundPort = options.initial.port;
+		this.resolvedPath = options.loadOptions.noConfig ? null : tryFindConfigFile(options.loadOptions.configPath);
+	}
+	get() {
+		return this.current;
+	}
+	async reload() {
+		if (this.loading) {
+			this.pending = true;
+			return { ok: true };
+		}
+		this.loading = true;
+		try {
+			const next = await this.load(this.loadOptions);
+			const restartNeeded = next.host !== this.boundHost || next.port !== this.boundPort;
+			let diff = "";
+			try {
+				diff = summarizeChanges(this.current, next);
+			} catch {
+				diff = "";
+			}
+			this.current = next;
+			if (restartNeeded) logger.warn("host/port changed — restart proxitor to apply (live reload does not re-bind the socket)");
+			logger.info(`Config reloaded${diff ? ` — ${diff}` : " (no material changes)"}`);
+			return { ok: true };
+		} catch (error) {
+			const msg = error instanceof Error ? error.message : String(error);
+			logger.error(`Config reload failed — keeping previous config: ${msg}`);
+			return {
+				ok: false,
+				error: msg
+			};
+		} finally {
+			this.loading = false;
+			if (this.pending) {
+				this.pending = false;
+				this.reload();
+			}
+		}
+	}
+	start() {
+		if (this.watching) return;
+		if (!this.resolvedPath) {
+			logger.info("Live config reload disabled (no config file)");
+			return;
+		}
+		this.watching = true;
+		const path = this.resolvedPath;
+		this.stopWatch = this.watch(path, this.pollIntervalMs, (curr, prev) => {
+			try {
+				this.onStat(path, curr, prev);
+			} catch {}
+		});
+	}
+	onStat(path, curr, prev) {
+		if (curr.nlink === 0) {
+			logger.warn(`config file disappeared — keeping current config (${path})`);
+			return;
+		}
+		if (curr.mtimeMs === prev.mtimeMs) return;
+		this.reload();
+	}
+	stop() {
+		if (this.watching) {
+			this.stopWatch?.();
+			this.stopWatch = void 0;
+			this.watching = false;
+		}
+	}
+};
+//#endregion
 //#region node_modules/.pnpm/@hono+node-server@2.0.4_hono@4.12.25/node_modules/@hono/node-server/dist/index.mjs
 var RequestError = class extends Error {
 	constructor(message, options) {
@@ -22876,20 +23012,23 @@ const injectChain = [
 	normalizeVolatileSystemMiddleware,
 	injectSessionId
 ];
-function createProxyServer(config, onReady) {
+function createProxyServer(source, onReady) {
 	const app = new Hono();
-	const globalRouting = buildProviderRouting(config.provider);
-	const modelOverrideKeys = Object.keys(config.modelOverrides ?? []);
 	app.use("*", async (c, next) => {
-		c.set("config", config);
+		c.set("config", source.get());
 		await next();
 	});
-	app.get("/health", (c) => c.json({
-		ok: true,
-		upstream: config.openrouterBaseUrl,
-		provider: globalRouting ?? "not configured",
-		modelOverrides: modelOverrideKeys
-	}));
+	app.get("/health", (c) => {
+		const config = source.get();
+		const globalRouting = buildProviderRouting(config.provider);
+		const modelOverrideKeys = Object.keys(config.modelOverrides ?? []);
+		return c.json({
+			ok: true,
+			upstream: config.openrouterBaseUrl,
+			provider: globalRouting ?? "not configured",
+			modelOverrides: modelOverrideKeys
+		});
+	});
 	for (const path of INJECT_PATHS) app.post(path, setupRequest, readBody, ...injectChain, buildUpstreamReq, forwardRequest);
 	app.all("*", setupRequest, readBody, resolveConfig, buildUpstreamReq, forwardRequest);
 	app.onError((err, c) => {
@@ -22900,20 +23039,22 @@ function createProxyServer(config, onReady) {
 			type: "proxy_internal_error"
 		} }, { status: 500 });
 	});
+	const initial = source.get();
 	return serve({
 		fetch: app.fetch,
-		port: config.port,
-		hostname: config.host
+		port: initial.port,
+		hostname: initial.host
 	}, onReady);
 }
 const SHUTDOWN_TIMEOUT_MS = 1e4;
-function startProxyServer(config, onReady) {
-	const server = createProxyServer(config, onReady);
+function startProxyServer(source, onReady) {
+	const server = createProxyServer(source, onReady);
 	let shuttingDown = false;
 	function shutdown(signal) {
 		if (shuttingDown) return;
 		shuttingDown = true;
 		logger.info(`${signal} received — draining active connections…`);
+		source.stop();
 		const timer = setTimeout(() => {
 			logger.warn("Forcing shutdown — drain timeout exceeded");
 			process.exit(1);
@@ -23031,17 +23172,24 @@ const startCommand = (0, import_cjs.command)({
 	},
 	handler: async ({ configPath, port, host, noConfig, openrouterKey, verbose }) => {
 		try {
-			const cfg = await loadConfig({
+			const loadOptions = {
 				configPath,
 				noConfig,
 				port,
 				host,
 				openrouterKey,
 				verbose
+			};
+			const cfg = await loadConfig(loadOptions);
+			const source = createConfigSource({
+				loadOptions,
+				initial: cfg
 			});
-			startProxyServer(cfg, () => {
+			source.start();
+			startProxyServer(source, () => {
 				logger.ready(`Proxitor proxy listening on ${cfg.host}:${cfg.port}`);
 				logger.info("Routing requests to OpenRouter");
+				if (source.resolvedPath) logger.info(`Watching ${source.resolvedPath} for changes (live reload)`);
 			});
 		} catch (error) {
 			logger.error("Failed to start proxy:", error);