Skip to content

Commit 206fa93

Browse files
lodyai[bot]lody-ai
andauthored
fix: resolve lint errors in handshake-auth.test.ts and simple-server.ts (#49)
- Replace arrow shorthand with block statements to avoid void expression returns - Use addEventListener instead of onopen/onerror properties - Remove unused 'expect' import and unused 'err' parameter - Replace 'any' type with proper verifyClient function type Co-authored-by: lody <[email protected]>
1 parent 903eb9c commit 206fa93

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

packages/loro-websocket/src/server/simple-server.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ export class SimpleServer {
9494

9595
start(): Promise<void> {
9696
return new Promise(resolve => {
97-
const options: { port: number; host?: string; verifyClient?: any } = {
97+
const options: {
98+
port: number;
99+
host?: string;
100+
verifyClient?: (
101+
info: { origin: string; secure: boolean; req: IncomingMessage },
102+
cb: (res: boolean, code?: number, message?: string) => void
103+
) => void;
104+
} = {
98105
port: this.config.port,
99106
};
100107
if (this.config.host) {

packages/loro-websocket/tests/handshake-auth.test.ts

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, it, expect, beforeAll, afterAll } from "vitest";
1+
import { describe, it, beforeAll, afterAll } from "vitest";
22
import { WebSocket } from "ws";
33
import getPort from "get-port";
44
import { SimpleServer } from "../src/server/simple-server";
@@ -38,8 +38,12 @@ describe("Handshake Auth", () => {
3838
});
3939

4040
await new Promise<void>((resolve, reject) => {
41-
ws.onopen = () => resolve();
42-
ws.onerror = err => reject(err);
41+
ws.addEventListener("open", () => {
42+
resolve();
43+
});
44+
ws.addEventListener("error", err => {
45+
reject(err);
46+
});
4347
});
4448
ws.close();
4549
});
@@ -52,19 +56,25 @@ describe("Handshake Auth", () => {
5256
});
5357

5458
await new Promise<void>((resolve, reject) => {
55-
ws.onopen = () => reject(new Error("Should have failed"));
56-
ws.onerror = err => {
59+
ws.addEventListener("open", () => {
60+
reject(new Error("Should have failed"));
61+
});
62+
ws.addEventListener("error", () => {
5763
resolve();
58-
};
64+
});
5965
});
6066
});
6167

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

6571
await new Promise<void>((resolve, reject) => {
66-
ws.onopen = () => reject(new Error("Should have failed"));
67-
ws.onerror = () => resolve();
72+
ws.addEventListener("open", () => {
73+
reject(new Error("Should have failed"));
74+
});
75+
ws.addEventListener("error", () => {
76+
resolve();
77+
});
6878
});
6979
});
7080
});

0 commit comments

Comments
 (0)