Skip to content
Open
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
29 changes: 29 additions & 0 deletions src/transports/websocket.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,35 @@ describe("WebSocket transport", () => {
expect(mockServer.close).toHaveBeenCalled();
});

it("returns a parse error for invalid JSON and stays alive", async () => {
const simpleMathExample = await parseOpenRPCDocument(examples.simpleMath);
const transport = new WebSocketTransport({
middleware: [],
port: 9712,
});
const router = new Router(simpleMathExample, { mockMode: true });
transport.addRouter(router);
await transport.start();

const ws = new WebSocket("ws://localhost:9712");

await new Promise<void>((resolve, reject) => {
ws.on("message", (raw: WebSocket.Data) => {
const payload = JSON.parse(raw.toString());
expect(payload.error).toEqual({ code: -32700, message: "Parse error" });
expect(payload.id).toBeNull();
resolve();
});
ws.on("error", reject);
ws.on("open", () => {
ws.send("this is not json");
});
});

ws.close();
await transport.stop();
});

it("applies default timeout when none provided", () => {
const transport = new WebSocketTransport({
middleware: [],
Expand Down
19 changes: 15 additions & 4 deletions src/transports/websocket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,21 @@ export default class WebSocketServerTransport extends ServerTransport {
this.wss = new WebSocket.Server({ server: this.server as any });

this.wss.on("connection", (ws: WebSocket) => {
ws.on(
"message",
(message: string) => this.webSocketRouterHandler(JSON.parse(message), ws.send.bind(ws)),
);
ws.on("message", (message: WebSocket.RawData) => {
try {
const parsed = JSON.parse(typeof message === "string" ? message : message.toString());
void this.webSocketRouterHandler(parsed, ws.send.bind(ws));
} catch (err) {
ws.send(JSON.stringify({
jsonrpc: "2.0",
id: null,
error: {
code: -32700,
message: "Parse error",
},
}));
}
});
ws.on("close", () => ws.removeAllListeners());
});
}
Expand Down