From e67c08d83774f67d9f520db4dce7cd8ad23f235a Mon Sep 17 00:00:00 2001
From: Tudor-Ovidiu Avram <tudor.potecaru@8x8.com>
Date: Fri, 16 Oct 2020 15:16:21 +0300
Subject: [PATCH] fix(pwa) move logic for registering pwa worker

---
 debian/jitsi-meet-web.install |  1 +
 index.html                    | 15 ++++++++++++++-
 react/index.web.js            |  8 --------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/jitsi-meet-web.install b/debian/jitsi-meet-web.install
index fb8ea9ed8..e755d9b54 100644
--- a/debian/jitsi-meet-web.install
+++ b/debian/jitsi-meet-web.install
@@ -13,3 +13,4 @@ lang					/usr/share/jitsi-meet/
 connection_optimization	/usr/share/jitsi-meet/
 resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/
+pwa-worker.js /usr/share/jitsi-meet/
diff --git a/index.html b/index.html
index fa366474b..1266fa5f9 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,6 @@
     <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
     <link rel="stylesheet" href="css/all.css">
     <link rel="manifest" href="static/pwa/manifest.json">
-
     <script>
         document.addEventListener('DOMContentLoaded', () => {
             if (!JitsiMeetJS.app) {
@@ -20,6 +19,20 @@
             JitsiMeetJS.app.renderEntryPoint({
                 Component: JitsiMeetJS.app.entryPoints.APP
             })
+
+            const isElectron = navigator.userAgent.includes('Electron');
+            const shouldRegisterWorker = !isElectron && 'serviceWorker' in navigator;
+
+            if (shouldRegisterWorker) {
+                navigator.serviceWorker
+                    .register('pwa-worker.js')
+                    .then(reg => {
+                        console.log('Service worker registered.', reg);
+                    })
+                    .catch(err => {
+                        console.log(err);
+                    });
+            }
         })
     </script>
     <script>
diff --git a/react/index.web.js b/react/index.web.js
index 8bae96960..c187f6e49 100644
--- a/react/index.web.js
+++ b/react/index.web.js
@@ -6,11 +6,9 @@ import ReactDOM from 'react-dom';
 import { getJitsiMeetTransport } from '../modules/transport';
 
 import { App } from './features/app/components';
-import { browser } from './features/base/lib-jitsi-meet';
 import { getLogger } from './features/base/logging/functions';
 import { Platform } from './features/base/react';
 import { getJitsiMeetGlobalNS } from './features/base/util';
-import { loadScript } from './features/base/util/loadScript';
 import PrejoinApp from './features/prejoin/components/PrejoinApp';
 
 const logger = getLogger('index.web');
@@ -24,12 +22,6 @@ document.addEventListener('DOMContentLoaded', () => {
 
     APP.connectionTimes['document.ready'] = now;
     logger.log('(TIME) document ready:\t', now);
-
-    if (!browser.isElectron()) {
-        const base = window.location.origin;
-
-        loadScript(`${base}/static/pwa/registrator.js`);
-    }
 });
 
 // Workaround for the issue when returning to a page with the back button and