fix error logging

AdguardTeam · Dec 4, 2024 · ddd9ac0 · ddd9ac0
1 parent 47fafe8
commit ddd9ac0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/__tests__/filters-downloader.test.ts b/__tests__/filters-downloader.test.ts
@@ -77,7 +77,7 @@ Context:
 \t||example.com
 \t||example.org
 \t!#include ${nonExistentFilePath}
-\tENOENT: no such file or directory, open '${nonExistentFilePath}'
+\tError: ENOENT: no such file or directory, open '${nonExistentFilePath}'
 `),
             );
         });
@@ -101,7 +101,7 @@ Context:
 \t||example.org^
 \t||example.com^
 \t!#include
-\tEISDIR: illegal operation on a directory, read
+\tError: EISDIR: illegal operation on a directory, read
 `),
             );
         });

diff --git a/_qunit_tests_/filters-downloader.test.ts b/_qunit_tests_/filters-downloader.test.ts
@@ -729,15 +729,14 @@ QUnit.test('Test filter downloader - compile rules with conditional includes', a
         '!#endif',
     ];
 
-    try {
-        await FiltersDownloader.compile(rules, null, FilterCompilerConditionsConstants);
-    } catch (e) {
-        assert.equal(
-            (e as Error).message,
-            // eslint-disable-next-line max-len
-            `Failed to resolve the include directive: '!#include ${URL404}'`,
-        );
-    }
+    assert.rejects(
+        FiltersDownloader.compile(rules, null, FilterCompilerConditionsConstants),
+        `Failed to resolve the include directive '!#include https://raw.githubusercontent.com/AdguardTeam/FiltersDownloader/test-resources/__test__/resources/blabla.txt'
+Context:
+        always_included_rule
+        !#include ${URL404}
+        Response status for url ${URL404} is invalid: 404`,
+    );
 
     // case 3: negative condition and include non-existing url
     rules = [

diff --git a/src/filters-downloader-creator.ts b/src/filters-downloader-creator.ts
@@ -241,7 +241,7 @@ const FiltersDownloaderCreator = (FileDownloadWrapper: IFileDownloader): IFilter
      * @param line The line where the error occurred.
      * @param contextStr The context string (3 lines before) to include in the error message.
      * @param url The URL of the filter file.
-     * @param errorMessage The error message to include in the error message.
+     * @param originalError The error message to include in the error message.
      * @throws {Error} Throws an error with a detailed error message.
      */
     const throwError = (
@@ -263,7 +263,8 @@ const FiltersDownloaderCreator = (FileDownloadWrapper: IFileDownloader): IFilter
             errorChunks.push(`\t${line}`);
         }
 
-        if (errorMessage) {
+        if (originalError) {
+            const errorMessage = originalError instanceof Error ? originalError.message : String(originalError);
             errorChunks.push(`\t${errorMessage}`);
         }