fix: got tests passing

.circleci/config.yml

@@ -28,7 +28,7 @@ aliases:
 defaults: &defaults
   working_directory: ~/server-js
   docker:
-    - image: cimg/node:18.13.0
+    - image: cimg/node:20.12.1
 jobs:
   test:
     <<: *defaults

.github/workflows/lint.yml

@@ -7,10 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Use Node.js 14.15.1
-      uses: actions/setup-node@v1
-      with:
-        node-version: 14.15.1
+    - uses: actions/setup-node@v4
     - name: npm install
       run: npm install
     - name: lint

.node-version

@@ -1 +1 @@
-18.13.0
+20.12.1

jest.config.js

@@ -4,6 +4,5 @@ module.exports = {
   resetMocks: true,
   restoreMocks: true,
   rootDir: './src',
-  testEnvironment: 'node',
   preset: 'ts-jest',
 }

package.json

@@ -25,35 +25,34 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@open-rpc/schema-utils-js": "1.15.0",
+    "@open-rpc/schema-utils-js": "^2.0.2",
     "body-parser": "^1.19.0",
     "connect": "^3.7.0",
     "cors": "^2.8.5",
     "json-schema-faker": "^0.5.0-rcv.26",
-    "node-ipc": "9.1.1",
     "lodash": "^4.17.19",
+    "node-ipc": "9.1.1",
     "ws": "^8.0.0"
   },
   "devDependencies": {
-    "@open-rpc/examples": "1.6.1",
-    "@open-rpc/meta-schema": "1.14.2",
-    "@types/body-parser": "^1.19.0",
-    "@types/connect": "^3.4.33",
-    "@types/cors": "^2.8.6",
-    "@types/fs-extra": "^9.0.1",
-    "@types/jest": "^26.0.7",
-    "@types/json-schema": "^7.0.5",
-    "@types/lodash": "^4.14.158",
-    "@types/node": "^16.0.0",
-    "@types/node-fetch": "^2.5.7",
-    "@types/node-ipc": "9.1.3",
-    "@types/ws": "^7.2.6",
-    "@typescript-eslint/eslint-plugin": "^4.9.1",
-    "@typescript-eslint/parser": "^4.9.1",
-    "eslint": "^7.15.0",
-    "jest": "^26.1.0",
-    "node-fetch": "^2.6.0",
-    "ts-jest": "^26.1.4",
-    "typescript": "^4.0.2"
+    "@open-rpc/examples": "^1.7.2",
+    "@open-rpc/meta-schema": "^1.14.9",
+    "@types/body-parser": "^1.19.5",
+    "@types/connect": "^3.4.38",
+    "@types/cors": "^2.8.17",
+    "@types/fs-extra": "^11.0.4",
+    "@types/jest": "^29.5.12",
+    "@types/json-schema": "^7.0.15",
+    "@types/lodash": "^4.17.1",
+    "@types/node": "^20.12.11",
+    "@types/node-ipc": "^9.2.3",
+    "@types/ws": "^8.5.10",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "eslint": "^7.17.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "typescript": "^4.9.5",
+    "undici": "^6.16.0"
   }
 }

src/transports/http.test.ts

@@ -2,7 +2,6 @@ import examples from "@open-rpc/examples";
 import { parseOpenRPCDocument } from "@open-rpc/schema-utils-js";
 import { Router } from "../router";
 import HTTPTransport from "./http";
-import fetch from "node-fetch";
 import { JSONRPCResponse } from "./server-transport";
 
 describe("http transport", () => {
@@ -35,7 +34,7 @@ describe("http transport", () => {
       }),
       headers: { "Content-Type": "application/json" },
       method: "post",
-    }).then((res) => res.json());
+    }).then((res) => res.json() as Promise<JSONRPCResponse>);
 
     expect(result).toBe(4);
   });
@@ -56,7 +55,7 @@ describe("http transport", () => {
       ]),
       headers: { "Content-Type": "application/json" },
       method: "post",
-    }).then((res) => res.json());
+    }).then((res) => res.json() as Promise<JSONRPCResponse[]>);
 
     const pluckedResult = result.map((r: JSONRPCResponse) => r.result);
     expect(pluckedResult).toEqual([4, 8]);

src/transports/https.test.ts

@@ -1,7 +1,6 @@
 import examples from "@open-rpc/examples";
 import { parseOpenRPCDocument } from "@open-rpc/schema-utils-js";
 import { Router } from "../router";
-import fetch from "node-fetch";
 import * as fs from "fs";
 import { promisify } from "util";
 import HTTPSTransport from "./https";
@@ -11,9 +10,13 @@ import cors from "cors";
 import { json as jsonParser } from "body-parser";
 import { HandleFunction } from "connect";
 import { JSONRPCResponse } from "./server-transport";
+import { Agent } from 'undici';
 
