Updates (#4)

* Update uninstallURL, Bump Version

* Update homepage_url

* Simplify Host Pattern

* Update checkPerms, Add requestPerms, SW type module

* Added Permissions onAdded Callback

* Bump Version for Host Pattern Change

README.md

@@ -45,7 +45,7 @@ All **Chromium** Based Browsers can install the extension from the
 *   Add Additional Links to Entries
 *   Update Main Navigation Links
 *   Hide Site Header Image
-*   Search by Registration or Operator from the Popup
+*   Search Registration/Operator from Popup
 
 ### Upcoming Features and Ideas
 

manifest-firefox.json

@@ -5,7 +5,7 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "[email protected]",
-      "strict_min_version": "109.0"
+      "strict_min_version": "112.0"
     }
   }
 }

manifest.json

@@ -1,9 +1,9 @@
 {
   "name": "ASN Plus",
   "description": "Aviation Safety Network Plus - Additional Features, Display and Search Options.",
-  "homepage_url": "https://github.com/cssnr/asn-plus",
+  "homepage_url": "https://asn-plus.cssnr.com/",
   "author": "Shane",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "manifest_version": 3,
   "commands": {
     "_execute_action": {
@@ -20,30 +20,21 @@
     }
   },
   "permissions": ["contextMenus", "scripting", "storage"],
-  "host_permissions": [
-    "http://aviation-safety.net/*",
-    "https://aviation-safety.net/*"
-  ],
+  "host_permissions": ["*://aviation-safety.net/*"],
   "content_scripts": [
     {
-      "matches": [
-        "http://aviation-safety.net/*",
-        "https://aviation-safety.net/*"
-      ],
+      "matches": ["*://aviation-safety.net/*"],
       "run_at": "document_start",
       "js": ["dist/jquery/jquery.min.js", "js/asn.js", "js/content-script.js"]
     }
   ],
   "web_accessible_resources": [
     {
       "resources": ["css/dark.css"],
-      "matches": [
-        "http://aviation-safety.net/*",
-        "https://aviation-safety.net/*"
-      ]
+      "matches": ["*://aviation-safety.net/*"]
     }
   ],
-  "background": {},
+  "background": { "type": "module" },
   "options_ui": {
     "page": "html/options.html",
     "open_in_tab": true

src/js/export.js

@@ -1,20 +1,32 @@
 // JS Exports
 
+/**
+ * Request Host Permissions
+ * @function requestPerms
+ * @return {chrome.permissions.request}
+ */
+export async function requestPerms() {
+    return await chrome.permissions.request({
+        origins: ['*://aviation-safety.net/*'],
+    })
+}
+
 /**
  * Check Host Permissions
  * @function checkPerms
  * @return {Boolean}
  */
 export async function checkPerms() {
-    const hasPermsEl = document.querySelectorAll('.has-perms')
-    const grantPermsEl = document.querySelectorAll('.grant-perms')
     const hasPerms = await chrome.permissions.contains({
-        origins: [
-            'http://aviation-safety.net/*',
-            'https://aviation-safety.net/*',
-        ],
+        origins: ['*://aviation-safety.net/*'],
     })
     console.debug('checkPerms:', hasPerms)
+    if (typeof document === 'undefined') {
+        console.debug('document undefined')
+        return hasPerms
+    }
+    const hasPermsEl = document.querySelectorAll('.has-perms')
+    const grantPermsEl = document.querySelectorAll('.grant-perms')
     if (hasPerms) {
         hasPermsEl.forEach((el) => el.classList.remove('d-none'))
         grantPermsEl.forEach((el) => el.classList.add('d-none'))

src/js/oninstall.js

@@ -1,6 +1,8 @@
 // JS for oninstall.html
 
-import { checkPerms } from './export.js'
+import { checkPerms, requestPerms } from './export.js'
+
+chrome.permissions.onAdded.addListener(onAdded)
 
 document.addEventListener('DOMContentLoaded', domContentLoaded)
 document.getElementById('grant-perms').addEventListener('click', grantPerms)
@@ -22,9 +24,7 @@ async function domContentLoaded() {
  */
 async function grantPerms(event) {
     console.debug('grantPerms:', event)
-    await chrome.permissions.request({
-        origins: ['http://aviation-safety.net/*', 'https://aviation-safety.net/*'],
-    })
+    await requestPerms()
     const hasPerms = await checkPerms()
     if (hasPerms) {
         chrome.runtime.openOptionsPage()
@@ -43,3 +43,16 @@ function openOptions(event) {
     chrome.runtime.openOptionsPage()
     window.close()
 }
+
+/**
+ * Permissions On Added Callback
+ * @param permissions
+ */
+async function onAdded(permissions) {
+    console.info('onAdded', permissions)
+    const hasPerms = await checkPerms()
+    if (hasPerms) {
+        chrome.runtime.openOptionsPage()
+        window.close()
+    }
+}

src/js/options.js

@@ -1,8 +1,15 @@
 // JS for options.html
 
-import { checkPerms, saveOptions, updateOptions } from './export.js'
+import {
+    checkPerms,
+    requestPerms,
+    saveOptions,
+    updateOptions,
+} from './export.js'
 
 chrome.storage.onChanged.addListener(onChanged)
+chrome.permissions.onAdded.addListener(onAdded)
+
 document.addEventListener('DOMContentLoaded', initOptions)
 document.getElementById('grant-perms').addEventListener('click', grantPerms)
 document
@@ -62,12 +69,7 @@ function onChanged(changes, namespace) {
  */
 async function grantPerms(event) {
     console.debug('grantPermsBtn:', event)
-    await chrome.permissions.request({
-        origins: [
-            'http://aviation-safety.net/*',
-            'https://aviation-safety.net/*',
-        ],
-    })
+    await requestPerms()
     await checkPerms()
 }
 
@@ -102,3 +104,12 @@ async function setShortcuts(mapping) {
         }
     }
 }
+
+/**
+ * Permissions On Added Callback
+ * @param permissions
+ */
+async function onAdded(permissions) {
+    console.debug('onAdded', permissions)
+    await checkPerms()
+}

src/js/popup.js

@@ -1,6 +1,12 @@
 // JS for popup.html
 
-import { checkPerms, saveOptions, showToast, updateOptions } from './export.js'
+import {
+    checkPerms,
+    requestPerms,
+    saveOptions,
+    showToast,
+    updateOptions,
+} from './export.js'
 
 document.addEventListener('DOMContentLoaded', initPopup)
 document.getElementById('grant-perms').addEventListener('click', grantPerms)
@@ -126,14 +132,9 @@ async function popupLinks(event) {
  * @function grantPerms
  * @param {Event} event
  */
-function grantPerms(event) {
+async function grantPerms(event) {
     console.debug('grantPerms:', event)
-    chrome.permissions.request({
-        origins: [
-            'http://aviation-safety.net/*',
-            'https://aviation-safety.net/*',
-        ],
-    })
+    requestPerms()
     window.close()
 }
 

src/js/service-worker.js

@@ -1,5 +1,7 @@
 // JS Background Service Worker
 
+import { checkPerms } from './export.js'
+
 chrome.runtime.onStartup.addListener(onStartup)
 chrome.runtime.onInstalled.addListener(onInstalled)
 chrome.runtime.onMessage.addListener(onMessage)
@@ -8,13 +10,14 @@ chrome.commands.onCommand.addListener(onCommand)
 chrome.storage.onChanged.addListener(onChanged)
 
 const asnHomePageURL = 'https://aviation-safety.net/'
+const uninstallURL = 'https://asn-plus.cssnr.com/uninstall/'
 
 /**
  * On Startup Callback
  * @function onStartup
  */
-async function onStartup(arg) {
-    console.log('onStartup', arg)
+async function onStartup() {
+    console.log('onStartup')
     if (typeof browser !== 'undefined') {
         console.log('FireFox Startup - Fix for Bug')
         const { options } = await chrome.storage.sync.get(['options'])
@@ -53,12 +56,8 @@ async function onInstalled(details) {
         await registerDarkMode()
     }
     if (details.reason === chrome.runtime.OnInstalledReason.INSTALL) {
-        const hasPerms = await chrome.permissions.contains({
-            origins: [
-                'http://aviation-safety.net/*',
-                'https://aviation-safety.net/*',
-            ],
-        })
+        const hasPerms = await checkPerms()
+        console.debug('hasPerms:', hasPerms)
         if (hasPerms) {
             chrome.runtime.openOptionsPage()
         } else {
@@ -74,7 +73,7 @@ async function onInstalled(details) {
             }
         }
     }
-    await chrome.runtime.setUninstallURL(`${githubURL}/issues`)
+    await chrome.runtime.setUninstallURL(uninstallURL)
 }
 
 /**
@@ -94,7 +93,7 @@ function onMessage(message, sender, sendResponse) {
                 tabId: sender.tab.id,
             },
         }
-        console.info(`SW: Dark Mode: ${message.dark}`, darkCss)
+        console.debug(`SW: Dark Mode: ${message.dark}`, darkCss)
         if (message.dark === 'off') {
             try {
                 chrome.scripting.removeCSS(darkCss)
@@ -138,7 +137,7 @@ async function onClicked(ctx, tab) {
  * @param {String} command
  */
 async function onCommand(command) {
-    console.error('onCommand:', command)
+    console.debug('onCommand:', command)
     if (command === 'openHome') {
         await chrome.tabs.create({ active: true, url: asnHomePageURL })
     } else {
@@ -188,10 +187,7 @@ async function registerDarkMode() {
     const asnDark = {
         id: 'asn-dark',
         css: ['css/dark.css'],
-        matches: [
-            'http://aviation-safety.net/*',
-            'https://aviation-safety.net/*',
-        ],
+        matches: ['*://aviation-safety.net/*'],
         runAt: 'document_start',
     }
     console.log('registerDarkMode', asnDark)