Merge pull request #133 from DeepDoge/master

Bug fixes again

src/components/dialogs.tsx

@@ -68,6 +68,7 @@ export function Dialogs(params: { manager: ReturnType<typeof createDialogManager
             {`
 .alert-dialog
 {
+    position: fixed;
     border: none;
     background: var(--color-dark);
     color: var(--color-light);

src/modules/yt/urlCache.ts

@@ -1,25 +1,21 @@
 // This should only work in background
-
-let db: IDBDatabase | null = null
-
 if (typeof chrome.extension === 'undefined') throw new Error("YT urlCache can only be accessed from extension windows and service-workers.")
 
-if (typeof self.indexedDB !== 'undefined') {
-    const openRequest = indexedDB.open("yt-url-resolver-cache")
-    openRequest.addEventListener('upgradeneeded', () => openRequest.result.createObjectStore("store").createIndex("expireAt", "expireAt"))
-
-    // Delete Expired
-    openRequest.addEventListener('success', () => {
-        db = openRequest.result
-        clearExpired()
-    })
-}
-else console.warn(`IndexedDB not supported`)
+let db = new Promise<IDBDatabase>((resolve, reject) => {
+    if (typeof self.indexedDB !== 'undefined') {
+        const openRequest = indexedDB.open("yt-url-resolver-cache")
+        openRequest.addEventListener('upgradeneeded', () => openRequest.result.createObjectStore("store").createIndex("expireAt", "expireAt"))
+        openRequest.addEventListener('success', () => {
+            resolve(openRequest.result)
+            clearExpired()
+        }, { once: true })
+    }
+    else reject(`IndexedDB not supported`)
+})
 
 async function clearExpired() {
-    return new Promise<void>((resolve, reject) => {
-        if (!db) throw new Error(`IDBDatabase not defined.`)
-        const transaction = db.transaction("store", "readwrite")
+    return new Promise<void>(async (resolve, reject) => {
+        const transaction = (await db).transaction("store", "readwrite")
         const range = IDBKeyRange.upperBound(new Date())
 
         const expireAtCursorRequest = transaction.objectStore("store").index("expireAt").openCursor(range)
@@ -40,8 +36,8 @@ async function clearExpired() {
 }
 
 async function clearAll() {
-    return await new Promise<void>((resolve, reject) => {
-        const store = db?.transaction("store", "readwrite").objectStore("store")
+    return await new Promise<void>(async (resolve, reject) => {
+        const store = (await db).transaction("store", "readwrite").objectStore("store")
         if (!store) return resolve()
         const request = store.clear()
         request.addEventListener('success', () => resolve())
@@ -50,8 +46,8 @@ async function clearAll() {
 }
 
 async function put(url: string | null, id: string): Promise<void> {
-    return await new Promise((resolve, reject) => {
-        const store = db?.transaction("store", "readwrite").objectStore("store")
+    return await new Promise(async (resolve, reject) => {
+        const store = (await db).transaction("store", "readwrite").objectStore("store")
         if (!store) return resolve()
         const expireAt = !url ? new Date(Date.now() + 1 * 60 * 60 * 1000) : new Date(Date.now() + 15 * 24 * 60 * 60 * 1000)
         const request = store.put({ value: url, expireAt }, id)
@@ -65,8 +61,8 @@ async function put(url: string | null, id: string): Promise<void> {
 // null means there is cache of that id has no lbrypathname
 // undefined means there is no cache
 async function get(id: string): Promise<string | null | undefined> {
-    const response = (await new Promise((resolve, reject) => {
-        const store = db?.transaction("store", "readonly").objectStore("store")
+    const response = (await new Promise(async (resolve, reject) => {
+        const store = (await db).transaction("store", "readonly").objectStore("store")
         if (!store) return reject(`Can't find object store.`)
 
         const request = store.get(id)

src/modules/yt/urlResolve.ts

@@ -55,7 +55,7 @@ export async function resolveById(params: Paramaters, progressCallback?: (progre
 
         const controller = new AbortController()
         // 5 second timeout:
-        const timeoutId = setTimeout(() => controller.abort(), 5000)
+        const timeoutId = setTimeout(() => controller.abort(), 15000)
         const apiResponse = await fetch(url.toString(), { cache: 'no-store', signal: controller.signal })
         clearTimeout(timeoutId)
         

src/scripts/background.ts

@@ -23,7 +23,7 @@ chrome.runtime.onMessage.addListener(({ method, data }, sender, sendResponse) =>
           console.log('lbrypathname request', params, await promise)
           resolve(await promise)
         } catch (error) {
-          sendResponse(`error:${(error as any).toString()}`)
+          sendResponse(`error: ${(error as any).toString()}`)
           console.error(error)
         }
         finally {

src/scripts/ytContent.tsx

@@ -226,14 +226,16 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
     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.${response ?? ''}`)
+      throw new Error(`Background error. ${response ?? ''}`)
     }
+    console.log(response)
     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 }) })
+    if (!open(url.href, '_blank'))
+      chrome.runtime.sendMessage({ method: 'openTab', data: JSON.stringify({ href: url.href, active }) })
   }
 
   function getLbryUrlByTarget(target: Target) {
@@ -246,7 +248,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
   let urlHrefCache: string | null = null
   while (true) {
     await sleep(500)
-    const url: URL = new URL(location.href);
+    const url: URL = new URL(location.href)
 
     await (async () => {
       const source = await getSourceByUrl(new URL(location.href))
@@ -256,7 +258,6 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
         if (settings.redirect) {
           const target = (await getTargetsBySources(source))[source.id]
           if (!target) return
-          console.log(url.href, urlHrefCache)
           if (url.href === urlHrefCache) return
 
           const lbryURL = getLbryUrlByTarget(target)
@@ -276,7 +277,6 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
             location.replace(lbryURL)
           }
           else {
-            console.log('open', lbryURL.href)
             openNewTab(lbryURL, document.hasFocus())
 
             if (window.history.length === 1) window.close()