Skip to content

fix: correct PID check, preserve stack traces, and add missing return after queue overflow reject #110

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
Swastik-Prakash1 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

fix: correct PID check, preserve stack traces, and add missing return after queue overflow reject #110

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
10 changes: 7 additions & 3 deletions src/JavaScriptEvaluator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export type EvalResponse = {
timeout?: boolean // if true the promise is rejected due to timeout
starvation?: boolean // if true the promise is rejected due to lack of child process
message?: string; // if promise rejected due to a caught exception this will be set
stack?: string;
elapsed?: number; // the elapsed time in ms to process the work item
maxQueueDepthExceeded?: boolean // if true the promise is rejected because the queue is full
}
Expand Down Expand Up @@ -137,15 +138,17 @@ export class JavaScriptEvaluator {
.catch(err => {
console.log(err);
reject({
message: err.message
message: err.message,
stack: err.stack
Comment on lines 138 to +142
});
});
}
}
catch (err: any) {
console.log(err);
reject({
Comment on lines 147 to 149
message: err.message
message: err.message,
stack: err.stack
});
}
});
Expand All @@ -169,6 +172,7 @@ export class JavaScriptEvaluator {
};
if(this.queue.length >= this.options.maxQueueDepth) {
reject({ maxQueueDepthExceeded: true, elapsed: 0 });
return;
}
Comment on lines 173 to 176
this.queue.push(workItem);
this.processQueue(options);
Expand Down Expand Up @@ -220,7 +224,7 @@ export class JavaScriptEvaluator {
const workerPath = this.getWorkerPath();
// console.debug(`Worker path: ${workerPath}`);
const worker = child_process.fork(workerPath, { timeout: options.timeout, env: {} });
if (!worker.pid) {
if (worker.pid === undefined || worker.pid === null) {
Comment on lines 224 to +227
throw new Error('Failed to fork child process');
}
this.workers.push(worker);
Expand Down
Loading