slawk0/web-chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed db connection on first build in docker

Browse Source
This commit is contained in:
slawk0
2024-09-04 22:25:48 +02:00
parent 2613d77c39
commit 161d2a1515
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/db.js
View File

@@ -50,11 +50,6 @@ async function createTables() {
} }
} }
createTables()
.catch((err) => {
console.error('Error creating tables:', err);
});
// function for checking if user exists // function for checking if user exists
async function isUserExists(username) { async function isUserExists(username) {
try { try {

13
backend/socket.js
View File

@@ -27,7 +27,7 @@ function initializeSocket(server) {
next(new Error('Not logged in')); next(new Error('Not logged in'));
} }
}); });
fdjklsdfjkldfsjklsdfjklsdfkljsdf
io.on('connection', (socket) => { io.on('connection', (socket) => {
if (!socket.user) { if (!socket.user) {
@@ -36,7 +36,8 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
return; return;
} }
const username = socket.user.username; const username = socket.user.username;
console.log(username + ' connected'); // useless option for log in users activity but why
//console.log(username + ' connected');
// Join a room with the user's username // Join a room with the user's username
socket.join(username); socket.join(username);
@@ -62,7 +63,6 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
if (result.rows.length > 0) { if (result.rows.length > 0) {
const newMessage = result.rows[0]; const newMessage = result.rows[0];
const formattedMessage = `Username: ${newMessage.username}, recipient: ${newMessage.recipient}, message: ${newMessage.content}`;
//console.log(formattedMessage); //console.log(formattedMessage);
// Emit message to the sender's and recipient's rooms // Emit message to the sender's and recipient's rooms
@@ -72,7 +72,7 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
console.error('Error fetching inserted message:', err); console.error('Error fetching inserted message:', err);
} }
// i think this is not needed? (it cause duplicate messages with loading messages history) // I think this is not needed? (it cause duplicate messages with loading messages history)
// if (!socket.recovered) { // if (!socket.recovered) {
// try { // try {
// const query = 'SELECT id, content, username, recipient FROM messages WHERE id > $1 ORDER BY id ASC'; // const query = 'SELECT id, content, username, recipient FROM messages WHERE id > $1 ORDER BY id ASC';
@@ -103,7 +103,9 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
if (result.rows.length > 0) { if (result.rows.length > 0) {
//const { username: sender, recipient: receiver, content: content, id: id } = result.rows; //const { username: sender, recipient: receiver, content: content, id: id } = result.rows;
console.log('Sending historical messages');
// useless option
//console.log('Sending historical messages');
socket.emit('messages history', result.rows); socket.emit('messages history', result.rows);
} else { } else {
io.emit('no messages', ); io.emit('no messages', );
@@ -113,6 +115,7 @@ fdjklsdfjkldfsjklsdfjklsdfkljsdf
} }
}); });
// disconnect event // disconnect event
socket.on('disconnect', () => { socket.on('disconnect', () => {
console.log(username + ' has disconnected'); console.log(username + ' has disconnected');