feat(service): Now express app can be mounted even if sw is already a…

…ctive
jjak0b · Mar 24, 2021 · 3eb235e · 3eb235e
1 parent 9f6cba8
commit 3eb235e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/service.js b/src/service.js
@@ -24,6 +24,17 @@ class Server {
     this.serverApp = express();
     this.port = 80;
     this.registerService();
+
+    this.promiseMount
+      .then( (app) => {
+        if(!this.mountUrl) {
+          this.mountUrl = new Url( self.registration.scope );
+        }
+        let mountPath = this.mountUrl.pathname;
+        this.serverApp.all( "*", mountExpressAt( mountPath ) );
+        this.serverApp.use( this.mountUrl.pathname, app )
+        debug("Mounted app @", this.mountUrl.toString() );
+      })
   }
 
   registerService() {
@@ -46,14 +57,7 @@ class Server {
     this.mountUrl = new Url( self.registration.scope );
     let mountPath = this.mountUrl.pathname;
 
-    this.serverApp.all( "*", mountExpressAt( mountPath ) );
     debug('installed at mount: \"%s\"', mountPath, self.registration );
-
-    this.promiseMount
-      .then( (app) => {
-        this.serverApp.use( this.mountUrl.pathname, app )
-        debug("Mounted app @", this.mountUrl.toString() );
-      })
   }
 
   onActivate(event) {