Merge pull request #141 from codex-team/fix-fetch

fix(stack-parser): handle file fetch error

Author: neSpecc

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hawk.so/javascript",
   "type": "commonjs",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "description": "JavaScript errors tracking for Hawk.so",
   "files": [
     "dist"

src/addons/consoleCatcher.ts

@@ -173,7 +173,8 @@ export class ConsoleCatcher {
     // First frame is used as fileLine - this is what DevTools shows as clickable link
     const fileLine = stackLines[userFrameIndex]?.trim() || '';
 
-    return { userStack, fileLine };
+    return { userStack,
+      fileLine };
   }
 
   /**
@@ -248,6 +249,8 @@ export class ConsoleCatcher {
        * 3. Create a ConsoleLogEvent with metadata
        * 4. Store it in the buffer
        * 5. Forward the call to the native console (so output still appears in DevTools)
+       *
+       * @param {...any} args
        */
       window.console[method] = (...args: unknown[]): void => {
         // Capture full stack trace and extract user code stack

src/modules/fetchTimer.ts

@@ -25,9 +25,18 @@ export default function fetchTimer(url: string, ms: number): Promise<any> {
     log('Request is too long, aborting...', 'log', url);
   }, ms);
 
-  return fetchPromise.then((response) => {
-    clearTimeout(timeoutId);
+  return fetchPromise
+    .then((response) => {
+      clearTimeout(timeoutId);
 
-    return response;
-  });
+      return response;
+    })
+    .catch((error) => {
+      clearTimeout(timeoutId);
+
+      /**
+       * Re-throw the error so it can be handled by the caller
+       */
+      throw error;
+    });
 }

src/modules/stackParser.ts

@@ -1,7 +1,6 @@
 import type { StackFrame } from 'error-stack-parser';
 import ErrorStackParser from 'error-stack-parser';
 import type { BacktraceFrame, SourceCodeLine } from '@hawk.so/types';
-import log from '../utils/log';
 import fetchTimer from './fetchTimer';
 
 /**
@@ -26,7 +25,7 @@ export default class StackParser {
       const sourceCode = await this.extractSourceCode(frame);
       const file = frame.fileName !== null && frame.fileName !== undefined ? frame.fileName : '';
       const line = frame.lineNumber !== null && frame.lineNumber !== undefined ? frame.lineNumber : 0;
-      
+
       return {
         file,
         line,
@@ -132,7 +131,18 @@ export default class StackParser {
        * Wait for maximum 2 sec to skip loading big files.
        */
       this.sourceFilesCache[fileName] = fetchTimer(fileName, 2000)
-        .then((response) => response.text());
+        .then((response) => response.text())
+        .catch((error) => {
+          /**
+           * Remove failed promise from cache to allow retry
+           */
+          delete this.sourceFilesCache[fileName];
+
+          /**
+           * Re-throw error so it can be caught by try-catch
+           */
+          throw error;
+        });
 
       /**
        * Dealloc cache when it collects more that 10 files
@@ -146,7 +156,10 @@ export default class StackParser {
 
       return await this.sourceFilesCache[fileName];
     } catch (error) {
-      log('Can not load source file. Skipping...');
+      /**
+       * Ensure failed promise is removed from cache
+       */
+      delete this.sourceFilesCache[fileName];      // log('Can not load source file. Skipping...');
 
       return null;
     }

src/types/hawk-initial-settings.ts

@@ -64,7 +64,7 @@ export interface HawkInitialSettings {
 
   /**
    * This Method allows you to filter any data you don't want sending to Hawk.
-   * 
+   *
    * Return `false` to prevent the event from being sent to Hawk.
    */
   beforeSend?(event: HawkJavaScriptEvent): HawkJavaScriptEvent | false;