use once from events

Author: sapphi-red

lib/test/balancer/simple-balancer-with-websockets.test.ts

@@ -7,7 +7,7 @@ pnpm test ./simple-balancer-with-websockets.test.ts
 import * as http from "http";
 import * as httpProxy from "../..";
 import getPort from "../get-port";
-import { once } from "../wait";
+import { once } from "events";
 import fetch from "node-fetch";
 
 describe("A simple round-robin load balancer that supports websockets", () => {

lib/test/lib/http-proxy.test.ts

@@ -11,7 +11,8 @@ import * as net from "net";
 import WebSocket, { WebSocketServer } from "ws";
 import { Server } from "socket.io";
 import { io as socketioClient } from "socket.io-client";
-import wait, { once } from "../wait";
+import wait from "../wait";
+import { once } from "events";
 
 const ports: { [port: string]: number } = {};
 let portIndex = -1;

lib/test/wait.ts

@@ -1,4 +1,4 @@
-import { callback, delay } from "awaiting";
+import { delay } from "awaiting";
 
 export default async function wait({ until }: { until: Function }) {
   let d = 5;
@@ -7,23 +7,3 @@ export default async function wait({ until }: { until: Function }) {
     d = Math.min(1000, d * 1.2);
   }
 }
-
-import type { EventEmitter } from "events";
-
-export async function once(obj: EventEmitter, event: string): Promise<any> {
-  if (obj == null) {
-    throw Error("once -- obj is undefined");
-  }
-  if (typeof obj.once != "function") {
-    throw Error("once -- obj.once must be a function");
-  }
-  let val: any[] = [];
-  function wait(cb: Function): void {
-    obj.once(event, function (...args): void {
-      val = args;
-      cb();
-    });
-  }
-  await callback(wait);
-  return val;
-}

lib/test/websocket/latent-websocket-proxy.test.ts

@@ -6,7 +6,7 @@ pnpm test latent-websocket-proxy.test.ts
 
 import * as httpProxy from "../..";
 import getPort from "../get-port";
-import { once } from "../wait";
+import { once } from "events";
 import http, { createServer } from "http";
 import { Server } from "socket.io";
 import { io as socketioClient } from "socket.io-client";

lib/test/websocket/simple-websocket-proxy.test.ts

@@ -15,7 +15,7 @@ import * as http from "http";
 import * as httpProxy from "../..";
 import log from "../log";
 import getPort from "../get-port";
-import { once } from "../wait";
+import { once } from "events";
 
 describe("Example of simple proxying of a WebSocket", () => {
   let ports: Record<'ws' | 'proxy', number>;

lib/test/websocket/standalone-websocket-proxy.test.ts

@@ -6,7 +6,7 @@ pnpm test ./standalone-websocket-proxy.test.ts
 
 import * as httpProxy from "../..";
 import getPort from "../get-port";
-import { once } from "../wait";
+import { once } from "events";
 import http, { createServer } from "http";
 import { Server } from "socket.io";
 import { io as socketioClient } from "socket.io-client";

lib/test/websocket/websocket-load.test.ts

@@ -7,7 +7,8 @@ pnpm test websocket-load.test.ts
 import * as http from "http";
 import * as httpProxy from "../..";
 import getPort from "../get-port";
-import wait, { once } from "../wait";
+import wait from "../wait";
+import { once } from "events";
 
 describe("Load testing proxying a WebSocket", () => {
   let ports: Record<'ws' | 'proxy', number>;

lib/test/websocket/websocket-proxy-websocket.test.ts

@@ -17,7 +17,7 @@ import * as httpProxy from "../..";
 import getPort from "../get-port";
 import { Server } from "socket.io";
 import { io as socketioClient } from "socket.io-client";
-import { once } from "../wait";
+import { once } from "events";
 
 describe("Multilevel Proxying of a Websocket using Socket.io", () => {
   let ports: Record<'socketio' | 'inner' | 'outer', number>;

lib/test/websocket/websocket-proxy.test.ts

@@ -13,7 +13,8 @@ that no sockets leak.
 import * as httpProxy from "../..";
 import log from "../log";
 import getPort from "../get-port";
-import wait, { once } from "../wait";
+import wait from "../wait";
+import { once } from "events";
 import { createServer } from "http";
 import { Server } from "socket.io";
 import { io as socketioClient } from "socket.io-client";