com.jimuwd.xian.registry-proxy 1.0.76 → 1.0.78

package/dist/index.js

@@ -173,7 +173,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
         const safeHeaders = { 'connection': connection, 'content-type': contentType, };
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            'content-length',
+            // 'content-length', upstream response body is modified by proxy, the content-length is not valid anymore.
             'content-encoding',
             'transfer-encoding',
         ];
@@ -198,7 +198,10 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                     }
                 }
             }
-            resToDownstreamClient.writeHead(upstreamResponse.status, { "content-type": contentType }).end(JSON.stringify(data));
+            const bodyData = JSON.stringify(data);
+            // body is modified, reset the content-length
+            safeHeaders["content-length"] = bodyData.length;
+            resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders).end(bodyData);
         }
         else if (contentType.includes('application/octet-stream')) {
             // 二进制流处理
@@ -209,22 +212,19 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             else {
                 // write back to client
                 resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders);
-                // clean up when server if client is closed accidentally.
+                // stop pipe when req from client is closed accidentally.
                 const cleanup = () => {
                     reqFromDownstreamClient.off('close', cleanup);
-                    logger.warn(`Downstream client closed connection accidentally, stop pipe from upstream ${targetUrl} to downstream client.`);
+                    logger.info(`Req from downstream client is closed, stop pipe from upstream ${targetUrl} to downstream client.`);
                     upstreamResponse.body?.unpipe();
-                    resToDownstreamClient.destroy();
-                    reqFromDownstreamClient.destroy();
                 };
                 reqFromDownstreamClient.on('close', cleanup);
+                reqFromDownstreamClient.on('end', () => logger.info("Req from downstream client ends."));
                 // clean up when server closes connection to downstream client.
                 const cleanup0 = () => {
                     resToDownstreamClient.off('close', cleanup0);
                     logger.info(`Close connection to downstream client, upstream url is ${targetUrl}`);
-                    /*upstreamResponse.body?.unpipe(); 代理服务器主动关闭与客户端的连接，不需要此时对接管道已经断开了，没必要重复断开*/
-                    // resToDownstreamClient.destroy();
-                    // reqFromDownstreamClient.destroy();
+                    upstreamResponse.body?.unpipe();
                 };
                 resToDownstreamClient.on('close', cleanup0);
                 // write back body data (chunked probably)
@@ -250,7 +250,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
         }
         else {
             logger.warn(`Unsupported response content-type from upstream ${targetUrl}`);
-            resToDownstreamClient.writeHead(upstreamResponse.status, { "content-type": contentType }).end(upstreamResponse.text());
+            resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders).end(upstreamResponse.text());
         }
     }
     catch (err) {

package/package.json

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