refactor(core): Extract shared modules and utilities

Reversean · Reversean · commit d772d18b1e54 · 2026-03-08T15:39:30.000+03:00
- fetchTimer function moved to @hawk.so/core
- StackParser moved to @hawk.so/core
- Transport moved to @hawk.so/core
- event utility functions moved to @hawk.so/core
- selector utility functions moved to @hawk.so/core
- EventRejectedError moved to @hawk.so/core
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -5,3 +5,9 @@ export type { Logger, LogType } from './logger/logger';
 export { isLoggerSet, setLogger, resetLogger, log } from './logger/logger';
 export { isPlainObject, validateUser, validateContext, isValidEventPayload, isValidBreadcrumb } from './utils/validation';
 export { Sanitizer } from './modules/sanitizer';
+export type { SanitizerTypeHandler } from './modules/sanitizer';
+export { StackParser } from './modules/stack-parser';
+export { buildElementSelector } from './utils/selector';
+export type { Transport } from './transports/transport';
+export { EventRejectedError } from './errors';
+export { isErrorProcessed, markErrorAsProcessed } from './utils/event';
diff --git a/packages/core/src/modules/fetch-timer.ts b/packages/core/src/modules/fetch-timer.ts
@@ -1,4 +1,4 @@
-import { log } from '@hawk.so/core';
+import { log } from '../logger/logger';
 
 /**
  * Sends AJAX request and wait for some time.
diff --git a/packages/core/src/modules/stack-parser.ts b/packages/core/src/modules/stack-parser.ts
@@ -1,12 +1,12 @@
 import type { StackFrame } from 'error-stack-parser';
 import ErrorStackParser from 'error-stack-parser';
 import type { BacktraceFrame, SourceCodeLine } from '@hawk.so/types';
-import fetchTimer from './fetchTimer';
+import fetchTimer from './fetch-timer';
 
 /**
  * This module prepares parsed backtrace
  */
