fix: compatible with lower node versions

webpack · Dec 22, 2023 · 30aa7ad · 30aa7ad
1 parent 53e8edf
commit 30aa7ad
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -2295,9 +2295,11 @@ class Server {
 
             if (newProxyConfig !== proxyConfig) {
               proxyConfig = newProxyConfig;
-              const server = (req.socket ?? req.connection)?.server;
+              const socket = req.socket != null ? req.socket : req.connection;
+              // @ts-ignore
+              const server = socket != null ? socket.server : null;
               if (server) {
-                server.removeAllListeners('close');
+                server.removeAllListeners("close");
               }
               proxyMiddleware =
                 /** @type {RequestHandler} */

diff --git a/test/server/proxy-option.test.js b/test/server/proxy-option.test.js
@@ -70,9 +70,16 @@ let maxServerListeners = 0;
 const proxyOptionOfArray = [
   { context: "/proxy1", target: proxyOption.target },
   function proxy(req, res, next) {
-    const server = (req?.socket ?? req?.connection)?.server;
-    if (server) {
-      maxServerListeners = Math.max(maxServerListeners, server.listeners('close').length)
+    if (req != null) {
+      const socket = req.socket != null ? req.socket : req.connection;
+      // @ts-ignore
+      const server = socket != null ? socket.server : null;
+      if (server) {
+        maxServerListeners = Math.max(
+          maxServerListeners,
+          server.listeners("close").length
+        );
+      }
     }
     return {
       context: "/api/proxy2",
@@ -445,7 +452,6 @@ describe("proxy option", () => {
     it("should not exist multiple close events registered", async () => {
       expect(maxServerListeners).toBeLessThanOrEqual(1);
     });
-
   });
 
   describe("as an array without the `route` option", () => {