Merge pull request #89 from underprovisioned/cc-tlds

chore: use psl for base domain resolution

Author: Tensai75

global.d.ts

@@ -1,2 +1,9 @@
 // global.d.ts
 /// <reference types="vite-plugin-md-to-html/types" />
+
+// Type definitions for the 'psl' module
+declare module 'psl' {
+  export function parse(domain: string): { input: string; tld: string; sld: string; domain: string; subdomain: string }
+  export function isValid(domain: string): boolean
+  export function get(domain: string): string | null
+}

package-lock.json

@@ -36,6 +36,7 @@
     "linkedom": "^0.18.11",
     "primeicons": "^7.0.0",
     "primevue": "^4.2.5",
+    "psl": "^1.15.0",
     "tailwindcss-primeui": "^0.4.0",
     "vue": "^3.5.12"
   },

package.json

@@ -9,7 +9,7 @@ import notifications from '@/services/notifications'
 import {
   DeserializedResponse,
   deserializeResponse,
-  getBaseDomainFromULR,
+  getBaseDomainFromURL,
   serializeRequest,
 } from '@/utils/fetchUtilities'
 
@@ -115,7 +115,7 @@ function onErrorOccurredListener(details: Browser.webRequest.WebRequestDetails):
       if (!cachedRequest) throw new Error(`no cached request found for requestId ${details.requestId}`)
       requestCache.delete(details.requestId) // Clear the cache after processing
       const { url, source } = cachedRequest
-      const domain = getBaseDomainFromULR(url)
+      const domain = getBaseDomainFromURL(url)
       const setting = (await interception.getSettings()).domains.find((d) => d.domain === domain)
       if (!setting) throw new Error(`no domain setting found for ${domain}`)
       try {

src/entrypoints/background/interception/declarativeNetRequestHandler.ts

@@ -11,7 +11,7 @@ import notifications from '@/services/notifications'
 import { NZBFileObject } from '@/services/nzbfile'
 import {
   DeserializedResponse,
-  getBaseDomainFromULR,
+  getBaseDomainFromURL,
   getFilenameFromResponse,
   getHttpStatusText,
 } from '@/utils/fetchUtilities'
@@ -46,7 +46,7 @@ export async function processInterceptedRequestResponse({
 }): Promise<void> {
   let nzbFiles: NZBFileObject[] = [] // Initialize nzbFiles here
   const url = response.url
-  const domain = getBaseDomainFromULR(url)
+  const domain = getBaseDomainFromURL(url)
   const filename = getFilenameFromResponse(response as Response)
   const setting = (await getInterceptionSettings()).domains.find((d) => d.domain === domain)
   try {

src/entrypoints/background/interception/interceptedRequestsHandler.ts

@@ -1,4 +1,5 @@
 import { FormFieldResolverOptions } from '@primevue/forms'
+import psl from 'psl'
 
 import { i18n } from '#i18n'
 import { browser } from '#imports'
@@ -52,8 +53,7 @@ export const requiredBaseDomainResolver = ({ value, name = '' }: FormFieldResolv
       message: i18n.t('validation.isRequired', [name]),
     })
   }
-  const regex = /^[a-zA-Z0-9-]{1,63}(?:\.(?:(?:a[cd]|com?|edu|gov|net|org?)\.[a-zA-Z0-9-]{2}|[a-zA-Z]{2,63}))?$/i
-  if (!regex.test(value)) {
+  if (psl.get(value) !== value) {
     errors.push({ message: i18n.t('validation.noBaseDomain') })
   }
   return { errors }

src/services/resolvers.ts

@@ -1,3 +1,5 @@
+import psl from 'psl'
+
 import { b64EncodeUnicode, getFileNameFromPath } from '@/utils/stringUtilities'
 
 const DEFAULT_HEADER = { 'X-NZBDonkey': 'true' }
@@ -214,8 +216,16 @@ export const getFilenameFromResponse = (response: Response): string => {
  * @return {string} The base domain.
  * @throws {Error} Throws an error if the URL is invalid.
  */
-export const getBaseDomainFromULR = (url: string): string => {
-  return new URL(url).hostname.split('.').slice(-2).join('.')
+export const getBaseDomainFromURL = (url: string): string => {
+  const hostname = new URL(url).hostname
+  const domain = psl.get(hostname)
+
+  // Fall back to simple extraction for edge cases
+  if (domain === null) {
+    return hostname.split('.').slice(-2).join('.')
+  }
+
+  return domain
 }
 
 /**