HotFix query url for Json manifest (workadventure#2761)

ffddorf · Nov 2, 2022 · 4e011c5 · 4e011c5
1 parent e69923d
commit 4e011c5
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 3 deletions.
diff --git a/play/public/service-worker-dev.js b/play/public/service-worker-dev.js
@@ -4,6 +4,14 @@ let urlsToCache = [
 ];
 
 self.addEventListener('install', function(event) {
+    // url to cache
+    if(event.target && event.target.serviceWorker && event.target.serviceWorker.scriptURL){
+        const url = new URL(event.target.serviceWorker.scriptURL);
+        const searchParams = new URLSearchParams(url.search);
+        const playUri = searchParams.get('playUri');
+        urlsToCache = [playUri];
+    }
+
     // Perform install steps
     event.waitUntil(
         caches.open(CACHE_NAME)

diff --git a/play/public/service-worker-prod.js b/play/public/service-worker-prod.js
@@ -4,6 +4,14 @@ let urlsToCache = [
 ];
 
 self.addEventListener('install', function(event) {
+    // url to cache
+    if(event.target && event.target.serviceWorker && event.target.serviceWorker.scriptURL){
+        const url = new URL(event.target.serviceWorker.scriptURL);
+        const searchParams = new URLSearchParams(url.search);
+        const playUri = searchParams.get('playUri');
+        urlsToCache = [playUri];
+    }
+
     // Perform install steps
     event.waitUntil(
         caches.open(CACHE_NAME)

diff --git a/play/src/front/Network/ServiceWorker.ts b/play/src/front/Network/ServiceWorker.ts
@@ -3,6 +3,18 @@ import { NODE_ENV } from "../Enum/EnvironmentVariable";
 export class _ServiceWorker {
     constructor() {
         if ("serviceWorker" in navigator) {
+            if (navigator.storage && navigator.storage.persist) {
+                navigator.storage
+                    .persist()
+                    .then((persistent) => {
+                        if (persistent) {
+                            console.log("Storage will not be cleared except by explicit user action");
+                        } else {
+                            console.log("Storage may be cleared by the UA under storage pressure.");
+                        }
+                    })
+                    .catch((err) => console.error("_ServiceWorker => err", err));
+            }
             this.init();
         }
     }
@@ -11,7 +23,9 @@ export class _ServiceWorker {
         //Check node env and if is development, use service worker dev file
         if (NODE_ENV === "development") {
             navigator.serviceWorker
-                .register("/service-worker-dev.js")
+                .register(
+                    `/service-worker-dev.js?playUri=${window.location.protocol}//${window.location.host}${window.location.pathname}`
+                )
                 .then((serviceWorker) => {
                     console.info("Service Worker registered: ", serviceWorker);
                 })
@@ -21,7 +35,9 @@ export class _ServiceWorker {
             return;
         }
         navigator.serviceWorker
-            .register("/service-worker-prod.js")
+            .register(
+                `/service-worker-prod.js?playUri=${window.location.protocol}//${window.location.host}${window.location.pathname}`
+            )
             .then((serviceWorker) => {
                 console.info("Service Worker registered: ", serviceWorker);
             })

diff --git a/play/src/pusher/controllers/FrontController.ts b/play/src/pusher/controllers/FrontController.ts
@@ -79,7 +79,10 @@ export class FrontController extends BaseHttpController {
         });
 
         this.app.get("/static/images/favicons/manifest.json", (req: Request, res: Response) => {
-            return this.displayManifestJson(req, res, req.get("url"));
+            if (req.query.url == undefined) {
+                return res.status(500).send("playUrl is empty in query pramater of the request");
+            }
+            return this.displayManifestJson(req, res, req.query.url.toString());
         });
 
         this.app.get("/login", (req: Request, res: Response) => {