Send ConnectedUsersMessages when user requests desiredName change
This commit is contained in:
parent
9db0f98430
commit
ccd671c70c
1 changed files with 55 additions and 18 deletions
|
@ -11,6 +11,7 @@ import type {
|
||||||
TypingMessage,
|
TypingMessage,
|
||||||
ConnectedUser,
|
ConnectedUser,
|
||||||
ConnectedUsersMessage,
|
ConnectedUsersMessage,
|
||||||
|
DesiredNameMessage,
|
||||||
} from "./lib/ServerMessage";
|
} from "./lib/ServerMessage";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
@ -97,43 +98,78 @@ async function handleCloseConnection(id: string) {
|
||||||
desiredNames.delete(id);
|
desiredNames.delete(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const connected =
|
||||||
|
Array.from(activeConnections,
|
||||||
|
(id) => {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
desiredName: desiredNames.get(id),
|
||||||
|
} as ConnectedUser;
|
||||||
|
});
|
||||||
for (const to of webSocketServer.clients) {
|
for (const to of webSocketServer.clients) {
|
||||||
to.send(
|
to.send(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
type: MessageType.CONNECTED_USERS,
|
type: MessageType.CONNECTED_USERS,
|
||||||
__ctx: `${id} left`,
|
__ctx: `${id} left`,
|
||||||
date: Date.now(),
|
date: Date.now(),
|
||||||
connected:
|
connected,
|
||||||
Array.from(activeConnections,
|
|
||||||
(id) => {
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
desiredName: desiredNames.get(id),
|
|
||||||
} as ConnectedUser;
|
|
||||||
}),
|
|
||||||
} as ConnectedUsersMessage)
|
} as ConnectedUsersMessage)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleNewConnection(id: string) {
|
function handleNewConnection(id: string) {
|
||||||
activeConnections.add(id);
|
activeConnections.add(id);
|
||||||
|
|
||||||
|
const connected =
|
||||||
|
Array.from(activeConnections,
|
||||||
|
(id) => {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
desiredName: desiredNames.get(id),
|
||||||
|
} as ConnectedUser;
|
||||||
|
});
|
||||||
|
|
||||||
for (const to of webSocketServer.clients) {
|
for (const to of webSocketServer.clients) {
|
||||||
to.send(
|
to.send(
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
type: MessageType.CONNECTED_USERS,
|
type: MessageType.CONNECTED_USERS,
|
||||||
__ctx: `${id} joined`,
|
__ctx: `${id} joined`,
|
||||||
date: Date.now(),
|
date: Date.now(),
|
||||||
connected:
|
connected,
|
||||||
Array.from(activeConnections,
|
} as ConnectedUsersMessage)
|
||||||
(id) => {
|
);
|
||||||
return {
|
}
|
||||||
id,
|
}
|
||||||
desiredName: desiredNames.get(id),
|
|
||||||
} as ConnectedUser;
|
async function handleDesiredNameMessage(message: DesiredNameMessage, from: string) {
|
||||||
}),
|
if (!activeConnections.has(from) && desiredNames.has(from)) {
|
||||||
|
desiredNames.delete(from);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.debug(`${from} set desiredName to ${message.desiredName}`);
|
||||||
|
if (message.desiredName === undefined) {
|
||||||
|
desiredNames.delete(from);
|
||||||
|
} else {
|
||||||
|
desiredNames.set(from, message.desiredName);
|
||||||
|
}
|
||||||
|
|
||||||
|
const connected =
|
||||||
|
Array.from(activeConnections,
|
||||||
|
(id) => {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
desiredName: desiredNames.get(id),
|
||||||
|
} as ConnectedUser;
|
||||||
|
});
|
||||||
|
for (const to of webSocketServer.clients) {
|
||||||
|
to.send(
|
||||||
|
JSON.stringify({
|
||||||
|
type: MessageType.CONNECTED_USERS,
|
||||||
|
__ctx: `${from} changed desiredName to ${message.desiredName}`,
|
||||||
|
date: Date.now(),
|
||||||
|
connected,
|
||||||
} as ConnectedUsersMessage)
|
} as ConnectedUsersMessage)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -171,9 +207,10 @@ webSocketServer.on("connection", function connection(socket) {
|
||||||
} else if (isTypingMessage(message)) {
|
} else if (isTypingMessage(message)) {
|
||||||
handleTypingMessage(message, authorId);
|
handleTypingMessage(message, authorId);
|
||||||
} else if (isDesiredNameMessage(message)) {
|
} else if (isDesiredNameMessage(message)) {
|
||||||
desiredNames.set(authorId, message.desiredName);
|
handleDesiredNameMessage(message, authorId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on("close", function close() {
|
socket.on("close", function close() {
|
||||||
console.log("closed a connection");
|
console.log("closed a connection");
|
||||||
});
|
});
|
||||||
|
|
Reference in a new issue