com.jimuwd.xian.registry-proxy 1.0.75 → 1.0.77

package/dist/index.js

@@ -199,9 +199,8 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                 }
             }
             resToDownstreamClient.writeHead(upstreamResponse.status, { "content-type": contentType }).end(JSON.stringify(data));
-            reqFromDownstreamClient.destroy();
         }
-        else {
+        else if (contentType.includes('application/octet-stream')) {
             // 二进制流处理
             if (!upstreamResponse.body) {
                 logger.error(`Empty response body from upstream ${targetUrl}`);
@@ -210,22 +209,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)
@@ -237,7 +233,7 @@ 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.
+                    // connection will be closed automatically when all chunk data is transferred (after stream ends).
                     .on('close', () => {
                     logger.info(`Upstream server ${targetUrl} closed connection.`);
                 })
@@ -249,6 +245,10 @@ 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());
+        }
     }
     catch (err) {
         logger.error('Failed to write upstreamResponse:', err);

package/package.json

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