From 56802a1bd6e0f841e038c68262978d2e0a400c73 Mon Sep 17 00:00:00 2001 From: Colinm1215 Date: Sun, 8 Oct 2023 17:10:46 -0400 Subject: [PATCH 1/2] chatroom (not working) --- http_server.js | 64 +++++++++++++++++ package-lock.json | 177 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 4 +- src/App.jsx | 36 ++++------ src/Chat.jsx | 93 ++++++++++++++++++++++++ 5 files changed, 346 insertions(+), 28 deletions(-) create mode 100644 http_server.js create mode 100644 src/Chat.jsx diff --git a/http_server.js b/http_server.js new file mode 100644 index 00000000..02b4c5ea --- /dev/null +++ b/http_server.js @@ -0,0 +1,64 @@ +import express from 'express' +import ViteExpress from 'vite-express' +import { createServer } from 'http' +import { Server } from 'socket.io' + +let messagesLog = []; + +const app = express(); +const httpServer = createServer(app); +const io = new Server(httpServer, { + cors: { + origin: "http://localhost:3000", + methods: ["GET", "POST"] + } + }); + + +app.use(express.static('dist')); + + +io.on('connection', (socket) => { + console.log('a user connected'); + + // Handle joining a chatroom + socket.on('join-room', (room) => { + socket.join(room); + }); + + // Handle sending a message + socket.on('send-message', ({ room, message }) => { + const timestamp = new Date().toISOString(); + console.log(`${timestamp} : ${room}: ${message}`); + + // Store the message details + messagesLog.push({ + message, + room, + timestamp + }); + const roomMessages = messagesLog.filter(msg => msg.room === room); + + socket.on('request-historical-messages', (room) => { + console.log("request-historical-messages"); + socket.emit('historical-messages', roomMessages); + }); + + io.to(room).emit('receive-message', roomMessages); + }); + + + socket.on('leave-room', (room) => { + socket.leave(room); + }); + + socket.on('disconnect', () => { + console.log('user disconnected'); + }); +}); + +httpServer.listen(3001, () => { + console.log('http server started'); +}); + +ViteExpress.listen( app, 3000 ) \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2231d9b9..f1dc3b73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,8 @@ "express": "^4.18.2", "react": "^18.2.0", "react-dom": "^18.2.0", + "socket.io": "^4.7.2", + "socket.io-client": "^4.7.2", "vite-express": "^0.10.0" }, "devDependencies": { @@ -912,6 +914,11 @@ "node": ">= 8" } }, + "node_modules/@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" + }, "node_modules/@types/babel__core": { "version": "7.20.2", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz", @@ -953,6 +960,24 @@ "@babel/types": "^7.20.7" } }, + "node_modules/@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" + }, + "node_modules/@types/cors": { + "version": "2.8.14", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.14.tgz", + "integrity": "sha512-RXHUvNWYICtbP6s18PnOCaqToK8y14DnLd75c6HfyKf228dxy7pHNOQkxPtvXKp/hINFMDjbYzsj63nnpPMSRQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "20.8.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz", + "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==" + }, "node_modules/@types/prop-types": { "version": "15.7.8", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.8.tgz", @@ -1214,6 +1239,14 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/base64id": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", + "engines": { + "node": "^4.5.0 || >= 5.9" + } + }, "node_modules/body-parser": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", @@ -1414,6 +1447,18 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1438,7 +1483,6 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, "dependencies": { "ms": "2.1.2" }, @@ -1536,6 +1580,54 @@ "node": ">= 0.8" } }, + "node_modules/engine.io": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.2.tgz", + "integrity": "sha512-IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA==", + "dependencies": { + "@types/cookie": "^0.4.1", + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~5.2.1", + "ws": "~8.11.0" + }, + "engines": { + "node": ">=10.2.0" + } + }, + "node_modules/engine.io-client": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz", + "integrity": "sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1", + "engine.io-parser": "~5.2.1", + "ws": "~8.11.0", + "xmlhttprequest-ssl": "~2.0.0" + } + }, + "node_modules/engine.io-parser": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", + "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/es-abstract": { "version": "1.22.2", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", @@ -3074,8 +3166,7 @@ "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { "version": "3.3.6", @@ -3119,7 +3210,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3821,6 +3911,57 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/socket.io": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz", + "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==", + "dependencies": { + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "cors": "~2.8.5", + "debug": "~4.3.2", + "engine.io": "~6.5.2", + "socket.io-adapter": "~2.5.2", + "socket.io-parser": "~4.2.4" + }, + "engines": { + "node": ">=10.2.0" + } + }, + "node_modules/socket.io-adapter": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz", + "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==", + "dependencies": { + "ws": "~8.11.0" + } + }, + "node_modules/socket.io-client": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.2.tgz", + "integrity": "sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.2", + "engine.io-client": "~6.5.2", + "socket.io-parser": "~4.2.4" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io-parser": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -4313,6 +4454,34 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, + "node_modules/ws": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xmlhttprequest-ssl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz", + "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", diff --git a/package.json b/package.json index 80db9291..b9225ba5 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,14 @@ "build": "vite build", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", - "start": "node server.js" + "start": "node http_server.js" }, "dependencies": { "express": "^4.18.2", "react": "^18.2.0", "react-dom": "^18.2.0", + "socket.io": "^4.7.2", + "socket.io-client": "^4.7.2", "vite-express": "^0.10.0" }, "devDependencies": { diff --git a/src/App.jsx b/src/App.jsx index b8b8473a..64b7e49b 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,35 +1,25 @@ -import { useState } from 'react' -import reactLogo from './assets/react.svg' -import viteLogo from '/vite.svg' +import { useState } from 'react'; +import Chat from './Chat'; import './App.css' function App() { - const [count, setCount] = useState(0) + const [count, setCount] = useState(0); + const [selectedRoom, setSelectedRoom] = useState(null); return ( <> -
- - Vite logo - - - React logo - -
-

Vite + React

- -

- Edit src/App.jsx and save to test HMR -

+

Select a chatroom:

+ + {selectedRoom && }
-

- Click on the Vite and React logos to learn more -

) } -export default App +export default App; diff --git a/src/Chat.jsx b/src/Chat.jsx new file mode 100644 index 00000000..8e86cefa --- /dev/null +++ b/src/Chat.jsx @@ -0,0 +1,93 @@ +import { useEffect, useState, useRef } from 'react'; +import io from 'socket.io-client'; + +function Chat({ room }) { + const [messages, setMessages] = useState([]); + const [input, setInput] = useState(''); + const socketRef = useRef(null); + const [prevRoom, setPrevRoom] = useState(null); + const [connected, setConnected] = useState(false); + + useEffect(() => { + console.log("useEffect"); + setMessages([]); + if (room) { + setPrevRoom(room); + } + if (!connected) { + socketRef.current = io.connect('http://localhost:3001'); + setConnected(true); + } + + if (prevRoom != null) { + socketRef.current.emit('leave-room', prevRoom); + } + socketRef.current.emit('join-room', room); + + socketRef.current.emit('request-historical-messages', room); + socketRef.current.on('historical-messages', (historicalMessages) => { + console.log("historical-message"); + console.log(messages); + console.log(historicalMessages); + setMessages(historicalMessages); + }); + + socketRef.current.on('receive-message', (message) => { + console.log("Received message:", message); + setMessages((prev) => [...prev, message]); + }); + + + return () => { + socketRef.current.off('historical-messages'); + socketRef.current.off('receive-message'); + }; + + + }, [room]); + + + useEffect(() => { + return () => { + socketRef.current.disconnect(); + setConnected(false); + }; + }, []); + + const sendMessage = () => { + console.log(room + ' : ' + input); + socketRef.current.emit('send-message', { room, message: input }); + + // Use setMessages to update the state + const newMessage = { + message: input, + room, + timestamp: new Date().toISOString() + }; + setMessages((prev) => [...prev, newMessage]); + + setInput(''); + console.log('Sent Message : ' + newMessage); + }; + + return ( +
+

{room}

+
+ {messages.map((messageObj, index) => ( +
+

{messageObj.room} ({messageObj.timestamp}): {messageObj.message}

+
+ ))} +
+ setInput(e.target.value)} + type="text" + /> + +
+ ); +} + +export default Chat; From fb5715bc97565122ba051aeaa83a2c7d8a6bc523 Mon Sep 17 00:00:00 2001 From: Colinm1215 Date: Sun, 8 Oct 2023 17:56:20 -0400 Subject: [PATCH 2/2] chatroom structure (WORKING) --- http_server.js | 86 ++++++++++++++++++++++++++------------------------ src/Chat.jsx | 40 +++++++++++++++-------- 2 files changed, 71 insertions(+), 55 deletions(-) diff --git a/http_server.js b/http_server.js index 02b4c5ea..34e52379 100644 --- a/http_server.js +++ b/http_server.js @@ -4,61 +4,65 @@ import { createServer } from 'http' import { Server } from 'socket.io' let messagesLog = []; - + const app = express(); const httpServer = createServer(app); const io = new Server(httpServer, { - cors: { - origin: "http://localhost:3000", - methods: ["GET", "POST"] - } - }); - + cors: { + origin: "http://localhost:3000", + methods: ["GET", "POST"] + } +}); + app.use(express.static('dist')); io.on('connection', (socket) => { - console.log('a user connected'); - - // Handle joining a chatroom - socket.on('join-room', (room) => { - socket.join(room); - }); - - // Handle sending a message - socket.on('send-message', ({ room, message }) => { - const timestamp = new Date().toISOString(); - console.log(`${timestamp} : ${room}: ${message}`); - - // Store the message details - messagesLog.push({ - message, - room, - timestamp - }); - const roomMessages = messagesLog.filter(msg => msg.room === room); - - socket.on('request-historical-messages', (room) => { - console.log("request-historical-messages"); - socket.emit('historical-messages', roomMessages); - }); - - io.to(room).emit('receive-message', roomMessages); + console.log('a user connected'); + + // Handle joining a chatroom + socket.on('join-room', (room) => { + socket.join(room); }); - - socket.on('leave-room', (room) => { - socket.leave(room); - }); + // Handle sending a message + socket.on('send-message', ({ room, message }) => { + const timestamp = new Date().toISOString(); + console.log(`${room} (${timestamp}): ${message}`); + + // Store the message details + const newMessage = { + message, + room, + timestamp + }; + messagesLog.push(newMessage); + + // Emit the new message to everyone in the room + io.to(room).emit('receive-message', newMessage); + }); - socket.on('disconnect', () => { - console.log('user disconnected'); - }); + // Handle the request for historical messages + socket.on('request-historical-messages', (room) => { + console.log("request-historical-messages"); + const roomMessages = messagesLog.filter(msg => msg.room === room); + socket.emit('historical-messages', roomMessages); + }); + + + + socket.on('leave-room', (room) => { + socket.leave(room); + }); + + socket.on('disconnect', () => { + console.log('user disconnected'); + }); }); httpServer.listen(3001, () => { console.log('http server started'); }); -ViteExpress.listen( app, 3000 ) \ No newline at end of file +ViteExpress.listen(app, 3000) \ No newline at end of file diff --git a/src/Chat.jsx b/src/Chat.jsx index 8e86cefa..83284196 100644 --- a/src/Chat.jsx +++ b/src/Chat.jsx @@ -7,6 +7,14 @@ function Chat({ room }) { const socketRef = useRef(null); const [prevRoom, setPrevRoom] = useState(null); const [connected, setConnected] = useState(false); + const activeRoomRef = useRef(room); + + useEffect(() => { + + // ... (rest of the code remains the same) + + }, [room]); + useEffect(() => { console.log("useEffect"); @@ -14,6 +22,8 @@ function Chat({ room }) { if (room) { setPrevRoom(room); } + activeRoomRef.current = room; // Update ref to current room + if (!connected) { socketRef.current = io.connect('http://localhost:3001'); setConnected(true); @@ -22,21 +32,23 @@ function Chat({ room }) { if (prevRoom != null) { socketRef.current.emit('leave-room', prevRoom); } - socketRef.current.emit('join-room', room); + socketRef.current.emit('join-room', room); socketRef.current.emit('request-historical-messages', room); + socketRef.current.on('historical-messages', (historicalMessages) => { - console.log("historical-message"); - console.log(messages); - console.log(historicalMessages); - setMessages(historicalMessages); + // Check if the room associated with the messages matches the currently active room + if (historicalMessages.length > 0 && historicalMessages[0].room === activeRoomRef.current) { + console.log("historical-message"); + setMessages(historicalMessages); + } }); socketRef.current.on('receive-message', (message) => { console.log("Received message:", message); setMessages((prev) => [...prev, message]); - }); - + }); + return () => { socketRef.current.off('historical-messages'); @@ -57,15 +69,13 @@ function Chat({ room }) { const sendMessage = () => { console.log(room + ' : ' + input); socketRef.current.emit('send-message', { room, message: input }); - + // Use setMessages to update the state const newMessage = { message: input, room, timestamp: new Date().toISOString() - }; - setMessages((prev) => [...prev, newMessage]); - + }; setInput(''); console.log('Sent Message : ' + newMessage); }; @@ -75,9 +85,11 @@ function Chat({ room }) {

{room}

{messages.map((messageObj, index) => ( -
-

{messageObj.room} ({messageObj.timestamp}): {messageObj.message}

-
+ messageObj.message ? ( +
+

{messageObj.room} ({messageObj.timestamp}): {messageObj.message}

+
+ ) : null ))}