@networkpro/web 1.1.3 → 1.4.2

package/src/routes/+layout.svelte

@@ -12,8 +12,8 @@ This file is part of Network Pro.
   import Footer from "$lib/components/layout/Footer.svelte";
   import HeaderDefault from "$lib/components/layout/HeaderDefault.svelte";
   import HeaderHome from "$lib/components/layout/HeaderHome.svelte";
+  import PWAInstallButton from "$lib/components/PWAInstallButton.svelte";
   import { browser } from "$app/environment";
-  // TODO: Testing in progress
   import { registerServiceWorker } from "$lib/registerServiceWorker.js";
   import "$lib/styles";
 
@@ -47,7 +47,6 @@ This file is part of Network Pro.
     // Preload Apple Touch icon
     touchImg.src = appleTouchIcon;
 
-    // TODO: Testing in progress
     // Register the service worker
     registerServiceWorker();
   }
@@ -92,9 +91,11 @@ This file is part of Network Pro.
     {#if data.pathname === "/"}
       <!-- Render the Home Header for the root route -->
       <HeaderHome />
+      <PWAInstallButton />
     {:else}
       <!-- Render the Default Header for all other routes -->
       <HeaderDefault />
+      <PWAInstallButton />
     {/if}
   </ContainerSection>
 </header>

package/src/service-worker.js

@@ -8,25 +8,71 @@ This file is part of Network Pro.
 /** @type {ServiceWorkerGlobalScope} */
 const sw = self;
 
+const disallowedHosts = ["licdn.com", "googletagmanager.com"];
+
 import { build, files, version } from "$service-worker";
 
 /** @type {string} */
 const CACHE = `cache-${version}`;
 
 /** @type {string[]} */
-const ASSETS = Array.from(new Set([...build, ...files, "/offline.html"]));
+const excludedAssets = [];
+
+/** @type {string[]} */
+const ASSETS = Array.from(
+  new Set(
+    [...build, ...files, "/offline.html"].filter((path) => {
+      try {
+        const url = new URL(path, location.origin);
+        const hostname = url.hostname;
+
+        const shouldExclude =
+          path.startsWith("http") ||
+          disallowedHosts.some(
+            (host) => hostname === host || hostname.endsWith(`.${host}`),
+          ) ||
+          [
+            "/img/banner-1280x640.png",
+            "/img/banner-og-1200x630.png",
+            "/img/logo-transparent.png",
+            "/img/logo.png",
+            "/img/svelte.png",
+            "/robots.txt",
+            "/screenshots/desktop-foss.png",
+            "/sitemap.xml",
+            "/CNAME",
+          ].includes(path);
+
+        if (shouldExclude) excludedAssets.push(path);
+        return !shouldExclude;
+      } catch (err) {
+        console.warn("[SW] URL parse failed, skipping path:", path, err);
+        excludedAssets.push(path);
+        return true;
+      }
+    }),
+  ),
+);
 
-console.log("[SW] Assets to cache:", ASSETS); // Helps debug duplicates
+const uniqueExcludedAssets = [...new Set(excludedAssets)].sort();
+
+console.log("[SW] Assets to precache:", ASSETS);
+console.log("[SW] Excluded assets:", uniqueExcludedAssets);
 
 /**
  * @param {ExtendableEvent} event
  */
 sw.addEventListener("install", (event) => {
-  /** @type {ExtendableEvent} */ (event).waitUntil(
-    caches
-      .open(CACHE)
-      .then((cache) => cache.addAll(ASSETS))
-      .then(() => sw.skipWaiting()),
+  event.waitUntil(
+    (async () => {
+      const cache = await caches.open(CACHE);
+      try {
+        await cache.addAll(ASSETS);
+        sw.skipWaiting();
+      } catch (err) {
+        console.warn("[SW] Failed to precache some assets:", err);
+      }
+    })(),
   );
 });
 
@@ -64,8 +110,10 @@ sw.addEventListener("activate", (event) => {
 sw.addEventListener("fetch", (event) => {
   /** @type {FetchEvent} */ (event).respondWith(
     (async () => {
-      const cached = await caches.match(event.request);
-      if (cached) return cached;
+      if (new URL(event.request.url).origin === location.origin) {
+        const cached = await caches.match(event.request);
+        if (cached) return cached;
+      }
 
       try {
         if (event.request.mode === "navigate") {

package/static/manifest.json

@@ -1,10 +1,15 @@
 {
+  "id": "/",
+  "start_url": "/?utm_source=homescreen",
+  "scope": "/",
   "name": "Network Pro Strategies",
   "short_name": "Network Pro",
   "description": "Access our expert cybersecurity services anytime, anywhere with our streamlined Progressive Web App. Optimized for speed, security, and mobile use, this app offers a seamless experience to explore our solutions, view project highlights, and get in touch—all in one place.",
-  "start_url": "/?utm_source=homescreen",
+  "lang": "en-US",
+  "dir": "ltr",
   "display": "standalone",
   "display_override": ["window-controls-overlay", "minimal-ui"],
+  "orientation": "any",
   "background_color": "#191919",
   "theme_color": "#ffc627",
   "icons": [
@@ -22,7 +27,7 @@
       "src": "/icon-512x512-maskable.png",
       "type": "image/png",
       "sizes": "512x512",
-      "purpose": "maskable"
+      "purpose": "any maskable"
     },
     {
       "src": "/icon-splash.png",
@@ -30,6 +35,8 @@
       "sizes": "512x512"
     }
   ],
+  "categories": ["business", "security", "technology", "network", "privacy"],
+  "prefer_related_applications": false,
   "screenshots": [
     {
       "src": "/screenshots/desktop-home.png",
@@ -60,9 +67,6 @@
       "label": "FOSS Spotlight on mobile"
     }
   ],
-  "orientation": "any",
-  "scope": "/",
-  "categories": ["business", "security", "technology", "network", "privacy"],
   "shortcuts": [
     {
       "name": "Consulting Services",

package/static/robots.txt

@@ -6,7 +6,22 @@
 # www.robotstxt.org/
 
 User-agent: *
-Disallow: *.jsonc$
-Disallow: *.json$
-Disallow: *.mjs$
-Disallow: *.js$
+
+# Disallow dev and CI/CD artifacts
+Disallow: /tests/
+Disallow: /scripts/
+Disallow: /playwright-report/
+Disallow: /reports/
+Disallow: /coverage/
+Disallow: /build/
+Disallow: /.lighthouseci/
+
+# Disallow stub routes that redirect externally
+Disallow: /contact
+Disallow: /privacy-rights
+
+# Allow everything else
+Allow: /
+
+# Inform bots where to find the sitemap
+Sitemap: https://netwk.pro/sitemap.xml

package/tests/{app.spec.js → e2e/app.spec.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-src/app.spec.js
+tests/e2e/app.spec.js
 
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
 This file is part of Network Pro.

package/tests/{mobile.spec.js → e2e/mobile.spec.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-src/mobile.spec.js
+tests/e2e/mobile.spec.js
 
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
 This file is part of Network Pro.

package/tests/unit/auditScripts.test.js

@@ -0,0 +1,42 @@
+/* ==========================================================================
+tests/unit/auditScripts.test.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== */
+
+/**
+ * Unit test for scripts/auditScripts.js
+ */
+
+import fs from "fs";
+import path from "path";
+import { describe, expect, it } from "vitest";
+
+describe("auditScripts.js", () => {
+  it("should identify untested scripts correctly", () => {
+    const scriptsDir = path.resolve("./scripts");
+    const testsDir = path.resolve("./tests");
+
+    const allowList = new Set(["checkNode.js", "auditScripts.js"]);
+
+    const scriptFiles = fs
+      .readdirSync(scriptsDir)
+      .filter((file) => file.endsWith(".js"));
+
+    const testFiles = fs
+      .readdirSync(testsDir)
+      .filter((file) => file.endsWith(".test.js") || file.endsWith(".spec.js"));
+
+    const testedModules = new Set(
+      testFiles.map((f) => f.replace(/\.test\.js$|\.spec\.js$/, "")),
+    );
+
+    const untested = scriptFiles.filter((file) => {
+      const base = file.replace(/\.js$/, "");
+      return !allowList.has(file) && !testedModules.has(base);
+    });
+
+    expect(untested).not.toContain("auditScripts.js");
+  });
+});

package/tests/unit/checkEnv.test.js

@@ -0,0 +1,48 @@
+/* ==========================================================================
+tests/unit/checkEnv.test.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== */
+
+/**
+ * Unit test for scripts/checkEnv.js
+ */
+
+import { afterEach, describe, expect, it } from "vitest";
+import { checkEnv } from "../../scripts/checkEnv.js";
+
+describe("checkEnv()", () => {
+  const originalEnv = process.env.ENV_MODE;
+
+  afterEach(() => {
+    if (originalEnv === undefined) {
+      delete process.env.ENV_MODE;
+    } else {
+      process.env.ENV_MODE = originalEnv;
+    }
+  });
+
+  it("should default to 'dev' if ENV_MODE is not set", () => {
+    delete process.env.ENV_MODE;
+    const result = checkEnv();
+    expect(result.mode).toBe("dev");
+    expect(result.valid).toBe(true);
+    expect(result.wasDefaulted).toBe(true);
+  });
+
+  it("should validate a correct ENV_MODE", () => {
+    process.env.ENV_MODE = "ci";
+    const result = checkEnv();
+    expect(result.mode).toBe("ci");
+    expect(result.valid).toBe(true);
+    expect(result.wasDefaulted).toBe(false);
+  });
+
+  it("should return invalid for an unknown ENV_MODE", () => {
+    process.env.ENV_MODE = "banana";
+    const result = checkEnv();
+    expect(result.valid).toBe(false);
+    expect(result.allowed).toContain("dev");
+  });
+});

package/tests/unit/checkVersions.test.js

@@ -0,0 +1,24 @@
+/* ==========================================================================
+tests/unit/checkVersions.test.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== */
+
+/**
+ * Unit test for scripts/checkVersions.js
+ */
+
+import { describe, expect, it } from "vitest";
+import { checkVersions } from "../../scripts/checkVersions.js";
+
+describe("checkVersions()", () => {
+  it("should match current Node and NPM versions to engine ranges", () => {
+    const result = checkVersions();
+
+    expect(result.nodeVersion).toMatch(/^v\d+\.\d+\.\d+$/);
+    expect(result.npmVersion).toMatch(/^\d+\.\d+\.\d+$/);
+    expect(result.nodeValid).toBe(true);
+    expect(result.npmValid).toBe(true);
+  });
+});

package/{src/demo.spec.js → tests/unit/demo.test.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-src/demo.spec.js
+tests/unit/demo.spec.js
 
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
 This file is part of Network Pro.

package/{src → tests/unit}/routes/page.svelte.test.js

@@ -1,5 +1,5 @@
 /* ==========================================================================
-src/routes/page.svelte.test.js
+tests/unit/routes/page.svelte.test.js
 
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
 This file is part of Network Pro.
@@ -8,7 +8,7 @@ This file is part of Network Pro.
 import "@testing-library/jest-dom/vitest";
 import { render, screen } from "@testing-library/svelte";
 import { describe, expect, test } from "vitest";
-import Page from "./+page.svelte";
+import Page from "../../../src/routes/+page.svelte";
 
 describe("/+page.svelte", () => {
   test("should render the home page section", () => {

package/vite.config.js

@@ -1,3 +1,10 @@
+/* =========================================================================
+vite.config.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================= */
+
 import { sveltekit } from "@sveltejs/kit/vite";
 import { defineConfig } from "vite";
 import lightningcssPlugin from "vite-plugin-lightningcss";

package/vitest.config.client.js

@@ -1,3 +1,10 @@
+/* =========================================================================
+vitest.config.client.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================= */
+
 import { sveltekit } from "@sveltejs/kit/vite";
 import { svelteTesting } from "@testing-library/svelte/vite";
 import lightningcssPlugin from "vite-plugin-lightningcss";
@@ -18,8 +25,8 @@ export default defineConfig({
     name: "client",
     environment: "jsdom",
     clearMocks: true,
-    include: ["src/**/*.svelte.{test,spec}.{js,mjs}"],
-    exclude: ["src/lib/server/**"],
+    include: ["tests/unit/**/*.svelte.test.{js,mjs}"],
+    exclude: [],
     setupFiles: ["./vitest-setup-client.js"],
     reporters: ["default", "json"],
     outputFile: {

package/vitest.config.server.js

@@ -1,3 +1,10 @@
+/* =========================================================================
+vitest.config.server.js
+
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================= */
+
 import { sveltekit } from "@sveltejs/kit/vite";
 import lightningcssPlugin from "vite-plugin-lightningcss";
 import { defineConfig } from "vitest/config";
@@ -15,8 +22,8 @@ export default defineConfig({
   test: {
     name: "server",
     environment: "node",
-    include: ["src/**/*.{test,spec}.{js,mjs}"],
-    exclude: ["src/**/*.svelte.{test,spec}.{js,mjs}"],
+    include: ["tests/unit/**/*.test.{js,mjs}"],
+    exclude: ["tests/unit/**/*.svelte.test.{js,mjs}"],
     reporters: ["default", "json"],
     outputFile: {
       json: "./reports/server/results.json",