com.jimuwd.xian.registry-proxy 1.0.31 → 1.0.32

package/dist/index.js

@@ -69,7 +69,7 @@ function resolvePath(path) {
 function removeRegistryPrefix(tarballUrl, registries) {
     const normalizedTarball = normalizeUrl(tarballUrl);
     const normalizedRegistries = registries
-        .map(r => normalizeUrl(r.url))
+        .map(r => normalizeUrl(r.normalizedRegistryUrl))
         .sort((a, b) => b.length - a.length);
     for (const normalizedRegistry of normalizedRegistries) {
         if (normalizedTarball.startsWith(normalizedRegistry)) {
@@ -130,7 +130,7 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
                 }
             }
         }
-        registryMap.set(normalizedProxiedRegUrl, { url: normalizedProxiedRegUrl, token });
+        registryMap.set(normalizedProxiedRegUrl, { normalizedRegistryUrl: normalizedProxiedRegUrl, token });
     }
     const registries = Array.from(registryMap.values());
     const https = proxyConfig.https;
@@ -139,9 +139,9 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
 }
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
     const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const registries = proxyInfo.registries;
+    const registryInfos = proxyInfo.registries;
     const basePathPrefixedWithSlash = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
-    console.log('Active registries:', registries.map(r => r.url));
+    console.log('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
     console.log('HTTPS:', !!proxyInfo.https);
     let proxyPort;
@@ -160,78 +160,79 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
         const relativePathPrefixedWithSlash = basePathPrefixedWithSlash === '/' ? fullUrl.pathname : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
         console.log(`Proxying: ${relativePathPrefixedWithSlash}`);
-        const fetchPromises = registries.map(async ({ url, token }) => {
+        // 修改为按顺序尝试注册表，找到第一个成功响应即返回
+        for (const { normalizedRegistryUrl, token } of registryInfos) {
             await limiter.acquire();
             try {
-                const cleanRelativePath = relativePathPrefixedWithSlash.replace(/^\/+|\/+$/g, '');
-                const targetUrl = `${url}/${cleanRelativePath}${fullUrl.search || ''}`;
+                const targetUrl = `${normalizedRegistryUrl}${relativePathPrefixedWithSlash}${fullUrl.search || ''}`;
                 console.log(`Fetching from: ${targetUrl}`);
                 const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
-                const response = await fetch(targetUrl, { headers, });
+                const response = await fetch(targetUrl, { headers });
                 console.log(`Response from ${targetUrl}: ${response.status} ${response.statusText}`);
-                return response.ok ? response : null;
-            }
-            catch (e) {
-                console.error(`Failed to fetch from ${url}:`, e);
-                return null;
-            }
-            finally {
-                limiter.release();
-            }
-        });
-        const responses = await Promise.all(fetchPromises);
-        const successResponse = responses.find((r) => r !== null);
-        if (!successResponse) {
-            console.error(`All registries failed for ${relativePathPrefixedWithSlash}`);
-            res.writeHead(404).end('Not Found - All upstream registries failed');
-            return;
-        }
-        const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
-        if (contentType.includes('application/json')) {
-            try {
-                const data = await successResponse.json();
-                if (data.versions) {
-                    const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
-                    console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
-                    const proxyBaseUrlNoSuffixedWithSlash = `${proxyInfo.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
-                    console.log("proxyBaseUrlNoSuffixedWithSlash", proxyBaseUrlNoSuffixedWithSlash);
-                    for (const version in data.versions) {
-                        const dist = data.versions[version]?.dist;
-                        if (dist?.tarball) {
-                            const originalUrl = new URL(dist.tarball);
-                            const originalSearchParamsStr = originalUrl.search || '';
-                            const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
-                            dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
-                            if (!tarballPathPrefixedWithSlash.startsWith("/"))
-                                console.error("bad tarballPath, must be PrefixedWithSlash", tarballPathPrefixedWithSlash);
+                if (response.ok) {
+                    const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+                    if (contentType.includes('application/json')) {
+                        // application/json 元数据
+                        try {
+                            const data = await response.json();
+                            if (data.versions) {
+                                const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
+                                console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
+                                const proxyBaseUrlNoSuffixedWithSlash = `${proxyInfo.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
+                                console.log("proxyBaseUrlNoSuffixedWithSlash", proxyBaseUrlNoSuffixedWithSlash);
+                                for (const version in data.versions) {
+                                    const dist = data.versions[version]?.dist;
+                                    if (dist?.tarball) {
+                                        const originalUrl = new URL(dist.tarball);
+                                        const originalSearchParamsStr = originalUrl.search || '';
+                                        const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registryInfos);
+                                        dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
+                                        if (!tarballPathPrefixedWithSlash.startsWith("/"))
+                                            console.error("bad tarballPath, must be PrefixedWithSlash", tarballPathPrefixedWithSlash);
+                                    }
+                                }
+                            }
+                            res.writeHead(200, { 'Content-Type': 'application/json' });
+                            res.end(JSON.stringify(data));
+                            return;
+                        }
+                        catch (e) {
+                            console.error('Failed to parse JSON response:', e);
+                            // 继续尝试下一个注册表
+                        }
+                    }
+                    else {
+                        // 非application/json则是tarball
+                        if (!response.body) {
+                            console.error(`Empty response body from ${response.url}, status: ${response.status}`);
+                            // 继续尝试下一个注册表
+                            continue;
                         }
+                        const contentLength = response.headers.get('Content-Length');
+                        const safeHeaders = {};
+                        safeHeaders["content-type"] = contentType;
+                        if (contentLength && !isNaN(Number(contentLength)))
+                            safeHeaders["content-length"] = contentLength;
+                        res.writeHead(response.status, safeHeaders);
+                        response.body.pipe(res).on('error', (err) => {
+                            console.error(`Stream error for ${relativePathPrefixedWithSlash}:`, err);
+                            res.writeHead(502).end('Stream Error');
+                        });
+                        return;
                     }
                 }
-                res.writeHead(200, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify(data));
             }
             catch (e) {
-                console.error('Failed to parse JSON response:', e);
-                res.writeHead(502).end('Invalid Upstream Response');
+                console.error(`Failed to fetch from ${normalizedRegistryUrl}:`, e);
+                // 继续尝试下一个注册表
             }
