Go back to capture-console

Author: NigelBreslaw

api/node/__test__/helpers/utils.ts

@@ -1,52 +1,34 @@
 // Copyright © SixtyFPS GmbH <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
-import { Console } from "node:console";
-import { Writable } from "node:stream";
-import stripAnsi from "strip-ansi";
+import { hook } from "capture-console";
 
-export function captureLogs() {
-    const stdout: string[] = [];
-    const stderr: string[] = [];
+export function captureAsyncStderr() {
+    const chunks: string[] = [];
 
-    const streams = {
-        stdout: new Writable({
-            write(chunk, _encoding, callback) {
-                stdout.push(chunk.toString());
-                callback();
-            },
-        }),
-        stderr: new Writable({
-            write(chunk, _encoding, callback) {
-                stderr.push(chunk.toString());
-                callback();
-            },
-        }),
-    };
-
-    const originalConsole = globalThis.console;
-    globalThis.console = new Console({
-        stdout: streams.stdout,
-        stderr: streams.stderr,
-    });
+    const streams = new Set<NodeJS.WritableStream>();
+    streams.add(process.stderr);
 
-    const originalStdoutWrite = process.stdout.write;
-    process.stdout.write = streams.stdout.write.bind(streams.stdout) as any;
+    const consoleStderr = (globalThis.console as any)?._stderr;
+    if (consoleStderr && consoleStderr !== process.stderr) {
+        streams.add(consoleStderr);
+    }
 
-    const originalStderrWrite = process.stderr.write;
-    process.stderr.write = streams.stderr.write.bind(streams.stderr) as any;
+    const unhooks = Array.from(streams).map((stream) =>
+        hook(stream, { quiet: true }, (chunk) => {
+            chunks.push(chunk);
+        }),
+    );
 
     return {
-        restore() {
-            globalThis.console = originalConsole;
-            process.stdout.write = originalStdoutWrite;
-            process.stderr.write = originalStderrWrite;
+        output() {
+            return chunks.join("");
         },
-        getLogs() {
-            return {
-                stdout: stripAnsi(stdout.join("")),
-                stderr: stripAnsi(stderr.join("")),
-            };
+        restore() {
+            while (unhooks.length) {
+                const unhook = unhooks.pop();
+                unhook && unhook();
+            }
         },
     };
 }

api/node/__test__/js_value_conversion.spec.mts

@@ -5,7 +5,7 @@ import { test, expect } from "vitest";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { Jimp } from "jimp";
-import { captureLogs } from "./helpers/utils.js";
+import { captureAsyncStderr } from "./helpers/utils.js";
 import {
     private_api,
     type ImageData,
@@ -1062,23 +1062,21 @@ test("throw exception in callback", async () => {
 
     const instance = definition.App!.create();
     expect(instance).not.toBeNull();
-    let speakTest: string;
 
     instance!.setCallback("throw-something", () => {
         throw new Error("I'm an error");
     });
 
-    const logs = captureLogs();
+    const stderrCapture = captureAsyncStderr();
     try {
         instance!.invoke("throw-something", []);
         // Vitest runs these tests in workers and the native binding writes to
         // stderr on the next macrotask, so yield once before restoring writers.
-        // https://github.com/vitest-dev/vitest/discussions/5366
         await new Promise((resolve) => setTimeout(resolve, 0));
     } finally {
-        logs.restore();
+        stderrCapture.restore();
     }
-    const output = logs.getLogs().stderr;
+    const output = stderrCapture.output();
     expect(
         output.includes("Node.js: Invoking callback 'throw-something' failed"),
     ).toBe(true);

api/node/package.json

@@ -49,7 +49,6 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@napi-rs/cli": "2.18.4",
-    "strip-ansi": "7.1.2"
+    "@napi-rs/cli": "2.18.4"
   }
 }