Cleanup PDF Errors (#95)

Author: smashedr

src/html/permissions.html

@@ -31,8 +31,8 @@ <h1>Link Extractor</h1>
     </ul>
     <p class="fw-bold mb-0">Firefox</p>
     <ul>
-        <li>Extracting links from PDFs.</li>
         <li>Using Omnibox to extract links.</li>
+        <li>Extracting links from PDFs.</li>
     </ul>
     <div class="d-none grant-perms">
         <button class="btn btn-lg btn-success w-100 mb-3 grant-permissions" type="button"

src/html/popup.html

@@ -36,15 +36,15 @@
            data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Experimental Feature">
             <i class="fa-solid fa-file-pdf me-1"></i> Extract from PDF
             <i class="fa-solid fa-flask" id="pdf-icon" style="min-width: 22px;"></i></a>
-        <div id="file-access" class="alert alert-warning text-center p-1 my-0 d-none">
+        <div id="no-file-access" class="alert alert-warning text-center p-1 my-0 d-none">
             <span>Browser</span> does <b>not</b> allow access to files.
         </div>
-        <div id="firefox-pdf" class="alert alert-warning text-center p-1 my-0 d-none">
-            PDF Extraction Requires <a href="#" class="alert-link grant-permissions">Host Permissions</a>.
-        </div>
-        <div id="chrome-files" class="alert alert-warning text-center p-1 my-0 d-none">
+        <div id="file-access" class="alert alert-warning text-center p-1 my-0 d-none">
             PDF files require <a href="https://link-extractor.cssnr.com/faq/#fileAccess" class="alert-link">file access</a>.
         </div>
+        <div id="pdf-perms" class="alert alert-warning text-center p-1 my-0 d-none">
+            PDF extraction needs <a href="#" class="alert-link grant-permissions">host permissions</a>.
+        </div>
         <hr class="my-0">
         <form id="links-form" class="my-0">
             <label for="links-text" class="form-label visually-hidden">Open Links</label>

src/js/popup.js

@@ -64,7 +64,7 @@ async function initPopup() {
 
     // PDF Check
     try {
-        await checkPDF(hasPerms)
+        await processFileTypes(hasPerms)
     } catch (e) {
         console.debug(e)
     }
@@ -76,7 +76,7 @@ async function initPopup() {
     // }
 }
 
-async function checkPDF(hasPerms) {
+async function processFileTypes(hasPerms) {
     const [tab] = await chrome.tabs.query({ active: true })
     console.debug('tab:', tab)
     const url = new URL(tab.url)
@@ -85,30 +85,29 @@ async function checkPDF(hasPerms) {
     // console.debug('browser:', browser)
     if (url.pathname.toLowerCase().endsWith('.pdf')) {
         console.debug(`Detected PDF: ${url.href}`)
-        if (['firefox', 'edge'].includes(browser.id)) {
-            if (url.protocol === 'file:') {
-                const el = document.getElementById('file-access')
+        if (url.protocol === 'file:') {
+            if (browser.id === 'firefox') {
+                const el = document.getElementById('no-file-access')
                 el.querySelector('span').textContent = browser.name
                 el.classList.remove('d-none')
                 return
             }
-            if (!hasPerms) {
-                document
-                    .getElementById('firefox-pdf')
-                    .classList.remove('d-none')
-                return
-            }
-        } else if (url.protocol === 'file:') {
             const fileAccess =
                 await chrome.extension.isAllowedFileSchemeAccess()
             console.debug('fileAccess:', fileAccess)
             if (!fileAccess) {
                 document
-                    .getElementById('chrome-files')
+                    .getElementById('file-access')
                     .classList.remove('d-none')
                 return
             }
         }
+        if (!hasPerms) {
+            if (browser.id === 'firefox') {
+                document.getElementById('pdf-perms').classList.remove('d-none')
+                return
+            }
+        }
         pdfBtn.dataset.pdfUrl = url.href
         pdfBtn.classList.remove('d-none')
         pdfBtn.addEventListener('click', extractPDF)
@@ -132,7 +131,11 @@ async function extractPDF(event) {
         window.close()
     } catch (e) {
         console.log('e:', e)
-        showToast(e.message, 'danger')
+        if (e.message === 'Promise.withResolvers is not a function') {
+            showToast('This browser does not support pdf.js', 'danger')
+        } else {
+            showToast(e.message, 'danger')
+        }
     } finally {
         pdfIcon.classList.remove('fa-sync', 'fa-spin')
         pdfIcon.classList.add('fa-flask')