Close #11, rimprove logging

src/background/index.chrome.ts

@@ -1,15 +1,15 @@
 import { DOMParser } from 'linkedom';
-import { installedHandler } from './background';
-import { parseAndReply } from './parsing';
+import { installedHandler } from './common';
+import { parseAndReply } from './parser';
 import { resolveURL } from './services';
 
 const scrapeHandler = async ({ url }, res: (response?: any) => void) => {
-  let oldUrl = url
-  let newUrl = ""
   try {
+    let oldUrl = url
+    let newUrl = ""
     let doc: Document
     while (oldUrl !== newUrl) {
-      oldUrl = newUrl
+      oldUrl = newUrl || oldUrl
       const resp = await fetch(oldUrl)
       const html = await resp.text()
       // @ts-expect-error - linkedom's document is FAKE and missing lots of properties, but we don't care because we don't use them :)
@@ -18,6 +18,7 @@ const scrapeHandler = async ({ url }, res: (response?: any) => void) => {
     }
     await parseAndReply(doc, newUrl, res)
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
 }
@@ -34,6 +35,7 @@ const parseHTMLHandler = async ({ html, url }, res: (response?: any) => void) =>
       await parseAndReply(doc, url, res)
     }
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
 }
@@ -54,6 +56,7 @@ const messageHandler = (req: any, sender, res: (response?: any) => void) => {
         return;
     }
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
   return true

src/background/index.firefox.ts

@@ -1,21 +1,22 @@
-import { installedHandler } from "./background";
-import { parseAndReply } from "./parsing";
+import { installedHandler } from "./common";
+import { parseAndReply } from "./parser";
 import { resolveURL } from "./services";
 
 const scrapeHandler = async ({ url }, res: (response?: any) => void) => {
-  let oldUrl = url
-  let newUrl = ""
   try {
+    let oldUrl = url
+    let newUrl = ""
     let doc: Document
     while (oldUrl !== newUrl) {
-      oldUrl = newUrl
+      oldUrl = newUrl || oldUrl
       const resp = await fetch(oldUrl)
       const html = await resp.text()
       doc = new DOMParser().parseFromString(html, "text/html")
       newUrl = await resolveURL(doc, oldUrl) || oldUrl
     }
     await parseAndReply(doc, newUrl, res)
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
 }
@@ -30,6 +31,7 @@ const parseHTMLHandler = async ({ html, url }, res: (response?: any) => void) =>
       await parseAndReply(doc, url, res)
     }
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
 }
@@ -50,6 +52,7 @@ const messageHandler = (req: any, sender, res: (response?: any) => void) => {
         res({ error: "Unknown request" })
     }
   } catch (err) {
+    console.error(err)
     res({ error: err.message })
   }
   return true

src/background/parsing.ts → src/background/parser.ts

@@ -16,7 +16,7 @@ const parseHTMLMeta = (doc: Document, url: string) => {
   let imageUrl = (doc.querySelector('meta[property="og:image"]') as HTMLMetaElement)?.content ||
       (doc.querySelector('meta[property="og:image:url"]') as HTMLMetaElement)?.content ||
       (doc.querySelector('img') as HTMLImageElement)?.src;
-  if (!imageUrl.startsWith("http")) {
+  if (imageUrl && !imageUrl.startsWith("http")) {
     imageUrl = new URL(imageUrl, url).href;
   }
   return {

src/contents/index.tsx

@@ -228,7 +228,7 @@ const ContentPopup = () => {
               target: "background",
               url
             })
-      if (tagData.error) throw new Error(tagData.error)
+      if (tagData.error) throw new Error(`Backend error -- ${tagData.error}`)
       // It is not worth showing just a title.
       if (!tagData.description && !tagData.body && !tagData.image) {
         throw new Error("No data found")