Skip to content
This repository was archived by the owner on Dec 2, 2022. It is now read-only.

Commit 349619b

Browse files
committed
Fix username validation and the leave signal
1 parent 56df8b8 commit 349619b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/client/public/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ $(function onload() {
7676
}
7777
case 'join': {
7878
const username = objData.d;
79-
chatWriteLine(`User connect (${username}).`);
79+
chatWriteLine(`User connect (${username})`);
8080
break;
8181
}
8282
case 'chat': {
@@ -87,7 +87,7 @@ $(function onload() {
8787
}
8888
case 'leave': {
8989
const username = objData.d;
90-
chatWriteLine(`User disconnect (${username}).`);
90+
chatWriteLine(`User disconnect (${username})`);
9191
break;
9292
}
9393
default: {

src/server/WebSocket.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export async function HandleWSConn(pWebSocket: WebSocket): Promise<void> {
4141
switch (objEvent.h) {
4242
case 'join': {
4343
const _name = objEvent.d;
44-
if (/^[a-zA-Z0-1]+$/i.test(_name)) {
44+
if (/^[a-zA-Z0-9]+$/i.test(_name)) {
4545
_conn.state = true;
4646
_conn.name = objEvent.d;
4747
await BroadcastJoin(_connInfo);
@@ -52,9 +52,9 @@ export async function HandleWSConn(pWebSocket: WebSocket): Promise<void> {
5252
break;
5353
}
5454
case 'leave': {
55+
await BroadcastLeave(_connInfo);
5556
_conn.name = '';
5657
_conn.state = false;
57-
await BroadcastLeave(_connInfo);
5858
await RespondLeave(_connInfo, 'OK');
5959
break;
6060
}

0 commit comments

Comments
 (0)