Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
4d0fc68
docs: add design for multiple isolated DataWeave engines per process
mlischetti Aug 7, 2026
31dada3
W-23692110: handle-keyed ScriptRuntime registry with per-engine resol…
mlischetti Aug 10, 2026
75f02df
W-23692110: per-engine resolver bridge and handle-based N-API methods
mlischetti Aug 10, 2026
fe2f67a
W-23692110: per-instance engine handles in Node binding + isolation r…
mlischetti Aug 10, 2026
d29da78
W-23692110: fix native library ref-count leak on partial DataWeave.in…
mlischetti Aug 10, 2026
fe9596b
W-23692110: document independent per-instance engines
mlischetti Aug 10, 2026
cf75e90
W-23692110: Make Node engine bridge teardown safe against in-flight o…
mlischetti Aug 10, 2026
a300907
W-23692110: Reject invalid engine handles and fix resolver-buffer lea…
mlischetti Aug 10, 2026
387631e
W-23692110: Use bridge_finalize in create_engine_with_resolver reject…
mlischetti Aug 10, 2026
0940e68
Require per-engine ABI symbols at load and align resolver log policy
mlischetti Aug 10, 2026
612622e
Make default resolver-error log fully content-free, not just message-…
mlischetti Aug 10, 2026
28d1516
test(node): add lifecycle/error coverage for F1/F4/F6 remediation
mlischetti Aug 10, 2026
463f243
W-23692110: Add native-level test for unknown engine handle contract
mlischetti Aug 10, 2026
d13d472
chore: remove PR-157 code review process notes from repo
mlischetti Aug 10, 2026
d2fde4c
docs: add design for cleanup()-during-active-stream deadlock fix
mlischetti Aug 11, 2026
abd8fd0
Add process-global active-op accounting for streaming/transform
mlischetti Aug 11, 2026
423d2d9
Make napi_cleanup async: defer isolate teardown until active ops drain
mlischetti Aug 11, 2026
7f68422
Block initialize() while an isolate teardown is pending
mlischetti Aug 11, 2026
88b37dd
Fix signal-stealing deadlock: use broadcast instead of signal for op-…
mlischetti Aug 11, 2026
0c37175
Change DataWeave.cleanup() to return Promise<void>
mlischetti Aug 11, 2026
161083d
Await the now-async DataWeave.cleanup() in existing tests
mlischetti Aug 11, 2026
ba4a30c
Add cleanup()-during-active-stream/transform deadlock regression tests
mlischetti Aug 11, 2026
32376b2
Fix napi_initialize deadlock: decrement g_active_ops from the worker …
mlischetti Aug 11, 2026
e1f37f5
Document DataWeave.cleanup()'s Promise<void> signature
mlischetti Aug 11, 2026
8730238
W-23692110: Unwind pre-spawn state on streaming/transform worker spaw…
mlischetti Aug 11, 2026
6a2b64e
W-23692110: Roll back pending-teardown state on waiter spawn failure
mlischetti Aug 11, 2026
11d679a
fix(native-lib/node): signal read waiter on env==NULL teardown (F3)
mlischetti Aug 11, 2026
53de4d9
W-23692110: Drain in-flight ops via beforeExit before exit fallback
mlischetti Aug 11, 2026
2fc0fc7
fix: reset cleanupStarted guard after singleton teardown completes
mlischetti Aug 11, 2026
247c30c
fix(node): guard uv_thread_join on spawn-failure in three sync paths …
mlischetti Aug 11, 2026
68d471b
Fix resource leak in write-completion callbacks when env == NULL
mlischetti Aug 11, 2026
818d0a1
Only clear global isolate state in teardown_waiter_thread_fn on success
mlischetti Aug 11, 2026
a636c5c
W-23692110: Clear initialized in finally so a failed cleanup() doesn'…
mlischetti Aug 12, 2026
c68009b
Fix dead-env napi_ref deletion and orphaned-isolate cleanup race
mlischetti Aug 12, 2026
30f4176
fix(node): finalize worker-side state when the completion sentinel en…
mlischetti Aug 13, 2026
ef2cddd
fix(node): drop tsfn releases already discharged by napi_closing (F1 …
mlischetti Aug 13, 2026
4eec641
Fix(node): guard cross-thread destroyEngine for resolver-backed engin…
mlischetti Aug 13, 2026
a39a166
fix(node): check N-API allocation results in teardown_waiter_create (F3)
mlischetti Aug 13, 2026
bb44ea4
fix(node): coalesce concurrent DataWeave.cleanup() calls (F1)
mlischetti Aug 13, 2026
8b766d0
Fix F2: Free the teardown waiter when its completion enqueue fails
mlischetti Aug 13, 2026
1130a55
Fix napi_initialize deadlock: adopt live isolate during pending teardown
mlischetti Aug 14, 2026
30630a4
Add deterministic regression test for napi_initialize teardown deadlock
mlischetti Aug 14, 2026
e71584e
docs: design spec for round-6 instance-lifecycle-state fix (W-23692110)
mlischetti Aug 14, 2026
0d50b85
fix(node): model DataWeave instance lifecycle explicitly (round-6 #1/#3)
mlischetti Aug 14, 2026
755df1e
fix(node): coalesce cleanup() before the not-ready guard (task-1 revi…
mlischetti Aug 14, 2026
92cbbe4
fix(node): make stream/transform admission atomic under g_mutex (roun…
mlischetti Aug 14, 2026
c5bd399
fix(node): validate napi_get_value_int64 at handle-read sites (round-…
mlischetti Aug 14, 2026
6b4b6f0
fix(node): balance ffi.initialize()/cleanup() in handle-validation test
mlischetti Aug 14, 2026
83a2a9c
docs: design spec for round-7 FFI admission & conversion sweep (W-236…
mlischetti Aug 18, 2026
5ad3f8b
fix(node): reserve g_active_ops across run() isolate window (round-7 #1)
mlischetti Aug 18, 2026
973b502
fix(node): admit adopted-but-cancelled isolates at all 3 FFI admissio…
mlischetti Aug 18, 2026
1fca2a1
fix(node): check every napi_get_value_* status in FFI entrypoints (ro…
mlischetti Aug 18, 2026
8709e28
docs(node): await async cleanup() in external-modules examples (round…
mlischetti Aug 18, 2026
2f9ef6b
docs: design spec for round-8 OOM-safe streaming/transform setup (W-2…
mlischetti Aug 18, 2026
8ad2e4f
fix(node): NULL-check allocations in streaming/transform setup (round…
mlischetti Aug 18, 2026
85bf206
docs: mark ga-cleanup backlog item 6 resolved by round-8 OOM fix (W-2…
mlischetti Aug 18, 2026
6d50902
docs: round-9 design spec — engine lifecycle & worker-OOM hardening
mlischetti Aug 18, 2026
e7629bd
docs: correct round-9 spec — #1 is not deterministically testable
mlischetti Aug 18, 2026
553575b
fix(node): OOM-safe worker/callback allocations (round-9 P2)
mlischetti Aug 18, 2026
7d8a7b0
fix(node): check N-API resource creation after reservation (round-9 P3)
mlischetti Aug 18, 2026
565167b
fix(node): defer engine registry removal until admitted ops drain (ro…
mlischetti Aug 18, 2026
d504c0f
docs(node): fix stale bridge comments after round-9 all-engines recor…
mlischetti Aug 18, 2026
3abb84f
W-23692110: Remove Java registry entry during Worker/env teardown (ro…
mlischetti Aug 19, 2026
50b2930
docs: round-10 design spec (worker-teardown dangling resolver ctx + s…
mlischetti Aug 19, 2026
ff8ceb9
docs: round-11 design spec (engine-pin at admission + all-engines cle…
mlischetti Aug 19, 2026
7f24fc7
W-23692110: Extract bridge_begin_op_locked for atomic admission-time …
mlischetti Aug 19, 2026
27cc714
W-23692110: Pin engine in the admission transaction for streaming/tra…
mlischetti Aug 19, 2026
4950380
W-23692110: Pin the engine for synchronous runScriptEngine (round 11 #3)
mlischetti Aug 19, 2026
fd49ad1
W-23692110: Register env cleanup hook for every engine + extend owner…
mlischetti Aug 19, 2026
58c2690
W-23692110: Register process exit hooks once, not per singleton (roun…
mlischetti Aug 19, 2026
cacb41b
W-23692110: Node integration tests for *_engine unknown/destroyed-han…
mlischetti Aug 19, 2026
6865803
W-23692110: Fix initialize/cleanup ref-count imbalance in engine-hand…
mlischetti Aug 19, 2026
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
73 changes: 73 additions & 0 deletions docs/ga-cleanup-backlog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# GA Cleanup Backlog

Non-blocking cleanup/refactor items identified while working on the multi-engine
Node binding (W-23692110, PR #157). None of these are required for that PR to
merge — tracked here to brainstorm and prioritize before GA, since pre-GA we
have no external ABI-stability commitment yet and more latitude to remove
legacy paths outright.

## Node binding

1. **Dead legacy `runScript` wrapper.** `native-lib/node/src/ffi.ts:6,44-46`
(`runScript`), the `"runScript"` N-API export at
`native-lib/node/src/addon.c:1234-1235`, and `dw_napi_run_script` itself
(`addon.c:382-...`) are unreferenced — the Node singleton now routes
through `createEngine()`/`runScriptEngine()` instead. Safe to delete from
the Node addon without touching the underlying C `run_script` symbol,
which Python still depends on.

2. **Undocumented owner-thread constraint on `destroyEngine`.**
`native-lib/node/src/addon.c` (`napi_destroy_engine`) requires cleanup-hook
removal / `napi_ref` deletion to happen on the bridge's owner thread. Today
this is only implied by the general "don't share a `DataWeave` instance
across Workers" rule in the README. Add an explicit one-line code comment
stating the constraint directly on `napi_destroy_engine`.

3. **Test clarity: near-tautological assertion.**
`native-lib/node/tests/integration/dataweave-resolver.test.ts` — the
cleanup-during-streaming regression test's `expect(settled).toBe(true)`
is near-tautological (the real protection is process survival, not the
value). Add a comment explaining that if this test is touched again.

4. **Test tightening: throwing-resolver test.** Same file — the
throwing-resolver test only asserts `result.success === false`; could
additionally assert `result.error` is truthy for a slightly stronger
check.

6. **~~Unchecked `malloc` before the fill `napi_get_value_string_utf8` in
streaming/transform.~~ RESOLVED (round 8, commit `516311e`).** The streaming
(`napi_run_script_streaming_engine`) and transform
(`napi_run_script_transform_engine`) entrypoints passed `calloc`/`malloc`
results straight to `w->handle` / the fill `napi_get_value_string_utf8`
without a NULL check, unlike `napi_run_script_engine`. On OOM this
segfaulted the host process (NULL deref) and stranded the `g_active_ops`
reservation. The eighth "andy" review
(`docs/pr-157-follow-up-andy-code-review-8.md`) escalated it Minor→P1, and
round 8 fixed both sites: every `calloc`/`malloc` is NULL-checked before any
dereference, each OOM path unwinds `g_active_ops` (verbatim pattern) and
frees any partial work struct, throwing bare `"OOM"` to match
`napi_run_script_engine`. Spec:
`docs/superpowers/specs/2026-08-18-oom-safe-streaming-transform-setup-design.md`.
Note: the identical gap in the legacy singleton `dw_napi_run_script` was
deliberately left (out of scope by the Global Constraints) — subsumed by
item 1's "delete the dead legacy wrapper".

## Cross-binding / architecture

5. **Retire the legacy `ScriptRuntime` singleton once Python adopts the
per-engine registry.** `native-lib/src/main/java/org/mule/weave/lib/ScriptRuntime.java`
(`defaultInstance`, `getInstance()`) backs the legacy `run_script` /
`run_script_callback` / `run_script_input_output_callback` `@CEntryPoint`s
in `NativeLib.java`, called today only by the Python binding. These are
exported as part of `dwlib`'s public C ABI (`dwlib.h`), not just internal
plumbing — so removing them is a bigger call than deleting an internal TS
wrapper (item 1) and needs a deliberate decision, not just a "zero
internal callers" grep.
- Requires deciding whether Python migrates onto the same handle-keyed
registry the Node binding uses (possibly with a single implicit handle
if Python doesn't need multi-engine support), or keeps its own
singleton path indefinitely.
- Being pre-GA removes the "might break an external consumer of the C
ABI" concern, but this is still cross-binding work broader than the
Node-only scope of PR #157 — needs its own brainstorm/plan before
starting.
169 changes: 169 additions & 0 deletions docs/superpowers/specs/2026-08-07-native-lib-multi-engine-design.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# Fix `cleanup()`-During-Active-Stream Deadlock — Design

**Goal:** Eliminate a process-wide deadlock where calling `DataWeave.cleanup()` while any `runStreaming()`/`runTransform()` operation is still in flight (on any engine, in any thread) can freeze the process, by making isolate teardown wait for active operations to drain instead of blocking the JS thread they depend on.

**Architecture:** `napi_cleanup` becomes async: when it's the last release and no ops are active, it keeps today's synchronous spawn+join fast path unchanged. When ops are active, it defers teardown to a dedicated waiter thread that blocks on a condition variable until every op drains, then performs teardown and signals completion back into JS via a `napi_threadsafe_function` — the same pattern this addon already uses for streaming chunk delivery.

**Tech Stack:** N-API C addon (`napi_*`, `uv_thread`/`uv_mutex`/`uv_cond`), TypeScript (`DataWeave.cleanup()` signature change), vitest.

## Global Constraints

- Node binding only — do not touch `native-lib/python/**`.
- Legacy singleton entrypoints (`run_script`, `run_script_callback`, `run_script_input_output_callback`) and `ScriptRuntime.getInstance()` on the Java side are untouched by this fix; the bug and fix are entirely within `native-lib/node/src/addon.c` and `dataweave.ts`.
- Handle width stays C `long long` everywhere (unaffected by this fix, but any touched signature must not regress it).
- The existing per-bridge `in_flight`/`destroy_pending` accounting (F1 remediation, PR #157) is untouched — this fix adds a **separate, process-global** `g_active_ops` counter that covers all streaming/transform ops (resolver-backed or not), because isolate teardown blocks on *any* attached worker thread, not just resolver-backed ones.
- `DataWeave.cleanup()` signature changes from `void` to `Promise<void>` (async). This is acceptable pre-GA; no external ABI-stability commitment exists yet for the Node package.
- The module-level `process.on("exit", () => cleanup())` hook (`dataweave.ts:222`) stays fire-and-forget — not awaited. This is a pre-existing, acceptable tradeoff, not a new one.

---

## Background

### The bug

`napi_cleanup` (`addon.c:1189-1218`) decrements the process-global `g_ref_count`. When it drops to 0, it spawns a thread that calls `graal_tear_down_isolate`, then calls **`uv_thread_join` on that thread synchronously, blocking the calling JS thread** until teardown finishes.

`graal_tear_down_isolate` blocks until every GraalVM-attached thread reaches a safepoint/detaches. A `runStreaming()`/`runTransform()` background worker (`streaming_thread_fn`/`transform_thread_fn`) stays attached to the isolate for the duration of its native call, and delivers each chunk via `napi_call_threadsafe_function(..., napi_tsfn_blocking)`, which requires the JS event loop to run the corresponding `call_js_write`/`call_js_transform_write` callback before the worker can proceed.

If `cleanup()` is the call that drops `g_ref_count` to 0 while such a worker is still attached and mid-delivery, this produces a real circular wait:

```
JS thread: cleanup() -> uv_thread_join(teardown thread) -> blocked
Teardown thread: graal_tear_down_isolate() -> waiting for worker to detach -> blocked
Worker thread: napi_call_threadsafe_function(..., blocking) -> waiting for JS thread to run callback -> blocked
```

`g_isolate`/`g_ref_count` are process-global, so this is reachable even when the streaming op and the `cleanup()` call belong to different, unrelated `DataWeave` instances — not just same-instance self-cleanup.

### Why the existing F1 regression test didn't catch it

The Task 4 F1 test (added during the PR-157 remediation) uses a resolver that throws before emitting any data, so the streaming operation fails fast and the worker thread never reaches the mid-delivery, blocked-on-`napi_tsfn_blocking` state this bug requires.

---

## Design

### New global state (guarded by the existing `g_mutex`)

- **`g_active_ops`** (`int`) — count of all currently-running streaming/transform native calls, across every engine (resolver-backed or not) and every Worker thread.
- **`g_teardown_pending`** (`bool`) — true from the moment `cleanup()` drops `g_ref_count` to 0 while `g_active_ops > 0`, until teardown actually completes.
- **`g_teardown_cond`** (`uv_cond_t`) — condition variable the waiter thread blocks on; signaled by each op's completion sentinel after decrementing `g_active_ops`.
- **`g_teardown_waiters`** (linked list, each node `{napi_env env, napi_deferred deferred, napi_threadsafe_function tsfn}`) — one entry per `cleanup()` call currently waiting on the same in-progress teardown. A list rather than a single slot because a second (or third) `cleanup()` call can arrive from a **different** `napi_env` (a different Worker thread) while the first teardown is still pending — `napi_env`/`napi_deferred`/`napi_threadsafe_function` are thread-affine, so each waiting caller needs its own tsfn created on its own env; there is no way to resolve one env's deferred from another env's thread.

### Op accounting

Every streaming/transform entrypoint (`napi_run_script_streaming_engine`, `napi_run_script_transform_engine`) increments `g_active_ops` under `g_mutex`, immediately alongside the existing `bridge_begin_op` call and before spawning its worker thread — same timing, same "no early return in between" invariant already documented for `bridge_begin_op`.

The completion sentinel branch (`chunk->len == -1`) in `call_js_write`/`call_js_transform_write` decrements `g_active_ops` under `g_mutex`, alongside the existing `bridge_end_op` call, and signals `g_teardown_cond`. This is the only new responsibility added to the sentinel — it does not spawn anything or run teardown itself.

### `napi_cleanup` behavior

1. Lock `g_mutex`, decrement `g_ref_count` only if it's currently `> 0` (a second `cleanup()` call while one is already pending, with `g_ref_count` already at 0, must not decrement further into negative values).
2. If `g_ref_count > 0` after decrementing: unlock, return an already-resolved promise (today's "no-op until last release" behavior, promise-shaped). Every branch that returns "already resolved" (this one and case 4) creates a `napi_deferred`/promise and resolves it immediately before returning, rather than inventing a separate no-promise return path — keeps `napi_cleanup`'s return type uniformly "a promise" regardless of which branch runs.
3. If `g_ref_count <= 0` and `g_teardown_pending` is already true (re-entrant call — see Edge Cases): create a new deferred/promise + threadsafe function on *this call's* env, append it to `g_teardown_waiters`, unlock, return the pending promise. No second waiter thread is spawned — this call's node just joins the list the existing waiter thread will drain on completion.
4. If `g_ref_count <= 0`, `g_teardown_pending` is false, and `g_active_ops == 0`: unchanged fast path — spawn+join the teardown thread inline (`cleanup_thread_fn`, unmodified), reset `g_thread`/`g_isolate`/`g_initialized`/`g_ref_count`, unlock, return an already-resolved promise.
5. If `g_ref_count <= 0`, `g_teardown_pending` is false, and `g_active_ops > 0`: set `g_teardown_pending = true`; create a deferred/promise + threadsafe function on this env, append it as the first node of `g_teardown_waiters`; spawn the **waiter thread**; unlock; return the pending promise.

### Waiter thread

A dedicated thread (spawned only in case 5 above) that:
1. Locks `g_mutex`, waits on `g_teardown_cond` while `g_active_ops > 0`.
2. Once drained, runs teardown exactly as `cleanup_thread_fn` does today (attach a local thread to the isolate, call `graal_tear_down_isolate`, ignoring its return code — matching today's behavior of not propagating a teardown failure).
3. Resets `g_thread`/`g_isolate`/`g_initialized`/`g_ref_count`/`g_teardown_pending` under `g_mutex`, signals `g_teardown_cond` again (to release any `initialize()` call blocked in the re-entrant-init path below).
4. Walks `g_teardown_waiters`: for each node, calls its `tsfn` to resolve its `deferred` back on its own env, then releases that threadsafe function. Clears the list once every node has been signaled.

This thread is dedicated to this one teardown — no unrelated Worker's event loop is ever blocked as a side effect of finishing its own streaming op (rejected alternative: piggybacking teardown onto the last op's own completion sentinel, which would stall whichever unrelated thread happens to run that sentinel for the full teardown duration).

### `DataWeave.cleanup()` (TypeScript)

`cleanup(): Promise<void>` (was `void`). Awaits `ffi.cleanup()`'s now-Promise-returning addon call. Callers that need the old synchronous-fire-and-forget behavior (e.g. the module-level process-exit hook) simply don't await it — unchanged behavior for them, since the promise resolving or not doesn't block anything if nobody awaits it.

---

## Edge Cases

**Re-entrant `cleanup()` while teardown is pending, possibly from a different Worker/env.** Handled by case 3 above — `g_ref_count` doesn't go negative, no second waiter thread is spawned, and each caller's own env gets its own list node (deferred + tsfn) so it can be resolved on its own thread when teardown finishes, regardless of which env made the original triggering call. Preserves `cleanup()`'s documented idempotency (`dataweave.ts:105`, "a no-op if not initialized") at the addon layer, including across Workers.

**`initialize()` called while a teardown is pending.** `napi_initialize` must not re-create the isolate while the old one is still tearing down (risk of two live isolates, or use of a half-torn-down one). Add a check: if `g_teardown_pending` is true, block on `g_teardown_cond` until it's false and `g_isolate == NULL` is confirmed, then proceed with the existing create-isolate logic. This is a narrow, rare path (re-initializing mid-drain) but must not be skipped.

**`graal_tear_down_isolate` returning a non-zero/failure code.** Unchanged from today — the existing fast path already ignores this return value; the waiter thread preserves that (no new failure-propagation behavior invented for this fix).

**Process exit while ops are active and teardown is pending.** No new behavior introduced; an active native worker thread at process exit is already an existing, out-of-scope condition handled by libuv/Node's own exit sequencing, not this addon.

---

## Testing

1. **Deadlock regression (the core test).** For both `runStreaming()` and `runTransform()`: start an operation whose script produces multiple chunks with real volume/delay between them (so the worker is genuinely attached and mid-delivery, not failing fast like the existing F1 test). Call `gen.next()` once to pin the operation, then `await dw.cleanup()` before draining the generator. Assert the returned promise resolves within a bounded timeout (test-level timeout or explicit `Promise.race`) rather than hanging, and that the streaming generator itself eventually settles.
2. **Fast-path regression guard.** `cleanup()` called after a stream has already fully drained (`g_active_ops == 0` at the moment of last release) still resolves via the unchanged inline fast path — confirms the new branch didn't silently become the only path.
3. **Idempotency / re-entrant cleanup.** Two concurrent (or sequential, unawaited-then-awaited) `cleanup()` calls while a stream is active both resolve off the same underlying teardown, without spawning a second waiter thread or throwing.
4. **Re-initialize during pending teardown.** Start a stream, call `cleanup()` without awaiting, then immediately call `initialize()` again — confirms it blocks until the pending teardown finishes and the instance is usable afterward (a subsequent `run()` succeeds).
5. **No regression in the existing suite.** All current streaming/transform/lifecycle tests, including the Task 4 F1/F4/F6 additions from the PR-157 remediation, continue passing unmodified.
Loading
Loading