maven-proxy 1.1.1 → 1.2.1

package/README.md

@@ -185,8 +185,8 @@ npm install
 2. Configure environment variables as needed.
 
 Notes:
-- Development mode (default): npm start loads .env first, then .evn as fallback alias.
-- User mode (CLI default): npx maven-proxy or global command uses ~/maven-proxy/config.
+- Development mode (default): npm start loads config.properties in the project root.
+- User mode (CLI default): npx maven-proxy or global command uses ~/maven-proxy/config.properties.
 - Override mode with MAVEN_PROXY_CONFIG_MODE as development or user.
 - Override config file path with MAVEN_PROXY_CONFIG_FILE.
 - JAVA_HOME supports auto-detection:
@@ -267,6 +267,12 @@ Environment variables:
 - HTTPS_MITM_DOMAINS: MITM domain list (includes registry.npmjs.org by default, wildcards supported).
 - DOWNLOAD_LOG_DIR: log directory.
 - LOG_RETENTION_DAYS: number of days to retain logs.
+- LOG_TO_STDOUT: whether to also print runtime logs to stdout/stderr; startup logs are always printed.
+- LOG_CONNECT_EVENTS: whether to print verbose CONNECT/MITM handshake logs. Default false.
+- OUTBOUND_KEEP_ALIVE: enable outbound keep-alive connection pooling.
+- OUTBOUND_KEEP_ALIVE_SECONDS: keep-alive interval in seconds.
+- OUTBOUND_MAX_SOCKETS: max outbound sockets per origin.
+- OUTBOUND_MAX_FREE_SOCKETS: max idle outbound sockets per origin.
 - MAVEN_PROXY_CONFIG_MODE: development or user.
 - MAVEN_PROXY_CONFIG_FILE: explicit config file path.
 - EXISTING_TRUST_STORE_PATH: optional existing truststore path. If present, truststore init prefers it as source.
@@ -289,15 +295,21 @@ Priority:
 - `REPO_FALLBACK_REPOS`: Comma-separated fallback repository URLs for cache misses.
 - `ENABLE_HTTPS_PROXY`: Enable HTTPS proxy handling (`true/false`).
 - `HTTPS_MITM_DOMAINS`: Comma-separated domains to apply MITM certificate issuance (wildcards supported).
-- `HTTPS_PASSTHROUGH_FOR_UNMATCHED`: Whether unmatched HTTPS domains are tunneled directly.
+- `HTTPS_PASSTHROUGH_FOR_UNMATCHED`: Whether unmatched HTTPS domains are tunneled directly. Default `false`.
 - `NPM_REGISTRY_DOMAINS`: Domains treated as npm ecosystem for cache routing (wildcards supported).
 - `MAVEN_REPO_DOMAINS`: Domains treated as Maven ecosystem for cache routing (wildcards supported).
 - `MULTI_THREAD_DOMAINS`: Domains allowed to use multi-thread download (wildcards supported).
 - `MULTI_THREAD_COUNT`: Number of download threads for ranged downloads.
-- `MULTI_THREAD_MIN_SIZE_BYTES`: Minimum size threshold to trigger multi-thread download.
-- `DOWNLOAD_TIMEOUT_MS`: Upstream request timeout in milliseconds.
-- `DOWNLOAD_LOG_DIR`: Directory for download/console logs.
+- `MULTI_THREAD_MIN_SIZE_MB`: Minimum size threshold to trigger multi-thread download (MB).
+- `DOWNLOAD_TIMEOUT_SECONDS`: Upstream request timeout in seconds.
+- `DOWNLOAD_LOG_DIR`: Directory for unified app/error logs.
 - `LOG_RETENTION_DAYS`: Number of days to keep log files.
+- `LOG_TO_STDOUT`: Whether to also print runtime logs to stdout/stderr. Startup logs are always printed. Default `true`.
+- `LOG_CONNECT_EVENTS`: Whether to print verbose CONNECT/MITM handshake logs. Default `false`.
+- `OUTBOUND_KEEP_ALIVE`: Enable outbound keep-alive connection pooling. Default `true`.
+- `OUTBOUND_KEEP_ALIVE_SECONDS`: Keep-alive interval in seconds. Default `1`.
+- `OUTBOUND_MAX_SOCKETS`: Max outbound sockets per origin. Default `64`.
+- `OUTBOUND_MAX_FREE_SOCKETS`: Max idle outbound sockets per origin. Default `16`.
 - `UPSTREAM_PROXY_URL`: Generic upstream proxy URL (fallback for HTTP/HTTPS).
 - `UPSTREAM_HTTP_PROXY_URL`: Upstream proxy URL for HTTP requests.
 - `UPSTREAM_HTTPS_PROXY_URL`: Upstream proxy URL for HTTPS requests.
