Add tests for proxy with unix socket

Author: dometto

bin/configurable-http-proxy

@@ -325,7 +325,7 @@ options.storageBackend = args.storageBackend;
 
 var proxy = new ConfigurableProxy(options);
 
-var listen = parseListenOptions(args);
+var listen = parseListenOptions(args, log);
 
 proxy.proxyServer.listen(...listen.proxyTarget);
 proxy.apiServer.listen(...listen.apiTarget);

lib/configproxy.js

@@ -24,40 +24,40 @@ const require = createRequire(import.meta.url);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-export function parseListenOptions(args) {
+export function parseListenOptions(args, logger) {
   var listen = {};
 
   if (args.socket) {
     listen.proxyTarget = [args.socket];
-    log.warn(
+    logger.warn(
       "Proxy will listen on UNIX domain socket, --ip and --port options will be ignored."
     );
   } else {
     listen.port = parseInt(args.port) || 8000;
     if (args.ip === "*") {
       // handle ip=* alias for all interfaces
-      log.warn(
+      logger.warn(
         "Interpreting ip='*' as all-interfaces. Preferred usage is 0.0.0.0 for all IPv4 or '' for all-interfaces."
       );
       args.ip = "";
     }
     listen.ip = args.ip;
     listen.proxyTarget = [listen.port, listen.ip];
   }
-  
+
   if (args.apiSocket) {
     listen.apiSocket = [args.apiSocket];
-    log.warn(
+    logger.warn(
       "API server will listen on UNIX domain socket, --api-ip and --api-port options will be ignored."
     );
   } else {
-    listen.apiPort = args.apiPort ? parseInt(args.apiPort) : (listen.port ? listen.port + 1 : 8001);
+    listen.apiPort = args.apiPort ? parseInt(args.apiPort) : listen.port ? listen.port + 1 : 8001;
     listen.apiTarget = [listen.apiPort, args.apiIp];
   }
-  
+
   if (args.metricsSocket) {
     listen.metricsSocket = [args.metricsSocket];
-    log.warn(
+    logger.warn(
       "Metrics server will listen on UNIX domain socket, --metrics-ip and --metrics-port options will be ignored."
     );
   } else if (args.metricsPort) {

package-lock.json

@@ -18,7 +18,8 @@
     "c8": "^10.1.3",
     "jasmine": "^5.6.0",
     "node-fetch": "^2.7.0",
-    "ws": "^8.4.0"
+    "ws": "^8.4.0",
+    "tmp": "^0.2"
   },
   "engines": {
     "node": ">= 18"

package.json

@@ -11,7 +11,7 @@ describe("API Tests", function () {
   var listenOptions = {
     port: port,
     apiPort: 8903,
-    ip: '127.0.0.1'
+    ip: "127.0.0.1",
   };
   var proxy;
   var apiUrl = "http://" + listenOptions.ip + ":" + listenOptions.apiPort + "/api/routes";

test/api_spec.js

@@ -1,11 +1,13 @@
 import fs from "node:fs";
 import path from "node:path";
+import tmp from "tmp"
 import { fileURLToPath } from "node:url";
 import fetch from "node-fetch";
 import WebSocket from "ws";
 
 import { ConfigurableProxy } from "../lib/configproxy.js";
 import * as util from "../lib/testutil.js";
+import http from "node:http";
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
@@ -15,7 +17,7 @@ describe("Proxy Tests", function () {
   var port = 8902;
   var listenOptions = {
     port: port,
-    ip: '127.0.0.1'
+    ip: "127.0.0.1",
   };
   var testPort = port + 10;
   var proxy;
@@ -343,7 +345,7 @@ describe("Proxy Tests", function () {
 
   it("custom error target", function (done) {
     var listenOptions = {
-      port: 55550
+      port: 55550,
     };
     util
       .setupProxy(listenOptions, { errorTarget: "http://127.0.0.1:55565" }, [])
@@ -412,7 +414,7 @@ describe("Proxy Tests", function () {
 
   it("backend error", function (done) {
     var listenOptions = {
-      port: 55550
+      port: 55550,
     };
     util
       .setupProxy(listenOptions, { errorTarget: "http://127.0.0.1:55565" }, [])
@@ -442,7 +444,7 @@ describe("Proxy Tests", function () {
 
   it("Redirect location with rewriting", function (done) {
     var listenOptions = {
-      port: 55556
+      port: 55556,
     };
     var options = {
       protocolRewrite: "https",
@@ -466,7 +468,9 @@ describe("Proxy Tests", function () {
         )
       )
       .then(() =>
-        fetch("http://127.0.0.1:" + listenOptions.port + "/external/urlpath/", { redirect: "manual" })
+        fetch("http://127.0.0.1:" + listenOptions.port + "/external/urlpath/", {
+          redirect: "manual",
+        })
       )
       .then((res) => {
         expect(res.status).toEqual(301);
@@ -494,7 +498,7 @@ describe("Proxy Tests", function () {
       return;
     }
     var listenOptions = {
-      port: 55556
+      port: 55556,
     };
     var testPort = listenOptions.port + 20;
     var options = {