com.jimuwd.xian.registry-proxy 1.0.17 → 1.0.18

package/dist/index.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 import { createServer } from 'http';
 import { createServer as createHttpsServer } from 'https';
-import { promises as fsPromises, readFileSync } from 'fs';
+import { readFileSync, promises as fsPromises } from 'fs';
 import { load } from 'js-yaml';
 import fetch from 'node-fetch';
 import { homedir } from 'os';
 import { join, resolve } from 'path';
 import { URL } from 'url';
 const { readFile, writeFile } = fsPromises;
-// 并发控制队列
 class ConcurrencyLimiter {
     maxConcurrency;
     current = 0;
@@ -34,34 +33,22 @@ class ConcurrencyLimiter {
         }
     }
 }
-// 设置最大并发数（可调整）
-const limiter = new ConcurrencyLimiter(5); // 限制为 5 个并发请求
+const limiter = new ConcurrencyLimiter(3);
 function normalizeUrl(url) {
     try {
         const urlObj = new URL(url);
-        // 规范化端口
         if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
             urlObj.port = '';
         }
         else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
             urlObj.port = '';
         }
-        // 处理路径末尾斜杠
-        const pathname = urlObj.pathname;
-        if (pathname.endsWith('.tgz') || pathname.endsWith('.tgz/')) {
-            // tarball 文件，去除末尾斜杠
-            urlObj.pathname = pathname.replace(/\/+$/, '');
-        }
-        else if (!pathname.endsWith('/')) {
-            // 注册表根路径，确保末尾有斜杠
-            urlObj.pathname += '/';
-        }
-        console.debug(`Normalized URL: ${url} -> ${urlObj.toString()}`);
+        urlObj.pathname = urlObj.pathname.replace(/\/+$/, '');
         return urlObj.toString();
     }
     catch (e) {
         console.error(`Invalid URL: ${url}`, e);
-        return url.endsWith('/') ? url.slice(0, -1) : url; // 默认去除末尾斜杠
+        return url.replace(/\/+$/, '');
     }
 }
 function resolvePath(path) {
@@ -73,15 +60,11 @@ function removeRegistryPrefix(tarballUrl, registries) {
         const normalizedRegistries = registries
             .map(r => normalizeUrl(r.url))
             .sort((a, b) => b.length - a.length);
-        console.debug(`Removing registry prefix from tarball: ${normalizedTarball}`);
         for (const registry of normalizedRegistries) {
             if (normalizedTarball.startsWith(registry)) {
-                const result = normalizedTarball.slice(registry.length - 1) || '/';
-                console.debug(`Matched registry ${registry}, result: ${result}`);
-                return result;
+                return normalizedTarball.slice(registry.length) || '/';
             }
         }
-        console.debug(`No registry prefix matched for ${normalizedTarball}`);
     }
     catch (e) {
         console.error(`Invalid URL in removeRegistryPrefix: ${tarballUrl}`, e);
@@ -90,14 +73,12 @@ function removeRegistryPrefix(tarballUrl, registries) {
 }
 async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
     const resolvedPath = resolvePath(proxyConfigPath);
-    console.debug(`Loading proxy config from: ${resolvedPath}`);
     try {
         const content = await readFile(resolvedPath, 'utf8');
         const config = load(content);
         if (!config.registries) {
             throw new Error('Missing required "registries" field in config');
         }
-        console.debug('Loaded proxy config:', JSON.stringify(config, null, 2));
         return config;
     }
     catch (e) {
@@ -106,12 +87,9 @@ async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
     }
 }
 async function loadYarnConfig(path) {
-    console.debug(`Loading Yarn config from: ${path}`);
     try {
         const content = await readFile(resolvePath(path), 'utf8');
-        const config = load(content);
-        console.debug(`Loaded Yarn config from ${path}:`, JSON.stringify(config, null, 2));
-        return config;
+        return load(content);
     }
     catch (e) {
         console.warn(`Failed to load Yarn config from ${path}:`, e);
@@ -119,7 +97,6 @@ async function loadYarnConfig(path) {
     }
 }
 async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
-    console.debug('Loading registries...');
     const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
         loadProxyConfig(proxyConfigPath),
         loadYarnConfig(localYarnConfigPath),
@@ -136,16 +113,13 @@ async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYa
                     config.npmRegistries?.[url];
                 if (registryConfig?.npmAuthToken) {
                     token = registryConfig.npmAuthToken;
-                    console.debug(`Found token for ${normalizedUrl} in Yarn config`);
                     break;
                 }
             }
         }
         registryMap.set(normalizedUrl, { url: normalizedUrl, token });
     }