-const agent = new https.Agent({ rejectUnauthorized: false });
-
+const agent = new Agent({
+  connect: {
+    rejectUnauthorized: false,
+  },
+}) as any;
 describe("https transport", () => {
   let transport: HTTPSTransport;
   beforeAll(async () => {
@@ -44,7 +47,7 @@ describe("https transport", () => {
 
   it("can start an https server that works", async () => {
     const { result } = await fetch("https://localhost:9697", {
-      agent,
+      dispatcher: agent,
       body: JSON.stringify({
         id: "0",
         jsonrpc: "2.0",
@@ -53,14 +56,14 @@ describe("https transport", () => {
       }),
       headers: { "Content-Type": "application/json" },
       method: "post",
-    }).then((res) => res.json());
+    }).then((res) => res.json() as Promise<JSONRPCResponse>);
 
     expect(result).toBe(4);
   });
 
   it("works with batching", async () => {
     const result = await fetch("https://localhost:9697", {
-      agent,
+      dispatcher: agent,
       body: JSON.stringify([
         {
           id: "0",
@@ -76,7 +79,7 @@ describe("https transport", () => {
       ]),
       headers: { "Content-Type": "application/json" },
       method: "post",
-    }).then((res) => res.json());
+    }).then((res) => res.json() as Promise<JSONRPCResponse[]>);
 
     const pluckedResult = result.map((r: JSONRPCResponse) => r.result);
     expect(pluckedResult).toEqual([4, 8]);

src/transports/websocket.test.ts

@@ -10,7 +10,8 @@ import { JSONRPCResponse } from "./server-transport";
 
 describe("WebSocket transport", () => {
 
-  it("can start an https server that works", async (done) => {
+  it("can start an https server that works", async () => {
+    expect.assertions(1);
     const simpleMathExample = await parseOpenRPCDocument(examples.simpleMath);
 
     const transport = new WebSocketTransport({
@@ -25,12 +26,13 @@ describe("WebSocket transport", () => {
     transport.start();
 
     const ws = new WebSocket("wss://localhost:9698", { rejectUnauthorized: false });
+    let done: any;
     const handleMessage = (data: string) => {
       ws.off("message", handleMessage);
       transport.stop();
       const { result } = JSON.parse(data);
       expect(result).toBe(4);
-      done();
+      setTimeout(done, 3500); // give ws 3.5 seconds to shutdown
     };
     const handleConnnect = () => {
       ws.off("open", handleConnnect);
@@ -42,10 +44,14 @@ describe("WebSocket transport", () => {
         params: [2, 2],
       }));
     };
-    ws.on("open", handleConnnect);
+    const prom = new Promise((resolve) => {
+      done = resolve;
+      ws.on("open", handleConnnect);
+    });
+    await prom;
   });
 
-  it("can start an https server that works", async (done) => {
+  it("can start an https server that works", async () => {
     const simpleMathExample = await parseOpenRPCDocument(examples.simpleMath);
 
     const transport = new WebSocketTransport({
@@ -58,12 +64,13 @@ describe("WebSocket transport", () => {
     transport.start();
 
     const ws = new WebSocket("ws://localhost:9698", { rejectUnauthorized: false });
+    let done: any;
     const handleMessage = (data: string) => {
       ws.off("message", handleMessage);
       transport.stop();
       const { result } = JSON.parse(data);
       expect(result).toBe(4);
-      done();
+      setTimeout(done, 3500); // give ws 3.5 seconds to shutdown
     };
     const handleConnnect = () => {
       ws.off("open", handleConnnect);
@@ -75,10 +82,13 @@ describe("WebSocket transport", () => {
         params: [2, 2],
       }));
     };
-    ws.on("open", handleConnnect);
+    await new Promise((resolve) => {
+      done = resolve;
+      ws.on("open", handleConnnect);
+    });
   });
 
-  it("works with batching", async (done) => {
+  it("works with batching", async () => {
     const simpleMathExample = await parseOpenRPCDocument(examples.simpleMath);
 
     const transport = new WebSocketTransport({
@@ -93,14 +103,14 @@ describe("WebSocket transport", () => {
     transport.start();
 
     const ws = new WebSocket("wss://localhost:9698", { rejectUnauthorized: false });
-
+    let done: any;
     const handleMessage = (data: string) => {
       ws.off("message", handleMessage);
       transport.stop();
       const result = JSON.parse(data) as JSONRPCResponse[];
       expect(result.map((r) => r.result)).toEqual([4, 8]);
       transport.removeRouter(router);
-      done();
+      setTimeout(done, 3500); // give ws 3.5 seconds to shutdown
     };
 
     const handleConnnect = () => {
@@ -121,6 +131,10 @@ describe("WebSocket transport", () => {
         },
       ]));
     };
-    ws.on("open", handleConnnect);
+
+    await new Promise((resolve) => {
+      done = resolve;
+      ws.on("open", handleConnnect);
+    });
   });
 });

src/transports/websocket.ts

@@ -59,6 +59,19 @@ export default class WebSocketServerTransport extends ServerTransport {
   }
 
   public stop() {
+    // First sweep, soft close
+    this.wss.clients.forEach((socket) => {
+      socket.close();
+    });
+    setTimeout(() => {
+      // Second sweep, hard close
+      // for everyone who's left
+      this.wss.clients.forEach((socket) => {
+        if ([socket.OPEN, socket.CLOSING].includes((socket as any).readyState)) {
+          socket.terminate();
+        }
+      });
+    }, 3000);
     this.wss.removeAllListeners();
     this.wss.close();
     this.server.close();

test-cert/server.cert

@@ -1,18 +1,34 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+9rusp0JnjfQcdTymZg==
 -----END CERTIFICATE-----