refactor: simplify baseUrl handling

uschtwill · Oct 12, 2023 · a90cea4 · a90cea4
1 parent 73b4aaf
commit a90cea4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/fetch.js b/lib/fetch.js
@@ -8,7 +8,6 @@ export const fetch = async (strategy, query, config) => {
   const { headers, logResponse } = config.fetchConfig;
   const {
     url,
-    baseUrl,
     zeroResultsYields404,
     getters: { getNextPageHref },
   } = strategy;
@@ -32,7 +31,7 @@ export const fetch = async (strategy, query, config) => {
       if (!nextHref) {
         href = false;
       } else {
-        href = buildHref(nextHref, baseUrl);
+        href = buildHref(nextHref, url);
       }
     }
   } catch (error) {

diff --git a/lib/process.js b/lib/process.js
@@ -8,8 +8,8 @@ export const process = async (htmlDocuments, strategy, query, config) => {
   const { database, notifications, debug, alreadySeenHrefs } = config;
   const {
     getters: { getSingleResult, getResultTitle, getResultHref },
-    baseUrl,
     customDeduplication,
+    url,
   } = strategy;
 
   const fileContent = await loadDatabase(strategy);
@@ -36,7 +36,7 @@ export const process = async (htmlDocuments, strategy, query, config) => {
           strategy,
           query,
           extractedTitle,
-          extractedHref: buildHref(extractedHref, baseUrl),
+          extractedHref: buildHref(extractedHref, url),
         };
 
         if (!alreadySeenHrefs.includes(extractedHref)) {

diff --git a/lib/utils.js b/lib/utils.js
@@ -1,16 +1,20 @@
 import fs from "fs";
-  href.includes("https://") ? href : baseUrl + href;
+
+const _getBaseUrl = (url) => url.match(/^.+?[^\/:](?=[?\/]|$)/)[0];
+
+const buildHref = (href, url) =>
+  href.includes("https://") ? href : _getBaseUrl(url) + href;
 
 const renderMessage = ({
   strategy,
   query,
   extractedTitle,
   extractedHref,
-  baseUrl,
+  url,
 }) => {
   return `${strategy.name} -- ${query} --- ${extractedTitle} --- <${buildHref(
     extractedHref,
-    baseUrl
+    url
   )}>\n`;
 };