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

package/dist/index.js

@@ -411,25 +411,22 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             socket.setTimeout(60000);
             socket.setKeepAlive(true, 30000);
         };
-        // 嵌套的回调函数，在ipv6监听器启动之后会被回调调用
-        const nestedListener = () => {
-            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}`);
-            resolve({ serverIpv6, serverIpv4, });
-        };
-        const listenerCallback = () => {
-            const address = serverIpv6.address();
-            proxyPort = address.port;
-            // 前面已经监听了ipv6端口，追加监听Ipv4同端口号
-            serverIpv4.listen(proxyPort, '0.0.0.0', nestedListener);
-        };
         serverIpv6.on('error', errHandler);
         serverIpv4.on('error', errHandler);
         serverIpv6.on('connection', connectionHandler);
         serverIpv4.on('connection', connectionHandler);
         // 为了代理服务器的健壮性，先启动ipv6监听，然后再在其回调函数中启动ipv4监听
-        serverIpv6.listen(port, '::', listenerCallback);
+        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 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}`);
+                resolve({ serverIpv6, serverIpv4, });
+            });
+        });
     });
     return promisedServer;
 }

package/package.json

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