com.jimuwd.xian.registry-proxy 1.0.50 → 1.0.52

package/dist/index.js

@@ -33,7 +33,7 @@ class ConcurrencyLimiter {
         }
     }
 }
-const limiter = new ConcurrencyLimiter(3);
+const limiter = new ConcurrencyLimiter(10);
 function removeEndingSlashAndForceStartingSlash(str) {
     if (!str)
         return '/';
@@ -144,7 +144,7 @@ async function fetchFromRegistry(registry, targetUrl, limiter) {
         const headers = registry.token ? { Authorization: `Bearer ${registry.token}` } : {};
         headers.Collection = "keep-alive";
         const response = await fetch(targetUrl, { headers });
-        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText} content-type=${response.headers.get("content-type")} content-length=${response.headers.get("content-length")}`);
+        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText}`, { headers: [...response.headers] });
         return response.ok ? response : null;
     }
     catch (e) {
@@ -164,16 +164,13 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
     if (!upstreamResponse.ok)
         throw new Error("Only 2xx upstream response is supported");
     try {
-        const upstreamContentType = upstreamResponse.headers.get('Content-Type');
-        const upstreamConnection = upstreamResponse.headers.get("connection");
-        const contentType = upstreamContentType || 'application/octet-stream';
-        const connection = upstreamConnection || 'keep-alive';
+        const contentType = upstreamResponse.headers.get('content-type') || 'application/octet-stream';
+        const connection = upstreamResponse.headers.get("connection") || 'keep-alive';
         // 准备通用头信息
         const safeHeaders = { 'connection': connection, 'content-type': contentType, };
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            'etag', 'last-modified',
-            'cache-control',
+            // 'etag', 'last-modified', 'cache-control',
             'content-length',
             'content-encoding',
             'transfer-encoding',
@@ -208,7 +205,7 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
                 res.writeHead(502).end('Empty Upstream Response');
             }
             else {
-                res.writeHead(upstreamResponse.status, /*safeHeaders*/ { connection: "keep-alive", "content-type": "application/octet-stream", "transfer-encoding": "chunked" });
+                res.writeHead(upstreamResponse.status, safeHeaders);
                 upstreamResponse.body.pipe(res, { end: true });
             }
         }
@@ -251,9 +248,9 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             targetRegistry = registry;
             const search = fullUrl.search || '';
             targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
-            const response = await fetchFromRegistry(registry, targetUrl, limiter);
-            if (response) {
-                successfulResponse = response;
+            const okResponseOrNull = await fetchFromRegistry(registry, targetUrl, limiter);
+            if (okResponseOrNull) {
+                successfulResponse = okResponseOrNull;
                 break;
             }
         }

package/package.json

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

package/src/index.ts

@@ -78,7 +78,7 @@ class ConcurrencyLimiter {
     }
 }
 
-const limiter = new ConcurrencyLimiter(3);
+const limiter = new ConcurrencyLimiter(10);
 
 function removeEndingSlashAndForceStartingSlash(str: string | undefined | null): string {
     if (!str) return '/';
@@ -196,7 +196,7 @@ async function fetchFromRegistry(
         const headers: {} = registry.token ? {Authorization: `Bearer ${registry.token}`} : {};
         (headers as any).Collection = "keep-alive";
         const response = await fetch(targetUrl, {headers});
-        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText} content-type=${response.headers.get("content-type")} content-length=${response.headers.get("content-length")}`);
+        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText}`, {headers: [...response.headers]});
         return response.ok ? response : null;
     } catch (e) {
         if (e instanceof Error) {
@@ -227,18 +227,15 @@ async function writeSuccessfulResponse(
     if (!upstreamResponse.ok) throw new Error("Only 2xx upstream response is supported");
 
     try {
-        const upstreamContentType = upstreamResponse.headers.get('Content-Type');
-        const upstreamConnection = upstreamResponse.headers.get("connection");
-        const contentType = upstreamContentType || 'application/octet-stream';
-        const connection = upstreamConnection || 'keep-alive';
+        const contentType = upstreamResponse.headers.get('content-type') || 'application/octet-stream';
+        const connection = upstreamResponse.headers.get("connection") || 'keep-alive';
 
         // 准备通用头信息
         const safeHeaders: OutgoingHttpHeaders = {'connection': connection, 'content-type': contentType,};
 
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            'etag', 'last-modified',
-            'cache-control',
+            // 'etag', 'last-modified', 'cache-control',
             'content-length',
             'content-encoding',
             'transfer-encoding',
@@ -273,7 +270,7 @@ async function writeSuccessfulResponse(
                 console.error(`Empty response body from ${targetUrl}`);
                 res.writeHead(502).end('Empty Upstream Response');
             } else {
-                res.writeHead(upstreamResponse.status, /*safeHeaders*/{connection:"keep-alive","content-type":"application/octet-stream","transfer-encoding":"chunked"});
+                res.writeHead(upstreamResponse.status, safeHeaders);
                 upstreamResponse.body.pipe(res, {end: true});
             }
         }
@@ -326,9 +323,9 @@ export async function startProxyServer(
             targetRegistry = registry;
             const search = fullUrl.search || '';
             targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
-            const response = await fetchFromRegistry(registry, targetUrl, limiter);
-            if (response) {
-                successfulResponse = response;
+            const okResponseOrNull = await fetchFromRegistry(registry, targetUrl, limiter);
+            if (okResponseOrNull) {
+                successfulResponse = okResponseOrNull;
                 break;
             }
         }