LBRYFoundation/Watch-on-LBRY
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/Watch-on-LBRY.git synced 2025-08-23 17:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🍣 bug fixes

Browse source
This commit is contained in:
Shiba 2022-08-09 16:42:51 +00:00
parent c089de3f0f
commit b26d540a4a
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/scripts/background.ts
View file

@ -10,7 +10,10 @@ chrome.runtime.onMessage.addListener(({ method, data }, sender, sendResponse) =>
switch (method) { switch (method) {
case 'openTab': case 'openTab':
chrome.tabs.create({ url: data }) {
const { href, active }: { href: string, active: boolean } = JSON.parse(data)
chrome.tabs.create({ url: href, active })
}
break break
case 'resolveUrl': case 'resolveUrl':
try { try {
@ -20,7 +23,7 @@ chrome.runtime.onMessage.addListener(({ method, data }, sender, sendResponse) =>
console.log('lbrypathname request', params, await promise) console.log('lbrypathname request', params, await promise)
resolve(await promise) resolve(await promise)
} catch (error) { } catch (error) {
sendResponse('error') sendResponse(`error:${(error as any).toString()}`)
console.error(error) console.error(error)
} }
finally { finally {

25
src/scripts/ytContent.tsx
View file

@ -26,6 +26,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
chrome.storage.onChanged.addListener(async (changes, areaName) => { chrome.storage.onChanged.addListener(async (changes, areaName) => {
if (areaName !== 'local') return if (areaName !== 'local') return
Object.assign(settings, Object.fromEntries(Object.entries(changes).map(([key, change]) => [key, change.newValue]))) Object.assign(settings, Object.fromEntries(Object.entries(changes).map(([key, change]) => [key, change.newValue])))
if (settings.redirect) updateButton(null)
}) })
const buttonMountPoint = document.createElement('div') const buttonMountPoint = document.createElement('div')
@ -222,17 +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 // 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> { async function requestResolveById(...params: Parameters<typeof resolveById>): ReturnType<typeof resolveById> {
const json = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ method: 'resolveUrl', data: JSON.stringify(params) }, resolve)) const response = await new Promise<string | null | 'error'>((resolve) => chrome.runtime.sendMessage({ method: 'resolveUrl', data: JSON.stringify(params) }, resolve))
if (json === 'error') { if (response?.startsWith('error:')) {
console.error("Background error on:", params) 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 // Request new tab
async function openNewTab(url: URL) { async function openNewTab(url: URL, active: boolean) {
chrome.runtime.sendMessage({ method: 'openTab', data: url.href }) chrome.runtime.sendMessage({ method: 'openTab', data: JSON.stringify({ href: url.href, active }) })
} }
function getLbryUrlByTarget(target: Target) { function getLbryUrlByTarget(target: Target) {
@ -242,11 +243,11 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
return url return url
} }
let urlCache: URL | null = null let urlHrefCache: string | null = null
while (true) { while (true) {
await sleep(500) await sleep(500)
const url: URL = (urlCache?.href === location.href) ? urlCache : new URL(location.href) const url: URL = new URL(location.href)
const source = await getSourceByUrl(new URL(location.href)) const source = await getSourceByUrl(new URL(location.href))
if (!source) continue if (!source) continue
@ -254,7 +255,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
if (settings.redirect) { if (settings.redirect) {
const target = (await getTargetsBySources(source))[source.id] const target = (await getTargetsBySources(source))[source.id]
if (!target) continue if (!target) continue
if (url === urlCache) continue if (url.href === urlHrefCache) continue
const lbryURL = getLbryUrlByTarget(target) const lbryURL = getLbryUrlByTarget(target)
@ -273,14 +274,14 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
location.replace(lbryURL) location.replace(lbryURL)
} }
else { else {
openNewTab(lbryURL) openNewTab(lbryURL, document.hasFocus())
if (window.history.length === 1) window.close() if (window.history.length === 1) window.close()
else window.history.back() else window.history.back()
} }
} }
else { else {
if (urlCache !== url) updateButton(null) if (urlHrefCache !== url.href) updateButton(null)
let target = (await getTargetsBySources(source))[source.id] let target = (await getTargetsBySources(source))[source.id]
// There is no target found via API try to check Video Description for LBRY links. // There is no target found via API try to check Video Description for LBRY links.
@ -336,7 +337,7 @@ import { getExtensionSettingsAsync, getSourcePlatfromSettingsFromHostname, getTa
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
urlCache = url urlHrefCache = url.href
} }
})() })()