github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4223 from overleaf/bg-load-server-worker-timeout

Browse source 
add timeout on loading of service worker

GitOrigin-RevId: d2153c9abf1dbd6eee3b2fcfd770a21766ebb84e
This commit is contained in:
Timothée Alby 2021-06-21 16:00:51 +02:00 committed by Copybot
parent 392b854f49
commit 866e2f0aab
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/frontend/js/ide.js
View file

@ -369,7 +369,7 @@ If the project has been renamed please look in your project list for a new proje
if (getMeta('ol-resetServiceWorker')) { if (getMeta('ol-resetServiceWorker')) {
unregisterServiceWorker() unregisterServiceWorker()
} else if (getMeta('ol-enablePdfCaching')) { } else if (getMeta('ol-enablePdfCaching')) {
loadServiceWorker() loadServiceWorker({ timeout: 5000 })
} }
export default angular.bootstrap(document.body, ['SharelatexApp']) export default angular.bootstrap(document.body, ['SharelatexApp'])

12
services/web/frontend/js/ide/pdfng/directives/serviceWorkerManager.js
View file

@ -11,9 +11,9 @@ export function waitForServiceWorker() {
return pendingWorkerSetup return pendingWorkerSetup
} }
export function loadServiceWorker() { export function loadServiceWorker(options) {
if (supportsServiceWorker()) { if (supportsServiceWorker()) {
pendingWorkerSetup = navigator.serviceWorker const workerSetup = navigator.serviceWorker
.register('/serviceWorker.js', { .register('/serviceWorker.js', {
scope: '/project/', scope: '/project/',
}) })
@ -38,6 +38,14 @@ export function loadServiceWorker() {
.catch(error => .catch(error =>
captureException(OError.tag(error, 'Cannot register serviceWorker')) captureException(OError.tag(error, 'Cannot register serviceWorker'))
) )
if (options && options.timeout > 0) {
const workerTimeout = new Promise(resolve => {
setTimeout(resolve, options.timeout)
})
pendingWorkerSetup = Promise.race([workerSetup, workerTimeout])
} else {
pendingWorkerSetup = workerSetup
}
} }
} }