rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Date.now ClientChat that stores user, socket id and date

Browse source
This commit is contained in:
NigeParis 2025-11-25 17:49:49 +01:00
parent 0f3414e8ce
commit 40980bedeb
8 changed files with 107 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/@shared/package.json
View file

@ -20,7 +20,7 @@
"fastify-plugin": "^5.1.0",
"joi": "^18.0.2",
"otp": "^1.1.2",
"typebox": "^1.0.55",
"typebox": "^1.0.56",
"uuidv7": "^1.0.2"
},
"devDependencies": {

2
src/auth/package.json
View file

@ -27,7 +27,7 @@
"fastify": "^5.6.2",
"fastify-cli": "^7.4.1",
"fastify-plugin": "^5.1.0",
"typebox": "^1.0.55"
"typebox": "^1.0.56"
},
"devDependencies": {
"@types/node": "^22.19.1",

52
src/chat/src/app.ts
View file

@ -11,7 +11,12 @@ declare const __SERVICE_NAME: string;
// Global map of clients
// key = socket, value = clientname
const clientChat = new Map<string, string>();
interface ClientInfo {
user: string;
lastSeen: number;
}
const clientChat = new Map<string, ClientInfo>();
// @ts-expect-error: import.meta.glob is a vite thing. Typescript doesn't know this...
const plugins = import.meta.glob('./plugins/**/*.ts', { eager: true });
@ -79,13 +84,13 @@ async function onReady(fastify: FastifyInstance) {
const seen = new Set<string>();
// <- only log/count unique usernames
for (const [socketId, username] of clientChat) {
for (const [socketId, username,] of clientChat) {
// Basic sanity checks
if (typeof socketId !== 'string' || socketId.length === 0) {
clientChat.delete(socketId);
continue;
}
if (typeof username !== 'string' || username.length === 0) {
if (typeof username.user !== 'string' || username.user.length === 0) {
clientChat.delete(socketId);
continue;
}
@ -102,17 +107,17 @@ async function onReady(fastify: FastifyInstance) {
}
// Skip duplicates (DO NOT delete them — just don't count)
if (seen.has(username)) {
if (seen.has(username.user)) {
continue;
}
// socket exists and is connected
seen.add(username);
seen.add(username.user);
count++;
// console.log(color.green,"count: ", count);
console.log(color.yellow, 'Client:', color.reset, username);
console.log(color.yellow, 'Client:', color.reset, username.user);
const targetSocketId = target;
io.to(targetSocketId!).emit('listObj', username);
io.to(targetSocketId!).emit('listObj', username.user);
console.log(
color.yellow,
@ -147,8 +152,8 @@ async function onReady(fastify: FastifyInstance) {
for (const s of sockets) {
if (s.id !== sender) {
// Send REAL JSON object
const clientName = clientChat.get(s.id) || null;
if (clientName !== null) {
const clientName = clientChat.get(s.id)?.user;
if (clientName !== undefined) {
s.emit('MsgObjectServer', { message: data });
}
console.log(' Target window socket ID:', s.id);
@ -159,7 +164,11 @@ async function onReady(fastify: FastifyInstance) {
});
}
fastify.io.on('connection', (socket: Socket) => {
socket.on('message', (message: string) => {
console.info(
color.blue,
@ -173,9 +182,9 @@ async function onReady(fastify: FastifyInstance) {
color.reset,
message,
);
const obj: ClientMessage = JSON.parse(message) as ClientMessage;
clientChat.set(socket.id, obj.user);
clientChat.set(socket.id, { user: obj.user, lastSeen: Date.now() });
console.log(
color.green,
'Message from client',
@ -191,35 +200,40 @@ async function onReady(fastify: FastifyInstance) {
color.reset,
);
});
socket.emit("welcome", {
msg: `Welcome to the chat!`,
id: socket.id
});
socket.on('testend', (sock_id_cl: string) => {
console.log('testend received from client socket id:', sock_id_cl);
});
socket.on('list', () => {
console.log(color.red, 'list activated', color.reset, socket.id);
connectedUser(fastify.io, socket.id);
});
socket.on('disconnecting', (reason) => {
const clientName = clientChat.get(socket.id) || null;
console.log(
color.green,
`Client disconnecting: ${clientName} (${socket.id}) reason:`,
`Client disconnecting: ${clientName?.user} (${socket.id}) reason:`,
reason,
);
if (reason === 'transport error') return;
if (clientName !== null) {
if (clientName?.user !== null) {
const obj = {
type: 'chat',
user: clientName,
user: clientName!.user,
token: '',
text: 'LEFT the chat',
timestamp: Date.now(),
SenderWindowID: socket.id,
};
broadcast(obj, obj.SenderWindowID);
// clientChat.delete(obj.user);
}

18
src/pnpm-lock.yaml generated
View file

@ -88,8 +88,8 @@ importers:
specifier: ^1.1.2
version: 1.1.2
typebox:
specifier: ^1.0.55
version: 1.0.55
specifier: ^1.0.56
version: 1.0.56
uuidv7:
specifier: ^1.0.2
version: 1.0.2
@ -131,8 +131,8 @@ importers:
specifier: ^5.1.0
version: 5.1.0
typebox:
specifier: ^1.0.55
version: 1.0.55
specifier: ^1.0.56
version: 1.0.56
devDependencies:
'@types/node':
specifier: ^22.19.1
@ -266,8 +266,8 @@ importers:
specifier: ^5.1.0
version: 5.1.0
typebox:
specifier: ^1.0.55
version: 1.0.55
specifier: ^1.0.56
version: 1.0.56
devDependencies:
'@types/node':
specifier: ^22.19.1
@ -3025,8 +3025,8 @@ packages:
resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
engines: {node: '>= 0.6'}
typebox@1.0.55:
resolution: {integrity: sha512-TP02wN0B6tDZngprrGVu/Z9s/QUyVEmR7VIg1yEOtsqyDdXXEoQPSfWdkD2PsA2lGLxu6GgwOTtGZVS9CAoERg==}
typebox@1.0.56:
resolution: {integrity: sha512-KMd1DJnIRqLUzAicpFmGqgmt+/IePCEmT/Jtywyyyn0hK6+dupQnxm7OAIn/cL/vu22jKi1XvDjDhrpatZ46kA==}
typescript-eslint@8.48.0:
resolution: {integrity: sha512-fcKOvQD9GUn3Xw63EgiDqhvWJ5jsyZUaekl3KVpGsDJnN46WJTe3jWxtQP9lMZm1LJNkFLlTaWAxK2vUQR+cqw==}
@ -6156,7 +6156,7 @@ snapshots:
media-typer: 0.3.0
mime-types: 2.1.35
typebox@1.0.55: {}
typebox@1.0.56: {}
typescript-eslint@8.48.0(eslint@9.39.1)(typescript@5.9.3):
dependencies:

2
src/user/package.json
View file

@ -26,7 +26,7 @@
"fastify": "^5.6.2",
"fastify-cli": "^7.4.1",
"fastify-plugin": "^5.1.0",
"typebox": "^1.0.55"
"typebox": "^1.0.56"
},
"devDependencies": {
"@types/node": "^22.19.1",