srvx 0.5.0 → 0.5.1

package/dist/adapters/service-worker.mjs

@@ -2,7 +2,8 @@ import { w as wrapFetch } from '../shared/srvx.DhN4g5wJ.mjs';
 import { w as wrapFetchOnError } from '../shared/srvx.BD9sRkkl.mjs';
 
 const Response = globalThis.Response;
-const isMainThread = () => typeof navigator !== "undefined" && "serviceWorker" in navigator;
+const isBrowserWindow = typeof window !== "undefined" && typeof navigator !== "undefined";
+const isServiceWorker = typeof self !== "undefined" && "skipWaiting" in self;
 function serve(options) {
   return new ServiceWorkerServer(options);
 }
@@ -30,7 +31,12 @@ class ServiceWorkerServer {
   #fetchListener;
   #listeningPromise;
   serve() {
-    if (isMainThread()) {
+    if (isBrowserWindow) {
+      if (!navigator.serviceWorker) {
+        throw new Error(
+          "Service worker is not supported in the current window."
+        );
+      }
       const swURL = this.options.serviceWorker?.url;
       if (!swURL) {
         throw new Error(
@@ -41,28 +47,32 @@ class ServiceWorkerServer {
         type: "module",
         scope: this.options.serviceWorker?.scope
       }).then((registration) => {
-        registration.addEventListener("updatefound", () => {
+        if (registration.active) {
           location.replace(location.href);
-        });
+        } else {
+          registration.addEventListener("updatefound", () => {
+            location.replace(location.href);
+          });
+        }
+      });
+    } else if (isServiceWorker) {
+      this.#fetchListener = async (event) => {
+        if (/\/[^/]*\.[a-zA-Z0-9]+$/.test(new URL(event.request.url).pathname)) {
+          return;
+        }
+        const response = await this.fetch(event.request, event);
+        if (response.status !== 404) {
+          event.respondWith(response);
+        }
+      };
+      addEventListener("fetch", this.#fetchListener);
+      self.addEventListener("install", () => {
+        self.skipWaiting();
+      });
+      self.addEventListener("activate", () => {
+        self.clients?.claim?.();
       });
-      return;
     }
-    this.#fetchListener = async (event) => {
-      if (/\/[^/]*\.[a-zA-Z0-9]+$/.test(new URL(event.request.url).pathname)) {
-        return;
-      }
-      const response = await this.fetch(event.request, event);
-      if (response.status !== 404) {
-        event.respondWith(response);
-      }
-    };
-    addEventListener("fetch", this.#fetchListener);
-    globalThis.addEventListener("install", () => {
-      globalThis.skipWaiting();
-    });
-    globalThis.addEventListener("activate", (event) => {
-      event.waitUntil(globalThis.clients?.claim?.());
-    });
   }
   ready() {
     return Promise.resolve(this.#listeningPromise).then(() => this);
@@ -71,15 +81,15 @@ class ServiceWorkerServer {
     if (this.#fetchListener) {
       removeEventListener("fetch", this.#fetchListener);
     }
-    if (isMainThread()) {
+    if (isBrowserWindow) {
       const registrations = await navigator.serviceWorker.getRegistrations();
       for (const registration of registrations) {
         if (registration.active) {
           await registration.unregister();
         }
       }
-    } else {
-      await globalThis.registration.unregister();
+    } else if (isServiceWorker) {
+      await self.registration.unregister();
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "srvx",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Universal Server API based on web platform standards. Works seamlessly with Deno, Bun and Node.js.",
   "repository": "h3js/srvx",
   "homepage": "https://srvx.h3.dev",
@@ -59,6 +59,7 @@
     "@types/bun": "^1.2.10",
     "@types/deno": "^2.2.0",
     "@types/node": "^22.14.1",
+    "@types/serviceworker": "^0.0.132",
     "@vitest/coverage-v8": "^3.1.2",
     "automd": "^0.4.0",
     "changelogen": "^0.6.1",