-    const registries = Array.from(registryMap.values());
-    console.log('Loaded registries:', registries);
-    return registries;
+    return Array.from(registryMap.values());
 }
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
     const proxyConfig = await loadProxyConfig(proxyConfigPath);
@@ -156,14 +130,12 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     console.log('HTTPS:', !!proxyConfig.https);
     let proxyPort;
     const requestHandler = async (req, res) => {
-        console.debug(`Received request: ${req.method} ${req.url}`);
         if (!req.url || !req.headers.host) {
             console.error('Invalid request: missing URL or host header');
             res.writeHead(400).end('Invalid Request');
             return;
         }
         const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
-        console.debug(`Full URL: ${fullUrl.toString()}`);
         if (basePath && !fullUrl.pathname.startsWith(basePath)) {
             console.error(`Path ${fullUrl.pathname} does not match basePath ${basePath}`);
             res.writeHead(404).end('Not Found');
@@ -174,13 +146,13 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             : fullUrl.pathname;
         console.log(`Proxying: ${relativePath}`);
         const fetchPromises = registries.map(async ({ url, token }) => {
-            await limiter.acquire(); // 获取并发许可
+            await limiter.acquire();
             try {
-                const cleanRelativePath = relativePath.replace(/\/+$/, '');
-                const targetUrl = `${url}${cleanRelativePath}${fullUrl.search || ''}`;
+                const cleanRelativePath = relativePath.replace(/^\/+|\/+$/g, '');
+                const targetUrl = `${url}/${cleanRelativePath}${fullUrl.search || ''}`.replace(/\/+/g, '/');
                 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 ${url}: ${response.status} ${response.statusText}`);
                 return response.ok ? response : null;
             }
@@ -189,7 +161,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 return null;
             }
             finally {
-                limiter.release(); // 释放并发许可
+                limiter.release();
             }
         });
         const responses = await Promise.all(fetchPromises);
@@ -205,20 +177,17 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 const data = await successResponse.json();
                 if (data.versions) {
                     const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePath}`;
-                    console.debug(`Rewriting tarball URLs with proxy base: ${proxyBase}`);
                     for (const version in data.versions) {
                         const dist = data.versions[version]?.dist;
                         if (dist?.tarball) {
                             const originalUrl = new URL(dist.tarball);
                             const tarballPath = removeRegistryPrefix(dist.tarball, registries);
                             dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
-                            console.debug(`Rewrote tarball: ${originalUrl} -> ${dist.tarball}`);
                         }
                     }
                 }
                 res.writeHead(200, { 'Content-Type': 'application/json' });
-                const jsonResponse = JSON.stringify(data);
-                res.end(jsonResponse);
+                res.end(JSON.stringify(data));
             }
             catch (e) {
                 console.error('Failed to parse JSON response:', e);
@@ -231,9 +200,10 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 res.writeHead(502).end('Empty Response Body');
                 return;
             }
+            const contentLength = successResponse.headers.get('Content-Length');
             const safeHeaders = {
                 'Content-Type': successResponse.headers.get('Content-Type'),
-                'Content-Length': successResponse.headers.get('Content-Length'),
+                'Content-Length': contentLength && !isNaN(Number(contentLength)) ? contentLength : undefined,
             };
             res.writeHead(successResponse.status, safeHeaders);
             successResponse.body.pipe(res).on('error', (err) => {
@@ -277,7 +247,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             const address = server.address();
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-            console.debug(`Writing port ${proxyPort} to file: ${portFile}`);
             writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
             console.log(`Proxy server running on ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePath}`);
             resolve(server);
@@ -286,7 +255,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
 }
 if (import.meta.url === `file://${process.argv[1]}`) {
     const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
-    console.log(`Starting server with args: configPath=${configPath}, localYarnPath=${localYarnPath}, globalYarnPath=${globalYarnPath}, port=${port}`);
     startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(err => {
         console.error('Failed to start server:', err);
         process.exit(1);

package/package.json

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

package/src/index.ts

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-import {createServer, Server as HttpServer} from 'http';
-import {createServer as createHttpsServer, Server as HttpsServer} from 'https';
-import {promises as fsPromises, readFileSync} from 'fs';
-import {AddressInfo} from 'net';
-import {load} from 'js-yaml';
-import fetch, {Response} from 'node-fetch';
-import {homedir} from 'os';
-import {join, resolve} from 'path';
-import {URL} from 'url';
+import { createServer, Server as HttpServer } from 'http';
+import { createServer as createHttpsServer, Server as HttpsServer } from 'https';
+import { readFileSync, promises as fsPromises } from 'fs';
+import { AddressInfo } from 'net';
+import { load } from 'js-yaml';
+import fetch, { Response } from 'node-fetch';
+import { homedir } from 'os';
+import { join, resolve } from 'path';
+import { URL } from 'url';
 
 const { readFile, writeFile } = fsPromises;
 
@@ -23,7 +23,6 @@ interface RegistryInfo { url: string; token?: string; }
 interface PackageVersion { dist?: { tarball?: string }; }
 interface PackageData { versions?: Record<string, PackageVersion>; }
 
-// 并发控制队列
 class ConcurrencyLimiter {
     private maxConcurrency: number;
     private current: number = 0;
@@ -53,32 +52,21 @@ class ConcurrencyLimiter {
     }
 }
 
-// 设置最大并发数（可调整）
-const limiter = new ConcurrencyLimiter(5); // 限制为 5 个并发请求
+const limiter = new ConcurrencyLimiter(3);
 
 function normalizeUrl(url: string): string {
     try {
         const urlObj = new URL(url);
-        // 规范化端口
         if (urlObj.protocol === 'http:' && (urlObj.port === '80' || urlObj.port === '')) {
             urlObj.port = '';
         } else if (urlObj.protocol === 'https:' && (urlObj.port === '443' || urlObj.port === '')) {
             urlObj.port = '';
         }
-        // 处理路径末尾斜杠
-        const pathname = urlObj.pathname;
-        if (pathname.endsWith('.tgz') || pathname.endsWith('.tgz/')) {
-            // tarball 文件，去除末尾斜杠
-            urlObj.pathname = pathname.replace(/\/+$/, '');
-        } else if (!pathname.endsWith('/')) {
-            // 注册表根路径，确保末尾有斜杠
-            urlObj.pathname += '/';
-        }
-        console.debug(`Normalized URL: ${url} -> ${urlObj.toString()}`);
+        urlObj.pathname = urlObj.pathname.replace(/\/+$/, '');
         return urlObj.toString();
     } catch (e) {
         console.error(`Invalid URL: ${url}`, e);
-        return url.endsWith('/') ? url.slice(0, -1) : url; // 默认去除末尾斜杠
+        return url.replace(/\/+$/, '');
     }
 }
 
@@ -93,15 +81,11 @@ function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): s
             .map(r => normalizeUrl(r.url))
             .sort((a, b) => b.length - a.length);
 
-        console.debug(`Removing registry prefix from tarball: ${normalizedTarball}`);
         for (const registry of normalizedRegistries) {
             if (normalizedTarball.startsWith(registry)) {
-                const result = normalizedTarball.slice(registry.length - 1) || '/';
-                console.debug(`Matched registry ${registry}, result: ${result}`);
-                return result;
+                return normalizedTarball.slice(registry.length) || '/';
             }
         }
-        console.debug(`No registry prefix matched for ${normalizedTarball}`);
     } catch (e) {
         console.error(`Invalid URL in removeRegistryPrefix: ${tarballUrl}`, e);
     }
@@ -110,14 +94,12 @@ function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): s
 
 async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promise<ProxyConfig> {
     const resolvedPath = resolvePath(proxyConfigPath);
-    console.debug(`Loading proxy config from: ${resolvedPath}`);
     try {
         const content = await readFile(resolvedPath, 'utf8');
         const config = load(content) as ProxyConfig;
         if (!config.registries) {
             throw new Error('Missing required "registries" field in config');
         }
-        console.debug('Loaded proxy config:', JSON.stringify(config, null, 2));
         return config;
     } catch (e) {
         console.error(`Failed to load proxy config from ${resolvedPath}:`, e);
@@ -126,12 +108,9 @@ async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promi
 }
 
 async function loadYarnConfig(path: string): Promise<YarnConfig> {
-    console.debug(`Loading Yarn config from: ${path}`);
     try {
         const content = await readFile(resolvePath(path), 'utf8');
-        const config = load(content) as YarnConfig;
-        console.debug(`Loaded Yarn config from ${path}:`, JSON.stringify(config, null, 2));
-        return config;
+        return load(content) as YarnConfig;
     } catch (e) {
         console.warn(`Failed to load Yarn config from ${path}:`, e);
         return {};
@@ -143,7 +122,6 @@ async function loadRegistries(
     localYarnConfigPath = './.yarnrc.yml',
     globalYarnConfigPath = join(homedir(), '.yarnrc.yml')
 ): Promise<RegistryInfo[]> {
-    console.debug('Loading registries...');
     const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
         loadProxyConfig(proxyConfigPath),
         loadYarnConfig(localYarnConfigPath),
@@ -162,16 +140,13 @@ async function loadRegistries(
                     config.npmRegistries?.[url];
                 if (registryConfig?.npmAuthToken) {
                     token = registryConfig.npmAuthToken;
-                    console.debug(`Found token for ${normalizedUrl} in Yarn config`);
                     break;
                 }
             }
         }
         registryMap.set(normalizedUrl, { url: normalizedUrl, token });
     }
-    const registries = Array.from(registryMap.values());
-    console.log('Loaded registries:', registries);
-    return registries;
+    return Array.from(registryMap.values());
 }
 
 export async function startProxyServer(
@@ -191,7 +166,6 @@ export async function startProxyServer(
     let proxyPort: number;
 
     const requestHandler = async (req: any, res: any) => {
-        console.debug(`Received request: ${req.method} ${req.url}`);
         if (!req.url || !req.headers.host) {
             console.error('Invalid request: missing URL or host header');
             res.writeHead(400).end('Invalid Request');
@@ -199,7 +173,6 @@ export async function startProxyServer(
         }
 
         const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
-        console.debug(`Full URL: ${fullUrl.toString()}`);
         if (basePath && !fullUrl.pathname.startsWith(basePath)) {
             console.error(`Path ${fullUrl.pathname} does not match basePath ${basePath}`);
             res.writeHead(404).end('Not Found');
@@ -212,20 +185,20 @@ export async function startProxyServer(
         console.log(`Proxying: ${relativePath}`);
 
         const fetchPromises = registries.map(async ({ url, token }) => {
-            await limiter.acquire(); // 获取并发许可
+            await limiter.acquire();
             try {
-                const cleanRelativePath = relativePath.replace(/\/+$/, '');
-                const targetUrl = `${url}${cleanRelativePath}${fullUrl.search || ''}`;
+                const cleanRelativePath = relativePath.replace(/^\/+|\/+$/g, '');
+                const targetUrl = `${url}/${cleanRelativePath}${fullUrl.search || ''}`.replace(/\/+/g, '/');
                 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 ${url}: ${response.status} ${response.statusText}`);
                 return response.ok ? response : null;
             } catch (e) {
                 console.error(`Failed to fetch from ${url}:`, e);
                 return null;
             } finally {
-                limiter.release(); // 释放并发许可
+                limiter.release();
             }
         });
 
@@ -243,20 +216,17 @@ export async function startProxyServer(
                 const data = await successResponse.json() as PackageData;
                 if (data.versions) {
                     const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePath}`;
-                    console.debug(`Rewriting tarball URLs with proxy base: ${proxyBase}`);
                     for (const version in data.versions) {
                         const dist = data.versions[version]?.dist;
                         if (dist?.tarball) {
                             const originalUrl = new URL(dist.tarball);
                             const tarballPath = removeRegistryPrefix(dist.tarball, registries);
                             dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
-                            console.debug(`Rewrote tarball: ${originalUrl} -> ${dist.tarball}`);
                         }
                     }
                 }
                 res.writeHead(200, { 'Content-Type': 'application/json' });
-                const jsonResponse = JSON.stringify(data);
-                res.end(jsonResponse);
+                res.end(JSON.stringify(data));
             } catch (e) {
                 console.error('Failed to parse JSON response:', e);
                 res.writeHead(502).end('Invalid Upstream Response');
@@ -267,9 +237,10 @@ export async function startProxyServer(
                 res.writeHead(502).end('Empty Response Body');
                 return;
             }
+            const contentLength = successResponse.headers.get('Content-Length');
             const safeHeaders = {
                 'Content-Type': successResponse.headers.get('Content-Type'),
-                'Content-Length': successResponse.headers.get('Content-Length'),
+                'Content-Length': contentLength && !isNaN(Number(contentLength)) ? contentLength : undefined,
             };
             res.writeHead(successResponse.status, safeHeaders);
             successResponse.body.pipe(res).on('error', (err:any) => {
@@ -313,7 +284,6 @@ export async function startProxyServer(
             const address = server.address() as AddressInfo;
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-            console.debug(`Writing port ${proxyPort} to file: ${portFile}`);
             writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
             console.log(`Proxy server running on ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePath}`);
             resolve(server);
@@ -323,7 +293,6 @@ export async function startProxyServer(
 
 if (import.meta.url === `file://${process.argv[1]}`) {
     const [,, configPath, localYarnPath, globalYarnPath, port] = process.argv;
-    console.log(`Starting server with args: configPath=${configPath}, localYarnPath=${localYarnPath}, globalYarnPath=${globalYarnPath}, port=${port}`);
     startProxyServer(
         configPath,
         localYarnPath,