com.jimuwd.xian.registry-proxy 1.0.10 → 1.0.12

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 jimuwd.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.MD

@@ -73,8 +73,7 @@ unsafeHttpWhitelist:
 ```bash
 #!/bin/bash
 
-# 启用严格模式
-set -e  # 命令失败时退出
+# 启用严格模式，但移除 set -e，手动处理错误
 set -u  # 未定义变量时退出
 set -o pipefail  # 管道中任一命令失败时退出
 
@@ -98,46 +97,83 @@ PROJECT_ROOT=$(find_project_root)
 LOCK_FILE="$PROJECT_ROOT/.registry-proxy-install.lock"
 PORT_FILE="$PROJECT_ROOT/.registry-proxy-port"
 
-# 捕获 Ctrl+C 信号，清理锁文件和端口文件
+# 检查是否已经在运行（通过锁文件）
+if [ -f "$LOCK_FILE" ]; then
+  echo "Custom install script is already running (lock file $LOCK_FILE exists)."
+  echo "If this is unexpected, please remove $LOCK_FILE and try again."
+  exit 0  # 内层脚本直接退出，表示任务已由外层脚本完成
+fi
+
+# 创建锁文件
+touch "$LOCK_FILE"
+
+# 清理函数，支持不同的退出状态
+# 参数 $1：退出状态（0 表示正常退出，1 表示异常退出）
 cleanup() {
-  echo "Caught interrupt signal, cleaning up..."
-  rm -f "$LOCK_FILE"
+  local exit_code=${1:-1}  # 默认退出码为 1（异常退出）
+
+  # 显式清除 EXIT 信号的 trap，避免潜在的误解
+  trap - EXIT
+
+  if [ "$exit_code" -eq 0 ]; then
+    echo "Cleaning up after successful execution..."
+  else
+    echo "Caught interrupt signal or error, cleaning up..."
+  fi
+
+  # 清理临时文件
+  rm -f "$LOCK_FILE" 2>/dev/null
+  rm -f "$PORT_FILE" 2>/dev/null
+
+  # 停止代理服务器
   if [ -n "${PROXY_PID:-}" ]; then
-    echo "Stopping proxy server..."
+    echo "Stopping proxy server (PID: $PROXY_PID)..."
     kill -TERM "$PROXY_PID" 2>/dev/null
-    wait "$PROXY_PID" 2>/dev/null || { echo "Error: Failed to stop proxy server"; exit 1; }
-    rm -f "$PORT_FILE"
+    wait "$PROXY_PID" 2>/dev/null || true
     echo "Proxy server stopped."
   fi
-  exit 1
+
+  # 切换到项目根目录
+  cd "$PROJECT_ROOT"
+
+  # 清理 npmRegistryServer 配置
+  yarn config unset npmRegistryServer 2>/dev/null || true
+  echo "Cleared npmRegistryServer configuration"
+
+  # 根据退出状态退出
+  exit "$exit_code"
 }
 
 # 注册信号处理
-trap cleanup SIGINT SIGTERM
+trap 'cleanup 1' SIGINT SIGTERM EXIT  # 异常退出时调用 cleanup，退出码为 1
 
-# 检查是否已经在运行（通过锁文件）
-if [ -f "$LOCK_FILE" ]; then
-  echo "Custom install script is already running, skipping to avoid loop."
-  exit 0
-fi
-
-# 创建锁文件
-touch "$LOCK_FILE"
+# 切换到项目根目录
+cd "$PROJECT_ROOT"
 
-# 通过 npx 运行 registry-proxy，无需预装依赖
-# 传递项目根目录作为环境变量，供 registry-proxy 使用
-REGISTRY_PROXY_VERSION="${REGISTRY_PROXY_VERSION:-latest}"  # 默认使用 latest，可通过环境变量指定
-PROJECT_ROOT="$PROJECT_ROOT" npx com.jimuwd.xian.registry-proxy@"$REGISTRY_PROXY_VERSION" .registry-proxy.yml .yarnrc.yml ~/.yarnrc.yml &
+# 使用 yarn dlx 直接运行 registry-proxy，放入后台运行
+REGISTRY_PROXY_VERSION="${REGISTRY_PROXY_VERSION:-latest}"
+echo "Starting registry-proxy@$REGISTRY_PROXY_VERSION in the background (logs will be displayed below)..."
+yarn dlx com.jimuwd.xian.registry-proxy@"$REGISTRY_PROXY_VERSION" .registry-proxy.yml .yarnrc.yml ~/.yarnrc.yml &
 PROXY_PID=$!
 
-# 等待代理服务器启动并写入端口，最多 10 秒
-echo "Waiting for proxy server to start..."
-for i in {1..100}; do
+# 等待代理服务器启动并写入端口，最多 30 秒
+echo "Waiting for proxy server to start (up to 30 seconds)..."
+for i in {1..300}; do  # 300 次循环，每次 0.1 秒，总共 30 秒
   if [ -f "$PORT_FILE" ]; then
     PROXY_PORT=$(cat "$PORT_FILE")
+    if [ -z "$PROXY_PORT" ]; then
+      echo "Error: Port file $PORT_FILE is empty"
+      cleanup 1
+    fi
     if nc -z localhost "$PROXY_PORT" 2>/dev/null; then
       echo "Proxy server is ready on port $PROXY_PORT!"
       break
+    else
+      # 检查端口是否被占用
+      if netstat -tuln 2>/dev/null | grep -q ":$PROXY_PORT "; then
+        echo "Error: Port $PROXY_PORT is already in use by another process"
+        cleanup 1
+      fi
     fi
   fi
   sleep 0.1
@@ -145,26 +181,23 @@ done
 
 # 检查是否成功启动
 if [ -z "${PROXY_PORT:-}" ] || ! nc -z localhost "$PROXY_PORT" 2>/dev/null; then
-  echo "Error: Proxy server failed to start"
-  kill "$PROXY_PID" 2>/dev/null || true  # 忽略 kill 失败
-  rm -f "$LOCK_FILE"
-  exit 1
+  echo "Error: Proxy server failed to start after 30 seconds"
+  echo "Please check the registry-proxy logs above for more details."
+  cleanup 1
 fi
 
-# 使用动态代理端口运行 yarn install
-# 切换到项目根目录运行 yarn install，确保 yarn 行为一致
-cd "$PROJECT_ROOT"
-yarn install --registry "http://localhost:$PROXY_PORT/"
+# 动态设置 npmRegistryServer 为代理地址
+yarn config set npmRegistryServer "http://localhost:$PROXY_PORT/"
+echo "Set npmRegistryServer to http://localhost:$PROXY_PORT/"
 
-# 停止代理服务器
-echo "Stopping proxy server..."
-kill -TERM "$PROXY_PID"
-wait "$PROXY_PID" 2>/dev/null || { echo "Error: Failed to stop proxy server"; rm -f "$LOCK_FILE"; exit 1; }
-rm -f "$PORT_FILE"  # 清理临时文件
-echo "Proxy server stopped."
+# 使用动态代理端口运行 yarn install，并捕获错误
+if ! yarn install; then
+  echo "Error: yarn install failed"
+  cleanup 1
+fi
 
-# 清理锁文件
-rm -f "$LOCK_FILE"
+# 正常执行完成，调用 cleanup 并传入退出码 0
+cleanup 0
 ```
 
 ### 5. 设置脚本权限
