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 1 commit
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
Next Next commit
Keep going if loading the image blurrer worker fails 
Until now it was assumed that loading the image blurrer worker would not
fail. However, if the browser does not support the CSP "worker-src"
directive (like Safari) trying to load the worker would throw an
exception which would interrupt the load of Talk itself. Now the
exception is caught and logged instead, and the image blurrer reverts to
a synced generation if no worker is available (although that should not
happen, as the image blurrer is used only on Chromium and Chromium
supports the "worker-src" directive).

Note that Firefox does not throw an exception when loading a worker if
not allowed by the CSP. Moreover, as the worker object is created, it
does not seem to be possible to know if the worker is actually not
available. This is not a problem, though; the image blurrer is not used
on Firefox, and even if it was Firefox supports the "worker-src"
directive.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Jan 7, 2021
commit 4706f899af487aa320ad1d054f72a59bd81aa3bb
25 changes: 15 additions & 10 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,27 @@

import { generateFilePath } from '@nextcloud/router'

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

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)
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) {
console.error('Image blurrer worker could not be loaded', exception)
}

function blurSync(image, width, height, blurRadius) {
Expand All @@ -54,7 +59,7 @@ function blurSync(image, width, height, blurRadius) {
}

export default function blur(image, width, height, blurRadius) {
if (typeof OffscreenCanvas === 'undefined') {
if (!worker || typeof OffscreenCanvas === 'undefined') {
return blurSync(image, width, height, blurRadius)
}

Expand Down