com.jimuwd.xian.registry-proxy 1.0.84 → 1.0.86

package/dist/index.js

@@ -138,13 +138,22 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
     const basePath = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
     return { registries, https, basePath };
 }
-async function fetchFromRegistry(registry, targetUrl, limiter) {
+async function fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, limiter) {
     await limiter.acquire();
     try {
-        logger.info(`Fetching from: ${targetUrl}`);
-        const headers = registry.token ? { Authorization: `Bearer ${registry.token}` } : {};
-        headers.Collection = "keep-alive";
-        const response = await fetch(targetUrl, { headers });
+        logger.info(`Fetching from upstream: ${targetUrl}`);
+        const headersFromDownstreamClient = reqFromDownstreamClient.headers;
+        const authorizationHeaders = registry.token ? { Authorization: `Bearer ${registry.token}` } : {};
+        // 合并 headersFromDownstreamClient 和 authorizationHeaders
+        const mergedHeaders = { ...headersFromDownstreamClient, ...authorizationHeaders, };
+        // (mergedHeaders as any).connection = "keep-alive"; 不允许私自添加 connection: keep-alive header，应当最终下游客户端自己的选择
+        // 替换“Host”头为upstream的host
+        const upstreamHost = new URL(registry.normalizedRegistryUrl).host;
+        if (mergedHeaders.host) {
+            logger.info(`Replace 'Host=${mergedHeaders.host}' header in downstream request to upstream 'Host=${upstreamHost}' header when proxying to upstream ${targetUrl}.`);
+            mergedHeaders.host = upstreamHost;
+        }
+        const response = await fetch(targetUrl, { headers: mergedHeaders });
         logger.info(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText} content-type=${response.headers.get('content-type')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
         return response.ok ? response : null;
     }
@@ -176,7 +185,8 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
         // 准备通用响应头信息
         const safeHeaders = {};
         // 复制所有可能需要的头信息（不包含安全相关的敏感头信息，如access-control-allow-origin、set-cookie、server、strict-transport-security等，这意味着代理服务器向下游客户端屏蔽了这些认证等安全数据）
-        const headersToCopy = ['cache-control', 'cf-cache-status', 'cf-ray', 'connection', 'content-type', 'content-encoding', 'content-length', 'date', 'etag', 'last-modified', 'transfer-encoding', 'vary',];
+        // 也不能包含cf-cache-status、cf-ray（Cloudflare 特有字段）可能干扰客户端解析。
+        const headersToCopy = ['cache-control', 'connection', 'content-type', 'content-encoding', 'content-length', 'date', 'etag', 'last-modified', 'transfer-encoding', 'vary',];
         headersToCopy.forEach(header => {
             const value = upstreamResponse.headers.get(header);
             if (value)
@@ -203,8 +213,8 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             }
             const bodyData = JSON.stringify(data);
             resetHeaderContentLengthIfTransferEncodingIsAbsent(safeHeaders, targetUrl, bodyData);
-            logger.info(`Response to downstream client headers`, JSON.stringify(safeHeaders));
-            resToDownstreamClient.writeHead(upstreamResponse.status, /*safeHeaders*/ { 'content-type': 'application/json' }).end(bodyData);
+            logger.info(`Response to downstream client headers`, JSON.stringify(safeHeaders), targetUrl);
+            resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders /*{'content-type': 'application/json'}*/).end(bodyData);
         }
         else if (contentType.includes('application/octet-stream')) {
             // 二进制流处理
@@ -214,6 +224,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             }
             else {
                 // write back to client
+                logger.info(`Response to downstream client headers`, JSON.stringify(safeHeaders), targetUrl);
                 resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders);
                 // stop pipe when req from client is closed accidentally.
                 const cleanup = () => {
@@ -255,6 +266,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             logger.warn(`Unsupported response content-type from upstream ${targetUrl}`);
             const bodyData = await upstreamResponse.text();
             resetHeaderContentLengthIfTransferEncodingIsAbsent(safeHeaders, targetUrl, bodyData);
+            logger.info(`Response to downstream client headers`, JSON.stringify(safeHeaders), targetUrl);
             resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders).end(bodyData);
         }
     }
@@ -291,12 +303,14 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         let targetRegistry = null;
         let targetUrl = null;
         for (const registry of registryInfos) {
-            if (reqFromDownstreamClient.destroyed)
-                break;
+            if (reqFromDownstreamClient.destroyed) {
+                // 如果下游客户端自己提前断开（或取消）请求，那么这里不再逐个fallback方式请求（fetch）上游数据了，直接退出循环并返回
+                return;
+            }
             targetRegistry = registry;
             const search = fullUrl.search || '';
             targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
-            const okResponseOrNull = await fetchFromRegistry(registry, targetUrl, limiter);
+            const okResponseOrNull = await fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, limiter);
             if (okResponseOrNull) {
                 successfulResponseFromUpstream = okResponseOrNull;
                 break;

package/package.json

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