Skip to content

refactor(native): split bridge modules and merge worker teardown fix #255

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

Merged
RtlZeroMemory merged 7 commits into from
Mar 6, 2026
Merged

refactor(native): split bridge modules and merge worker teardown fix #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
848a8c6
Fix native worker-thread teardown stability
RtlZeroMemory Mar 5, 2026
b71c1ec
refactor(native): split bridge modules
RtlZeroMemory Mar 5, 2026
96a1e9f
chore: merge PR #254 into native bridge refactor
RtlZeroMemory Mar 5, 2026
301c4b8
fix(native): align engine guard semantics
RtlZeroMemory Mar 6, 2026
e7e1021
test(node): gate prebuild native loader smoke
RtlZeroMemory Mar 6, 2026
ac47dfa
merge: resolve native bridge refactor against main
RtlZeroMemory Mar 6, 2026
5eafe9c
fix(native): harden config and debug numeric parsing
RtlZeroMemory Mar 6, 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
148 changes: 79 additions & 69 deletions packages/native/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,82 +2,92 @@ use std::env;
use std::path::PathBuf;

fn main() {
napi_build::setup();
napi_build::setup();

let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR"));
let vendor = manifest_dir.join("vendor").join("zireael");
let include_dir = vendor.join("include");
let src_dir = vendor.join("src");
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR"));
let vendor = manifest_dir.join("vendor").join("zireael");
let include_dir = vendor.join("include");
let src_dir = vendor.join("src");

let mut build = cc::Build::new();
build.include(&include_dir);
build.include(&src_dir);
build.warnings(false);
let mut build = cc::Build::new();
build.include(&include_dir);
build.include(&src_dir);
build.warnings(false);

// The engine assumes a C99-or-newer compiler; C11 is required for atomics on MSVC.
if build.get_compiler().is_like_msvc() {
build.flag_if_supported("/std:c11");
build.flag_if_supported("/experimental:c11atomics");
} else {
build.flag_if_supported("-std=c11");
}
// The engine assumes a C99-or-newer compiler; C11 is required for atomics on MSVC.
if build.get_compiler().is_like_msvc() {
build.flag_if_supported("/std:c11");
build.flag_if_supported("/experimental:c11atomics");
} else {
build.flag_if_supported("-std=c11");
}

// Core + unicode + util.
build.file(src_dir.join("core").join("zr_engine.c"));
build.file(src_dir.join("core").join("zr_framebuffer.c"));
build.file(src_dir.join("core").join("zr_drawlist.c"));
build.file(src_dir.join("core").join("zr_event_pack.c"));
build.file(src_dir.join("core").join("zr_event_queue.c"));
build.file(src_dir.join("core").join("zr_metrics.c"));
build.file(src_dir.join("core").join("zr_input_parser.c"));
build.file(src_dir.join("core").join("zr_damage.c"));
build.file(src_dir.join("core").join("zr_config.c"));
build.file(src_dir.join("core").join("zr_base64.c"));
build.file(src_dir.join("core").join("zr_blit.c"));
build.file(src_dir.join("core").join("zr_blit_ascii.c"));
build.file(src_dir.join("core").join("zr_blit_braille.c"));
build.file(src_dir.join("core").join("zr_blit_halfblock.c"));
build.file(src_dir.join("core").join("zr_blit_quadrant.c"));
build.file(src_dir.join("core").join("zr_blit_sextant.c"));
build.file(src_dir.join("core").join("zr_debug_overlay.c"));
build.file(src_dir.join("core").join("zr_debug_trace.c"));
build.file(src_dir.join("core").join("zr_detect.c"));
build.file(src_dir.join("core").join("zr_diff.c"));
build.file(src_dir.join("core").join("zr_placeholder.c"));
build.file(src_dir.join("core").join("zr_image.c"));
build.file(src_dir.join("core").join("zr_image_iterm2.c"));
build.file(src_dir.join("core").join("zr_image_kitty.c"));
build.file(src_dir.join("core").join("zr_image_sixel.c"));
// Core + unicode + util.
build.file(src_dir.join("core").join("zr_engine.c"));
build.file(src_dir.join("core").join("zr_framebuffer.c"));
build.file(src_dir.join("core").join("zr_drawlist.c"));
build.file(src_dir.join("core").join("zr_event_pack.c"));
build.file(src_dir.join("core").join("zr_event_queue.c"));
build.file(src_dir.join("core").join("zr_metrics.c"));
build.file(src_dir.join("core").join("zr_input_parser.c"));
build.file(src_dir.join("core").join("zr_damage.c"));
build.file(src_dir.join("core").join("zr_config.c"));
build.file(src_dir.join("core").join("zr_base64.c"));
build.file(src_dir.join("core").join("zr_blit.c"));
build.file(src_dir.join("core").join("zr_blit_ascii.c"));
build.file(src_dir.join("core").join("zr_blit_braille.c"));
build.file(src_dir.join("core").join("zr_blit_halfblock.c"));
build.file(src_dir.join("core").join("zr_blit_quadrant.c"));
build.file(src_dir.join("core").join("zr_blit_sextant.c"));
build.file(src_dir.join("core").join("zr_debug_overlay.c"));
build.file(src_dir.join("core").join("zr_debug_trace.c"));
build.file(src_dir.join("core").join("zr_detect.c"));
build.file(src_dir.join("core").join("zr_diff.c"));
build.file(src_dir.join("core").join("zr_placeholder.c"));
build.file(src_dir.join("core").join("zr_image.c"));
build.file(src_dir.join("core").join("zr_image_iterm2.c"));
build.file(src_dir.join("core").join("zr_image_kitty.c"));
build.file(src_dir.join("core").join("zr_image_sixel.c"));

build.file(src_dir.join("unicode").join("zr_width.c"));
build.file(src_dir.join("unicode").join("zr_unicode_data.c"));
build.file(src_dir.join("unicode").join("zr_utf8.c"));
build.file(src_dir.join("unicode").join("zr_grapheme.c"));
build.file(src_dir.join("unicode").join("zr_wrap.c"));
build.file(src_dir.join("unicode").join("zr_width.c"));
build.file(src_dir.join("unicode").join("zr_unicode_data.c"));
build.file(src_dir.join("unicode").join("zr_utf8.c"));
build.file(src_dir.join("unicode").join("zr_grapheme.c"));
build.file(src_dir.join("unicode").join("zr_wrap.c"));

build.file(src_dir.join("util").join("zr_arena.c"));
build.file(src_dir.join("util").join("zr_caps.c"));
build.file(src_dir.join("util").join("zr_ring.c"));
build.file(src_dir.join("util").join("zr_log.c"));
build.file(src_dir.join("util").join("zr_assert.c"));
build.file(src_dir.join("util").join("zr_string_builder.c"));
build.file(src_dir.join("util").join("zr_vec.c"));
build.file(src_dir.join("util").join("zr_arena.c"));
build.file(src_dir.join("util").join("zr_caps.c"));
build.file(src_dir.join("util").join("zr_ring.c"));
build.file(src_dir.join("util").join("zr_log.c"));
build.file(src_dir.join("util").join("zr_assert.c"));
build.file(src_dir.join("util").join("zr_string_builder.c"));
build.file(src_dir.join("util").join("zr_vec.c"));

// Platform selection + backend.
build.file(src_dir.join("platform").join("zr_platform_select.c"));
if env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") {
build.file(src_dir.join("platform").join("win32").join("zr_plat_win32.c"));
println!("cargo:rustc-link-lib=dylib=advapi32");
println!("cargo:rustc-link-lib=dylib=kernel32");
println!("cargo:rustc-link-lib=dylib=user32");
} else {
build.file(src_dir.join("platform").join("posix").join("zr_plat_posix.c"));
}
// Platform selection + backend.
build.file(src_dir.join("platform").join("zr_platform_select.c"));
if env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") {
build.file(
src_dir
.join("platform")
.join("win32")
.join("zr_plat_win32.c"),
);
println!("cargo:rustc-link-lib=dylib=advapi32");
println!("cargo:rustc-link-lib=dylib=kernel32");
println!("cargo:rustc-link-lib=dylib=user32");
} else {
build.file(
src_dir
.join("platform")
.join("posix")
.join("zr_plat_posix.c"),
);
}

