com.jimuwd.xian.registry-proxy 1.1.8 → 1.1.10

package/README.MD

@@ -63,7 +63,7 @@ registries:
 
 ```yaml
 unsafeHttpWhitelist:
-  - "[::1]"
+  - "127.0.0.1"
 ```
 
 ### 4. 安装命令
@@ -324,7 +324,7 @@ Create a `.yarnrc.yml` file in your project root to allow Yarn to use the local
 
 ```yaml
 unsafeHttpWhitelist:
-  - "[::1]"
+  - "127.0.0.1"
 ```
 
 ### 4. install Script

package/dist/client/yarn-install.js

@@ -124,8 +124,8 @@ async function main() {
             throw new Error(`Proxy server not listening on port ${PROXY_PORT}`);
         }
         // Configure yarn
-        await execa('yarn', ['config', 'set', 'npmRegistryServer', `http://[::1]:${PROXY_PORT}`]);
-        console.log(`Set npmRegistryServer to http://[::1]:${PROXY_PORT}`);
+        await execa('yarn', ['config', 'set', 'npmRegistryServer', `http://127.0.0.1:${PROXY_PORT}`]);
+        console.log(`Set npmRegistryServer to http://127.0.0.1:${PROXY_PORT}`);
         registerCleanup(async () => {
             try {
                 await execa('yarn', ['config', 'unset', 'npmRegistryServer']);

package/dist/server/index.js

@@ -204,7 +204,7 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
             const data = await upstreamResponse.json();
             if (data.versions) { // 处理node依赖包元数据
                 logger.debug(() => "Write package meta data application/json response from upstream to downstream", targetUrl);
-                const host = reqFromDownstreamClient.headers.host /*|| `[::1]:${_proxyPort}`*/;
+                const host = reqFromDownstreamClient.headers.host;
                 const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
                 for (const versionKey in data.versions) {
                     const packageVersion = data.versions[versionKey];
@@ -425,15 +425,17 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         };
         server.on('error', errHandler /*this handler will call 'reject'*/);
         server.on('connection', connectionHandler);
-        // 为了代理服务器的安全性，暂时只监听本机ipv6地址【::1】，不能对本机之外暴露本代理服务地址避免造成安全隐患
-        // 注意：截止目前yarn客户端如果通过localhost:<port>来访问本服务，可能会报错ECONNREFUSED错误码，原因是yarn客户端环境解析“localhost”至多个地址，它会尝试轮询每个地址。
-        const ipv6OnlyHost = '::1';
-        const listenOptions = { port, host: ipv6OnlyHost, ipv6Only: true };
+        // 安全提示：为了代理服务器的安全性，暂时只监听本机ipv6地址【127.0.0.1】，不能对本机之外暴露本代理服务地址避免造成安全隐患。
+        // 兼容性说明：
+        // 1、不使用ipv6地址因为旧的docker容器内部并未开放ipv6，为了最大成都兼容容器内运行registry-proxy，只使用ipv4了。
+        // 2、yarn客户端应当通过127.0.0.1:<port>而非localhost:<port>来访问本服务，原因是yarn客户端环境解析“localhost”至多个地址，它会尝试轮询每个地址，其中某地址可能会报错ECONNREFUSED错误码，会导致yarn install执行失败。
+        const ipv4LocalhostIp = '127.0.0.1';
+        const listenOptions = { port, host: ipv4LocalhostIp, ipv6Only: false };
         server.listen(listenOptions, async () => {
             const addressInfo = server.address();
             port = addressInfo.port; // 回写上层局部变量
             await writePortFile(port);
-            logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://[${ipv6OnlyHost}]:${port}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
+            logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://${ipv4LocalhostIp}:${port}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });
@@ -444,7 +446,7 @@ if (import.meta.url === `file://${process.argv[1]}`) {
     registerProcessShutdownHook();
     const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
     startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(async (err) => {
-        logger.error('Failed to start server:', err);
+        logger.error('Failed to start server', err);
         await gracefulShutdown();
     });
 }

package/dist/utils/portTester.d.ts

@@ -2,7 +2,7 @@ export declare function isPortFree(port: number): Promise<boolean>;
 /**
  * 检查指定端口是否可连接（有服务正在监听）
  * @param port 要检查的端口号
- * @param host 目标主机（默认本地IPv6 ::1）
+ * @param host 目标主机（默认本地IPv4 127.0.0.1）
  * @param timeout 超时时间（毫秒，默认1000ms）
  */
 export declare function isPortConnectable(port: number, host?: string, timeout?: number): Promise<boolean>;

package/dist/utils/portTester.js

@@ -12,10 +12,10 @@ export async function isPortFree(port) {
 /**
  * 检查指定端口是否可连接（有服务正在监听）
  * @param port 要检查的端口号
- * @param host 目标主机（默认本地IPv6 ::1）
+ * @param host 目标主机（默认本地IPv4 127.0.0.1）
  * @param timeout 超时时间（毫秒，默认1000ms）
  */
-export async function isPortConnectable(port, host = '::1', timeout = 1000) {
+export async function isPortConnectable(port, host = '127.0.0.1', timeout = 1000) {
     return new Promise((resolve) => {
         const socket = new net.Socket();
         // 设置超时
@@ -46,7 +46,7 @@ async function checkPortListening(port) {
             socket.destroy();
             resolve(true);
         });
-        socket.connect({ port, host: '::1' });
+        socket.connect({ port, host: '127.0.0.1' });
     });
 }
 export default { isPortFree, isPortConnectable, checkPortListening };

package/package.json

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