com.jimuwd.xian.registry-proxy 1.0.95 → 1.0.97

package/dist/index.js

@@ -34,7 +34,7 @@ class ConcurrencyLimiter {
         }
     }
 }
-const limiter = new ConcurrencyLimiter(10);
+const limiter = new ConcurrencyLimiter(Infinity);
 function removeEndingSlashAndForceStartingSlash(str) {
     if (!str)
         return '/';
@@ -286,6 +286,15 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
         }
     }
 }
+function getDownstreamClientIp(req) {
+    // 如果经过代理（如 Nginx），取 X-Forwarded-For 的第一个 IP
+    const forwardedFor = req.headers['x-forwarded-for'];
+    if (forwardedFor) {
+        return forwardedFor.toString().split(',')[0].trim();
+    }
+    // 直接连接时，取 socket.remoteAddress
+    return req.socket.remoteAddress;
+}
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
     const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
     const registryInfos = proxyInfo.registries;
@@ -295,11 +304,19 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     logger.info('HTTPS:', !!proxyInfo.https);
     let proxyPort;
     const requestHandler = async (reqFromDownstreamClient, resToDownstreamClient) => {
-        if (!reqFromDownstreamClient.url || !reqFromDownstreamClient.headers.host) {
+        const downstreamUserAgent = reqFromDownstreamClient.headers["user-agent"]; // "curl/x.x.x"
+        const downstreamIp = getDownstreamClientIp(reqFromDownstreamClient);
+        const downstreamRequestedHttpMethod = reqFromDownstreamClient.method; // "GET", "POST", etc.
+        const downstreamRequestedHost = reqFromDownstreamClient.headers.host; // "example.com:8080"
+        const downstreamRequestedFullPath = reqFromDownstreamClient.url; //  "/some/path?param=1&param=2"
+        logger.info(`Received downstream request ${downstreamUserAgent} ${downstreamIp} ${downstreamRequestedHttpMethod} ${downstreamRequestedHost} ${downstreamRequestedFullPath}`);
+        if (!downstreamRequestedFullPath || !downstreamRequestedHost) {
+            logger.warn(`400 Invalid Request, downstream ${downstreamUserAgent} req.url is absent or downstream.headers.host is absent.`);
             resToDownstreamClient.writeHead(400).end('Invalid Request');
             return;
         }
-        const fullUrl = new URL(reqFromDownstreamClient.url, `${proxyInfo.https ? 'https' : 'http'}://${reqFromDownstreamClient.headers.host}`);
+        const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${downstreamRequestedHost}`;
+        const fullUrl = new URL(downstreamRequestedFullPath, baseUrl);
         if (!fullUrl.pathname.startsWith(basePathPrefixedWithSlash)) {
             resToDownstreamClient.writeHead(404).end('Not Found');
             return;
@@ -307,19 +324,22 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         const path = basePathPrefixedWithSlash === '/'
             ? fullUrl.pathname
             : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
-        // 顺序尝试注册表，获取第一个成功响应
+        const search = fullUrl.search || '';
+        const targetPath = path + search;
+        logger.info(`Proxying to ${targetPath}`);
+        // 按配置顺序尝试注册表，获取第一个成功响应
         let successfulResponseFromUpstream = null;
         let targetRegistry = null;
         let targetUrl = null;
-        for (const registry of registryInfos) {
+        for (const registry_i of registryInfos) {
+            targetRegistry = registry_i;
+            targetUrl = `${targetRegistry.normalizedRegistryUrl}${targetPath}`;
             if (reqFromDownstreamClient.destroyed) {
                 // 如果下游客户端自己提前断开（或取消）请求，那么这里不再逐个fallback方式请求（fetch）上游数据了，直接退出循环并返回
+                logger.warn(`Downstream ${reqFromDownstreamClient.headers["user-agent"]} request is destroyed, no need to proxy request to upstream ${targetUrl} any more.`);
                 return;
             }
-            targetRegistry = registry;
-            const search = fullUrl.search || '';
-            targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
-            const okResponseOrNull = await fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, limiter);
+            const okResponseOrNull = await fetchFromRegistry(targetRegistry, targetUrl, reqFromDownstreamClient, limiter);
             if (okResponseOrNull) {
                 successfulResponseFromUpstream = okResponseOrNull;
                 break;

package/package.json

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