Enhance WebSocket handling: remove socket timeout, improve frame creation, and update test page UI

src/server.c

@@ -536,6 +536,12 @@ static void *handle_websocket(void *arg)
         pthread_exit(NULL);
     }
 
+    // Remove socket timeout for WebSocket (connections should stay open)
+    struct timeval ws_timeout;
+    ws_timeout.tv_sec = 0;  // No timeout - wait indefinitely
+    ws_timeout.tv_usec = 0;
+    setsockopt(conn->socket_fd, SOL_SOCKET, SO_RCVTIMEO, &ws_timeout, sizeof(ws_timeout));
+
     log_event("WebSocket connection established");
 
     uint8_t buffer[65536];
@@ -554,9 +560,13 @@ static void *handle_websocket(void *arg)
 
         if (bytes_received <= 0)
         {
-            ws_close_connection(conn, 1000);
+            if (bytes_received == 0 || (errno != EAGAIN && errno != EWOULDBLOCK))
-            free(conn);
+            {
-            pthread_exit(NULL);
+                ws_close_connection(conn, 1000);
+                free(conn);
+                pthread_exit(NULL);
+            }
+            continue;
         }
 
         ws_frame_header_t header;
@@ -578,7 +588,7 @@ static void *handle_websocket(void *arg)
             if (ws_is_valid_utf8(payload, header.payload_length))
             {
                 // Echo back the text message
-                ws_send_text(conn, (const char *)payload);
+                ws_send_frame(conn, WS_OPCODE_TEXT, payload, header.payload_length);
                 log_event("WebSocket text frame received and echoed");
             }
             else

src/websocket.c

