AI_Assistant/pcbjam
Watch
1
0
Fork
You've already forked pcbjam
 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity Actions

staging CI green-up: P-1 apply-slot wedge under JSPI, popup P-4 regression, ysync double-seed header, spec fixes

Browse source 
- P-1 (findings-p.spec P-1c red on CI + locally): a JS exception thrown from a
  window.kicadCollab wire callback does NOT reach the C++ catch(...) — under
  JSPI it REJECTS the promising coroutine entry, slot.done never flips and the
  apply slot is busy for the page's life. Three layers: libcontext flags the
  rejected record dead (kicad → d0afbc4bd3),
  drainApplies() reaps a !done && !CanResume() body, and every EM_ASM
  window.kicadCollab.onX(...) call is try/catch-guarded (collab_common.h,
  kicad_editor/eeschema/pl_editor embind).
- popup.spec 'dismisses on outside click': wx P-4 SetFocus delegation excluded
  for wxPopupWindow (wxwidgets → a7436d1052).
- ysync-two-tab concurrent seed: repairLayoutY + seedNonce retraction deleted
  both headers (pcbjam-shared → 8dabf2e).
- dark-mode.spec: stale light-mode reference (pre wx fa46f1822c DOM
  re-projection) replaced with the CI chromium render.
- items-wire-batch-loss.spec: precondition obsolete after P-5 — poisoned entry
  is now synthetic, plus a P-5 contract assertion (field blob == '').
- presence-ghost-peer.spec: skip early when no /parties/ socket (CI web e2e
  runs the BroadcastChannel provider); findings-p1.spec: polled click-select
  precondition.

Local: kicad-chromium findings/presence/ysync/collab 59/59, popup 7/7,
dark-mode 1/1, pcbjam-shared vitest 249/249.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LvvARNMxQrq17vogn3REMU
This commit is contained in:
Gergő Törcsvári 2026-08-28 22:25:21 +02:00
commit c4bdaad7a0
No known key found for this signature in database
GPG key ID: 8E75F2CDE64E5322
11 changed files with 166 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

67
wasm/bindings/collab_common.h
View file

@ -107,9 +107,18 @@ inline void drainApplies()
if( applyBusy() )
{
if( !slot.done )
return; // suspended body still in flight — its tail re-drains
{
if( slot.cor && slot.cor->CanResume() )
return; // suspended body still in flight — its tail re-drains
reapApply(); // completed since the last drain
// P-1: the body's activation died without finishing (its promising entry
// REJECTED — a JS exception out of a wire callback, or a trap — and libcontext
// flagged the record dead). Its tail never runs, so nothing else would ever
// reap it: release the slot here and keep draining.
EM_ASM( { console.error( '[pcbjam collab] apply body died mid-flight — slot released' ); } );
}
reapApply(); // completed (or died) since the last drain
}
auto& q = applyQueue();
@ -126,11 +135,13 @@ inline void drainApplies()
ApplySlot& sl = activeApplySlot();
// P-1 hardening (findings group P): `done` is the ONLY completion signal, so a
// body that unwinds — a C++ exception, or a foreign (JS) exception thrown out of
// an EM_ASM wire callback inside flushDiff and surfacing here as `...` under
// wasm EH — would leave applyBusy() true for the page's life and silently
// queue every later job behind it: fit/pan from JS, remote applies AND the
// local-edit flushDiff (local edits stop syncing). Always mark the slot done.
// body that unwinds on a C++ exception would leave applyBusy() true for the
// page's life and silently queue every later job behind it: fit/pan from JS,
// remote applies AND the local-edit flushDiff (local edits stop syncing).
// Always mark the slot done. NOTE: a JS exception thrown out of an EM_ASM wire
// callback does NOT surface here — under JSPI it rejects the promising entry
// and this frame is simply abandoned; that case is covered by the wire
// emitters' own try/catch plus the dead-body reap in drainApplies().
try
{
( *sl.body )();
@ -154,7 +165,12 @@ inline void drainApplies()
slot.cor->Call( 0 );
if( !slot.done )
return; // suspended — cor/body stay pinned for the resume
{
if( slot.cor->CanResume() )
return; // suspended — cor/body stay pinned for the resume
EM_ASM( { console.error( '[pcbjam collab] apply body died at entry — slot released' ); } );
}
reapApply();
}
@ -183,7 +199,12 @@ inline void emitDelta( const nlohmann::json& aDelta )
std::string s = aDelta.dump();
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onDelta )
window.kicadCollab.onDelta( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onDelta( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onDelta listener threw', e ); }
}
}, s.c_str() );
}
@ -193,7 +214,12 @@ inline void emitItemsWire( const nlohmann::json& aWire )
std::string s = aWire.dump();
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onItems )
window.kicadCollab.onItems( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onItems( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onItems listener threw', e ); }
}
}, s.c_str() );
}
@ -202,7 +228,12 @@ inline void emitCursor( double aX, double aY, bool aActive )
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onCursor )
window.kicadCollab.onCursor( $0, $1, $2 );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onCursor( $0, $1, $2 ); }
catch( e ) { console.error( '[pcbjam collab] onCursor listener threw', e ); }
}
}, aX, aY, aActive ? 1 : 0 );
}
@ -211,7 +242,12 @@ inline void emitSelection( const std::string& aJson )
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSelection )
window.kicadCollab.onSelection( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSelection( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSelection listener threw', e ); }
}
}, aJson.c_str() );
}
@ -220,7 +256,12 @@ inline void emitViewport( double aCx, double aCy, double aPxPerIu, int aW, int a
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onViewport )
window.kicadCollab.onViewport( $0, $1, $2, $3, $4 );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onViewport( $0, $1, $2, $3, $4 ); }
catch( e ) { console.error( '[pcbjam collab] onViewport listener threw', e ); }
}
}, aCx, aCy, aPxPerIu, aW, aH );
}

