@swoff/cli 0.3.13 → 0.3.14

package/dist/runtime/sw-injector.js

@@ -1,103 +1,21 @@
-import { T, R } from "./utils.js";
+import { R } from "./utils.js";
 export function generateSwInjectorCode(ctx) {
-    const { ext, ts, autoUpdate, autoActivate, versionEnabled, swFilename } = ctx;
-    if (!versionEnabled) {
-        return `/**
- * Swoff SW Injector (Simple Mode)
- * Fixed SW URL with hash-based cache name — no versioned URLs or update events.
- *
- * Usage:
- *   import { initServiceWorker } from './swoff/sw/injector.${ext}';
- *   initServiceWorker();
- *
- * Window events:
- *   sw-ready  - SW active and controlling page
- *   sw-error  - SW registration failed
- *
- * Window properties:
- *   window.currentSWVersion  - "simple"
- *   window.swReady           - SW is active
- *   window.swError           - Registration failed
- */
-async function waitForController()${R(ts, "Promise<void>")}{
-  return new Promise<void>((resolve) => {
-    if (navigator.serviceWorker.controller) {
-      resolve();
-    } else {
-      const timeout = setTimeout(() => resolve(), 30000);
-      navigator.serviceWorker.addEventListener("controllerchange", () => {
-        clearTimeout(timeout);
-        resolve();
-      }, { once: true });
-    }
-  });
-}
-
-/** Register the SW with a fixed URL (non-versioned mode). Dispatches sw-ready/sw-error. */
-export async function initServiceWorker()${R(ts, "Promise<void>")}{
-  if (!("serviceWorker" in navigator)) {
-    console.warn("Service Workers not supported");
-    return;
-  }
-  try {
-    const registration = await navigator.serviceWorker.register("/${swFilename}.js");
-    window.currentSWVersion = "simple";
-    window.dispatchEvent(new CustomEvent("sw-version-detected"));
-    await waitForController();
-    window.dispatchEvent(new CustomEvent("sw-ready"));
-  } catch (error) {
-    console.error("Service Worker registration failed:", error);
-    window.swError = true;
-    window.dispatchEvent(new CustomEvent("sw-error"));
-  }
-}
-`;
-    }
+    const { ext, ts, autoActivate, swFilename } = ctx;
     return `/**
  * Swoff SW Injector
- * Framework-agnostic SW registration with versioned URLs and update flow.
+ * Registers the service worker and tracks installation progress.
  *
  * Usage:
  *   import { initServiceWorker } from './swoff/sw/injector.${ext}';
  *   initServiceWorker();
  *
  * Window events:
- *   sw-version-detected  - Version info available on window
- *   sw-update-available  - New version ready for user consent (detail: { version })
  *   sw-progress          - Download progress (detail: { percent, downloaded, total })
  *   sw-ready             - SW active and controlling page
  *   sw-error             - SW registration failed
- *
- * Window properties:
- *   window.latestSWVersion       - Latest version from version.json
- *   window.currentSWVersion      - Active SW version
- *   window.swAvailableVersion    - Pending update version
- *   window.swUpdateRequired      - Forced update needed (version < minSupportedVersion)
- *   window.swMinSupportedVersion - Minimum supported version
- *   window.swReady               - SW is active
- *   window.swError               - Registration failed
  */
-const AUTO_UPDATE = ${autoUpdate};
 const AUTO_ACTIVATE = ${autoActivate};
 
-function semverCompare(a${T(ts, "string")}, b${T(ts, "string")})${R(ts, "number")}{
-  const pa = a.split('.').map(Number);
-  const pb = b.split('.').map(Number);
-  for (let i = 0; i < 3; i++) {
-    if (pa[i] > pb[i]) return 1;
-    if (pa[i] < pb[i]) return -1;
-  }
-  return 0;
-}
-
-async function checkForUpdate() {
-  const response = await fetch("/version.json?t=" + Date.now());
-  if (!response.ok) {
-    throw new Error("Failed to fetch version.json");
-  }
-  return response.json();
-}
-
 async function waitForController()${R(ts, "Promise<void>")}{
   return new Promise<void>((resolve) => {
     if (navigator.serviceWorker.controller) {
@@ -112,19 +30,7 @@ async function waitForController()${R(ts, "Promise<void>")}{
   });
 }
 
-async function doRegisterServiceWorker(version${T(ts, "string")})${R(ts, "Promise<ServiceWorkerRegistration>")}{
-  const swUrl = \`/sw-v\${version}.js\`;
-  const registration = await navigator.serviceWorker.register(swUrl);
-  localStorage.setItem("swRegisteredVersion", version);
-  window.currentSWVersion = version;
-  window.swRegisteredVersion = version;
-  window.dispatchEvent(new CustomEvent("sw-version-detected"));
-  await waitForController();
-  window.dispatchEvent(new CustomEvent("sw-ready"));
-  return registration;
-}
-
-/** Register the SW with version checking and update flow. Checks version.json, handles updates, and dispatches sw-ready/sw-error events. */
+/** Register the SW. The browser detects updates by comparing SW file bytes. */
 export async function initServiceWorker()${R(ts, "Promise<void>")}{
   if (!("serviceWorker" in navigator)) {
     console.warn("Service Workers not supported");
@@ -132,98 +38,33 @@ export async function initServiceWorker()${R(ts, "Promise<void>")}{
   }
 
   try {
-    const manifest = await checkForUpdate();
-    const currentVersion = localStorage.getItem("swRegisteredVersion");
-    window.latestSWVersion = manifest.version;
-    window.swMinSupportedVersion = manifest.minSupportedVersion || "0.0.0";
-
-    if (currentVersion === manifest.version) {
-      const registration = await navigator.serviceWorker.getRegistration();
-      if (registration && registration.active) {
-        window.currentSWVersion = currentVersion ?? undefined;
-        window.dispatchEvent(new CustomEvent("sw-version-detected"));
-        await waitForController();
-        if (!window.swReady) {
-          window.dispatchEvent(new CustomEvent("sw-ready"));
-        }
-      }
-    } else if (currentVersion && currentVersion !== manifest.version) {
-      window.swAvailableVersion = manifest.version;
-      window.swUpdateRequired =
-        semverCompare(currentVersion, manifest.minSupportedVersion || "0.0.0") < 0;
+    const registration = await navigator.serviceWorker.register("/${swFilename}.js");
 
-      if (AUTO_UPDATE) {
-        const registration = await navigator.serviceWorker.getRegistration();
-        if (registration && registration.waiting) {
+    var swReadyDispatched = false;
+    if (registration.installing) {
+      const installingWorker = registration.installing;
+      installingWorker.addEventListener("statechange", () => {
+        if (installingWorker.state === "installed") {
           if (AUTO_ACTIVATE) {
-            registration.waiting.postMessage({ type: "SKIP_WAITING" });
-          } else {
-            window.dispatchEvent(
-              new CustomEvent("sw-update-available", {
-                detail: { version: manifest.version },
-              })
-            );
-          }
-        } else {
-          const newReg = await doRegisterServiceWorker(manifest.version);
-          if (AUTO_ACTIVATE && newReg.waiting) {
-            newReg.waiting.postMessage({ type: "SKIP_WAITING" });
-          } else {
-            window.dispatchEvent(
-              new CustomEvent("sw-update-available", {
-                detail: { version: manifest.version },
-              })
-            );
+            registration.waiting?.postMessage({ type: "SKIP_WAITING" });
           }
-        }
-      } else {
-        window.dispatchEvent(
-          new CustomEvent("sw-update-available", {
-            detail: { version: manifest.version },
-          })
-        );
-      }
-    } else {
-      await doRegisterServiceWorker(manifest.version);
-    }
-  } catch (error) {
-    try {
-      const existing = await navigator.serviceWorker.getRegistration();
-      if (existing && existing.active) {
-        window.currentSWVersion = localStorage.getItem("swRegisteredVersion") || "unknown";
-        window.dispatchEvent(new CustomEvent("sw-version-detected"));
-        await waitForController();
-        if (!window.swReady) {
+          swReadyDispatched = true;
           window.dispatchEvent(new CustomEvent("sw-ready"));
         }
-        return;
-      }
-    } catch {
-      // Handle the case where no existing active registration is found
+      });
     }
 
-    console.error("Service Worker initialization failed:", error);
+    await waitForController();
+    if (!swReadyDispatched) {
+      window.dispatchEvent(new CustomEvent("sw-ready"));
+    }
+  } catch (error) {
+    console.error("Service Worker registration failed:", error);
     window.swError = true;
     window.dispatchEvent(new CustomEvent("sw-error"));
   }
 }
 
-/** Accept a pending SW update. Reloads the page once the new SW takes control. */
-export async function handleUpdateApproved(newVersion${T(ts, "string")})${R(ts, "Promise<void>")}{
-  const registration = await navigator.serviceWorker.getRegistration();
-  if (registration && registration.waiting) {
-    registration.waiting.postMessage({ type: "SKIP_WAITING" });
-    registration.addEventListener("controllerchange", () => {
-      window.location.reload();
-    });
-  } else {
-    await doRegisterServiceWorker(newVersion);
-    navigator.serviceWorker.addEventListener("controllerchange", () => {
-      window.location.reload();
-    });
-  }
-}
-
 /** Activate a waiting SW without reloading. Useful when you handle the transition yourself. */
 export async function skipWaiting()${R(ts, "Promise<void>")}{
   const registration = await navigator.serviceWorker.ready;

package/dist/runtime/sw-injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"sw-injector.js","sourceRoot":"","sources":["../../src/runtime/sw-injector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAElC,MAAM,UAAU,sBAAsB,CACpC,GAAiH;IAEjH,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAE9E,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO;;;;;8DAKmD,GAAG;;;;;;;;;;;;oCAY7B,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;;;;;;;;;2CAef,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;oEAMG,UAAU;;;;;;;;;;;CAW7E,CAAC;IACA,CAAC;IAED,OAAO;;;;;8DAKqD,GAAG;;;;;;;;;;;;;;;;;;;sBAmB3C,UAAU;wBACR,YAAY;;0BAEV,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC;;;;;;;;;;;;;;;;;;oCAkB7C,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;;;;;;;;gDAcV,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,oCAAoC,CAAC;;;;;;;;;;;;;2CAanE,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uDAoFV,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;;;;;;;;;;qCAgB3D,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;CAM1D,CAAC;AACF,CAAC"}
+{"version":3,"file":"sw-injector.js","sourceRoot":"","sources":["../../src/runtime/sw-injector.ts"],"names":[],"mappings":"AACA,OAAO,EAAK,CAAC,EAAE,MAAM,YAAY,CAAC;AAElC,MAAM,UAAU,sBAAsB,CACpC,GAAmE;IAEnE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;IAElD,OAAO;;;;;8DAKqD,GAAG;;;;;;;;wBAQzC,YAAY;;oCAEA,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;;;;;;;;;2CAef,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;;oEAOG,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA4BzC,CAAC,CAAC,EAAE,EAAE,eAAe,CAAC;;;;;;CAM1D,CAAC;AACF,CAAC"}

package/dist/runtime/sw-version.js

@@ -0,0 +1,13 @@
+export function generateSwVersionCode(ctx) {
+    return `/**
+ * Swoff SW Version
+ *
+ * Developer-editable version used for SW URL and cache naming.
+ * - "package" mode:  The build script overwrites this from package.json
+ * - "manual" mode:   Edit this file directly to bump the version
+ * - "hash" mode:     Not used (SW URL is fixed, cache is content-addressed)
+ */
+export const SW_VERSION = ${JSON.stringify(ctx.version)};
+`;
+}
+//# sourceMappingURL=sw-version.js.map

package/dist/runtime/sw-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sw-version.js","sourceRoot":"","sources":["../../src/runtime/sw-version.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CACnC,GAAyC;IAEzC,OAAO;;;;;;;;4BAQmB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC;CACtD,CAAC;AACF,CAAC"}