@@ -219,6 +219,28 @@ int ws_parse_frame(const uint8_t *data, size_t len, ws_frame_header_t *header, u
 // Create WebSocket frame
 int ws_create_frame(uint8_t *buffer, size_t buffer_size, uint8_t opcode, const uint8_t *payload, size_t payload_len)
 {
+    size_t header_size;
+    
+    // Calculate total frame size first
+    if (payload_len < 126)
+    {
+        header_size = 2;
+    }
+    else if (payload_len < 65536)
+    {
+        header_size = 4;
+    }
+    else
+    {
+        header_size = 10;
+    }
+    
+    // Check buffer size before writing anything
+    if (buffer_size < header_size + payload_len)
+    {
+        return -1;
+    }
+    
     size_t offset = 0;
 
     // First byte: FIN + opcode
@@ -227,22 +249,16 @@ int ws_create_frame(uint8_t *buffer, size_t buffer_size, uint8_t opcode, const u
     // Second byte: MASK + payload length
     if (payload_len < 126)
     {
-        if (buffer_size < offset + 1 + payload_len)
+        buffer[offset++] = (uint8_t)payload_len;
-            return -1;
-        buffer[offset++] = payload_len;
     }
     else if (payload_len < 65536)
     {
-        if (buffer_size < offset + 3 + payload_len)
-            return -1;
         buffer[offset++] = 126;
         buffer[offset++] = (payload_len >> 8) & 0xFF;
         buffer[offset++] = payload_len & 0xFF;
     }
     else
     {
-        if (buffer_size < offset + 9 + payload_len)
-            return -1;
         buffer[offset++] = 127;
         for (int i = 7; i >= 0; i--)
         {
@@ -257,7 +273,7 @@ int ws_create_frame(uint8_t *buffer, size_t buffer_size, uint8_t opcode, const u
         offset += payload_len;
     }
 
-    return offset;
+    return (int)offset;
 }
 
 // Send WebSocket frame

www/websocket-test.html

@@ -11,333 +11,511 @@
             box-sizing: border-box;
         }
         
+        :root {
+            --primary: #3b82f6;
+            --primary-hover: #2563eb;
+            --success: #10b981;
+            --danger: #ef4444;
+            --bg: #0f172a;
+            --surface: #1e293b;
+            --border: #334155;
+            --text: #f1f5f9;
+            --text-dim: #94a3b8;
+        }
+        
         body {
-            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+            background: var(--bg);
+            color: var(--text);
             min-height: 100vh;
-            display: flex;
+            padding: 1.5rem;
-            justify-content: center;
-            align-items: center;
-            padding: 20px;
         }
         
         .container {
-            background: white;
+            max-width: 1200px;
-            border-radius: 15px;
+            margin: 0 auto;
-            box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
-            max-width: 600px;
-            width: 100%;
-            overflow: hidden;
         }
         
-        .header {
+        header {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
-            padding: 30px;
             text-align: center;
+            margin-bottom: 2rem;
         }
         
-        .header h1 {
+        h1 {
-            font-size: 28px;
+            font-size: 2rem;
-            margin-bottom: 10px;
+            font-weight: 700;
+            margin-bottom: 0.5rem;
+        }
+        
+        .subtitle {
+            color: var(--text-dim);
+            font-size: 0.95rem;
+        }
+        
+        .grid {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            gap: 1.5rem;
+            margin-bottom: 1.5rem;
+        }
+        
+        @media (max-width: 768px) {
+            .grid {
+                grid-template-columns: 1fr;
+            }
+        }
+        
+        .card {
+            background: var(--surface);
+            border: 1px solid var(--border);
+            border-radius: 0.75rem;
+            padding: 1.5rem;
+        }
+        
+        .card-title {
+            font-size: 1.1rem;
+            font-weight: 600;
+            margin-bottom: 1rem;
+            display: flex;
+            align-items: center;
+            gap: 0.5rem;
         }
         
         .status {
-            display: inline-block;
+            display: flex;
-            padding: 5px 15px;
+            align-items: center;
-            border-radius: 20px;
+            gap: 0.75rem;
-            font-size: 14px;
+            padding: 0.75rem 1rem;
-            font-weight: bold;
+            background: rgba(255, 255, 255, 0.05);
+            border-radius: 0.5rem;
+            margin-bottom: 1rem;
         }
         
-        .status.connected {
+        .status-dot {
-            background: #10b981;
+            width: 0.75rem;
+            height: 0.75rem;
+            border-radius: 50%;
+            background: var(--danger);
+            animation: pulse 2s infinite;
         }
         
-        .status.disconnected {
+        .status-dot.connected {
-            background: #ef4444;
+            background: var(--success);
         }
         
-        .content {
+        @keyframes pulse {
-            padding: 30px;
+            0%, 100% { opacity: 1; }
-        }
+            50% { opacity: 0.6; }
-        
-        .messages {
-            height: 300px;
-            overflow-y: auto;
-            border: 2px solid #e5e7eb;
-            border-radius: 10px;
-            padding: 15px;
-            margin-bottom: 20px;
-            background: #f9fafb;
-        }
-        
-        .message {
-            margin-bottom: 10px;
-            padding: 10px;
-            border-radius: 8px;
-            animation: fadeIn 0.3s;
-        }
-        
-        .message.sent {
-            background: #dbeafe;
-            margin-left: 20px;
-        }
-        
-        .message.received {
-            background: #d1fae5;
-            margin-right: 20px;
-        }
-        
-        .message.system {
-            background: #fee2e2;
-            text-align: center;
-            font-style: italic;
-        }
-        
-        .timestamp {
-            font-size: 11px;
-            color: #6b7280;
-            margin-bottom: 5px;
         }
         
         .input-group {
-            display: flex;
+            margin-bottom: 1rem;
-            gap: 10px;
-        }
-        
-        #messageInput {
-            flex: 1;
-            padding: 12px;
-            border: 2px solid #e5e7eb;
-            border-radius: 8px;
-            font-size: 14px;
-        }
-        
-        #messageInput:focus {
-            outline: none;
-            border-color: #667eea;
-        }
-        
-        button {
-            padding: 12px 30px;
-            border: none;
-            border-radius: 8px;
-            font-size: 14px;
-            font-weight: bold;
-            cursor: pointer;
-            transition: all 0.3s;
-        }
-        
-        #sendBtn {
-            background: #667eea;
-            color: white;
-        }
-        
-        #sendBtn:hover:not(:disabled) {
-            background: #5568d3;
-            transform: translateY(-2px);
-        }
-        
-        #sendBtn:disabled {
-            background: #9ca3af;
-            cursor: not-allowed;
-        }
-        
-        #connectBtn {
-            width: 100%;
-            margin-top: 15px;
-        }
-        
-        #connectBtn.connected {
-            background: #ef4444;
-            color: white;
-        }
-        
-        #connectBtn.disconnected {
-            background: #10b981;
-            color: white;
-        }
-        
-        @keyframes fadeIn {
-            from {
-                opacity: 0;
-                transform: translateY(10px);
-            }
-            to {
-                opacity: 1;
-                transform: translateY(0);
-            }
-        }
-        
-        .controls {
-            margin-top: 20px;
-            padding-top: 20px;
-            border-top: 2px solid #e5e7eb;
         }
         
         label {
             display: block;
-            margin-bottom: 8px;
+            margin-bottom: 0.4rem;
-            color: #374151;
+            font-size: 0.9rem;
-            font-weight: 600;
+            color: var(--text-dim);
         }
         
