Pull request: upd-companiesdb

Merge in DNS/adguard-home from upd-companiesdb to master

Squashed commit of the following:

commit c38ccd89a46193b24393c00b4a83ed439f6d7469
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 19 12:00:58 2022 +0300

    client: upd trackers

client/src/helpers/trackers/adguard.json

@@ -21,87 +21,128 @@
         "akamai_technologies": {
             "name": "Akamai Technologies",
             "categoryId": 9,
-            "url": "https://www.akamai.com/"
+            "url": "https://www.akamai.com/",
+            "companyId": "akamai"
         },
         "apple": {
             "name": "Apple",
             "categoryId": 8,
-            "url": "https://www.apple.com/"
+            "url": "https://www.apple.com/",
+            "companyId": "apple"
         },
         "apple_ads": {
             "name": "Apple Search Ads",
             "categoryId": 4,
-            "url": "https://searchads.apple.com/"
+            "url": "https://searchads.apple.com/",
+            "companyId": "apple"
         },
         "facebook_audience": {
             "name": "Facebook Audience Network",
             "categoryId": 4,
-            "url": "https://www.facebook.com/business/products/audience-network"
+            "url": "https://www.facebook.com/business/products/audience-network",
+            "companyId": "facebook"
         },
         "crashlytics": {
             "name": "Crashlytics",
             "categoryId": 101,
-            "url": "https://crashlytics.com/"
+            "url": "https://crashlytics.com/",
+            "companyId": null
         },
         "flurry": {
             "name": "Flurry",
             "categoryId": 101,
-            "url": "http://www.flurry.com/"
+            "url": "http://www.flurry.com/",
+            "companyId": "verizon"
         },
         "hockeyapp": {
             "name": "HockeyApp",
             "categoryId": 101,
-            "url": "https://hockeyapp.net/"
+            "url": "https://hockeyapp.net/",
+            "companyId": null
         },
         "firebase": {
             "name": "Firebase",
             "categoryId": 101,
-            "url": "https://firebase.google.com/"
+            "url": "https://firebase.google.com/",
+            "companyId": "google"
         },
         "appsflyer": {
             "name": "AppsFlyer",
             "categoryId": 101,
-            "url": "https://www.appsflyer.com/"
+            "url": "https://www.appsflyer.com/",
+            "companyId": "appsflyer"
         },
         "yandex_appmetrica": {
             "name": "Yandex AppMetrica",
             "categoryId": 101,
-            "url": "https://appmetrica.yandex.com/"
+            "url": "https://appmetrica.yandex.com/",
+            "companyId": "yandex"
         },
         "adjust": {
             "name": "Adjust",
             "categoryId": 101,
-            "url": "https://www.adjust.com/"
+            "url": "https://www.adjust.com/",
+            "companyId": "adjust"
         },
         "branch": {
             "name": "Branch.io",
             "categoryId": 101,
-            "url": "https://branch.io/"
+            "url": "https://branch.io/",
+            "companyId": "branch_metrics_inc"
         },
         "markmonitor": {
             "name": "MarkMonitor",
             "categoryId": 4,
-            "url": "https://www.markmonitor.com/"
+            "url": "https://www.markmonitor.com/",
+            "companyId": "markmonitor"
         },
         "appcenter": {
             "name": "Microsoft App Center",
             "categoryId": 5,
-            "url": "https://appcenter.ms/"
+            "url": "https://appcenter.ms/",
+            "companyId": null
         },
         "unity_ads": {
             "name": "Unity Ads",
             "categoryId": 4,
-            "url": "https://unity.com/solutions/mobile-business/monetize-your-game"
+            "url": "https://unity.com/solutions/mobile-business/monetize-your-game",
+            "companyId": null
         },
         "azure": {
             "name": "Microsoft Azure",
             "categoryId": 10,
-            "url": "https://azure.microsoft.com/"
+            "url": "https://azure.microsoft.com/",
+            "companyId": "microsoft"
         },
         "button": {
             "name": "Button",
             "categoryId": 4,
-            "url": "https://www.usebutton.com/"
+            "url": "https://www.usebutton.com/",
+            "companyId": null
+        },
+        "netflix": {
+            "name": "Netflix",
+            "categoryId": 8,
+            "url": "https://www.netflix.com/",
+            "companyId": null
+        },
+        "mail.ru_banner": {
+            "name": "Mail.Ru Banner Network",
+            "categoryId": 4,
+            "url": "http://mail.ru/",
+            "companyId": "vk"
+        },
+        "mail.ru_counter": {
+            "name": "Mail.Ru Counter",
+            "categoryId": 2,
+            "url": "http://mail.ru/",
+            "companyId": "vk"
+        },
+        "mail.ru_group": {
+            "name": "Mail.Ru Group",
+            "categoryId": 7,
+            "url": "http://mail.ru/",
+            "companyId": "vk"
         }
     },
     "trackerDomains": {
@@ -128,4 +169,4 @@
         "azure.com": "azure",
         "bttn.io": "button"
     }
-}
+}

scripts/README.md

@@ -195,14 +195,13 @@ Optional environment:
 
 ##  `companiesdb/`: Whotracks.me Database Converter
 
-A simple script that downloads and updates the companies DB in the `client` 
+A simple script that downloads and updates the companies DB in the `client`
 code from [the repo][companiesrepo].
 
  ###  Usage
 
 ```sh
-cd scripts/companiesdb
+( cd scripts/companiesdb && sh ./download.sh )
-./download.sh
 ```
 
 [companiesrepo]: https://github.com/AdguardTeam/companiesdb

scripts/companiesdb/download.sh

@@ -10,5 +10,5 @@ adguard='https://raw.githubusercontent.com/AdguardTeam/companiesdb/main/dist/adg
 base_path='../../client/src/helpers/trackers'
 readonly whotracksme adguard base_path
 
-curl "$whotracksme" --output "${base_path}/whotracksme.json"
+curl -o "${base_path}/whotracksme.json" -v "$whotracksme"
-curl "$adguard" --output "${base_path}/adguard.json"
+curl -o "${base_path}/adguard.json"     -v "$adguard"