com.jimuwd.xian.registry-proxy 1.0.134 → 1.1.0

package/dist/server/index.js

@@ -129,17 +129,17 @@ async function fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, l
         // 替换“Host”头为upstream的host
         const upstreamHost = new URL(registry.normalizedRegistryUrl).host;
         if (mergedHeaders.host) {
-            logger.info(`Replace 'Host=${mergedHeaders.host}' header in downstream request to upstream 'Host=${upstreamHost}' header when proxying to upstream ${targetUrl}.`);
+            logger.debug(() => `Replace 'Host=${mergedHeaders.host}' header in downstream request to upstream 'Host=${upstreamHost}' header when proxying to upstream ${targetUrl}.`);
             mergedHeaders.host = upstreamHost;
         }
         const response = await fetch(targetUrl, { headers: mergedHeaders });
         if (response.ok) {
-            logger.debug(`Success response from upstream ${targetUrl}: ${response.status} ${response.statusText}
+            logger.debug(() => `Success response from upstream ${targetUrl}: ${response.status} ${response.statusText}
             content-type=${response.headers.get('content-type')} content-encoding=${response.headers.get('content-encoding')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
             return response;
         }
         else {
-            logger.info(`Failure response from upstream ${targetUrl}: ${response.status} ${response.statusText} 
+            logger.debug(async () => `Failure response from upstream ${targetUrl}: ${response.status} ${response.statusText} 
             content-type=${response.headers.get('content-type')} content-encoding=${response.headers.get('content-encoding')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}
             body=${await response.text()}`);
             return null;
@@ -161,7 +161,7 @@ async function fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, l
     }
 }
 async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDownstreamClient, upstreamResponse, reqFromDownstreamClient, proxyInfo, _proxyPort, registryInfos) {
-    logger.info(`Writing upstream registry server ${registryInfo.normalizedRegistryUrl}'s ${upstreamResponse.status}${upstreamResponse.statusText ? (' "' + upstreamResponse.statusText + '"') : ''} response to downstream client.`);
+    logger.debug(() => `Writing upstream registry server ${registryInfo.normalizedRegistryUrl}'s ${upstreamResponse.status}${upstreamResponse.statusText ? (' "' + upstreamResponse.statusText + '"') : ''} response to downstream client.`);
     if (!upstreamResponse.ok)
         throw new Error("Only 2xx upstream response is supported");
     try {
@@ -173,7 +173,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
         else if (contentType.includes('application/json')) { // JSON 处理逻辑
             const data = await upstreamResponse.json();
             if (data.versions) { // 处理node依赖包元数据
-                logger.info("Write package meta data application/json response from upstream to downstream", targetUrl);
+                logger.debug(() => "Write package meta data application/json response from upstream to downstream", targetUrl);
                 const host = reqFromDownstreamClient.headers.host /*|| `[::1]:${_proxyPort}`*/;
                 const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
                 for (const versionKey in data.versions) {
@@ -201,7 +201,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             resToDownstreamClient.writeHead(upstreamResponse.status).end(bodyData);
         }
         else if (contentType.includes('application/octet-stream')) { // 二进制流处理
-            logger.info("Write application/octet-stream response from upstream to downstream", targetUrl);
+            logger.debug(() => `Write application/octet-stream response from upstream to downstream, upstream url is ${targetUrl}`);
             if (!upstreamResponse.body) {
                 logger.error(`Empty response body from upstream ${targetUrl}`);
                 resToDownstreamClient.writeHead(502).end('Empty Upstream Response');
@@ -233,7 +233,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                 // this is good when proxying big stream from upstream to downstream.
                 const cleanup = () => {
                     reqFromDownstreamClient.off('close', cleanup);
-                    logger.info(`Req from downstream client is closed, stop pipe from upstream ${targetUrl} to downstream client.`);
+                    logger.debug(() => `Req from downstream client is closed, stop pipe from upstream ${targetUrl} to downstream client.`);
                     upstreamResponse.body?.unpipe();
                 };
                 reqFromDownstreamClient.on('close', cleanup);
@@ -241,7 +241,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                 // 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}`);
+                    logger.debug(() => `Close connection to downstream client, upstream url is ${targetUrl}`);
                     // upstreamResponse.body?.unpipe();
                 };
                 resToDownstreamClient.on('close', cleanup0);
@@ -249,10 +249,10 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
                 // pipe upstream body-stream to downstream stream and automatically ends the stream to downstream when upstream stream is ended.
                 upstreamResponse.body.pipe(resToDownstreamClient, { end: true });
                 upstreamResponse.body
-                    .on('data', (chunk) => logger.debug(`Chunk transferred from ${targetUrl} to downstream client size=${chunk.length}`))
-                    .on('end', () => logger.info(`Upstream server ${targetUrl} response.body ended.`))
+                    .on('data', (chunk) => logger.info(`Chunk transferred from ${targetUrl} to downstream client size=${Buffer.byteLength(chunk)}bytes`))
+                    .on('end', () => logger.info(`Upstream server ${targetUrl} response.body stream ended.`))
                     // connection will be closed automatically when all chunk data is transferred (after stream ends).
-                    .on('close', () => logger.info(`Upstream server ${targetUrl} closed connection.`))
+                    .on('close', () => logger.debug(() => `Upstream ${targetUrl} closed stream.`))
                     .on('error', (err) => {
                     const errMsg = `Stream error between upstream and registry-proxy server: ${err.message}. Upstream url is ${targetUrl}`;
                     logger.error(errMsg);
@@ -270,7 +270,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             resToDownstreamClient.removeHeader('Keep-Alive');
             resToDownstreamClient.setHeader('content-type', contentType);
             resToDownstreamClient.setHeader('content-length', Buffer.byteLength(bodyData));
-            logger.info(`Response to downstream client headers`, JSON.stringify(resToDownstreamClient.getHeaders()), `Upstream url is ${targetUrl}`);
+            logger.debug(() => `Response to downstream client headers ${JSON.stringify(resToDownstreamClient.getHeaders())} Upstream url is ${targetUrl}`);
             resToDownstreamClient.writeHead(upstreamResponse.status).end(bodyData);
         }
     }

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "com.jimuwd.xian.registry-proxy",
-  "version": "1.0.134",
+  "version": "1.1.0",
   "description": "A lightweight npm registry proxy with fallback support",
   "type": "module",
   "main": "dist/server/index.js",
   "bin": {
     "registry-proxy": "dist/server/index.js",
-    "yarn-install": "dist/client/yarn-install.js",
-    "yarn-install-bash": "src/client/yarn-install.sh"
+    "yarn-install": "dist/client/yarn-install.js"
   },
   "files": [
     "dist",

package/src/client/yarn-install.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+eco "@@Deprecated@@"
+eco "use yarn-install.ts instead!"
+
 # 启用严格模式，但移除 set -e，手动处理错误
 set -u  # 未定义变量时退出
 set -o pipefail  # 管道中任一命令失败时退出