-        input[type="text"] {
+        input, select, textarea {
             width: 100%;
-            padding: 10px;
+            padding: 0.65rem;
-            border: 2px solid #e5e7eb;
+            background: rgba(255, 255, 255, 0.05);
-            border-radius: 8px;
+            border: 1px solid var(--border);
-            font-size: 14px;
+            border-radius: 0.5rem;
-            margin-bottom: 15px;
+            color: var(--text);
+            font-size: 0.95rem;
+            transition: all 0.2s;
+        }
+        
+        input:focus, select:focus, textarea:focus {
+            outline: none;
+            border-color: var(--primary);
+            background: rgba(255, 255, 255, 0.08);
+        }
+        
+        textarea {
+            resize: vertical;
+            min-height: 80px;
+            font-family: 'Consolas', monospace;
+        }
+        
+        .btn {
+            padding: 0.65rem 1.25rem;
+            border: none;
+            border-radius: 0.5rem;
+            font-size: 0.95rem;
+            font-weight: 500;
+            cursor: pointer;
+            transition: all 0.2s;
+            display: inline-flex;
+            align-items: center;
+            gap: 0.5rem;
+        }
+        
+        .btn-primary {
+            background: var(--primary);
+            color: white;
+        }
+        
+        .btn-primary:hover:not(:disabled) {
+            background: var(--primary-hover);
+        }
+        
+        .btn-success {
+            background: var(--success);
+            color: white;
+        }
+        
+        .btn-danger {
+            background: var(--danger);
+            color: white;
+        }
+        
+        .btn:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+        
+        .btn-block {
+            width: 100%;
+            justify-content: center;
+        }
+        
+        .btn-group {
+            display: flex;
+            gap: 0.5rem;
+        }
+        
+        .messages {
+            background: rgba(0, 0, 0, 0.2);
+            border-radius: 0.5rem;
+            padding: 1rem;
+            height: 400px;
+            overflow-y: auto;
+            margin-bottom: 1rem;
+        }
+        
+        .message {
+            margin-bottom: 0.75rem;
+            padding: 0.75rem;
+            border-radius: 0.5rem;
+            font-size: 0.9rem;
+            animation: fadeIn 0.3s;
+        }
+        
+        @keyframes fadeIn {
+            from { opacity: 0; transform: translateY(5px); }
+            to { opacity: 1; transform: translateY(0); }
+        }
+        
+        .message.sent {
+            background: rgba(59, 130, 246, 0.2);
+            border-left: 3px solid var(--primary);
+        }
+        
+        .message.received {
+            background: rgba(16, 185, 129, 0.2);
+            border-left: 3px solid var(--success);
+        }
+        
+        .message.system {
+            background: rgba(148, 163, 184, 0.15);
+            border-left: 3px solid var(--text-dim);
+            text-align: center;
+        }
+        
+        .message-time {
+            font-size: 0.75rem;
+            color: var(--text-dim);
+            margin-bottom: 0.25rem;
+        }
+        
+        .message-content {
+            word-break: break-word;
+        }
+        
+        .stats {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
+            gap: 1rem;
+        }
+        
+        .stat {
+            text-align: center;
+            padding: 1rem;
+            background: rgba(255, 255, 255, 0.05);
+            border-radius: 0.5rem;
+        }
+        
+        .stat-value {
+            font-size: 1.75rem;
+            font-weight: 700;
+            color: var(--primary);
+        }
+        
+        .stat-label {
+            font-size: 0.8rem;
+            color: var(--text-dim);
+            margin-top: 0.25rem;
+        }
+        
+        .messages::-webkit-scrollbar {
+            width: 6px;
+        }
+        
+        .messages::-webkit-scrollbar-track {
+            background: rgba(255, 255, 255, 0.05);
+            border-radius: 3px;
+        }
+        
+        .messages::-webkit-scrollbar-thumb {
+            background: var(--border);
+            border-radius: 3px;
+        }
+        
+        .messages::-webkit-scrollbar-thumb:hover {
+            background: var(--primary);
         }
     </style>
 </head>
 <body>
     <div class="container">
-        <div class="header">
+        <header>
-            <h1>🔥 Carbon WebSocket Test</h1>
+            <h1>🔌 WebSocket Test</h1>
-            <span class="status disconnected" id="status">Disconnected</span>
+            <p class="subtitle">Carbon Server</p>
+        </header>
+        
+        <div class="grid">
+            <!-- Connection -->
+            <div class="card">
+                <h2 class="card-title">⚡ Connection</h2>
+                
+                <div class="status">
+                    <span class="status-dot" id="statusDot"></span>
+                    <span id="statusText">Disconnected</span>
+                </div>
+                
+                <div class="input-group">
+                    <label>WebSocket URL</label>
+                    <input type="text" id="wsUrl" value="" placeholder="ws://localhost:8080/">
+                </div>
+                
+                <button class="btn btn-success btn-block" id="connectBtn">Connect</button>
+                
+                <div style="margin-top: 1.5rem;">
+                    <h3 class="card-title">🧪 Quick Tests</h3>
+                    <div class="btn-group">
+                        <button class="btn btn-primary" id="pingBtn" disabled>Ping</button>
+                        <button class="btn btn-primary" id="echoBtn" disabled>Echo</button>
+                    </div>
+                </div>
+            </div>
+            
+            <!-- Stats -->
+            <div class="card">
+                <h2 class="card-title">📊 Statistics</h2>
+                <div class="stats">
+                    <div class="stat">
+                        <div class="stat-value" id="statSent">0</div>
+                        <div class="stat-label">Sent</div>
+                    </div>
+                    <div class="stat">
+                        <div class="stat-value" id="statReceived">0</div>
+                        <div class="stat-label">Received</div>
+                    </div>
+                    <div class="stat">
+                        <div class="stat-value" id="statLatency">--</div>
+                        <div class="stat-label">Latency (ms)</div>
+                    </div>
+                </div>
+            </div>
         </div>
         
-        <div class="content">
+        <!-- Messages -->
+        <div class="card">
+            <h2 class="card-title">💬 Messages</h2>
+            
             <div class="messages" id="messages">
                 <div class="message system">
-                    <div class="timestamp">System</div>
+                    <div class="message-content">Ready to connect...</div>
-                    Welcome! Configure the WebSocket URL below and click Connect.
                 </div>
             </div>
             
             <div class="input-group">
-                <input type="text" id="messageInput" placeholder="Type your message..." disabled>
+                <textarea id="messageInput" placeholder="Type a message..." disabled></textarea>
-                <button id="sendBtn" disabled>Send</button>
             </div>
             
-            <div class="controls">
+            <div class="btn-group">
-                <label for="wsUrl">WebSocket URL:</label>
+                <button class="btn btn-primary" id="sendBtn" disabled>Send</button>
-                <input type="text" id="wsUrl" value="ws://localhost:8080" placeholder="ws://localhost:8080">
+                <button class="btn btn-danger" id="clearBtn">Clear</button>
-                <button id="connectBtn" class="disconnected">Connect</button>
             </div>
         </div>
     </div>
 
     <script>
         let ws = null;
-        const messagesDiv = document.getElementById('messages');
+        let stats = { sent: 0, received: 0 };
-        const messageInput = document.getElementById('messageInput');
+        let pingTime = null;
-        const sendBtn = document.getElementById('sendBtn');
-        const connectBtn = document.getElementById('connectBtn');
-        const statusSpan = document.getElementById('status');
-        const wsUrlInput = document.getElementById('wsUrl');
 
-        function addMessage(text, type) {
+        const elements = {
-            const messageDiv = document.createElement('div');
+            statusDot: document.getElementById('statusDot'),
-            messageDiv.className = `message ${type}`;
+            statusText: document.getElementById('statusText'),
-            
+            wsUrl: document.getElementById('wsUrl'),
-            const timestamp = document.createElement('div');
+            connectBtn: document.getElementById('connectBtn'),
-            timestamp.className = 'timestamp';
+            messages: document.getElementById('messages'),
-            timestamp.textContent = new Date().toLocaleTimeString();
+            messageInput: document.getElementById('messageInput'),
-            
+            sendBtn: document.getElementById('sendBtn'),
-            const content = document.createElement('div');
+            clearBtn: document.getElementById('clearBtn'),
-            content.textContent = text;
+            pingBtn: document.getElementById('pingBtn'),
-            
+            echoBtn: document.getElementById('echoBtn'),
-            messageDiv.appendChild(timestamp);
+            statSent: document.getElementById('statSent'),
-            messageDiv.appendChild(content);
+            statReceived: document.getElementById('statReceived'),
-            messagesDiv.appendChild(messageDiv);
+            statLatency: document.getElementById('statLatency')
-            messagesDiv.scrollTop = messagesDiv.scrollHeight;
+        };
+
+        // Auto-detect WebSocket URL based on page protocol
+        function getDefaultWebSocketUrl() {
+            const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const host = window.location.hostname;
+            const port = window.location.port || (window.location.protocol === 'https:' ? '443' : '8080');
+            return `${protocol}//${host}:${port}/`;
+        }
+
+        // Initialize URL on page load
+        window.addEventListener('DOMContentLoaded', () => {
+            if (!elements.wsUrl.value) {
+                elements.wsUrl.value = getDefaultWebSocketUrl();
+            }
+        });
+
+        function addMessage(content, type = 'system') {
+            const msg = document.createElement('div');
+            msg.className = `message ${type}`;
+            msg.innerHTML = `
+                <div class="message-time">${new Date().toLocaleTimeString()}</div>
+                <div class="message-content">${content}</div>
+            `;
+            elements.messages.appendChild(msg);
+            elements.messages.scrollTop = elements.messages.scrollHeight;
         }
 
         function updateStatus(connected) {
             if (connected) {
-                statusSpan.textContent = 'Connected';
+                elements.statusDot.classList.add('connected');
-                statusSpan.className = 'status connected';
+                elements.statusText.textContent = 'Connected';
-                connectBtn.textContent = 'Disconnect';
+                elements.connectBtn.textContent = 'Disconnect';
-                connectBtn.className = 'connected';
+                elements.connectBtn.className = 'btn btn-danger btn-block';
-                messageInput.disabled = false;
+                elements.messageInput.disabled = false;
-                sendBtn.disabled = false;
+                elements.sendBtn.disabled = false;
-                wsUrlInput.disabled = true;
+                elements.pingBtn.disabled = false;
+                elements.echoBtn.disabled = false;
             } else {
-                statusSpan.textContent = 'Disconnected';
+                elements.statusDot.classList.remove('connected');
-                statusSpan.className = 'status disconnected';
+                elements.statusText.textContent = 'Disconnected';
-                connectBtn.textContent = 'Connect';
+                elements.connectBtn.textContent = 'Connect';
-                connectBtn.className = 'disconnected';
+                elements.connectBtn.className = 'btn btn-success btn-block';
-                messageInput.disabled = true;
+                elements.messageInput.disabled = true;
-                sendBtn.disabled = true;
+                elements.sendBtn.disabled = true;
-                wsUrlInput.disabled = false;
+                elements.pingBtn.disabled = true;
+                elements.echoBtn.disabled = true;
             }
         }
 
+        function updateStats() {
+            elements.statSent.textContent = stats.sent;
+            elements.statReceived.textContent = stats.received;
+        }
+
         function connect() {
-            const url = wsUrlInput.value.trim();
+            const url = elements.wsUrl.value.trim();
-            if (!url) {
+            if (!url) return;
-                addMessage('Please enter a valid WebSocket URL', 'system');
-                return;
-            }
 
             try {
-                addMessage('Attempting to connect to: ' + url, 'system');
                 ws = new WebSocket(url);
 
-                ws.addEventListener('open', (event) => {
+                ws.onopen = () => {
-                    console.log('WebSocket opened', event);
-                    addMessage('✅ Connected to server!', 'system');
                     updateStatus(true);
-                });
+                    addMessage('✅ Connected', 'system');
+                };
 
-                ws.addEventListener('message', (event) => {
+                ws.onmessage = (event) => {
-                    console.log('WebSocket message received:', event.data);
+                    stats.received++;
-                    addMessage(event.data, 'received');
+                    updateStats();
-                });
 
-                ws.addEventListener('error', (error) => {
+                    if (pingTime && event.data.includes('pong')) {
-                    console.error('WebSocket error:', error);
+                        const latency = Date.now() - pingTime;
-                    addMessage('❌ WebSocket error occurred - Check console for details', 'system');
+                        elements.statLatency.textContent = latency;
-                });
+                        addMessage(`Pong! Latency: ${latency}ms`, 'received');
+                        pingTime = null;
+                    } else {
+                        addMessage(event.data, 'received');
+                    }
+                };
 
-                ws.addEventListener('close', (event) => {
+                ws.onerror = () => {
-                    console.log('WebSocket closed', event);
+                    addMessage('❌ Connection error', 'system');
-                    addMessage(`Connection closed (Code: ${event.code}, Reason: ${event.reason || 'None'})`, 'system');
+                };
+
+                ws.onclose = () => {
                     updateStatus(false);
+                    addMessage('Connection closed', 'system');
                     ws = null;
-                });
+                };
             } catch (error) {
-                console.error('Exception while connecting:', error);
+                addMessage(`❌ Failed: ${error.message}`, 'system');
-                addMessage('❌ Failed to connect: ' + error.message, 'system');
-                updateStatus(false);
             }
         }
 
         function disconnect() {
             if (ws) {
-                ws.close(1000, 'User disconnected');
+                ws.close();
                 ws = null;
             }
         }
 
-        function sendMessage() {
+        function sendMessage(text) {
-            const message = messageInput.value.trim();
+            if (!ws || ws.readyState !== WebSocket.OPEN) return;
-            if (message && ws && ws.readyState === WebSocket.OPEN) {
+
-                ws.send(message);
+            ws.send(text);
-                addMessage(message, 'sent');
+            stats.sent++;
-                messageInput.value = '';
+            updateStats();
-            }
+            addMessage(text, 'sent');
         }
 
-        connectBtn.addEventListener('click', () => {
+        elements.connectBtn.addEventListener('click', () => {
-            if (ws && ws.readyState === WebSocket.OPEN) {
+            ws ? disconnect() : connect();
-                disconnect();
+        });
-            } else {
+
-                connect();
+        elements.sendBtn.addEventListener('click', () => {
+            const text = elements.messageInput.value.trim();
+            if (text) {
+                sendMessage(text);
+                elements.messageInput.value = '';
             }
         });
 
-        sendBtn.addEventListener('click', sendMessage);
+        elements.messageInput.addEventListener('keydown', (e) => {
-
+            if (e.key === 'Enter' && !e.shiftKey) {
-        messageInput.addEventListener('keypress', (e) => {
+                e.preventDefault();
-            if (e.key === 'Enter') {
+                elements.sendBtn.click();
-                sendMessage();
             }
         });
+
+        elements.clearBtn.addEventListener('click', () => {
+            elements.messages.innerHTML = '<div class="message system"><div class="message-content">Log cleared</div></div>';
+        });
+
+        elements.pingBtn.addEventListener('click', () => {
+            pingTime = Date.now();
+            sendMessage(JSON.stringify({ type: 'ping', timestamp: pingTime }));
+        });
+
+        elements.echoBtn.addEventListener('click', () => {
+            sendMessage(JSON.stringify({ type: 'echo', message: 'Hello, Carbon!' }));
+        });
     </script>
 </body>
 </html>