@networkpro/web 1.14.3 → 1.15.1

package/src/lib/utils/redirect.js

@@ -0,0 +1,52 @@
+/* ==========================================================================
+src/lib/utils/redirect.js
+
+Copyright © 2025 Network Pro Strategies (Network Pro™)
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== */
+
+/**
+ * @file utm.js
+ * @description Determines if the current browser is Firefox and skips redirect
+ * visual if true.
+ *
+ * @module src/lib/utils/
+ * @author SunDevil311
+ * @updated 2025-07-01
+ */
+
+/**
+ * Checks whether the current browser is Firefox.
+ * @returns {boolean} True if the browser is Firefox.
+ */
+function isFirefox() {
+  return (
+    typeof navigator !== 'undefined' &&
+    navigator.userAgent.toLowerCase().includes('firefox')
+  );
+}
+
+/**
+ * Redirects to a URL, immediately in Firefox (to avoid popup heuristics),
+ * and with a visual delay in all other browsers.
+ *
+ * @param {string} to - Destination URL
+ * @param {number} delay - Delay in seconds (ignored for Firefox)
+ */
+export function redirectWithBrowserAwareness(to, delay = 2) {
+  if (!to) {
+    console.warn('⛔ No redirect target provided');
+    return;
+  }
+
+  if (isFirefox()) {
+    console.log('🦊 Firefox detected — redirecting immediately');
+    window.location.replace(to);
+  } else {
+    console.log(`✅ Delayed redirect to: ${to} after ${delay}s`);
+    setTimeout(() => {
+      window.location.replace(to);
+    }, delay * 1000);
+  }
+}

package/src/lib/utils/utm.js

@@ -34,6 +34,7 @@ export function appendUTM(url) {
   else if (pathname.startsWith('/links')) campaign = 'links';
   else if (pathname.startsWith('/posts')) campaign = 'posts';
   else if (pathname.startsWith('/privacy-rights')) campaign = 'prights';
+  else if (pathname.startsWith('/consultation')) campaign = 'consult';
   // add more if needed
 
   const utmParams = new URLSearchParams({

package/src/routes/consultation/+page.svelte

@@ -9,6 +9,10 @@ This file is part of Network Pro.
 <script>
   import RedirectPage from '$lib/components/RedirectPage.svelte';
   import { appendUTM } from '$lib/utils/utm.js';
+  import { getUTMParams } from '$lib/utils/getUTMParams.js';
+  import { trackingEnabled } from '$lib/stores/trackingPreferences';
+  import posthog from 'posthog-js';
+  import { get } from 'svelte/store';
   import { onMount } from 'svelte';
   import { browser } from '$app/environment';
 
@@ -21,10 +25,20 @@ This file is part of Network Pro.
   onMount(() => {
     if (!browser) return;
 
-    target = appendUTM(
+    const url = appendUTM(
       'https://cloud.neteng.pro/index.php/apps/appointments/pub/8clCqQrt3AtGbNrr/form',
     );
-    show = true;
+
+    if (get(trackingEnabled)) {
+      const utm = getUTMParams(url);
+      posthog.capture('redirect_to_consult', {
+        target_url: url,
+        ...utm,
+      });
+    }
+
+    target = url;
+    show = true; // Immediately show RedirectPage
   });
 </script>
 

package/src/routes/contact/+page.svelte

@@ -37,10 +37,8 @@ This file is part of Network Pro.
       });
     }
 
-    setTimeout(() => {
-      target = url;
-      show = true;
-    }, 150);
+    target = url;
+    show = true; // Immediately show RedirectPage
   });
 </script>
 

package/src/routes/links/+page.svelte

@@ -40,10 +40,8 @@ This file is part of Network Pro.
       });
     }
 
-    setTimeout(() => {
-      target = url;
-      show = true;
-    }, 150);
+    target = url;
+    show = true; // Immediately show RedirectPage
   });
 </script>
 

package/src/routes/posts/+page.svelte

@@ -40,10 +40,8 @@ This file is part of Network Pro.
       });
     }
 
-    setTimeout(() => {
-      target = url;
-      show = true;
-    }, 150);
+    target = url;
+    show = true; // Immediately show RedirectPage
   });
 </script>
 

