@aztec/bb.js 3.0.0-nightly.20251127 → 3.0.0-nightly.20251128

package/src/barretenberg_wasm/helpers/browser/index.ts

@@ -13,7 +13,14 @@ export function getNumCpu() {
   return navigator.hardwareConcurrency;
 }
 
-export function threadLogger(): ((msg: string) => void) | undefined {
+export function threadLogger(useCustomLogger: boolean): ((msg: string) => void) | undefined {
+  if (useCustomLogger) {
+    // Post log messages back to main thread for routing through user-provided logger
+    return (msg: string) => {
+      postMessage({ type: 'log', msg });
+    };
+  }
+  // Use console.log directly when no custom logger is provided
   return console.log;
 }
 

package/src/barretenberg_wasm/helpers/node/index.ts

@@ -1,4 +1,4 @@
-import { Worker } from 'worker_threads';
+import { Worker, parentPort } from 'worker_threads';
 import os from 'os';
 import { wrap } from 'comlink';
 import { nodeEndpoint } from './node_endpoint.js';
@@ -25,12 +25,19 @@ export function getNumCpu() {
 }
 
 /**
- * In node, the message passing is different to the browser. When using 'debug' in the browser, we seemingly always
- * get our logs, but in node it looks like it's dependent on the chain of workers from child to main thread be
- * unblocked. If one of our threads aborts, we can't see it as the parent is blocked waiting on threads to join.
- * To work around this in node, threads will by default write directly to stdout.
+ * Returns a logger function for worker threads.
+ * When a custom logger is provided, posts messages back to the main thread.
+ * Otherwise, writes directly to stdout.
  */
-export function threadLogger(): ((msg: string) => void) | undefined {
+export function threadLogger(useCustomLogger: boolean): ((msg: string) => void) | undefined {
+  if (useCustomLogger) {
+    return (msg: string) => {
+      if (parentPort) {
+        parentPort.postMessage({ type: 'log', msg });
+      }
+    };
+  }
+  // Write directly to stdout when no custom logger is provided
   return (msg: string) => {
     writeSync(1, msg + '\n');
   };

package/src/bb_backends/node/native_socket.ts

@@ -41,6 +41,10 @@ export class BarretenbergNativeSocketAsyncBackend implements IMsgpackBackendAsyn
   private responseBuffer: Buffer | null = null;
   private responseBytesRead: number = 0;
 
+  // Readline interfaces for stdout/stderr - stored so we can close them on destroy
+  private stdoutReader: readline.Interface | null = null;
+  private stderrReader: readline.Interface | null = null;
+
   constructor(bbBinaryPath: string, threads?: number, logger?: (msg: string) => void) {
     // Create a unique socket path in temp directory
     this.socketPath = path.join(os.tmpdir(), `bb-${process.pid}-${Date.now()}.sock`);
@@ -76,8 +80,10 @@ export class BarretenbergNativeSocketAsyncBackend implements IMsgpackBackendAsyn
 
     if (logger) {
       logger("Logger attached to bb process. DON'T FORGET TO DESTROY THE BACKEND to allow Node.js to exit.");
-      readline.createInterface({ input: this.process.stdout! }).on('line', logger);
-      readline.createInterface({ input: this.process.stderr! }).on('line', logger);
+      this.stdoutReader = readline.createInterface({ input: this.process.stdout! });
+      this.stderrReader = readline.createInterface({ input: this.process.stderr! });
+      this.stdoutReader.on('line', logger);
+      this.stderrReader.on('line', logger);
     }
 
     this.process.on('error', err => {
@@ -319,6 +325,11 @@ export class BarretenbergNativeSocketAsyncBackend implements IMsgpackBackendAsyn
   }
 
   async destroy(): Promise<void> {
+    // Close readline interfaces first to prevent "Cannot log after tests are done" warnings
+    // This stops forwarding bb's shutdown logs to the logger after Jest has finished
+    this.stdoutReader?.close();
+    this.stderrReader?.close();
+
     this.cleanup();
     this.process.kill('SIGTERM');
     this.process.removeAllListeners();