build.compile("zireael_core");
build.compile("zireael_core");

// Keep rebuilds deterministic when vendored sources change.
println!("cargo:rerun-if-changed=vendor/VENDOR_COMMIT.txt");
println!("cargo:rerun-if-changed=vendor/zireael/include");
println!("cargo:rerun-if-changed=vendor/zireael/src");
// Keep rebuilds deterministic when vendored sources change.
println!("cargo:rerun-if-changed=vendor/VENDOR_COMMIT.txt");
println!("cargo:rerun-if-changed=vendor/zireael/include");
println!("cargo:rerun-if-changed=vendor/zireael/src");
}
66 changes: 33 additions & 33 deletions packages/native/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,39 @@

/* auto-generated by NAPI-RS */

export interface DebugStats {
totalRecords: bigint;
totalDropped: bigint;
errorCount: number;
warnCount: number;
currentRingUsage: number;
ringCapacity: number;
}
export interface DebugQueryResult {
recordsReturned: number;
recordsAvailable: number;
oldestRecordId: bigint;
newestRecordId: bigint;
recordsDropped: number;
}
export declare function engineDebugEnable(
engineId: number,
config?: object | undefined | null,
): number;
export declare function engineDebugDisable(engineId: number): number;
export declare function engineDebugQuery(
engineId: number,
query: object | undefined | null,
outHeaders: Uint8Array,
): DebugQueryResult;
export declare function engineDebugGetPayload(
engineId: number,
recordId: bigint,
outPayload: Uint8Array,
): number;
export declare function engineDebugGetStats(engineId: number): DebugStats;
export declare function engineDebugExport(engineId: number, outBuf: Uint8Array): number;
export declare function engineDebugReset(engineId: number): number;
export interface EngineMetrics {
structSize: number;
negotiatedEngineAbiMajor: number;
Expand Down Expand Up @@ -62,36 +95,3 @@ export declare function enginePostUserEvent(
export declare function engineSetConfig(engineId: number, cfg?: object | undefined | null): number;
export declare function engineGetMetrics(engineId: number): EngineMetrics;
export declare function engineGetCaps(engineId: number): TerminalCaps;
export interface DebugStats {
totalRecords: bigint;
totalDropped: bigint;
errorCount: number;
warnCount: number;
currentRingUsage: number;
ringCapacity: number;
}
export interface DebugQueryResult {
recordsReturned: number;
recordsAvailable: number;
oldestRecordId: bigint;
newestRecordId: bigint;
recordsDropped: number;
}
export declare function engineDebugEnable(
engineId: number,
config?: object | undefined | null,
): number;
export declare function engineDebugDisable(engineId: number): number;
export declare function engineDebugQuery(
engineId: number,
query: object | undefined | null,
outHeaders: Uint8Array,
): DebugQueryResult;
export declare function engineDebugGetPayload(
engineId: number,
recordId: bigint,
outPayload: Uint8Array,
): number;
export declare function engineDebugGetStats(engineId: number): DebugStats;
export declare function engineDebugExport(engineId: number, outBuf: Uint8Array): number;
export declare function engineDebugReset(engineId: number): number;
12 changes: 9 additions & 3 deletions packages/native/scripts/smoke.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ async function assertWorkerLoadExitCleanly() {
workerData: { phase: "loadOnly" },
type: "module",
});
const exitPromise = new Promise((resolve) => worker.once("exit", resolve));

const loadResult = await new Promise((resolve, reject) => {
const onExit = (code) => reject(new Error(`load-only worker exited with ${code}`));
Expand All @@ -92,7 +93,7 @@ async function assertWorkerLoadExitCleanly() {
});

assert(loadResult.phase === "loadOnly", "worker load-only phase must complete");
const exitCode = await new Promise((resolve) => worker.once("exit", resolve));
const exitCode = await exitPromise;
assert(exitCode === 0, `load-only worker must exit cleanly, got: ${String(exitCode)}`);
}

Expand Down Expand Up @@ -167,6 +168,11 @@ assert(
engineSetConfig(engineId, null) === ZR_ERR_INVALID_ARGUMENT,
"engineSetConfig(null) must return ZR_ERR_INVALID_ARGUMENT",
);
assertThrows(
() => engineSetConfig(engineId, { plat: 1 }),
/plat must be an object/i,
"engineSetConfig must reject non-object plat values",
);
assertThrows(
() => engineSetConfig(engineId, { unknownKey: 1 }),
/unknown key/i,
Expand Down Expand Up @@ -292,8 +298,8 @@ assert(
`wrong-thread enginePresent must return ZR_ERR_INVALID_ARGUMENT, got: ${alive.present}`,
);
assert(
alive.postUserEvent === ZR_OK,
`enginePostUserEvent must succeed cross-thread while alive (ZR_OK), got: ${alive.postUserEvent}`,
alive.postUserEvent === ZR_ERR_INVALID_ARGUMENT,
`wrong-thread enginePostUserEvent must return ZR_ERR_INVALID_ARGUMENT, got: ${alive.postUserEvent}`,
);
assert(
alive.setConfig === ZR_ERR_INVALID_ARGUMENT,
Expand Down
Loading
Loading