@ifc-lite/geometry 1.16.6 → 1.18.1

package/dist/geometry-controller.worker.d.ts

@@ -0,0 +1,4 @@
+import type { GeometryWorkerInitMessage, GeometryWorkerProcessMessage, GeometryWorkerStreamStartMessage, GeometryWorkerStreamChunkMessage, GeometryWorkerStreamEndMessage, GeometryWorkerSetStylesMessage, GeometryWorkerSetEntityIndexMessage, GeometryWorkerSetMergeLayersMessage, GeometryWorkerPrePassMessage, GeometryWorkerBatchMessage, GeometryWorkerCompleteMessage, GeometryWorkerErrorMessage, GeometryWorkerMemoryMessage } from './geometry.worker.js';
+export type GeometryControllerRequest = GeometryWorkerInitMessage | GeometryWorkerProcessMessage | GeometryWorkerStreamStartMessage | GeometryWorkerStreamChunkMessage | GeometryWorkerStreamEndMessage | GeometryWorkerSetStylesMessage | GeometryWorkerSetEntityIndexMessage | GeometryWorkerSetMergeLayersMessage | GeometryWorkerPrePassMessage;
+export type GeometryControllerResponse = GeometryWorkerBatchMessage | GeometryWorkerCompleteMessage | GeometryWorkerErrorMessage | GeometryWorkerMemoryMessage;
+//# sourceMappingURL=geometry-controller.worker.d.ts.map

package/dist/geometry-controller.worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry-controller.worker.d.ts","sourceRoot":"","sources":["../src/geometry-controller.worker.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EACV,yBAAyB,EACzB,4BAA4B,EAC5B,gCAAgC,EAChC,gCAAgC,EAChC,8BAA8B,EAC9B,8BAA8B,EAC9B,mCAAmC,EACnC,mCAAmC,EACnC,4BAA4B,EAC5B,0BAA0B,EAC1B,6BAA6B,EAC7B,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,sBAAsB,CAAC;AAG9B,MAAM,MAAM,yBAAyB,GACjC,yBAAyB,GACzB,4BAA4B,GAC5B,gCAAgC,GAChC,gCAAgC,GAChC,8BAA8B,GAC9B,8BAA8B,GAC9B,mCAAmC,GACnC,mCAAmC,GACnC,4BAA4B,CAAC;AAEjC,MAAM,MAAM,0BAA0B,GAClC,0BAA0B,GAC1B,6BAA6B,GAC7B,0BAA0B,GAC1B,2BAA2B,CAAC"}

package/dist/geometry-controller.worker.js

