fix

Author: Dobrunia

packages/javascript/src/catcher.ts

@@ -76,7 +76,7 @@ export default class Catcher {
    * This Method allows developer to filter any data you don't want sending to Hawk.
    * - Return modified event — it will be sent instead of the original.
    * - Return `false` — the event will be dropped entirely.
-   * - Return nothing (`void` / `undefined` / `null`) — the original event is sent as-is (a warning is logged).
+   * - Any other value is invalid — the original event is sent as-is (a warning is logged).
    */
   private readonly beforeSend: undefined | ((event: HawkJavaScriptEvent) => HawkJavaScriptEvent | false | void);
 
@@ -441,35 +441,23 @@ export default class Catcher {
       const result = this.beforeSend(payload);
 
       /**
-       * Allow user to intentionally drop event by returning false
+       * false → drop event
        */
       if (result === false) {
         throw new EventRejectedError('Event rejected by beforeSend method.');
       }
 
       /**
-       * If user returned nothing (void/undefined/null) — warn and keep original payload
+       * Valid event payload → use it
        */
-      if (result === undefined || result === null) {
-        log(`Invalid beforeSend value: (${String(result)}). It should return event or false. Event is sent without changes.`, 'warn');
-      } else if (isValidEventPayload(result)) {
-        payload = result;
+      if (isValidEventPayload(result)) {
+        payload = result as HawkJavaScriptEvent;
       } else {
-        let received: string;
-
-        try {
-          received = JSON.stringify(result);
-        } catch {
-          try {
-            received = String(result);
-          } catch {
-            received = Object.prototype.toString.call(result);
-          }
-        }
-
+        /**
+         * Anything else is invalid — warn and send original
+         */
         log(
-          'beforeSend produced invalid payload (missing required fields), sending original. '
-          + `Received: ${received}`,
+          `Invalid beforeSend value: (${String(result)}). It should return event or false. Event is sent without changes.`,
           'warn'
         );
       }

packages/javascript/src/types/hawk-initial-settings.ts

@@ -67,7 +67,7 @@ export interface HawkInitialSettings {
    * This Method allows you to filter any data you don't want sending to Hawk.
    * - Return modified event — it will be sent instead of the original.
    * - Return `false` — the event will be dropped entirely.
-   * - Return nothing (`void` / `undefined` / `null`) — the original event is sent as-is (a warning is logged).
+   * - Any other value is invalid — the original event is sent as-is (a warning is logged).
    */
   beforeSend?(event: HawkJavaScriptEvent): HawkJavaScriptEvent | false | void;
 

packages/javascript/src/utils/validation.ts

@@ -75,13 +75,11 @@ export function isValidEventPayload(payload: unknown): payload is EventData<Java
  * @param breadcrumb - value to validate
  */
 export function isValidBreadcrumb(breadcrumb: unknown): breadcrumb is Breadcrumb {
-  if (typeof breadcrumb !== 'object' || breadcrumb === null || Array.isArray(breadcrumb)) {
+  if (!isPlainObject(breadcrumb)) {
     return false;
   }
 
-  const record = breadcrumb as Record<string, unknown>;
-
-  if (record.timestamp !== undefined && typeof record.timestamp !== 'number') {
+  if (breadcrumb.timestamp !== undefined && typeof breadcrumb.timestamp !== 'number') {
     return false;
   }
 

packages/javascript/tests/before-send.test.ts

@@ -132,7 +132,7 @@ describe('beforeSend', () => {
 
     expect(socketSendSpy).toHaveBeenCalledOnce();
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] Invalid beforeSend value: (undefined)'),
+      expect.stringContaining('Invalid beforeSend value: (undefined)'),
       expect.anything(),
       expect.anything()
     );
@@ -145,7 +145,7 @@ describe('beforeSend', () => {
 
     expect(socketSendSpy).toHaveBeenCalledOnce();
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] Invalid beforeSend value: (null)'),
+      expect.stringContaining('Invalid beforeSend value: (null)'),
       expect.anything(),
       expect.anything()
     );
@@ -158,7 +158,7 @@ describe('beforeSend', () => {
 
     expect(socketSendSpy).toHaveBeenCalledOnce();
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeSend produced invalid payload'),
+      expect.stringContaining('Invalid beforeSend value:'),
       expect.anything(),
       expect.anything()
     );
@@ -171,7 +171,7 @@ describe('beforeSend', () => {
 
     expect(socketSendSpy).toHaveBeenCalledOnce();
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeSend produced invalid payload'),
+      expect.stringContaining('Invalid beforeSend value:'),
       expect.anything(),
       expect.anything()
     );

packages/javascript/tests/breadcrumbs.test.ts

@@ -199,7 +199,7 @@ describe('beforeBreadcrumb', () => {
 
     expect(manager.getBreadcrumbs()[0].message).toBe('void');
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeBreadcrumb returned nothing'),
+      expect.stringContaining('beforeBreadcrumb returned nothing'),
       expect.anything(),
       expect.anything()
     );
@@ -210,7 +210,7 @@ describe('beforeBreadcrumb', () => {
 
     expect(manager.getBreadcrumbs()[0].message).toBe('null');
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeBreadcrumb returned nothing'),
+      expect.stringContaining('beforeBreadcrumb returned nothing'),
       expect.anything(),
       expect.anything()
     );
@@ -221,7 +221,7 @@ describe('beforeBreadcrumb', () => {
 
     expect(manager.getBreadcrumbs()[0].message).toBe('invalid');
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeBreadcrumb produced invalid breadcrumb'),
+      expect.stringContaining('beforeBreadcrumb produced invalid breadcrumb'),
       expect.anything(),
       expect.anything()
     );
@@ -235,7 +235,7 @@ describe('beforeBreadcrumb', () => {
     expect(bc.message).toBe('bad-ts');
     expect(bc.timestamp).toBeTypeOf('number');
     expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[Hawk] beforeBreadcrumb produced invalid breadcrumb'),
+      expect.stringContaining('beforeBreadcrumb produced invalid breadcrumb'),
       expect.anything(),
       expect.anything()
     );