Fix bugs and rewrite in TypeScript.
- User
Fix bugs and rewrite in TypeScript.
Assistant
Here's the rewritten code in TypeScript, addressing several bugs and improving code quality:
Project Structure:
e2ee-chat/ ├── node_modules/ ├── public/ │ ├── index.html │ ├── style.css │ └── client.ts ├── server.ts ├── package.json └── tsconfig.jsonpackage.json:{ "name": "e2ee-chat", "version": "1.0.0", "description": "End-to-end encrypted Socket.IO chat", "main": "server.ts", "scripts": { "start": "tsc && node server.js", "build": "tsc" }, "dependencies": { "express": "^4.18.2", "socket.io": "^4.7.2", "@types/express": "^4.17.13", "@types/socket.io": "^4.5.0", "@types/node": "^18.11.18" }, "devDependencies": { "typescript": "^4.9.4" } }tsconfig.json:{ "compilerOptions": { "target": "es6", "module": "commonjs", "outDir": "./", "strict": true, "esModuleInterop": true, "skipLibCheck": true, "forceConsistentCasingInFileNames": true } }server.ts:import express, { Request, Response } from 'express'; import http from 'http'; import { Server } from 'socket.io'; const app = express(); const server = http.createServer(app); const io = new Server(server); const PORT = process.env.PORT || 3000; // Store user public keys (In-memory, lost on restart!) interface User { username: string; publicKey: string; // Base64 encoded } const users: { [socketId: string]: User } = {}; app.use(express.static('public')); io.on('connection', (socket) => { console.log(`User connected: ${socket.id}`); // Send existing users' public keys to the new user socket.emit('existing_users', Object.values(users)); // Handle user joining with their public key socket.on('join', ({ username, publicKey }: { username: string; publicKey: string }) => { console.log(`${username} (${socket.id}) joined with public key.`); users[socket.id] = { username, publicKey }; // Notify others about the new user (including their public key) socket.broadcast.emit('user_joined', users[socket.id]); }); // Relay encrypted messages socket.on('send_message', (data: { recipientId: string; ciphertext: string; iv: string }) => { console.log(`Relaying message from ${socket.id} to ${data.recipientId}`); // Send only to the intended recipient socket.to(data.recipientId).emit('receive_message', data); }); // Handle disconnection socket.on('disconnect', () => { console.log(`User disconnected: ${socket.id}`); const username = users[socket.id]?.username || 'Unknown'; delete users[socket.id]; // Notify others io.emit('user_left', { id: socket.id, username }); }); }); server.listen(PORT, () => { console.log(`Server listening on *:${PORT}`); });public/index.html:<!DOCTYPE html> <html> <head> <title>E2EE Chat</title> <link rel="stylesheet" href="style.css"> </head> <body> <h1>E2EE Socket.IO Chat</h1> <div id="username-prompt"> <label for="username">Enter Username:</label> <input type="text" id="username" autocomplete="off" /> <button id="join-button">Join Chat</button> </div> <div id="chat-container" style="display: none;"> <div id="sidebar"> <h2>Users Online</h2> <ul id="user-list"></ul> </div> <div id="main-chat"> <div id="messages"></div> <form id="form"> <label for="recipient-select">Send DM to:</label> <select id="recipient-select"> <option value="" disabled selected>Select user...</option> </select> <input id="input" autocomplete="off" placeholder="Type message..." /> <button>Send</button> </form> </div> </div> <script src="/socket.io/socket.io.js"></script> <script src="client.js"></script> </body> </html>public/style.css:body { margin: 0; padding-bottom: 3rem; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; } #username-prompt { padding: 1rem; text-align: center; } #chat-container { display: flex; height: 90vh; } #sidebar { width: 20%; border-right: 1px solid #ccc; padding: 1rem; overflow-y: auto; } #main-chat { width: 80%; display: flex; flex-direction: column; } #form { background: rgba(0, 0, 0, 0.1); padding: 0.5rem; display: flex; height: 3rem; box-sizing: border-box; backdrop-filter: blur(10px); position: fixed; bottom: 0; width: 80%; } /* Adjust width if sidebar changes */ #input { border: none; padding: 0 1rem; flex-grow: 1; border-radius: 2rem; margin: 0.25rem; } #input:focus { outline: none; } #form > button { background: #333; border: none; padding: 0 1rem; margin: 0.25rem; border-radius: 3px; outline: none; color: #fff; } #recipient-select { margin: 0.25rem; padding: 0 0.5rem; } #messages { list-style-type: none; margin: 0; padding: 1rem; overflow-y: auto; flex-grow: 1; } #messages > div { padding: 0.5rem 1rem; } #messages > div:nth-child(odd) { background: #efefef; } .message-meta { font-size: 0.8em; color: #555; margin-bottom: 0.2em;} .message-content { font-weight: bold; } /* Displaying encrypted first */ .decrypted { font-weight: normal; color: green; } /* Style for decrypted */ .error { color: red; font-style: italic; } .system-message { color: gray; font-style: italic; text-align: center; padding: 0.5rem; } #user-list { list-style-type: none; padding: 0; } #user-list li { padding: 0.3rem 0; } #user-list li.you { font-weight: bold; color: blue; }public/client.ts:// Connect to Socket.IO server const socket = io(); // --- DOM Elements --- const usernamePrompt = document.getElementById('username-prompt') as HTMLDivElement; const chatContainer = document.getElementById('chat-container') as HTMLDivElement; const usernameInput = document.getElementById('username') as HTMLInputElement; const joinButton = document.getElementById('join-button') as HTMLButtonElement; const userList = document.getElementById('user-list') as HTMLUListElement; const recipientSelect = document.getElementById('recipient-select') as HTMLSelectElement; const messages = document.getElementById('messages') as HTMLDivElement; const form = document.getElementById('form') as HTMLFormElement; const input = document.getElementById('input') as HTMLInputElement; // --- State --- let myUsername = ''; let myKeyPair: CryptoKeyPair | null = null; let myPublicKeyBase64 = ''; let users: { [socketId: string]: { username: string; publicKey: CryptoKey; publicKeyBase64: string } } = {}; // --- Crypto Constants --- const KEY_ALGORITHM: EcdhKeyGenParams = { name: 'ECDH', namedCurve: 'P-256' // NIST P-256 curve }; const ENCRYPT_ALGORITHM: AesGcmParams = { name: 'AES-GCM', length: 256 // Key length }; // --- Utility Functions --- function arrayBufferToBase64(buffer: ArrayBuffer): string { let binary = ''; const bytes = new Uint8Array(buffer); const len = bytes.byteLength; for (let i = 0; i < len; i++) { binary += String.fromCharCode(bytes[i]); } return window.btoa(binary); } function base64ToArrayBuffer(base64: string): ArrayBuffer { const binary_string = window.atob(base64); const len = binary_string.length; const bytes = new Uint8Array(len); for (let i = 0; i < len; i++) { bytes[i] = binary_string.charCodeAt(i); } return bytes.buffer; } // --- Crypto Functions --- // Generate ECDH key pair async function generateKeys(): Promise<CryptoKeyPair> { return await window.crypto.subtle.generateKey( KEY_ALGORITHM