@@ -0,0 +1,349 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/**
+ * Single-controller geometry worker (Phase 2 of single-controller-rayon-design.md).
+ *
+ * Replaces the N-independent-Web-Workers pool. ONE WASM instance with
+ * an internal rayon thread pool of (navigator.hardwareConcurrency - 1)
+ * helper threads. All `processGeometryBatchParallel` work happens
+ * inside this worker; rayon's `par_iter` distributes per-entity work
+ * across the helpers via shared memory.
+ *
+ * Message protocol is INTENTIONALLY identical to `geometry.worker.js`
+ * so the host (`geometry-parallel.ts`) can swap implementations behind
+ * a feature flag without changing the dispatch / event-collection
+ * code. The controller accepts the same set: `init`, `stream-start`,
+ * `stream-chunk`, `stream-end`, `set-styles`, `set-entity-index`.
+ *
+ * Why this matters: the per-worker entity-index FxHashMap (~600 MB
+ * per worker on the 986 MB test file) was triplicated across 3
+ * workers. Single controller holds ONE copy. Total peakWasm should
+ * drop from ~5.3 GB to ~3 GB. Plus rayon work-stealing replaces
+ * the contention pattern that capped useful workers at 3 even on
+ * 10-core hosts.
+ */
+// Import the THREADED bundle. The viewer's vite.config.ts maps
+// `@ifc-lite/wasm-threaded` to `packages/wasm-threaded/pkg/ifc-lite.js`.
+// (See vite.config.ts alias added by Phase 2 wiring.)
+import init, { initSync, IfcAPI, initThreadPool } from '@ifc-lite/wasm-threaded';
+let api = null;
+let threadPoolReady = false;
+/**
+ * Cached merge-layers flag (issue #540). The host may post
+ * `set-merge-layers` BEFORE `init`, so we remember the latest value
+ * and re-apply once the threaded IfcAPI is constructed.
+ */
+let mergeLayersFlag = false;
+let mergeLayersApplied = false;
+function applyMergeLayersToApi() {
+    if (!api || mergeLayersApplied)
+        return;
+    const merging = api;
+    if (typeof merging.setMergeLayers === 'function') {
+        merging.setMergeLayers(mergeLayersFlag);
+    }
+    mergeLayersApplied = true;
+}
+let activeSession = null;
+function viewSharedBytes(sharedBuffer) {
+    return new Uint8Array(sharedBuffer);
+}
+function materialiseSharedBytes(sharedBuffer) {
+    const local = new Uint8Array(sharedBuffer.byteLength);
+    local.set(new Uint8Array(sharedBuffer));
+    return local;
+}
+function startSession(input) {
+    return {
+        sharedBuffer: input.sharedBuffer,
+        localBytes: viewSharedBytes(input.sharedBuffer),
+        sabFallbackTaken: false,
+        unitScale: input.unitScale,
+        rtcX: input.rtcX, rtcY: input.rtcY, rtcZ: input.rtcZ,
+        needsShift: input.needsShift,
+        voidKeys: input.voidKeys,
+        voidCounts: input.voidCounts,
+        voidValues: input.voidValues,
+        styleIds: input.styleIds,
+        styleColors: input.styleColors,
+        pendingMeshes: [],
+        pendingTransfers: [],
+        totalMeshesEmitted: 0,
+        cumulativeMeshBytes: 0,
+    };
+}
+function flushPending(session) {
+    if (session.pendingMeshes.length === 0)
+        return;
+    const meshes = session.pendingMeshes;
+    const transfers = session.pendingTransfers;
+    session.pendingMeshes = [];
+    session.pendingTransfers = [];
+    session.totalMeshesEmitted += meshes.length;
+    self.postMessage({ type: 'batch', meshes }, transfers);
+}
+function collectMeshes(session, collection) {
+    for (let i = 0; i < collection.length; i++) {
+        const mesh = collection.get(i);
+        if (!mesh)
+            continue;
+        const positions = new Float32Array(mesh.positions);
+        const normals = new Float32Array(mesh.normals);
+        const indices = new Uint32Array(mesh.indices);
+        session.pendingMeshes.push({
+            expressId: mesh.expressId,
+            ifcType: mesh.ifcType,
+            positions, normals, indices,
+            color: [mesh.color[0], mesh.color[1], mesh.color[2], mesh.color[3]],
+        });
+        session.pendingTransfers.push(positions.buffer, normals.buffer, indices.buffer);
+        session.cumulativeMeshBytes += positions.byteLength + normals.byteLength + indices.byteLength;
+        mesh.free();
+    }
+    collection.free();
+}
+/**
+ * Run one chunk through the rayon-parallel batch entry. Same binary-
+ * split recovery as the N-worker path: if WASM rejects the whole slice
+ * (typical: SAB-view incompatible with this runtime), fall back to a
+ * materialised copy; on per-entity failure, halve and retry.
+ */
+async function processBatchParallel(session, jobs) {
+    const numJobs = Math.floor(jobs.length / 3);
+    if (numJobs === 0)
+        return;
+    try {
+        if (!api) {
+            throw new Error('controller API not initialised before stream-chunk');
+        }
+        const collection = api.processGeometryBatchParallel(session.localBytes, jobs, session.unitScale, session.rtcX, session.rtcY, session.rtcZ, session.needsShift, session.voidKeys, session.voidCounts, session.voidValues, session.styleIds, session.styleColors);
+        collectMeshes(session, collection);
+    }
+    catch (err) {
+        const msg = err.message;
+        if (!session.sabFallbackTaken && session.localBytes.buffer instanceof SharedArrayBuffer) {
+            session.sabFallbackTaken = true;
+            console.warn(`[controller] processGeometryBatchParallel rejected SAB view (${msg}), copying`);
+            session.localBytes = materialiseSharedBytes(session.sharedBuffer);
+            await processBatchParallel(session, jobs);
+            return;
+        }
+        if (numJobs === 1) {
+            console.warn(`[controller] skipping entity #${jobs[0]}: ${msg}`);
+            return;
+        }
+        console.warn(`[controller] batch of ${numJobs} entities failed (${msg}), splitting…`);
+        const mid = Math.floor(numJobs / 2) * 3;
+        await processBatchParallel(session, jobs.slice(0, mid));
+        await processBatchParallel(session, jobs.slice(mid));
+    }
+}
+/**
+ * Run a slice in STREAM_BATCH_SIZE chunks, flushing after each. Same
+ * cadence as the N-worker path so downstream React/render code sees
+ * familiar timing.
+ */
+const STREAM_BATCH_SIZE = 1_000_000;
+async function processSliceStreaming(session, jobsFlat) {
+    const totalJobs = Math.floor(jobsFlat.length / 3);
+    for (let jobOffset = 0; jobOffset < totalJobs; jobOffset += STREAM_BATCH_SIZE) {
+        const start = jobOffset * 3;
+        const end = Math.min(start + STREAM_BATCH_SIZE * 3, jobsFlat.length);
+        await processBatchParallel(session, jobsFlat.slice(start, end));
+        flushPending(session);
+    }
+}
+function emitSessionEnd(session) {
+    flushPending(session);
+    // Memory snapshot — single WASM heap (vs N-worker pool sums).
+    let wasmHeapBytes = 0;
+    try {
+        const memJs = api?.getMemory();
+        const buf = memJs?.buffer;
+        wasmHeapBytes = buf?.byteLength ?? 0;
+    }
+    catch { /* memory probe is best-effort */ }
+    self.postMessage({
+        type: 'memory',
+        wasmHeapBytes,
+        meshBytes: session.cumulativeMeshBytes,
+    });
+    self.postMessage({
+        type: 'complete',
+        totalMeshes: session.totalMeshesEmitted,
+    });
+}
+/**
+ * Tail-promise serialiser — copied from `geometry.worker.js`. Web
+ * Worker `onmessage` is fire-and-forget; without serialisation, an
+ * async handler for `stream-start` (which awaits init() + initThreadPool)
+ * can be overtaken by a synchronous `stream-chunk` handler that
+ * dispatches before the session is ready.
+ */
+let messageTail = Promise.resolve();
+self.onmessage = (rawEvent) => {
+    const e = rawEvent;
+    messageTail = messageTail.then(async () => {
+        try {
+            if (e.data.type === 'init') {
+                if (e.data.wasmModule) {
+                    initSync({ module_or_path: e.data.wasmModule });
+                }
+                else {
+                    await init();
+                }
+                api = new IfcAPI();
+                mergeLayersApplied = false;
+                applyMergeLayersToApi();
+                // Spin up the rayon thread pool. Per the design (and upstream
+                // guidance from issue #36), call from inside this worker (NOT
+                // main thread) to dodge the Atomics.wait deadlock that fires
+                // when initThreadPool runs on the main thread.
+                //
+                // Thread count: hardwareConcurrency - 1 to leave one core for
+                // main-thread render. Wrap with retry-25ms-backoff x5 in case
+                // we hit transient deadlocks anyway.
+                const cores = (typeof navigator !== 'undefined'
+                    ? (navigator.hardwareConcurrency ?? 4)
+                    : 4);
+                const targetThreads = Math.max(1, cores - 1);
+                let lastInitErr = null;
+                for (let attempt = 1; attempt <= 5; attempt++) {
+                    try {
+                        const t0 = performance.now();
+                        await initThreadPool(targetThreads);
+                        console.log(`[controller] rayon pool ready (${targetThreads} threads, attempt ${attempt}) @ ${Math.round(performance.now() - t0)}ms`);
+                        threadPoolReady = true;
+                        lastInitErr = null;
+                        break;
+                    }
+                    catch (err) {
+                        lastInitErr = err;
+                        console.warn(`[controller] initThreadPool attempt ${attempt} failed:`, err);
+                        if (attempt < 5) {
+                            await new Promise((r) => setTimeout(r, 25));
+                        }
+                    }
+                }
+                if (!threadPoolReady) {
+                    // Surface the failure as an error message back to the host
+                    // instead of silently posting `ready` and then hanging on
+                    // the first par_iter call. The host's processParallel will
+                    // see this and reject the load with a clear cause.
+                    const errMsg = lastInitErr instanceof Error
+                        ? lastInitErr.message
+                        : String(lastInitErr ?? 'unknown initThreadPool failure');
+                    self.postMessage({
+                        type: 'error',
+                        message: `controller: initThreadPool failed after 5 attempts: ${errMsg}`,
+                    });
+                    return;
+                }
+                // Phase 2 microbenchmark — run a CPU-pure parallel task to
+                // measure rayon's actual speedup on this hardware. Helps
+                // distinguish "rayon is broken" vs "our workload doesn't fit
+                // rayon" when stream tail is slow.
+                try {
+                    const benchApi = api;
+                    if (typeof benchApi.benchmarkPureCpuParallelism === 'function') {
+                        // 9 tasks → one per helper thread — best case for scaling.
+                        benchApi.benchmarkPureCpuParallelism(9);
+                    }
+                }
+                catch (err) {
+                    console.warn('[controller] microbench failed:', err);
+                }
+                self.postMessage({ type: 'ready' });
+                return;
+            }
+            if (e.data.type === 'stream-start') {
+                // The thread pool MUST be ready before we accept stream
+                // messages — `processGeometryBatchParallel` calls par_iter
+                // which would silently run on the calling thread (slow
+                // serial fallback) if the pool isn't initialized. Refuse
+                // and surface a clear error so the host can fall back.
+                if (!api || !threadPoolReady) {
+                    throw new Error('controller: stream-start before init/threadPool ready — host must wait for {type:"ready"} before dispatching');
+                }
+                activeSession = startSession({
+                    sharedBuffer: e.data.sharedBuffer,
+                    unitScale: e.data.unitScale,
+                    rtcX: e.data.rtcX, rtcY: e.data.rtcY, rtcZ: e.data.rtcZ,
+                    needsShift: e.data.needsShift,
+                    voidKeys: e.data.voidKeys,
+                    voidCounts: e.data.voidCounts,
+                    voidValues: e.data.voidValues,
+                    styleIds: e.data.styleIds,
+                    styleColors: e.data.styleColors,
+                });
+                return;
+            }
+            if (e.data.type === 'stream-chunk') {
+                if (!activeSession || !api || !threadPoolReady) {
+                    throw new Error('controller: stream-chunk before init/stream-start');
+                }
+                await processSliceStreaming(activeSession, e.data.jobsFlat);
+                return;
+            }
+            if (e.data.type === 'stream-end') {
+                if (!activeSession)
+                    return;
+                emitSessionEnd(activeSession);
+                activeSession = null;
+                return;
+            }
+            if (e.data.type === 'set-styles') {
+                if (!activeSession)
+                    return;
+                activeSession.styleIds = e.data.styleIds;
+                activeSession.styleColors = e.data.styleColors;
+                activeSession.voidKeys = e.data.voidKeys;
+                activeSession.voidCounts = e.data.voidCounts;
+                activeSession.voidValues = e.data.voidValues;
+                return;
+            }
+            if (e.data.type === 'set-merge-layers') {
+                // Cache the requested merge-layers flag (issue #540). The
+                // host may post this BEFORE `init` (rare but legal); if so
+                // we just hold onto the value and the `init` branch above
+                // applies it to the newly-constructed API.
+                mergeLayersFlag = e.data.enabled === true;
+                mergeLayersApplied = false;
+                applyMergeLayersToApi();
+                return;
+            }
+            if (e.data.type === 'set-entity-index') {
+                if (!api) {
+                    // Should never happen — host always sends `init` first and
+                    // waits for `ready`. If we hit this, it indicates a host
+                    // sequencing bug; surface clearly rather than silently
+                    // initializing a fresh API (which would skip thread-pool
+                    // setup and break later par_iter calls).
+                    throw new Error('controller: set-entity-index before init — host must wait for {type:"ready"} before dispatching');
+                }
+                // Eager FxHashMap build — happens during the styles wait so
+                // by the time stream-chunk arrives the cache is hot.
+                api.setEntityIndex(e.data.ids, e.data.starts, e.data.lengths);
+                return;
+            }
+            // process / prepass-* message types are NOT handled by the
+            // controller path — those are pre-pass-only contracts that stay
+            // on the existing pre-pass worker (geometry.worker.js). The
+            // controller is for stream-chunk dispatch only.
+            console.warn(`[controller] ignoring unhandled message type: ${e.data.type}`);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.error('[controller] handler error:', err);
+            self.postMessage({
+                type: 'error',
+                message: msg,
+            });
+        }
+    });
+};
+// Mark threadPoolReady reachable to silence potential unused warning
+// when the future Phase 3 code references it for back-pressure.
+void threadPoolReady;
+//# sourceMappingURL=geometry-controller.worker.js.map

