Skip to content

fix: add connection timeout and max buffer size limit #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yuan-ManX wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add connection timeout and max buffer size limit #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion src/queue-ipc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import type {

const QUEUE_CONNECT_ATTEMPTS = 40;
export const QUEUE_CONNECT_RETRY_MS = 50;
export const SOCKET_CONNECTION_TIMEOUT_MS = 5000;
export const MAX_MESSAGE_BUFFER_SIZE = 10 * 1024 * 1024;
export {
isProcessAlive,
releaseQueueOwnerLease,
Expand Down Expand Up @@ -103,15 +105,35 @@ function shouldRetryQueueConnect(error: unknown): boolean {
return code === "ENOENT" || code === "ECONNREFUSED";
}

async function connectToSocket(socketPath: string): Promise<net.Socket> {
async function connectToSocket(socketPath: string, timeoutMs = SOCKET_CONNECTION_TIMEOUT_MS): Promise<net.Socket> {
return await new Promise<net.Socket>((resolve, reject) => {
const socket = net.createConnection(socketPath);
let settled = false;

const timeout = setTimeout(() => {
if (settled) {
return;
}
settled = true;
socket.destroy();
reject(new Error(`Connection to ${socketPath} timed out after ${timeoutMs}ms`));
}, timeoutMs);

const onConnect = () => {
if (settled) {
return;
}
settled = true;
clearTimeout(timeout);
socket.off("error", onError);
resolve(socket);
};
const onError = (error: Error) => {
if (settled) {
return;
}
settled = true;
clearTimeout(timeout);
socket.off("connect", onConnect);
reject(error);
};
Expand Down Expand Up @@ -337,6 +359,12 @@ async function runQueueOwnerRequest<TResult>(options: {
socket.on("data", (chunk: string) => {
buffer += chunk;

if (buffer.length > MAX_MESSAGE_BUFFER_SIZE) {
socket.destroy();
finishReject(new Error(`Message buffer exceeded ${MAX_MESSAGE_BUFFER_SIZE} bytes`));
return;
}

let index = buffer.indexOf("\n");
while (index >= 0) {
const line = buffer.slice(0, index).trim();
Expand Down