refactor: simplify test_verify.mjs and remove color formatting

- Remove red() function (not critical for tests)
- Extract testUrl() helper for testing URLs with badge count
- Add assertBadgeCount() for cleaner assertions
- Use testCases array for easier test case management
- Support '>0' as expected value for dynamic counts

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

.dockerignore

@@ -0,0 +1,16 @@
+.log
+node_modules
+sidebar.js
+web-ext-artifacts/
+lib/*
+yarn-error.log
+rentgen.zip
+
+# Generated PNG icons (build artifacts)
+assets/icons/*.png
+assets/icon-addon-*.png
+
+# Exception: do not ignore the `browser-api` directory inside `lib`
+!/lib/browser-api/
+
+Dockerfile

.gitignore

@@ -2,6 +2,7 @@
 node_modules
 sidebar.js
 /web-ext-artifacts/
+/artifacts/
 lib/*
 /yarn-error.log
 /rentgen.zip
@@ -12,3 +13,5 @@ lib/*
 
 # Exception: do not ignore the `browser-api` directory inside `lib`
 !/lib/browser-api/
+
+.claude

.nvmrc

@@ -0,0 +1 @@
+25

Dockerfile

@@ -0,0 +1,106 @@
+# Rentgen Browser Extension - Docker Build
+# See README.md for detailed usage instructions
+
+# Build stage
+FROM node:lts AS builder
+
+WORKDIR /app
+
+# Copy package files for dependency installation (better layer caching)
+COPY package.json package-lock.json ./
+
+# Install dependencies
+RUN npm install
+
+# FIXME: COPY . . invalidates cache, so we need to optionally install Firefox
+# and jump back to the correct stage. It might be too complex though, so we
+# either need to use build args (if cache properly) or heavily document the
+# stage transitions, maybe even with a graph.
+
+# Copy source code (respecting .dockerignore)
+COPY . .
+
+# Build the extension for Firefox (default) - without tests
+RUN npm run build
+
+# Create the package
+RUN npm run create-package
+
+# Test builder stage - builds with ENABLE_TESTS=true
+FROM node:lts AS test_builder
+
+WORKDIR /app
+
+# Copy package files for dependency installation
+COPY package.json package-lock.json ./
+
+# Install dependencies
+RUN npm install
+
+# Copy source code
+COPY . .
+
+# Build with tests enabled
+RUN ENABLE_TESTS=true npm run build
+
+# Create the package
+RUN npm run create-package
+
+# Code quality stage - for running quality checks
+FROM builder AS code_quality
+COPY tests/run-checks.sh /app/tests/run-checks.sh
+RUN chmod +x /app/tests/run-checks.sh && /app/tests/run-checks.sh
+
+# Artifacts stage - only contains the built artifacts (for --output)
+FROM scratch AS artifacts
+
+# Copy only the built extension zip file to root
+COPY --from=builder /app/web-ext-artifacts/*.zip /
+
+# Default stage - full development environment
+FROM builder
+
+# Default command shows the built artifact
+CMD ["ls", "-lh", "/app/web-ext-artifacts/"]
+
+# Runtime stage - for running extension with Selenium WebDriver
+FROM node:lts AS runtime
+
+WORKDIR /app
+
+# Copy built extension from test_builder (includes test code)
+COPY --from=test_builder /app /app
+
+# Install Firefox and Xvfb for headless execution
+RUN apt-get update && apt-get install -y \
+    firefox-esr \
+    xvfb \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install geckodriver for WebDriver protocol
+RUN wget -q https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz \
+    && tar -xzf geckodriver-v0.34.0-linux64.tar.gz \
+    && mv geckodriver /usr/local/bin/ \
+    && rm geckodriver-v0.34.0-linux64.tar.gz \
+    && chmod +x /usr/local/bin/geckodriver
+
+# Install Node.js test dependencies
+RUN npm install
+
+# Set display for Xvfb
+ENV DISPLAY=:99
+
+# Start script (not used in verify stage)
+CMD ["echo", "Use verify stage for testing"]
+
+# Integration test stage - automated testing with exit code
+FROM runtime AS integration_test
+
+# Copy verification scripts
+COPY tests/test_verify.mjs /app/tests/test_verify.mjs
+COPY tests/test-lib.js /app/tests/test-lib.js
+RUN chmod +x /app/tests/test_verify.mjs
+
+# Run verification and exit with proper exit code
+CMD ["node", "/app/tests/test_verify.mjs"]

README.md

@@ -21,9 +21,21 @@ Firefox: https://addons.mozilla.org/en-US/firefox/addon/rentgen/
 ### Pre-requirements
 
 -   OS: Linux x86_64
--   Node.js: 16.x version
+-   Node.js: 25.x version (recommended: use [fnm](https://github.com/Schniz/fnm) for automatic version management)
 -   npm: 7.x version or higher
 
+**Using fnm (recommended):**
+
+If you're using fnm, it will automatically use the correct Node.js version specified in `.nvmrc`:
+
+```bash
+# Install fnm (if not already installed)
+curl -fsSL https://fnm.vercel.app/install | bash
+
+# In the project directory, fnm will automatically use Node.js 25
+fnm use
+```
+
 ### Build steps
 
 1. Pull repository or download a zip package
@@ -82,9 +94,21 @@ Firefox: https://addons.mozilla.org/pl/firefox/addon/rentgen/
 ### Wymagania wstępne
 
 -   System operacyjny: Linux x86_64
--   Node.js: 16.x
+-   Node.js: 25.x (zalecane: użyj [fnm](https://github.com/Schniz/fnm) do automatycznego zarządzania wersją)
 -   npm: 7.x lub wyższy
 
+**Używanie fnm (zalecane):**
+
+Jeśli używasz fnm, automatycznie użyje prawidłowej wersji Node.js określonej w `.nvmrc`:
+
+```bash
+# Zainstaluj fnm (jeśli nie jest zainstalowane)
+curl -fsSL https://fnm.vercel.app/install | bash
+
+# W katalogu projektu fnm automatycznie użyje Node.js 25
+fnm use
+```
+
 ### Proces budowy
 
 1. Pobierz repozytorium przez `git pull https://git.internet-czas-dzialac.pl/icd/rentgen.git` lub pobierz archwium zip
@@ -112,3 +136,4 @@ Każdy problem zostanie sprawdzony i przeniesiony na wewnętrzną listę problem
 
 ---
 
+# Test pre-commit hook - without Docker check

background.ts

@@ -1,18 +1,35 @@
-import { init } from './memory';
+import { init, getMemory } from "./memory";
 
-console.log('🔴 [DIAGNOSTYKA] Wczytywanie background.ts, TARGET =', process.env.TARGET);
+// Use global browser object directly (available in extension context)
+declare const browser: any;
+declare const ENABLE_TESTS: boolean;
 
-// Inicjalizacja pamięci storage
-try {
-    init();
-    console.log('✅ init() zakończone pomyślnie');
-} catch (error) {
-    console.error('❌ init() nie powiodło się:', error);
-}
-
-// Log zakończenia inicjalizacji
-if (process.env.TARGET === 'chrome') {
-    console.log('🔵 Service worker Chrome Rentgen zainicjalizowany (używa chrome.storage.session)');
-} else {
-    console.log('🦊 Strona tła Firefox Rentgen zainicjalizowana');
+init();
+
+// Test verification handler for Marionette tests
+// Tests real Rentgen functionality: counting third-party domains
+if (ENABLE_TESTS) {
+    browser.runtime.onMessage.addListener((message: any, sender: any, sendResponse: any) => {
+        if (message.type === 'RENTGEN_TEST_VERIFICATION') {
+            // Get the origin from message (sent by content script)
+            const origin = message.origin;
+
+            // Access the memory to get clusters for this origin
+            const memory = getMemory();
+            const clusters = memory.getClustersForOrigin(origin);
+            const badgeCount = Object.keys(clusters).length;
+
+            // Send back the badge count (number of third-party domains)
+            const response = {
+                success: true,
+                badgeCount: badgeCount,
+                origin: origin,
+                clusterIds: Object.keys(clusters),
+                backgroundTimestamp: Date.now()
+            };
+
+            sendResponse(response);
+            return true;  // Keep channel open for async response
+        }
+    });
 }

components/report-window/report-window.tsx

@@ -24,24 +24,6 @@ function Report() {
         if (!origin) {
             return <div>Błąd: brak parametru "origin"</div>;
         }
-        
-        // Oczekiwanie na gotowość pamięci Chrome
-        const [memoryReady, setMemoryReady] = React.useState(process.env.TARGET !== 'chrome');
-        
-        React.useEffect(() => {
-            if (process.env.TARGET === 'chrome') {
-                const memory = getMemory();
-                if (typeof (memory as any).waitUntilReady === 'function') {
-                    (memory as any).waitUntilReady().then(() => {
-                        setMemoryReady(true);
-                        console.log('✅ Memory gotowa dla okna raportu');
-                    });
-                } else {
-                    setMemoryReady(true);
-                }
-            }
-        }, []);
-        
         const [counter] = useEmitter(getMemory());
         const rawAnswers = url.searchParams.get('answers');
         const [answers, setAnswers] = React.useState<ParsedAnswers>(
@@ -50,32 +32,22 @@ function Report() {
         const [mode, setMode] = React.useState(url.searchParams.get('mode') || 'survey');
         const [scrRequestPath, setScrRequestPath] = React.useState('');
 
-        // Pobieranie klastrów tylko gdy pamięć jest gotowa
-        const clusters = memoryReady ? getMemory().getClustersForOrigin(origin || '') : {};
+        const clusters = getMemory().getClustersForOrigin(origin || '');
 
         React.useEffect(() => {
-            if (!origin || !memoryReady) return;
+            if (!origin) return;
             const url = new URL(document.location.toString());
             url.searchParams.set('origin', origin);
             url.searchParams.set('answers', JSON.stringify(answers));
             url.searchParams.set('mode', mode);
             history.pushState({}, 'Rentgen', url.toString());
-        }, [mode, answers, origin, memoryReady]);
-        
-        // Wyświetlanie wczytywania w trakcie oczekiwania na pamięć
-        if (!memoryReady) {
-            return <div>Wczytywanie danych z rozszerzenia...</div>;
-        }
-        
+        }, [mode, answers, origin]);
         const visited_url = Object.values(clusters)
             .sort((a, b) => (a.lastModified > b.lastModified ? -1 : 1))
             .find((cluster) => !!cluster.lastFullUrl)?.lastFullUrl;
 
-        // Jeśli nie znaleziono visited_url, próba skonstruowania z origin
-        const finalVisitedUrl = visited_url || origin;
-        
-        if (!finalVisitedUrl) {
-            return <div>Błąd: nie można znaleźć adresu strony</div>;
+        if (!visited_url) {
+            return <div>Wczytywanie...</div>;
         }
 
         const result = (
@@ -83,7 +55,7 @@ function Report() {
                 {mode === 'survey' ? (
                     <Questions
                         clusters={Object.values(clusters).filter(
-                            (cluster) => cluster.hasMarks()
+                            (cluster) => cluster.getMarkedRequests().length > 0
                         )}
                         onComplete={(answers) => {
                             setAnswers(parseAnswers(answers));
@@ -96,11 +68,11 @@ function Report() {
                 {mode === 'screenshots' ? (
                     <ScreenshotGenerator
                         {...{
-                            visited_url: finalVisitedUrl,
+                            visited_url,
                             clusters,
                             setReportWindowMode: setMode,
                             setRequestPath: setScrRequestPath,
-                            downloadFiles,
+                            downloadFiles: downloadFiles,
                             user_role: answers.user_role,
                         }}
                     />
@@ -111,10 +83,10 @@ function Report() {
                     <EmailContent
                         {...{
                             answers,
-                            visited_url: finalVisitedUrl,
+                            visited_url,
                             clusters,
                             scrRequestPath,
-                            downloadFiles,
+                            downloadFiles: downloadFiles,
                             user_role: answers.user_role,
                         }}
                     />
@@ -123,18 +95,27 @@ function Report() {
                 )}
             </div>
         );
-        return result;
+        return (
+            <Fragment>
+                <header className="header">
+                    <img src="../../assets/icon-addon.svg" height={32}></img>
+                    <div className="webpage-metadata">
+                        {origin ? (
+                            <>
+                                <span>Generowanie raportu </span>
+                                <span className="webpage-metadata--hyperlink">{origin}</span>
+                            </>
+                        ) : (
+                            <span>Przejdź do wybranej strony internetowej</span>
+                        )}
+                    </div>
+                </header>
+                <section id="main-section">{result}</section>
+            </Fragment>
+        );
     } catch (e) {
         console.error(e);
-        return (
-            <div style={{ padding: 30 }}>
-                <p>
-                    <strong>Wystąpił błąd</strong>
-                </p>
-                <p>Najprawdopodobniej Rentgen napotkał stronę, której nie jest w stanie obsłużyć.</p>
-                <p>{(e as Error).toString()}</p>
-            </div>
-        );
+        return <div>ERROR! {JSON.stringify(e)}</div>;
     }
 }
 

components/report-window/use-survey.ts

@@ -8,7 +8,7 @@ import verbs, { v } from './verbs';
 export default function useSurvey(
     clusters: RequestCluster[],
     { onComplete }: { onComplete: (sender: { data: RawAnswers }) => void }
-): Survey.ReactSurveyModel | null {
+): Survey.Model | null {
     const [survey, setSurvey] = React.useState<Survey.Model | null>(null);
     React.useEffect(() => {
         const model = generateSurveyQuestions(clusters);

components/sidebar/sidebar.tsx

@@ -12,8 +12,6 @@ const Sidebar = () => {
     const url = new URL(document.location.toString());
     const origin = url.searchParams.get('origin');
 
-    // Chrome: Oczekiwanie na gotowość pamięci
-    const [memoryReady, setMemoryReady] = React.useState(process.env.TARGET !== 'chrome');
     const [minValueLength, setMinValueLength] = React.useState<number | null>(
         localStorage.getItem('minValueLength') === null
             ? 7
@@ -46,24 +44,8 @@ const Sidebar = () => {
             : false
     );
 
-    // Oczekiwanie na gotowość pamięci Chrome
     React.useEffect(() => {
-        if (process.env.TARGET === 'chrome') {
-            const memory = getMemory();
-            if (typeof (memory as any).waitUntilReady === 'function') {
-                (memory as any).waitUntilReady().then(() => {
-                    setMemoryReady(true);
-                    console.log('✅ Memory gotowa dla sidebara');
-                });
-            } else {
-                setMemoryReady(true);
-            }
-        }
-    }, []);
-
-    React.useEffect(() => {
-        if (!origin || !memoryReady) return;
-        
+        if (!origin) return;
         for (const cluster of Object.values(getMemory().getClustersForOrigin(origin))) {
             if (cluster.hasMarks()) {
                 return setMarksOccurrence(true);
@@ -71,24 +53,9 @@ const Sidebar = () => {
         }
 
         return setMarksOccurrence(false);
-    }, [eventCounts['*'], memoryReady]);
+    }, [eventCounts['*']]);
 
     if (!origin) return <div>Błąd: Brak parametru "origin"</div>;
-    
-    // Wyświetlanie stanu wczytywania dla Chrome
-    if (!memoryReady) {
-        return (
-            <div className="sidebar">
-                <header className="header">
-                    <img src="../../assets/icon-addon.svg" height={32}></img>
-                    <div className="webpage-metadata">
-                        <span>Ładowanie danych...</span>
-                    </div>
-                </header>
-            </div>
-        );
-    }
-    
     return (
         <div className="sidebar">
             <header className="header">
@@ -154,12 +121,12 @@ const Sidebar = () => {
                     </button>
 
                     {localStorage.getItem('blottingBrowser') ===
-                    'nikttakniesplamitwojejprzeglądarki jakspidersweb' ? (
+                    'nikttakniesplamitwojejprzeglądarkijakspidersweb' ? (
                         <button
                             onClick={() => {
                                 if (
                                     window.confirm(
-                                        'Czy chcesz wczytać wszystkie domeny w celu „splamienia" twojej przeglądarki? Uwaga przeglądarka może zablokować otwieranie nowych kart. (Ten krok jest opcjonalny)'
+                                        'Czy chcesz wczytać wszystkie domeny w celu „splamienia” twojej przeglądarki? Uwaga przeglądarka może zablokować otwieranie nowych kart. (Ten krok jest opcjonalny)'
                                     )
                                 ) {
                                     let deep_copy = JSON.parse(
@@ -211,8 +178,8 @@ const Sidebar = () => {
                             <section className="dialog-container dialog-container--warning">
                                 <span>
                                     <strong>Uwaga!</strong> Niekoniecznie każda przesłana poniżej
-                                    informacja jest daną osobową. Niektóre z podanych domen mogą
-                                    należeć do właściciela strony i nie reprezentować podmiotów
+                                    informacja jest daną osobową. Niektóre z podanych domen mogą
+                                    należeć do właściciela strony i nie reprezentować podmiotów
                                     trzecich.
                                 </span>
                                 <button

components/sidebar/stolen-data-cluster.tsx

@@ -102,7 +102,6 @@ function StolenDataRow({ entry }: { entry: StolenDataEntry }) {
 export default function StolenDataCluster({
     origin,
     shorthost,
-    refreshToken,
     minValueLength,
     cookiesOnly,
     cookiesOrOriginOnly,
@@ -110,7 +109,6 @@ export default function StolenDataCluster({
 }: {
     origin: string;
     shorthost: string;
-    refreshToken: number;
     minValueLength: number;
     cookiesOnly: boolean;
     cookiesOrOriginOnly: boolean;

components/sidebar/stolen-data.tsx

@@ -43,7 +43,6 @@ export function StolenData({
                         origin={origin}
                         shorthost={cluster.id}
                         key={cluster.id + origin}
-                        refreshToken={eventCounts[cluster.id] || 0}
                         minValueLength={minValueLength}
                         cookiesOnly={cookiesOnly}
                         cookiesOrOriginOnly={cookiesOrOriginOnly}

components/sidebar/tab-dropdown.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import browserAPI, { Tab } from '../../lib/browser-api';
+import { Tab } from '../../util';
 
 export default function TabDropdown({
     setPickedTab,
@@ -10,7 +10,7 @@ export default function TabDropdown({
 }) {
     const [tabs, setTabs] = React.useState<Tab[]>([]);
     React.useEffect(() => {
-        browserAPI.tabs.query({ currentWindow: true }).then(setTabs);
+        browser.tabs.query({ currentWindow: true }).then(setTabs);
     }, []);
     return (
         <select

components/toolbar/toolbar.html

@@ -7,10 +7,6 @@
         rel="stylesheet"
         href="/lib/styles/global.css"
     >
-    <link
-        rel="stylesheet"
-        href="/lib/styles/fonts.css"
-    >
     <link
         rel="stylesheet"
         href="/lib/components/toolbar/toolbar.css"

components/toolbar/toolbar.tsx

@@ -1,46 +1,20 @@
 import React, { Fragment } from 'react';
 import ReactDOM from 'react-dom';
+import { useEmitter } from '../../util';
 import { getMemory } from '../../memory';
-import { useEmitter, getshorthost } from '../../util';
-import browserAPI from '../../lib/browser-api';
 
-// Niezawodne pobieranie zakładki z ponawianiem prób
-async function getCurrentTab(retries = 3, delay = 100): Promise<any> {
-    for (let i = 0; i < retries; i++) {
-        try {
-            // Metoda 1: Zapytanie o aktywną zakładkę
-            const tabs = await browserAPI.tabs.query({
+async function getCurrentTab() {
+    const [tab] = await browser.tabs.query({
         active: true,
-                currentWindow: true,
+        windowId: browser.windows.WINDOW_ID_CURRENT,
     });
-            
-            if (tabs && tabs[0] && tabs[0].url) {
-                return tabs[0];
-            }
-
-            // Metoda 2: Użycie lastFocusedWindow
-            const tabsLastFocused = await browserAPI.tabs.query({
-                active: true,
-                lastFocusedWindow: true,
-            });
-            
-            if (tabsLastFocused && tabsLastFocused[0] && tabsLastFocused[0].url) {
-                return tabsLastFocused[0];
-            }
-        } catch (error) {
-            console.warn(`Próba ${i + 1} zapytania o zakładkę nie powiodła się:`, error);
-        }
-
-        // Czekanie przed ponowieniem próby
-        if (i < retries - 1) {
-            await new Promise(resolve => setTimeout(resolve, delay));
-        }
-    }
-
-    return undefined;
+    return tab;
 }
 
-function isDomainHighlySuspicious(domain: string) {
+import './../../styles/global.scss';
+import './toolbar.scss';
+
+function isDomainHighlySuspicious(domain: string): boolean {
     return (
         domain.includes('facebook') ||
         domain.includes('twitter') ||
@@ -51,88 +25,41 @@ function isDomainHighlySuspicious(domain: string) {
 
 const Toolbar = () => {
     const [origin, setOrigin] = React.useState<string | null>(null);
-    const [memoryReady, setMemoryReady] = React.useState(process.env.TARGET !== 'chrome');
     const [eventCounts] = useEmitter(getMemory());
     const [cookieDomainCopy, setCookieDomainCopy] = React.useState<string | null>(null);
-    const [_, setMarksOccurrence] = React.useState(false);
+    const [_, setMarksOccurrence] = React.useState<boolean>(false);
     const [exposedOriginDomainCopy, setExposedOriginDomainCopy] = React.useState<string | null>(
         null
     );
 
-    const first_sentence_cookie =
-        'Strona dokonała zapisu i odczytu plików Cookie dla domen ';
+    const first_sentence_cookie = 'Strona dokonała zapisu i odczytu plików Cookie dla domen ';
     const first_sentence_history =
         'Część informacji o Twojej historii przeglądania została wysłana do ';
 
-    // Oczekiwanie na gotowość pamięci Chrome
     React.useEffect(() => {
-        if (process.env.TARGET === 'chrome') {
-            const memory = getMemory();
-            if (typeof (memory as any).waitUntilReady === 'function') {
-                (memory as any).waitUntilReady().then(() => {
-                    setMemoryReady(true);
-                    console.log('✅ Memory gotowa, popup może wyświetlać dane');
-                });
-            } else {
-                setMemoryReady(true);
-            }
-        }
-    }, []);
-
-    React.useEffect(() => {
-        let isMounted = true;
-
         const listener = async () => {
-            if (!isMounted) return;
-
             const tab = await getCurrentTab();
 
-            if (!isMounted) return;
-            
-            if (tab && tab.url) {
-                try {
+            if (tab !== undefined && tab.url) {
                 const url = new URL(tab.url);
-                    
-                    // Pomijanie stron rozszerzenia
-                    if (url.origin.startsWith('moz-extension') || 
-                        url.origin.startsWith('chrome-extension') ||
-                        url.protocol === 'chrome:' ||
-                        url.protocol === 'about:') {
+                if (url.origin.startsWith('moz-extension')) {
                     return;
                 }
-                    
                 setOrigin(url.origin);
-                } catch (error) {
-                    console.warn('Nie udało się sparsować URL zakładki:', tab.url, error);
-                }
             } else {
-                // Tylko ostrzeżenie w trybie debug, nie błąd
-                if (process.env.NODE_ENV === 'development') {
-                    console.debug('Popup otwarty bez kontekstu aktywnej zakładki');
-                }
+                console.warn('Out of the tab scope');
             }
         };
 
-        browserAPI.tabs.onUpdated.addListener(listener);
-        
-        // Początkowe wczytywanie z odpowiednim opóźnieniem
-        if (process.env.TARGET === 'chrome') {
-            // Chrome potrzebuje więcej czasu dla service worker + storage
-            setTimeout(listener, 200);
-        } else {
-            // Firefox jest gotowy natychmiast
+        browser.tabs.onUpdated.addListener(listener);
         listener();
-        }
-        
         return () => {
-            isMounted = false;
-            browserAPI.tabs.onUpdated.removeListener(listener);
+            browser.tabs.onUpdated.removeListener(listener);
         };
-    }, []);
+    });
 
     React.useEffect(() => {
-        if (!origin || !memoryReady) return;
-
+        if (!origin) return;
         const exposedOriginDomains = Object.values(getMemory().getClustersForOrigin(origin))
             .filter((cluster) => cluster.exposesOrigin())
             .sort((cluster1, cluster2) =>
@@ -143,7 +70,6 @@ const Toolbar = () => {
                       : 0
             )
             .map((cluster) => cluster.id);
-
         setExposedOriginDomainCopy('');
 
         switch (exposedOriginDomains.length) {
@@ -170,11 +96,10 @@ const Toolbar = () => {
                 );
                 break;
         }
-    }, [eventCounts['*'], origin, memoryReady]);
+    }, [eventCounts['*'], origin]);
 
     React.useEffect(() => {
-        if (!origin || !memoryReady) return;
-
+        if (!origin) return;
         const cookieDomains = Object.values(getMemory().getClustersForOrigin(origin))
             .filter((cluster) => cluster.hasCookies())
             .sort((cluster1, cluster2) =>
@@ -185,7 +110,6 @@ const Toolbar = () => {
                       : 0
             )
             .map((cluster) => cluster.id);
-
         setCookieDomainCopy('');
 
         switch (cookieDomains.length) {
@@ -204,45 +128,52 @@ const Toolbar = () => {
                 break;
             default:
                 setCookieDomainCopy(
-                    `${cookieDomains[0]}, ${cookieDomains[1]} (i ${
+                    `${cookieDomains[0]}, ${cookieDomains[1]} (i ${
                         cookieDomains.length - 2 < 2 ? 2 : cookieDomains.length - 2
                     } innych).`
                 );
                 break;
         }
-    }, [eventCounts['*'], origin, memoryReady]);
+    }, [eventCounts['*'], origin]);
 
-    const autoMark = () => {
-        Object.values(getMemory().getClustersForOrigin(origin || '')).forEach((cluster) =>
-            cluster.autoMark()
-        );
-        setMarksOccurrence(true);
-    };
+    React.useEffect(() => {
+        if (!origin) return;
+        for (const cluster of Object.values(getMemory().getClustersForOrigin(origin))) {
+            if (cluster.hasMarks()) {
+                return setMarksOccurrence(true);
+            }
+        }
+
+        return setMarksOccurrence(false);
+    }, [eventCounts['*']]);
+
+    function autoMark() {
+        if (!origin) return;
+        for (const cluster of Object.values(getMemory().getClustersForOrigin(origin))) {
+            cluster.autoMark();
+        }
+        return setMarksOccurrence(true);
+    }
 
     return (
         <div className="toolbar">
             <header className={origin ? 'header' : 'header header--no-page'}>
-                <img src="../../assets/icon-addon.svg" height="24" />
+                <img src="../../assets/icon-addon.svg" height={32}></img>
                 <div className="webpage-metadata">
                     {origin ? (
-                        <div className="webpage-metadata--hyperlink">{origin}</div>
+                        <>
+                            <span>Analiza strony</span>
+                            <span className="webpage-metadata--hyperlink">{origin}</span>
+                        </>
                     ) : (
-                        <div>Rentgen - wtyczka do przeglądania</div>
+                        <span>Przejdź do wybranej strony internetowej</span>
                     )}
                 </div>
                 {origin ? (
-                    <button
-                        onClick={() => {
-                            window.close();
-                        }}
-                    >
-                        <img src="../../assets/icons/x_thick.svg" width="12" height="12" />
-                    </button>
-                ) : (
                     <a href="https://internet-czas-dzialac.pl">
                         <img src="/assets/icons/info_circle_outline.svg" width="20" height="20" />
                     </a>
-                )}
+                ) : null}
             </header>
 
             {origin ? (
@@ -252,22 +183,30 @@ const Toolbar = () => {
                         <div className="counters-wrapper">
                             <div className="counters">
                                 <div className="counter counter--cookies">
-                                    <img src="/assets/icons/cookie.svg#color" width="24" height="24" />
+                                    <img
+                                        src="/assets/icons/cookie.svg#color"
+                                        width="24"
+                                        height="24"
+                                    />
                                     <span data-event={`${eventCounts['*']}`}>
                                         {
-                                            Object.values(getMemory().getClustersForOrigin(origin)).filter(
-                                                (cluster) => cluster.hasCookies()
-                                            ).length
+                                            Object.values(
+                                                getMemory().getClustersForOrigin(origin)
+                                            ).filter((cluster) => cluster.hasCookies()).length
                                         }
                                     </span>
                                 </div>
                                 <div className="counter counter--browser-history">
-                                    <img src="/assets/icons/warning.svg#color" width="24" height="24" />
+                                    <img
+                                        src="/assets/icons/warning.svg#color"
+                                        width="24"
+                                        height="24"
+                                    />
                                     <span data-event={`${eventCounts['*']}`}>
                                         {
-                                            Object.values(getMemory().getClustersForOrigin(origin)).filter(
-                                                (cluster) => cluster.exposesOrigin()
-                                            ).length
+                                            Object.values(
+                                                getMemory().getClustersForOrigin(origin)
+                                            ).filter((cluster) => cluster.exposesOrigin()).length
                                         }
                                     </span>
                                 </div>
@@ -308,9 +247,9 @@ const Toolbar = () => {
                         <Fragment>
                             <section className="about">
                                 <p>
-                                    Takie przetwarzanie danych może być niezgodne z&nbsp;prawem.
-                                    Przejdź do analizy aby pomóc ustalić, czy ta strona nie narusza
-                                    RODO lub ustawy Prawo Komunikacji Elektronicznej.
+                                    Takie przetwarzanie danych może być niezgodne z prawem. Przejdź
+                                    do analizy aby pomóc ustalić, czy ta strona nie narusza RODO lub
+                                    ustawy Prawo Komunikacji Elektronicznej.
                                 </p>
                             </section>
                             <section className="actions">
@@ -322,7 +261,7 @@ const Toolbar = () => {
                                             `/components/sidebar/sidebar.html?origin=${origin}`,
                                             'new_tab'
                                         );
-                                        window.close();
+                                        window.close(); // close toolbar popup
                                     }}
                                 >
                                     Przejdź do analizy

compose.yml

@@ -0,0 +1,21 @@
+services:
+    rentgen_build:
+        build: .
+
+    rentgen_check:
+        build:
+            context: .
+            target: code_quality
+
+    rentgen_run:
+        build:
+            context: .
+            target: runtime
+        stdin_open: true
+        tty: true
+
+    rentgen_verify:
+        build:
+            context: .
+            target: integration_test
+        restart: "no"

esbuild.config.js

@@ -1,115 +1,18 @@
 import esbuild from 'esbuild';
 import scss from 'esbuild-plugin-sass';
-import { copyFileSync, mkdirSync, readdirSync, existsSync } from 'fs';
-import { join, dirname } from 'path';
-
-// Określenie platformy docelowej: firefox (domyślnie) lub chrome
-const TARGET = process.env.TARGET || 'firefox';
-const IS_FIREFOX = TARGET === 'firefox';
-const IS_CHROME = TARGET === 'chrome';
-
-// Katalogi wyjściowe
-const DIST_DIR = IS_FIREFOX ? './dist-firefox' : './dist-chrome';
-const LIB_DIR = join(DIST_DIR, 'lib');
-
-console.log(`🎯 Budowanie dla: ${TARGET.toUpperCase()}`);
-console.log(`📁 Katalog wyjściowy: ${DIST_DIR}`);
+import fs from 'fs';
+import path from 'path';
 
 const watch = process.argv.includes('--watch') && {
     onRebuild(error) {
-        if (error) console.error('[watch] budowanie nie powiodło się', error);
-        else console.log('[watch] budowanie zakończone');
+        if (error) console.error('[watch] build failed', error);
+        else console.log('[watch] build finished');
     },
 };
 
-// Funkcja pomocnicza: rekurencyjne kopiowanie katalogów
-function copyDir(src, dest) {
-    if (!existsSync(dest)) {
-        mkdirSync(dest, { recursive: true });
-    }
+const ENABLE_TESTS = process.env.ENABLE_TESTS === 'true';
 
-    const entries = readdirSync(src, { withFileTypes: true });
-    
-    for (const entry of entries) {
-        const srcPath = join(src, entry.name);
-        const destPath = join(dest, entry.name);
-        
-        if (entry.isDirectory()) {
-            copyDir(srcPath, destPath);
-        } else {
-            copyFileSync(srcPath, destPath);
-        }
-    }
-}
-
-// Plugin: kopiowanie plików statycznych po zakończeniu budowania
-const copyStaticFiles = {
-    name: 'copy-static-files',
-    setup(build) {
-        build.onEnd(() => {
-            console.log('📋 Kopiowanie plików statycznych...');
-            
-            // Kopiowanie manifestu (wybór na podstawie platformy docelowej)
-            const manifestSrc = IS_FIREFOX ? './manifest.json' : './manifest-chrome.json';
-            const manifestDest = join(DIST_DIR, 'manifest.json');
-            mkdirSync(dirname(manifestDest), { recursive: true });
-            copyFileSync(manifestSrc, manifestDest);
-            console.log(`   ✓ Skopiowano ${manifestSrc} → ${manifestDest}`);
-            
-            // Kopiowanie katalogu components
-            if (existsSync('./components')) {
-                copyDir('./components', join(DIST_DIR, 'components'));
-                console.log('   ✓ Skopiowano components/');
-            }
-            
-            // Kopiowanie katalogu assets
-            if (existsSync('./assets')) {
-                copyDir('./assets', join(DIST_DIR, 'assets'));
-                console.log('   ✓ Skopiowano assets/');
-            }
-            
-            // Kopiowanie wymaganych bibliotek z node_modules (potrzebne dla plików HTML z UMD React)
-            const nodeModulesDest = join(DIST_DIR, 'node_modules');
-            
-            // React
-            const reactUmdSrc = './node_modules/react/umd';
-            const reactUmdDest = join(nodeModulesDest, 'react/umd');
-            if (existsSync(reactUmdSrc)) {
-                copyDir(reactUmdSrc, reactUmdDest);
-                console.log('   ✓ Skopiowano node_modules/react/umd/');
-            }
-            
-            // React-DOM
-            const reactDomUmdSrc = './node_modules/react-dom/umd';
-            const reactDomUmdDest = join(nodeModulesDest, 'react-dom/umd');
-            if (existsSync(reactDomUmdSrc)) {
-                copyDir(reactDomUmdSrc, reactDomUmdDest);
-                console.log('   ✓ Skopiowano node_modules/react-dom/umd/');
-            }
-            
-            // Survey-React
-            const surveyReactSrc = './node_modules/survey-react';
-            const surveyReactDest = join(nodeModulesDest, 'survey-react');
-            if (existsSync(surveyReactSrc)) {
-                // Kopiowanie tylko niezbędnych plików
-                mkdirSync(surveyReactDest, { recursive: true });
-                const surveyFiles = ['survey.react.min.js', 'survey.react.min.css'];
-                surveyFiles.forEach(file => {
-                    const src = join(surveyReactSrc, file);
-                    if (existsSync(src)) {
-                        copyFileSync(src, join(surveyReactDest, file));
-                    }
-                });
-                console.log('   ✓ Skopiowano node_modules/survey-react/');
-            }
-            
-            console.log(`✅ Budowanie dla ${TARGET.toUpperCase()} zakończone!`);
-        });
-    },
-};
-
-// Zobacz: https://github.com/evanw/esbuild/issues/806#issuecomment-779138268
-// Plugin pomijający importy React (używamy globalnych obiektów z UMD)
+// see https://github.com/evanw/esbuild/issues/806#issuecomment-779138268
 let skipReactImports = {
     name: 'skipReactImports',
     setup(build) {
@@ -133,7 +36,6 @@ let skipReactImports = {
                 loader: 'js',
             };
         });
-        
         build.onLoad({ filter: /.*/, namespace: 'globalExternal_survey-react' }, () => {
             return {
                 contents: `module.exports = globalThis.Survey`,
@@ -143,37 +45,64 @@ let skipReactImports = {
     },
 };
 
-esbuild
-    .build({
-        entryPoints: [
-            // JavaScript/TypeScript
+const entryPoints = [
     'components/toolbar/toolbar.tsx',
     'components/sidebar/sidebar.tsx',
     'components/report-window/report-window.tsx',
     'background.ts',
     'diag.tsx',
-            
-            // Globalne style
     'styles/global.scss',
     'styles/fonts.scss',
+];
 
-            // Style komponentów (kompilowane osobno)
-            'components/toolbar/toolbar.scss',
-            // 'components/sidebar/sidebar.scss',
-            // 'components/report-window/report-window.scss',
-        ],
+if (ENABLE_TESTS) {
+    entryPoints.push('tests/inner-test-content-script.js');
+}
+
+esbuild
+    .build({
+        entryPoints,
         bundle: true,
         // minify: true,
-        outdir: LIB_DIR,
+        outdir: './lib',
         loader: { '.woff': 'file', '.woff2': 'file' },
-        plugins: [scss(), skipReactImports, copyStaticFiles],
+        plugins: [scss(), skipReactImports],
         define: {
             PLUGIN_NAME: '"Rentgen"',
             PLUGIN_URL: '"https://addons.mozilla.org/pl/firefox/addon/rentgen/"',
-            'process.env.TARGET': JSON.stringify(TARGET),
+            ENABLE_TESTS: String(ENABLE_TESTS),
         },
         external: ['react', 'react-dom', 'survey-react'],
         watch,
     })
-    .then(() => console.log(`\n🎉 Dodatek dla ${TARGET.toUpperCase()} zbudowany pomyślnie!\n`))
+    .then(() => {
+        console.log('Add-on was built');
+
+        // Modify manifest.json to include test content script when ENABLE_TESTS=true
+        if (ENABLE_TESTS) {
+            const manifestPath = path.join(process.cwd(), 'manifest.json');
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
+
+            // Add content_scripts for testing
+            if (!manifest.content_scripts) {
+                manifest.content_scripts = [];
+            }
+
+            // Check if test script is already added
+            const hasTestScript = manifest.content_scripts.some(
+                cs => cs.js && cs.js.includes('lib/tests/inner-test-content-script.js')
+            );
+
+            if (!hasTestScript) {
+                manifest.content_scripts.push({
+                    matches: ['<all_urls>'],
+                    js: ['lib/tests/inner-test-content-script.js'],
+                    run_at: 'document_start'
+                });
+
+                fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 4));
+                console.log('Added test content script to manifest.json');
+            }
+        }
+    })
     .catch(() => process.exit(1));

extended-request.ts

@@ -8,27 +8,6 @@ import {
     safeDecodeURIComponent,
 } from './util';
 
-/**
- * Bezpieczna konwersja Uint8Array na string, obsługująca duże tablice
- * które mogłyby spowodować stack overflow przy użyciu String.fromCharCode.apply()
- */
-function uint8ArrayToString(bytes: Uint8Array): string {
-    const CHUNK_SIZE = 8192; // Przetwarzanie w kawałkach 8KB aby uniknąć stack overflow
-    
-    if (bytes.length <= CHUNK_SIZE) {
-        // Mała tablica - używamy szybkiej metody
-        return String.fromCharCode.apply(null, Array.from(bytes) as any);
-    }
-    
-    // Duża tablica - przetwarzamy w kawałkach
-    let result = '';
-    for (let i = 0; i < bytes.length; i += CHUNK_SIZE) {
-        const chunk = bytes.subarray(i, i + CHUNK_SIZE);
-        result += String.fromCharCode.apply(null, Array.from(chunk) as any);
-    }
-    return result;
-}
-
 type NameValue = { name: string; value: string };
 
 export type HAREntry = {
@@ -83,7 +62,7 @@ const whitelisted_cookies = [
     /^Connection$/,
     /^Sec-Fetch-.*$/,
     /^Content-Type$/,
-    /^Cookie$/, // wyodrębniamy to w getCookie() osobno
+    /^Cookie$/, // we're extracting it in getCookie separately anyway
     /^User-Agent$/,
 ];
 
@@ -101,8 +80,8 @@ export default class ExtendedRequest {
     public origin: string;
     public initialized = false;
     public stolenData: StolenDataEntry[] = [];
-    public originalURL: string | null = null; // czasami możemy ustalić tylko origin, a nie pełny URL z paska adresu - np. w przypadku service workerów
-    public originalPathname: string | null = null; // tak samo jak powyżej
+    public originalURL: string | null = null; // sometimes we can only establish that the given request applied to a certain origin, not a full URL from the address bar - in case of service workers, for example. Hence the null
+    public originalPathname: string | null = null; // same as above
     public originalHost: string;
     public requestBody: RequestBody;
 
@@ -112,45 +91,20 @@ export default class ExtendedRequest {
     constructor(data: Request) {
         this.tabId = data.tabId;
         this.url = data.url;
+        this.shorthost = getshorthost(data.url);
         this.requestBody = ((data as any).requestBody as undefined | RequestBody) || {};
+        ExtendedRequest.by_id[data.requestId] = this;
+
         this.data = Object.assign({}, data);
         (this.data as any).frameAncestors = [
             ...((data as any)?.frameAncestors?.map((e: any) => ({ url: e.url })) || []),
-        ];
+        ]; // making a copy?
 
-        ExtendedRequest.by_id[data.requestId] = this;
+        // console.log('→→→',(this.data as any).frameAncestors, (data as any).frameAncestors);
 
-        // ========================================
-        // Parsowanie URL - obsługa różnych przeglądarek
-        // ========================================
-
-        // Funkcja pomocnicza: sprawdzenie czy URL jest poprawnym HTTP(S)
-        const isValidHttpUrl = (urlString: string): boolean => {
-            if (!urlString || urlString.length < 8) return false;
-            const lower = urlString.toLowerCase();
-            return lower.startsWith('http://') || lower.startsWith('https://');
-        };
-
-        // Funkcja pomocnicza: bezpieczne parsowanie URL
-        const safeParseUrl = (urlString: string) => {
-            try {
-                if (!isValidHttpUrl(urlString)) return null;
-                const parsed = new URL(urlString);
-                return {
-                    origin: parsed.origin,
-                    host: parsed.host,
-                    pathname: parsed.pathname
-                };
-            } catch (error) {
-                return null;
-            }
-        };
-
-        // Określenie URL kandydata z kontekstu żądania
         let url: string;
         let is_full_url = true;
         let url_comes_from: string;
-
         if (this.data.type === 'main_frame') {
             url = this.data.url;
             url_comes_from = 'main_frame';
@@ -158,6 +112,7 @@ export default class ExtendedRequest {
             url = this.data.documentUrl;
             url_comes_from = 'documentUrl';
             if (this.data.tabId == -1) {
+                //a service worker?
                 url_comes_from = 'documentUrl (webworker)';
                 is_full_url = false;
             }
@@ -167,58 +122,16 @@ export default class ExtendedRequest {
         ) {
             url = (this.data as any).frameAncestors.at(-1).url || '';
             url_comes_from = 'frameAncestors';
-        } else if (process.env.TARGET === 'chrome' && (this.data as any).initiator) {
-            // Chrome MV3: Używamy właściwości initiator
-            url = (this.data as any).initiator;
-            url_comes_from = 'initiator (Chrome MV3)';
-            is_full_url = false;
         } else {
             url = this.data.documentUrl || this.data.originUrl;
-            url_comes_from = 'ostatnia deska ratunku';
+            url_comes_from = 'last resort';
         }
 
-        // Próba parsowania URLi w kolejności preferencji
-        const urlsToTry = [
-            url,
-            this.data.documentUrl,
-            this.data.originUrl,
-            this.data.url
-        ].filter(Boolean);
-
-        let parsedUrl: { origin: string; host: string; pathname: string } | null = null;
-
-        for (const urlToTry of urlsToTry) {
-            parsedUrl = safeParseUrl(urlToTry as string);
-            if (parsedUrl) {
-                url = urlToTry as string;
-                break;
-            }
-        }
-
-        // Ustawienie właściwości z bezpiecznymi wartościami domyślnymi
-        if (parsedUrl) {
-            // Pomyślnie sparsowano
         this.originalURL = is_full_url ? url : null;
-            this.origin = parsedUrl.origin;
-            this.originalHost = parsedUrl.host;
-            this.originalPathname = is_full_url ? parsedUrl.pathname : null;
+        this.origin = new URL(url).origin;
 
-            // Bezpieczne ustawienie shorthost
-            try {
-                this.shorthost = getshorthost(parsedUrl.host);
-            } catch (error) {
-                console.warn('Nie udało się uzyskać shorthost:', parsedUrl.host, error);
-                this.shorthost = parsedUrl.host;
-            }
-        } else {
-            // Nie udało się sparsować - używamy bezpiecznych wartości domyślnych
-            // Te żądania zostaną odfiltrowane przez isThirdParty() później
-            this.originalURL = null;
-            this.origin = 'unknown://unknown';
-            this.originalHost = 'unknown';
-            this.originalPathname = '/';
-            this.shorthost = 'unknown';
-        }
+        this.originalHost = new URL(url).host;
+        this.originalPathname = is_full_url ? new URL(url).pathname : null;
     }
 
     addHeaders(headers: Request['requestHeaders']) {
@@ -232,30 +145,17 @@ export default class ExtendedRequest {
     }
 
     isThirdParty() {
-        // Pomijanie żądań z nieznanym origin (nieparsowalny URL)
-        if (this.origin === 'unknown://unknown' || this.originalHost === 'unknown') {
-            return false; // Nie śledzimy tych
-        }
-
-        try {
         const request_url = new URL(this.data.url);
-            
         if (request_url.host.includes(this.originalHost)) {
             return false;
         }
-            
         if (getshorthost(request_url.host) == getshorthost(this.originalHost)) {
             return false;
         }
-            
         return (
             request_url.origin != this.origin ||
             (this.data as any).urlClassification.thirdParty.length > 0
         );
-        } catch (error) {
-            // Jeśli nie możemy sparsować URL żądania, nie jest śledzalne
-            return false;
-        }
     }
 
     getReferer() {
@@ -318,19 +218,14 @@ export default class ExtendedRequest {
                     ])
                 ),
             }).map(([key, value]) => {
-                // Obsługa szyfrowanego POST body (jak na ocdn.eu na businessinsider.com.pl)
+                // to handle how ocdn.eu encrypts POST body on https://businessinsider.com.pl/
                 if ((Array.isArray(value) && value.length === 1 && !value[0]) || !value) {
                     return ['requestBody', key];
                 } else if (!Array.isArray(value)) {
-                    // POPRAWKA: Używamy bezpiecznej konwersji w kawałkach zamiast apply()
-                    try {
-                        const uint8Array = new Uint8Array(value.bytes);
-                        const stringValue = uint8ArrayToString(uint8Array);
-                        return ['raw', stringValue];
-                    } catch (e) {
-                        console.warn('Nie udało się przetworzyć bajtów body żądania:', e);
-                        return ['raw', '[Dane binarne - nie udało się przetworzyć]'];
-                    }
+                    return [
+                        'raw',
+                        String.fromCharCode.apply(null, Array.from(new Uint8Array(value.bytes))),
+                    ];
                 } else {
                     return [key, value || ''];
                 }

lib/browser-api/chrome.ts

@@ -14,60 +14,37 @@ export const chromeAPI: BrowserAPI = {
     tabs: {
         query: chrome.tabs.query,
         onUpdated: {
-            addListener: chrome.tabs.onUpdated.addListener.bind(chrome.tabs.onUpdated),
-            removeListener: chrome.tabs.onUpdated.removeListener.bind(chrome.tabs.onUpdated),
+            addListener: chrome.tabs.onUpdated.addListener,
+            removeListener: chrome.tabs.onUpdated.removeListener,
         },
-        onRemoved: chrome.tabs.onRemoved ? {
-            addListener: chrome.tabs.onRemoved.addListener.bind(chrome.tabs.onRemoved),
-            removeListener: chrome.tabs.onRemoved.removeListener.bind(chrome.tabs.onRemoved),
-        } : undefined,
     },
 
-    // Badge API - Chrome używa action (nie browserAction jak Firefox)
-    // Owinięte w try-catch aby obsłużyć zamknięte zakładki
+    // Badge API - Chrome używa action (nie browserAction)
     badge: {
-        setBadgeText: (details: any) => {
-            try {
-                chrome.action.setBadgeText(details);
-            } catch (e) {
-                // Zakładka zamknięta - ignorujemy
-            }
-        },
-        setTitle: (details: any) => {
-            try {
-                chrome.action.setTitle(details);
-            } catch (e) {
-                // Zakładka zamknięta - ignorujemy
-            }
-        },
-        setBadgeBackgroundColor: (details: any) => {
-            try {
-                chrome.action.setBadgeBackgroundColor(details);
-            } catch (e) {
-                // Zakładka zamknięta - ignorujemy
-            }
-        },
+        setBadgeText: chrome.action.setBadgeText,
+        setTitle: chrome.action.setTitle,
+        setBadgeBackgroundColor: chrome.action.setBadgeBackgroundColor,
     },
 
     // WebRequest API - chrome.webRequest.* → webRequest.*
     webRequest: {
         onBeforeRequest: {
-            addListener: chrome.webRequest.onBeforeRequest.addListener.bind(chrome.webRequest.onBeforeRequest),
+            addListener: chrome.webRequest.onBeforeRequest.addListener,
         },
         onBeforeSendHeaders: {
-            addListener: chrome.webRequest.onBeforeSendHeaders.addListener.bind(chrome.webRequest.onBeforeSendHeaders),
+            addListener: chrome.webRequest.onBeforeSendHeaders.addListener,
         },
     },
 
     // Cookies API - chrome.cookies.* → cookies.*
     cookies: {
-        getAll: chrome.cookies.getAll.bind(chrome.cookies),
-        remove: chrome.cookies.remove.bind(chrome.cookies),
+        getAll: chrome.cookies.getAll,
+        remove: chrome.cookies.remove,
     },
 
     // Extension API - chrome.extension.* → extension.*
     extension: {
-        getBackgroundPage: chrome.extension?.getBackgroundPage?.bind(chrome.extension) || (() => null),
+        getBackgroundPage: chrome.extension.getBackgroundPage,
     },
 
     // Windows API - chrome.windows.* → windows.*  

lib/browser-api/firefox.ts

@@ -6,102 +6,49 @@
 
 import type { BrowserAPI } from './types';
 
-// Bezpieczny dostęp do globalnego obiektu browser - sprawdzamy czy istnieje w runtime
-function getBrowser() {
-    // @ts-ignore - dostęp do potencjalnie niezdefiniowanego globalnego obiektu
-    if (typeof globalThis.browser !== 'undefined') {
-        // @ts-ignore
-        return globalThis.browser;
-    }
-    return null;
-}
+// Firefox używa globalnego obiektu `browser`
+declare const browser: any;
 
 export const firefoxAPI: BrowserAPI = {
-    // Tabs API - leniwy dostęp z odpowiednimi typami zwracanymi
+    // Tabs API - direct mapping
     tabs: {
-        query: (queryInfo: any) => {
-            const b = getBrowser();
-            if (b) {
-                return b.tabs.query(queryInfo);
-            }
-            return Promise.resolve([]);
-        },
+        query: browser.tabs.query,
         onUpdated: {
-            addListener: (listener: any) => {
-                getBrowser()?.tabs.onUpdated.addListener(listener);
-            },
-            removeListener: (listener: any) => {
-                getBrowser()?.tabs.onUpdated.removeListener(listener);
-            },
-        },
-        onRemoved: {
-            addListener: (listener: any) => {
-                getBrowser()?.tabs.onRemoved?.addListener(listener);
-            },
-            removeListener: (listener: any) => {
-                getBrowser()?.tabs.onRemoved?.removeListener(listener);
-            },
+            addListener: browser.tabs.onUpdated.addListener,
+            removeListener: browser.tabs.onUpdated.removeListener,
         },
     },
 
-    // Badge API - Firefox używa browserAction (nie action jak Chrome)
+    // Badge API - Firefox używa browserAction
     badge: {
-        setBadgeText: (details: any) => {
-            getBrowser()?.browserAction.setBadgeText(details);
-        },
-        setTitle: (details: any) => {
-            getBrowser()?.browserAction.setTitle(details);
-        },
-        setBadgeBackgroundColor: (details: any) => {
-            getBrowser()?.browserAction.setBadgeBackgroundColor(details);
-        },
+        setBadgeText: browser.browserAction.setBadgeText,
+        setTitle: browser.browserAction.setTitle,
+        setBadgeBackgroundColor: browser.browserAction.setBadgeBackgroundColor,
     },
 
-    // WebRequest API - leniwy dostęp
+    // WebRequest API - direct mapping
     webRequest: {
         onBeforeRequest: {
-            addListener: (listener: any, filter: any, extraInfoSpec?: any) => {
-                getBrowser()?.webRequest.onBeforeRequest.addListener(listener, filter, extraInfoSpec);
-            },
+            addListener: browser.webRequest.onBeforeRequest.addListener,
         },
         onBeforeSendHeaders: {
-            addListener: (listener: any, filter: any, extraInfoSpec?: any) => {
-                getBrowser()?.webRequest.onBeforeSendHeaders.addListener(listener, filter, extraInfoSpec);
-            },
+            addListener: browser.webRequest.onBeforeSendHeaders.addListener,
         },
     },
 
-    // Cookies API - leniwy dostęp z odpowiednimi typami zwracanymi
+    // Cookies API - direct mapping
     cookies: {
-        getAll: (details: any) => {
-            const b = getBrowser();
-            if (b) {
-                return b.cookies.getAll(details);
-            }
-            return Promise.resolve([]);
-        },
-        remove: (details: any) => {
-            const b = getBrowser();
-            if (b) {
-                return b.cookies.remove(details);
-            }
-            return Promise.resolve(null);
-        },
+        getAll: browser.cookies.getAll,
+        remove: browser.cookies.remove,
     },
 
-    // Extension API - leniwy dostęp
+    // Extension API - direct mapping
     extension: {
-        getBackgroundPage: () => {
-            const b = getBrowser();
-            return b ? b.extension.getBackgroundPage() : null;
-        },
+        getBackgroundPage: browser.extension.getBackgroundPage,
     },
 
-    // Windows API - leniwy dostęp
+    // Windows API - direct mapping
     windows: {
-        get WINDOW_ID_CURRENT() {
-            const b = getBrowser();
-            return b ? b.windows.WINDOW_ID_CURRENT : -2;
-        },
+        WINDOW_ID_CURRENT: browser.windows.WINDOW_ID_CURRENT,
     },
 };

lib/browser-api/index.ts

@@ -1,28 +1,27 @@
 /**
- * Browser API Abstraction - Główny eksport
+ * Browser API Abstraction - Main Export
  * 
- * Eksportuje właściwą implementację na podstawie zmiennej TARGET z procesu budowania
- * Używa statycznych importów dla kompatybilności z Chrome service worker
+ * Eksportuje właściwą implementację na podstawie TARGET build variable
  */
 
 import type { BrowserAPI } from './types';
-import { chromeAPI } from './chrome';
-import { firefoxAPI } from './firefox';
 
-// Wybór implementacji API przeglądarki w czasie budowania
+// Build-time selection of browser API implementation
 let browserApi: BrowserAPI;
 
 // TARGET jest ustawiane przez esbuild.config.js na podstawie npm script
 if (process.env.TARGET === 'chrome') {
-    // Build dla Chrome - używamy adaptera Chrome
+    // Chrome build - używamy chrome adapter
+    const { chromeAPI } = require('./chrome');
     browserApi = chromeAPI;
 } else {
-    // Build dla Firefox (domyślny) - używamy adaptera Firefox
+    // Firefox build (default) - używamy firefox adapter  
+    const { firefoxAPI } = require('./firefox');
     browserApi = firefoxAPI;
 }
 
-// Eksport jako default export
+// Eksportuj jako default export
 export default browserApi;
 
-// Re-eksport typów dla wygody
+// Re-export typów dla wygody
 export * from './types';

lib/browser-api/types.ts

@@ -1,86 +1,76 @@
 /**
  * Browser API Abstraction - Typy na podstawie faktycznego użycia w kodzie
+ * 
+ * Przeanalizowane pliki:
+ * - util.ts: tabs.query, Tab.id
+ * - tab-dropdown.tsx: tabs.query, Tab.id, Tab.title  
+ * - toolbar.tsx: tabs.query, tabs.onUpdated, Tab.url, windows.WINDOW_ID_CURRENT
+ * - memory.ts: browserAction.*, webRequest.*, cookies.*, extension.*
  */
 
-// Import pełnego typu Request z util.ts
-export type Request = {
-    cookieStoreId?: string;
-    documentUrl?: string;
-    frameId: number;
-    incognito?: boolean;
-    method: string;
-    originUrl: string;
-    parentFrameId: number;
-    proxyInfo?: {
-        host: string;
-        port: number;
-        type: string;
-        username: string;
-        proxyDNS: boolean;
-        failoverTimeout: number;
-    };
-    requestHeaders?: { name: string; value?: string; binaryValue?: number[] }[];
-    requestId: string;
-    tabId: number;
-    thirdParty?: boolean;
-    timeStamp: number;
-    type: string;
-    url: string;
-    urlClassification?: { firstParty: string[]; thirdParty: string[] };
-};
-
-// === Tab API ===
+// === Tab API (util.ts, tab-dropdown.tsx, toolbar.tsx) ===
 export interface Tab {
-    id?: number;
-    title?: string;
-    url?: string;
+    id?: number;      // util.ts: tab.id, tab-dropdown.tsx: tab.id
+    title?: string;   // tab-dropdown.tsx: tab.title
+    url?: string;     // toolbar.tsx: tab.url
 }
 
 export interface TabQuery {
-    currentWindow?: boolean;
-    active?: boolean;
-    windowId?: number;
-    lastFocusedWindow?: boolean;  // Chrome używa tego zamiast currentWindow czasami
+    currentWindow?: boolean; // util.ts, tab-dropdown.tsx
+    active?: boolean;        // toolbar.tsx
+    windowId?: number;       // toolbar.tsx
 }
 
-// === Badge/BrowserAction API ===
+// === Badge/BrowserAction API (memory.ts) ===
 export interface BadgeTextDetails {
-    text: string;
-    tabId?: number;
+    text: string;    // memory.ts: setBadgeText
+    tabId?: number;  // memory.ts: setBadgeText (optional)
 }
 
 export interface BadgeTitleDetails {
-    title: string;
-    tabId?: number;
+    title: string;   // memory.ts: setTitle
+    tabId?: number;  // memory.ts: setTitle (optional)
 }
 
 export interface BadgeColorDetails {
-    color: string;
+    color: string;   // memory.ts: setBadgeBackgroundColor
 }
 
-// === WebRequest API ===
-export interface RequestFilter {
-    urls: string[];
+// === WebRequest API (memory.ts) ===
+export interface RequestDetails {
+    requestId: string;                    // memory.ts: request.requestId
+    requestHeaders?: RequestHeader[];     // memory.ts: request.requestHeaders
+    // Note: ExtendedRequest konstruktor używa więcej pól, 
+    // ale tu skupiamy się na tym co bezpośrednio używa browser API
 }
 
-export type RequestListener = (details: Request) => void;
-
-// === Cookies API ===
-export interface Cookie {
+export interface RequestHeader {
     name: string;
-    domain: string;
+    value?: string;
+}
+
+export interface RequestFilter {
+    urls: string[];  // memory.ts: { urls: ['<all_urls>'] }
+}
+
+export type RequestListener = (details: RequestDetails) => void;
+
+// === Cookies API (memory.ts) ===
+export interface Cookie {
+    name: string;    // memory.ts: cookie.name
+    domain: string;  // memory.ts: cookie.domain
 }
 
 export interface CookieQuery {
-    domain?: string;
+    domain?: string; // memory.ts: { domain: shorthost }
 }
 
 export interface CookieRemove {
-    name: string;
-    url: string;
+    name: string;    // memory.ts: { name: cookie.name, url: ... }
+    url: string;     // memory.ts: { url: `https://${cookie.domain}` }
 }
 
-// === Główny interfejs Browser API ===
+// === Main Browser API Interface ===
 export interface BrowserAPI {
     // Tabs API
     tabs: {
@@ -89,10 +79,6 @@ export interface BrowserAPI {
             addListener(listener: (tabId: number, changeInfo: any, tab: Tab) => void): void;
             removeListener(listener: (tabId: number, changeInfo: any, tab: Tab) => void): void;
         };
-        onRemoved?: {
-            addListener(listener: (tabId: number, removeInfo: any) => void): void;
-            removeListener(listener: (tabId: number, removeInfo: any) => void): void;
-        };
     };
 
     // Badge API (Firefox: browserAction, Chrome: action)

manifest-chrome.json

@@ -1,35 +0,0 @@
-{
-    "description": "Rentgen is an add-on that automatically visualizes all the data that a given website sends to third parties.",
-    "manifest_version": 3,
-    "name": "Rentgen",
-    "short_name": "Rentgen",
-    "version": "0.1.10",
-    "author": "Kuba Orlik, Arkadiusz Wieczorek (Internet. Czas działać!)",
-    "homepage_url": "https://git.internet-czas-dzialac.pl/icd/rentgen",
-    "background": {
-        "service_worker": "lib/background.js"
-    },
-    "action": {
-        "default_icon": {
-            "16": "assets/icon-16.png",
-            "32": "assets/icon-32.png",
-            "48": "assets/icon-48.png"
-        },
-        "default_title": "Rentgen",
-        "default_popup": "components/toolbar/toolbar.html"
-    },
-    "icons": {
-        "16": "assets/icon-16.png",
-        "32": "assets/icon-32.png",
-        "48": "assets/icon-48.png",
-        "128": "assets/icon-128.png"
-    },
-    "permissions": [
-        "storage",
-        "webRequest",
-        "cookies"
-    ],
-    "host_permissions": [
-        "<all_urls>"
-    ]
-}

manifest.json

@@ -3,8 +3,8 @@
     "manifest_version": 2,
     "name": "Rentgen",
     "short_name": "Rentgen",
-    "version": "0.1.10",
-    "author": "Kuba Orlik, Arkadiusz Wieczorek (Internet. Czas działać!)",
+    "version": "0.2.1",
+    "author": "Kuba Orlik, Arkadiusz Wieczorek (Internet. Time to act! Foundation)",
     "homepage_url": "https://git.internet-czas-dzialac.pl/icd/rentgen",
     "background": {
         "scripts": ["lib/background.js"]

memory.ts

@@ -2,134 +2,20 @@ import ExtendedRequest from './extended-request';
 import { getshorthost } from './util';
 import { RequestCluster } from './request-cluster';
 import { SaferEmitter } from './safer-emitter';
-import browserAPI from './lib/browser-api';
-
-// Deklaracja Chrome API dla TypeScript
-declare const chrome: any;
 
 function setDomainsCount(counter: number, tabId: number) {
-    // Ochrona przed próbą ustawienia badge dla zamkniętej zakładki
-    try {
-        browserAPI.badge.setBadgeText({ text: counter < 0 ? '0' : counter.toString(), tabId });
-        browserAPI.badge.setTitle({
+    browser.browserAction.setBadgeText({ text: counter < 0 ? '0' : counter.toString(), tabId });
+    browser.browserAction.setTitle({
         title: 'Rentgen',
         tabId,
     });
-    } catch (e) {
-        // Zakładka została zamknięta - ignorujemy błąd
-        console.debug(`Zakładka ${tabId} już nie istnieje, pomijanie aktualizacji badge`);
-    }
-}
-
-// Cachowany RequestCluster dla popupu Chrome (ma metody, ale używa danych z cache)
-class CachedRequestCluster extends RequestCluster {
-    private _hasCookies: boolean = false;
-    private _exposesOrigin: boolean = false;
-    private _hasMarks: boolean = false;
-    public lastFullUrl: string | null = null;
-    public lastModified: number = 0;
-    
-    constructor(id: string, cached: any) {
-        super(id);
-        this._hasCookies = cached.hasCookies || false;
-        this._exposesOrigin = cached.exposesOrigin || false;
-        this._hasMarks = cached.hasMarks || false;
-        this.lastFullUrl = cached.lastFullUrl || null;
-        this.lastModified = cached.lastModified || 0;
-        this.requests = []; // Pusta tablica zapobiegająca błędom
-    }
-    
-    hasCookies(): boolean {
-        return this._hasCookies;
-    }
-    
-    exposesOrigin(): boolean {
-        return this._exposesOrigin;
-    }
-    
-    hasMarks(): boolean {
-        return this._hasMarks;
-    }
-    
-    // Automatyczne zaznaczenie dla cachowanego clustra
-    autoMark(): void {
-        this._hasMarks = true;
-        // ✅ Trigger storage sync
-        if (process.env.TARGET === 'chrome') {
-            const memory = getMemory();
-            if (memory instanceof Memory) {
-                memory.scheduleSyncToStorage?.();
-            }
-        }
-    }
-    
-    // Cofnięcie zaznaczenia dla cachowanego clustra
-    undoMark(): void {
-        this._hasMarks = false;
-        // ✅ Trigger storage sync
-        if (process.env.TARGET === 'chrome') {
-            const memory = getMemory();
-            if (memory instanceof Memory) {
-                memory.scheduleSyncToStorage?.();
-            }
-        }
-    }
-    
-    // Nadpisanie metody - zwraca pustą tablicę
-    calculateRepresentativeStolenData(): any[] {
-        return [];
-    }
-    
-    // Nadpisanie metody - zwraca tylko główną domenę
-    getFullHosts(): string[] {
-        return [this.id];
-    }
-    
-    // Metody wymagane przez report-window
-    hasMarkedCookies(): boolean {
-        return this._hasCookies && this._hasMarks;
-    }
-    
-    getMarkedRequests(): any[] {
-        return [];
-    }
-    
-    getMarkedEntries(): any[] {
-        return [];
-    }
-    
-    exposesOriginWhere(): any[] {
-        return this._exposesOrigin ? [{ path: '', source: 'cached', key: '' }] : [];
-    }
-    
-    getDataTypeDescription(noun = 'Twojej'): string {
-        let types_of_data: string[] = [];
-        if (this.exposesOrigin()) {
-            types_of_data.push(`część ${noun} historii przeglądania`);
-        }
-        if (this.hasMarkedCookies()) {
-            types_of_data.push('unikalne ID z cookies');
-        }
-        if (types_of_data.length > 1) {
-            types_of_data[types_of_data.length - 1] = 'oraz ' + types_of_data[types_of_data.length - 1];
-        }
-        return types_of_data.join(', ');
-    }
 }
 
 export default class Memory extends SaferEmitter {
     origin_to_history = {} as Record<string, Record<string, RequestCluster>>;
-    isReady: boolean = true; // Firefox jest zawsze gotowy
-    private readyPromise: Promise<void> | null = null;
-    private syncScheduled: boolean = false;
-    private lastSyncTime: number = 0;
-    
-    // Chrome: Śledzenie pełnych URLi dla zakładek (do generowania screenshotów)
-    private tabUrls: Map<number, string> = new Map();
 
     async register(request: ExtendedRequest) {
         await request.init();
-        
         if (!request.isThirdParty()) {
             return;
         }
@@ -137,31 +23,18 @@ export default class Memory extends SaferEmitter {
             this.origin_to_history[request.origin] = {};
         }
         const shorthost = getshorthost(new URL(request.url).host);
-        
-        let isNewCluster = false;
         if (!this.origin_to_history[request.origin][shorthost]) {
             const cluster = new RequestCluster(shorthost);
             this.origin_to_history[request.origin][shorthost] = cluster;
-            isNewCluster = true;
         }
-        
         this.origin_to_history[request.origin][shorthost].add(request);
-        
-        // Chrome: Automatyczne zaznaczanie podejrzanych domen w service workerze
-        if (process.env.TARGET === 'chrome' && isNewCluster) {
-            // Zaznacz od razu po utworzeniu clustra
-            this.origin_to_history[request.origin][shorthost].autoMark();
-        }
-        
         this.emit('change', shorthost);
 
-        // Owinięcie operacji badge w try-catch
-        try {
         Object.values(this.getClustersForOrigin(request.origin)).some((cluster) =>
             cluster.hasCookies()
         )
-                ? browserAPI.badge.setBadgeBackgroundColor({ color: '#ff726b' })
-                : browserAPI.badge.setBadgeBackgroundColor({ color: '#ffb900' });
+            ? browser.browserAction.setBadgeBackgroundColor({ color: '#ff726b' })
+            : browser.browserAction.setBadgeBackgroundColor({ color: '#ffb900' });
 
         if (request.tabId >= 0) {
             setDomainsCount(
@@ -169,43 +42,18 @@ export default class Memory extends SaferEmitter {
                 request.tabId
             );
         }
-        } catch (e) {
-            // Zakładka zamknięta - ignorujemy błędy badge
-            console.debug('Aktualizacja badge nie powiodła się - zakładka prawdopodobnie zamknięta');
-        }
-
-        // Chrome: Throttlowana synchronizacja do storage (max co 500ms)
-        if (process.env.TARGET === 'chrome') {
-            this.scheduleSyncToStorage();
-        }
     }
 
     constructor() {
         super();
-
-        browserAPI.webRequest.onBeforeRequest.addListener(
+        browser.webRequest.onBeforeRequest.addListener(
             async (request) => {
-                // Chrome: Śledzenie nawigacji main_frame dla pełnego URL
-                if (process.env.TARGET === 'chrome' && request.type === 'main_frame' && request.tabId >= 0) {
-                    this.tabUrls.set(request.tabId, request.url);
-                    console.log(`📍 Zapamiętano URL zakładki ${request.tabId}:`, request.url);
-                }
-                
-                const extReq = new ExtendedRequest(request);
-                
-                // Chrome: Wstrzyknięcie pełnego URL ze śledzonych zakładek
-                if (process.env.TARGET === 'chrome' && request.tabId >= 0) {
-                    const fullUrl = this.tabUrls.get(request.tabId);
-                    if (fullUrl && !extReq.originalURL) {
-                        extReq.originalURL = fullUrl;
-                    }
-                }
+                new ExtendedRequest(request);
             },
             { urls: ['<all_urls>'] },
             ['requestBody']
         );
-        
-        browserAPI.webRequest.onBeforeSendHeaders.addListener(
+        browser.webRequest.onBeforeSendHeaders.addListener(
             async (request) => {
                 const extendedRequest = ExtendedRequest.by_id[request.requestId].addHeaders(
                     request.requestHeaders || []
@@ -215,34 +63,10 @@ export default class Memory extends SaferEmitter {
             { urls: ['<all_urls>'] },
             ['requestHeaders']
         );
-
-        // Chrome: Czyszczenie URLi zakładek po zamknięciu
-        if (process.env.TARGET === 'chrome') {
-            browserAPI.tabs.onRemoved?.addListener?.((tabId: number) => {
-                this.tabUrls.delete(tabId);
-            });
-        }
-
-        // Chrome: Wczytywanie z storage przy starcie (dla popupu)
-        if (process.env.TARGET === 'chrome') {
-            this.isReady = false;
-            this.readyPromise = this.loadFromStorage().then(() => {
-                this.isReady = true;
-                this.emit('ready');
-                console.log('🔵 Memory gotowa do użycia przez popup');
-            });
-        }
     }
 
     emit(eventName: string, data = 'any'): boolean {
-        setTimeout(() => {
-            super.emit(eventName, data);
-
-            // ✅ Sync to storage when marks change (Chrome only)
-            if (process.env.TARGET === 'chrome' && eventName === 'change') {
-                this.scheduleSyncToStorage();
-        }
-        }, 0);
+        setTimeout(() => super.emit(eventName, data), 0);
         return true;
     }
 
@@ -250,19 +74,11 @@ export default class Memory extends SaferEmitter {
         return this.origin_to_history[origin] || {};
     }
 
-    // Chrome: Oczekiwanie na zakończenie wczytywania ze storage
-    async waitUntilReady(): Promise<void> {
-        if (this.isReady) return;
-        if (this.readyPromise) {
-            await this.readyPromise;
-        }
-    }
-
     async removeCookiesFor(origin: string, shorthost?: string): Promise<void> {
         if (shorthost) {
-            const cookies = await browserAPI.cookies.getAll({ domain: shorthost });
+            const cookies = await browser.cookies.getAll({ domain: shorthost });
             for (const cookie of cookies) {
-                await browserAPI.cookies.remove({
+                await browser.cookies.remove({
                     name: cookie.name,
                     url: `https://${cookie.domain}`,
                 });
@@ -276,150 +92,19 @@ export default class Memory extends SaferEmitter {
                     .map((cluster) => this.removeCookiesFor(origin, cluster.id))
             );
         }
-
-        // Chrome: Throttlowana synchronizacja do storage
-        if (process.env.TARGET === 'chrome') {
-            this.scheduleSyncToStorage();
-        }
     }
 
     async removeRequestsFor(origin: string) {
         this.origin_to_history[origin] = {};
-
-        // Chrome: Throttlowana synchronizacja do storage
-        if (process.env.TARGET === 'chrome') {
-            this.scheduleSyncToStorage();
-        }
-    }
-
-    // ========================================
-    // CHROME: Metody synchronizacji ze storage (THROTTLED)
-    // ========================================
-
-    public scheduleSyncToStorage(): void {
-        if (this.syncScheduled) return;
-        
-        this.syncScheduled = true;
-        setTimeout(() => {
-            this.syncToStorage();
-            this.syncScheduled = false;
-        }, 500); // Synchronizacja max co 500ms
-    }
-
-    private syncToStorage(): void {
-        if (typeof chrome !== 'undefined' && chrome.storage?.session) {
-            const now = Date.now();
-            // Pomijamy jeśli synchronizowano niedawno (w ciągu 300ms)
-            if (now - this.lastSyncTime < 300) {
-                return;
-            }
-            this.lastSyncTime = now;
-            
-            const serializable: Record<string, any> = {};
-            
-            for (const [origin, clusters] of Object.entries(this.origin_to_history)) {
-                serializable[origin] = {};
-                for (const [shorthost, cluster] of Object.entries(clusters)) {
-                    // Zapisujemy tylko niezbędne dane dla UI
-                    serializable[origin][shorthost] = {
-                        id: cluster.id,
-                        hasCookies: cluster.hasCookies(),
-                        exposesOrigin: cluster.exposesOrigin(),
-                        hasMarks: cluster.hasMarks(),
-                        requestCount: cluster.requests?.length || 0,
-                        lastFullUrl: cluster.lastFullUrl || null,
-                        lastModified: cluster.lastModified || 0,
-                    };
-                }
-            }
-            
-            chrome.storage.session.set({ rentgen_memory: serializable }).catch((err: any) => {
-                console.error('Nie udało się zsynchronizować pamięci do storage:', err);
-            });
-        }
-    }
-
-    private async loadFromStorage(): Promise<void> {
-        if (typeof chrome !== 'undefined' && chrome.storage?.session) {
-            try {
-                const result = await chrome.storage.session.get('rentgen_memory');
-                if (result.rentgen_memory) {
-                    const serialized = result.rentgen_memory;
-                    
-                    for (const [origin, clusters] of Object.entries(serialized)) {
-                        this.origin_to_history[origin] = {};
-                        for (const [shorthost, cached] of Object.entries(clusters as Record<string, any>)) {
-                            // Tworzenie CachedRequestCluster ze wszystkimi potrzebnymi danymi
-                            const clusterData = cached as { 
-                                id: string; 
-                                hasCookies: boolean; 
-                                exposesOrigin: boolean;
-                                hasMarks: boolean;
-                                requestCount: number;
-                                lastFullUrl: string | null;
-                                lastModified: number;
-                            };
-                            this.origin_to_history[origin][shorthost] = new CachedRequestCluster(
-                                clusterData.id,
-                                clusterData
-                            );
-                        }
-                    }
-                    
-                    console.log('🔵 Wczytano pamięć z chrome.storage.session:', Object.keys(this.origin_to_history).length, 'origins');
-                }
-            } catch (err) {
-                console.error('Nie udało się wczytać pamięci ze storage:', err);
-            }
-        }
     }
 }
 
-// ========================================
-// INICJALIZACJA: Firefox vs Chrome
-// ========================================
-
 export function init() {
     const memory = new Memory();
 
-    if (process.env.TARGET === 'chrome') {
-        // Chrome MV3: Service worker używa 'self' zamiast 'window'
-        (self as any).memory = memory;
-        console.log('🔵 Memory zainicjalizowana w service workerze Chrome (self.memory + chrome.storage.session)');
-    } else {
-        // Firefox: Standardowa strona tła z 'window'
     (window as any).memory = memory;
-        console.log('🦊 Memory zainicjalizowana w stronie tła Firefox (window.memory)');
-    }
 }
 
-// ========================================
-// DOSTĘP DO MEMORY: Firefox vs Chrome
-// ========================================
-
-// Cachowana instancja memory dla popupu (tylko Chrome)
-let popupMemoryInstance: Memory | null = null;
-
 export function getMemory(): Memory {
-    if (process.env.TARGET === 'chrome') {
-        // Chrome: Najpierw próba pobrania z service workera
-        if (typeof self !== 'undefined' && (self as any).memory) {
-            // Jesteśmy W service workerze - bezpośredni dostęp
-            return (self as any).memory as Memory;
-        } else {
-            // Jesteśmy w popupie/contencie - tworzymy RAZ i cachujemy
-            if (!popupMemoryInstance) {
-                console.log('🔵 Tworzenie instancji Chrome memory dla popupu (czytanie z chrome.storage.session)');
-                popupMemoryInstance = new Memory();
-            }
-            return popupMemoryInstance;
-        }
-    } else {
-        // Firefox: Używamy tradycyjnego getBackgroundPage()
-        const backgroundPage = browserAPI.extension.getBackgroundPage();
-        if (!backgroundPage) {
-            throw new Error('Strona tła nie jest dostępna');
-        }
-        return (backgroundPage.window as any).memory as Memory;
-    }
+    return (browser.extension.getBackgroundPage().window as any).memory as Memory;
 }

package.json

@@ -1,26 +1,26 @@
 {
     "name": "rentgen",
-    "version": "0.1.10",
+    "version": "0.2.1",
     "description": "Rentgen is an add-on prepared for both Firefox-based and Chromium-based browsers. This extension will automatically visualize all the data that a given website sends to third parties.",
     "main": "esbuild.config.js",
     "type": "module",
     "scripts": {
-        "convert-icons": "node scripts/convert-icons.js",
         "build": "node esbuild.config.js",
         "build:firefox": "TARGET=firefox node esbuild.config.js",
-        "build:chrome": "npm run convert-icons && TARGET=chrome node esbuild.config.js",
+        "build:chrome": "TARGET=chrome node esbuild.config.js",
         "watch": "node esbuild.config.js --watch",
         "watch:firefox": "TARGET=firefox node esbuild.config.js --watch",
         "watch:chrome": "TARGET=chrome node esbuild.config.js --watch",
         "ext-test": "web-ext run",
         "build-addon": "npm i && npm run build && npm run create-package",
-        "build-addon:firefox": "npm i && npm run build && npm run create-package:firefox",
+        "build-addon:firefox": "npm i && npm run build:firefox && npm run create-package:firefox",
         "build-addon:chrome": "npm i && npm run build:chrome && npm run create-package:chrome",
         "create-package": "web-ext build --ignore-files '!**/node_modules' '!**/node_modules/**/react-dom' '!**/node_modules/**/react-dom/umd' '!**/node_modules/**/*/react-dom.production.min.js' '!**/node_modules/**/react' '!**/node_modules/**/react/umd' '!**/node_modules/**/*/react.production.min.js' '!**/node_modules/**/survey-react'  '!**/node_modules/**/survey-react/*.min.js' '!**/node_modules/**/survey-react/*.min.css' --overwrite-dest",
-        "create-package:firefox": "cd dist-firefox && web-ext build --overwrite-dest --artifacts-dir ../web-ext-artifacts --ignore-files '!**/node_modules' '!**/node_modules/**/react-dom' '!**/node_modules/**/react-dom/umd' '!**/node_modules/**/*/react-dom.production.min.js' '!**/node_modules/**/react' '!**/node_modules/**/react/umd' '!**/node_modules/**/*/react.production.min.js' '!**/node_modules/**/survey-react' '!**/node_modules/**/survey-react/*.min.js' '!**/node_modules/**/survey-react/*.min.css'",
+        "create-package:firefox": "web-ext build --overwrite-dest --artifacts-dir ../web-ext-artifacts",
         "create-package:chrome": "cd dist-chrome && 7z a -tzip ../web-ext-artifacts/rentgen-chrome-0.1.10.zip * && cd ..",
         "typecheck": "tsc --noEmit",
-        "lint": "web-ext lint"
+        "lint": "web-ext lint --ignore-files 'tests/**'",
+        "test": "ENABLE_TESTS=true npm run build && node tests/test_verify.mjs; git checkout manifest.json"
     },
     "repository": {
         "type": "git",
@@ -29,6 +29,9 @@
     "homepage": "https://git.internet-czas-dzialac.pl/icd/rentgen",
     "author": "Kuba Orlik, Arkadiusz Wieczorek",
     "license": "GPL-3.0-or-later",
+    "engines": {
+        "node": ">=25"
+    },
     "dependencies": {
         "@iabtcf/core": "^1.3.1",
         "@types/proposal-relative-indexing-method": "^0.1.0",
@@ -58,7 +61,7 @@
         "addons-linter": "^4.7.0",
         "esbuild": "^0.14.14",
         "esbuild-plugin-sass": "^1.0.1",
-        "sharp": "^0.34.4",
+        "selenium-webdriver": "^4.38.0",
         "typescript": "^4.6.4",
         "web-ext": "^6.7.0",
         "web-ext-types": "^3.2.1"

scripts/convert-icons.js

@@ -1,32 +0,0 @@
-import sharp from 'sharp';
-import { mkdirSync } from 'fs';
-
-const sizes = [16, 32, 48, 128];
-const svgPath = 'assets/icon-addon.svg';
-const outputDir = 'dist-chrome/assets';
-
-async function convertIcons() {
-    try {
-        // Upewnienie się, że katalog wyjściowy istnieje
-        mkdirSync(outputDir, { recursive: true });
-        
-        console.log('🎨 Konwersja ikon SVG do PNG dla Chrome...');
-        
-        // Konwersja do każdego rozmiaru
-        for (const size of sizes) {
-            await sharp(svgPath)
-                .resize(size, size)
-                .png()
-                .toFile(`${outputDir}/icon-${size}.png`);
-            
-            console.log(`✓ Utworzono icon-${size}.png`);
-        }
-        
-        console.log('✅ Wszystkie ikony Chrome wygenerowane pomyślnie');
-    } catch (error) {
-        console.error('Błąd konwersji ikon:', error);
-        process.exit(1);
-    }
-}
-
-convertIcons();

tests/inner-test-content-script.js

@@ -0,0 +1,48 @@
+// Test content script - RUNS INSIDE THE BROWSER EXTENSION
+// Only loaded during automated testing (ENABLE_TESTS=true)
+// This script proves bidirectional communication between content script and background
+
+// Browser API polyfill for Chrome/Chromium compatibility
+if (typeof browser === 'undefined') {
+    var browser = chrome;
+}
+
+// Set initial DOM marker to prove content script is injected
+(function() {
+    function setMarker() {
+        if (document.body) {
+            document.body.setAttribute('data-rentgen-injected', 'true');
+        } else {
+            // Wait for DOM ready
+            if (document.readyState === 'loading') {
+                document.addEventListener('DOMContentLoaded', () => {
+                    document.body.setAttribute('data-rentgen-injected', 'true');
+                });
+            }
+        }
+    }
+    setMarker();
+})();
+
+// Listen for test request from test script (test-lib.js)
+document.addEventListener('DEBUG_rentgen_test_request', async (event) => {
+    try {
+        // Send message to background script to get badge count for this origin
+        // This tests real Rentgen functionality: counting third-party domains
+        const response = await browser.runtime.sendMessage({
+            type: 'RENTGEN_TEST_VERIFICATION',
+            origin: window.location.origin,
+            url: window.location.href,
+            title: document.title,
+            timestamp: event.detail?.timestamp || Date.now()
+        });
+
+        // Store the badge count in DOM for the test script to read
+        if (response && response.success) {
+            document.body.setAttribute('data-rentgen-badge-count', String(response.badgeCount));
+        }
+    } catch (error) {
+        // If there's an error, the test will timeout waiting for badge count
+        console.error('Test verification error:', error);
+    }
+});

tests/pre-commit

@@ -0,0 +1,21 @@
+#!/bin/bash
+# Pre-commit hook for Rentgen extension
+# Builds and runs verification tests before allowing commit
+
+set -e
+
+echo "Running pre-commit checks..."
+
+# Build all stages
+echo "Building Docker images..."
+docker compose build
+
+# Run code quality checks (typecheck + lint)
+echo "Running code quality checks..."
+docker compose up --abort-on-container-exit --exit-code-from rentgen_check rentgen_check
+
+# Run integration tests
+echo "Running integration tests..."
+docker compose up --abort-on-container-exit --exit-code-from rentgen_verify rentgen_verify
+
+echo "✓ All pre-commit checks passed!"

tests/run-checks.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Code quality checks for Rentgen extension
+# Runs typecheck and lint
+
+set -e
+
+echo "Running type checking..."
+npm run typecheck
+
+echo "Running linter..."
+npm run lint
+
+echo "Running tests..."
+npm run test
+
+echo "✓ All code quality checks passed!"

tests/test-lib.js

@@ -0,0 +1,55 @@
+// Test library for Marionette-based extension verification
+// This JavaScript code runs in the browser context via Marionette
+
+/**
+ * Check if test content script is loaded
+ * The content script is automatically injected by manifest.json when ENABLE_TESTS=true
+ * @returns {Promise<boolean>} - True if content script is loaded
+ */
+async function waitForTestContentScript() {
+    // Wait for content script to set the marker
+    let attempts = 0;
+    while (attempts < 50) {
+        if (document.body && document.body.getAttribute('data-rentgen-injected') === 'true') {
+            return true;
+        }
+        await new Promise(resolve => setTimeout(resolve, 100));
+        attempts++;
+    }
+    return false;
+}
+
+/**
+ * Test that background script returns badge count correctly
+ * Tests real Rentgen functionality: counting third-party domains
+ * @returns {Promise<number|null>} - Badge count (number of third-party domains) or null on failure
+ */
+async function testBadgeCount() {
+    // Wait for content script to be loaded
+    const loaded = await waitForTestContentScript();
+    if (!loaded) {
+        return -1;  // Content script not loaded
+    }
+
+    // Dispatch test request to content script
+    document.dispatchEvent(new CustomEvent('DEBUG_rentgen_test_request', {
+        detail: { timestamp: Date.now() }
+    }));
+
+    // Wait for background response with badge count
+    return new Promise((resolve) => {
+        let attempts = 0;
+        const checkInterval = setInterval(() => {
+            attempts++;
+            const badgeCount = document.body.getAttribute('data-rentgen-badge-count');
+
+            if (badgeCount !== null) {
+                clearInterval(checkInterval);
+                resolve(parseInt(badgeCount));
+            } else if (attempts > 50) {
+                clearInterval(checkInterval);
+                resolve(null);
+            }
+        }, 100);
+    });
+}

tests/test_verify.mjs

@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+/**
+ * test_verify.mjs - Extension badge count verification test using Selenium WebDriver
+ *
+ * Verifies Rentgen's core functionality: counting third-party domains.
+ * Tests two scenarios:
+ * 1. Site without third-party domains (news.ycombinator.com) → badge = 0
+ * 2. Site with third-party domains (pudelek.pl) → badge > 0
+ */
+
+import { Builder } from 'selenium-webdriver';
+import firefox from 'selenium-webdriver/firefox.js';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Load test library once
+const testLibPath = join(__dirname, 'test-lib.js');
+const testLib = readFileSync(testLibPath, 'utf-8');
+
+/**
+ * Test badge count for a specific URL
+ * @param {WebDriver} driver - Selenium WebDriver instance
+ * @param {string} url - URL to test
+ * @param {number} waitMs - How long to wait after page load
+ * @returns {Promise<number|null>} Badge count or null on failure
+ */
+async function testUrl(driver, url, waitMs = 5000) {
+    await driver.get(url);
+    await driver.sleep(waitMs);
+
+    const badgeCount = await driver.executeAsyncScript(`
+        const testLibCode = arguments[0];
+        const callback = arguments[1];
+
+        eval(testLibCode);
+        testBadgeCount().then(callback).catch(err => callback(null));
+    `, testLib);
+
+    return badgeCount;
+}
+
+/**
+ * Verify badge count matches expected value
+ * @param {number|null} actual - Actual badge count
+ * @param {number|string} expected - Expected value (number or '>0')
+ * @returns {boolean} Whether assertion passed
+ */
+function assertBadgeCount(actual, expected) {
+    if (actual === null) return false;
+    if (expected === '>0') return actual > 0;
+    return actual === expected;
+}
+
+async function testBadgeCount() {
+    let driver = null;
+
+    try {
+        const extensionPath = join(__dirname, '..');
+
+        console.log('  Launching Firefox with extension...');
+
+        const options = new firefox.Options();
+        if (process.env.HEADLESS !== 'false') {
+            options.addArguments('-headless');
+        }
+
+        driver = await new Builder()
+            .forBrowser('firefox')
+            .setFirefoxOptions(options)
+            .build();
+
+        console.log('  Installing extension...');
+        await driver.installAddon(extensionPath, true);
+
+        // Test cases: [url, expectedBadgeCount, waitMs, name]
+        const testCases = [
+            ['https://news.ycombinator.com', 0, 5000, 'news.ycombinator.com'],
+            ['https://pudelek.pl', '>0', 10000, 'pudelek.pl']
+        ];
+
+        const results = {};
+
+        for (const [url, expected, waitMs, name] of testCases) {
+            console.log(`  Testing ${name} (expected: ${expected === '>0' ? '>0' : expected} third-party domains)...`);
+            const badgeCount = await testUrl(driver, url, waitMs);
+            results[name] = badgeCount;
+            console.log(`    → Badge count: ${badgeCount}`);
+
+            if (!assertBadgeCount(badgeCount, expected)) {
+                await driver.quit();
+                return {
+                    success: false,
+                    error: `${name}: expected ${expected}, got ${badgeCount}`
+                };
+            }
+        }
+
+        await driver.quit();
+        return { success: true, results };
+
+    } catch (error) {
+        if (driver) {
+            await driver.quit();
+        }
+        return { success: false, error: error.message };
+    }
+}
+
+async function main() {
+    console.log('Starting Rentgen badge count verification test...');
+    console.log('');
+
+    const result = await testBadgeCount();
+
+    console.log('');
+    if (!result.success) {
+        console.log(`FAIL: ${result.error}`);
+        process.exit(1);
+    }
+
+    console.log('PASS: Badge count test succeeded!');
+    const resultNames = Object.keys(result.results);
+    for (const name of resultNames) {
+        console.log(`  - ${name}: ${result.results[name]} third-party domains`);
+    }
+    process.exit(0);
+}
+
+// Handle signals
+process.on('SIGINT', () => process.exit(130));
+process.on('SIGTERM', () => process.exit(143));
+
+main().catch(error => {
+    console.error(`ERROR: ${error.message}`);
+    process.exit(1);
+});

util.ts

@@ -1,12 +1,11 @@
 import { EventEmitter } from 'events';
 import React from 'react';
 import { DataLocation, Sources } from './stolen-data-entry';
-import browserAPI from './lib/browser-api';
 
 export type Unpromisify<T> = T extends Promise<infer R> ? R : T;
 export type Unarray<T> = T extends Array<infer R> ? R : T;
 
-export type Tab = Unarray<Unpromisify<ReturnType<typeof browserAPI.tabs.query>>>;
+export type Tab = Unarray<Unpromisify<ReturnType<typeof browser.tabs.query>>>;
 export type Request = {
     cookieStoreId?: string;
     documentUrl?: string; // RL of the document in which the resource will be loaded. For example, if the web page at "https://example.com" contains an image or an iframe, then the documentUrl for the image or iframe will be "https://example.com". For a top-level document, documentUrl is undefined.
@@ -34,50 +33,21 @@ export type Request = {
 };
 
 export function getshorthost(host: string) {
-    // Obsługa przypadków brzegowych
-    if (!host || typeof host !== 'string') {
-        console.warn('getshorthost: nieprawidłowy host:', host);
-        return 'unknown';
-    }
-
-    // Czyszczenie stringa hosta
-    const cleanHost = host
-        .replace(/^.*:\/\//, '')  // Usunięcie protokołu
-        .replace(/\/.*$/, '')      // Usunięcie ścieżki
-        .replace(/:\d+$/, '');     // Usunięcie portu
-
-    const parts = cleanHost.split('.');
-
-    // Obsługa przypadków specjalnych
-    if (parts.length === 0 || !cleanHost) {
-        console.warn('getshorthost: pusty host po czyszczeniu');
-        return 'unknown';
-    }
-
-    if (parts.length === 1) {
-        // Pojedyncze słowo jak "localhost" lub "unknown"
-        return parts[0];
-    }
-
+    const parts = host
+        .replace(/^.*:\/\//, '')
+        .replace(/\/.*$/, '')
+        .split('.');
     const second_last = parts.at(-2);
-    
-    // Bezpieczny fallback jeśli wciąż nieprawidłowy
     if (!second_last) {
-        console.warn('getshorthost: nie można określić domeny dla:', host);
-        return cleanHost; // Zwracamy jak jest zamiast crashować
+        throw new Error('url too short?');
     }
-
     let lookback = !['co', 'com'].includes(second_last) ? -2 : -3;
-    
     if (parts.at(-2) == 'doubleclick' || parts.at(-2) == 'google') {
-        lookback = -4; // aby rozróżnić google ads i stats
+        lookback = -4; // to distinguish between google ads and stats
     } else if (parts.at(-2) == 'google') {
-        lookback = -3; // aby rozróżnić różne usługi google
+        lookback = -3; // to distinguish various google services
     }
-
-    // Upewnienie się, że nie wycinamy poza granice tablicy
-    const sliceStart = Math.max(0, parts.length + lookback);
-    return parts.slice(sliceStart).join('.');
+    return parts.slice(lookback).join('.');
 }
 
 export function useEmitter(
@@ -119,7 +89,7 @@ export function parseCookie(cookie: string): Record<string, string> {
 }
 
 export async function getTabByID(id: number) {
-    const tabs = await browserAPI.tabs.query({ currentWindow: true });
+    const tabs = await browser.tabs.query({ currentWindow: true });
     return tabs.find((tab) => tab.id == id);
 }