package/dist/geometry-controller.worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry-controller.worker.js","sourceRoot":"","sources":["../src/geometry-controller.worker.ts"],"names":[],"mappings":"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"}

package/dist/geometry-parallel.d.ts

@@ -1,23 +1,65 @@
 /**
- * Multi-worker parallel geometry processing.
+ * Multi-worker parallel geometry processing with streaming pre-pass.
  *
- * Spawns Web Workers that each get their own WASM instance and process
- * disjoint slices of the geometry entity list.  Batches are yielded as
- * they arrive from any worker, enabling progressive rendering while
- * utilizing multiple cores.
+ * Architecture:
+ *   1. Spawn a single "pre-pass" worker that runs the WASM streaming
+ *      scanner. The scanner walks the file once and emits:
+ *        - `meta`     once, when RTC + unit are resolved (~1-2 % of scan)
+ *        - `jobs`     repeatedly, every ~50 K entities
+ *        - `complete` once, when the scan finishes
+ *   2. On `meta`: spawn N geometry process workers (memory-budget-aware
+ *      count) and send each a `stream-start` so they hold the metadata
+ *      before any chunk arrives.
+ *   3. On each `jobs` chunk: round-robin the chunk to a worker via
+ *      `stream-chunk`. Workers process and emit `batch` messages.
+ *   4. On `complete`: send `stream-end` to each worker so they emit
+ *      their final `batch`/`memory`/`complete`.
+ *
+ * Net effect for a 1 GB file: time-to-first-batch drops from ~17 s
+ * (full pre-pass + worker spawn + first batch) to ~3-5 s (pre-pass
+ * scans first 100 K bytes → meta → first chunk → first batch).
  */
 import type { CoordinateHandler } from './coordinate-handler.js';
 import type { StreamingGeometryEvent } from './index.js';
