vxaboveground/overlord
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix resolving cwd

Browse Source
This commit is contained in:
KingKDot
2026-04-18 22:38:08 -05:00
parent b1d2cab242
commit 55ebf3dcbd
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1
View File
@@ -117,6 +117,7 @@ ENV PORT=5173
ENV HOST=0.0.0.0 ENV HOST=0.0.0.0
ENV DATA_DIR=/app/data ENV DATA_DIR=/app/data
ENV NODE_ENV=production ENV NODE_ENV=production
ENV OVERLORD_ROOT=/app
# Run the compiled production binary # Run the compiled production binary
CMD ["./overlord-server"] CMD ["./overlord-server"]
Overlord-Server/src/main-server.ts
+19 -3
View File
@@ -4,6 +4,7 @@ import { logger } from "./logger";
import { fileURLToPath } from "url"; import { fileURLToPath } from "url";
import path from "path"; import path from "path";
import fs from "fs/promises"; import fs from "fs/promises";
import { existsSync } from "node:fs";
import { upsertClientRow, setOnlineState, listClients, markAllClientsOffline, getBuild, getBuildByTag, getAllBuilds, deleteExpiredBuilds, deleteBuild, getNotificationScreenshot, clearNotificationScreenshots, deleteClientRow, getClientIp, banIp, isIpBanned, clientExists, deleteExpiredSharedFiles, getChatHistory, insertChatMessage, getOnlineClientCountForUser, deleteExpiredChatMessages } from "./db"; import { upsertClientRow, setOnlineState, listClients, markAllClientsOffline, getBuild, getBuildByTag, getAllBuilds, deleteExpiredBuilds, deleteBuild, getNotificationScreenshot, clearNotificationScreenshots, deleteClientRow, getClientIp, banIp, isIpBanned, clientExists, deleteExpiredSharedFiles, getChatHistory, insertChatMessage, getOnlineClientCountForUser, deleteExpiredChatMessages } from "./db";
import { handleFrame, handleHello, handlePing, handlePong } from "./wsHandlers"; import { handleFrame, handleHello, handlePing, handlePong } from "./wsHandlers";
import { getMessageByteLength, getMaxPayloadLimit, isAllowedClientMessageType } from "./wsValidation"; import { getMessageByteLength, getMaxPayloadLimit, isAllowedClientMessageType } from "./wsValidation";
@@ -144,9 +145,24 @@ const isAuthorizedAgent = (req: Request, url: URL) =>
const PORT = config.server.port; const PORT = config.server.port;
const HOST = config.server.host; const HOST = config.server.host;
const RUNTIME_ROOT = process.env.OVERLORD_ROOT?.trim()
? path.resolve(process.env.OVERLORD_ROOT) function resolveRuntimeRoot(): string {
: fileURLToPath(new URL("..", import.meta.url)); if (process.env.OVERLORD_ROOT?.trim()) {
return path.resolve(process.env.OVERLORD_ROOT);
}
const fromMeta = fileURLToPath(new URL("..", import.meta.url));
if (existsSync(path.join(fromMeta, "public"))) return fromMeta;
const exeDir = path.dirname(process.execPath);
if (existsSync(path.join(exeDir, "public"))) return exeDir;
const exeParent = path.dirname(exeDir);
if (existsSync(path.join(exeParent, "public"))) return exeParent;
return process.cwd();
}
const RUNTIME_ROOT = resolveRuntimeRoot();
const PUBLIC_ROOT = process.env.OVERLORD_PUBLIC_ROOT?.trim() const PUBLIC_ROOT = process.env.OVERLORD_PUBLIC_ROOT?.trim()
? path.resolve(process.env.OVERLORD_PUBLIC_ROOT) ? path.resolve(process.env.OVERLORD_PUBLIC_ROOT)
: path.join(RUNTIME_ROOT, "public"); : path.join(RUNTIME_ROOT, "public");