fix google-ima3 compatibility. #272 AG-18460

related: AdguardTeam/FiltersCompiler#167

Squashed commit of the following:

commit f9d1c8b
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Dec 21 21:03:15 2022 +0200

    update changelog

commit 8bdc932
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Dec 21 21:02:34 2022 +0200

    update compatibility-table

commit 2538a5b
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Dec 21 21:01:25 2022 +0200

    fix google-ima3 conversion

commit 5e990c4
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Dec 21 21:00:46 2022 +0200

    add alias for google-ima3

CHANGELOG.md

@@ -1,10 +1,11 @@
 # Scriptlets and Redirect Resources Changelog
 
-## Unreleased
+## Unreleased 1.7.x
 
 ### Fixed
 
 - `prevent-addEventListener` and `log-addEventListener` loosing context when encountering already bound `.addEventListener`
+- `google-ima3` conversion
 
 ## v1.7.14
 

scripts/compatibility-table.json

@@ -295,6 +295,10 @@
             "adg": "google-analytics-ga",
             "ubo": "google-analytics_ga.js"
         },
+        {
+            "adg": "google-ima3",
+            "ubo": "google-ima.js"
+        },
         {
             "adg": "googlesyndication-adsbygoogle",
             "ubo": "googlesyndication_adsbygoogle.js"
@@ -444,9 +448,6 @@
         {
             "ubo": "mxpnl_mixpanel.js"
         },
-        {
-            "ubo": "google-ima.js"
-        },
         {
             "ubo": "noop-0.5s.mp3"
         }

src/helpers/compatibility-redirects.js

@@ -77,6 +77,7 @@ const redirects = [
     },
     {
         adg: 'google-ima3',
+        ubo: 'google-ima.js',
     },
     {
         adg: 'gemius',

src/redirects/google-ima3.js

@@ -478,7 +478,13 @@ export function GoogleIma3(source) {
     hit(source);
 }
 
-GoogleIma3.names = ['google-ima3'];
+GoogleIma3.names = [
+    'google-ima3',
+    // prefixed name
+    'ubo-google-ima.js',
+    // original ubo name
+    'google-ima.js',
+];
 
 GoogleIma3.injections = [
     hit,

tests/lib-tests/index.test.js

@@ -418,6 +418,10 @@ test('Test REDIRECT converting - UBO -> ADG', (assert) => {
     uboRule = '||g9g.eu^*fa.js$script,redirect=fuckadblock.js-3.2.0';
     expectedAdgRule = '||g9g.eu^*fa.js$script,redirect=prevent-fab-3.2.0';
     assert.strictEqual(convertRedirectToAdg(uboRule), expectedAdgRule);
+
+    uboRule = '||imasdk.googleapis.com/js/sdkloader/ima3.js$script,important,redirect=google-ima.js,domain=example.org';
+    expectedAdgRule = '||imasdk.googleapis.com/js/sdkloader/ima3.js$script,important,redirect=google-ima3,domain=example.org';
+    assert.strictEqual(convertRedirectToAdg(uboRule), expectedAdgRule);
 });
 
 test('Test REDIRECT-RULE converting - UBO -> ADG', (assert) => {
@@ -555,6 +559,10 @@ test('Test REDIRECT converting - ADG -> UBO', (assert) => {
         new RegExp('Unable to convert for uBO'), // specific error matcher
         'no TYPES to specify, ABSENT_SOURCE_TYPE_REPLACEMENT should be updated',
     );
+
+    adgRule = '||imasdk.googleapis.com/js/sdkloader/ima3.js$script,important,redirect=google-ima3,domain=example.org';
+    expectedUboRule = '||imasdk.googleapis.com/js/sdkloader/ima3.js$script,important,redirect=google-ima.js,domain=example.org';
+    assert.strictEqual(convertAdgRedirectToUbo(adgRule), expectedUboRule);
 });
 
 test('Test REDIRECT-RULE converting - ADG -> UBO', (assert) => {

tests/redirects/google-ima3.test.js

@@ -18,6 +18,24 @@ const afterEach = () => {
 
 module(name, { beforeEach, afterEach });
 
+test('Checking if alias name works', (assert) => {
+    const adgParams = {
+        name,
+        engine: 'test',
+        verbose: true,
+    };
+    const uboParams = {
+        name: 'ubo-google-ima.js',
+        engine: 'test',
+        verbose: true,
+    };
+
+    const codeByAdgParams = window.scriptlets.redirects.getCode(adgParams);
+    const codeByUboParams = window.scriptlets.redirects.getCode(uboParams);
+
+    assert.strictEqual(codeByAdgParams, codeByUboParams, 'ubo name - ok');
+});
+
 test('Ima mocked', (assert) => {
     assert.expect(28);
 

wiki/compatibility-table.md

@@ -91,6 +91,7 @@
 | [fingerprint3js](../wiki/about-redirects.md#fingerprint3js) | fingerprint3.js |  |
 | [google-analytics](../wiki/about-redirects.md#google-analytics) | google-analytics_analytics.js |  |
 | [google-analytics-ga](../wiki/about-redirects.md#google-analytics-ga) | google-analytics_ga.js |  |
+| [google-ima3](../wiki/about-redirects.md#google-ima3) | google-ima.js |  |
 | [googlesyndication-adsbygoogle](../wiki/about-redirects.md#googlesyndication-adsbygoogle) | googlesyndication_adsbygoogle.js |  |
 | [googletagservices-gpt](../wiki/about-redirects.md#googletagservices-gpt) | googletagservices_gpt.js |  |
 | [gemius](../wiki/about-redirects.md#gemius) |  |  |
@@ -133,5 +134,4 @@
 |  | window.open-defuser.js |  |
 |  | noeval.js |  |
 |  | mxpnl_mixpanel.js |  |
-|  | google-ima.js |  |
 |  | noop-0.5s.mp3 |  |