mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-18 06:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: drain CDP messages after doConnect to prevent message loss on reconnect

Browse Source 
receiveMessagesOnInspectorThread was draining messages from the queue
before checking if the connection needed doConnect. If the connection
was Pending, it called doConnect and returned early, dropping the
already-drained messages on the floor.

Move the doConnect check before the message drain so messages that
arrive during reconnection are not lost.
This commit is contained in:
Alistair Smith
2026-02-17 11:48:31 -08:00
parent 4ca4f07d4c
commit 9a2c9b3394
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bun.js/bindings/BunDebugger.cpp
View File

@@ -346,6 +346,21 @@ public:
// tasks pile up for after the loop exits).
if (!(this->pauseFlags.load() & kInPauseLoop))
this->jsThreadMessageScheduled.store(false);
// Connect pending connections BEFORE draining messages.
// If we drain first and then doConnect returns early, the drained
// messages would be lost (dropped on stack unwind).
auto& dispatcher = globalObject->inspectorDebuggable();
Inspector::JSGlobalObjectDebugger* debugger = reinterpret_cast<Inspector::JSGlobalObjectDebugger*>(globalObject->debugger());
if (!debugger && connectIfNeeded && this->status == ConnectionStatus::Pending) {
this->doConnect(context);
// doConnect calls receiveMessagesOnInspectorThread recursively,
// but jsThreadMessages may have been empty at that point.
// Fall through to drain any messages that arrived during doConnect.
debugger = reinterpret_cast<Inspector::JSGlobalObjectDebugger*>(globalObject->debugger());
}
WTF::Vector<WTF::String, 12> messages;
{
@@ -353,15 +368,7 @@ public:
this->jsThreadMessages.swap(messages);
}
auto& dispatcher = globalObject->inspectorDebuggable();
Inspector::JSGlobalObjectDebugger* debugger = reinterpret_cast<Inspector::JSGlobalObjectDebugger*>(globalObject->debugger());
if (!debugger) {
if (connectIfNeeded && this->status == ConnectionStatus::Pending) {
this->doConnect(context);
return;
}
for (auto message : messages) {
dispatcher.dispatchMessageFromRemote(WTF::move(message));