@@ -440,8 +473,7 @@ Create a script at `scripts/install-from-proxy-registries.sh` to automate the pr
 ```bash
 #!/bin/bash
 
-# 启用严格模式
-set -e  # 命令失败时退出
+# 启用严格模式，但移除 set -e，手动处理错误
 set -u  # 未定义变量时退出
 set -o pipefail  # 管道中任一命令失败时退出
 
@@ -465,46 +497,83 @@ PROJECT_ROOT=$(find_project_root)
 LOCK_FILE="$PROJECT_ROOT/.registry-proxy-install.lock"
 PORT_FILE="$PROJECT_ROOT/.registry-proxy-port"
 
-# 捕获 Ctrl+C 信号，清理锁文件和端口文件
+# 检查是否已经在运行（通过锁文件）
+if [ -f "$LOCK_FILE" ]; then
+  echo "Custom install script is already running (lock file $LOCK_FILE exists)."
+  echo "If this is unexpected, please remove $LOCK_FILE and try again."
+  exit 0  # 内层脚本直接退出，表示任务已由外层脚本完成
+fi
+
+# 创建锁文件
+touch "$LOCK_FILE"
+
+# 清理函数，支持不同的退出状态
+# 参数 $1：退出状态（0 表示正常退出，1 表示异常退出）
 cleanup() {
-  echo "Caught interrupt signal, cleaning up..."
-  rm -f "$LOCK_FILE"
+  local exit_code=${1:-1}  # 默认退出码为 1（异常退出）
+
+  # 显式清除 EXIT 信号的 trap，避免潜在的误解
+  trap - EXIT
+
+  if [ "$exit_code" -eq 0 ]; then
+    echo "Cleaning up after successful execution..."
+  else
+    echo "Caught interrupt signal or error, cleaning up..."
+  fi
+
+  # 清理临时文件
+  rm -f "$LOCK_FILE" 2>/dev/null
+  rm -f "$PORT_FILE" 2>/dev/null
+
+  # 停止代理服务器
   if [ -n "${PROXY_PID:-}" ]; then
-    echo "Stopping proxy server..."
+    echo "Stopping proxy server (PID: $PROXY_PID)..."
     kill -TERM "$PROXY_PID" 2>/dev/null
-    wait "$PROXY_PID" 2>/dev/null || { echo "Error: Failed to stop proxy server"; exit 1; }
-    rm -f "$PORT_FILE"
+    wait "$PROXY_PID" 2>/dev/null || true
     echo "Proxy server stopped."
   fi
-  exit 1
+
+  # 切换到项目根目录
+  cd "$PROJECT_ROOT"
+
+  # 清理 npmRegistryServer 配置
+  yarn config unset npmRegistryServer 2>/dev/null || true
+  echo "Cleared npmRegistryServer configuration"
+
+  # 根据退出状态退出
+  exit "$exit_code"
 }
 
 # 注册信号处理
-trap cleanup SIGINT SIGTERM
+trap 'cleanup 1' SIGINT SIGTERM EXIT  # 异常退出时调用 cleanup，退出码为 1
 
-# 检查是否已经在运行（通过锁文件）
-if [ -f "$LOCK_FILE" ]; then
-  echo "Custom install script is already running, skipping to avoid loop."
-  exit 0
-fi
-
-# 创建锁文件
-touch "$LOCK_FILE"
+# 切换到项目根目录
+cd "$PROJECT_ROOT"
 
-# 通过 npx 运行 registry-proxy，无需预装依赖
-# 传递项目根目录作为环境变量，供 registry-proxy 使用
-REGISTRY_PROXY_VERSION="${REGISTRY_PROXY_VERSION:-latest}"  # 默认使用 latest，可通过环境变量指定
-PROJECT_ROOT="$PROJECT_ROOT" npx com.jimuwd.xian.registry-proxy@"$REGISTRY_PROXY_VERSION" .registry-proxy.yml .yarnrc.yml ~/.yarnrc.yml &
+# 使用 yarn dlx 直接运行 registry-proxy，放入后台运行
+REGISTRY_PROXY_VERSION="${REGISTRY_PROXY_VERSION:-latest}"
+echo "Starting registry-proxy@$REGISTRY_PROXY_VERSION in the background (logs will be displayed below)..."
+yarn dlx com.jimuwd.xian.registry-proxy@"$REGISTRY_PROXY_VERSION" .registry-proxy.yml .yarnrc.yml ~/.yarnrc.yml &
 PROXY_PID=$!
 
-# 等待代理服务器启动并写入端口，最多 10 秒
-echo "Waiting for proxy server to start..."
-for i in {1..100}; do
+# 等待代理服务器启动并写入端口，最多 30 秒
+echo "Waiting for proxy server to start (up to 30 seconds)..."
+for i in {1..300}; do  # 300 次循环，每次 0.1 秒，总共 30 秒
   if [ -f "$PORT_FILE" ]; then
     PROXY_PORT=$(cat "$PORT_FILE")
+    if [ -z "$PROXY_PORT" ]; then
+      echo "Error: Port file $PORT_FILE is empty"
+      cleanup 1
+    fi
     if nc -z localhost "$PROXY_PORT" 2>/dev/null; then
       echo "Proxy server is ready on port $PROXY_PORT!"
       break
+    else
+      # 检查端口是否被占用
+      if netstat -tuln 2>/dev/null | grep -q ":$PROXY_PORT "; then
+        echo "Error: Port $PROXY_PORT is already in use by another process"
+        cleanup 1
+      fi
     fi
   fi
   sleep 0.1
@@ -512,26 +581,23 @@ done
 
 # 检查是否成功启动
 if [ -z "${PROXY_PORT:-}" ] || ! nc -z localhost "$PROXY_PORT" 2>/dev/null; then
-  echo "Error: Proxy server failed to start"
-  kill "$PROXY_PID" 2>/dev/null || true  # 忽略 kill 失败
-  rm -f "$LOCK_FILE"
-  exit 1
+  echo "Error: Proxy server failed to start after 30 seconds"
+  echo "Please check the registry-proxy logs above for more details."
+  cleanup 1
 fi
 
-# 使用动态代理端口运行 yarn install
-# 切换到项目根目录运行 yarn install，确保 yarn 行为一致
-cd "$PROJECT_ROOT"
-yarn install --registry "http://localhost:$PROXY_PORT/"
+# 动态设置 npmRegistryServer 为代理地址
+yarn config set npmRegistryServer "http://localhost:$PROXY_PORT/"
+echo "Set npmRegistryServer to http://localhost:$PROXY_PORT/"
 
-# 停止代理服务器
-echo "Stopping proxy server..."
-kill -TERM "$PROXY_PID"
-wait "$PROXY_PID" 2>/dev/null || { echo "Error: Failed to stop proxy server"; rm -f "$LOCK_FILE"; exit 1; }
-rm -f "$PORT_FILE"  # 清理临时文件
-echo "Proxy server stopped."
+# 使用动态代理端口运行 yarn install，并捕获错误
+if ! yarn install; then
+  echo "Error: yarn install failed"
+  cleanup 1
+fi
 
-# 清理锁文件
-rm -f "$LOCK_FILE"
+# 正常执行完成，调用 cleanup 并传入退出码 0
+cleanup 0
 ```
 
 ### 5. Set Script Permissions

