@networkpro/web 1.5.1 → 1.5.2

package/README.md

@@ -5,6 +5,10 @@
 
  
 
+[![Netlify Status](https://api.netlify.com/api/v1/badges/93910633-3fdb-4bb3-a9bf-5d91ccfeebf9/deploy-status)](https://app.netlify.com/projects/networkpro-web/deploys) [![NPM Version](https://img.shields.io/npm/v/%40networkpro%2Fweb?registry_uri=https%3A%2F%2Fregistry.npmjs.com&style=flat&logo=npm&logoSize=auto&color=%23CB3837)](https://www.npmjs.com/package/@networkpro/web) [![Build and Publish to Registries](https://github.com/netwk-pro/netwk-pro.github.io/actions/workflows/build-and-publish.yml/badge.svg)](https://github.com/netwk-pro/netwk-pro.github.io/actions/workflows/build-and-publish.yml)  
+[![Code Style: Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat)](https://github.com/prettier/prettier) [![stylelint](https://img.shields.io/badge/stylelint-%23747474?style=flat&logo=stylelint&logoSize=auto&labelColor=%23263238)](https://stylelint.io/)
+[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/netwk-pro/netwk-pro.github.io/blob/master/CODE_OF_CONDUCT.md)
+
 ## 🚀 Project Overview
 
 This is the official web presence for **[Network Pro Strategies](https://netwk.pro/about)**, a privacy-forward consultancy specializing in network engineering, information security, and public advocacy focused on cybersecurity and digital privacy.
@@ -71,8 +75,6 @@ npm -v
 
 ---
 
- 
-
 ## 📜 Available Scripts
 
 The following CLI commands are available via `npm run <script>` or `pnpm run <script>`.
@@ -171,8 +173,6 @@ The following CLI commands are available via `npm run <script>` or `pnpm run <sc
 
 ---
 
-&nbsp;
-
 ## 🧾 License
 
 This project is licensed under:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@networkpro/web",
   "private": false,
   "sideEffects": false,
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Locking Down Networks, Unlocking Confidence | Security, Networking, Privacy — Network Pro Strategies",
   "keywords": [
     "advisory",

package/src/app.html

@@ -65,16 +65,6 @@
       if (location.search.includes("nosw")) {
         window.__DISABLE_SW__ = true;
         console.warn("🧪 Service worker disabled via ?nosw flag in URL.");
-
-        if ("serviceWorker" in navigator) {
-          navigator.serviceWorker.getRegistrations().then((registrations) => {
-            for (const registration of registrations) {
-              registration.unregister().then((success) => {
-                console.log("🧹 SW unregistered:", success);
-              });
-            }
-          });
-        }
       }
     </script>
 

package/src/lib/registerServiceWorker.js

@@ -10,50 +10,60 @@ This file is part of Network Pro.
  * browser/environment compatibility checks. This supports offline usage and PWA behavior.
  */
 export function registerServiceWorker() {
-  const disableSW = window?.__DISABLE_SW__ || false;
+  const disableSW =
+    window?.__DISABLE_SW__ || location.search.includes("nosw");
 
   if (disableSW) {
     console.warn("⚠️ Service Worker registration disabled via diagnostic mode.");
+
+    if ('serviceWorker' in navigator) {
+      navigator.serviceWorker.getRegistrations().then((registrations) => {
+        for (const registration of registrations) {
+          registration.unregister().then((success) => {
+            console.log("🧹 SW unregistered from registerServiceWorker.js:", success);
+          });
+        }
+      });
+    }
+
     return;
   }
 
   if ('serviceWorker' in navigator) {
-    // Skip registration in Firefox during development
+    // Optional: skip for Firefox in dev
     const isFirefox = navigator.userAgent.includes('Firefox');
     const isDevelopment =
-      window.location.hostname === 'localhost' ||
-      window.location.hostname === '127.0.0.1';
+      location.hostname === 'localhost' || location.hostname === '127.0.0.1';
 
     if (isFirefox && isDevelopment) {
-      console.log('Service Worker registration skipped in Firefox development mode');
+      console.log('🛑 SW registration skipped in Firefox development mode');
       return;
     }
 
-    // Wait until after full page load for performance optimization
     window.addEventListener('load', () => {
       navigator.serviceWorker
         .register('service-worker.js')
         .then((registration) => {
-          console.log('Service Worker registered with scope:', registration.scope);
+          console.log('✅ Service Worker registered with scope:', registration.scope);
 
-          // Track installation of a new service worker
           registration.addEventListener('updatefound', () => {
             const newWorker = registration.installing;
-            console.log('New service worker installing...');
+            console.log('[SW-CLIENT] New service worker installing...');
 
             if (!newWorker) return;
 
             let updatePrompted = false;
 
             newWorker.addEventListener('statechange', () => {
+              console.log('[SW-CLIENT] New worker state:', newWorker.state);
+
               if (
                 newWorker.state === 'installed' &&
                 navigator.serviceWorker.controller &&
                 !updatePrompted
               ) {
                 updatePrompted = true;
-
-                // Custom prompt: ask user to reload for latest content
+                console.log('[SW-CLIENT] New SW installed. Prompting user to reload.');
                 if (confirm('New content is available. Reload to update?')) {
                   window.location.reload();
                 }
@@ -62,19 +72,18 @@ export function registerServiceWorker() {
           });
         })
         .catch((error) => {
-          console.error('Service Worker registration failed:', error);
+          console.error('❌ Service Worker registration failed:', error);
         });
 
-      // Ensure the page reloads automatically when the new service worker takes control
       let refreshing = false;
       navigator.serviceWorker.addEventListener('controllerchange', () => {
+        console.log('[SW-CLIENT] Controller changed.');
         if (!refreshing) {
           refreshing = true;
           window.location.reload();
         }
       });
 
-      // Optional PWA install prompt logic
       window.addEventListener('beforeinstallprompt', (e) => {
         e.preventDefault();
         window.dispatchEvent(new CustomEvent('pwa-install-available', {

package/src/routes/+layout.js

@@ -21,9 +21,6 @@ const fallbackMeta = {
     "Locking Down Networks, Unlocking Confidence™ | Security, Networking, Privacy — Network Pro™",
 };
 
-import { browser } from "$app/environment";
-import { registerServiceWorker } from "$lib/registerServiceWorker.js";
-
 export const prerender = "auto";
 export const trailingSlash = "never";
 
@@ -34,11 +31,6 @@ export const trailingSlash = "never";
 export function load({ url }) {
   const normalizedPathname = url.pathname.replace(/\/+$/, "") || "/";
 
-  if (browser) {
-    // Move service worker registration here
-    registerServiceWorker();
-  }
-
   return {
     pathname: normalizedPathname,
     meta: fallbackMeta, // Required to ensure meta always exists for typing

package/src/routes/+layout.svelte

@@ -13,6 +13,8 @@ This file is part of Network Pro.
   import HeaderDefault from "$lib/components/layout/HeaderDefault.svelte";
   import HeaderHome from "$lib/components/layout/HeaderHome.svelte";
   import PWAInstallButton from "$lib/components/PWAInstallButton.svelte";
+  import { onMount } from "svelte";
+  import { registerServiceWorker } from "$lib/registerServiceWorker.js";
   import { browser } from "$app/environment";
   import "$lib/styles";
 
@@ -22,6 +24,10 @@ This file is part of Network Pro.
   import faviconSvg from "$lib/img/favicon.svg";
   import appleTouchIcon from "$lib/img/icon-180x180.png";
 
+  onMount(() => {
+    registerServiceWorker();
+  });
+
   if (browser) {
     // Preload logo images
     [logoPng, logoWbp].forEach((src) => {

package/src/service-worker.js

@@ -18,28 +18,28 @@ const CACHE = `cache-${version}`;
 /** @type {string[]} */
 const excludedAssets = [];
 
+const IGNORE_PATHS = new Set([
+  "/img/banner-1280x640.png",
+  "/img/banner-og-1200x630.png",
+  "/img/logo-transparent.png",
+  "/img/logo.png",
+  "/img/svelte.png",
+  "/webfonts/fa-brands-400.ttf",
+  "/webfonts/fa-solid-900.ttf",
+  "/robots.txt",
+  "/screenshots/desktop-foss.png",
+  "/sitemap.xml",
+  "/CNAME",
+]);
+
 /** @type {string[]} */
-const ASSETS = Array.from(
-  new Set(
+const ASSETS = [
+  ...new Set(
     [...build, ...files, "/offline.html"].filter((path) => {
       try {
         const url = new URL(path, location.origin);
         const hostname = url.hostname;
 
-        const IGNORE_PATHS = new Set([
-          "/img/banner-1280x640.png",
-          "/img/banner-og-1200x630.png",
-          "/img/logo-transparent.png",
-          "/img/logo.png",
-          "/img/svelte.png",
-          "/webfonts/fa-brands-400.ttf",
-          "/webfonts/fa-solid-900.ttf",
-          "/robots.txt",
-          "/screenshots/desktop-foss.png",
-          "/sitemap.xml",
-          "/CNAME",
-        ]);
-
         const shouldExclude =
           path.startsWith("http") ||
           disallowedHosts.some(
@@ -56,23 +56,24 @@ const ASSETS = Array.from(
       }
     }),
   ),
-);
+];
 
 const uniqueExcludedAssets = [...new Set(excludedAssets)].sort();
 
 console.log("[SW] Assets to precache:", ASSETS);
 console.log("[SW] Excluded assets:", uniqueExcludedAssets);
 
-/**
- * @param {ExtendableEvent} event
- */
+// 🔹 Install event
 sw.addEventListener("install", (event) => {
+  console.log("[SW] Install event");
   event.waitUntil(
     (async () => {
       const cache = await caches.open(CACHE);
       try {
         await cache.addAll(ASSETS);
+        console.log("[SW] Precaching complete");
         sw.skipWaiting();
+        console.log("[SW] skipWaiting() called");
       } catch (err) {
         console.warn("[SW] Failed to precache some assets:", err);
       }
@@ -80,23 +81,26 @@ sw.addEventListener("install", (event) => {
   );
 });
 
-/**
- * @param {ExtendableEvent} event
- */
+// 🔹 Activate event
 sw.addEventListener("activate", (event) => {
-  /** @type {ExtendableEvent} */ (event).waitUntil(
+  console.log("[SW] Activate event");
+  event.waitUntil(
     (async () => {
       const tasks = [];
 
       if (sw.registration.navigationPreload) {
         tasks.push(sw.registration.navigationPreload.enable());
+        console.log("[SW] Navigation preload enabled");
       }
 
       tasks.push(
         caches.keys().then((keys) =>
           Promise.all(
             keys.map((key) => {
-              if (key !== CACHE) return caches.delete(key);
+              if (key !== CACHE) {
+                console.log("[SW] Deleting old cache:", key);
+                return caches.delete(key);
+              }
             }),
           ),
         ),
@@ -104,29 +108,43 @@ sw.addEventListener("activate", (event) => {
 
       await Promise.all(tasks);
       await sw.clients.claim();
+      console.log("[SW] clients.claim() called");
+      console.log("[SW] Scope:", sw.registration.scope);
     })(),
   );
 });
 
-/**
- * @param {FetchEvent} event
- */
+// 🔹 Fetch event
 sw.addEventListener("fetch", (event) => {
-  /** @type {FetchEvent} */ (event).respondWith(
+  console.log("[SW] Fetch intercepted:", event.request.url);
+  event.respondWith(
     (async () => {
       if (new URL(event.request.url).origin === location.origin) {
         const cached = await caches.match(event.request);
-        if (cached) return cached;
+        if (cached) {
+          console.log("[SW] Serving from cache:", event.request.url);
+          return cached;
+        }
       }
 
       try {
         if (event.request.mode === "navigate") {
           const preloadResponse = await event.preloadResponse;
-          if (preloadResponse) return preloadResponse;
+          if (preloadResponse) {
+            console.log("[SW] Using preload response for:", event.request.url);
+            return preloadResponse;
+          }
         }
 
+        console.log("[SW] Fetching from network:", event.request.url);
         return await fetch(event.request);
-      } catch {
+      } catch (err) {
+        console.warn(
+          "[SW] Fetch failed; offline fallback used:",
+          event.request.url,
+          err,
+        );
+
         if (event.request.mode === "navigate") {
           const offline = await caches.match("/offline.html");
           if (offline) return offline;