Skip to content

[stable20.1] Fix loading worker on browsers without CSP "worker-src" directive #4899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Jan 7, 2021
Merged

[stable20.1] Fix loading worker on browsers without CSP "worker-src" directive #4899

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4706f89
Keep going if loading the image blurrer worker fails
danxuliu Dec 21, 2020
d7f131a
Use lazy load for image blurrer worker
danxuliu Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 25 additions & 9 deletions src/utils/imageBlurrer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,30 @@

import { generateFilePath } from '@nextcloud/router'

const worker = new Worker(generateFilePath('spreed', '', 'js/image-blurrer-worker.js'))
let worker

const pendingResults = {}
let pendingResultsNextId = 0

worker.onmessage = function(message) {
const pendingResult = pendingResults[message.data.id]
if (!pendingResult) {
console.debug('No pending result for blurring image with id ' + message.data.id)
function loadWorker() {
try {
worker = new Worker(generateFilePath('spreed', '', 'js/image-blurrer-worker.js'))
worker.onmessage = function(message) {
const pendingResult = pendingResults[message.data.id]
if (!pendingResult) {
console.debug('No pending result for blurring image with id ' + message.data.id)

return
}
return
}

pendingResult(message.data.blurredImageAsDataUrl)
pendingResult(message.data.blurredImageAsDataUrl)

delete pendingResults[message.data.id]
delete pendingResults[message.data.id]
}
} catch (exception) {
worker = null
console.error('Image blurrer worker could not be loaded', exception)
}
}

function blurSync(image, width, height, blurRadius) {
Expand All @@ -58,6 +66,14 @@ export default function blur(image, width, height, blurRadius) {
return blurSync(image, width, height, blurRadius)
}

if (worker === undefined) {
loadWorker()
}

if (!worker) {
return blurSync(image, width, height, blurRadius)
}

const id = pendingResultsNextId

pendingResultsNextId++
Expand Down