Merge branch 'main' into add-pv-cdn.net

dist/companies.json

@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "companies": {
         "163": {
             "name": "163",
@@ -6805,7 +6805,7 @@
             "description": "MicroAd is a Japanese behavioral targeting ad delivery service. They offer contextual advertising services as well as retargeting and other ad delivery services."
         },
         "microsoft": {
-            "name": "Microsoft",
+            "name": "Microsoft Corporation",
             "websiteUrl": "https://www.microsoft.com/",
             "description": "Microsoft is an American multinational corporation that develops, manufactures, licenses, supports, and sells a range of software products and services.",
             "source": "AdGuard"

dist/trackers.csv

@@ -622,7 +622,9 @@ amazonpay.com;amazon_payments;2
 payments-amazon.com;amazon_payments;2
 amazonpay.in;amazon_payments;2
 aiv-cdn.net;amazon_video;0
+aiv-delivery.net;amazon_video;0
 amazonvideo.com;amazon_video;0
+primevideo.com;amazon_video;0
 amazonaws.com;amazon_web_services;10
 amazonwebservices.com;amazon_web_services;10
 awsstatic.com;amazon_web_services;10
@@ -769,6 +771,7 @@ perfb.com;awin;4
 ad.globe7.com;axill;4
 azadify.com;azadify;4
 azure.com;azure;10
+azure.net;azure;10
 azurefd.net;azure;10
 trafficmanager.net;azure;10
 blob.core.windows.net;azure_blob_storage;8
@@ -4990,7 +4993,7 @@ yellowpages.com;yp;4
 prod-js.aws.y-track.com;ysance;4
 y-track.com;ysance;4
 yume.com;yume;4
-yumenetworks.com;yume,_inc.;4
+yumenetworks.com;"yume,_inc.";4
 gravityrd-services.com;yusp;6
 api.zadarma.com;zadarma;2
 zalan.do;zalando_de;8

dist/trackers.json

@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",
@@ -20705,7 +20705,9 @@
         "payments-amazon.com": "amazon_payments",
         "amazonpay.in": "amazon_payments",
         "aiv-cdn.net": "amazon_video",
+        "aiv-delivery.net": "amazon_video",
         "amazonvideo.com": "amazon_video",
+        "primevideo.com": "amazon_video",
         "amazonaws.com": "amazon_web_services",
         "amazonwebservices.com": "amazon_web_services",
         "awsstatic.com": "amazon_web_services",
@@ -20852,6 +20854,7 @@
         "ad.globe7.com": "axill",
         "azadify.com": "azadify",
         "azure.com": "azure",
+        "azure.net": "azure",
         "azurefd.net": "azure",
         "trafficmanager.net": "azure",
         "blob.core.windows.net": "azure_blob_storage",

dist/whotracksme.json

@@ -1,5 +1,5 @@
 {
-    "timeUpdated": "2023-10-22T00:09:43.045Z",
+    "timeUpdated": "2023-11-09T13:44:47.025Z",
     "categories": {
         "0": "audio_video_player",
         "1": "comments",

index.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as zod from 'zod';
 import { consola } from 'consola';
+import { stringify } from 'csv-stringify/sync';
 
 const WHOTRACKSME_INPUT_PATH = 'source/whotracksme.json';
 const WHOTRACKSME_COMPANIES_INPUT_PATH = 'source/whotracksme_companies.json';
@@ -291,14 +292,16 @@ function buildTrackersCSV(
 
     Object.entries(trackersDomains).forEach(([domain, trackerId]) => {
         const tracker = trackers[trackerId];
-
         if (!tracker) {
             throw new Error(`Tracker domain ${domain} has an invalid tracker ID: ${trackerId}`);
         }
-
         const { categoryId } = tracker;
         if (typeof categoryId !== 'undefined') {
-            csv += `${domain};${trackerId};${categoryId}\n`;
+            const csvRow = stringify([[domain, trackerId, categoryId]], {
+                delimiter: ';',
+                quoted_match: ',',
+            });
+            csv += csvRow;
         } else {
             consola.warn(`Tracker ${trackerId} has no category ID, consider adding it`);
         }

package.json

@@ -22,6 +22,7 @@
     },
     "dependencies": {
         "consola": "^3.1.0",
+        "csv-stringify": "^6.4.4",
         "zod": "^3.21.4"
     }
 }

source/companies.json

@@ -197,7 +197,7 @@
             "description": "Meta builds technologies that help people connect, find communities and grow businesses."
         },
         "microsoft": {
-            "name": "Microsoft",
+            "name": "Microsoft Corporation",
             "websiteUrl": "https://www.microsoft.com/",
             "description": "Microsoft is an American multinational corporation that develops, manufactures, licenses, supports, and sells a range of software products and services."
         },

source/trackers.json

@@ -1101,8 +1101,10 @@
         "amazontrust.com": "amazon_cdn",
         "associates-amazon.com": "amazon_cdn",
         "amazonpay.in": "amazon_payments",
+        "aiv-delivery.net": "amazon_video",
         "amazonvideo.com": "amazon_video",
         "pv-cdn.net": "amazon_video",
+        "primevideo.com": "amazon_video",
         "appcenter.ms": "appcenter",
         "aaplimg.com": "apple",
         "apple-cloudkit.com": "apple",
@@ -1130,6 +1132,7 @@
         "jira.com": "atlassian.net",
         "ss-inf.net": "atlassian.net",
         "azure.com": "azure",
+        "azure.net": "azure",
         "azurefd.net": "azure",
         "trafficmanager.net": "azure",
         "blob.core.windows.net": "azure_blob_storage",