package/dist/index.js

@@ -1,187 +1,220 @@
 #!/usr/bin/env node
 import { createServer } from 'http';
-import { readFile } from 'fs/promises';
+import { createServer as createHttpsServer } from 'https';
+import { readFileSync, promises as fsPromises } from 'fs';
 import { load } from 'js-yaml';
 import fetch from 'node-fetch';
 import { homedir } from 'os';
 import { join, resolve } from 'path';
-import { writeFileSync } from 'fs';
+import { URL } from 'url'; // 显式导入URL
+const { readFile, writeFile } = fsPromises;
 function normalizeUrl(url) {
-    return url.endsWith('/') ? url.slice(0, -1) : url;
+    try {
+        const urlObj = new URL(url);
+        if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
+            urlObj.port = '';
+        }
+        else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
+            urlObj.port = '';
+        }
+        if (!urlObj.pathname.endsWith('/')) {
+            urlObj.pathname += '/';
+        }
+        return urlObj.toString();
+    }
+    catch (e) {
+        console.error(`Invalid URL: ${url}`, e);
+        return url.endsWith('/') ? url : `${url}/`;
+    }
 }
 function resolvePath(path) {
     return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
 }
-async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
-    const resolvedProxyPath = resolvePath(proxyConfigPath);
-    const resolvedLocalYarnPath = resolvePath(localYarnConfigPath);
-    const resolvedGlobalYarnPath = resolvePath(globalYarnConfigPath);
-    let proxyConfig = { registries: {} };
+function removeRegistryPrefix(tarballUrl, registries) {
     try {
-        const proxyYamlContent = await readFile(resolvedProxyPath, 'utf8');
-        proxyConfig = load(proxyYamlContent);
-        console.log(`Loaded proxy config from ${resolvedProxyPath}`);
+        const normalizedTarball = normalizeUrl(tarballUrl);
+        const normalizedRegistries = registries
+            .map(r => normalizeUrl(r.url))
+            .sort((a, b) => b.length - a.length);
+        for (const registry of normalizedRegistries) {
+            if (normalizedTarball.startsWith(registry)) {
+                return normalizedTarball.slice(registry.length - 1) || '/';
+            }
+        }
     }
     catch (e) {
-        console.error(`Failed to load ${resolvedProxyPath}: ${e.message}`);
-        process.exit(1);
+        console.error(`Invalid URL: ${tarballUrl}`, e);
     }
-    if (!proxyConfig.registries || !Object.keys(proxyConfig.registries).length) {
-        console.error(`No registries found in ${resolvedProxyPath}`);
-        process.exit(1);
-    }
-    let localYarnConfig = { npmRegistries: {} };
+    return tarballUrl;
+}
+async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
+    const resolvedPath = resolvePath(proxyConfigPath);
     try {
-        const localYamlContent = await readFile(resolvedLocalYarnPath, 'utf8');
-        localYarnConfig = load(localYamlContent);
-        console.log(`Loaded local Yarn config from ${resolvedLocalYarnPath}`);
+        const content = await readFile(resolvedPath, 'utf8');
+        const config = load(content);
+        if (!config.registries) {
+            throw new Error('Missing required "registries" field in config');
+        }
+        return config;
     }
     catch (e) {
-        console.warn(`Failed to load ${resolvedLocalYarnPath}: ${e.message}`);
+        console.error(`Failed to load proxy config from ${resolvedPath}:`, e);
+        process.exit(1);
     }
