wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent race condition in MessageQueue2 wait logic

Browse Source
This commit is contained in:
weishu
2025-12-30 13:26:33 +08:00
parent b160888101
commit ce6234da3f
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/utils/MessageQueue2.ts
+29 -25
View File
@@ -288,22 +288,18 @@ export class MessageQueue2<T> {
*/
private waitForMessages(abortSignal?: AbortSignal): Promise<boolean> {
return new Promise((resolve) => {
let settled = false;
let abortHandler: (() => void) | null = null;
let waiterFunc: (hasMessages: boolean) => void;
// Set up abort handler
if (abortSignal) {
abortHandler = () => {
logger.debug('[MessageQueue2] Wait aborted');
// Clear waiter if it's still set
if (this.waiter === waiterFunc) {
this.waiter = null;
}
resolve(false);
};
abortSignal.addEventListener('abort', abortHandler);
}
const waiterFunc = (hasMessages: boolean) => {
const finish = (hasMessages: boolean) => {
if (settled) {
return;
}
settled = true;
if (this.waiter === waiterFunc) {
this.waiter = null;
}
// Clean up abort handler
if (abortHandler && abortSignal) {
abortSignal.removeEventListener('abort', abortHandler);
@@ -311,26 +307,34 @@ export class MessageQueue2<T> {
resolve(hasMessages);
};
waiterFunc = (hasMessages: boolean) => {
finish(hasMessages);
};
// Set up abort handler
if (abortSignal) {
abortHandler = () => {
logger.debug('[MessageQueue2] Wait aborted');
finish(false);
};
abortSignal.addEventListener('abort', abortHandler);
}
// Set the waiter before checking the queue to avoid missed notifications
this.waiter = waiterFunc;
// Check again in case messages arrived or queue closed while setting up
if (this.queue.length > 0) {
if (abortHandler && abortSignal) {
abortSignal.removeEventListener('abort', abortHandler);
}
resolve(true);
finish(true);
return;
}
if (this.closed || abortSignal?.aborted) {
if (abortHandler && abortSignal) {
abortSignal.removeEventListener('abort', abortHandler);
}
resolve(false);
finish(false);
return;
}
// Set the waiter
this.waiter = waiterFunc;
logger.debug('[MessageQueue2] Waiting for messages...');
});
}
}
}