Skip to content

fix(logger): recognize callers on Windows #4337

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
KristjanESPERANTO merged 1 commit into from
Nov 8, 2026
Merged

fix(logger): recognize callers on Windows #4337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion js/logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ if (typeof module !== "undefined") {
const getCallerPrefix = () => {
try {
const lines = new Error().stack.split("\n");
for (const line of lines) {
for (const frame of lines) {
const line = frame.replaceAll("\\", "/");
if (line.includes("node:") || line.includes("js/logger.js") || line.includes("node_modules")) continue;
const match = line.match(/\((.+?\.[cm]?js):\d+:\d+\)/) || line.match(/at\s+(.+?\.[cm]?js):\d+:\d+/);
if (match) {
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/functions/logger_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ describe("logger caller prefixes", () => {
const loggerPath = path.resolve(__dirname, "../../../js/logger.js");

it.each(["js", "mjs", "cjs"])("recognizes .%s callers", (extension) => {
const windowsScript = `C:\\MagicMirror\\js\\probe.${extension}`;
const windowsModule = `C:\\MagicMirror\\modules\\MMM-test\\node_helper.${extension}`;
const script = `
require(${JSON.stringify(loggerPath)});
const vm = require("node:vm");
vm.runInThisContext('console.log("top-level");', {filename: "file:///MagicMirror/js/probe.${extension}"});
vm.runInThisContext('(() => console.log("function"))();', {filename: "file:///MagicMirror/js/probe.${extension}"});
vm.runInThisContext('console.log("module");', {filename: "file:///MagicMirror/modules/MMM-test/node_helper.${extension}"});
vm.runInThisContext('console.log("windows script");', {filename: ${JSON.stringify(windowsScript)}});
vm.runInThisContext('console.log("windows module");', {filename: ${JSON.stringify(windowsModule)}});
`;
const output = execFileSync(process.execPath, ["-e", script], {
env: { ...process.env, mmTestMode: "false", FORCE_COLOR: "0" },
Expand All @@ -20,5 +24,7 @@ describe("logger caller prefixes", () => {
expect(output).toContain("[probe] top-level");
expect(output).toContain("[probe] function");
expect(output).toContain("[MMM-test] module");
expect(output).toContain("[probe] windows script");
expect(output).toContain("[MMM-test] windows module");
});
});
Loading