fix trackers database update

background.js

@@ -1,5 +1,5 @@
 import { chrome, browser } from './globals';
-import trackerData from './whotracksme.json';
+import companyHostnameMapping from './whotracksme.json';
 import {
 	cleanStorage,
 	saveCookies,
@@ -191,17 +191,6 @@ let cookieTable = {};
 
 const parentTabMapping = {};
 
-// Create a mapping of hostname to company name
-const company_hostname_mapping = {}
-
-Object.values(trackerData.trackers).forEach((info) => {
-	const company_name = info.company_id === null ? 'Unknown' : trackerData.companies[info.company_id].name;
-	info.domains.forEach(y => {
-		trackerDomains.push(y);
-		company_hostname_mapping[y] = company_name;
-	});
-});
-
 // Adding company name and tracker host.
 // Structure is:
 // refTP[url][company_name] => ['trackerdomain1', 'trackerdomain2'];
@@ -588,9 +577,9 @@ function parseQueryString(q) {
 }
 
 function getCompanyName(hostname, partialHostName) {
-	if (company_hostname_mapping.hasOwnProperty(hostname) || company_hostname_mapping.hasOwnProperty(partialHostName)) {
+	if (companyHostnameMapping.hasOwnProperty(hostname) || companyHostnameMapping.hasOwnProperty(partialHostName)) {
 		return {
-			company_name: company_hostname_mapping[hostname] || company_hostname_mapping[partialHostName],
+			company_name: companyHostnameMapping[hostname] || companyHostnameMapping[partialHostName],
 			// tracker_company: e,
 			// tracker_id: trackerData[e].id,
 			tracker_host: hostname

package.json

@@ -8,7 +8,7 @@
     "watch": "rollup --config rollup.config.js --watch",
     "lint": "web-ext lint",
     "start": "concurrently 'npm run watch' 'web-ext run --source-dir .'",
-    "update-wtm": "curl 'https://whotracks.me/data/trackerdb.json' > whotracksme.json"
+    "update-wtm": "node updater.js"
   },
   "repository": {
     "type": "git",
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "@ampproject/rollup-plugin-closure-compiler": "^0.10.0",
+    "axios": "^0.19.0",
     "concurrently": "^4.1.1",
     "rollup": "^1.17.0",
     "rollup-plugin-json": "^4.0.0",

updater.js

@@ -0,0 +1,25 @@
+const fs = require("fs");
+const axios = require("axios");
+
+async function update() {
+	// Fetch latest trackers data from whotracks.me
+	const { trackers, companies } = (await axios.get(
+		"https://whotracks.me/data/trackerdb.json"
+	)).data;
+
+	// Create mapping from tracker domain to company name
+	const companyMapping = {};
+	for (const [tracker, { company_id, domains }] of Object.entries(trackers)) {
+		const companyName = (companies[company_id] || { name: "unknown" }).name;
+		for (const domain of domains) {
+			companyMapping[domain] = companyName;
+		}
+	}
+
+	// Save mapping on disk
+	fs.writeFileSync("whotracksme.json", JSON.stringify(companyMapping), {
+		encoding: "utf-8"
+	});
+}
+
+update();