com.jimuwd.xian.registry-proxy 1.0.67 → 1.0.69

package/dist/index.js

@@ -206,19 +206,22 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             else {
                 // write back to client
                 resToDownstreamClient.writeHead(upstreamResponse.status, safeHeaders);
-                // stop transfer if client is closed accidentally.
+                // clean up when server if 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.`);
                     upstreamResponse.body?.unpipe();
                     resToDownstreamClient.destroy();
+                    reqFromDownstreamClient.destroy();
                 };
                 reqFromDownstreamClient.on('close', cleanup);
+                // clean up when server closes connection to downstream client.
                 const cleanup0 = () => {
                     resToDownstreamClient.off('close', cleanup0);
-                    logger.info(`Downstream client closed connection, destroy connection, upstream url is ${targetUrl}`);
-                    upstreamResponse.body?.unpipe();
-                    resToDownstreamClient.destroy();
+                    logger.info(`Close connection to downstream client, destroy connection, upstream url is ${targetUrl}`);
+                    /*upstreamResponse.body?.unpipe(); 代理服务器主动关闭与客户端的连接，不需要此时对接管道已经断开了，没必要重复断开*/
+                    // resToDownstreamClient.destroy();
+                    // reqFromDownstreamClient.destroy();
                 };
                 resToDownstreamClient.on('close', cleanup0);
                 // write back body data (chunked probably)
@@ -230,16 +233,15 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                     logger.info(`Upstream server ${targetUrl} response.body ended.`);
                     resToDownstreamClient.end();
                 })
+                    // connection will be closed automatically when all chunk data is transferred.
                     .on('close', () => {
-                    const errMsg = `Upstream server ${targetUrl} closed connection while transferring data.`;
-                    logger.error(errMsg);
-                    // resToDownstreamClient.destroy(new Error(errMsg));
-                    resToDownstreamClient.destroy();
+                    logger.info(`Upstream server ${targetUrl} closed connection.`);
                 })
                     .on('error', (err) => {
                     const errMsg = `Stream error: ${err.message}`;
                     logger.error(errMsg);
                     resToDownstreamClient.destroy(new Error(errMsg, { cause: err, }));
+                    reqFromDownstreamClient.destroy(new Error(errMsg, { cause: err, }));
                 });
             }
         }

package/package.json

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