-        }
-        else {
-            if (!successResponse.body) {
-                console.error(`Empty response body from ${successResponse.url}, status: ${successResponse.status}`);
-                res.writeHead(502).end('Empty Response Body');
-                return;
+            finally {
+                limiter.release();
             }
-            const contentLength = successResponse.headers.get('Content-Length');
-            const safeHeaders = {};
-            safeHeaders["content-type"] = contentType;
-            if (contentLength && !isNaN(Number(contentLength)))
-                safeHeaders["content-length"] = contentLength;
-            res.writeHead(successResponse.status, safeHeaders);
-            successResponse.body.pipe(res).on('error', (err) => {
-                console.error(`Stream error for ${relativePathPrefixedWithSlash}:`, err);
-                res.writeHead(502).end('Stream Error');
-            });
         }
+        // 所有注册表都尝试失败
+        console.error(`All registries failed for ${relativePathPrefixedWithSlash}`);
+        res.writeHead(404).end('Not Found - All upstream registries failed');
     };
     let server;
     if (proxyInfo.https) {
@@ -255,7 +256,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     else {
         server = createServer(requestHandler);
     }
-    return new Promise((resolve, reject) => {
+    const promisedServer = new Promise((resolve, reject) => {
         server.on('error', (err) => {
             if (err.code === 'EADDRINUSE') {
                 console.error(`Port ${port} is in use, please specify a different port or free it.`);
@@ -273,6 +274,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             resolve(server);
         });
     });
+    return promisedServer;
 }
 if (import.meta.url === `file://${process.argv[1]}`) {
     const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;

package/package.json

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

package/src/index.ts

@@ -31,7 +31,7 @@ interface YarnConfig {
 }
 
 interface RegistryInfo {
-    url: string;
+    normalizedRegistryUrl: string;
     token?: string;
 }
 
@@ -111,7 +111,7 @@ function resolvePath(path: string): string {
 function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): string {
     const normalizedTarball = normalizeUrl(tarballUrl);
     const normalizedRegistries = registries
-        .map(r => normalizeUrl(r.url))
+        .map(r => normalizeUrl(r.normalizedRegistryUrl))
         .sort((a, b) => b.length - a.length);
     for (const normalizedRegistry of normalizedRegistries) {
         if (normalizedTarball.startsWith(normalizedRegistry)) {
@@ -177,7 +177,7 @@ async function loadProxyInfo(
                 }
             }
         }
-        registryMap.set(normalizedProxiedRegUrl, {url: normalizedProxiedRegUrl, token});
+        registryMap.set(normalizedProxiedRegUrl, {normalizedRegistryUrl: normalizedProxiedRegUrl, token});
     }
     const registries = Array.from(registryMap.values());
     const https = proxyConfig.https;
@@ -192,10 +192,10 @@ export async function startProxyServer(
     port: number = 0
 ): Promise<HttpServer | HttpsServer> {
     const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const registries = proxyInfo.registries;
+    const registryInfos = proxyInfo.registries;
     const basePathPrefixedWithSlash: string = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
 
-    console.log('Active registries:', registries.map(r => r.url));
+    console.log('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
     console.log('HTTPS:', !!proxyInfo.https);
 
@@ -219,74 +219,76 @@ export async function startProxyServer(
         const relativePathPrefixedWithSlash = basePathPrefixedWithSlash === '/' ? fullUrl.pathname : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
         console.log(`Proxying: ${relativePathPrefixedWithSlash}`);
 
-        const fetchPromises = registries.map(async ({url, token}) => {
+        // 修改为按顺序尝试注册表，找到第一个成功响应即返回
+        for (const {normalizedRegistryUrl, token} of registryInfos) {
             await limiter.acquire();
             try {
-                const cleanRelativePath = relativePathPrefixedWithSlash.replace(/^\/+|\/+$/g, '');
-                const targetUrl = `${url}/${cleanRelativePath}${fullUrl.search || ''}`;
+                const targetUrl = `${normalizedRegistryUrl}${relativePathPrefixedWithSlash}${fullUrl.search || ''}`;
                 console.log(`Fetching from: ${targetUrl}`);
                 const headers = token ? {Authorization: `Bearer ${token}`} : undefined;
-                const response = await fetch(targetUrl, {headers,});
+                const response = await fetch(targetUrl, {headers});
                 console.log(`Response from ${targetUrl}: ${response.status} ${response.statusText}`);
-                return response.ok ? response : null;
-            } catch (e) {
-                console.error(`Failed to fetch from ${url}:`, e);
-                return null;
-            } finally {
-                limiter.release();
-            }
-        });
-
-        const responses = await Promise.all(fetchPromises);
-        const successResponse = responses.find((r): r is Response => r !== null);
-        if (!successResponse) {
-            console.error(`All registries failed for ${relativePathPrefixedWithSlash}`);
-            res.writeHead(404).end('Not Found - All upstream registries failed');
-            return;
-        }
 
-        const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
-        if (contentType.includes('application/json')) {
-            try {
-                const data = await successResponse.json() as PackageData;
-                if (data.versions) {
-                    const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
-                    console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
-                    const proxyBaseUrlNoSuffixedWithSlash = `${proxyInfo.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
-                    console.log("proxyBaseUrlNoSuffixedWithSlash", proxyBaseUrlNoSuffixedWithSlash);
-                    for (const version in data.versions) {
-                        const dist = data.versions[version]?.dist;
-                        if (dist?.tarball) {
-                            const originalUrl = new URL(dist.tarball);
-                            const originalSearchParamsStr = originalUrl.search || '';
-                            const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
-                            dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
-                            if (!tarballPathPrefixedWithSlash.startsWith("/")) console.error("bad tarballPath, must be PrefixedWithSlash", tarballPathPrefixedWithSlash);
+                if (response.ok) {
+                    const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+
+                    if (contentType.includes('application/json')) {
+                        // application/json 元数据
+                        try {
+                            const data = await response.json() as PackageData;
+                            if (data.versions) {
+                                const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
+                                console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
+                                const proxyBaseUrlNoSuffixedWithSlash = `${proxyInfo.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
+                                console.log("proxyBaseUrlNoSuffixedWithSlash", proxyBaseUrlNoSuffixedWithSlash);
+                                for (const version in data.versions) {
+                                    const dist = data.versions[version]?.dist;
+                                    if (dist?.tarball) {
+                                        const originalUrl = new URL(dist.tarball);
+                                        const originalSearchParamsStr = originalUrl.search || '';
+                                        const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registryInfos);
+                                        dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
+                                        if (!tarballPathPrefixedWithSlash.startsWith("/")) console.error("bad tarballPath, must be PrefixedWithSlash", tarballPathPrefixedWithSlash);
+                                    }
+                                }
+                            }
+                            res.writeHead(200, {'Content-Type': 'application/json'});
+                            res.end(JSON.stringify(data));
+                            return;
+                        } catch (e) {
+                            console.error('Failed to parse JSON response:', e);
+                            // 继续尝试下一个注册表
+                        }
+                    } else {
+                        // 非application/json则是tarball
+                        if (!response.body) {
+                            console.error(`Empty response body from ${response.url}, status: ${response.status}`);
+                            // 继续尝试下一个注册表
+                            continue;
                         }
+                        const contentLength = response.headers.get('Content-Length');
+                        const safeHeaders: OutgoingHttpHeaders = {};
+                        safeHeaders["content-type"] = contentType;
+                        if (contentLength && !isNaN(Number(contentLength))) safeHeaders["content-length"] = contentLength;
+                        res.writeHead(response.status, safeHeaders);
+                        response.body.pipe(res).on('error', (err: any) => {
+                            console.error(`Stream error for ${relativePathPrefixedWithSlash}:`, err);
+                            res.writeHead(502).end('Stream Error');
+                        });
+                        return;
                     }
                 }
-                res.writeHead(200, {'Content-Type': 'application/json'});
-                res.end(JSON.stringify(data));
             } catch (e) {
-                console.error('Failed to parse JSON response:', e);
-                res.writeHead(502).end('Invalid Upstream Response');
-            }
-        } else {
-            if (!successResponse.body) {
-                console.error(`Empty response body from ${successResponse.url}, status: ${successResponse.status}`);
-                res.writeHead(502).end('Empty Response Body');
-                return;
+                console.error(`Failed to fetch from ${normalizedRegistryUrl}:`, e);
+                // 继续尝试下一个注册表
+            } finally {
+                limiter.release();
             }
-            const contentLength = successResponse.headers.get('Content-Length');
-            const safeHeaders: OutgoingHttpHeaders = {};
-            safeHeaders["content-type"] = contentType;
-            if (contentLength && !isNaN(Number(contentLength))) safeHeaders["content-length"] = contentLength;
-            res.writeHead(successResponse.status, safeHeaders);
-            successResponse.body.pipe(res).on('error', (err: any) => {
-                console.error(`Stream error for ${relativePathPrefixedWithSlash}:`, err);
-                res.writeHead(502).end('Stream Error');
-            });
         }
+
+        // 所有注册表都尝试失败
+        console.error(`All registries failed for ${relativePathPrefixedWithSlash}`);
+        res.writeHead(404).end('Not Found - All upstream registries failed');
     };
 
     let server: HttpServer | HttpsServer;
@@ -310,7 +312,7 @@ export async function startProxyServer(
         server = createServer(requestHandler);
     }
 
-    return new Promise((resolve, reject) => {
+    const promisedServer: Promise<HttpServer | HttpsServer> = new Promise((resolve, reject) => {
         server.on('error', (err: NodeJS.ErrnoException) => {
             if (err.code === 'EADDRINUSE') {
                 console.error(`Port ${port} is in use, please specify a different port or free it.`);
@@ -328,6 +330,8 @@ export async function startProxyServer(
             resolve(server);
         });
     });
+
+    return promisedServer as Promise<HttpServer | HttpsServer>;
 }
 
 if (import.meta.url === `file://${process.argv[1]}`) {