Express conflicts between socket and ip, port options via commander API

Author: dometto

bin/configurable-http-proxy

@@ -7,7 +7,7 @@
 //
 
 import fs from "node:fs";
-import { Command } from "commander";
+import { Command, Option } from "commander";
 
 import ConfigurableProxy from "../lib/configproxy.js";
 import { parseListenOptions } from "../lib/configproxy.js";
@@ -23,7 +23,7 @@ cli
   .version(pkg.version)
   .option("--ip <ip-address>", "Public-facing IP of the proxy")
   .option("--port <n> (defaults to 8000)", "Public-facing port of the proxy", parseInt)
-  .option("--socket <path>", "Path to a UNIX domain socket for the proxy to listen on. Alternative to specifying IP and port.")
+  .addOption(new Option("--socket <path>", "Path to a UNIX domain socket for the proxy to listen on. Alternative to specifying IP and port.").conflicts(['port', 'ip']))
   .option("--ssl-key <keyfile>", "SSL key to use, if any")
   .option("--ssl-cert <certfile>", "SSL certificate to use, if any")
   .option("--ssl-ca <ca-file>", "SSL certificate authority, if any")
@@ -42,7 +42,7 @@ cli
     "Inward-facing port for API requests (defaults to --port=value+1)",
     parseInt
   )
-  .option("--api-socket <path>", "Path to a UNIX domain socket for the API server to listen on. Alternative to specifying API IP and port.")
+  .addOption(new Option("--api-socket <path>", "Path to a UNIX domain socket for the API server to listen on. Alternative to specifying API IP and port.").conflicts(['api-port', 'api-ip']))
   .option("--api-ssl-key <keyfile>", "SSL key to use, if any, for API requests")
   .option("--api-ssl-cert <certfile>", "SSL certificate to use, if any, for API requests")
   .option("--api-ssl-ca <ca-file>", "SSL certificate authority, if any, for API requests")
@@ -97,7 +97,7 @@ cli
   .option("--host-routing", "Use host routing (host as first level of path)")
   .option("--metrics-ip <ip>", "IP for metrics server", "")
   .option("--metrics-port <n>", "Port of metrics server. Defaults to no metrics server")
-  .option("--metrics-socket <path>", "Path to a UNIX domain socket for the metrics server to listen on. Alternative to specifying metrics IP and port.")
+  .addOption(new Option("--metrics-socket <path>", "Path to a UNIX domain socket for the metrics server to listen on. Alternative to specifying metrics IP and port.").conflicts(['metrics-port', 'metrics-ip']))
   .option("--log-level <loglevel>", "Log level (debug, info, warn, error)", "info")
   .option(
     "--timeout <n>",

lib/configproxy.js

@@ -29,9 +29,6 @@ export function parseListenOptions(args, logger) {
 
   if (args.socket) {
     listen.proxyTarget = [args.socket];
-    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 === "*") {
@@ -47,19 +44,13 @@ export function parseListenOptions(args, logger) {
 
   if (args.apiSocket) {
     listen.apiSocket = [args.apiSocket];
-    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.apiTarget = [listen.apiPort, args.apiIp];
   }
 
   if (args.metricsSocket) {
     listen.metricsSocket = [args.metricsSocket];
-    logger.warn(
-      "Metrics server will listen on UNIX domain socket, --metrics-ip and --metrics-port options will be ignored."
-    );
   } else if (args.metricsPort) {
     listen.metricsTarget = [parseInt(args.metricsPort), args.metricsIp];
   }