-    let globalYarnConfig = { npmRegistries: {} };
+}
+async function loadYarnConfig(path) {
     try {
-        const globalYamlContent = await readFile(resolvedGlobalYarnPath, 'utf8');
-        globalYarnConfig = load(globalYamlContent);
-        console.log(`Loaded global Yarn config from ${resolvedGlobalYarnPath}`);
+        const content = await readFile(resolvePath(path), 'utf8');
+        return load(content);
     }
     catch (e) {
-        console.warn(`Failed to load ${resolvedGlobalYarnPath}: ${e.message}`);
+        console.warn(`Failed to load Yarn config from ${path}:`, e);
+        return {};
     }
+}
+async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
+    const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
+        loadProxyConfig(proxyConfigPath),
+        loadYarnConfig(localYarnConfigPath),
+        loadYarnConfig(globalYarnConfigPath)
+    ]);
     const registryMap = new Map();
     for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
         const normalizedUrl = normalizeUrl(url);
-        registryMap.set(normalizedUrl, regConfig);
-    }
-    const registries = Array.from(registryMap.entries()).map(([url, regConfig]) => {
-        let token;
-        if (regConfig && 'npmAuthToken' in regConfig) {
-            token = regConfig.npmAuthToken?.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || regConfig.npmAuthToken;
-        }
-        const normalizedUrl = normalizeUrl(url);
-        const urlWithSlash = normalizedUrl + '/';
+        let token = regConfig?.npmAuthToken;
         if (!token) {
-            const localConfig = localYarnConfig.npmRegistries;
-            if (localConfig?.[normalizedUrl]?.npmAuthToken) {
-                token = localConfig[normalizedUrl].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || localConfig[normalizedUrl].npmAuthToken;
-                console.log(`Token for ${url} not found in ${resolvedProxyPath}, using local Yarn config (normalized)`);
-            }
-            else if (localConfig?.[urlWithSlash]?.npmAuthToken) {
-                token = localConfig[urlWithSlash].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || localConfig[urlWithSlash].npmAuthToken;
-                console.log(`Token for ${url} not found in ${resolvedProxyPath}, using local Yarn config (with slash)`);
-            }
-        }
-        if (!token) {
-            const globalConfig = globalYarnConfig.npmRegistries;
-            if (globalConfig?.[normalizedUrl]?.npmAuthToken) {
-                token = globalConfig[normalizedUrl].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || globalConfig[normalizedUrl].npmAuthToken;
-                console.log(`Token for ${url} not found in local Yarn config, using global Yarn config (normalized)`);
-            }
-            else if (globalConfig?.[urlWithSlash]?.npmAuthToken) {
-                token = globalConfig[urlWithSlash].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || globalConfig[urlWithSlash].npmAuthToken;
-                console.log(`Token for ${url} not found in local Yarn config, using global Yarn config (with slash)`);
+            const yarnConfigs = [localYarnConfig, globalYarnConfig];
+            for (const config of yarnConfigs) {
+                const registryConfig = config.npmRegistries?.[normalizedUrl] ||
+                    config.npmRegistries?.[url];
+                if (registryConfig?.npmAuthToken) {
+                    token = registryConfig.npmAuthToken;
+                    break;
+                }
             }
         }
-        console.log(`Registry ${url}: token=${token ? 'present' : 'missing'}`);
-        return { url, token };
-    });
-    return registries;
+        registryMap.set(normalizedUrl, { url: normalizedUrl, token });
+    }
+    return Array.from(registryMap.values());
 }
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
-    console.log('Starting proxy server...');
+    const proxyConfig = await loadProxyConfig(proxyConfigPath);
     const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    registries.forEach(({ url, token }) => {
-        console.log(`Registry: ${url}, Token: ${token ? 'present' : 'missing'}`);
-    });
-    const server = createServer(async (req, res) => {
-        if (!req.url || req.method !== 'GET') {
-            console.log(`Invalid request: URL=${req.url}, Method=${req.method}`);
-            res.writeHead(400, { 'Content-Type': 'text/plain' });
-            res.end('Bad Request');
+    const basePath = proxyConfig.basePath ? `/${proxyConfig.basePath.replace(/^\/|\/$/g, '')}` : '';
+    console.log('Active registries:', registries.map(r => r.url));
+    console.log('Proxy base path:', basePath || '/');
+    console.log('HTTPS:', !!proxyConfig.https);
+    let proxyPort;
+    const requestHandler = async (req, res) => {
+        if (!req.url || !req.headers.host) {
+            res.writeHead(400).end('Invalid Request');
+            return;
+        }
+        // Handle base path
+        const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
+        if (basePath && !fullUrl.pathname.startsWith(basePath)) {
+            res.writeHead(404).end('Not Found');
             return;
         }
-        const fullUrl = new URL(req.url, `http://${req.headers.host}`);
-        console.log(`Received request: ${fullUrl.pathname} (Full URL: ${fullUrl.href})`); // 增强日志
-        const pathname = fullUrl.pathname;
-        const fetchPromises = registries.map(async ({ url: registry, token }) => {
-            const targetUrl = `${registry}${pathname}`;
-            const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
-            console.log(`Fetching ${targetUrl} with headers:`, JSON.stringify(headers, null, 2)); // 打印完整 headers
+        const relativePath = basePath
+            ? fullUrl.pathname.slice(basePath.length)
+            : fullUrl.pathname;
+        console.log(`Proxying: ${relativePath}`);
+        const responses = await Promise.all(registries.map(async ({ url, token }) => {
             try {
+                const targetUrl = `${url}${relativePath}${fullUrl.search || ''}`;
+                const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
                 const response = await fetch(targetUrl, { headers });
-                console.log(`Response from ${targetUrl}: ${response.status} ${response.statusText}`);
-                if (!response.ok) {
-                    const errorBody = await response.text();
-                    console.log(`Error body from ${targetUrl}: ${errorBody}`);
-                }
-                return response;
+                return response.ok ? response : null;
             }
             catch (e) {
-                console.error(`Fetch failed for ${targetUrl}: ${e.message}`);
+                console.error(`Failed to fetch from ${url}:`, e);
                 return null;
             }
-        });
-        const responses = await Promise.all(fetchPromises);
-        const successResponse = responses.find((r) => r?.ok);
-        if (successResponse) {
-            console.log(`Forwarding successful response from ${successResponse.url}: ${successResponse.status} ${successResponse.statusText}`);
-            res.writeHead(successResponse.status, {
-                'Content-Type': successResponse.headers.get('Content-Type') || 'application/octet-stream',
-            });
-            successResponse.body?.pipe(res);
+        }));
+        const successResponse = responses.find((r) => r !== null);
+        if (!successResponse) {
+            res.writeHead(404).end('Not Found');
+            return;
+        }
+        const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
+        if (contentType.includes('application/json')) {
+            try {
+                const data = await successResponse.json();
+                if (data.versions) {
+                    const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePath}`;
+                    for (const version in data.versions) {
+                        const dist = data.versions[version]?.dist;
+                        if (dist?.tarball) {
+                            const originalUrl = new URL(dist.tarball);
+                            const tarballPath = removeRegistryPrefix(dist.tarball, registries);
+                            dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
+                        }
+                    }
+                }
+                res.writeHead(200, { 'Content-Type': 'application/json' }).end(JSON.stringify(data));
+            }
+            catch (e) {
+                console.error('Failed to parse JSON response:', e);
+                res.writeHead(502).end('Invalid Upstream Response');
+            }
         }
         else {
-            console.log('No successful response found, returning 404');
-            res.writeHead(404, { 'Content-Type': 'text/plain' });
-            res.end('Package not found');
+            if (!successResponse.body) {
+                console.error(`Empty response body from ${successResponse.url}, status: ${successResponse.status}`);
+                res.writeHead(502).end('Empty Response Body');
+                return;
+            }
+            const safeHeaders = {
+                'Content-Type': successResponse.headers.get('Content-Type'),
+                'Content-Length': successResponse.headers.get('Content-Length'),
+            };
+            res.writeHead(successResponse.status, safeHeaders);
+            successResponse.body.pipe(res);
         }
-    });
+    };
+    let server;
+    if (proxyConfig.https) {
+        const { key, cert } = proxyConfig.https;
+        try {
+            await fsPromises.access(resolvePath(key));
+            await fsPromises.access(resolvePath(cert));
+        }
+        catch (e) {
+            console.error(`HTTPS config error: key or cert file not found`, e);
+            process.exit(1);
+        }
+        const httpsOptions = {
+            key: readFileSync(resolvePath(key)),
+            cert: readFileSync(resolvePath(cert)),
+        };
+        server = createHttpsServer(httpsOptions, requestHandler);
+    }
+    else {
+        server = createServer(requestHandler);
+    }
     return new Promise((resolve, reject) => {
+        server.on('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                console.error(`Port ${port} is in use, please specify a different port or free it.`);
+                process.exit(1);
+            }
+            reject(err);
+        });
         server.listen(port, () => {
             const address = server.address();
-            if (!address) {
-                console.error('Failed to get server address: address is null');
-                reject(new Error('Failed to get server address: address is null'));
-                return;
-            }
-            if (typeof address === 'string') {
-                console.error('Server bound to a path (e.g., Unix socket), which is not supported');
-                reject(new Error('Server bound to a path, expected a TCP port'));
-                return;
-            }
-            const addressInfo = address;
-            const actualPort = addressInfo.port;
-            const projectRoot = process.env.PROJECT_ROOT || process.cwd();
-            const portFilePath = join(projectRoot, '.registry-proxy-port');
-            console.log(`Proxy server started at http://localhost:${actualPort}`);
-            writeFileSync(portFilePath, actualPort.toString(), 'utf8');
+            proxyPort = address.port;
+            const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
+            writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
+            console.log(`Proxy server running on ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePath}`);
             resolve(server);
         });
-        process.on('SIGTERM', () => {
-            console.log('Received SIGTERM, shutting down...');
-            server.close((err) => {
-                if (err) {
-                    console.error('Error closing server:', err.message);
-                    process.exit(1);
-                }
-                console.log('Server closed.');
-                process.exit(0);
-            });
-            setTimeout(() => {
-                console.error('Server did not close in time, forcing exit...');
-                process.exit(1);
-            }, 5000);
-        });
     });
 }
 if (import.meta.url === `file://${process.argv[1]}`) {
-    const proxyConfigPath = process.argv[2];
-    const localYarnConfigPath = process.argv[3];
-    const globalYarnConfigPath = process.argv[4];
-    const port = parseInt(process.argv[5], 10) || 0;
-    console.log(`CLI: proxyConfigPath=${proxyConfigPath || './.registry-proxy.yml'}, localYarnConfigPath=${localYarnConfigPath || './.yarnrc.yml'}, globalYarnConfigPath=${globalYarnConfigPath || join(homedir(), '.yarnrc.yml')}, port=${port || 'dynamic'}`);
-    startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port).catch(err => {
-        console.error('Startup failed:', err.message);
+    const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
+    startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(err => {
+        console.error('Failed to start server:', err);
         process.exit(1);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.jimuwd.xian.registry-proxy",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "type": "module",
   "description": "A lightweight npm registry proxy with fallback support",
   "main": "dist/index.js",

package/src/index.ts

@@ -1,213 +1,264 @@
 #!/usr/bin/env node
-import { createServer, Server } from 'http';
+import { createServer, Server as HttpServer } from 'http';
+import { createServer as createHttpsServer, Server as HttpsServer } from 'https';
+import { readFileSync, promises as fsPromises } from 'fs';
 import { AddressInfo } from 'net';
-import { readFile } from 'fs/promises';
 import { load } from 'js-yaml';
 import fetch, { Response } from 'node-fetch';
 import { homedir } from 'os';
 import { join, resolve } from 'path';
-import { writeFileSync } from 'fs';
+import { URL } from 'url'; // 显式导入URL
+
+const { readFile, writeFile } = fsPromises;
 
 interface RegistryConfig { npmAuthToken?: string; }
-interface ProxyConfig { registries: Record<string, RegistryConfig | null>; }
+interface HttpsConfig { key: string; cert: string; }
+interface ProxyConfig {
+    registries: Record<string, RegistryConfig | null>;
+    https?: HttpsConfig;
+    basePath?: string;
+}
 interface YarnConfig { npmRegistries?: Record<string, RegistryConfig | null>; }
+interface RegistryInfo { url: string; token?: string; }
+interface PackageVersion { dist?: { tarball?: string }; }
+interface PackageData { versions?: Record<string, PackageVersion>; }
 
 function normalizeUrl(url: string): string {
-    return url.endsWith('/') ? url.slice(0, -1) : url;
+    try {
+        const urlObj = new URL(url);
+        if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
+            urlObj.port = '';
+        } else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
+            urlObj.port = '';
+        }
+        if (!urlObj.pathname.endsWith('/')) {
+            urlObj.pathname += '/';
+        }
+        return urlObj.toString();
+    } catch (e) {
+        console.error(`Invalid URL: ${url}`, e);
+        return url.endsWith('/') ? url : `${url}/`;
+    }
 }
 
 function resolvePath(path: string): string {
     return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
 }
 
-async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')): Promise<{ url: string; token?: string }[]> {
-    const resolvedProxyPath = resolvePath(proxyConfigPath);
-    const resolvedLocalYarnPath = resolvePath(localYarnConfigPath);
-    const resolvedGlobalYarnPath = resolvePath(globalYarnConfigPath);
-
-    let proxyConfig: ProxyConfig = { registries: {} };
+function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): string {
     try {
-        const proxyYamlContent = await readFile(resolvedProxyPath, 'utf8');
-        proxyConfig = load(proxyYamlContent) as ProxyConfig;
-        console.log(`Loaded proxy config from ${resolvedProxyPath}`);
-    } catch (e) {
-        console.error(`Failed to load ${resolvedProxyPath}: ${(e as Error).message}`);
-        process.exit(1);
-    }
+        const normalizedTarball = normalizeUrl(tarballUrl);
+        const normalizedRegistries = registries
+            .map(r => normalizeUrl(r.url))
+            .sort((a, b) => b.length - a.length);
 
-    if (!proxyConfig.registries || !Object.keys(proxyConfig.registries).length) {
-        console.error(`No registries found in ${resolvedProxyPath}`);
-        process.exit(1);
+        for (const registry of normalizedRegistries) {
+            if (normalizedTarball.startsWith(registry)) {
+                return normalizedTarball.slice(registry.length - 1) || '/';
+            }
+        }
+    } catch (e) {
+        console.error(`Invalid URL: ${tarballUrl}`, e);
     }
+    return tarballUrl;
+}
 
-    let localYarnConfig: YarnConfig = { npmRegistries: {} };
+async function loadProxyConfig(
+    proxyConfigPath = './.registry-proxy.yml'
+): Promise<ProxyConfig> {
+    const resolvedPath = resolvePath(proxyConfigPath);
     try {
-        const localYamlContent = await readFile(resolvedLocalYarnPath, 'utf8');
-        localYarnConfig = load(localYamlContent) as YarnConfig;
-        console.log(`Loaded local Yarn config from ${resolvedLocalYarnPath}`);
+        const content = await readFile(resolvedPath, 'utf8');
+        const config = load(content) as ProxyConfig;
+        if (!config.registries) {
+            throw new Error('Missing required "registries" field in config');
+        }
+        return config;
     } catch (e) {
-        console.warn(`Failed to load ${resolvedLocalYarnPath}: ${(e as Error).message}`);
+        console.error(`Failed to load proxy config from ${resolvedPath}:`, e);
+        process.exit(1);
     }
+}
 
-    let globalYarnConfig: YarnConfig = { npmRegistries: {} };
+async function loadYarnConfig(path: string): Promise<YarnConfig> {
     try {
-        const globalYamlContent = await readFile(resolvedGlobalYarnPath, 'utf8');
-        globalYarnConfig = load(globalYamlContent) as YarnConfig;
-        console.log(`Loaded global Yarn config from ${resolvedGlobalYarnPath}`);
+        const content = await readFile(resolvePath(path), 'utf8');
+        return load(content) as YarnConfig;
     } catch (e) {
-        console.warn(`Failed to load ${resolvedGlobalYarnPath}: ${(e as Error).message}`);
+        console.warn(`Failed to load Yarn config from ${path}:`, e);
+        return {};
     }
+}
+
+async function loadRegistries(
+    proxyConfigPath = './.registry-proxy.yml',
+    localYarnConfigPath = './.yarnrc.yml',
+    globalYarnConfigPath = join(homedir(), '.yarnrc.yml')
+): Promise<RegistryInfo[]> {
+    const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
+        loadProxyConfig(proxyConfigPath),
+        loadYarnConfig(localYarnConfigPath),
+        loadYarnConfig(globalYarnConfigPath)
+    ]);
 
-    const registryMap = new Map<string, RegistryConfig | null>();
+    const registryMap = new Map<string, RegistryInfo>();
     for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
         const normalizedUrl = normalizeUrl(url);
-        registryMap.set(normalizedUrl, regConfig);
+        let token = regConfig?.npmAuthToken;
+
+        if (!token) {
+            const yarnConfigs = [localYarnConfig, globalYarnConfig];
+            for (const config of yarnConfigs) {
+                const registryConfig = config.npmRegistries?.[normalizedUrl] ||
+                    config.npmRegistries?.[url];
+                if (registryConfig?.npmAuthToken) {
+                    token = registryConfig.npmAuthToken;
+                    break;
+                }
+            }
+        }
+        registryMap.set(normalizedUrl, { url: normalizedUrl, token });
     }
+    return Array.from(registryMap.values());
+}
 
