Merge pull request #132 from DeepDoge/master

Opening new tabs handled by the background now

manifest.v2.json

@@ -18,6 +18,7 @@
         "https://odysee.com/",
         "https://madiator.com/",
         "https://finder.madiator.com/",
+        "tabs",
         "storage"
     ],
     "web_accessible_resources": [

manifest.v3.json

@@ -8,7 +8,8 @@
     "128": "assets/icons/wol/icon128.png"
   },
   "permissions": [
-    "storage"
+    "storage",
+    "tabs"
   ],
   "host_permissions": [
     "https://www.youtube.com/",

src/scripts/background.ts

@@ -2,23 +2,34 @@ import { resolveById } from "../modules/yt/urlResolve"
 
 const onGoingLbryPathnameRequest: Record<string, ReturnType<typeof resolveById>> = {}
 
-chrome.runtime.onMessage.addListener(({ json }, sender, sendResponse) => {
+chrome.runtime.onMessage.addListener(({ method, data }, sender, sendResponse) => {
   function resolve(result: Awaited<ReturnType<typeof resolveById>>) {
     sendResponse(JSON.stringify(result))
   }
   (async () => {
+
+    switch (method) {
+      case 'openTab':
+        {
+          const { href, active }: { href: string, active: boolean } = JSON.parse(data)
+          chrome.tabs.create({ url: href, active })
+        }
+        break
+      case 'resolveUrl':
         try {
-      const params: Parameters<typeof resolveById> = JSON.parse(json)
+          const params: Parameters<typeof resolveById> = JSON.parse(data)
           // Don't create a new Promise for same ID until on going one is over.
-      const promise = onGoingLbryPathnameRequest[json] ?? (onGoingLbryPathnameRequest[json] = resolveById(...params))
+          const promise = onGoingLbryPathnameRequest[data] ?? (onGoingLbryPathnameRequest[data] = resolveById(...params))
           console.log('lbrypathname request', params, await promise)
           resolve(await promise)
         } catch (error) {
-      sendResponse('error')
+          sendResponse(`error:${(error as any).toString()}`)
           console.error(error)
         }
         finally {
-      delete onGoingLbryPathnameRequest[json]
+          delete onGoingLbryPathnameRequest[data]
+        }
+        break
     }
   })()
 

src/scripts/ytContent.tsx

@@ -26,6 +26,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
   chrome.storage.onChanged.addListener(async (changes, areaName) => {
     if (areaName !== 'local') return
     Object.assign(settings, Object.fromEntries(Object.entries(changes).map(([key, change]) => [key, change.newValue])))
+    if (settings.redirect) updateButton(null)
   })
 
   const buttonMountPoint = document.createElement('div')
@@ -222,12 +223,17 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
   }
   // We should get this from background, so the caching works and we don't get errors in the future if yt decides to impliment CORS
   async function requestResolveById(...params: Parameters<typeof resolveById>): ReturnType<typeof resolveById> {
-    const json = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ json: JSON.stringify(params) }, resolve))
-    if (json === 'error') {
+    const response = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ method: 'resolveUrl', data: JSON.stringify(params) }, resolve))
+    if (response?.startsWith('error:')) {
       console.error("Background error on:", params)
-      throw new Error("Background error.")
+      throw new Error(`Background error.${response ?? ''}`)
     }
-    return json ? JSON.parse(json) : null
+    return response ? JSON.parse(response) : null
+  }
+
+  // Request new tab
+  async function openNewTab(url: URL, active: boolean) {
+    chrome.runtime.sendMessage({ method: 'openTab', data: JSON.stringify({ href: url.href, active }) })
   }
 
   function getLbryUrlByTarget(target: Target) {
@@ -237,27 +243,31 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
     return url
   }
 
-  let urlCache: URL | null = null
+  let urlHrefCache: string | null = null
   while (true) {
     await sleep(500)
+    const url: URL = new URL(location.href);
     
-    const url: URL = (urlCache?.href === location.href) ? urlCache : new URL(location.href)
+    await (async () => {  
       const source = await getSourceByUrl(new URL(location.href))
-    if (!source) continue
+      if (!source) return
   
       try {
         if (settings.redirect) {
           const target = (await getTargetsBySources(source))[source.id]
-        if (!target) continue
-        if (url === urlCache) continue
+          if (!target) return
+          console.log(url.href, urlHrefCache)
+          if (url.href === urlHrefCache) return
   
           const lbryURL = getLbryUrlByTarget(target)
   
+          if (source.type === 'video') {
             // As soon as video play is ready and start playing, pause it.
             findVideoElementAwait(source).then((videoElement) => {
               videoElement.addEventListener('play', () => videoElement.pause(), { once: true })
               videoElement.pause()
             })
+          }
   
           if (target.platform === targetPlatformSettings.app) {
             if (document.hidden) await new Promise((resolve) => document.addEventListener('visibilitychange', resolve, { once: true }))
@@ -266,13 +276,15 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
             location.replace(lbryURL)
           }
           else {
-          open(lbryURL, '_blank')
+            console.log('open', lbryURL.href)
+            openNewTab(lbryURL, document.hasFocus())
+  
             if (window.history.length === 1) window.close()
             else window.history.back()
           }
         }
         else {
-        if (urlCache !== url) updateButton(null)
+          if (urlHrefCache !== url.href) updateButton(null)
           let target = (await getTargetsBySources(source))[source.id]
   
           // There is no target found via API try to check Video Description for LBRY links.
@@ -328,7 +340,9 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
       } catch (error) {
         console.error(error)
       }
-    urlCache = url
+    })()
+
+    urlHrefCache = url.href
   }
 
 })()