21
wasm/bindings/eeschema_embind.cpp
View file

@ -381,7 +381,12 @@ void emitSheetChanged()
std::string s = toUtf8( screen->GetFileName() );
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSheetChanged )
window.kicadCollab.onSheetChanged( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSheetChanged( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSheetChanged listener threw', e ); }
}
}, s.c_str() );
}
@ -637,7 +642,12 @@ void scheduleSheetSave( SCH_SHEET* aSheet )
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSheetCreated )
window.kicadCollab.onSheetCreated( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSheetCreated( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSheetCreated listener threw', e ); }
}
}, childAbs.c_str() );
} );
}
@ -1876,7 +1886,12 @@ extern "C" void kicadCollabOnSave( const char* aPath )
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSave )
window.kicadCollab.onSave( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSave( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSave listener threw', e ); }
}
}, aPath );
}
#endif // !KICAD_MERGED_EMBIND

7
wasm/bindings/kicad_editor_embind.cpp
View file

@ -353,7 +353,12 @@ extern "C" void kicadCollabOnSave( const char* aPath )
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSave )
window.kicadCollab.onSave( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSave( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSave listener threw', e ); }
}
}, aPath );
}

21
wasm/bindings/pl_editor_embind.cpp
View file

@ -227,7 +227,12 @@ void emit( const json& aDelta )
std::string s = aDelta.dump();
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onDelta )
window.kicadCollab.onDelta( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onDelta( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onDelta listener threw', e ); }
}
}, s.c_str() );
}
@ -239,7 +244,12 @@ void emitItems( const json& aWire )
std::string s = aWire.dump();
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onItems )
window.kicadCollab.onItems( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onItems( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onItems listener threw', e ); }
}
}, s.c_str() );
}
@ -455,7 +465,12 @@ extern "C" void kicadCollabOnSave( const char* aPath )
{
EM_ASM( {
if( window.kicadCollab && window.kicadCollab.onSave )
window.kicadCollab.onSave( UTF8ToString( $0 ) );
{
// A throwing listener must never unwind the wasm frame that called it: under
// JSPI that rejects the running coroutine's entry (findings P-1).
try { window.kicadCollab.onSave( UTF8ToString( $0 ) ); }
catch( e ) { console.error( '[pcbjam collab] onSave listener threw', e ); }
}
}, aPath );
}