Merge branch 'master' into fix/AG-21081

AdguardTeam · Jul 7, 2023 · 71c74b5 · 71c74b5
2 parents e288834 + c647f9a
commit 71c74b5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- issue with printing unnecessary logs to the console in `log-addEventListener` scriptlet
+  [#335](https://github.com/AdguardTeam/Scriptlets/issues/335)
 - error throwing in `prevent-fetch` and `prevent-xhr` scriptlets when a request is blocked
   [#334](https://github.com/AdguardTeam/Scriptlets/issues/334)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@adguard/scriptlets",
-    "version": "1.9.43",
+    "version": "1.9.44",
     "description": "AdGuard's JavaScript library of Scriptlets and Redirect resources",
     "scripts": {
         "build": "babel-node -x .js,.ts scripts/build.js",

diff --git a/src/scriptlets/log-addEventListener.js b/src/scriptlets/log-addEventListener.js
@@ -35,14 +35,14 @@ export function logAddEventListener(source) {
             const message = `addEventListener("${type}", ${listenerToString(listener)})`;
             logMessage(source, message, true);
             hit(source);
+        } else {
+            // logging while debugging
+            const message = `Invalid event type or listener passed to addEventListener:
+        type: ${convertTypeToString(type)}
+        listener: ${convertTypeToString(listener)}`;
+            logMessage(source, message, true);
         }
 
-        // logging while debugging
-        const message = `Invalid event type or listener passed to addEventListener:
-type: ${convertTypeToString(type)}
-listener: ${convertTypeToString(listener)}`;
-        logMessage(source, message, true);
-
         // Avoid illegal invocations due to lost context
         // https://github.com/AdguardTeam/Scriptlets/issues/271
         let context = this;

diff --git a/tests/scriptlets/log-addEventListener.test.js b/tests/scriptlets/log-addEventListener.test.js
@@ -60,6 +60,7 @@ test('logs events to console', (assert) => {
         }
         assert.ok(input.includes(eventName), 'console.hit input should be equal');
         assert.ok(input.includes(callback.toString()), 'console.hit input should be equal');
+        assert.notOk(input.includes(INVALID_MESSAGE_START), 'Invalid message should not be displayed');
     };
 
     runScriptlet(name);