invitation working by chat

This commit is contained in:
NigeParis 2025-12-09 17:50:57 +01:00
parent f252770833
commit 8b43cd38a9
2 changed files with 122 additions and 51 deletions

View file

@ -32,8 +32,25 @@ export type ClientProfil = {
text: string, text: string,
timestamp: number, timestamp: number,
SenderWindowID:string, SenderWindowID:string,
SenderName: string,
innerHtml?: string,
}; };
// export type inviteGame = {
// command?: string,
// destination?: string,
// type?: string,
// user?: string,
// loginName?: string,
// userID?: string,
// innerHtml?: string,
// timestamp?: number,
// SenderWindowID?:string,
// };
// get the name of the machine used to connect // get the name of the machine used to connect
const machineHostName = window.location.hostname; const machineHostName = window.location.hostname;
console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow); console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow);
@ -81,28 +98,35 @@ function isLoggedIn() {
}; };
function inviteToPlayPong(profil: ClientProfil, senderSocket: Socket) { function inviteToPlayPong(profil: ClientProfil, senderSocket: Socket) {
profil.SenderName = getUser()?.name ?? '';
if (profil.SenderName === profil.user) return;
addMessage(`You invited to play: ${profil.user}🏓`)
senderSocket.emit('inviteGame', JSON.stringify(profil));
}; };
function actionBtnPopUp(profil: ClientProfil, senderSocket: Socket) { function actionBtnPopUpClear(profil: ClientProfil) {
setTimeout(() => { setTimeout(() => {
const clearTextBtn = document.querySelector("#popup-b-clear"); const clearTextBtn = document.querySelector("#popup-b-clear");
clearTextBtn?.addEventListener("click", () => { clearTextBtn?.addEventListener("click", () => {
clearText(); clearText();
}); });
const InvitePongBtn = document.querySelector("#popup-b-invite");
InvitePongBtn?.addEventListener("click", () => {
inviteToPlayPong(profil, senderSocket);
});
}, 0) }, 0)
}; };
function actionBtnPopUpInvite(invite: ClientProfil, senderSocket: Socket) {
setTimeout(() => {
const InvitePongBtn = document.querySelector("#popup-b-invite");
InvitePongBtn?.addEventListener("click", () => {
inviteToPlayPong(invite, senderSocket);
});
}, 0)
};
// getProfil get the profil of user // getProfil get the profil of user
function getProfil(socket: Socket, user: string) { function getProfil(socket: Socket, user: string) {
if (!socket.connected) return; if (!socket.connected) return;
@ -357,7 +381,7 @@ async function openProfilePopup(profil: ClientProfil) {
<div-login-name id="loginName"> Login ID: '${profil.userID ?? ''}' </div> <div-login-name id="loginName"> Login ID: '${profil.userID ?? ''}' </div>
</br> </br>
<button id="popup-b-clear" class="btn-style popup-b-clear">Clear Text</button> <button id="popup-b-clear" class="btn-style popup-b-clear">Clear Text</button>
<button id="popup-b-invite" class="btn-style popup-b-invite">Pong Us ?</button> <button id="popup-b-invite" class="btn-style popup-b-invite">U Game ?</button>
<div id="profile-about">About: '${profil.text}' </div> <div id="profile-about">About: '${profil.text}' </div>
</div> </div>
`; `;
@ -403,9 +427,6 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
// Listen for messages from the server "MsgObjectServer" // Listen for messages from the server "MsgObjectServer"
socket.on("MsgObjectServer", (data: { message: ClientMessage}) => { socket.on("MsgObjectServer", (data: { message: ClientMessage}) => {
console.log("%cDEBUG LOGS - Message Obj Recieved:", color.green, data);
console.log("%cDEBUG LOGS - Recieved data.message.text: ", color.green, data.message.text);
console.log("%cDEBUG LOGS - Recieved data.message.user: ", color.green, data.message.user);
// Display the message in the chat window // Display the message in the chat window
const systemWindow = document.getElementById('system-box') as HTMLDivElement; const systemWindow = document.getElementById('system-box') as HTMLDivElement;
const chatWindow = document.getElementById("t-chatbox") as HTMLDivElement; const chatWindow = document.getElementById("t-chatbox") as HTMLDivElement;
@ -447,10 +468,17 @@ function handleChat(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
socket.on('profilMessage', (profil: ClientProfil) => { socket.on('profilMessage', (profil: ClientProfil) => {
openProfilePopup(profil); openProfilePopup(profil);
actionBtnPopUp(profil, socket); actionBtnPopUpClear(profil);
actionBtnPopUpInvite(profil, socket);
});
socket.on('inviteGame', (invite: ClientProfil) => {
const chatWindow = document.getElementById("t-chatbox") as HTMLDivElement;
const messageElement = document.createElement("div");
messageElement.innerHTML =`🏓${invite.SenderName}: ${invite.innerHtml}`;
chatWindow.appendChild(messageElement);
}); });
socket.on('logout', () => { socket.on('logout', () => {
quitChat(socket); quitChat(socket);
}); });

View file

@ -42,18 +42,35 @@ export type ClientMessage = {
SenderWindowID: string; SenderWindowID: string;
}; };
export type ClientProfil = { export type ClientProfil = {
command?: string, command: string,
destination?: string, destination: string,
type?: string, type: string,
user?: string, user: string,
loginName?: string, loginName: string,
userID?: string, userID: string,
text?: string, text: string,
timestamp?: number, timestamp: number,
SenderWindowID?:string, SenderWindowID:string,
}; SenderName: string,
innerHtml?: string,
};
// export type inviteGame = {
// command?: string,
// destination?: string,
// type?: string,
// user?: string,
// loginName?: string,
// userID?: string,
// innerHtml?: string,
// timestamp?: number,
// SenderWindowID?:string,
// SenderName: string
// };
const clientChat = new Map<string, ClientInfo>(); const clientChat = new Map<string, ClientInfo>();
@ -99,6 +116,7 @@ declare module 'fastify' {
MsgObjectServer: (data: { message: ClientMessage }) => void; MsgObjectServer: (data: { message: ClientMessage }) => void;
privMessage: (data: string) => void; privMessage: (data: string) => void;
profilMessage: (data: ClientProfil) => void; profilMessage: (data: ClientProfil) => void;
inviteGame: (data: ClientProfil) => void;
privMessageCopy: (msg: string) => void; privMessageCopy: (msg: string) => void;
message: (msg: string) => void; message: (msg: string) => void;
listBud: (msg: string) => void; listBud: (msg: string) => void;
@ -130,15 +148,12 @@ async function onReady(fastify: FastifyInstance) {
// If we have the io instance, attempt to validate the socket is still connected // If we have the io instance, attempt to validate the socket is still connected
if (io && typeof io.sockets?.sockets?.get === 'function') { if (io && typeof io.sockets?.sockets?.get === 'function') {
const s = io.sockets.sockets.get(socketId) as const s = io.sockets.sockets.get(socketId) as Socket | undefined;
| Socket
| undefined;
// If socket not found or disconnected, remove from map and skip // If socket not found or disconnected, remove from map and skip
if (!s || s.disconnected) { if (!s || s.disconnected) {
clientChat.delete(socketId); clientChat.delete(socketId);
continue; continue;
} }
// Skip duplicates (DO NOT delete them — just don't count) // Skip duplicates (DO NOT delete them — just don't count)
if (seen.has(username.user)) { if (seen.has(username.user)) {
continue; continue;
@ -146,23 +161,11 @@ async function onReady(fastify: FastifyInstance) {
// socket exists and is connected // socket exists and is connected
seen.add(username.user); seen.add(username.user);
count++; count++;
// console.log(color.green,"count: ", count);
// console.log(color.yellow, 'Client:', color.reset, username.user);
const targetSocketId = target; const targetSocketId = target;
io.to(targetSocketId!).emit('listBud', username.user); io.to(targetSocketId!).emit('listBud', username.user);
// console.log(
// color.yellow,
// 'Chat Socket ID:',
// color.reset,
// socketId,
// );
continue; continue;
} }
// If no io provided, assume entries in the map are valid and count them.
count++; count++;
console.log(color.red, 'DEBUG LOG: - Client (unverified):', color.reset, username);
console.log(color.red, 'DEBUG LOG: - Chat Socket ID (unverified):', color.reset, socketId);
} }
return count; return count;
} }
@ -182,9 +185,6 @@ async function onReady(fastify: FastifyInstance) {
socket.emit('MsgObjectServer', { message: data }); socket.emit('MsgObjectServer', { message: data });
// Debug logs // Debug logs
console.log(color.green, `'Broadcast to:', ${data.command} message: ${data.text}`); console.log(color.green, `'Broadcast to:', ${data.command} message: ${data.text}`);
// console.log('DEBUG - Target socket ID:', s.id);
// console.log('DEBUG - Target rooms:', [...s.rooms]);
// console.log('DEBUG - Sender socket ID:', sender ?? 'none');
} }
}); });
} }
@ -195,34 +195,44 @@ async function onReady(fastify: FastifyInstance) {
// } // }
function getUserByName(users: User[], name: string) { function getUserByName(users: User[], name: string) {
return users.find(u => u.name === name) || null; return users.find(user => user.name === name) || null;
} }
///TODO find the description info for profil / or profil game link and return
function getAboutPlayer( ): string{ function getAboutPlayer( ): string{
const description = 'Player is good Shape this needs to be replaced by a bd.function()'; const description = 'Player is good Shape this needs to be replaced by a bd.function()';
return description; return description;
} }
function getGameLink(): string{
const link = `<a href="https://google.com" style="color: blue; text-decoration: underline; cursor: pointer;">Click me</a>`;
return link;
}
// this function returns html the profil pop up in CHAT of a user 'nickname unique' TODO .... // this function returns html the profil pop up in CHAT of a user 'nickname unique' TODO ....
async function getProfil(user: string, socket: Socket): Promise <ClientProfil> { async function getProfil(user: string, socket: Socket): Promise <ClientProfil> {
let clientProfil: ClientProfil = {}; let clientProfil!: ClientProfil;
const users: User[] = fastify.db.getAllUsers() ?? []; const users: User[] = fastify.db.getAllUsers() ?? [];
const allUsers: User | null = getUserByName(users, user); const allUsers: User | null = getUserByName(users, user);
console.log(color.yellow, `'userFound is:'${allUsers?.name}`); console.log(color.yellow, `'userFound is:'${allUsers?.name}`);
if (user === allUsers?.name) { if (user === allUsers?.name) {
console.log(color.yellow, `'login Name: '${allUsers.login}' user: '${user}'`); console.log(color.yellow, `'login Name: '${allUsers.login}' user: '${user}'`);
clientProfil = { clientProfil =
{
command: 'getProfil', command: 'getProfil',
destination: 'profilMsg', destination: 'profilMsg',
type: 'chat' as const, type: 'chat' as const,
user: `${allUsers.name}`, user: `${allUsers.name}`,
loginName: `${allUsers?.login ?? 'Guest'}`, loginName: `${allUsers?.login ?? 'Guest'}`,
userID: `${allUsers?.id ?? ''}`, userID: `${allUsers?.id ?? ''}`,
text: getAboutPlayer(), text: getAboutPlayer(),
timestamp: Date.now(), timestamp: Date.now(),
SenderWindowID: socket.id, SenderWindowID: socket.id,
SenderName: '',
innerHtml: '',
}; };
} }
return clientProfil; return clientProfil;
@ -238,6 +248,26 @@ async function onReady(fastify: FastifyInstance) {
}); });
} }
function sendInvite(innerHtml: string, data: ClientProfil) {
fastify.io.fetchSockets().then((sockets) => {
let targetSocket;
for (const socket of sockets) {
let clientInfo: string = clientChat.get(socket.id)?.user || '';
if (clientInfo === data.user) {
console.log(color.yellow, 'FOUND:', data.user);
targetSocket = socket || '';
break;
}
}
data.innerHtml = innerHtml ?? '';
if (targetSocket) {
targetSocket.emit('inviteGame', data);
}
});
}
function sendPrivMessage(data: ClientMessage, sender?: string) { function sendPrivMessage(data: ClientMessage, sender?: string) {
fastify.io.fetchSockets().then((sockets) => { fastify.io.fetchSockets().then((sockets) => {
const senderSocket = sockets.find(s => s.id === sender); const senderSocket = sockets.find(s => s.id === sender);
@ -442,7 +472,7 @@ async function onReady(fastify: FastifyInstance) {
} }
}); });
socket.on('profilMessage', async (data) => { socket.on('profilMessage', async (data: string) => {
const clientName: string = clientChat.get(socket.id)?.user || ''; const clientName: string = clientChat.get(socket.id)?.user || '';
const profilMessage: ClientMessage = JSON.parse(data) || ''; const profilMessage: ClientMessage = JSON.parse(data) || '';
const users: User[] = fastify.db.getAllUsers() ?? []; const users: User[] = fastify.db.getAllUsers() ?? [];
@ -462,6 +492,19 @@ async function onReady(fastify: FastifyInstance) {
} }
}); });
socket.on('inviteGame', async (data: string) => {
const clientName: string = clientChat.get(socket.id)?.user || '';
const profilInvite: ClientProfil = JSON.parse(data) || '';
// const users: User[] = fastify.db.getAllUsers() ?? [];
const inviteHtml: string = `invites you to a game ` + getGameLink();
if (clientName !== null) {
// const testuser: User | null = getUserByName(users, profilInvite.user ?? '');
// console.log(color.yellow, 'user:', testuser?.name ?? 'Guest');
sendInvite(inviteHtml, profilInvite);
}
});
socket.on('client_entered', (data) => { socket.on('client_entered', (data) => {
// data may be undefined (when frontend calls emit with no payload) // data may be undefined (when frontend calls emit with no payload)