fix(popup): seed lastKnownPeers in init() to prevent false join toasts

init() called updatePeerList() directly but never set lastKnownPeers.
On the first PEER_UPDATE message (heartbeat, play/pause, any state
change), detectPeerChanges() saw lastKnownPeers=[] and treated ALL
peers including self as newly joined — triggering 'name joined the room'
toast on every action while the popup was open.

AI_INIT.md

@@ -68,7 +68,7 @@ The following features are critical and must not be removed or fundamentally alt
 - **Two-Phase Force Sync**: The `Prepare` → `ACK` → `Execute` flow ensures all peers are buffered before playback resumes.
 - **Episode Auto-Sync**: Ensures series binges stay perfectly synced. A lobby initiates during title transitions, freezing peers until everyone is ready.
 - **Dual Heartbeat**: 
-    - **Background Heartbeat (30s)**: Ensures session persistence even without a video element.
+    - **Background Heartbeat (1m)**: Ensures session persistence even without a video element.
     - **Content Heartbeat (15s)**: Transmits current video metadata (time, title).
 - **Dead Peer Pruning**: Server "Reaper" disconnects peers after 5 minutes of total silence (no heartbeats or events).
 - **Deduplication**: Server kills old sockets if a user re-joins with the same `peerId` to prevent ghosts.

PRIVACY.md

@@ -15,8 +15,7 @@ KoalaSync does not use a database. All active session data exists only in the se
 |:----------|:------------------|:---------------------|
 | Session data (peerId, username, video metadata) | Duration of session | User leaves room or disconnects |
 | Room state | 2 hours max | Last peer leaves, or inactivity timeout |
-| Failed auth lockout records | 15 minutes | Automatic expiry |
-| Auth failure records | 1 hour | Periodic cleanup |
+| Auth failure records (lockout after 5 failed attempts) | 15 minutes | Periodic cleanup |
 | Connection rate-limit counters | 60 seconds | Automatic expiry |
 | Event rate-limit counters | 10 seconds | Automatic expiry + periodic cleanup |
 

README.md

@@ -1,18 +1,19 @@
-# <img src="extension/icons/icon128.png" width="32" valign="middle"> KoalaSync
+<h1 align="center"><img src="extension/icons/icon128.png" width="32" valign="middle"> KoalaSync</h1>
 
 <p align="center">
   <a href="https://github.com/Shik3i/KoalaSync/actions/workflows/release.yml"><img src="https://github.com/Shik3i/KoalaSync/actions/workflows/release.yml/badge.svg" alt="Release Status"></a>
   <a href="https://github.com/Shik3i/KoalaSync/releases"><img src="https://img.shields.io/github/v/release/Shik3i/KoalaSync" alt="GitHub release"></a>
   <a href="LICENSE"><img src="https://img.shields.io/github/license/Shik3i/KoalaSync?color=blue" alt="License"></a>
-  <img src="https://img.shields.io/badge/Browser-Chrome%20|%20Firefox-blueviolet" alt="Cross Browser">
+  <a href="https://addons.mozilla.org/de/firefox/addon/koalasync/"><img src="https://img.shields.io/badge/Firefox-Download-orange?logo=firefoxbrowser&logoColor=white" alt="Firefox Add-on"></a>
+  <a href="https://chromewebstore.google.com/detail/koalasync/obbnmkmlaaddodakcbdljknjpagklifc"><img src="https://img.shields.io/badge/Chrome-Download-blue?logo=googlechrome&logoColor=white" alt="Chrome Extension"></a>
 </p>
 
-KoalaSync is a premium, lightweight Browser Extension and Relay Server for synchronized video playback across any website—YouTube, Twitch, Netflix, and custom HTML5 players. Built with a focus on **Data Sovereignty** and **Extreme Performance**.
+<p align="center"><i>KoalaSync is a lightweight Browser Extension and Relay Server for synchronized video playback across any website—YouTube, Twitch, Netflix, and custom HTML5 players. Built with a focus on <b>Data Sovereignty</b> and <b>Performance</b>.</i></p>
 
 ### 🌟 Why KoalaSync?
 
 *   **🛡️ Security-First**: Volatile RAM-based relay with built-in brute-force protection and zero-persistence architecture.
-*   **📡 Direct Logic**: Custom wire protocol implementation for frame-perfect synchronization.
+*   **📡 Direct Logic**: Manual Socket.IO wire implementation for reliable synchronization.
 *   **🛠️ Clean Build**: Dependency-free extension runtime with no library overhead.
 *   **🌐 Universal**: Works on any website with a `<video>` tag.
 
@@ -24,7 +25,7 @@ KoalaSync is a premium, lightweight Browser Extension and Relay Server for synch
 - **Episode Auto-Sync**: Perfectly sync series binges. All peers wait until everyone has loaded the next episode before starting together.
 - **Smart Matching**: Automatically highlights tabs containing matching video titles.
 - **Dual Heartbeat Architecture**: Robust session tracking that prevents ghost rooms and stale connections.
-- **Zero-Latency Relay**: Custom wire protocol implementation for maximum performance.
+- **Efficient Relay**: Minimal overhead WebSocket message forwarding.
 - **Seamless Invitations**: Smart links that automatically configure server and room credentials for your friends.
 
 ---

docs/ARCHITECTURE.md

@@ -11,18 +11,19 @@ This document describes the communication flows and internal logic of the KoalaS
      - **Protocol Version**: Client must match the server's protocol (currently `1.0.0`).
   3. Server responds with Engine.IO handshake (`0`) and the client joins the namespace (`40`).
 - **Room Join**: Background emits `JOIN_ROOM` containing `roomId`, `password`, `peerId`, and `username`.
-- **Deduplication**: If a user joins with a `peerId` that already has an active socket, the server kills the old socket to prevent "Ghost Peers".
+- **Deduplication**: If a user joins with a `peerId` that already has an active socket, the server kills the old socket to prevent "Ghost Peers". Deduplication re-validates after acquiring the room creation lock to avoid kicking the wrong socket during concurrent joins.
 
 ## 2. Media Event Synchronization
 When a user interacts with a video:
-1. **Detection**: `content.js` listens to native events (`play`, `pause`, `seeked`) on the `<video>` element.
-2. **Prevention of Loops**: Uses an `expectedEvents` Set to distinguish between user actions and programmatic actions. Expected events are consumed on match and expire via timeout.
+1. **Detection**: `content.js` listens to native events (`play`, `pause`, `seeked`) on the `<video>` element, including videos inside Shadow DOM (YouTube, Netflix, etc.).
+2. **Prevention of Loops**: Uses an `expectedEvents` Set to distinguish between user actions and programmatic actions. Expected events are consumed on match and expire via timeout. Timeout IDs are cleaned up immediately to prevent memory leaks.
 3. **Reporting**: `content.js` sends a `CONTENT_EVENT` to `background.js`.
 4. **Relay**: The Server forwards the event to all other peers in the room.
-5. **Execution**: Remote peers receive the command and call `video.play()`, `video.pause()`, or `video.currentTime = targetTime`.
+5. **Execution**: Remote peers receive the command via `SERVER_COMMAND` (which includes the original `senderId` for correct ACK routing) and call `video.play()`, `video.pause()`, or `video.currentTime = targetTime`.
+6. **ACK Routing**: `content.js` echoes the `commandSenderId` back in `CMD_ACK`, ensuring the `EVENT_ACK` is routed to the correct initiating peer even when multiple commands arrive concurrently.
 
 ## 3. Two-Phase Force Sync
-Ensures all peers are frame-perfect and buffered before resuming:
+Ensures all peers are buffered and synchronized before resuming:
 1. **Prepare**: Initiator sends `FORCE_SYNC_PREPARE` with the target timestamp.
 2. **Buffer**: Peers seek and pause. Once buffered (`readyState >= 3`), they send a `FORCE_SYNC_ACK`. (Note: `content.js` limits polling to 8000ms).
 3. **Execute**: Once the Initiator collects ACKs (or after an 8.5s timeout), they send `FORCE_SYNC_EXECUTE`.
@@ -44,6 +45,7 @@ To maintain a clean room state and eliminate "Ghost Peers":
 - **Video Heartbeat (Content)**: Every 15 seconds, `content.js` sends current playback metadata (time, title, state) if a video is found.
 - **Server Pruning**: The server runs a "Reaper" every 2 minutes. If a peer has sent **zero** activity (no events and no heartbeats) for 5 minutes, they are forcefully disconnected.
 - **Immediate Cleanup**: Rooms are deleted instantly when the last peer leaves or disconnects.
+- **Reconnect Strategy**: Aggressive backoff — 500ms base, 1.5x multiplier, capped at 5s. Max 20 attempts before marking as failed. Events are queued during disconnect and flushed after namespace rejoin.
 
 > [!CAUTION]
 > **Identity Rule**: Differentiate between `peerId` and `socket.id`. Use `socket.id` exclusively for ephemeral transport routing on the server. Use `peerId` exclusively for identity, state management, and room tracking across the stack.
@@ -54,8 +56,13 @@ KoalaSync uses a megaphone routing approach to minimize server logic:
 - **Storm Prevention**: When dispatching state updates in response to a new user joining (e.g., an active lobby state), ensure ONLY the initiator (or a designated leader) calls `emit()` to prevent $O(N)$ broadcast storms.
 
 ## 7. Security & Stability
-- **Service Worker Lifecycle**: Uses `chrome.alarms` to prevent the Manifest V3 service worker from suspending while in an active room.
-- **Rate Limiting**: Server-side per-socket and per-IP rate limits to prevent sync-spamming or DoS.
+- **Service Worker Lifecycle**: Uses `chrome.alarms` (30s interval) to prevent the Manifest V3 service worker from suspending while in an active room. On wake, runtime state is restored from `chrome.storage.session` via `ensureState()`.
+- **Reconnect Visualization**: Badge shows "..." (orange) during reconnect. Popup displays "Reconnecting..." with attempt counter.
+- **Rate Limiting**: Server-side per-socket and per-IP rate limits to prevent sync-spamming or DoS. Real client IP extracted via `x-forwarded-for` header behind proxies/CDNs.
+- **Room Creation Lock**: Per-room mutex prevents race conditions when multiple peers join a new room simultaneously.
+- **CORS**: Allows `chrome-extension://` origins for WebSocket fallback compatibility.
+- **Message Buffer**: `maxHttpBufferSize` set to 4KB to accommodate large `JOIN_ROOM` payloads.
+- **Process Guards**: `uncaughtException` and `unhandledRejection` handlers prevent silent server crashes.
 - **Noise Filtering**: Uses a curated blacklist of domains (Search Engines, Social Media) to declutter the "Target Tab" selector in the popup.
 - **Diagnostics**: A "Dev" tab provides real-time access to the underlying `<video>` state (`readyState`, `paused`, `currentTime`) for easier troubleshooting.
 

docs/HOW_IT_WORKS.md

@@ -143,7 +143,7 @@ If videos drift out of sync, either user can click **"Force Sync"**:
 
 ### Phase 2 — Execute
 6. Once all ACKs are received (or after 8.5 seconds), the initiator emits `FORCE_SYNC_EXECUTE`.
-7. All peers call `video.play()` simultaneously, achieving frame-perfect sync.
+7. All peers call `video.play()` simultaneously, achieving synchronized playback.
 
 > **Why two phases?** Without buffering confirmation, peers with slower connections would start playing before they've loaded the target timestamp, causing immediate desync.
 
@@ -155,7 +155,7 @@ While in a room, two heartbeats keep the session alive:
 
 | Heartbeat | Interval | Source | Purpose |
 |:----------|:---------|:-------|:--------|
-| **Background** | 1 minute | `background.js` | Signals "I'm still connected" and handles 5-min auto-reconnect fallback |
+| **Background** | 30 seconds | `background.js` | Signals "I'm still connected" and triggers aggressive reconnect (500ms base, max 5s) |
 | **Content** | 15 seconds | `content.js` | Sends video metadata: `currentTime`, `mediaTitle`, `playbackState`, `volume`, `muted` |
 
 - **Server Reaper**: Every 2 minutes, the server checks for peers with no activity for 5+ minutes and disconnects them ("dead peer pruning").

docs/ROADMAP.md

@@ -0,0 +1,26 @@
+# KoalaSync Roadmap
+
+This document tracks planned features, improvements, and their implementation details.
+
+---
+
+## Offene technische Fragen
+
+### 1. Service Worker Fallback bei Room-State Verlust
+Manifest V3 suspendiert den Service Worker nach ~30s Inaktivität. `chrome.alarms` weckt ihn auf, aber:
+- **Problem:** Wenn der SW neu startet, sind alle Variablen (`currentRoom`, `socket`, `isNamespaceJoined`) weg
+- **Aktueller Stand:** `chrome.storage.session` persistiert `currentRoom`, `peerId`, `eventQueue` — der SW stellt diese beim Start wieder her (`ensureState()`)
+- **Gelöst:** WebSocket wird automatisch via `connect()` neu aufgebaut. Events werden während Reconnect gequeued und nach Namespace-Join geflushed. "Reconnecting..." Status wird im Popup + Badge angezeigt. KeepAlive-Alarm auf 30s reduziert. Reconnect-Backoff: 500ms Basis, max 5s (statt vorher 1s→30s).
+
+### 7. Tests für Extensions
+Stimmt, sind aufwändig. Praktische Ansätze:
+- **Unit Tests:** `jest` + `jest-chrome` (mockt `chrome.*` APIs) — testet `popup.js` Logik, Server-Logik
+- **Integration Tests:** `puppeteer` mit `--load-extension` Flag — testet Extension im echten Browser
+- **Server Tests:** `supertest` + `socket.io-client` — testet WebSocket-Flows
+- **Aufwand:** ~400-600 LOC für sinnvolle Testabdeckung der Kernlogik
+
+---
+
+## Zukünftige Features
+
+Neue Features werden nur nach expliziter Freigabe hinzugefügt.

extension/README.md

@@ -20,7 +20,7 @@ KoalaSync requires `<all_urls>` permission to detect and interact with video ele
 - **No Browsing History**: We do not track or store your browsing history.
 - **State Management**: Sensitive data (Room Passwords) is stored locally using `chrome.storage`.
 - **Zero Telemetry**: No analytics or external tracking scripts.
-- **Zero Runtime Dependencies**: The extension is built with pure Vanilla JS and contains no external libraries or tracking scripts, ensuring maximum performance and privacy.
+- **Zero Runtime Dependencies**: The extension is built with pure Vanilla JS and contains no external libraries or tracking scripts, ensuring performance and privacy.
 
 ## Installation
 1. **Prepare Extension**: From the repository root, run:

extension/background.js

@@ -1,9 +1,7 @@
-import { EVENTS, PROTOCOL_VERSION, OFFICIAL_SERVER_URL, OFFICIAL_SERVER_TOKEN, APP_VERSION, EPISODE_LOBBY_TIMEOUT } from './shared/constants.js';
+import { EVENTS, PROTOCOL_VERSION, OFFICIAL_SERVER_URL, OFFICIAL_SERVER_TOKEN, APP_VERSION, EPISODE_LOBBY_TIMEOUT, FORCE_SYNC_TIMEOUT } from './shared/constants.js';
 
 // --- State Management ---
 let socket = null;
-let reconnectDelay = 1000;
-const MAX_RECONNECT_DELAY = 30000;
 let isConnecting = false;
 let peerId = null; // initialized via getPeerId()
 let currentRoom = null;
