Adjust library to be used in Service Worker context without DOM globa…

…l variables Fixes vaadin/hilla#2867
vaadin · Nov 11, 2024 · aaed4b3 · aaed4b3
1 parent 9a14915
commit aaed4b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/packages/common-frontend/src/ConnectionIndicator.ts b/frontend/packages/common-frontend/src/ConnectionIndicator.ts
@@ -454,10 +454,10 @@ export class ConnectionIndicator extends LitElement {
 
   private timeoutFor(timeoutId: number, enabled: boolean, handler: () => void, delay: number): number {
     if (timeoutId !== 0) {
-      self.window.clearTimeout(timeoutId);
+      self.clearTimeout(timeoutId);
     }
 
-    return enabled ? self.window.setTimeout(handler, delay) : 0;
+    return enabled ? self.setTimeout(handler, delay) : 0;
   }
 
   static get instance(): ConnectionIndicator {

diff --git a/frontend/packages/common-frontend/src/ConnectionState.ts b/frontend/packages/common-frontend/src/ConnectionState.ts
@@ -143,7 +143,8 @@ export const isLocalhost = (hostname: string) => {
 const $wnd = self as any;
 if (!$wnd.Vaadin?.connectionState) {
   let online;
-  if (isLocalhost(self.window.location.hostname)) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (self.location && isLocalhost(self.location.hostname)) {
     // We do not know if we are online or not as we cannot trust navigator.onLine which checks availability of a network connection. Better to assume online so localhost apps can work
     online = true;
   } else {