package/src/routes/privacy-rights/+page.svelte

@@ -37,10 +37,8 @@ This file is part of Network Pro.
       });
     }
 
-    setTimeout(() => {
-      target = url;
-      show = true;
-    }, 150);
+    target = url;
+    show = true; // Immediately show RedirectPage
   });
 </script>
 

package/static/sitemap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Sitemap last updated on 2025-06-11 -->
+<!-- Sitemap last updated on July 12, 2025 -->
 
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 
@@ -7,7 +7,7 @@
 
     <loc>https://netwk.pro</loc>
 
-    <lastmod>2025-06-10</lastmod>
+    <lastmod>2025-07-12</lastmod>
 
     <changefreq>weekly</changefreq>
 
@@ -43,7 +43,7 @@
 
     <loc>https://netwk.pro/privacy-dashboard</loc>
 
-    <lastmod>2025-05-28</lastmod>
+    <lastmod>2025-06-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -55,7 +55,7 @@
 
     <loc>https://netwk.pro/privacy</loc>
 
-    <lastmod>2025-06-02</lastmod>
+    <lastmod>2025-06-30</lastmod>
 
     <changefreq>monthly</changefreq>
 

package/tests/unit/{unregisterServiceWorker.test.js → client/lib/unregisterServiceWorker.test.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/unregisterServiceWorker.test.js
+tests/unit/client/lib/unregisterServiceWorker.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -7,7 +7,7 @@ This file is part of Network Pro.
 ========================================================================== */
 
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { unregisterServiceWorker } from '../../src/lib/unregisterServiceWorker.js';
+import { unregisterServiceWorker } from '../../../../src/lib/unregisterServiceWorker.js';
 
 describe('unregisterServiceWorker()', () => {
   beforeEach(() => {

package/tests/unit/client/lib/utils/redirect.test.js

@@ -0,0 +1,80 @@
+/* ==========================================================================
+tests/unit/client/lib/utils/redirect.test.js
+
+Copyright © 2025 Network Pro Strategies (Network Pro™)
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== */
+
+/**
+ * @file redirect.test.js
+ * @description Unit test for src/lib/utils/redirect.js
+ * @module tests/unit/lib/util/
+ * @author SunDevil311
+ * @updated 2025-07-01
+ */
+
+import { redirectWithBrowserAwareness } from '$lib/utils/redirect.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+describe('redirectWithBrowserAwareness', () => {
+  let originalLocation;
+  let originalNavigator;
+
+  /** @type {{ url: string; delay: number }} */
+  const commonMocks = {
+    url: 'https://example.com',
+    delay: 1,
+  };
+
+  beforeEach(() => {
+    // Preserve globals
+    originalLocation = window.location;
+    originalNavigator = global.navigator;
+
+    // Stub window.location.replace
+    delete window.location;
+    window.location = {
+      replace: vi.fn(),
+    };
+  });
+
+  afterEach(() => {
+    // Restore globals
+    window.location = originalLocation;
+    global.navigator = originalNavigator;
+    vi.clearAllMocks();
+  });
+
+  it('should redirect immediately in Firefox', () => {
+    global.navigator = {
+      userAgent:
+        'Mozilla/5.0 (Windows NT 10.0; rv:99.0) Gecko/20100101 Firefox/99.0',
+    };
+
+    redirectWithBrowserAwareness(commonMocks.url, commonMocks.delay);
+
+    expect(window.location.replace).toHaveBeenCalledWith(commonMocks.url);
+  });
+
+  it('should redirect after delay in non-Firefox', () => {
+    vi.useFakeTimers();
+
+    global.navigator = {
+      userAgent:
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0 Safari/537.36',
+    };
+
+    redirectWithBrowserAwareness(commonMocks.url, commonMocks.delay);
+
+    expect(window.location.replace).not.toHaveBeenCalled();
+
+    vi.advanceTimersByTime(commonMocks.delay * 1000);
+
+    expect(window.location.replace).toHaveBeenCalledWith(commonMocks.url);
+
+    vi.useRealTimers();
+  });
+});
+
+// cspell:ignore khtml

package/tests/unit/{utm.test.js → client/lib/utils/utm.test.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/utm.test.js
+tests/unit/client/lib/utils/utm.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later

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

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/routes/page.svelte.test.js
+tests/unit/client/routes/page.svelte.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -9,7 +9,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 '../../../src/routes/+page.svelte';
+import Page from '../../../../src/routes/+page.svelte';
 
 describe('/+page.svelte', () => {
   test('should render the home page section', () => {

package/tests/unit/{checkEnv.test.js → server/checkEnv.test.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/checkEnv.test.js
+tests/unit/server/checkEnv.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -11,7 +11,7 @@ This file is part of Network Pro.
  */
 
 import { afterEach, describe, expect, it } from 'vitest';
-import { checkEnv } from '../../scripts/checkEnv.js';
+import { checkEnv } from '../../../scripts/checkEnv.js';
 
 describe('checkEnv()', () => {
   const originalEnv = process.env.ENV_MODE;

package/tests/unit/{checkVersions.test.js → server/checkVersions.test.js}

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/checkVersions.test.js
+tests/unit/server/checkVersions.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -11,7 +11,7 @@ This file is part of Network Pro.
  */
 
 import { describe, expect, it } from 'vitest';
-import { checkVersions } from '../../scripts/checkVersions.js';
+import { checkVersions } from '../../../scripts/checkVersions.js';
 
 describe('checkVersions()', () => {
   it('should match current Node and NPM versions to engine ranges', () => {

package/tests/{internal → unit/server/internal}/auditCoverage.test.js

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/internal/auditCoverage.test.js
+tests/unit/server/internal/auditCoverage.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -8,10 +8,11 @@ This file is part of Network Pro.
 
 /**
  * @file auditCoverage.test.js
- * @description Scans all .js files in src/ and scripts/ for matching unit test
+ * @description Scans all .js files in src/ and scripts/ for matching unit
+ * tests
  * @module tests/internal
  * @author SunDevil311
- * @updated 2025-06-01
+ * @updated 2025-07-01
  */
 
 import fs from 'fs';
@@ -60,20 +61,26 @@ describe('auditCoverage', () => {
     const allFiles = [...srcFiles, ...scriptsFiles].map((f) =>
       path
         .relative(process.cwd(), f)
-        .replace(/\\/g, '/') // Normalize Windows slashes
+        .replace(/\\/g, '/')
         .replace(/^src\//, '')
         .replace(/^scripts\//, '')
         .replace(/\.js$/, ''),
     );
 
-    const testFiles = getAllJsFiles(path.resolve('tests/unit'), {
+    const clientTests = getAllJsFiles(path.resolve('tests/unit/client'), {
+      includeTests: true,
+    });
+    const serverTests = getAllJsFiles(path.resolve('tests/unit/server'), {
       includeTests: true,
     });
+    const testFiles = [...clientTests, ...serverTests];
 
     const testFilesNormalized = testFiles.map((f) =>
       path
-        .relative(path.resolve('tests/unit'), f)
+        .relative(process.cwd(), f)
         .replace(/\\/g, '/')
+        .replace(/^tests\/unit\/client\//, '')
+        .replace(/^tests\/unit\/server\//, '')
         .replace(/\.test\.js$|\.spec\.js$/, ''),
     );
 

package/tests/unit/{lib → server/lib}/utils/purify.test.js

@@ -1,5 +1,5 @@
 /* ==========================================================================
-tests/unit/lib/utils/purify.test.js
+tests/unit/server/lib/utils/purify.test.js
 
 Copyright © 2025 Network Pro Strategies (Network Pro™)
 SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
@@ -15,7 +15,7 @@ This file is part of Network Pro.
  */
 
 import { describe, expect, it } from 'vitest';
-import { sanitizeHtml } from '../../../../src/lib/utils/purify.js';
+import { sanitizeHtml } from '../../../../../src/lib/utils/purify.js';
 
 describe('sanitizeHtml', () => {
   it('removes dangerous tags like <script>', async () => {

package/vitest.config.client.js

@@ -26,10 +26,7 @@ export default defineConfig({
     name: 'client',
     environment: 'jsdom',
     clearMocks: true,
-    include: [
-      'tests/unit/**/*.test.{js,mjs,svelte}',
-      'tests/internal/**/*.test.{js,mjs,svelte}',
-    ],
+    include: ['tests/unit/client/**/*.test.{js,mjs,svelte}'],
     exclude: [],
     setupFiles: ['./vitest-setup-client.js'],
     reporters: ['default', 'json'],

package/vitest.config.server.js

@@ -23,7 +23,7 @@ export default defineConfig({
   test: {
     name: 'server',
     environment: 'node',
-    include: ['tests/unit/**/*.test.{js,mjs}'],
+    include: ['tests/unit/server/**/*.test.{js,mjs}'],
     exclude: ['tests/unit/**/*.svelte.test.{js,mjs}'],
     reporters: ['default', 'json'],
     testTimeout: 10000,

package/netlify/edge-functions/csp-report.js

@@ -1,160 +0,0 @@
-/* ==========================================================================
-edge-functions/csp-report.js
-
-Copyright © 2025 Network Pro Strategies (Network Pro™)
-SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
-This file is part of Network Pro.
-========================================================================== */
-
-/**
- * @file csp-report.js
- * @description Netlify Edge Function to handle CSP violation reports.
- *
- * Accepts POST requests to /api/csp-report and logs relevant CSP reports.
- * Filters out common low-value reports (e.g., img-src) to reduce invocation
- * cost. Alerts on high-risk violations via ntfy topic.
- *
- * @module netlify/edge-functions
- * @author SunDevil311
- * @updated 2025-05-31
- */
-
-/**
- * Netlify Edge Function entry point for CSP reporting.
- *
- * @param {Request} request - The incoming HTTP request object
- * @param {import('@netlify/edge-functions').Context} _context - The Netlify Edge Function context (unused)
- * @returns {Promise<Response>} HTTP Response with status 204 or 405
- */
-export default async (request, _context) => {
-  if (request.method !== 'POST') {
-    return new Response('Method Not Allowed', { status: 405 });
-  }
-
-  try {
-    const body = await request.json();
-    const report = body['csp-report'];
-
-    // Ignore if report is missing or malformed
-    if (!report || typeof report !== 'object') {
-      return new Response(null, { status: 204 });
-    }
-
-    const violated = report['violated-directive'] ?? '';
-    const blockedUri = report['blocked-uri'] ?? '';
-
-    // Filter: Skip noisy or unactionable reports
-    const ignored = [
-      violated.startsWith('img-src'),
-      blockedUri === '',
-      blockedUri === 'eval',
-      blockedUri === 'about',
-      blockedUri.startsWith('chrome-extension://'),
-      blockedUri.startsWith('moz-extension://'),
-      !report['source-file'],
-      !report['document-uri'],
-    ].some(Boolean);
-
-    if (ignored) {
-      console.log('[CSP-Edge] Ignored low-value violation:', {
-        directive: violated,
-        uri: blockedUri,
-      });
-      return new Response(null, { status: 204 });
-    }
-
-    // Send alert for high-risk directives
-    await sendToNtfy(violated, blockedUri, report);
-
-    // Log useful violations
-    console.log('[CSP-Edge] Violation:', {
-      directive: violated,
-      uri: blockedUri,
-      referrer: report['referrer'],
-      source: report['source-file'],
-      line: report['line-number'],
-    });
-  } catch (err) {
-    console.warn('[CSP-Edge] Failed to parse CSP report:', err.message);
-  }
-
-  return new Response(null, { status: 204 });
-};
-
-const recentViolations = new Map();
-const VIOLATION_TTL_MS = 60_000;
-
-/**
- * Sends a high-priority alert to your ntfy topic for high-risk CSP violations.
- * Applies rate-limiting to avoid sending duplicate alerts within 60 seconds.
- *
- * @param {string} violated - The violated CSP directive
- * @param {string} blockedUri - The URI that was blocked
- * @param {Record<string, any>} report - The full CSP report object
- */
-async function sendToNtfy(violated, blockedUri, report) {
-  const highRiskDirectives = [
-    'script-src',
-    'form-action',
-    'frame-ancestors',
-    'base-uri',
-  ];
-
-  const directiveKey = violated.split(' ')[0]; // strip fallback values or sources
-  const isHighRisk = highRiskDirectives.includes(directiveKey);
-  console.log(
-    `[CSP-Edge] Directive ${directiveKey} is ${isHighRisk ? '' : 'not '}high-risk`,
-  );
-  if (!isHighRisk) return;
-
-  const key = `${violated}|${blockedUri}`;
-  const now = Date.now();
-
-  // Skip and log if violation was reported recently
-  if (
-    recentViolations.has(key) &&
-    now - recentViolations.get(key) < VIOLATION_TTL_MS
-  ) {
-    console.log(`[CSP-Edge] Skipped duplicate alert for ${key}`);
-    return;
-  }
-
-  // Record the current timestamp
-  recentViolations.set(key, now);
-
-  // Cleanup old entries (memory-safe for low volume)
-  for (const [k, t] of recentViolations.entries()) {
-    if (now - t > VIOLATION_TTL_MS) {
-      recentViolations.delete(k);
-    }
-  }
-
-  const topicUrl = 'https://ntfy.neteng.pro/csp-alerts';
-
-  const message = [
-    `🚨 CSP Violation Detected`,
-    `Directive: ${violated}`,
-    `Blocked URI: ${blockedUri}`,
-    `Referrer: ${report.referrer || 'N/A'}`,
-    `Source: ${report['source-file'] || 'N/A'}`,
-    `Line: ${report['line-number'] || 'N/A'}`,
-  ].join('\n');
-
-  await fetch(topicUrl, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'text/plain',
-      'X-Title': 'High-Risk CSP Violation',
-      'X-Priority': '5',
-    },
-    body: message,
-  });
-}
-
-/**
- * Configuration block for the Edge Function.
- * This sets the endpoint route to /api/csp-report
- */
-export const config = {
-  path: '/api/csp-report',
-};

package/tests/unit/csp-report.test.js

@@ -1,81 +0,0 @@
-/* ==========================================================================
-tests/unit/csp-report.test.js
-
-Copyright © 2025 Network Pro Strategies (Network Pro™)
-SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
-This file is part of Network Pro.
-========================================================================== */
-
-/**
- * Tests the edge-functions/csp-report.js CSP reporting endpoint
- *
- * @module tests/unit
- * @author SunDevil311
- * @updated 2025-05-31
- */
-
-/** @file Unit tests for edge-functions/csp-report.js using Vitest */
-/** @typedef {import('vitest').TestContext} TestContext */
-
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import handler from '../../netlify/edge-functions/csp-report.js';
-
-// 🧪 Mock fetch used by sendToNtfy inside the Edge Function
-global.fetch = vi.fn(() =>
-  Promise.resolve({ ok: true, status: 200, text: () => 'OK' }),
-);
-
-describe('csp-report.js', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('should handle a valid CSP report', async () => {
-    const req = new Request('http://localhost/api/csp-report', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        'csp-report': {
-          'document-uri': 'https://example.com',
-          'violated-directive': 'script-src',
-          'blocked-uri': 'https://malicious.site',
-        },
-      }),
-    });
-
-    const res = await handler(req, {});
-    expect(res.status).toBe(204);
-  });
-
-  it('should reject non-POST requests', async () => {
-    const req = new Request('http://localhost/api/csp-report', {
-      method: 'GET',
-    });
-
-    const res = await handler(req, {});
-    const text = await res.text();
-    expect(res.status).toBe(405);
-    expect(text).toContain('Method Not Allowed');
-  });
-
-  it('should handle malformed JSON', async () => {
-    const badJson = '{ invalid json }';
-    const req = new Request('http://localhost/api/csp-report', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: badJson,
-    });
-
-    const res = await handler(req, {});
-    expect(res.status).toBe(204); // The current handler swallows errors silently
-  });
-
-  it('should handle missing body', async () => {
-    const req = new Request('http://localhost/api/csp-report', {
-      method: 'POST',
-    });
-
-    const res = await handler(req, {});
-    expect(res.status).toBe(204); // No body is also treated silently
-  });
-});