consoleCatcher init

src/addons/consoleCatcher.ts

@@ -1,48 +1,80 @@
 /**
- * @file Integration for catching console logs and other info
+ * @file Module for intercepting console logs with stack trace capture
  */
 
-interface ConsoleLogEvent {
-    /**
-     * Window.console object method (i.e. log, info, warn)
-     */
-    method: string;
-
-    /**
-     * Time when the log was occurred
-     */
-    timestamp: Date;
-
-    /**
-     * Log argument
-     */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    args: any;
-}
+import type { ConsoleLogEvent } from '@hawk.so/types/build/src/base/event/addons/javascript';
+
+const MAX_LOGS = 20;
+const consoleOutput: ConsoleLogEvent[] = [];
+
+let isInitialized = false;
 
 /**
- * Contains all data that will be logged by window.console
+ * Initializes the console catcher by overriding console methods
+ * to capture logs with stack traces.
  */
-const consoleOutput: ConsoleLogEvent[] = [];
+export function initConsoleCatcher(): void {
+  if (isInitialized) {
+    return;
+  };
+
+  isInitialized = true;
+  const consoleMethods = ['log', 'warn', 'error', 'info', 'debug'];
+
+  consoleMethods.forEach((method) => {
+    if (typeof window.console[method] !== 'function') {
+      return;
+    };
 
-// Override console methods
-Object.keys(window.console).forEach(key => {
-  const oldFunction = window.console[key];
+    const oldFunction = window.console[method].bind(window.console);
 
-  window.console[key] = function (...args): void {
-    consoleOutput.push({
-      method: key,
+    window.console[method] = function (...args): void {
+      if (consoleOutput.length >= MAX_LOGS) {
+        consoleOutput.shift();
+      }
+
+      const stack = new Error().stack?.split('\n').slice(2).join('\n') || '';
+
+      const logEvent: ConsoleLogEvent = {
+        method,
+        timestamp: new Date(),
+        type: method,
+        message: args
+          .map((arg) => (typeof arg === 'string' ? arg : JSON.stringify(arg))).join(' '),
+        stack,
+        fileLine: stack.split('\n')[0]?.trim(),
+      };
+
+      consoleOutput.push(logEvent);
+      oldFunction(...args);
+    };
+  });
+
+  window.addEventListener('error', function (event) {
+    if (consoleOutput.length >= MAX_LOGS) {
+      consoleOutput.shift();
+    }
+
+    const logEvent: ConsoleLogEvent = {
+      method: 'error',
       timestamp: new Date(),
-      args,
-    });
-    oldFunction.apply(window.console, args);
-  };
-});
+      type: event.error?.name || 'Error',
+      message: event.error?.message || event.message,
+      stack: event.error?.stack || '',
+      fileLine: event.filename
+        ? `${event.filename}:${event.lineno}:${event.colno}`
+        : '',
+    };
+
+    consoleOutput.push(logEvent);
+  });
+}
 
 /**
- * @param event - event to modify
- * @param data - event data
+ * Returns the stack of captured console logs.
+ *
+ * @returns {ConsoleLogEvent[]} Array of logged console events.
  */
-export default function (event, data): void {
-  data.payload.consoleOutput = consoleOutput;
+export function getConsoleLogStack(): ConsoleLogEvent[] {
+  return [ ...consoleOutput ];
 }

src/catcher.ts

@@ -16,6 +16,7 @@ import type { JavaScriptCatcherIntegrations } from './types/integrations';
 import { EventRejectedError } from './errors';
 import type { HawkJavaScriptEvent } from './types';
 import { isErrorProcessed, markErrorAsProcessed } from './utils/event';
+import { getConsoleLogStack, initConsoleCatcher } from './addons/consoleCatcher';
 
 /**
  * Allow to use global VERSION, that will be overwritten by Webpack
@@ -130,6 +131,8 @@ export default class Catcher {
       },
     });
 
+    initConsoleCatcher();
+
     /**
      * Set global handlers
      */
@@ -489,6 +492,7 @@ export default class Catcher {
     const userAgent = window.navigator.userAgent;
     const location = window.location.href;
     const getParams = this.getGetParams();
+    const consoleLogs = getConsoleLogStack();
 
     const addons: JavaScriptAddons = {
       window: {
@@ -507,6 +511,10 @@ export default class Catcher {
       addons.RAW_EVENT_DATA = this.getRawData(error);
     }
 
+    if (consoleLogs.length > 0) {
+      addons.consoleOutput = consoleLogs;
+    }
+
     return addons;
   }