com.jimuwd.xian.registry-proxy 1.0.113 → 1.0.115

package/dist/index.js

@@ -308,7 +308,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     logger.info('Proxy base path:', basePathPrefixedWithSlash);
     logger.info('HTTPS:', !!proxyInfo.https);
     // the real port server is listening on if configured port is empty or 0
-    let proxyPort;
+    let realPort = port;
     const requestHandler = async (reqFromDownstreamClient, resToDownstreamClient) => {
         const downstreamUserAgent = reqFromDownstreamClient.headers["user-agent"]; // "curl/x.x.x"
         const downstreamIp = getDownstreamClientIp(reqFromDownstreamClient);
@@ -354,7 +354,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
         // 统一回写响应
         if (successfulResponseFromUpstream) {
-            await writeResponseToDownstreamClient(targetRegistry, targetUrl, resToDownstreamClient, successfulResponseFromUpstream, reqFromDownstreamClient, proxyInfo, proxyPort, registryInfos);
+            await writeResponseToDownstreamClient(targetRegistry, targetUrl, resToDownstreamClient, successfulResponseFromUpstream, reqFromDownstreamClient, proxyInfo, realPort, registryInfos);
         }
         else {
             resToDownstreamClient.writeHead(404).end('All upstream registries failed');
@@ -400,7 +400,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     const promisedServer = new Promise((resolve, reject) => {
         const errHandler = (err) => {
             if (err.code === 'EADDRINUSE') {
-                logger.error(`Port ${port} is in use, please specify a different port or free it.`, err);
+                logger.error(`Port ${realPort} is in use, please specify a different port or free it.`, err);
                 process.exit(1);
             }
             logger.error('Server error:', err);
@@ -417,13 +417,14 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         serverIpv4.on('connection', connectionHandler);
         // 为了代理服务器的健壮性，先启动ipv6监听，然后再在其回调函数中启动ipv4监听
         serverIpv6.listen(port, '::', () => {
-            const address = serverIpv6.address();
-            proxyPort = address.port;
-            logger.info(`前面已经监听了ipv6端口 ${address}，追加监听Ipv4同端口号 0.0.0.0:${proxyPort}`);
-            serverIpv4.listen(proxyPort, '0.0.0.0', () => {
+            const addressInfo = serverIpv6.address();
+            // 回写上层局部变量
+            realPort = addressInfo.port;
+            logger.info(`前面已经监听了ipv6端口 ${addressInfo.address} ${addressInfo.port}，追加监听Ipv4同端口号 0.0.0.0:${addressInfo.port}`);
+            serverIpv4.listen(addressInfo.port, '0.0.0.0', () => {
                 const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-                writeFile(portFile, proxyPort.toString()).catch(e => logger.error(`Failed to write port file: ${portFile}`, e));
-                logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
+                writeFile(portFile, addressInfo.port.toString()).catch(e => logger.error(`Failed to write port file: ${portFile}`, e));
+                logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${addressInfo.port}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
                 resolve({ serverIpv6, serverIpv4, });
             });
         });

package/package.json

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