Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion packages/loro-websocket/src/server/simple-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,14 @@ export class SimpleServer {

start(): Promise<void> {
return new Promise(resolve => {
const options: { port: number; host?: string; verifyClient?: any } = {
const options: {
port: number;
host?: string;
verifyClient?: (
info: { origin: string; secure: boolean; req: IncomingMessage },
cb: (res: boolean, code?: number, message?: string) => void
) => void;
} = {
port: this.config.port,
};
if (this.config.host) {
Expand Down
26 changes: 18 additions & 8 deletions packages/loro-websocket/tests/handshake-auth.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest";
import { describe, it, beforeAll, afterAll } from "vitest";
import { WebSocket } from "ws";
import getPort from "get-port";
import { SimpleServer } from "../src/server/simple-server";
Expand Down Expand Up @@ -38,8 +38,12 @@ describe("Handshake Auth", () => {
});

await new Promise<void>((resolve, reject) => {
ws.onopen = () => resolve();
ws.onerror = err => reject(err);
ws.addEventListener("open", () => {
resolve();
});
ws.addEventListener("error", err => {
reject(err);
});
});
ws.close();
});
Expand All @@ -52,19 +56,25 @@ describe("Handshake Auth", () => {
});

await new Promise<void>((resolve, reject) => {
ws.onopen = () => reject(new Error("Should have failed"));
ws.onerror = err => {
ws.addEventListener("open", () => {
reject(new Error("Should have failed"));
});
ws.addEventListener("error", () => {
resolve();
};
});
});
});

it("should reject connection with missing cookie", async () => {
const ws = new WebSocket(`ws://localhost:${port}`);

await new Promise<void>((resolve, reject) => {
ws.onopen = () => reject(new Error("Should have failed"));
ws.onerror = () => resolve();
ws.addEventListener("open", () => {
reject(new Error("Should have failed"));
});
ws.addEventListener("error", () => {
resolve();
});
});
});
});