fix bugs

hanover-computing · Sep 14, 2021 · f34cc42 · f34cc42
1 parent e862d4b
commit f34cc42
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "lint:eslint": "eslint ."
   },
   "dependencies": {
+    "cacheable-lookup": "^6.0.1",
     "cheerio": "^1.0.0-rc.10",
     "debug": "^4.3.2",
     "got": "^12.0.0-beta.4",

diff --git a/utils/normalize-url.js b/utils/normalize-url.js
@@ -61,7 +61,11 @@ export default function gen(
     }
 
     // always strip trackers for consistency (even if it means worse performance)!
+    // And don't forget to normalize the end result of stripping tracking for consistency!
     debug('stripping trackers from %s', url)
-    return stripTrackers(url)
+    return normalizeUrl(stripTrackers(url), {
+      ...normalizeUrlOptions,
+      ...preferredOptions
+    })
   }
 }
diff --git a/utils/strip-trackers.js b/utils/strip-trackers.js
@@ -41,7 +41,7 @@ function clearUrl(url) {
     for (const redir of provider.redirections || []) {
       const regex = new RegExp(redir)
       const match = regex.exec(url)
-      if (match.length > 1) {
+      if (match && match.length > 1) {
         url = decodeURIComponent(match[1])
         debug('Matched a redirect! %s', url)
       }