Skip to content

Emit "connection" event on server when a socket connects #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sisou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Emit "connection" event on server when a socket connects #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,10 @@ export class WebSocketServer {

// Adds WebSocket events to the queue
private async handleSocketEvents(socket: WebSocket) {
// TODO add a connection event which also exposes the http request?
// TODO also expose the http request?
this.queue.add({ event: 'connection', socket });
for await (const event of socket) {
this.queue.add({ socket, event } as WebSocketServerEvent);
this.queue.add({ socket, event });
}
// When socket is closed, the for await loop will be finished
this.untrackSocket(socket);
Expand Down
16 changes: 9 additions & 7 deletions server_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ test("that a `WebSocketServer` receives events from a client", async () => {
const results: { socket: WebSocket; event: WebSocketEvent; }[] = [];
saveIterationResults(results, server);

const msgsPerClient = 3;
const msgsPerClient = 4; // The three below plus "connection"
const client1 = new WebSocket(`ws://127.0.0.1:${port}`);
await new Promise(resolve => client1.addEventListener('open', resolve))
const client2 = new WebSocket(`ws://127.0.0.1:${port}`);
Expand All @@ -60,12 +60,14 @@ test("that a `WebSocketServer` receives events from a client", async () => {
assertEquals(results[1].socket, results[5].socket);
assertNotEquals(results[0].socket, results[1].socket);

assertEquals(results[0].event, "client 1");
assertEquals(results[1].event, "client 2");
assertEquals(results[2].event, new Uint8Array([1, 2, 3]));
assertEquals(results[3].event, new Uint8Array([4, 5, 6]));
assertEquals(results[4].event, { code: 3001, reason: "done" });
assertEquals(results[5].event, { code: 3002, reason: "done" });
assertEquals(results[0].event, "connection"); // client1
assertEquals(results[1].event, "connection"); // client2
assertEquals(results[2].event, "client 1");
assertEquals(results[3].event, "client 2");
assertEquals(results[4].event, new Uint8Array([1, 2, 3]));
assertEquals(results[5].event, new Uint8Array([4, 5, 6]));
assertEquals(results[6].event, { code: 3001, reason: "done" });
assertEquals(results[7].event, { code: 3002, reason: "done" });

await server.close();
});