@@ -17,7 +15,6 @@ let pendingHistory = [];
 let eventQueue = [];
 let isNamespaceJoined = false;
 let lastActionState = { action: null, senderId: null, timestamp: 0, acks: [] };
-let currentCommandSenderId = null; // Track who sent the last command we are executing
 
 // --- Boot Sequence Lock ---
 let restorationTask = null;
@@ -25,12 +22,22 @@ let restorationTask = null;
 function ensureState() {
     if (!restorationTask) {
         restorationTask = new Promise(resolve => {
+            let resolved = false;
+            const done = () => { if (!resolved) { resolved = true; resolve(); } };
+
+            const storageTimeout = setTimeout(() => {
+                addLog('Storage restoration timed out, continuing with defaults', 'warn');
+                storageInitialized = true;
+                done();
+            }, 10000);
+
             chrome.storage.session.get([
                 'logs', 'history', 'currentRoom', 'lastActionState', 
                 'eventQueue', 'isForceSyncInitiator', 'forceSyncAcks', 
                 'forceSyncDeadline', 'reconnectFailed', 'reconnectStartTime', 'currentTabId', 'currentTabTitle',
                 'episodeLobby'
             ], (data) => {
+                clearTimeout(storageTimeout);
                 if (data.currentTabId !== undefined) currentTabId = data.currentTabId;
                 if (data.currentTabTitle !== undefined) currentTabTitle = data.currentTabTitle;
                 // Merge data from storage with any early-arriving state
@@ -91,7 +98,7 @@ function ensureState() {
                     pendingHistory = [];
                 }
 
-                resolve();
+                done();
             });
         });
     }
@@ -102,11 +109,12 @@ function ensureState() {
 ensureState();
 
 let reconnectTimer = null;
-let reconnectStartTime = null; // New: track when reconnection started
-let reconnectFailed = false; // New: true if we hit the 5-min cap
-let slowReconnectTimer = null; // Infinite slow background reconnect timer
-let isSlowReconnectAttempt = false; // True during slow background reconnect execution
-let lastSlowReconnectAttempt = 0;
+let reconnectStartTime = null;
+let reconnectFailed = false;
+let reconnectAttempts = 0;
+const MAX_RECONNECT_ATTEMPTS = 20;
+const _RECONNECT_BASE_DELAY = 500;
+const _RECONNECT_MAX_DELAY = 5000;
 
 // Force Sync Coordination
 let isForceSyncInitiator = false;
@@ -145,7 +153,7 @@ function createPeerData(raw) {
  */
 function updateLocalPeerState(targetPeerId, updates) {
     if (!currentRoom || !Array.isArray(currentRoom.peers)) return;
-    const peer = currentRoom.peers.find(p => (p.peerId || p) === targetPeerId);
+    const peer = currentRoom.peers.find(p => typeof p === 'object' ? p.peerId === targetPeerId : p === targetPeerId);
     if (peer && typeof peer === 'object') {
         Object.keys(updates).forEach(key => {
             if (updates[key] !== undefined && updates[key] !== null) {
@@ -170,22 +178,35 @@ async function getPeerId() {
 }
 
 async function getSettings() {
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         chrome.storage.sync.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'username'], (data) => {
+            if (chrome.runtime.lastError) {
+                reject(new Error(chrome.runtime.lastError.message));
+                return;
+            }
             let username = data.username;
             if (!username) {
-                const adjs = ['Happy', 'Cool', 'Fast', 'Smart', 'Brave', 'Calm', 'Sneaky', 'Lazy', 'Wild', 'Chill', 'Lucky', 'Epic'];
-                const nouns = ['Koala', 'Panda', 'Tiger', 'Eagle', 'Fox', 'Bear', 'Wolf', 'Lion', 'Hawk', 'Seal', 'Owl', 'Shark'];
+                const adjs = ['Happy', 'Cool', 'Fast', 'Smart', 'Brave', 'Calm', 'Sneaky', 'Lazy', 'Wild', 'Chill', 'Lucky', 'Epic', 'Swift', 'Bold', 'Mighty', 'Cosmic', 'Neon', 'Shadow', 'Crystal', 'Thunder', 'Silent', 'Golden', 'Fierce', 'Noble', 'Mystic', 'Frozen', 'Blazing', 'Sapphire', 'Iron', 'Crimson'];
+                const nouns = ['Koala', 'Panda', 'Tiger', 'Eagle', 'Fox', 'Bear', 'Wolf', 'Lion', 'Hawk', 'Seal', 'Owl', 'Shark', 'Dragon', 'Phoenix', 'Falcon', 'Panther', 'Raven', 'Cobra', 'Lynx', 'Jaguar', 'Orca', 'Mantis', 'Viper', 'Condor', 'Badger', 'Otter', 'Rhino', 'Crane', 'Mongoose', 'Specter'];
                 username = `${adjs[Math.floor(Math.random() * adjs.length)]}${nouns[Math.floor(Math.random() * nouns.length)]}`;
-                chrome.storage.sync.set({ username });
+                chrome.storage.sync.set({ username }, () => {
+                    resolve({
+                        serverUrl: data.serverUrl || '',
+                        useCustomServer: data.useCustomServer || false,
+                        roomId: data.roomId || '',
+                        password: data.password || '',
+                        username: username
+                    });
+                });
+            } else {
+                resolve({
+                    serverUrl: data.serverUrl || '',
+                    useCustomServer: data.useCustomServer || false,
+                    roomId: data.roomId || '',
+                    password: data.password || '',
+                    username: username
+                });
             }
-            resolve({
-                serverUrl: data.serverUrl || '',
-                useCustomServer: data.useCustomServer || false,
-                roomId: data.roomId || '',
-                password: data.password || '',
-                username: username
-            });
         });
     });
 }
@@ -211,9 +232,6 @@ async function connect() {
     if (isConnecting) return;
     isConnecting = true;
 
-    const isCurrentSlowRetry = isSlowReconnectAttempt;
-    isSlowReconnectAttempt = false;
-
     let finalUrl = '';
     try {
         // --- Phase 1: Storage ---
@@ -245,12 +263,12 @@ async function connect() {
             return;
         }
 
-        if (reconnectFailed && !isCurrentSlowRetry) {
+        if (reconnectFailed) {
             isConnecting = false;
-            return; // Let keepAlive alarm handle the 5-min retry interval
+            return;
         }
 
-        broadcastConnectionStatus('connecting');
+        broadcastConnectionStatus('reconnecting');
         const isCustomServer = settings.serverUrl && settings.useCustomServer;
         finalUrl = isCustomServer ? settings.serverUrl : OFFICIAL_SERVER_URL;
 
@@ -273,7 +291,7 @@ async function connect() {
             throw new Error(`[URL Error] ${e.message}`);
         }
 
-        addLog(`Connecting to ${isCustomServer ? finalUrl : 'Official Server'}...`, 'info');
+        addLog(`Connecting to ${isCustomServer ? finalUrl : 'Official Server'}... (attempt ${reconnectAttempts + 1})`, 'info');
 
         // --- Phase 4: WebSocket Init ---
         try {
@@ -291,15 +309,10 @@ async function connect() {
 
         // --- Phase 5: Event Listeners ---
         socket.onopen = () => {
-            reconnectDelay = 1000;
+            reconnectAttempts = 0;
             addLog('WebSocket Connection Opened', 'success');
             reconnectStartTime = null;
             reconnectFailed = false;
-            isSlowReconnectAttempt = false;
-            if (slowReconnectTimer) {
-                clearTimeout(slowReconnectTimer);
-                slowReconnectTimer = null;
-            }
             chrome.storage.session.set({ reconnectFailed: false });
             isNamespaceJoined = false;
             socket.send('40');
@@ -339,7 +352,11 @@ async function connect() {
             } else if (msg.startsWith('42')) {
                 try {
                     const payload = JSON.parse(msg.substring(2));
-                    handleServerEvent(payload[0], payload[1]);
+                    try {
+                        handleServerEvent(payload[0], payload[1]);
+                    } catch (handlerErr) {
+                        addLog(`Handler error for ${payload[0]}: ${handlerErr.message}`, 'error');
+                    }
                 } catch (_e) {
                     addLog(`Failed to parse message: ${msg}`, 'error');
                 }
@@ -350,7 +367,6 @@ async function connect() {
             isConnecting = false;
             isNamespaceJoined = false;
             
-            // Clear Force Sync state
             isForceSyncInitiator = false;
             forceSyncAcks.clear();
             if (forceSyncTimeout) clearTimeout(forceSyncTimeout);
@@ -360,22 +376,21 @@ async function connect() {
                 forceSyncDeadline: null 
             });
 
-            // Cancel any active episode lobby
-            clearEpisodeLobbyState();
             
             if (currentRoom) {
                 currentRoom.peers = [];
+                if (storageInitialized) chrome.storage.session.set({ currentRoom });
                 chrome.runtime.sendMessage({ type: 'PEER_UPDATE', peers: [] }).catch(() => {});
             }
             broadcastConnectionStatus('disconnected');
-            addLog(`Disconnected. Retrying in ${reconnectDelay / 1000}s...`, 'warn');
+            addLog('Disconnected. Scheduling reconnect...', 'warn');
+            socket = null;
             scheduleReconnect();
         };
 
-        socket.onerror = (err) => {
+        socket.onerror = () => {
             broadcastConnectionStatus('disconnected');
-            addLog(`WebSocket Error: ${err.message || 'Handshake failed or server unreachable'}`, 'error');
-            socket.close();
+            addLog('WebSocket Error: Connection failed', 'error');
         };
 
     } catch (e) {
@@ -394,11 +409,15 @@ function broadcastConnectionStatus(status) {
 
 function updateBadgeStatus() {
     const isConnected = socket && socket.readyState === WebSocket.OPEN && isNamespaceJoined;
-    const status = isConnected ? 'connected' : (isConnecting || (socket && socket.readyState === WebSocket.CONNECTING) ? 'connecting' : 'disconnected');
+    const isReconnecting = !isConnected && reconnectAttempts > 0 && !reconnectFailed;
+    const status = isConnected ? 'connected' : (isConnecting || (socket && socket.readyState === WebSocket.CONNECTING) ? 'connecting' : (isReconnecting ? 'reconnecting' : 'disconnected'));
 
     if (reconnectFailed) {
         chrome.action.setBadgeText({ text: 'ERR' });
         chrome.action.setBadgeBackgroundColor({ color: '#ef4444' });
+    } else if (status === 'reconnecting') {
+        chrome.action.setBadgeText({ text: '...' });
+        chrome.action.setBadgeBackgroundColor({ color: '#f59e0b' });
     } else if (status === 'connecting') {
         chrome.action.setBadgeText({ text: '...' });
         chrome.action.setBadgeBackgroundColor({ color: '#fbbf24' });
@@ -411,53 +430,69 @@ function updateBadgeStatus() {
 }
 
 function showNotification(senderName, action) {
-    const label = action === 'play' ? 'started playback' : 
-                  action === 'pause' ? 'paused playback' : 
-                  action === 'seek' ? 'seeked the video' :
-                  action === 'force_sync_prepare' ? 'started force sync' :
-                  action === 'force_sync_execute' ? 'synchronized everyone' : action;
-    
-    // Find username in current room if available
-    let displayName = senderName || 'A peer';
-    if (currentRoom && currentRoom.peers) {
-        const peer = currentRoom.peers.find(p => (p.peerId || p) === senderName);
-        if (peer && peer.username) displayName = peer.username;
-    }
+    chrome.storage.sync.get(['browserNotifications'], (settings) => {
+        if (!settings.browserNotifications) return;
 
-    chrome.notifications.create(`sync_${Date.now()}`, {
-        type: 'basic',
-        iconUrl: 'icons/icon128.png',
-        title: 'KoalaSync',
-        message: `${displayName} ${label}.`,
-        priority: 1
+        const label = action === 'play' ? 'started playback' : 
+                      action === 'pause' ? 'paused playback' : 
+                      action === 'seek' ? 'seeked the video' :
+                      action === 'force_sync_prepare' ? 'started force sync' :
+                      action === 'force_sync_execute' ? 'synchronized everyone' : action;
+        
+        let displayName = senderName || 'A peer';
+        if (currentRoom && Array.isArray(currentRoom.peers)) {
+            const peer = currentRoom.peers.find(p => (p.peerId || p) === senderName);
+            if (peer && peer.username) displayName = peer.username;
+        }
+
+        chrome.notifications.create(`sync_${Date.now()}`, {
+            type: 'basic',
+            iconUrl: 'icons/icon128.png',
+            title: 'KoalaSync',
+            message: `${displayName} ${label}.`,
+            priority: 1
+        });
     });
 }
 
 function scheduleReconnect() {
     if (reconnectTimer) return;
-    
-    isSlowReconnectAttempt = false;
 
     if (reconnectFailed) {
         return;
     }
-    
+
     if (!reconnectStartTime) reconnectStartTime = Date.now();
 
     // Check 5 minute cap (300,000ms)
     if (Date.now() - reconnectStartTime > 300000) {
         reconnectFailed = true;
         chrome.storage.session.set({ reconnectFailed: true });
-        addLog('Reconnection failed after 5 minutes. Entering slow background retry mode.', 'error');
+        addLog('Reconnection failed after 5 minutes.', 'error');
         broadcastConnectionStatus('reconnect_failed');
         return;
     }
-    
+
+    reconnectAttempts++;
+
+    // Cap at max attempts to prevent infinite loops
+    if (reconnectAttempts > MAX_RECONNECT_ATTEMPTS) {
+        reconnectFailed = true;
+        chrome.storage.session.set({ reconnectFailed: true });
+        addLog('Reconnection failed after max attempts.', 'error');
+        broadcastConnectionStatus('reconnect_failed');
+        return;
+    }
+
+    // Aggressive reconnect: 500ms base, cap at 5s, no exponential growth beyond that
+    const delay = Math.min(_RECONNECT_BASE_DELAY * Math.pow(1.5, reconnectAttempts - 1), _RECONNECT_MAX_DELAY);
+
+    addLog(`Reconnect in ${Math.round(delay)}ms (attempt ${reconnectAttempts})`, 'warn');
+
     reconnectTimer = setTimeout(() => {
         reconnectTimer = null;
-        reconnectDelay = Math.min(reconnectDelay * 2, MAX_RECONNECT_DELAY);
         connect();
-    }, reconnectDelay);
+    }, delay);
 }
 
 // Slow reconnect logic is now handled in the keepAlive alarm
@@ -497,8 +532,13 @@ function handleServerEvent(event, data) {
     switch (event) {
         case EVENTS.ROOM_DATA:
             currentRoom = data;
+            if (currentRoom && Array.isArray(currentRoom.peers)) {
+                currentRoom.peers = currentRoom.peers.map(p => typeof p === 'object' ? createPeerData(p) : { peerId: p, username: null, tabTitle: null, mediaTitle: null, playbackState: null, currentTime: null, volume: null, muted: null, lastHeartbeat: Date.now() });
+            } else if (currentRoom) {
+                currentRoom.peers = [];
+            }
             if (storageInitialized) chrome.storage.session.set({ currentRoom });
-            addLog(`Joined Room: ${data.roomId}`, 'success');
+            addLog(`Joined Room: ${data?.roomId || 'unknown'}`, 'success');
             chrome.runtime.sendMessage({ type: 'PEER_UPDATE', peers: data.peers }).catch(() => {});
                         
             // Inform Website Bridge & Popup
@@ -574,14 +614,14 @@ function handleServerEvent(event, data) {
                 }
 
                 // Check if all peers responded
-                const peerCount = currentRoom ? currentRoom.peers.length : 1;
+                const peerCount = currentRoom && Array.isArray(currentRoom.peers) ? currentRoom.peers.length : 1;
                 if (forceSyncAcks.size >= peerCount) {
                     executeForceSync();
                 }
             }
             break;
         case EVENTS.FORCE_SYNC_EXECUTE:
-            if (data.senderId) {
+            if (data?.senderId) {
                 addToHistory(event, data.senderId);
                 showNotification(data.senderId, event);
 
@@ -604,7 +644,7 @@ function handleServerEvent(event, data) {
             routeToContent(event, data);
             break;
         case EVENTS.EVENT_ACK:
-            if (lastActionState && lastActionState.action && data.senderId) {
+            if (lastActionState && lastActionState.action && data?.senderId) {
                 // Correlation Check: Only accept ACK if it matches our current action's timestamp
                 if (data.actionTimestamp === lastActionState.timestamp) {
                     if (!Array.isArray(lastActionState.acks)) lastActionState.acks = [];
@@ -640,20 +680,18 @@ function handleServerEvent(event, data) {
                     if (storageInitialized) chrome.storage.session.set({ currentRoom });
                     chrome.runtime.sendMessage({ type: 'PEER_UPDATE', peers: currentRoom.peers }).catch(() => {});
 
-                    // Episode Lobby: Handle peer departure
                     if (episodeLobby) {
                         checkEpisodeLobbyPeerDeparture();
                     }
 
                     if (isForceSyncInitiator) {
-                        const peerCount = currentRoom.peers ? currentRoom.peers.length : 1;
+                        const peerCount = Array.isArray(currentRoom.peers) ? currentRoom.peers.length : 1;
                         if (forceSyncAcks.size >= peerCount) {
                             executeForceSync();
                         }
                     }
                 } else {
-                    // Heartbeat/Update: Update tabTitle for matching
-                    const peer = currentRoom.peers.find(p => (p.peerId || p) === data.peerId);
+                    const peer = currentRoom.peers.find(p => (typeof p === 'object' ? p.peerId : p) === data.peerId);
                     if (peer) {
                         if (typeof peer === 'object') {
                             peer.tabTitle = data.tabTitle;
@@ -662,8 +700,6 @@ function handleServerEvent(event, data) {
                             peer.volume = data.volume !== undefined ? data.volume : peer.volume;
                             peer.muted = data.muted !== undefined ? data.muted : peer.muted;
 
-                            // Race condition guard: ignore heartbeat playbackState/currentTime 
-                            // if we applied a reactive user action in the last 1.0 second.
                             const timeSinceReactive = peer.lastReactiveUpdate ? (Date.now() - peer.lastReactiveUpdate) : Infinity;
                             const ignoreStatus = timeSinceReactive < 1000;
 
@@ -811,10 +847,13 @@ function executeEpisodeLobby() {
     clearEpisodeLobbyState();
     addLog(`Episode lobby complete: Starting "${title}" via Force Sync`, 'success');
 
-    // Trigger a standard Force Sync at targetTime 0.0
     isForceSyncInitiator = true;
     forceSyncAcks.clear();
-    const deadline = Date.now() + 8500;
+    const deadline = Date.now() + FORCE_SYNC_TIMEOUT;
+    const timestamp = Date.now();
+    updateLastAction(EVENTS.FORCE_SYNC_PREPARE, 'You', timestamp);
+    lastActionState.targetTime = 0.0;
+    if (storageInitialized) chrome.storage.session.set({ lastActionState });
     chrome.storage.session.set({ 
         isForceSyncInitiator: true, 
         forceSyncAcks: [], 
@@ -822,15 +861,15 @@ function executeEpisodeLobby() {
     });
 
     const syncPayload = { targetTime: 0.0 };
-    emit(EVENTS.FORCE_SYNC_PREPARE, { ...syncPayload, peerId });
-    routeToContent(EVENTS.FORCE_SYNC_PREPARE, syncPayload);
+    emit(EVENTS.FORCE_SYNC_PREPARE, { ...syncPayload, peerId, actionTimestamp: timestamp });
+    routeToContent(EVENTS.FORCE_SYNC_PREPARE, { ...syncPayload, actionTimestamp: timestamp });
 
     forceSyncTimeout = setTimeout(() => {
         if (isForceSyncInitiator) {
             addLog('Force Sync (Episode): Timeout waiting for ACKs, executing anyway...', 'warn');
             executeForceSync();
         }
-    }, 8500);
+    }, FORCE_SYNC_TIMEOUT);
 }
 
 function checkEpisodeLobbyCompletion() {
@@ -843,6 +882,7 @@ function checkEpisodeLobbyCompletion() {
 
 function checkEpisodeLobbyPeerDeparture() {
     if (!episodeLobby || !currentRoom) return;
+    if (!Array.isArray(currentRoom.peers)) return;
     const remainingPeerIds = currentRoom.peers.map(p => typeof p === 'object' ? p.peerId : p);
     
     // If only we remain, cancel the lobby
@@ -877,16 +917,16 @@ async function routeToContent(action, payload) {
     const tabId = parseInt(currentTabId);
     if (isNaN(tabId)) return;
 
-    currentCommandSenderId = payload.senderId || null;
-    const actionTimestamp = payload.actionTimestamp || Date.now();
+    const actionTimestamp = payload?.actionTimestamp || Date.now();
+    const commandSenderId = payload?.senderId || null;
 
     chrome.tabs.sendMessage(tabId, { 
         type: 'SERVER_COMMAND',
         action,
         payload,
-        actionTimestamp
+        actionTimestamp,
+        commandSenderId
     }).catch(err => {
-        // Auto-Reinject if content script is missing or extension was reloaded
         if (err.message.includes('Receiving end does not exist') || err.message.includes('Extension context invalidated')) {
             chrome.scripting.executeScript({
                 target: { tabId },
@@ -905,20 +945,13 @@ async function routeToContent(action, payload) {
 }
 
 // --- Keep-Alive Mechanism ---
-chrome.alarms.create('keepAlive', { periodInMinutes: 1 });
+chrome.alarms.create('keepAlive', { periodInMinutes: 0.5 });
 chrome.alarms.onAlarm.addListener(async (alarm) => {
     await ensureState();
     if (alarm.name === 'keepAlive') {
         chrome.storage.session.get('keepAlive', () => {});
         if (!socket || socket.readyState !== WebSocket.OPEN) {
-            if (reconnectFailed) {
-                if (Date.now() - lastSlowReconnectAttempt >= 300000) {
-                    lastSlowReconnectAttempt = Date.now();
-                    isSlowReconnectAttempt = true;
-                    addLog('Alarm triggered 5-min slow reconnect attempt', 'info');
-                    connect();
-                }
-            } else {
+            if (!reconnectFailed) {
                 connect();
             }
         } else if (currentRoom) {
@@ -938,11 +971,7 @@ function leaveOldRoomIfSwitching(newRoomId) {
     if (currentRoom && currentRoom.roomId !== newRoomId) {
         addLog(`Switching rooms: leaving ${currentRoom.roomId} to join ${newRoomId}`, 'info');
         if (socket && socket.readyState === WebSocket.OPEN && isNamespaceJoined) {
-            try {
-                socket.send(`42${JSON.stringify([EVENTS.LEAVE_ROOM, { peerId }])}`);
-            } catch (_e) {
-                addLog('Failed to send leave room packet during transition', 'error');
-            }
+            emit(EVENTS.LEAVE_ROOM, { peerId });
         }
         currentRoom = null;
         if (storageInitialized) chrome.storage.session.set({ currentRoom: null });
@@ -975,18 +1004,13 @@ async function handleAsyncMessage(message, sender, sendResponse) {
     if (message.type === 'CONNECT') {
         reconnectFailed = false;
         reconnectStartTime = null;
-        isSlowReconnectAttempt = false;
-        if (slowReconnectTimer) {
-            clearTimeout(slowReconnectTimer);
-            slowReconnectTimer = null;
-        }
+        reconnectAttempts = 0;
         chrome.storage.session.set({ reconnectFailed: false });
         const settings = await getSettings();
         if (settings.roomId) {
             leaveOldRoomIfSwitching(settings.roomId);
         }
         if (socket && socket.readyState === WebSocket.OPEN && isNamespaceJoined) {
-            // Already connected, but maybe room changed or we need to refresh room state
             if (settings.roomId) {
                 emit(EVENTS.JOIN_ROOM, { 
                     roomId: settings.roomId, 
@@ -1004,18 +1028,18 @@ async function handleAsyncMessage(message, sender, sendResponse) {
     } else if (message.type === 'RETRY_CONNECT') {
         reconnectFailed = false;
         reconnectStartTime = null;
-        reconnectDelay = 1000;
-        isSlowReconnectAttempt = false;
-        if (slowReconnectTimer) {
-            clearTimeout(slowReconnectTimer);
-            slowReconnectTimer = null;
+        reconnectAttempts = 0;
+        if (reconnectTimer) {
+            clearTimeout(reconnectTimer);
+            reconnectTimer = null;
         }
         chrome.storage.session.set({ reconnectFailed: false });
         connect();
         sendResponse({ status: 'ok' });
     } else if (message.type === 'GET_STATUS') {
         const isConnected = socket && socket.readyState === WebSocket.OPEN && isNamespaceJoined;
-        let status = isConnected ? 'connected' : (isConnecting || (socket && socket.readyState === WebSocket.CONNECTING) ? 'connecting' : 'disconnected');
+        const isReconnecting = !isConnected && reconnectAttempts > 0 && !reconnectFailed;
+        let status = isConnected ? 'connected' : (isConnecting || (socket && socket.readyState === WebSocket.CONNECTING) ? 'connecting' : (isReconnecting ? 'reconnecting' : 'disconnected'));
         if (reconnectFailed) status = 'reconnect_failed';
         sendResponse({ 
             status, 
@@ -1023,7 +1047,8 @@ async function handleAsyncMessage(message, sender, sendResponse) {
             peers: currentRoom ? currentRoom.peers : [],
             lastActionState,
             targetTabId: currentTabId,
-            episodeLobby: episodeLobby
+            episodeLobby: episodeLobby,
+            reconnectAttempts
         });
     } else if (message.type === 'LEAVE_ROOM') {
         emit(EVENTS.LEAVE_ROOM, { peerId });
@@ -1111,7 +1136,7 @@ async function handleAsyncMessage(message, sender, sendResponse) {
         const processEvent = () => {
             const timestamp = Date.now();
             updateLastAction(message.action, 'You', timestamp);
-            lastActionState.targetTime = message.payload.targetTime !== undefined ? message.payload.targetTime : message.payload.currentTime;
+            lastActionState.targetTime = message.payload?.targetTime !== undefined ? message.payload.targetTime : message.payload?.currentTime;
             if (storageInitialized) chrome.storage.session.set({ lastActionState });
             message.payload.actionTimestamp = timestamp;
             
@@ -1124,7 +1149,7 @@ async function handleAsyncMessage(message, sender, sendResponse) {
             if (message.action === EVENTS.FORCE_SYNC_PREPARE) {
                 isForceSyncInitiator = true;
                 forceSyncAcks.clear();
-                const deadline = Date.now() + 8500;
+                const deadline = Date.now() + FORCE_SYNC_TIMEOUT;
                 chrome.storage.session.set({ 
                     isForceSyncInitiator: true, 
                     forceSyncAcks: [], 
@@ -1139,7 +1164,7 @@ async function handleAsyncMessage(message, sender, sendResponse) {
                         addLog('Force Sync: Timeout waiting for ACKs, executing anyway...', 'warn');
                         executeForceSync();
                     }
-                }, 8500);
+                }, FORCE_SYNC_TIMEOUT);
             }
             addToHistory(message.action, 'You');
             emit(message.action, { ...message.payload, peerId });
@@ -1176,7 +1201,7 @@ async function handleAsyncMessage(message, sender, sendResponse) {
                 });
             }
 
-            const peerCount = currentRoom ? currentRoom.peers.length : 1;
+            const peerCount = currentRoom && Array.isArray(currentRoom.peers) ? currentRoom.peers.length : 1;
             if (forceSyncAcks.size >= peerCount) {
                 executeForceSync();
             }
@@ -1185,11 +1210,11 @@ async function handleAsyncMessage(message, sender, sendResponse) {
         }
         sendResponse({ status: 'ok' });
     } else if (message.type === 'CMD_ACK') {
-        // Content script successfully ran a command. Send ACK back to the initiator.
-        if (currentCommandSenderId && currentCommandSenderId !== peerId) {
+        const commandSenderId = message.commandSenderId;
+        if (commandSenderId && commandSenderId !== peerId) {
             emit(EVENTS.EVENT_ACK, { 
                 senderId: peerId, 
-                targetId: currentCommandSenderId,
+                targetId: commandSenderId,
                 actionTimestamp: message.actionTimestamp 
             });
         }
@@ -1212,21 +1237,25 @@ async function handleAsyncMessage(message, sender, sendResponse) {
             const statusPayload = { ...message.payload, peerId, username: settings.username, tabTitle: currentTabTitle };
             emit(EVENTS.PEER_STATUS, statusPayload);
 
-            if (currentRoom && currentRoom.peers) {
+            if (currentRoom && Array.isArray(currentRoom.peers)) {
                 const me = currentRoom.peers.find(p => (p.peerId || p) === peerId);
                 if (me && typeof me === 'object') {
                     me.tabTitle = currentTabTitle;
                     me.username = settings.username;
-                    me.mediaTitle = message.payload.mediaTitle;
-                    me.playbackState = message.payload.playbackState;
-                    me.currentTime = message.payload.currentTime;
-                    me.volume = message.payload.volume;
-                    me.muted = message.payload.muted;
+                    me.mediaTitle = message.payload?.mediaTitle;
+                    me.playbackState = message.payload?.playbackState;
+                    me.currentTime = message.payload?.currentTime;
+                    me.volume = message.payload?.volume;
+                    me.muted = message.payload?.muted;
                     me.lastHeartbeat = Date.now();
+                    if (storageInitialized) chrome.storage.session.set({ currentRoom });
                     chrome.runtime.sendMessage({ type: 'PEER_UPDATE', peers: currentRoom.peers }).catch(() => {});
                 }
             }
             sendResponse({ status: 'ok' });
+        }).catch(err => {
+            addLog('Heartbeat settings error: ' + err.message, 'error');
+            sendResponse({ status: 'ok' });
         });
     } else if (message.type === 'SET_TARGET_TAB') {
         currentTabId = message.tabId;

extension/content.js

@@ -47,10 +47,14 @@
 
     function expectEvent(state) {
         expectedEvents.add(state);
-        if (expectedTimeouts[state]) clearTimeout(expectedTimeouts[state]);
+        if (expectedTimeouts[state]) {
+            clearTimeout(expectedTimeouts[state]);
+            delete expectedTimeouts[state];
+        }
         const timeout = state === 'seek' ? 10000 : 1500;
         expectedTimeouts[state] = setTimeout(() => {
             expectedEvents.delete(state);
+            delete expectedTimeouts[state];
         }, timeout);
     }
 
@@ -59,9 +63,16 @@
     }
 
     // --- Helper: find the best video element on the page ---
-    function findVideo() {
-        const videos = document.querySelectorAll('video');
-        return videos.length > 0 ? videos[0] : null;
+    function findVideo(root = document) {
+        const video = root.querySelector('video');
+        if (video) return video;
+        for (const el of root.querySelectorAll('*')) {
+            if (el.shadowRoot) {
+                const found = findVideo(el.shadowRoot);
+                if (found) return found;
+            }
+        }
+        return null;
     }
 
     // --- Episode Auto-Sync: Detection ---
@@ -169,7 +180,7 @@
                 reportLog(`Media Action Error: Invalid seek payload - ${JSON.stringify(data)}`, 'error');
                 return;
             }
-            data.targetTime = target;
+            data = { ...data, targetTime: target };
         }
 
         try {
@@ -259,7 +270,7 @@
     chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
         if (message.action === 'get_current_time') {
             const video = findVideo();
-            sendResponse({ currentTime: video ? video.currentTime : undefined });
+            sendResponse({ currentTime: video ? video.currentTime : null });
             return true;
         }
 
@@ -269,15 +280,15 @@
             
             if (action === EVENTS.PLAY) {
                 tryMediaAction(EVENTS.PLAY);
-                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp });
+                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp, commandSenderId: message.commandSenderId });
                 actionCompleted = true;
             } else if (action === EVENTS.PAUSE) {
                 tryMediaAction(EVENTS.PAUSE);
-                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp });
+                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp, commandSenderId: message.commandSenderId });
                 actionCompleted = true;
             } else if (action === EVENTS.SEEK) {
                 tryMediaAction(EVENTS.SEEK, payload);
-                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp });
+                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp, commandSenderId: message.commandSenderId });
                 actionCompleted = true;
             } else if (action === EVENTS.FORCE_SYNC_PREPARE) {
                 if (!payload || payload.targetTime === undefined) return;
@@ -292,18 +303,18 @@
                     video.pause();
                     video.currentTime = payload.targetTime;
                     pollSeekReady(payload.targetTime).then((ready) => {
-                        chrome.runtime.sendMessage({ type: 'FORCE_SYNC_ACK' });
+                        chrome.runtime.sendMessage({ type: 'FORCE_SYNC_ACK' }).catch(() => {});
                         if (ready) {
                             scheduleProactiveHeartbeat();
                         } else {
                             reportLog('Force Sync: Seek ready timeout, proceeding anyway', 'warn');
                         }
-                    });
+                    }).catch(() => {});
                 }
             } else if (action === EVENTS.FORCE_SYNC_EXECUTE) {
-                stopLobbyPoll(); // Clear any pending lobby on force sync
+                stopLobbyPoll();
                 tryMediaAction(EVENTS.PLAY);
-                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp });
+                chrome.runtime.sendMessage({ type: 'CMD_ACK', actionTimestamp: message.actionTimestamp, commandSenderId: message.commandSenderId });
                 actionCompleted = true;
             }
 
@@ -471,7 +482,7 @@
     };
 
 
-    let lastVideoSrc = null;
+    let lastVideoSrc = undefined;
 
     // Episode detection handler for loadeddata event
     const handleLoadedData = () => {
@@ -481,19 +492,22 @@
     function setupListeners() {
         const video = findVideo();
         if (video) {
-            video.removeEventListener('play', handlePlay);
-            video.removeEventListener('pause', handlePause);
-            video.removeEventListener('seeked', handleSeeked);
-            video.removeEventListener('loadeddata', handleLoadedData);
+            const existing = video._koalaHandlers;
+            if (existing) {
+                video.removeEventListener('play', existing.play);
+                video.removeEventListener('pause', existing.pause);
+                video.removeEventListener('seeked', existing.seeked);
+                video.removeEventListener('loadeddata', existing.loadeddata);
+            }
+            video._koalaHandlers = { play: handlePlay, pause: handlePause, seeked: handleSeeked, loadeddata: handleLoadedData };
 
             video.addEventListener('play', handlePlay);
             video.addEventListener('pause', handlePause);
             video.addEventListener('seeked', handleSeeked);
             video.addEventListener('loadeddata', handleLoadedData);
             video.dataset.koalaAttached = 'true';
-            lastVideoSrc = video.currentSrc || video.src;
+            lastVideoSrc = video.currentSrc || video.src || null;
 
-            // Initialize episode tracking title on first attach
             if (!lastKnownMediaTitle) {
                 lastKnownMediaTitle = getMediaTitle();
             }
@@ -507,13 +521,19 @@
     function checkVideo() {
         lastMutate = Date.now();
         const video = findVideo();
+
+        if (!video && lastVideoSrc !== undefined) {
+            reportLog('Video element removed from page', 'warn');
+            lastVideoSrc = undefined;
+            return;
+        }
+
         if (!video) return;
 
-        const currentSrc = video.currentSrc || video.src;
+        const currentSrc = video.currentSrc || video.src || null;
 
-        if (!video.dataset.koalaAttached || (lastVideoSrc && currentSrc && lastVideoSrc !== currentSrc)) {
-            // If src changed, also check for episode transition
-            if (lastVideoSrc && currentSrc && lastVideoSrc !== currentSrc) {
+        if (!video.dataset.koalaAttached || (lastVideoSrc !== undefined && currentSrc && lastVideoSrc !== currentSrc)) {
+            if (lastVideoSrc !== undefined && currentSrc && lastVideoSrc !== currentSrc) {
                 checkEpisodeTransition();
             }
             setupListeners();
@@ -592,6 +612,7 @@
 
     // Episode Auto-Sync: Boot recovery — check if background has an active lobby
     chrome.runtime.sendMessage({ type: 'CONTENT_BOOT' }, (res) => {
+        if (chrome.runtime.lastError) return;
         if (res && res.lobbyActive && res.expectedTitle) {
             reportLog(`Boot: Active lobby detected for "${res.expectedTitle}"`, 'info');
             startLobbyPoll(res.expectedTitle);

extension/manifest.base.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "KoalaSync",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Watch party extension to synchronize video playback on YouTube, Twitch, Netflix, and HTML5 sites in real-time with friends.",
   "permissions": [
     "storage",

extension/popup.html

@@ -199,9 +199,48 @@
         }
         .invite-box input { flex: 1; font-size: 11px; }
         .invite-box button { width: 40px; padding: 0; }
+
+        /* Toast Notifications */
+        #toast-container {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            z-index: 9999;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            pointer-events: none;
+        }
+        .toast {
+            pointer-events: auto;
+            padding: 10px 16px;
+            margin-bottom: 6px;
+            border-radius: 8px;
+            font-size: 12px;
+            font-weight: 600;
+            max-width: 280px;
+            text-align: center;
+            animation: toastSlideIn 0.3s ease-out, toastFadeOut 0.3s ease-in 2.7s forwards;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.3);
+        }
+        .toast-success { background: var(--success); color: white; }
+        .toast-error { background: var(--error); color: white; }
+        .toast-info { background: var(--accent); color: white; }
+        .toast-warning { background: #f59e0b; color: white; }
+
+        @keyframes toastSlideIn {
+            from { opacity: 0; transform: translateY(-20px); }
+            to { opacity: 1; transform: translateY(0); }
+        }
+        @keyframes toastFadeOut {
+            from { opacity: 1; }
+            to { opacity: 0; transform: translateY(-10px); }
+        }
     </style>
 </head>
 <body>
+    <div id="toast-container"></div>
     <h1><img src="icons/icon128.png" alt="KoalaSync Logo">KoalaSync</h1>
 
     <div class="tabs">
@@ -332,6 +371,11 @@
             <label style="margin-bottom: 0;">Auto-Sync Next Episode</label>
             <input type="checkbox" id="autoSyncNextEpisode" style="width: auto;">
         </div>
+
+        <div class="form-group" style="display: flex; align-items: center; justify-content: space-between; background: var(--card); padding: 10px; border-radius: 8px; margin-bottom: 12px; border: 1px solid #334155;">
+            <label style="margin-bottom: 0;">Browser Notifications</label>
+            <input type="checkbox" id="browserNotifications" style="width: auto;">
+        </div>
         
         <div style="font-size: 11px; color: var(--text-muted); padding: 8px;">
             <p>• Username helps others identify you.</p>
@@ -381,5 +425,19 @@
     </div>
 
     <script src="popup.js" type="module"></script>
+
+    <!-- Onboarding Overlay -->
+    <div id="onboarding-overlay" style="display:none; position:fixed; inset:0; background:rgba(0,0,0,0.7); z-index:1000; align-items:center; justify-content:center;">
+        <div id="onboarding-card" style="background:var(--card); padding:24px; border-radius:16px; max-width:280px; width:90%; text-align:center; box-shadow:0 8px 32px rgba(0,0,0,0.5);">
+            <div id="onboarding-icon" style="font-size:48px; margin-bottom:12px;">\u{1F44B}</div>
+            <h2 id="onboarding-title" style="color:var(--accent); margin:0 0 8px; font-size:16px;">Welcome to KoalaSync!</h2>
+            <p id="onboarding-text" style="color:var(--text-muted); font-size:13px; margin:0 0 16px; line-height:1.4;">Let's get you started.</p>
+            <div style="display:flex; gap:8px; justify-content:center;">
+                <button id="onboarding-skip" class="secondary" style="width:auto; padding:8px 16px;">Skip</button>
+                <button id="onboarding-next" class="primary" style="width:auto; padding:8px 16px;">Next</button>
+            </div>
+            <div id="onboarding-dots" style="margin-top:12px; display:flex; gap:6px; justify-content:center;"></div>
+        </div>
+    </div>
 </body>
 </html>

extension/popup.js

@@ -45,20 +45,29 @@ const elements = {
     autoSyncNextEpisode: document.getElementById('autoSyncNextEpisode'),
     episodeLobbyCard: document.getElementById('episodeLobbyCard'),
     lobbyTitle: document.getElementById('lobbyTitle'),
-    lobbyPeerStatus: document.getElementById('lobbyPeerStatus')
+    lobbyPeerStatus: document.getElementById('lobbyPeerStatus'),
+    browserNotifications: document.getElementById('browserNotifications')
 };
 
 let localPeerId = null;
 let lastPeersJson = null;
+let lastKnownPeers = [];
+let isDevTabVisible = false;
+let joinBtnTimeout = null;
+let forceSyncResetTimer = null;
+let popupIntervals = [];
+let populateTabsToken = null;
+let errorToken = 0;
+let forceSyncDone = false;
 
 // --- Initialization ---
 async function init() {
     // Load Settings
-    const data = await chrome.storage.sync.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'filterNoise', 'username', 'autoSyncNextEpisode', 'forceSyncMode']);
+    const data = await chrome.storage.sync.get(['serverUrl', 'useCustomServer', 'roomId', 'password', 'filterNoise', 'username', 'autoSyncNextEpisode', 'forceSyncMode', 'browserNotifications']);
     let username = data.username;
     if (!username) {
-        const adjs = ['Happy', 'Cool', 'Fast', 'Smart', 'Brave', 'Calm', 'Sneaky', 'Lazy', 'Wild', 'Chill', 'Lucky', 'Epic'];
-        const nouns = ['Koala', 'Panda', 'Tiger', 'Eagle', 'Fox', 'Bear', 'Wolf', 'Lion', 'Hawk', 'Seal', 'Owl', 'Shark'];
+        const adjs = ['Happy', 'Cool', 'Fast', 'Smart', 'Brave', 'Calm', 'Sneaky', 'Lazy', 'Wild', 'Chill', 'Lucky', 'Epic', 'Swift', 'Bold', 'Mighty', 'Cosmic', 'Neon', 'Shadow', 'Crystal', 'Thunder', 'Silent', 'Golden', 'Fierce', 'Noble', 'Mystic', 'Frozen', 'Blazing', 'Sapphire', 'Iron', 'Crimson'];
+        const nouns = ['Koala', 'Panda', 'Tiger', 'Eagle', 'Fox', 'Bear', 'Wolf', 'Lion', 'Hawk', 'Seal', 'Owl', 'Shark', 'Dragon', 'Phoenix', 'Falcon', 'Panther', 'Raven', 'Cobra', 'Lynx', 'Jaguar', 'Orca', 'Mantis', 'Viper', 'Condor', 'Badger', 'Otter', 'Rhino', 'Crane', 'Mongoose', 'Specter'];
         username = `${adjs[Math.floor(Math.random() * adjs.length)]}${nouns[Math.floor(Math.random() * nouns.length)]}`;
         chrome.storage.sync.set({ username });
     }
@@ -70,6 +79,7 @@ async function init() {
     elements.filterNoise.checked = data.filterNoise !== false;
     elements.autoSyncNextEpisode.checked = data.autoSyncNextEpisode !== false;
     elements.forceSyncMode.value = data.forceSyncMode || 'jump-to-others';
+    elements.browserNotifications.checked = data.browserNotifications === true;
     
     // Set Version Info
     const versionEl = document.getElementById('appVersion');
@@ -90,10 +100,16 @@ async function init() {
 
     // Initial Status Check
     chrome.runtime.sendMessage({ type: 'GET_STATUS' }, async (res) => {
+        if (chrome.runtime.lastError) {
+            console.warn('[Popup] Background not responding:', chrome.runtime.lastError.message);
+            await populateTabs();
+            return;
+        }
         if (res) {
             localPeerId = res.peerId;
             applyConnectionStatus(res.status);
             updatePeerList(res.peers);
+            lastKnownPeers = res.peers || [];
             if (res.lastActionState) updateLastActionUI(res.lastActionState, res.peers);
             
             // Populate Tabs using the background's targetTabId
@@ -113,7 +129,12 @@ async function init() {
     chrome.runtime.sendMessage({ type: 'GET_ROOM_LIST' });
 
     // Debug Info Refresh
-    setInterval(refreshDebugInfo, 2000);
+    popupIntervals.push(setInterval(refreshDebugInfo, 2000));
+
+    // Show onboarding on first visit
+    chrome.storage.sync.get(['onboardingComplete'], (data) => {
+        if (!data.onboardingComplete) showOnboarding();
+    });
 }
 
 // --- UI Logic ---
@@ -138,6 +159,13 @@ function updateUI(roomId, password, useCustomServer = false, serverUrl = '') {
         }
     } else {
         updatePeerList([]);
+        if (elements.inviteLink) elements.inviteLink.value = '';
+        if (elements.activeRoomId) elements.activeRoomId.textContent = '';
+        if (elements.activeServer) {
+            elements.activeServer.textContent = '';
+            elements.activeServer.title = '';
+        }
+        lastKnownPeers = [];
     }
 }
 
@@ -147,6 +175,9 @@ function updateLastActionUI(state, peers) {
         return;
     }
 
+    const safePeers = peers || [];
+    const safeAcks = state.acks || [];
+
     const actionNames = {
         'play': 'PLAY',
         'pause': 'PAUSE',
@@ -156,10 +187,11 @@ function updateLastActionUI(state, peers) {
     };
 
     let senderName = state.senderId === 'You' ? 'You' : state.senderId;
-    const senderPeer = peers.find(p => (p.peerId || p) === state.senderId);
+    const senderPeer = safePeers.find(p => (p.peerId || p) === state.senderId);
     if (senderPeer && senderPeer.username) senderName = senderPeer.username;
 
-    const timeStr = new Date(state.timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' });
+    const ts = state.timestamp ? new Date(state.timestamp) : new Date();
+    const timeStr = isNaN(ts.getTime()) ? '--:--' : ts.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', second: '2-digit' });
 
     elements.lastActionCard.innerHTML = '';
 
@@ -178,14 +210,28 @@ function updateLastActionUI(state, peers) {
     header.appendChild(infoSpan);
     elements.lastActionCard.appendChild(header);
 
+    if (state.targetTime !== undefined && state.action === 'seek') {
+        const timeInfo = document.createElement('div');
+        timeInfo.style.cssText = 'font-size:9px; color:var(--text-muted); margin-top:4px;';
+        timeInfo.textContent = `Target: ${formatTime(state.targetTime)}`;
+        elements.lastActionCard.appendChild(timeInfo);
+    }
+
+    if (state.targetTime !== undefined && state.action.includes('force_sync')) {
+        const timeInfo = document.createElement('div');
+        timeInfo.style.cssText = 'font-size:9px; color:var(--text-muted); margin-top:4px;';
+        timeInfo.textContent = `Sync to: ${formatTime(state.targetTime)}`;
+        elements.lastActionCard.appendChild(timeInfo);
+    }
+
     const grid = document.createElement('div');
     grid.style.cssText = 'display:grid; grid-template-columns: repeat(auto-fill, minmax(36px, 1fr)); gap: 5px;';
 
-    peers.forEach(peer => {
+    safePeers.forEach(peer => {
         const pId = typeof peer === 'object' ? peer.peerId : peer;
         if (pId === localPeerId) return;
         const pName = (typeof peer === 'object' && peer.username) ? peer.username : pId.substring(0, 4);
-        const isAcked = state.acks.includes(pId) || pId === state.senderId;
+        const isAcked = safeAcks.includes(pId) || pId === state.senderId;
         const color = isAcked ? 'var(--success)' : '#475569';
         const icon = isAcked ? '✓' : '...';
         
@@ -210,7 +256,7 @@ function updateLastActionUI(state, peers) {
 }
 
 function formatTime(seconds) {
-    if (seconds === null || seconds === undefined || isNaN(seconds)) return '--:--';
+    if (seconds === null || seconds === undefined || isNaN(seconds) || seconds < 0) return '--:--';
     const h = Math.floor(seconds / 3600);
     const m = Math.floor((seconds % 3600) / 60);
     const s = Math.floor(seconds % 60);
@@ -250,6 +296,23 @@ function startInterpolation() {
     }, 1000);
 }
 
+function renderEmpty(container, type) {
+    const states = {
+        peers: { icon: '\u{1F465}', title: 'No peers yet', hint: 'Share your invite link to get started' },
+        history: { icon: '\u{1F4CB}', title: 'No activity yet', hint: 'Play, pause, or seek to see history' },
+        logs: { icon: '\u{1F4DD}', title: 'No logs', hint: 'Connection events will appear here' },
+        rooms: { icon: '\u{1F50D}', title: 'No active rooms', hint: 'Create a room or refresh to find public ones' }
+    };
+    const state = states[type] || { icon: '', title: '', hint: '' };
+    container.innerHTML = `
+        <div style="text-align:center; padding:16px 8px; color:var(--text-muted);">
+            <div style="font-size:24px; margin-bottom:6px;">${state.icon}</div>
+            <div style="font-size:12px; font-weight:600; margin-bottom:4px;">${state.title}</div>
+            <div style="font-size:10px; opacity:0.7;">${state.hint}</div>
+        </div>
+    `;
+}
+
 function updatePeerList(peers) {
     if (!peers) return;
     activePeers = peers;
@@ -276,10 +339,7 @@ function updatePeerList(peers) {
     const renderPeers = (container) => {
         container.innerHTML = '';
         if (peers.length === 0) {
-            const empty = document.createElement('div');
-            empty.style.cssText = 'text-align:center; color: var(--text-muted); font-size: 12px;';
-            empty.textContent = 'No peers connected';
-            container.appendChild(empty);
+            renderEmpty(container, 'peers');
             return;
         }
 
@@ -389,27 +449,68 @@ function updatePeerList(peers) {
     populateTabs(peers);
 }
 
+function detectPeerChanges(newPeers) {
+    const oldIds = new Set(lastKnownPeers.map(p => p.peerId || p));
+    const newIds = new Set(newPeers.map(p => p.peerId || p));
+
+    for (const peer of newPeers) {
+        const id = peer.peerId || peer;
+        if (!oldIds.has(id)) {
+            const name = peer.username || id.substring(0, 4);
+            showToast(`${name} joined the room`, 'success');
+        }
+    }
+
+    for (const oldPeer of lastKnownPeers) {
+        const id = oldPeer.peerId || oldPeer;
+        if (!newIds.has(id)) {
+            const name = oldPeer.username || id.substring(0, 4);
+            showToast(`${name} left the room`, 'info');
+        }
+    }
+
+    lastKnownPeers = newPeers;
+}
+
 async function populateTabs(providedPeers = null, providedTargetTabId = null) {
+    const token = {};
+    populateTabsToken = token;
+
     const data = await chrome.storage.sync.get(['filterNoise']);
     const isFilterActive = data.filterNoise !== false;
     
-    // Fallback if not provided directly
     let currentTargetTabId = providedTargetTabId;
     if (currentTargetTabId === null) {
         const status = await new Promise(r => chrome.runtime.sendMessage({ type: 'GET_STATUS' }, r));
-        currentTargetTabId = status?.targetTabId;
+        if (chrome.runtime.lastError) {
+            if (populateTabsToken !== token) return;
+            currentTargetTabId = null;
+        } else {
+            currentTargetTabId = status?.targetTabId;
+        }
     }
  
-    // Use provided peers or fetch if missing
     let peerIds = providedPeers;
     if (!peerIds) {
         const status = await new Promise(r => chrome.runtime.sendMessage({ type: 'GET_STATUS' }, r));
-        peerIds = status?.peers || [];
+        if (chrome.runtime.lastError) {
+            if (populateTabsToken !== token) return;
+            peerIds = [];
+        } else {
+            peerIds = status?.peers || [];
+        }
     }
 
-    const tabs = await chrome.tabs.query({});
+    let tabs = [];
+    try {
+        tabs = await chrome.tabs.query({});
+    } catch (e) {
+        console.warn('[Popup] tabs.query failed:', e.message);
+        if (populateTabsToken !== token) return;
+    }
     
-    // Clear existing options except placeholder
+    if (!elements.targetTab) return;
+    if (populateTabsToken !== token) return;
     while (elements.targetTab.options.length > 1) {
         elements.targetTab.remove(1);
     }
@@ -451,10 +552,25 @@ async function populateTabs(providedPeers = null, providedTargetTabId = null) {
         elements.targetTab.appendChild(option);
     });
 
-    // Sort: Matches first
+    // Sort: 1. Current tab first, 2. Matches, 3. Rest alphabetically
     const options = Array.from(elements.targetTab.options);
-    const placeholder = options.shift(); // Remove placeholder
-    options.sort((a, b) => (b.textContent.includes('⭐') ? 1 : 0) - (a.textContent.includes('⭐') ? 1 : 0));
+    const placeholder = options.shift();
+    const currentTabId = providedTargetTabId ? parseInt(providedTargetTabId) : null;
+
+    options.sort((a, b) => {
+        const aId = parseInt(a.value);
+        const bId = parseInt(b.value);
+
+        if (aId === currentTabId) return -1;
+        if (bId === currentTabId) return 1;
+
+        const aMatch = a.textContent.includes('⭐');
+        const bMatch = b.textContent.includes('⭐');
+        if (aMatch && !bMatch) return -1;
+        if (!aMatch && bMatch) return 1;
+
+        return a.textContent.localeCompare(b.textContent);
+    });
     elements.targetTab.innerHTML = '';
     elements.targetTab.appendChild(placeholder);
     options.forEach(opt => elements.targetTab.appendChild(opt));
@@ -467,37 +583,47 @@ async function populateTabs(providedPeers = null, providedTargetTabId = null) {
 function applyConnectionStatus(status) {
     const connected = status === 'connected';
     const connecting = status === 'connecting';
+    const reconnecting = status === 'reconnecting';
     const failed = status === 'reconnect_failed';
 
-    elements.connDot.className = 'status-dot ' + (connected ? 'status-online' : (failed ? 'status-offline' : (connecting ? 'status-online' : 'status-offline')));
-    
-    if (connecting) {
-        elements.connDot.style.background = '#fbbf24';
-        elements.connDot.style.boxShadow = '0 0 8px #fbbf24';
-    } else if (failed) {
-        elements.connDot.style.background = '#ef4444';
-        elements.connDot.style.boxShadow = 'none';
-    } else {
-        elements.connDot.style.background = '';
-        elements.connDot.style.boxShadow = '';
+    if (elements.connDot) {
+        elements.connDot.className = 'status-dot ' + (connected ? 'status-online' : (failed ? 'status-offline' : ((connecting || reconnecting) ? 'status-online' : 'status-offline')));
+        
+        if (reconnecting) {
+            elements.connDot.style.background = '#f59e0b';
+            elements.connDot.style.boxShadow = '0 0 8px #f59e0b';
+        } else if (connecting) {
+            elements.connDot.style.background = '#fbbf24';
+            elements.connDot.style.boxShadow = '0 0 8px #fbbf24';
+        } else if (failed) {
+            elements.connDot.style.background = '#ef4444';
+            elements.connDot.style.boxShadow = 'none';
+        } else {
+            elements.connDot.style.background = '';
+            elements.connDot.style.boxShadow = '';
+        }
     }
 
-    elements.connText.textContent = connected ? 'Connected' : (connecting ? 'Connecting...' : (failed ? 'Failed' : 'Disconnected'));
-    elements.retryBtn.style.display = failed ? 'block' : 'none';
-
-    // Update Join Button during auto-transition
-    if (connecting) {
-        elements.joinBtn.disabled = true;
-        elements.joinBtn.textContent = '🚀 Joining...';
-    } else {
-        elements.joinBtn.disabled = false;
-        elements.joinBtn.textContent = 'Join Room';
+    if (elements.connText) {
+        elements.connText.textContent = connected ? 'Connected' : (reconnecting ? 'Reconnecting...' : (connecting ? 'Connecting...' : (failed ? 'Failed' : 'Disconnected')));
+    }
+    if (elements.retryBtn) {
+        elements.retryBtn.style.display = failed ? 'block' : 'none';
     }
 
-    // Preserve icons for Remote Control buttons
-    elements.playBtn.textContent = '▶ Play';
-    elements.pauseBtn.textContent = '⏸ Pause';
-    elements.forceSyncBtn.textContent = '⚡ Force Sync';
+    if (elements.joinBtn) {
+        if (connecting || reconnecting) {
+            elements.joinBtn.disabled = true;
+            elements.joinBtn.textContent = connecting ? '🚀 Joining...' : '🔄 Reconnecting...';
+        } else {
+            elements.joinBtn.disabled = false;
+            elements.joinBtn.textContent = 'Join Room';
+        }
+    }
+
+    if (elements.playBtn) elements.playBtn.textContent = '▶ Play';
+    if (elements.pauseBtn) elements.pauseBtn.textContent = '⏸ Pause';
+    if (elements.forceSyncBtn) elements.forceSyncBtn.textContent = '⚡ Force Sync';
 }
 
 function updateHistory(history) {
@@ -505,10 +631,7 @@ function updateHistory(history) {
     elements.historyList.innerHTML = '';
 
     if (history.length === 0) {
-        const empty = document.createElement('div');
-        empty.style.cssText = 'text-align:center; padding: 10px;';
-        empty.textContent = 'No activity yet';
-        elements.historyList.appendChild(empty);
+        renderEmpty(elements.historyList, 'history');
         return;
     }
 
@@ -556,10 +679,7 @@ function updateRoomList(rooms) {
     elements.publicRooms.innerHTML = '';
 
     if (!rooms || rooms.length === 0) {
-        const empty = document.createElement('div');
-        empty.style.cssText = 'text-align:center; padding: 10px; color:var(--text-muted);';
-        empty.textContent = 'No active rooms';
-        elements.publicRooms.appendChild(empty);
+        renderEmpty(elements.publicRooms, 'rooms');
         return;
     }
 
@@ -606,39 +726,42 @@ function checkInviteLink() {
     chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
         const tab = tabs[0];
         if (tab && tab.url && tab.url.includes(OFFICIAL_LANDING_PAGE_URL) && tab.url.includes('#join:')) {
-            const rawHash = tab.url.split('#join:')[1];
-            const parts = rawHash.split(':');
-            if (parts.length >= 2) {
-                const roomId = parts.shift();
-                let useCustomServer = false;
-                let serverUrl = '';
+            try {
+                const rawHash = tab.url.split('#join:')[1];
+                if (!rawHash) return;
+                const parts = rawHash.split(':');
+                if (parts.length >= 2) {
+                    const roomId = parts.shift();
+                    let useCustomServer = false;
+                    let serverUrl = '';
 
-                // Smart Link: Parse Server Config if present
-                const last = parts[parts.length - 1];
-                const secondToLast = parts[parts.length - 2];
-                const decodedLast = decodeURIComponent(last || '');
-                const isCustom = secondToLast === '1' && (decodedLast.startsWith('ws://') || decodedLast.startsWith('wss://'));
-                const isOfficial = secondToLast === '0' && last === '';
+                    const last = parts[parts.length - 1];
+                    const secondToLast = parts[parts.length - 2];
+                    const decodedLast = decodeURIComponent(last || '');
+                    const isCustom = secondToLast === '1' && (decodedLast.startsWith('ws://') || decodedLast.startsWith('wss://'));
+                    const isOfficial = secondToLast === '0' && last === '';
 
-                if (parts.length >= 3 && (isCustom || isOfficial)) {
-                    serverUrl = decodeURIComponent(parts.pop());
-                    useCustomServer = parts.pop() === '1';
+                    if (parts.length >= 3 && (isCustom || isOfficial)) {
+                        serverUrl = decodeURIComponent(parts.pop());
+                        useCustomServer = parts.pop() === '1';
+                    }
+
+                    const password = parts.join(':');
+
+                    elements.roomId.value = roomId;
+                    elements.password.value = password;
+                    
+                    if (serverUrl || useCustomServer) {
+                        elements.serverUrl.value = serverUrl;
+                        setServerMode(useCustomServer);
+                        chrome.storage.sync.set({ serverUrl, useCustomServer });
+                    }
+
+                    elements.joinBtn.style.boxShadow = '0 0 15px var(--accent)';
+                    setTimeout(() => elements.joinBtn.style.boxShadow = '', 2000);
                 }
-
-                const password = parts.join(':');
-
-                elements.roomId.value = roomId;
-                elements.password.value = password;
-                
-                if (serverUrl || useCustomServer) {
-                    elements.serverUrl.value = serverUrl;
-                    setServerMode(useCustomServer);
-                    chrome.storage.sync.set({ serverUrl, useCustomServer });
-                }
-
-                // Visual feedback
-                elements.joinBtn.style.boxShadow = '0 0 15px var(--accent)';
-                setTimeout(() => elements.joinBtn.style.boxShadow = '', 2000);
+            } catch (_e) {
+                // Malformed invite link, ignore
             }
         }
     });
@@ -648,7 +771,11 @@ function setServerMode(custom) {
     elements.serverOfficial.classList.toggle('active', !custom);
     elements.serverCustom.classList.toggle('active', custom);
     elements.serverUrl.style.display = custom ? 'block' : 'none';
-    chrome.storage.sync.set({ useCustomServer: custom });
+    chrome.storage.sync.get(['useCustomServer'], (data) => {
+        if (data.useCustomServer !== custom) {
+            chrome.storage.sync.set({ useCustomServer: custom });
+        }
+    });
 }
 
 elements.serverOfficial.addEventListener('click', () => setServerMode(false));
@@ -664,6 +791,10 @@ elements.autoSyncNextEpisode.addEventListener('change', () => {
     chrome.storage.sync.set({ autoSyncNextEpisode: elements.autoSyncNextEpisode.checked });
 });
 
+elements.browserNotifications.addEventListener('change', () => {
+    chrome.storage.sync.set({ browserNotifications: elements.browserNotifications.checked });
+});
+
 elements.forceSyncMode.addEventListener('change', () => {
     chrome.storage.sync.set({ forceSyncMode: elements.forceSyncMode.value });
 });
@@ -691,29 +822,34 @@ elements.tabs.forEach(btn => {
         elements.contents.forEach(c => c.classList.remove('active'));
         btn.classList.add('active');
         document.getElementById(btn.dataset.tab).classList.add('active');
+        isDevTabVisible = btn.dataset.tab === 'tab-dev';
+        if (isDevTabVisible) refreshLogs();
         if (btn.dataset.tab === 'tab-sync') refreshHistory();
     });
 });
 
+function showToast(message, type = 'info', duration = 3000) {
+    const container = document.getElementById('toast-container');
+    if (!container) return;
+    const toast = document.createElement('div');
+    toast.className = `toast toast-${type}`;
+    toast.textContent = message;
+    container.appendChild(toast);
+    setTimeout(() => toast.remove(), duration);
+}
+
 function showError(msg) {
     if (!elements.roomError) return;
+    const currentToken = ++errorToken;
     elements.roomError.textContent = msg;
     elements.roomError.style.display = 'block';
     elements.roomId.style.borderColor = 'var(--error)';
     elements.password.style.borderColor = 'var(--error)';
     
-    // Shake effect
-    const activeTab = document.querySelector('.tab-content.active');
-    if (activeTab) {
-        activeTab.animate([
-            { transform: 'translateX(0)' },
-            { transform: 'translateX(-5px)' },
-            { transform: 'translateX(5px)' },
-            { transform: 'translateX(0)' }
-        ], { duration: 200, iterations: 2 });
-    }
+    showToast(msg, 'error', 5000);
 
     setTimeout(() => {
+        if (currentToken !== errorToken) return;
         if (elements.roomError) elements.roomError.style.display = 'none';
         elements.roomId.style.borderColor = '';
         elements.password.style.borderColor = '';
@@ -729,6 +865,14 @@ elements.joinBtn.addEventListener('click', async () => {
     elements.joinBtn.disabled = true;
     elements.joinBtn.textContent = isCreating ? 'Creating Room...' : 'Joining...';
     
+    if (joinBtnTimeout) clearTimeout(joinBtnTimeout);
+    joinBtnTimeout = setTimeout(() => {
+        elements.joinBtn.disabled = false;
+        elements.joinBtn.textContent = 'Join Room';
+        joinBtnTimeout = null;
+        showError('Connection timed out. Please try again.');
+    }, 15000);
+    
     const serverUrl = elements.serverUrl.value.trim();
     const useCustom = elements.serverCustom.classList.contains('active');
 
@@ -763,6 +907,7 @@ elements.leaveBtn.addEventListener('click', async () => {
     await chrome.storage.sync.set({ roomId: '', password: '' });
     elements.roomId.value = '';
     elements.password.value = '';
+    lastKnownPeers = [];
     updateUI(null, null);
 });
 
@@ -799,7 +944,7 @@ elements.forceSyncBtn.addEventListener('click', async () => {
     if (elements.forceSyncBtn.disabled) return;
     
     const status = await new Promise(r => chrome.runtime.sendMessage({ type: 'GET_STATUS' }, r));
-    if (!status || !status.targetTabId) return;
+    if (chrome.runtime.lastError || !status || !status.targetTabId) return;
 
     const mode = elements.forceSyncMode.value;
     let targetTime = null;
@@ -827,11 +972,14 @@ elements.forceSyncBtn.addEventListener('click', async () => {
     const originalText = elements.forceSyncBtn.textContent;
     elements.forceSyncBtn.disabled = true;
     elements.forceSyncBtn.textContent = mode === 'jump-to-others' ? `Syncing to group (${formatTime(targetTime)})...` : 'Syncing...';
-    setTimeout(() => {
-        elements.forceSyncBtn.disabled = false;
-        elements.forceSyncBtn.textContent = originalText;
-    }, 5000);
-
+    forceSyncDone = false;
+    const forceSyncReset = () => {
+        if (!forceSyncDone) {
+            elements.forceSyncBtn.disabled = false;
+            elements.forceSyncBtn.textContent = originalText;
+        }
+    };
+    forceSyncResetTimer = setTimeout(forceSyncReset, 12000);
     const tabId = parseInt(status.targetTabId);
 
     const sendForceSync = (time) => {
@@ -851,6 +999,7 @@ elements.forceSyncBtn.addEventListener('click', async () => {
                 }).then(() => {
                     setTimeout(() => {
                         chrome.tabs.sendMessage(tabId, { action: 'get_current_time' }, (retryResponse) => {
+                            if (chrome.runtime.lastError) return;
                             if (retryResponse && retryResponse.currentTime !== undefined) {
                                 sendForceSync(retryResponse.currentTime);
                             }
@@ -858,6 +1007,9 @@ elements.forceSyncBtn.addEventListener('click', async () => {
                     }, 500);
                 }).catch(() => {
                     showError('Could not connect to video tab.');
+                    forceSyncDone = true;
+                    elements.forceSyncBtn.disabled = false;
+                    elements.forceSyncBtn.textContent = originalText;
                 });
                 return;
             }
@@ -891,15 +1043,30 @@ elements.clearLogs.addEventListener('click', () => {
 });
 
 elements.copyInvite.addEventListener('click', () => {
-    navigator.clipboard.writeText(elements.inviteLink.value);
-    elements.copyInvite.textContent = '✅';
-    setTimeout(() => { elements.copyInvite.textContent = '📋'; }, 2000);
+    navigator.clipboard.writeText(elements.inviteLink.value).then(() => {
+        const original = elements.copyInvite.textContent;
+        elements.copyInvite.textContent = '✓';
+        elements.copyInvite.style.background = 'var(--success)';
+        elements.copyInvite.style.color = 'white';
+        showToast('Invite link copied!', 'success', 2000);
+        setTimeout(() => {
+            elements.copyInvite.textContent = original;
+            elements.copyInvite.style.background = '';
+            elements.copyInvite.style.color = '';
+        }, 2000);
+    }).catch(() => {
+        showToast('Failed to copy to clipboard', 'error');
+    });
 });
 
 // --- Logs & Status ---
 async function refreshLogs() {
     chrome.runtime.sendMessage({ type: 'GET_LOGS' }, (logs) => {
-        if (logs && elements.logList) {
+        if (elements.logList) {
+            if (!logs || logs.length === 0) {
+                renderEmpty(elements.logList, 'logs');
+                return;
+            }
             elements.logList.innerHTML = '';
             logs.forEach(log => {
                 const entry = document.createElement('div');
@@ -919,11 +1086,35 @@ chrome.runtime.onMessage.addListener((msg) => {
             showError(msg.log.message);
         }
     } else if (msg.type === 'ACTION_UPDATE') {
+        const state = msg.state;
+        if (state && state.senderId && state.senderId !== 'You') {
+            const actionNames = {
+                'play': '▶ Play',
+                'pause': '⏸ Pause',
+                'seek': '⏩ Seek',
+                'force_sync_prepare': '⚡ Force Sync',
+                'force_sync_execute': '⚡ Force Play'
+            };
+            const action = actionNames[state.action] || state.action;
+            showToast(`${state.senderId} ${action}`, 'info', 2000);
+        }
+        if (state && state.action === 'force_sync_execute') {
+            forceSyncDone = true;
+            if (forceSyncResetTimer) {
+                clearTimeout(forceSyncResetTimer);
+                forceSyncResetTimer = null;
+            }
+            if (elements.forceSyncBtn) {
+                elements.forceSyncBtn.disabled = false;
+                elements.forceSyncBtn.textContent = '⚡ Force Sync';
+            }
+        }
         chrome.runtime.sendMessage({ type: 'GET_STATUS' }, (res) => {
             if (res && res.peers) updateLastActionUI(msg.state, res.peers);
         });
     } else if (msg.type === 'PEER_UPDATE') {
         updatePeerList(msg.peers);
+        if (msg.peers) detectPeerChanges(msg.peers);
     } else if (msg.type === 'CONNECTION_STATUS') {
         applyConnectionStatus(msg.status);
         if (msg.status === 'connected') {
@@ -936,6 +1127,16 @@ chrome.runtime.onMessage.addListener((msg) => {
             elements.joinBtn.disabled = false;
             elements.joinBtn.textContent = 'Join Room';
         }
+        if (msg.status === 'reconnecting') {
+            chrome.runtime.sendMessage({ type: 'GET_STATUS' }, (res) => {
+                if (chrome.runtime.lastError) return;
+                if (res && res.reconnectAttempts !== undefined) {
+                    if (elements.connText) {
+                        elements.connText.textContent = `Reconnecting... (${res.reconnectAttempts})`;
+                    }
+                }
+            });
+        }
     } else if (msg.type === 'HISTORY_UPDATE') {
         updateHistory(msg.history);
     } else if (msg.type === 'ROOM_LIST') {
@@ -970,6 +1171,8 @@ elements.copyLogs.addEventListener('click', () => {
             const original = elements.copyLogs.textContent;
             elements.copyLogs.textContent = 'Copied!';
             setTimeout(() => elements.copyLogs.textContent = original, 2000);
+        }).catch(() => {
+            showToast('Failed to copy to clipboard', 'error');
         });
     });
 });
@@ -1021,7 +1224,7 @@ function refreshDebugInfo() {
                 };
 
                 addField('STATE', state.paused ? 'PAUSED' : 'PLAYING', 'var(--accent)');
-                addField('TIME', `${state.currentTime.toFixed(2)}s / ${state.duration.toFixed(2)}s`);
+                addField('TIME', `${state.currentTime.toFixed(2)}s / ${(state.duration || 0).toFixed(2)}s`);
                 addField('READY', state.readyState);
                 
                 addSection('Identification');
@@ -1052,7 +1255,23 @@ function refreshDebugInfo() {
 }
 
 init();
-setInterval(refreshLogs, 5000);
+popupIntervals.push(setInterval(() => {
+    if (isDevTabVisible) refreshLogs();
+}, 5000));
+
+window.addEventListener('unload', () => {
+    stopInterpolation();
+    popupIntervals.forEach(clearInterval);
+    popupIntervals = [];
+    if (joinBtnTimeout) {
+        clearTimeout(joinBtnTimeout);
+        joinBtnTimeout = null;
+    }
+    if (forceSyncResetTimer) {
+        clearTimeout(forceSyncResetTimer);
+        forceSyncResetTimer = null;
+    }
+});
 
 // --- Episode Lobby UI ---
 function updateLobbyUI(lobby, peers) {
@@ -1081,15 +1300,74 @@ function updateLobbyUI(lobby, peers) {
         });
     }
 
-    if (peerLines.length > 0) {
+    if (peerLines.length > 0 && elements.lobbyPeerStatus) {
         elements.lobbyPeerStatus.textContent = peerLines.join(' | ');
-    } else {
+    } else if (elements.lobbyPeerStatus) {
         elements.lobbyPeerStatus.textContent = 'Waiting for peers...';
     }
 
     // Show elapsed time
-    if (lobby.createdAt) {
+    if (lobby.createdAt && elements.lobbyPeerStatus) {
         const elapsed = Math.floor((Date.now() - lobby.createdAt) / 1000);
         elements.lobbyPeerStatus.textContent += ` (${elapsed}s)`;
     }
 }
+
+// --- Onboarding Tour ---
+const onboardingSteps = [
+    { icon: '\u{1F44B}', title: 'Welcome to KoalaSync!', text: 'Watch videos together in perfect sync — no matter where you are. Let\'s take a quick tour!' },
+    { icon: '\u{1F3E0}', title: 'Room Tab', text: 'Create a room and share the invite link with friends. Anyone with the link can join instantly.' },
+    { icon: '\u{1F3AC}', title: 'Sync Tab', text: 'Pick the tab with your video. Play, pause, and seek — everyone stays in sync. Drift? Just hit Force Sync.' },
+    { icon: '\u2699\uFE0F', title: 'Settings', text: 'Pick a fun username, hide distracting tabs, and enable notifications so you never miss a moment.' },
+    { icon: '\u{1F389}', title: 'You\'re all set!', text: 'Open a video, create a room, and start watching together. Enjoy!' }
+];
+
+let onboardingStep = 0;
+
+function showOnboarding() {
+    const overlay = document.getElementById('onboarding-overlay');
+    if (!overlay) return;
+    overlay.style.display = 'flex';
+    renderOnboardingStep();
+}
+
+function renderOnboardingStep() {
+    const step = onboardingSteps[onboardingStep];
+    const icon = document.getElementById('onboarding-icon');
+    const title = document.getElementById('onboarding-title');
+    const text = document.getElementById('onboarding-text');
+    const nextBtn = document.getElementById('onboarding-next');
+    const dots = document.getElementById('onboarding-dots');
+    if (!icon || !title || !text || !nextBtn || !dots) return;
+
+    icon.textContent = step.icon;
+    title.textContent = step.title;
+    text.textContent = step.text;
+
+    dots.innerHTML = onboardingSteps.map((_, i) =>
+        `<div style="width:8px; height:8px; border-radius:50%; background:${i === onboardingStep ? 'var(--accent)' : '#475569'};"></div>`
+    ).join('');
+
+    nextBtn.textContent = onboardingStep === onboardingSteps.length - 1 ? 'Done!' : 'Next';
+}
+
+function completeOnboarding() {
+    const overlay = document.getElementById('onboarding-overlay');
+    if (overlay) overlay.style.display = 'none';
+    chrome.storage.sync.set({ onboardingComplete: true });
+}
+
+document.getElementById('onboarding-next')?.addEventListener('click', () => {
+    onboardingStep++;
+    if (onboardingStep >= onboardingSteps.length) {
+        completeOnboarding();
+    } else {
+        renderOnboardingStep();
+    }
+});
+
+document.getElementById('onboarding-skip')?.addEventListener('click', completeOnboarding);
+
+document.getElementById('onboarding-overlay')?.addEventListener('click', (e) => {
+    if (e.target.id === 'onboarding-overlay') completeOnboarding();
+});

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "koalasync",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "koalasync",
-      "version": "1.6.0",
+      "version": "1.6.1",
       "devDependencies": {
         "archiver": "^7.0.1",
         "eslint": "^10.4.0",
@@ -294,7 +294,6 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -428,7 +427,6 @@
       "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "peerDependencies": {
         "bare-abort-controller": "*"
       },
@@ -730,7 +728,6 @@
       "integrity": "sha512-loXy6bWOoP3EP6JA7jo6p5jMpBJmHmsNZM5SFRHLdh1MGOPurMnNBj4ZlAbaqUAaQWbCr7jHV4P7gzAyryZWkQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "koalasync",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "KoalaSync Build Scripts",
   "private": true,
   "scripts": {

server/README.md

@@ -1,11 +1,11 @@
 # KoalaSync Relay Server
 
-A high-performance Node.js relay server for synchronized video playback.
+A Node.js relay server for synchronized video playback.
 
 ## Key Features
 - **Zero-Persistence**: No database. All state is held in RAM.
-- **Privacy First**: No tracking, no logging of user data.
-- **WebSocket Only**: High performance with minimal overhead.
+- **Privacy First**: No tracking, no persistent logging of user data.
+- **WebSocket Only**: Minimal overhead with efficient transport.
 
 ## Setup
 

server/index.js

@@ -15,18 +15,44 @@ const MIN_VERSION = process.env.MIN_VERSION || '1.0.0';
 const app = express();
 app.set('trust proxy', 1); // For real client IP through reverse proxy
 
-// Health Check
-app.get('/', (req, res) => res.json({ status: 'online', service: 'KoalaSync Relay' }));
+// Health Check with Rate Limiting
+app.get('/', (req, res) => {
+    const clientIp = req.ip;
+    if (!checkHealthRate(clientIp)) {
+        return res.status(429).json({ error: 'Too many requests. Try again later.' });
+    }
+    res.json({ status: 'online', service: 'KoalaSync Relay' });
+});
+
+app.get('/health', (req, res) => {
+    const clientIp = req.ip;
+    if (!checkHealthRate(clientIp)) {
+        return res.status(429).json({ error: 'Rate limited' });
+    }
+    res.json({
+        status: 'ok',
+        uptime: process.uptime(),
+        rooms: rooms.size,
+        connections: io.engine?.clientsCount ?? 0,
+        timestamp: Date.now()
+    });
+});
 
 const httpServer = createServer(app);
 
 // Socket.IO setup with security constraints
 const io = new Server(httpServer, {
     cors: {
-        origin: ["https://sync.koalastuff.net"],
+        origin: (origin, callback) => {
+            if (!origin || origin === 'https://sync.koalastuff.net' || origin.startsWith('chrome-extension://')) {
+                callback(null, true);
+            } else {
+                callback(new Error('Not allowed by CORS'));
+            }
+        },
         methods: ["GET", "POST"]
     },
-    maxHttpBufferSize: 1024, // 1KB max per message
+    maxHttpBufferSize: 4096, // 4KB max per message (headroom for JOIN_ROOM payloads)
     transports: ['websocket'],
     allowUpgrades: false
 });
@@ -37,6 +63,7 @@ const io = new Server(httpServer, {
 const rooms = new Map();
 const socketToRoom = new Map();
 const peerToSocket = new Map(); // peerId -> socketId (Global lookup)
+const roomCreationLocks = new Map(); // roomId -> Promise (prevents race on room creation)
 
 function log(type, message, details = '') {
     const timestamp = new Date().toISOString();
@@ -73,17 +100,18 @@ function recordAuthFailure(ip, roomId) {
     failedAuthAttempts.set(key, record);
 }
 
-// Periodically clean up old auth failure records (every hour)
+// Periodically clean up old auth failure records (every 15 minutes)
 setInterval(() => {
     const now = Date.now();
     for (const [key, record] of failedAuthAttempts.entries()) {
-        if (now - record.lastAttempt > 60 * 60 * 1000) {
+        if (now - record.lastAttempt > 15 * 60 * 1000) {
             failedAuthAttempts.delete(key);
         }
     }
-}, 60 * 60 * 1000);
+}, 15 * 60 * 1000);
 
 const eventCounts = new Map(); // socketId -> { count, resetTime }
+const healthCounts = new Map(); // ip -> { count, resetTime }
 
 // Clean up connection counts and event counts to prevent memory leak
 setInterval(() => {
@@ -94,10 +122,15 @@ setInterval(() => {
         }
     }
     for (const [socketId, entry] of eventCounts.entries()) {
-        if (now > entry.resetTime) {
+        if (now > entry.resetTime || !io.sockets.sockets.has(socketId)) {
             eventCounts.delete(socketId);
         }
     }
+    for (const [ip, entry] of healthCounts.entries()) {
+        if (now > entry.resetTime) {
+            healthCounts.delete(ip);
+        }
+    }
 }, 60000);
 
 function checkConnectionRate(ip) {
@@ -118,6 +151,15 @@ function checkEventRate(socketId) {
     return entry.count <= 30;
 }
 
+function checkHealthRate(ip) {
+    const now = Date.now();
+    const entry = healthCounts.get(ip) || { count: 0, resetTime: now + 60000 };
+    if (now > entry.resetTime) { entry.count = 0; entry.resetTime = now + 60000; }
+    entry.count++;
+    healthCounts.set(ip, entry);
+    return entry.count <= 60;
+}
+
 /**
  * Central peer teardown. Removes a socket from all room state and notifies
  * remaining peers. Call this from every disconnect/leave/reaper/dedupe path.
@@ -142,7 +184,8 @@ function removePeerFromRoom(socketId, roomId, reason) {
 
     // 2. Remove from global maps
     socketToRoom.delete(socketId);
-    if (peerToSocket.get(peerId) === socketId) {
+    const currentSocketId = peerToSocket.get(peerId);
+    if (currentSocketId === socketId) {
         peerToSocket.delete(peerId);
     }
 
@@ -160,7 +203,10 @@ function removePeerFromRoom(socketId, roomId, reason) {
 }
 
 io.on('connection', (socket) => {
-    const clientIp = socket.handshake.address;
+    // Get real client IP behind proxy/CDN
+    const forwardedFor = socket.handshake.headers['x-forwarded-for'];
+    const clientIp = forwardedFor ? forwardedFor.split(',')[0].trim() : socket.handshake.address;
+    socket._clientIp = clientIp;
     
     // 1. Connection Rate Limit
     if (!checkConnectionRate(clientIp)) {
@@ -181,7 +227,8 @@ io.on('connection', (socket) => {
     }
 
     if (clientVersion) {
-        const [cMaj, cMin, cPatch] = clientVersion.split('.').map(Number);
+        const parts = clientVersion.split('.').map(Number);
+        const cMaj = parts[0], cMin = parts[1], cPatch = parts[2] || 0;
         const [mMaj, mMin, mPatch] = MIN_VERSION.split('.').map(Number);
         if (isNaN(cMaj) || isNaN(cMin) || isNaN(cPatch)) {
             log('AUTH', `Invalid version format (${clientVersion}) from ${clientIp}`);
@@ -229,15 +276,15 @@ io.on('connection', (socket) => {
 
             // Cleanup old room if re-joining
             const oldMapping = socketToRoom.get(socket.id);
-            if (oldMapping && oldMapping.roomId === roomId) {
-                return; // Already in this room, ignore to prevent spam
+            if (oldMapping && oldMapping.roomId === roomId && oldMapping.peerId === peerId) {
+                return; // Already in this room with same peerId, ignore to prevent spam
             }
             if (oldMapping && oldMapping.roomId !== roomId) {
                 socket.leave(oldMapping.roomId);
                 removePeerFromRoom(socket.id, oldMapping.roomId, 'room-switch');
             }
 
-            const ip = socket.handshake.address;
+            const ip = socket._clientIp || socket.handshake.address;
             if (!checkAuthRate(ip, roomId)) {
                 socket.emit(EVENTS.ERROR, { message: "Too many failed attempts. Try again later." });
                 return;
@@ -246,21 +293,41 @@ io.on('connection', (socket) => {
             let room = rooms.get(roomId);
 
             if (!room) {
-                if (rooms.size >= MAX_ROOMS) {
-                    socket.emit(EVENTS.ERROR, { message: "Server capacity reached" });
-                    return;
+                // Acquire per-room creation lock to prevent race conditions
+                let lockPromise = roomCreationLocks.get(roomId);
+                if (lockPromise) {
+                    await lockPromise;
+                    room = rooms.get(roomId);
+                    if (room) {
+                        // Another concurrent request created it, fall through to password check
+                    }
                 }
+                if (!room) {
+                    // Create and store lock before async boundary
+                    let resolveLock;
+                    lockPromise = new Promise(resolve => { resolveLock = resolve; });
+                    roomCreationLocks.set(roomId, lockPromise);
+                    try {
+                        if (rooms.size >= MAX_ROOMS) {
+                            socket.emit(EVENTS.ERROR, { message: "Server capacity reached" });
+                            return;
+                        }
 
-                const passwordHash = password ? await bcrypt.hash(password, 10) : null;
-                room = {
-                    passwordHash,
-                    peers: new Set(),
-                    peerIds: new Map(),
-                    peerData: new Map(), // socketId -> { peerId, tabTitle }
-                    lastActivity: Date.now()
-                };
-                rooms.set(roomId, room);
-                log('ROOM', `Created room: ${roomId.substring(0, 3)}***`);
+                        const passwordHash = password ? await bcrypt.hash(password, 10) : null;
+                        room = {
+                            passwordHash,
+                            peers: new Set(),
+                            peerIds: new Map(),
+                            peerData: new Map(),
+                            lastActivity: Date.now()
+                        };
+                        rooms.set(roomId, room);
+                        log('ROOM', `Created room: ${roomId.substring(0, 3)}***`);
+                    } finally {
+                        roomCreationLocks.delete(roomId);
+                        resolveLock();
+                    }
+                }
             } else {
                 if (room.passwordHash) {
                     if (!password || !(await bcrypt.compare(password, room.passwordHash))) {
@@ -275,7 +342,6 @@ io.on('connection', (socket) => {
                 }
 
                 // Peer Deduplication: Remove existing socket for the same peerId
-                // Snapshot stale SIDs first to avoid mutating the Map during iteration
                 const dedupeSids = [];
                 for (const [sid, data] of room.peerData.entries()) {
                     if (data.peerId === peerId && sid !== socket.id) {
@@ -283,6 +349,10 @@ io.on('connection', (socket) => {
                     }
                 }
                 for (const sid of dedupeSids) {
+                    // Re-check: the socket might have been replaced by another concurrent join
+                    const currentMapping = room.peerData.get(sid);
+                    if (!currentMapping || currentMapping.peerId !== peerId) continue;
+                    
                     const oldSocket = io.sockets.sockets.get(sid);
                     if (oldSocket) {
                         oldSocket.emit(EVENTS.ERROR, { message: 'Deduplication: Another session with this ID joined. Disconnecting...' });
@@ -315,7 +385,9 @@ io.on('connection', (socket) => {
             log('ROOM', `Peer ${peerId} joined: ${roomId.substring(0, 3)}***`);
         } catch (err) {
             log('ERROR', `Join error for ${socket.id}`, err);
-            socket.emit(EVENTS.ERROR, { message: "Join error" });
+            if (socket.connected) {
+                socket.emit(EVENTS.ERROR, { message: "Join error" });
+            }
         }
     });
 
@@ -329,18 +401,19 @@ io.on('connection', (socket) => {
 
     relayEvents.forEach(eventName => {
         socket.on(eventName, (data) => {
-            if (!checkEventRate(socket.id)) {
-                log('SECURITY', `Event rate limit exceeded for socket: ${socket.id}`);
-                socket.disconnect(true);
-                return;
-            }
+            try {
+                if (!checkEventRate(socket.id)) {
+                    log('SECURITY', `Event rate limit exceeded for socket: ${socket.id}`);
+                    socket.disconnect(true);
+                    return;
+                }
 
-            if (!data || typeof data !== 'object') return; // Prevent null/invalid payload crash
+                if (!data || typeof data !== 'object') return;
 
-            const mapping = socketToRoom.get(socket.id);
-            if (mapping) {
-                const room = rooms.get(mapping.roomId);
-                if (room) {
+                const mapping = socketToRoom.get(socket.id);
+                if (mapping) {
+                    const room = rooms.get(mapping.roomId);
+                    if (room) {
                     room.lastActivity = Date.now();
                     
                     // --- S-2 & S-3: Sanitize ALL relay fields (strings, numbers, booleans) ---
@@ -382,7 +455,10 @@ io.on('connection', (socket) => {
                     // Strip undefined keys for clean wire format
                     Object.keys(relayPayload).forEach(k => relayPayload[k] === undefined && delete relayPayload[k]);
                     socket.to(mapping.roomId).emit(eventName, relayPayload);
+                    }
                 }
+            } catch (err) {
+                log('ERROR', `Relay handler error for ${eventName}: ${err.message}`);
             }
         });
     });
@@ -404,30 +480,30 @@ io.on('connection', (socket) => {
         }
     });
 
-        socket.on(EVENTS.EVENT_ACK, (data) => {
-            if (!checkEventRate(socket.id)) {
-                log('SECURITY', `Event rate limit exceeded for socket (ACK): ${socket.id}`);
-                socket.disconnect(true);
-                return;
-            }
-            if (!data || typeof data !== 'object') return;
-            if (typeof data.targetId !== 'string') return;
-            if (data.actionTimestamp !== undefined && (typeof data.actionTimestamp !== 'number' || !Number.isFinite(data.actionTimestamp))) return;
-            
-            const senderMapping = socketToRoom.get(socket.id);
-            const targetSocketId = peerToSocket.get(data.targetId);
-            const targetMapping = targetSocketId ? socketToRoom.get(targetSocketId) : null;
+    socket.on(EVENTS.EVENT_ACK, (data) => {
+        if (!checkEventRate(socket.id)) {
+            log('SECURITY', `Event rate limit exceeded for socket (ACK): ${socket.id}`);
+            socket.disconnect(true);
+            return;
+        }
+        if (!data || typeof data !== 'object') return;
+        if (typeof data.targetId !== 'string') return;
+        if (data.actionTimestamp !== undefined && (typeof data.actionTimestamp !== 'number' || !Number.isFinite(data.actionTimestamp))) return;
+        
+        const senderMapping = socketToRoom.get(socket.id);
+        const targetSocketId = peerToSocket.get(data.targetId);
+        const targetMapping = targetSocketId ? socketToRoom.get(targetSocketId) : null;
 
-            // Security: Only relay ACK if both peers are in the same room
-            if (senderMapping && targetMapping && senderMapping.roomId === targetMapping.roomId) {
-                io.to(targetSocketId).emit(EVENTS.EVENT_ACK, { 
-                    senderId: senderMapping.peerId,
-                    actionTimestamp: data.actionTimestamp
-                });
-            } else {
-                log('SECURITY', `Blocked cross-room ACK attempt from ${socket.id} to ${data.targetId}`);
-            }
-        });
+        // Security: Only relay ACK if both peers are in the same room
+        if (senderMapping && targetMapping && senderMapping.roomId === targetMapping.roomId) {
+            io.to(targetSocketId).emit(EVENTS.EVENT_ACK, { 
+                senderId: senderMapping.peerId,
+                actionTimestamp: data.actionTimestamp
+            });
+        } else {
+            log('SECURITY', `Blocked cross-room ACK attempt from ${socket.id} to ${data.targetId}`);
+        }
+    });
 
     socket.on('disconnect', () => {
         eventCounts.delete(socket.id);
@@ -447,7 +523,11 @@ setInterval(() => {
     const roomCutoff = now - (2 * 60 * 60 * 1000); // 2 hours
     const peerCutoff = now - (5 * 60 * 1000);      // 5 minutes
     
-    for (const [roomId, room] of rooms) {
+    // Snapshot room keys to avoid mutation during iteration
+    const roomIds = Array.from(rooms.keys());
+    for (const roomId of roomIds) {
+        const room = rooms.get(roomId);
+        if (!room) continue; // Room may have been deleted between snapshot and now
         // 1. Prune dead peers
         // Snapshot keys first — we must not mutate peerData while iterating it.
         const staleSids = [];
@@ -459,14 +539,15 @@ setInterval(() => {
         for (const sid of staleSids) {
             // Gracefully evict the socket from the Socket.IO room if it is
             // still technically connected (zombie with no heartbeat).
-            const deadSocket = io.sockets.sockets.get(sid);
+            const deadSocket = io.sockets?.sockets?.get(sid);
             if (deadSocket) deadSocket.leave(roomId);
             log('CLEANUP', `Pruning dead peer from room ${roomId.substring(0, 3)}***`);
             removePeerFromRoom(sid, roomId, 'reaper');
         }
 
         // 2. Prune empty or inactive rooms
-        if (room.peers.size === 0 || room.lastActivity < roomCutoff) {
+        const currentRoom = rooms.get(roomId);
+        if (currentRoom && (currentRoom.peers.size === 0 || currentRoom.lastActivity < roomCutoff)) {
             io.to(roomId).emit(EVENTS.ERROR, { message: 'Room closed' });
             rooms.delete(roomId);
             log('CLEANUP', `Deleted room ${roomId.substring(0, 3)}*** (Empty/Inactive)`);
@@ -497,3 +578,11 @@ function gracefulShutdown(signal) {
 
 process.on('SIGTERM', () => gracefulShutdown('SIGTERM'));
 process.on('SIGINT',  () => gracefulShutdown('SIGINT'));
+
+process.on('uncaughtException', (err) => {
+    log('ERROR', `Uncaught exception: ${err.message}`, err.stack);
+});
+
+process.on('unhandledRejection', (reason) => {
+    log('ERROR', `Unhandled rejection: ${reason}`);
+});

shared/blacklist.js

@@ -17,13 +17,37 @@ export const BLACKLIST_DOMAINS = [
     'msn.com',
     'baidu.com',
     'yandex.ru',
+    'ecosia.org',
+    'startpage.com',
+    'search.brave.com',
+    'qwant.com',
+    'you.com',
+    'perplexity.ai',
+    'ask.com',
+    'search.yahoo.com',
+    'swisscows.ch',
+    'mojeek.com',
 
     // Mail Providers
     'mail.google.com',
+    'gmail.com',
     'outlook.live.com',
     'outlook.office.com',
+    'mail.yahoo.com',
     'gmx.net',
+    'gmx.de',
+    'gmx.com',
     'web.de',
+    'protonmail.com',
+    'proton.me',
+    't-online.de',
+    'posteo.de',
+    'mailbox.org',
+    'mail.de',
+    'zoho.com',
+    'fastmail.com',
+    'tutanota.com',
+    'mail.ru',
 
     // Cloud Storage & Documents
     'docs.google.com',
@@ -61,6 +85,13 @@ export const BLACKLIST_DOMAINS = [
     'instagram.com',
     'reddit.com',
     'quora.com',
+    'threads.net',
+    'bsky.app',
+    'mastodon.social',
+    'vk.com',
+    'weibo.com',
+    '9gag.com',
+    'imgur.com',
 
     // E-Commerce
     'amazon.',
@@ -78,6 +109,15 @@ export const BLACKLIST_DOMAINS = [
     'myanimelist.net',
 
     // Development & Utilities
+    'koalastuff.net',
+    'auth.koalastuff.net',
+    'blog.koalastuff.net',
+    'clicker.koalastuff.net',
+    'cookies.koalastuff.net',
+    'multibox.koalastuff.net',
+    'snippets.koalastuff.net',
+    'status.koalastuff.net',
+    'sync.koalastuff.net',
     'timer.koalastuff.net',
     'localhost',
     'zoom.us',
@@ -85,6 +125,47 @@ export const BLACKLIST_DOMAINS = [
     'meet.google.com',
     'chrome.google.com',
 
+    // Music Streaming
+    'music.youtube.com',
+    'open.spotify.com',
+    'soundcloud.com',
+    'deezer.com',
+    'tidal.com',
+
+    // Knowledge & Blogs
+    'wikipedia.org',
+    'medium.com',
+    'dev.to',
+    'news.ycombinator.com',
+
+    // Design & Creative Tools
+    'figma.com',
+    'canva.com',
+    'miro.com',
+
+    // Online IDEs & Hosting
+    'vscode.dev',
+    'replit.com',
+    'codesandbox.io',
+    'vercel.com',
+    'netlify.com',
+
+    // Social & Image Sharing
+    'pinterest.com',
+    'tumblr.com',
+
+    // Language Learning
+    'duolingo.com',
+    'hellotalk.com',
+
+    // Google Utilities
+    'calendar.google.com',
+    'keep.google.com',
+
+    // Finance & Payments
+    'paypal.com',
+    'stripe.com',
+
     // Games & Idle Sites
     'milkywayidle.com',
     'melvoridle.com',

shared/constants.js

@@ -40,5 +40,5 @@ export const EVENTS = {
 };
 
 export const HEARTBEAT_INTERVAL = 15000; // 15s
-export const FORCE_SYNC_TIMEOUT = 5000; // 5s timeout for ACKs
+export const FORCE_SYNC_TIMEOUT = 8500; // 8.5s timeout for force sync ACKs (must be > content.js poll timeout of 8s)
 export const EPISODE_LOBBY_TIMEOUT = 60000; // 60s timeout for episode lobby

website/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>KoalaSync | Real-time Video Synchronization for Friends</title>
-    <meta name="description" content="Watch YouTube, Twitch, and HTML5 videos perfectly synchronized with friends. KoalaSync is a privacy-first, open-source browser extension for Chrome and Firefox.">
+    <meta name="description" content="Watch YouTube, Twitch, and HTML5 videos in sync with friends. KoalaSync is a privacy-first, open-source browser extension for Chrome and Firefox.">
     
     <link rel="stylesheet" href="style.css">
     <link rel="icon" type="image/png" href="assets/logo.png">
@@ -54,8 +54,8 @@
                     <span lang="de">Gemeinsam schauen.<br>Perfekt synchron.</span>
                 </h1>
                 <h2 class="hero-subtitle" data-reveal>
-                    <span lang="en">The ultimate free watch party extension for YouTube, Twitch, and local MP4s. Built for extreme precision and data sovereignty.</span>
-                    <span lang="de">Die ultimative, kostenlose Watch-Party-Erweiterung für YouTube, Twitch und lokale MP4s. Entwickelt für extreme Präzision und Datenhoheit.</span>
+                    <span lang="en">A free, open-source watch party extension for YouTube, Twitch, and local MP4s. Built for reliable synchronization and data sovereignty.</span>
+                    <span lang="de">Eine kostenlose, quelloffene Watch-Party-Erweiterung für YouTube, Twitch und lokale MP4s. Entwickelt für zuverlässige Synchronisation und Datenhoheit.</span>
                 </h2>
                 <div class="cta-group" data-reveal>
                     <a href="https://chromewebstore.google.com/detail/koalasync/obbnmkmlaaddodakcbdljknjpagklifc" class="btn btn-primary">
@@ -248,8 +248,8 @@
                 <span lang="en">Why KoalaSync?</span><span lang="de">Warum KoalaSync?</span>
             </h2>
             <p style="text-align: center; color: var(--text-muted); margin-bottom: 4rem;">
-                <span lang="en">Built for frame-perfect performance, absolute privacy, and total simplicity.</span>
-                <span lang="de">Entwickelt für bildgenaue Leistung, absolute Privatsphäre und totale Einfachheit.</span>
+                <span lang="en">Built for reliable sync, privacy-first design, and easy setup.</span>
+                <span lang="de">Entwickelt für zuverlässigen Sync, Datenschutz und einfache Einrichtung.</span>
             </p>
             
             <div class="features-grid">
@@ -259,8 +259,8 @@
                         <span lang="en">Full Control / Instant Sync</span>
                         <span lang="de">Volle Kontrolle & Echtzeit</span>
                     </h3>
-                    <p lang="en">One pauses, everyone pauses. One seeks, everyone follows. Our custom two-phase sync protocol coordinates playback with sub-millisecond precision across all participants.</p>
-                    <p lang="de">Einer pausiert, alle pausieren. Einer spult, alle folgen. Unser Zwei-Phasen-Synchronisationsprotokoll koordiniert die Wiedergabe in Echtzeit mit Sub-Millisekunden-Präzision.</p>
+                    <p lang="en">One pauses, everyone pauses. One seeks, everyone follows. Our two-phase sync protocol coordinates playback in real time across all participants.</p>
+                    <p lang="de">Einer pausiert, alle pausieren. Einer spult, alle folgen. Unser Zwei-Phasen-Synchronisationsprotokoll koordiniert die Wiedergabe aller Teilnehmer in Echtzeit.</p>
                 </div>
                 <div class="feature-card" data-reveal>
                     <div class="feature-icon">🎬</div>
@@ -268,7 +268,7 @@
                         <span lang="en">Endless Binge-Watching</span>
                         <span lang="de">Grenzenloses Bingen</span>
                     </h3>
-                    <p lang="en">Autoplay perfectly in sync. KoalaSync automatically detects episode transitions and holds playback until all peers have successfully loaded the next video.</p>
+                    <p lang="en">Autoplay in sync. KoalaSync automatically detects episode transitions and holds playback until all peers have successfully loaded the next video.</p>
                     <p lang="de">Nächste Episode startet für jeden zeitgleich. KoalaSync erkennt den Episodenwechsel und pausiert, bis jeder Teilnehmer das neue Video fertig geladen hat.</p>
                 </div>
                 <div class="feature-card" data-reveal>
@@ -277,8 +277,8 @@
                         <span lang="en">Zero Accounts / Pure Privacy</span>
                         <span lang="de">Keine Accounts / Datenschutz</span>
                     </h3>
-                    <p lang="en">No registration, no tracking, and no database persistence. The server runs entirely in RAM, collects no telemetry or logs, and completely forgets your room when you leave.</p>
-                    <p lang="de">Keine Registrierung, kein Tracking und keine Datenspeicherung. Der Server läuft flüchtig im RAM, sammelt keine Logs und vergisst deinen Raum sofort nach dem Verlassen.</p>
+                    <p lang="en">No registration, no tracking, and no database persistence. The server runs entirely in RAM, collects no telemetry or persistent logs, and purges your room when you leave.</p>
+                    <p lang="de">Keine Registrierung, kein Tracking und keine Datenspeicherung. Der Server läuft flüchtig im RAM, speichert keine dauerhaften Logs und löscht deinen Raum nach dem Verlassen.</p>
                 </div>
                 <div class="feature-card" data-reveal>
                     <div class="feature-icon">🌐</div>
@@ -286,8 +286,8 @@
                         <span lang="en">Universal HTML5 Support</span>
                         <span lang="de">Universeller HTML5-Support</span>
                     </h3>
-                    <p lang="en">Works on YouTube, Twitch, Netflix, Disney+, Jellyfin, Emby, and any standard webpage containing a HTML5 video element. Perfect for custom self-hosted setups.</p>
-                    <p lang="de">Unterstützt YouTube, Twitch, Netflix, Disney+, Jellyfin, Emby und jede beliebige Webseite mit einem HTML5-Video-Tag. Ideal auch für eigene Medienbibliotheken.</p>
+                    <p lang="en">Works on YouTube, Twitch, Netflix, Jellyfin, Emby, and any standard webpage containing a HTML5 video element. Also compatible with custom self-hosted setups.</p>
+                    <p lang="de">Unterstützt YouTube, Twitch, Netflix, Jellyfin, Emby und jede beliebige Webseite mit einem HTML5-Video-Tag. Ideal auch für eigene Medienbibliotheken.</p>
                 </div>
                 <div class="feature-card" data-reveal>
                     <div class="feature-icon">🐳</div>
@@ -304,8 +304,8 @@
                         <span lang="en">Instant Invites / 1-Click Join</span>
                         <span lang="de">Direkte Einladungen & 1-Klick Beitritt</span>
                     </h3>
-                    <p lang="en">No IP addresses or passwords to exchange. Share a secure, generated invite link with your friends to let them join your room automatically with a single click.</p>
-                    <p lang="de">Keine lästigen IPs oder Passwörter austauschen. Teile einfach einen verschlüsselten Einladungslink mit deinen Freunden, um sie mit einem Klick in den Raum zu holen.</p>
+                    <p lang="en">No IP addresses or passwords to exchange. Share a generated invite link with your friends to let them join your room automatically with a single click.</p>
+                    <p lang="de">Keine lästigen IPs oder Passwörter austauschen. Teile einfach einen Einladungslink mit deinen Freunden, um sie mit einem Klick in den Raum zu holen.</p>
                 </div>
             </div>
 
@@ -372,8 +372,8 @@
                     <div class="step-text" data-reveal>
                         <div class="step-num">03</div>
                         <h3><span lang="en">Share & Sync</span><span lang="de">Teilen & Synchronisieren</span></h3>
-                        <p lang="en">Send the invite link to your friends. Once they join, select your video tab and enjoy perfectly synced playback.</p>
-                        <p lang="de">Senden Sie den Einladungslink an Ihre Freunde. Sobald sie beitreten, wählen Sie Ihren Video-Tab aus und genießen Sie die perfekt synchronisierte Wiedergabe.</p>
+                        <p lang="en">Send the invite link to your friends. Once they join, select your video tab and enjoy synchronized playback.</p>
+                        <p lang="de">Senden Sie den Einladungslink an Ihre Freunde. Sobald sie beitreten, wählen Sie Ihren Video-Tab aus und genießen Sie die synchronisierte Wiedergabe.</p>
                     </div>
                     <!-- Custom Step 3 Illustration -->
                     <div class="step-illustration-3" data-reveal>
@@ -415,11 +415,11 @@
     <section id="self-hosting" style="background: rgba(15, 23, 42, 0.4); border-top: 1px solid var(--glass-border); border-bottom: 1px solid var(--glass-border);">
         <div class="container">
             <h2 style="font-size: 2.5rem; text-align: center; margin-bottom: 1rem;">
-                <span lang="en">Self-Hosters Paradise</span><span lang="de">Das Paradies für Self-Hoster</span>
+                <span lang="en">For Self-Hosters</span><span lang="de">Für Self-Hoster</span>
             </h2>
             <p style="text-align: center; color: var(--text-muted); margin-bottom: 3rem; max-width: 600px; margin-left: auto; margin-right: auto;">
-                <span lang="en">Maintain absolute data sovereignty. Deploy your own private high-performance relay server in under 60 seconds.</span>
-                <span lang="de">Behalte die absolute Datenhoheit. Richte deinen eigenen privaten Hochleistungs-Relay-Server in unter 60 Sekunden ein.</span>
+                <span lang="en">Maintain full data sovereignty. Deploy your own private relay server in minutes.</span>
+                <span lang="de">Behalte die volle Datenhoheit. Richte deinen eigenen privaten Relay-Server in wenigen Minuten ein.</span>
             </p>
 
             <div class="terminal-container" data-reveal>
@@ -482,7 +482,7 @@
         <div class="container">
             <h2 data-reveal><span lang="en">Ready to sync?</span><span lang="de">Bereit zum Synchronisieren?</span></h2>
             <p data-reveal style="margin-bottom: 2rem; color: var(--text-muted);">
-                <span lang="en">Join thousands of users watching together.</span><span lang="de">Schließen Sie sich Tausenden von Nutzern an, die bereits zusammen schauen.</span>
+                <span lang="en">Start watching together with friends.</span><span lang="de">Schau gemeinsam mit Freunden.</span>
             </p>
             <a href="https://github.com/Shik3i/KoalaSync" class="btn btn-primary" data-reveal>
                 <span lang="en">View on GitHub</span><span lang="de">Auf GitHub ansehen</span>

website/version.json

@@ -1,4 +1,4 @@
 {
-  "version": "1.6.0",
-  "date": "2026-05-25T00:15:24Z"
+  "version": "1.7.0",
+  "date": "2026-05-25T10:30:48Z"
 }