-export default class StackParser {
+export class StackParser {
   /**
    * Prevents loading one file several times
    * name -> content
@@ -48,7 +48,7 @@ export default class StackParser {
     try {
       if (!frame.fileName) {
         return null;
-      };
+      }
 
       if (!this.isValidUrl(frame.fileName)) {
         return null;
@@ -118,9 +118,9 @@ export default class StackParser {
   /**
    * Downloads source file
    *
-   * @param {string} fileName - name of file to download
+   * @param fileName - name of file to download
    */
-  private async loadSourceFile(fileName): Promise<string | null> {
+  private async loadSourceFile(fileName: string): Promise<string | null> {
     if (this.sourceFilesCache[fileName] !== undefined) {
       return this.sourceFilesCache[fileName];
     }
diff --git a/packages/core/src/transports/transport.ts b/packages/core/src/transports/transport.ts
@@ -0,0 +1,8 @@
+import type { CatcherMessage, CatcherMessageType } from '@hawk.so/types';
+
+/**
+ * Transport interface — anything that can send a CatcherMessage
+ */
+export interface Transport<T extends CatcherMessageType> {
+  send(message: CatcherMessage<T>): Promise<void>;
+}
diff --git a/packages/core/src/utils/event.ts b/packages/core/src/utils/event.ts
@@ -1,12 +1,12 @@
-import { log } from '@hawk.so/core';
+import { log } from '../logger/logger';
 
 /**
  * Symbol to mark error as processed by Hawk
  */
 const errorSentShadowProperty = Symbol('__hawk_processed__');
 
 /**
- * Check if the error has alrady been sent to Hawk.
+ * Check if the error has already been sent to Hawk.
  *
  * Motivation:
  * Some integrations may catch errors on their own side and then normally re-throw them down.
@@ -20,7 +20,7 @@ export function isErrorProcessed(error: unknown): boolean {
     return false;
   }
 
-  return error[errorSentShadowProperty] === true;
+  return (error as Record<symbol, unknown>)[errorSentShadowProperty] === true;
 }
 
 /**
@@ -35,7 +35,7 @@ export function markErrorAsProcessed(error: unknown): void {
     }
 
     Object.defineProperty(error, errorSentShadowProperty, {
-      enumerable: false, // Prevent from beight collected by Hawk
+      enumerable: false,  // Prevent from being collected by Hawk
       value: true,
       writable: true,
       configurable: true,
diff --git a/packages/core/src/utils/selector.ts b/packages/core/src/utils/selector.ts
diff --git a/packages/javascript/src/addons/breadcrumbs.ts b/packages/javascript/src/addons/breadcrumbs.ts
@@ -2,8 +2,7 @@
  * @file Breadcrumbs module - captures chronological trail of events before an error
  */
 import type { Breadcrumb, BreadcrumbLevel, BreadcrumbType, Json, JsonNode } from '@hawk.so/types';
-import { isValidBreadcrumb, log, Sanitizer } from '@hawk.so/core';
-import { buildElementSelector } from '../utils/selector';
+import { buildElementSelector, isValidBreadcrumb, log, Sanitizer } from '@hawk.so/core';
 
 /**
  * Default maximum number of breadcrumbs to store
diff --git a/packages/javascript/src/catcher.ts b/packages/javascript/src/catcher.ts
@@ -1,6 +1,5 @@
 import './modules/element-sanitizer';
 import Socket from './modules/socket';
-import StackParser from './modules/stackParser';
 import type { BreadcrumbsAPI, CatcherMessage, HawkInitialSettings, HawkJavaScriptEvent, Transport } from './types';
 import { VueIntegration } from './integrations/vue';
 import type {
@@ -12,24 +11,26 @@ import type {
   Json,
   VueIntegrationAddons
 } from '@hawk.so/types';
-import type { JavaScriptCatcherIntegrations } from './types/integrations';
-import { EventRejectedError } from './errors';
-import { isErrorProcessed, markErrorAsProcessed } from './utils/event';
-import { BrowserRandomGenerator } from './utils/random';
+import type { JavaScriptCatcherIntegrations } from '@/types';
 import { ConsoleCatcher } from './addons/consoleCatcher';
 import { BreadcrumbManager } from './addons/breadcrumbs';
 import {
+  EventRejectedError,
   HawkUserManager,
+  isErrorProcessed,
   isLoggerSet,
   isValidEventPayload,
   log,
+  markErrorAsProcessed,
   Sanitizer,
   setLogger,
+  StackParser,
   validateContext,
   validateUser
 } from '@hawk.so/core';
 import { HawkLocalStorage } from './storages/hawk-local-storage';
 import { createBrowserLogger } from './logger/logger';
+import { BrowserRandomGenerator } from './utils/random';
 
 /**
  * Allow to use global VERSION, that will be overwritten by Webpack
@@ -63,7 +64,7 @@ export default class Catcher {
   /**
    * Catcher Type
    */
-  private readonly type: string = 'errors/javascript';
+  private readonly type = 'errors/javascript' as const;
 
   /**
    * User project's Integration Token
@@ -516,7 +517,7 @@ export default class Catcher {
      * and reject() provided with text reason instead of Error()
      */
     if (notAnError) {
-      return null;
+      return undefined;
     }
 
     return (error as Error).name;
@@ -526,7 +527,7 @@ export default class Catcher {
    * Release version
    */
   private getRelease(): HawkJavaScriptEvent['release'] {
-    return this.release !== undefined ? String(this.release) : null;
+    return this.release !== undefined ? String(this.release) : undefined;
   }
 
   /**
@@ -579,7 +580,7 @@ export default class Catcher {
   private getBreadcrumbsForEvent(): HawkJavaScriptEvent['breadcrumbs'] {
     const breadcrumbs = this.breadcrumbManager?.getBreadcrumbs();
 
-    return breadcrumbs && breadcrumbs.length > 0 ? breadcrumbs : null;
+    return breadcrumbs && breadcrumbs.length > 0 ? breadcrumbs : undefined;
   }
 
   /**
@@ -619,15 +620,15 @@ export default class Catcher {
      * and reject() provided with text reason instead of Error()
      */
     if (notAnError) {
-      return null;
+      return undefined;
     }
 
     try {
       return await this.stackParser.parse(error as Error);
     } catch (e) {
       log('Can not parse stack:', 'warn', e);
 
-      return null;
+      return undefined;
     }
   }
 
@@ -694,6 +695,6 @@ export default class Catcher {
    * @param integrationAddons - extra addons
    */
   private appendIntegrationAddons(errorFormatted: CatcherMessage, integrationAddons: JavaScriptCatcherIntegrations): void {
-    Object.assign(errorFormatted.payload.addons, integrationAddons);
+    Object.assign(errorFormatted.payload.addons!, integrationAddons);
   }
 }
diff --git a/packages/javascript/src/modules/socket.ts b/packages/javascript/src/modules/socket.ts
@@ -1,6 +1,5 @@
 import { log } from '@hawk.so/core';
-import type { CatcherMessage } from '@/types';
-import type { Transport } from '../types/transport';
+import type { CatcherMessage, Transport } from '@/types';
 
 /**
  * Custom WebSocket wrapper class
diff --git a/packages/javascript/src/types/catcher-message.ts b/packages/javascript/src/types/catcher-message.ts
@@ -1,21 +1,6 @@
-import type { HawkJavaScriptEvent } from './event';
+import type { CatcherMessage as HawkCatcherMessage } from '@hawk.so/types';
 
 /**
  * Structure describing a message sending by Catcher
  */
-export interface CatcherMessage {
-  /**
-   * User project's Integration Token
-   */
-  token: string;
-
-  /**
-   * Hawk Catcher name
-   */
-  catcherType: string;
-
-  /**
-   * All information about the event
-   */
-  payload: HawkJavaScriptEvent;
-}
+export type CatcherMessage = HawkCatcherMessage<'errors/javascript'>;
diff --git a/packages/javascript/src/types/event.ts b/packages/javascript/src/types/event.ts
@@ -1,55 +1,6 @@
-import type { AffectedUser, BacktraceFrame, EventContext, EventData, JavaScriptAddons, Breadcrumb } from '@hawk.so/types';
-
-/**
- * Event data with JS specific addons
- */
-type JSEventData = EventData<JavaScriptAddons>;
+import type { CatcherMessagePayload } from '@hawk.so/types';
 
 /**
  * Event will be sent to Hawk by Hawk JavaScript SDK
- *
- * The listed EventData properties will always be sent, so we define them as required in the type
  */
-export type HawkJavaScriptEvent = Omit<JSEventData, 'type' | 'release' | 'breadcrumbs' | 'user' | 'context' | 'addons' | 'backtrace' | 'catcherVersion'> & {
-  /**
-   * Event type: TypeError, ReferenceError etc
-   * null for non-error events
-   */
-  type: string | null;
-
-  /**
-   * Current release (aka version, revision) of an application
-   */
-  release: string | null;
-
-  /**
-   * Breadcrumbs - chronological trail of events before the error
-   */
-  breadcrumbs: Breadcrumb[] | null;
-
-  /**
-   * Current authenticated user
-   */
-  user: AffectedUser | null;
-
-  /**
-   * Any other information collected and passed by user
-   */
-  context: EventContext;
-
-  /**
-   * Catcher-specific information
-   */
-  addons: JavaScriptAddons;
-
-  /**
-   * Stack
-   * From the latest call to the earliest
-   */
-  backtrace: BacktraceFrame[] | null;
-
-  /**
-   * Catcher version
-   */
-  catcherVersion: string;
-};
+export type HawkJavaScriptEvent = CatcherMessagePayload<'errors/javascript'>;
diff --git a/packages/javascript/src/types/hawk-initial-settings.ts b/packages/javascript/src/types/hawk-initial-settings.ts
@@ -1,6 +1,6 @@
-import type { EventContext, AffectedUser } from '@hawk.so/types';
+import type { AffectedUser, EventContext } from '@hawk.so/types';
 import type { HawkJavaScriptEvent } from './event';
-import type { Transport } from './transport';
+import type { Transport } from '@/types';
 import type { BreadcrumbsOptions } from '../addons/breadcrumbs';
 
 /**
diff --git a/packages/javascript/src/types/transport.ts b/packages/javascript/src/types/transport.ts
@@ -1,8 +1,7 @@
-import type { CatcherMessage } from './catcher-message';
+import type { Transport as HawkTransport } from '@hawk.so/core';
 
 /**
- * Transport interface — anything that can send a CatcherMessage
+ * Transport interface — anything that can send a {@link CatcherMessage}.
  */
-export interface Transport {
-  send(message: CatcherMessage): Promise<void>;
+export interface Transport extends HawkTransport<'errors/javascript'> {
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { log } from '@hawk.so/core';`
	`1`	`+import { log } from '../logger/logger';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Sends AJAX request and wait for some time.`