-    const registries = Array.from(registryMap.entries()).map(([url, regConfig]) => {
-        let token: string | undefined;
+export async function startProxyServer(
+    proxyConfigPath?: string,
+    localYarnConfigPath?: string,
+    globalYarnConfigPath?: string,
+    port: number = 0
+): Promise<HttpServer | HttpsServer> {
+    const proxyConfig = await loadProxyConfig(proxyConfigPath);
+    const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
+    const basePath = proxyConfig.basePath ? `/${proxyConfig.basePath.replace(/^\/|\/$/g, '')}` : '';
 
-        if (regConfig && 'npmAuthToken' in regConfig) {
-            token = regConfig.npmAuthToken?.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || regConfig.npmAuthToken;
-        }
+    console.log('Active registries:', registries.map(r => r.url));
+    console.log('Proxy base path:', basePath || '/');
+    console.log('HTTPS:', !!proxyConfig.https);
 
-        const normalizedUrl = normalizeUrl(url);
-        const urlWithSlash = normalizedUrl + '/';
+    let proxyPort: number;
 
-        if (!token) {
-            const localConfig = localYarnConfig.npmRegistries;
-            if (localConfig?.[normalizedUrl]?.npmAuthToken) {
-                token = localConfig[normalizedUrl].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || localConfig[normalizedUrl].npmAuthToken;
-                console.log(`Token for ${url} not found in ${resolvedProxyPath}, using local Yarn config (normalized)`);
-            } else if (localConfig?.[urlWithSlash]?.npmAuthToken) {
-                token = localConfig[urlWithSlash].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || localConfig[urlWithSlash].npmAuthToken;
-                console.log(`Token for ${url} not found in ${resolvedProxyPath}, using local Yarn config (with slash)`);
-            }
+    const requestHandler = async (req: any, res: any) => {
+        if (!req.url || !req.headers.host) {
+            res.writeHead(400).end('Invalid Request');
+            return;
         }
 
-        if (!token) {
-            const globalConfig = globalYarnConfig.npmRegistries;
-            if (globalConfig?.[normalizedUrl]?.npmAuthToken) {
-                token = globalConfig[normalizedUrl].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || globalConfig[normalizedUrl].npmAuthToken;
-                console.log(`Token for ${url} not found in local Yarn config, using global Yarn config (normalized)`);
-            } else if (globalConfig?.[urlWithSlash]?.npmAuthToken) {
-                token = globalConfig[urlWithSlash].npmAuthToken.replace(/\${(.+)}/, (_, key) => process.env[key] || '') || globalConfig[urlWithSlash].npmAuthToken;
-                console.log(`Token for ${url} not found in local Yarn config, using global Yarn config (with slash)`);
-            }
+        // Handle base path
+        const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
+        if (basePath && !fullUrl.pathname.startsWith(basePath)) {
+            res.writeHead(404).end('Not Found');
+            return;
         }
 
-        console.log(`Registry ${url}: token=${token ? 'present' : 'missing'}`);
-        return { url, token };
-    });
+        const relativePath = basePath
+            ? fullUrl.pathname.slice(basePath.length)
+            : fullUrl.pathname;
 
-    return registries;
-}
+        console.log(`Proxying: ${relativePath}`);
 
-export async function startProxyServer(proxyConfigPath?: string, localYarnConfigPath?: string, globalYarnConfigPath?: string, port: number = 0): Promise<Server> {
-    console.log('Starting proxy server...');
-    const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    registries.forEach(({ url, token }) => {
-        console.log(`Registry: ${url}, Token: ${token ? 'present' : 'missing'}`);
-    });
+        const responses = await Promise.all(
+            registries.map(async ({ url, token }) => {
+                try {
+                    const targetUrl = `${url}${relativePath}${fullUrl.search || ''}`;
+                    const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
+                    const response = await fetch(targetUrl, { headers });
+                    return response.ok ? response : null;
+                } catch (e) {
+                    console.error(`Failed to fetch from ${url}:`, e);
+                    return null;
+                }
+            })
+        );
 
-    const server = createServer(async (req, res) => {
-        if (!req.url || req.method !== 'GET') {
-            console.log(`Invalid request: URL=${req.url}, Method=${req.method}`);
-            res.writeHead(400, { 'Content-Type': 'text/plain' });
-            res.end('Bad Request');
+        const successResponse = responses.find((r): r is Response => r !== null);
+        if (!successResponse) {
+            res.writeHead(404).end('Not Found');
             return;
         }
 
-        const fullUrl = new URL(req.url, `http://${req.headers.host}`);
-        console.log(`Received request: ${fullUrl.pathname} (Full URL: ${fullUrl.href})`); // 增强日志
-        const pathname = fullUrl.pathname;
-
-        const fetchPromises = registries.map(async ({ url: registry, token }) => {
-            const targetUrl = `${registry}${pathname}`;
-            const headers: Record<string, string> | undefined = token ? { Authorization: `Bearer ${token}` } : undefined;
-            console.log(`Fetching ${targetUrl} with headers:`, JSON.stringify(headers, null, 2)); // 打印完整 headers
+        const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
+        if (contentType.includes('application/json')) {
             try {
-                const response = await fetch(targetUrl, { headers });
-                console.log(`Response from ${targetUrl}: ${response.status} ${response.statusText}`);
-                if (!response.ok) {
-                    const errorBody = await response.text();
-                    console.log(`Error body from ${targetUrl}: ${errorBody}`);
+                const data = await successResponse.json() as PackageData;
+                if (data.versions) {
+                    const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePath}`;
+                    for (const version in data.versions) {
+                        const dist = data.versions[version]?.dist;
+                        if (dist?.tarball) {
+                            const originalUrl = new URL(dist.tarball);
+                            const tarballPath = removeRegistryPrefix(dist.tarball, registries);
+                            dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
+                        }
+                    }
                 }
-                return response;
+                res.writeHead(200, { 'Content-Type': 'application/json' }).end(JSON.stringify(data));
             } catch (e) {
-                console.error(`Fetch failed for ${targetUrl}: ${(e as Error).message}`);
-                return null;
+                console.error('Failed to parse JSON response:', e);
+                res.writeHead(502).end('Invalid Upstream Response');
             }
-        });
-
-        const responses = await Promise.all(fetchPromises);
-        const successResponse = responses.find((r: Response | null) => r?.ok);
-
-        if (successResponse) {
-            console.log(`Forwarding successful response from ${successResponse.url}: ${successResponse.status} ${successResponse.statusText}`);
-            res.writeHead(successResponse.status, {
-                'Content-Type': successResponse.headers.get('Content-Type') || 'application/octet-stream',
-            });
-            successResponse.body?.pipe(res);
         } else {
-            console.log('No successful response found, returning 404');
-            res.writeHead(404, { 'Content-Type': 'text/plain' });
-            res.end('Package not found');
-        }
-    });
-
-    return new Promise((resolve, reject) => {
-        server.listen(port, () => {
-            const address: AddressInfo | string | null = server.address();
-            if (!address) {
-                console.error('Failed to get server address: address is null');
-                reject(new Error('Failed to get server address: address is null'));
+            if (!successResponse.body) {
+                console.error(`Empty response body from ${successResponse.url}, status: ${successResponse.status}`);
+                res.writeHead(502).end('Empty Response Body');
                 return;
             }
+            const safeHeaders = {
+                'Content-Type': successResponse.headers.get('Content-Type'),
+                'Content-Length': successResponse.headers.get('Content-Length'),
+            };
+            res.writeHead(successResponse.status, safeHeaders);
+            successResponse.body.pipe(res);
+        }
+    };
 
-            if (typeof address === 'string') {
-                console.error('Server bound to a path (e.g., Unix socket), which is not supported');
-                reject(new Error('Server bound to a path, expected a TCP port'));
-                return;
-            }
-
-            const addressInfo: AddressInfo = address;
-            const actualPort: number = addressInfo.port;
-
-            const projectRoot = process.env.PROJECT_ROOT || process.cwd();
-            const portFilePath = join(projectRoot, '.registry-proxy-port');
-            console.log(`Proxy server started at http://localhost:${actualPort}`);
-            writeFileSync(portFilePath, actualPort.toString(), 'utf8');
-            resolve(server);
-        });
-
-        process.on('SIGTERM', () => {
-            console.log('Received SIGTERM, shutting down...');
-            server.close((err) => {
-                if (err) {
-                    console.error('Error closing server:', err.message);
-                    process.exit(1);
-                }
-                console.log('Server closed.');
-                process.exit(0);
-            });
+    let server: HttpServer | HttpsServer;
+    if (proxyConfig.https) {
+        const { key, cert } = proxyConfig.https;
+        try {
+            await fsPromises.access(resolvePath(key));
+            await fsPromises.access(resolvePath(cert));
+        } catch (e) {
+            console.error(`HTTPS config error: key or cert file not found`, e);
+            process.exit(1);
+        }
+        const httpsOptions = {
+            key: readFileSync(resolvePath(key)),
+            cert: readFileSync(resolvePath(cert)),
+        };
+        server = createHttpsServer(httpsOptions, requestHandler);
+    } else {
+        server = createServer(requestHandler);
+    }
 
-            setTimeout(() => {
-                console.error('Server did not close in time, forcing exit...');
+    return new Promise((resolve, reject) => {
+        server.on('error', (err: NodeJS.ErrnoException) => {
+            if (err.code === 'EADDRINUSE') {
+                console.error(`Port ${port} is in use, please specify a different port or free it.`);
                 process.exit(1);
-            }, 5000);
+            }
+            reject(err);
+        });
+        server.listen(port, () => {
+            const address = server.address() as AddressInfo;
+            proxyPort = address.port;
+            const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
+            writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
+            console.log(`Proxy server running on ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePath}`);
+            resolve(server);
         });
     });
 }
 
 if (import.meta.url === `file://${process.argv[1]}`) {
-    const proxyConfigPath = process.argv[2];
-    const localYarnConfigPath = process.argv[3];
-    const globalYarnConfigPath = process.argv[4];
-    const port = parseInt(process.argv[5], 10) || 0;
-    console.log(`CLI: proxyConfigPath=${proxyConfigPath || './.registry-proxy.yml'}, localYarnConfigPath=${localYarnConfigPath || './.yarnrc.yml'}, globalYarnConfigPath=${globalYarnConfigPath || join(homedir(), '.yarnrc.yml')}, port=${port || 'dynamic'}`);
-    startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port).catch(err => {
-        console.error('Startup failed:', (err as Error).message);
+    const [,, configPath, localYarnPath, globalYarnPath, port] = process.argv;
+    startProxyServer(
+        configPath,
+        localYarnPath,
+        globalYarnPath,
+        parseInt(port, 10) || 0
+    ).catch(err => {
+        console.error('Failed to start server:', err);
         process.exit(1);
     });
 }