replace other places using awaiting with builtin functions

Author: sapphi-red

lib/test/http/error-handling.test.ts

@@ -6,7 +6,6 @@ import * as httpProxy from "../..";
 import * as http from "http";
 import getPort from "../get-port";
 import log from "../log";
-import { callback } from "awaiting";
 import fetch from "node-fetch";
 
 const CUSTOM_ERROR = "There was an error proxying your request";
@@ -68,15 +67,14 @@ describe("Test proxying over HTTP with latency", () => {
         Upgrade: "websocket",
       },
     };
-    const f = (cb: any) => {
+    const err = await new Promise<Error>((resolve) => {
       const req = http.request(options);
       req.end();
       req.on("error", (err) => {
         log(`request error -- ${err}`);
-        cb(undefined, err);
+        resolve(err);
       });
-    };
-    const err = await callback(f);
+    });
     expect(err.message).toContain("socket hang up");
     expect(customWSErrorCalled).toBe(true);
   });

lib/test/http/server-sent-events.test.ts

@@ -9,7 +9,6 @@ import * as http from "http";
 import getPort from "../get-port";
 import { createSession } from "better-sse";
 import { EventSource } from "eventsource";
-import { callback } from "awaiting";
 import fetch from "node-fetch";
 
 describe("proxying server sent events over HTTP", () => {
@@ -60,26 +59,24 @@ describe("proxying server sent events over HTTP", () => {
     // These two tests leave open handles on node v18, so we disable them ONLY
     // with node v18.
     it("test receiving an SSE WITHOUT using the proxy", async () => {
-      const f = (cb: any) => {
+      const resp = await new Promise(resolve => {
         const sse = new EventSource(`http://localhost:${ports.http}/sse`);
         sse.addEventListener("message", ({ data }) => {
           sse.close();
-          cb(undefined, JSON.parse(data));
+          resolve(JSON.parse(data));
         });
-      };
-      const resp = await callback(f);
+      })
       expect(resp).toEqual("Hello world! - 1");
     });
 
     it("test receiving an SSE USING the proxy", async () => {
-      const f = (cb: any) => {
+      const resp = await new Promise(resolve => {
         const sse = new EventSource(`http://localhost:${ports.proxy}/sse`);
         sse.addEventListener("message", ({ data }) => {
           sse.close();
-          cb(undefined, JSON.parse(data));
+          resolve(JSON.parse(data));
         });
-      };
-      const resp = await callback(f);
+      });
       expect(resp).toEqual("Hello world! - 2");
     });
   }

lib/test/wait.ts

@@ -1,9 +1,9 @@
-import { delay } from "awaiting";
+import { setTimeout } from "node:timers/promises";
 
 export default async function wait({ until }: { until: Function }) {
   let d = 5;
   while (!(await until())) {
-    await delay(d);
+    await setTimeout(d);
     d = Math.min(1000, d * 1.2);
   }
 }

package.json

@@ -37,7 +37,6 @@
     "@types/ws": "^8.18.1",
     "async": "^3.2.6",
     "auto-changelog": "^2.5.0",
-    "awaiting": "^3.0.0",
     "better-sse": "^0.14.1",
     "body-parser": "^2.2.0",
     "compression": "^1.8.0",