com.jimuwd.xian.registry-proxy 1.0.119 → 1.0.121

package/dist/index.d.ts

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
 import { Server as HttpServer } from 'node:http';
 import { Server as HttpsServer } from 'node:https';
-export declare function startProxyServer(proxyConfigPath?: string, localYarnConfigPath?: string, globalYarnConfigPath?: string, port?: number): Promise<{
-    serverIpv6: HttpServer | HttpsServer;
-    serverIpv4: HttpServer | HttpsServer;
-}>;
+export declare function startProxyServer(proxyConfigPath?: string, localYarnConfigPath?: string, globalYarnConfigPath?: string, port?: number): Promise<HttpServer | HttpsServer>;

package/dist/index.js

@@ -307,8 +307,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     logger.info('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
     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 realPort = port;
     const requestHandler = async (reqFromDownstreamClient, resToDownstreamClient) => {
         const downstreamUserAgent = reqFromDownstreamClient.headers["user-agent"]; // "curl/x.x.x"
         const downstreamIp = getDownstreamClientIp(reqFromDownstreamClient);
@@ -354,15 +352,14 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
         // 统一回写响应
         if (successfulResponseFromUpstream) {
-            await writeResponseToDownstreamClient(targetRegistry, targetUrl, resToDownstreamClient, successfulResponseFromUpstream, reqFromDownstreamClient, proxyInfo, realPort, registryInfos);
+            await writeResponseToDownstreamClient(targetRegistry, targetUrl, resToDownstreamClient, successfulResponseFromUpstream, reqFromDownstreamClient, proxyInfo, port, registryInfos);
         }
         else {
             resToDownstreamClient.writeHead(404).end('All upstream registries failed');
         }
     };
-    // 同时启动ipv6,ipv4监听，比如当客户端访问http://localhost:port时，无论客户端DNS解析到IPV4-127.0.0.1还是IPV6-::1地址，咱server都能轻松应对！
-    let serverIpv6;
-    let serverIpv4;
+    // 注意：需要同时启动ipv6,ipv4监听，比如当客户端访问http://localhost:port时，无论客户端DNS解析到IPV4-127.0.0.1还是IPV6-::1地址，咱server都能轻松应对！
+    let server;
     if (proxyInfo.https) {
         const { key, cert } = proxyInfo.https;
         const keyPath = resolvePath(key);
@@ -379,28 +376,24 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             key: readFileSync(keyPath),
             cert: readFileSync(certPath),
         };
-        serverIpv6 = createHttpsServer(httpsOptions, requestHandler);
-        serverIpv4 = createHttpsServer(httpsOptions, requestHandler);
+        server = createHttpsServer(httpsOptions, requestHandler);
         logger.info("Proxy server's maxSockets is", https.globalAgent.maxSockets);
     }
     else {
-        serverIpv6 = createServer(requestHandler);
-        serverIpv4 = createServer(requestHandler);
+        server = createServer(requestHandler);
         logger.info("Proxy server's maxSockets is", http.globalAgent.maxSockets);
     }
     // server参数暂时写死
     const serverMaxConnections = 10000;
     const serverTimeoutMs = 60000;
-    logger.info(`Proxy server's initial maxConnections is ${serverIpv4.maxConnections}, adjusting to ${serverMaxConnections}`);
-    serverIpv6.maxConnections = serverMaxConnections;
-    serverIpv4.maxConnections = serverMaxConnections;
-    logger.info(`Proxy server's initial timeout is ${serverIpv4.timeout}ms, adjusting to ${serverTimeoutMs}ms`);
-    serverIpv6.timeout = serverTimeoutMs;
-    serverIpv4.timeout = serverTimeoutMs;
+    logger.info(`Proxy server's initial maxConnections is ${server.maxConnections}, adjusting to ${serverMaxConnections}`);
+    server.maxConnections = serverMaxConnections;
+    logger.info(`Proxy server's initial timeout is ${server.timeout}ms, adjusting to ${serverTimeoutMs}ms`);
+    server.timeout = serverTimeoutMs;
     const promisedServer = new Promise((resolve, reject) => {
         const errHandler = (err) => {
             if (err.code === 'EADDRINUSE') {
-                logger.error(`Port ${realPort} is in use, please specify a different port or free it.`, err);
+                logger.error(`Port ${port} is in use, please specify a different port or free it.`, err);
                 process.exit(1);
             }
             logger.error('Server error:', err);
@@ -411,21 +404,17 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             socket.setTimeout(60000);
             socket.setKeepAlive(true, 30000);
         };
-        serverIpv6.on('error', errHandler /*this handler will call 'reject'*/);
-        serverIpv4.on('error', errHandler /*this handler will call 'reject'*/);
-        serverIpv6.on('connection', connectionHandler);
-        serverIpv4.on('connection', connectionHandler);
-        // 为了代理服务器的健壮性，先启动ipv6监听，然后再在其回调函数中启动ipv4监听
-        const listenOptions = { port, host: '*', ipv6Only: false };
-        serverIpv6.listen(listenOptions, () => {
-            const addressInfo = serverIpv6.address();
-            // 回写上层局部变量
-            realPort = addressInfo.port;
-            //logger.info(`前面已经监听了ipv6端口 ${addressInfo.address} ${addressInfo.port}，追加监听Ipv4同端口号 0.0.0.0:${addressInfo.port}`);
+        server.on('error', errHandler /*this handler will call 'reject'*/);
+        server.on('connection', connectionHandler);
+        // 为了代理服务器的健壮性，要同时监听ipv4、v6地址
+        const listenOptions = { port, ipv6Only: false };
+        server.listen(listenOptions, () => {
+            const addressInfo = server.address();
+            port = addressInfo.port; // 回写上层局部变量
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
             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, });
+            resolve(server);
         });
     });
     return promisedServer;

package/package.json

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