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

package/dist/index.js

@@ -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}`, { headers: [...response.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')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
         return response.ok ? response : null;
     }
     catch (e) {
@@ -170,7 +170,6 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
         const safeHeaders = { 'connection': connection, 'content-type': contentType, };
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            // 'etag', 'last-modified', 'cache-control',
             'content-length',
             'content-encoding',
             'transfer-encoding',
@@ -205,8 +204,16 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
                 res.writeHead(502).end('Empty Upstream Response');
             }
             else {
+                // write back to client
                 res.writeHead(upstreamResponse.status, safeHeaders);
-                upstreamResponse.body.pipe(res, { end: true });
+                // stop transfer if client is closed accidentally.
+                // req.on('close', () => upstreamResponse.body?.unpipe());
+                // write back body data (chunked probably)
+                upstreamResponse.body
+                    .on('data', (chunk) => res.write(chunk))
+                    .on('end', () => res.end())
+                    .on('close', () => res.destroy(new Error(`Upstream server ${registryInfo.normalizedRegistryUrl} closed connection while transferring data on url ${targetUrl}`)))
+                    .on('error', (err) => res.destroy(new Error(`Stream error: ${err.message}`, { cause: err, })));
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.jimuwd.xian.registry-proxy",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "type": "module",
   "description": "A lightweight npm registry proxy with fallback support",
   "main": "dist/index.js",
@@ -12,13 +12,13 @@
     "deploy": "yarn build && yarn npm publish"
   },
   "dependencies": {
-    "js-yaml": "latest",
-    "node-fetch": "latest"
+    "js-yaml": "4.1.0",
+    "node-fetch": "3.3.2"
   },
   "devDependencies": {
-    "@types/js-yaml": "latest",
-    "@types/node": "latest",
-    "typescript": "latest"
+    "@types/js-yaml": "4.0.9",
+    "@types/node": "20.17.0",
+    "typescript": "5.8.2"
   },
   "packageManager": "yarn@4.6.0"
 }

package/src/index.ts

@@ -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}`, {headers: [...response.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')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
         return response.ok ? response : null;
     } catch (e) {
         if (e instanceof Error) {
@@ -235,7 +235,6 @@ async function writeSuccessfulResponse(
 
         // 复制所有可能需要的头信息
         const headersToCopy = [
-            // 'etag', 'last-modified', 'cache-control',
             'content-length',
             'content-encoding',
             'transfer-encoding',
@@ -270,8 +269,16 @@ async function writeSuccessfulResponse(
                 console.error(`Empty response body from ${targetUrl}`);
                 res.writeHead(502).end('Empty Upstream Response');
             } else {
+                // write back to client
                 res.writeHead(upstreamResponse.status, safeHeaders);
-                upstreamResponse.body.pipe(res, {end: true});
+                // stop transfer if client is closed accidentally.
+                // req.on('close', () => upstreamResponse.body?.unpipe());
+                // write back body data (chunked probably)
+                upstreamResponse.body
+                    .on('data', (chunk) => res.write(chunk))
+                    .on('end', () => res.end())
+                    .on('close', () => res.destroy(new Error(`Upstream server ${registryInfo.normalizedRegistryUrl} closed connection while transferring data on url ${targetUrl}`)))
+                    .on('error', (err: Error) => res.destroy(new Error(`Stream error: ${err.message}`, {cause: err,})));
             }
         }
     } catch (err) {