-/**
- * Run the full pre-pass in a dedicated worker, then fan geometry jobs
- * out to N workers and yield batches as they complete.
- *
- * @param buffer       Raw IFC file bytes
- * @param coordinator  CoordinateHandler used to accumulate bounds
- */
+export interface ProcessParallelOptions {
+    /**
+     * Fires when the streaming pre-pass finishes building the entity index
+     * (after styles), with SAB-backed Uint32Array views over the shared
+     * column buffers. The parser worker uses this to skip its own
+     * `scanEntitiesFastBytes` call (~10 s on 1 GB files under WASM
+     * contention with the geometry workers).
+     */
+    onEntityIndex?: (ids: Uint32Array, starts: Uint32Array, lengths: Uint32Array) => void;
+    /**
+     * Phase 2 of single-controller-rayon-design.md — when true, spawn ONE
+     * controller worker that runs `processGeometryBatchParallel` with
+     * an internal rayon thread pool, instead of the N-independent-worker
+     * pool. The host can opt in via `localStorage.getItem('ifc-lite:single-controller')`
+     * (set in `useIfcLoader.ts`). Same input/output contract; the
+     * controller mirrors `geometry.worker.ts`'s message protocol so this
+     * file's dispatch loop is unchanged.
+     *
+     * Trade-offs documented in the design doc:
+     *   - peakWasm should drop ~5.3 GB → ~3 GB (one heap, not three).
+     *   - Stream tail should drop on rayon-friendly hosts (10+ cores).
+     *   - Falls back silently to N-worker path if the threaded WASM
+     *     bundle fails to load (no COI, Safari, etc.).
+     */
+    useSingleController?: boolean;
+    /**
+     * Issue #540 — "Merge Multilayer Walls" load-time toggle. When
+     * `true`, the geometry workers' IfcAPI receive
+     * `setMergeLayers(true)` before the first stream-chunk lands, so
+     * Revit-style multilayer-wall part meshes are suppressed at the
+     * Rust layer. Default `false` keeps existing behaviour.
+     */
+    mergeLayers?: boolean;
+}
 export declare function processParallel(buffer: Uint8Array, coordinator: CoordinateHandler, sharedRtcOffset?: {
     x: number;
     y: number;
     z: number;
-}): AsyncGenerator<StreamingGeometryEvent>;
+}, 
+/** Optional pre-allocated SAB the caller already shares with another worker. */
+existingSab?: SharedArrayBuffer, options?: ProcessParallelOptions): AsyncGenerator<StreamingGeometryEvent>;
 //# sourceMappingURL=geometry-parallel.d.ts.map

package/dist/geometry-parallel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-parallel.d.ts","sourceRoot":"","sources":["../src/geometry-parallel.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEzD;;;;;;GAMG;AACH,wBAAuB,eAAe,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,CAAC,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD,cAAc,CAAC,sBAAsB,CAAC,CA+MxC"}
+{"version":3,"file":"geometry-parallel.d.ts","sourceRoot":"","sources":["../src/geometry-parallel.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAUzD,MAAM,WAAW,sBAAsB;IACrC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,CACd,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,EAAE,WAAW,KACjB,IAAI,CAAC;IACV;;;;;;;;;;;;;;OAcG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAuB,eAAe,CACpC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,iBAAiB,EAC9B,eAAe,CAAC,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE;AACrD,gFAAgF;AAChF,WAAW,CAAC,EAAE,iBAAiB,EAC/B,OAAO,CAAC,EAAE,sBAAsB,GAC/B,cAAc,CAAC,sBAAsB,CAAC,CA4kBxC"}