@@ -388,18 +400,23 @@ maven-proxy
 ```
 
 Default CLI config path:
-- ~/maven-proxy/config
+- ~/maven-proxy/config.properties
 
 Common commands:
 - maven-proxy --config /path/to/config
 - maven-proxy start --mode development
 - maven-proxy start --mode user
+- maven-proxy stop
 - maven-proxy init-config --force
 - maven-proxy truststore print
 - maven-proxy truststore init
 - maven-proxy truststore merge --source /path/source.jks --target /path/target.jks
 - maven-proxy doctor
 
+Start/stop behavior:
+- `maven-proxy start` runs in background and returns immediately.
+- `maven-proxy stop` stops the background process using PID file `~/maven-proxy/maven-proxy.pid`.
+
 Doctor command:
 - Checks config loading, port availability, keytool, JAVA_HOME, cert/truststore paths, and writable log/cache directories.
 - Reports PASS/WARN/FAIL.

package/bin/maven-proxy.js

@@ -3,10 +3,14 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import net from "node:net";
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 
 const defaultConfigDir = path.resolve(os.homedir(), "maven-proxy");
-const defaultConfigFile = path.join(defaultConfigDir, "config");
+const defaultConfigFile = path.join(defaultConfigDir, "config.properties");
+const daemonPidFile = path.join(defaultConfigDir, "maven-proxy.pid");
+const internalRunCommand = "__run-server";
+const cliFilePath = fileURLToPath(import.meta.url);
 
 function normalizeMode(value) {
   const normalized = String(value || "").trim().toLowerCase();
@@ -44,7 +48,7 @@ function resolveEffectiveMode(options) {
     return forced;
   }
 
-  // CLI defaults to user mode to load ~/maven-proxy/config unless explicitly overridden.
+  // CLI defaults to user mode to load ~/maven-proxy/config.properties unless explicitly overridden.
   return "user";
 }
 
@@ -54,6 +58,7 @@ function printHelp() {
   console.log("Usage:");
   console.log("  maven-proxy");
   console.log("  maven-proxy start [--mode <development|user>] [--config <file>]");
+  console.log("  maven-proxy stop");
   console.log("  maven-proxy init-config [--force] [--config <file>]");
   console.log("  maven-proxy truststore <print|init|merge> [options]");
   console.log("  maven-proxy doctor [--mode <development|user>] [--config <file>]");
@@ -62,7 +67,8 @@ function printHelp() {
   console.log("  npx maven-proxy");
   console.log("  maven-proxy init-config");
   console.log("  maven-proxy start --mode development");
-  console.log("  maven-proxy --config ~/maven-proxy/config");
+  console.log("  maven-proxy stop");
+  console.log("  maven-proxy --config ~/maven-proxy/config.properties");
   console.log("  maven-proxy truststore print");
   console.log("  maven-proxy truststore merge --source ./a.jks --target ./b.jks");
   console.log("  maven-proxy doctor");
@@ -144,15 +150,25 @@ function getDefaultConfigTemplate() {
     "REPO_FALLBACK_REPOS=https://repo1.maven.org/maven2,https://jitpack.io,https://plugins.gradle.org/m2,https://maven.google.com",
     "ENABLE_HTTPS_PROXY=true",
     "HTTPS_MITM_DOMAINS=repo1.maven.org,repo.maven.apache.org,registry.npmjs.org",
-    "HTTPS_PASSTHROUGH_FOR_UNMATCHED=true",
+    "HTTPS_PASSTHROUGH_FOR_UNMATCHED=false",
     "NPM_REGISTRY_DOMAINS=registry.npmjs.org,registry.npmmirror.com,npm.pkg.github.com",
     "MAVEN_REPO_DOMAINS=repo1.maven.org,repo.maven.apache.org,jitpack.io,plugins.gradle.org,maven.google.com",
     "MULTI_THREAD_DOMAINS=repo1.maven.org",
     "MULTI_THREAD_COUNT=8",
-    "MULTI_THREAD_MIN_SIZE_BYTES=1048576",
-    "DOWNLOAD_TIMEOUT_MS=60000",
+    "MULTI_THREAD_MIN_SIZE_MB=1",
+    "DOWNLOAD_TIMEOUT_SECONDS=60",
+    "OUTBOUND_KEEP_ALIVE=true",
+    "OUTBOUND_KEEP_ALIVE_SECONDS=1",
+    "OUTBOUND_MAX_SOCKETS=64",
+    "OUTBOUND_MAX_FREE_SOCKETS=16",
+    "MAVEN_AFFINITY_ENABLED=true",
+    "MAVEN_AFFINITY_INDEX_DIR=.index",
+    "MAVEN_NEGATIVE_CACHE_TTL_HOURS=24",
+    "MAVEN_AFFINITY_FLUSH_INTERVAL_SECONDS=5",
+    "MAVEN_AFFINITY_EVENT_MAX_MB=8",
     "DOWNLOAD_LOG_DIR=data/logs/downloads",
     "LOG_RETENTION_DAYS=7",
+    "LOG_TO_STDOUT=false",
     "UPSTREAM_PROXY_URL=",
     "UPSTREAM_HTTP_PROXY_URL=",
     "UPSTREAM_HTTPS_PROXY_URL=",
@@ -207,12 +223,145 @@ async function ensureAutoConfigIfNeeded(options, command) {
   await initConfigFile(defaultConfigFile, false);
 }
 
-async function startServer(options) {
+async function runServerInCurrentProcess(options) {
   applyConfigOverrides(options);
 
   await import("../src/index.js");
 }
 
+function parsePid(rawText) {
+  const pid = Number.parseInt(String(rawText || "").trim(), 10);
+  return Number.isFinite(pid) && pid > 0 ? pid : 0;
+}
+
+function readDaemonPid() {
+  if (!fs.existsSync(daemonPidFile)) {
+    return 0;
+  }
+
+  try {
+    const text = fs.readFileSync(daemonPidFile, "utf8");
+    return parsePid(text);
+  } catch {
+    return 0;
+  }
+}
+
+function isProcessRunning(pid) {
+  if (!pid) {
+    return false;
+  }
+
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if (error && error.code === "EPERM") {
+      return true;
+    }
+    return false;
+  }
+}
+
+async function removeDaemonPidFile() {
+  await fs.promises.rm(daemonPidFile, { force: true });
+}
+
+function waitMs(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitForProcessExit(pid, timeoutMs = 5000) {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    if (!isProcessRunning(pid)) {
+      return true;
+    }
+    await waitMs(100);
+  }
+
+  return !isProcessRunning(pid);
+}
+
+async function startServer(options) {
+  await fs.promises.mkdir(defaultConfigDir, { recursive: true });
+
+  const existingPid = readDaemonPid();
+  if (existingPid && isProcessRunning(existingPid)) {
+    console.log(`[maven-proxy] already running (pid=${existingPid})`);
+    console.log(`[maven-proxy] pid file: ${daemonPidFile}`);
+    return;
+  }
+
+  if (existingPid && !isProcessRunning(existingPid)) {
+    await removeDaemonPidFile();
+  }
+
+  const childEnv = {
+    ...process.env,
+    MAVEN_PROXY_CONFIG_MODE: resolveEffectiveMode(options),
+  };
+
+  if (options.configPath) {
+    childEnv.MAVEN_PROXY_CONFIG_FILE = resolvePath(options.configPath);
+  } else {
+    delete childEnv.MAVEN_PROXY_CONFIG_FILE;
+  }
+
+  const child = spawn(
+    process.execPath,
+    [cliFilePath, internalRunCommand, "--mode", resolveEffectiveMode(options)],
+    {
+      cwd: process.cwd(),
+      detached: true,
+      stdio: "ignore",
+      env: childEnv,
+    },
+  );
+
+  child.unref();
+  await fs.promises.writeFile(daemonPidFile, `${child.pid}\n`, "utf8");
+
+  await waitMs(300);
+  if (!isProcessRunning(child.pid)) {
+    await removeDaemonPidFile();
+    throw new Error("start failed: process exited immediately, check app/error logs");
+  }
+
+  console.log(`[maven-proxy] started in background (pid=${child.pid})`);
+  console.log(`[maven-proxy] pid file: ${daemonPidFile}`);
+}
+
+async function stopServer(options) {
+  const pid = readDaemonPid();
+  if (!pid) {
+    console.log("[maven-proxy] not running (pid file not found)");
+    return;
+  }
+
+  if (!isProcessRunning(pid)) {
+    await removeDaemonPidFile();
+    console.log(`[maven-proxy] stale pid removed: ${pid}`);
+    return;
+  }
+
+  process.kill(pid, "SIGTERM");
+  const stopped = await waitForProcessExit(pid, 5000);
+  if (!stopped) {
+    process.kill(pid, "SIGKILL");
+    const forceStopped = await waitForProcessExit(pid, 2000);
+    if (!forceStopped) {
+      throw new Error(`stop failed: unable to terminate pid ${pid}`);
+    }
+  }
+
+  await removeDaemonPidFile();
+  console.log(`[maven-proxy] stopped (pid=${pid})`);
+  if (options.configPath) {
+    console.log(`[maven-proxy] stop requested with config: ${resolvePath(options.configPath)}`);
+  }
+}
+
 function applyConfigOverrides(options) {
   process.env.MAVEN_PROXY_CONFIG_MODE = resolveEffectiveMode(options);
 
@@ -304,7 +453,7 @@ async function runDoctor(options) {
     printDoctorLine("WARN", "config file", `not found, expected ${config.defaultUserConfigPath}`);
   } else {
     warnings.push("development config file missing");
-    printDoctorLine("WARN", "config file", "no .env/.evn loaded, using defaults");
+    printDoctorLine("WARN", "config file", "no config.properties loaded, using defaults");
   }
 
   const keytool = checkKeytool();
@@ -567,6 +716,14 @@ async function main() {
     return;
   }
 
+  if (command === "stop") {
+    if (options.commandArgs.length > 0) {
+      throw new Error(`Unknown argument for stop: ${options.commandArgs[0]}`);
+    }
+    await stopServer(options);
+    return;
+  }
+
   if (command === "start") {
     if (options.commandArgs.length > 0) {
       throw new Error(`Unknown argument for start: ${options.commandArgs[0]}`);
@@ -575,6 +732,14 @@ async function main() {
     return;
   }
 
+  if (command === internalRunCommand) {
+    if (options.commandArgs.length > 0) {
+      throw new Error(`Unknown argument for ${internalRunCommand}: ${options.commandArgs[0]}`);
+    }
+    await runServerInCurrentProcess(options);
+    return;
+  }
+
   throw new Error(`Unknown command: ${command}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maven-proxy",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Maven proxy with cache, HTTPS MITM for selected domains, and local repo publishing",
   "main": "src/index.js",
   "bin": {
@@ -17,6 +17,7 @@
     "start:cli": "node bin/maven-proxy.js",
     "cli:help": "node bin/maven-proxy.js --help",
     "cli:start": "node bin/maven-proxy.js start --mode development",
+    "cli:stop": "node bin/maven-proxy.js stop",
     "cli:doctor": "node bin/maven-proxy.js doctor --mode development",
     "cli:truststore:print": "node bin/maven-proxy.js truststore print --mode development",
     "cli:truststore:init": "node bin/maven-proxy.js truststore init --mode development",
@@ -33,7 +34,9 @@
     "npm:version:patch": "npm version patch",
     "npm:view:version": "npm view maven-proxy version",
     "npm:view:dist-tags": "npm view maven-proxy dist-tags",
-    "test": "node -e \"console.log('No tests yet')\""
+    "replay:affinity": "node --test test/replay-affinity.test.js",
+    "test:replay": "node --test test/replay-affinity.test.js",
+    "test": "node --test test/*.test.js"
   },
   "keywords": [],
   "author": "",

package/src/cache/downloader.js

@@ -3,7 +3,6 @@ import http from "node:http";
 import https from "node:https";
 import path from "node:path";
 import { pipeline } from "node:stream/promises";
-import { DownloadLogWriter } from "../common/download-log-writer.js";
 
 const REDIRECT_STATUS = new Set([301, 302, 303, 307, 308]);
 const MAX_REDIRECTS = 5;
@@ -288,7 +287,6 @@ export class Downloader {
     this.domainMatcher = domainMatcher;
     this.upstreamProxyManager = upstreamProxyManager;
     this.inflight = new Map();
-    this.downloadLogWriter = new DownloadLogWriter(config.downloadLogDir, config.logRetentionDays);
   }
 
   logDownload(event, urlObj, details = {}) {
@@ -299,7 +297,6 @@ export class Downloader {
       .join(" ");
 
     console.log(`[downloader] ${event} url=${url}${detailText ? ` ${detailText}` : ""}`);
-    this.downloadLogWriter.write(event, url, details);
   }
 
   async ensureCached(urlObj, finalPath, requestHeaders = {}) {