com.jimuwd.xian.registry-proxy 1.0.47 → 1.0.48

package/dist/index.js

@@ -160,31 +160,32 @@ async function fetchFromRegistry(registry, targetUrl, limiter) {
     }
 }
 // 修改后的 writeSuccessfulResponse 函数
-async function writeSuccessfulResponse(registryInfo, targetUrl, res, response, req, proxyInfo, proxyPort, registryInfos) {
-    if (!response.ok)
-        throw new Error("Only 2xx response is supported");
+async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamResponse, req, proxyInfo, proxyPort, registryInfos) {
+    if (!upstreamResponse.ok)
+        throw new Error("Only 2xx upstream response is supported");
     try {
-        const upstreamContentType = response.headers.get('Content-Type');
+        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 safeHeaders = {
-            'content-type': contentType,
-            'connection': 'keep-alive'
-        };
+        const safeHeaders = { 'connection': connection, 'content-type': contentType, };
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            'cache-control', 'etag', 'last-modified',
-            'content-encoding', 'content-length',
-            'transfer-encoding'
+            'etag', 'last-modified',
+            'cache-control',
+            'content-length',
+            'content-encoding',
+            'transfer-encoding',
         ];
         headersToCopy.forEach(header => {
-            const value = response.headers.get(header);
+            const value = upstreamResponse.headers.get(header);
             if (value)
                 safeHeaders[header] = value;
         });
         if (contentType.includes('application/json')) {
             // JSON 处理逻辑
-            const data = await response.json();
+            const data = await upstreamResponse.json();
             if (data.versions) {
                 const host = req.headers.host || `localhost:${proxyPort}`;
                 const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
@@ -198,23 +199,22 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, response, r
                     }
                 }
             }
-            res.writeHead(response.status, { "content-type": contentType });
-            res.end(JSON.stringify(data));
+            res.writeHead(upstreamResponse.status, safeHeaders).end(JSON.stringify(data));
         }
         else {
             // 二进制流处理
-            if (!response.body) {
+            if (!upstreamResponse.body) {
                 console.error(`Empty response body from ${targetUrl}`);
-                res.writeHead(response.status, safeHeaders).end();
+                res.writeHead(502).end('Empty Upstream Response');
             }
             else {
-                res.writeHead(response.status, safeHeaders).end(response.body);
-                /*await pipeline(response.body, res).finally(() => res.end());*/
+                res.writeHead(upstreamResponse.status, safeHeaders);
+                upstreamResponse.body.pipe(res, { end: true });
             }
         }
     }
     catch (err) {
-        console.error('Failed to write response:', err);
+        console.error('Failed to write upstreamResponse:', err);
         if (!res.headersSent) {
             res.writeHead(502).end('Internal Server Error');
         }

package/package.json

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

package/src/index.ts

@@ -8,7 +8,6 @@ import fetch, {Response} from 'node-fetch';
 import {homedir} from 'os';
 import {join, resolve} from 'path';
 import {URL} from 'url';
-import {pipeline} from "node:stream/promises";
 
 const {readFile, writeFile} = fsPromises;
 
@@ -218,40 +217,41 @@ async function writeSuccessfulResponse(
     registryInfo: RegistryInfo,
     targetUrl: string,
     res: ServerResponse,
-    response: Response,
+    upstreamResponse: Response,
     req: IncomingMessage,
     proxyInfo: ProxyInfo,
     proxyPort: number,
     registryInfos: RegistryInfo[]
 ): Promise<void> {
 
-    if (!response.ok) throw new Error("Only 2xx response is supported");
+    if (!upstreamResponse.ok) throw new Error("Only 2xx upstream response is supported");
 
     try {
-        const upstreamContentType = response.headers.get('Content-Type');
+        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 safeHeaders: OutgoingHttpHeaders = {
-            'content-type': contentType,
-            'connection': 'keep-alive'
-        };
+        const safeHeaders: OutgoingHttpHeaders = {'connection': connection, 'content-type': contentType,};
 
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            'cache-control', 'etag', 'last-modified',
-            'content-encoding', 'content-length',
-            'transfer-encoding'
+            'etag', 'last-modified',
+            'cache-control',
+            'content-length',
+            'content-encoding',
+            'transfer-encoding',
         ];
 
         headersToCopy.forEach(header => {
-            const value = response.headers.get(header);
+            const value = upstreamResponse.headers.get(header);
             if (value) safeHeaders[header] = value;
         });
 
         if (contentType.includes('application/json')) {
             // JSON 处理逻辑
-            const data = await response.json() as PackageData;
+            const data = await upstreamResponse.json() as PackageData;
             if (data.versions) {
                 const host = req.headers.host || `localhost:${proxyPort}`;
                 const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
@@ -266,20 +266,19 @@ async function writeSuccessfulResponse(
                     }
                 }
             }
-            res.writeHead(response.status, {"content-type": contentType});
-            res.end(JSON.stringify(data));
+            res.writeHead(upstreamResponse.status, safeHeaders).end(JSON.stringify(data));
         } else {
             // 二进制流处理
-            if (!response.body) {
+            if (!upstreamResponse.body) {
                 console.error(`Empty response body from ${targetUrl}`);
-                res.writeHead(response.status, safeHeaders).end();
+                res.writeHead(502).end('Empty Upstream Response');
             } else {
-                res.writeHead(response.status, safeHeaders).end(response.body)
-                /*await pipeline(response.body, res).finally(() => res.end());*/
+                res.writeHead(upstreamResponse.status, safeHeaders);
+                upstreamResponse.body.pipe(res, {end: true});
             }
         }
     } catch (err) {
-        console.error('Failed to write response:', err);
+        console.error('Failed to write upstreamResponse:', err);
         if (!res.headersSent) {
             res.writeHead(502).end('Internal Server Error');
         }