com.jimuwd.xian.registry-proxy 1.0.53 → 1.0.55

package/dist/index.js

@@ -7,6 +7,7 @@ import fetch from 'node-fetch';
 import { homedir } from 'os';
 import { join, resolve } from 'path';
 import { URL } from 'url';
+import logger from "./utils/logger";
 const { readFile, writeFile } = fsPromises;
 class ConcurrencyLimiter {
     maxConcurrency;
@@ -84,13 +85,13 @@ async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
         const content = await readFile(resolvedPath, 'utf8');
         const config = load(content);
         if (!config.registries) {
-            console.error('Missing required "registries" field in config');
+            logger.error('Missing required "registries" field in config');
             process.exit(1);
         }
         return config;
     }
     catch (e) {
-        console.error(`Failed to load proxy config from ${resolvedPath}:`, e);
+        logger.error(`Failed to load proxy config from ${resolvedPath}:`, e);
         process.exit(1);
     }
 }
@@ -100,7 +101,7 @@ async function readYarnConfig(path) {
         return load(content);
     }
     catch (e) {
-        console.warn(`Failed to load Yarn config from ${path}:`, e);
+        logger.warn(`Failed to load Yarn config from ${path}:`, e);
         return {};
     }
 }
@@ -140,16 +141,16 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
 async function fetchFromRegistry(registry, targetUrl, limiter) {
     await limiter.acquire();
     try {
-        console.log(`Fetching from: ${targetUrl}`);
+        logger.info(`Fetching from: ${targetUrl}`);
         const headers = registry.token ? { Authorization: `Bearer ${registry.token}` } : {};
         headers.Collection = "keep-alive";
         const response = await fetch(targetUrl, { headers });
-        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText}`, { headers: [...response.headers] });
+        logger.info(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText} content-type=${response.headers.get('content-type')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
         return response.ok ? response : null;
     }
     catch (e) {
         if (e instanceof Error) {
-            console.error(e.code === 'ECONNREFUSED'
+            logger.error(e.code === 'ECONNREFUSED'
                 ? `Registry ${registry.normalizedRegistryUrl} unreachable [ECONNREFUSED]`
                 : `Error from ${registry.normalizedRegistryUrl}: ${e.message}`);
         }
@@ -200,7 +201,7 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
         else {
             // 二进制流处理
             if (!upstreamResponse.body) {
-                console.error(`Empty response body from ${targetUrl}`);
+                logger.error(`Empty response body from ${targetUrl}`);
                 res.writeHead(502).end('Empty Upstream Response');
             }
             else {
@@ -218,7 +219,7 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, upstreamRes
         }
     }
     catch (err) {
-        console.error('Failed to write upstreamResponse:', err);
+        logger.error('Failed to write upstreamResponse:', err);
         if (!res.headersSent) {
             res.writeHead(502).end('Internal Server Error');
         }
@@ -228,9 +229,9 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
     const registryInfos = proxyInfo.registries;
     const basePathPrefixedWithSlash = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
-    console.log('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
-    console.log('Proxy base path:', basePathPrefixedWithSlash);
-    console.log('HTTPS:', !!proxyInfo.https);
+    logger.info('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
+    logger.info('Proxy base path:', basePathPrefixedWithSlash);
+    logger.info('HTTPS:', !!proxyInfo.https);
     let proxyPort;
     const requestHandler = async (req, res) => {
         if (!req.url || !req.headers.host) {
@@ -279,7 +280,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             await fsPromises.access(certPath);
         }
         catch (e) {
-            console.error(`HTTPS config error: key or cert file not found`, e);
+            logger.error(`HTTPS config error: key or cert file not found`, e);
             process.exit(1);
         }
         const httpsOptions = {
@@ -294,18 +295,18 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     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.`);
+                logger.error(`Port ${port} is in use, please specify a different port or free it.`);
                 process.exit(1);
             }
-            console.error('Server error:', err);
+            logger.error('Server error:', err);
             reject(err);
         });
         server.listen(port, () => {
             const address = server.address();
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-            writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
-            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
+            writeFile(portFile, proxyPort.toString()).catch(e => logger.error('Failed to write port file:', e));
+            logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });
@@ -314,7 +315,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
 if (import.meta.url === `file://${process.argv[1]}`) {
     const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
     startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(err => {
-        console.error('Failed to start server:', err);
+        logger.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.53",
+  "version": "1.0.55",
   "type": "module",
   "description": "A lightweight npm registry proxy with fallback support",
   "main": "dist/index.js",

package/src/index.ts

@@ -8,6 +8,7 @@ import fetch, {Response} from 'node-fetch';
 import {homedir} from 'os';
 import {join, resolve} from 'path';
 import {URL} from 'url';
+import logger from "./utils/logger";
 
 const {readFile, writeFile} = fsPromises;
 
@@ -127,12 +128,12 @@ async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promi
         const content = await readFile(resolvedPath, 'utf8');
         const config = load(content) as ProxyConfig;
         if (!config.registries) {
-            console.error('Missing required "registries" field in config');
+            logger.error('Missing required "registries" field in config');
             process.exit(1);
         }
         return config;
     } catch (e) {
-        console.error(`Failed to load proxy config from ${resolvedPath}:`, e);
+        logger.error(`Failed to load proxy config from ${resolvedPath}:`, e);
         process.exit(1);
     }
 }
@@ -142,7 +143,7 @@ async function readYarnConfig(path: string): Promise<YarnConfig> {
         const content = await readFile(resolvePath(path), 'utf8');
         return load(content) as YarnConfig;
     } catch (e) {
-        console.warn(`Failed to load Yarn config from ${path}:`, e);
+        logger.warn(`Failed to load Yarn config from ${path}:`, e);
         return {};
     }
 }
@@ -192,15 +193,15 @@ async function fetchFromRegistry(
 ): Promise<Response | null> {
     await limiter.acquire();
     try {
-        console.log(`Fetching from: ${targetUrl}`);
+        logger.info(`Fetching from: ${targetUrl}`);
         const headers: {} = registry.token ? {Authorization: `Bearer ${registry.token}`} : {};
         (headers as any).Collection = "keep-alive";
         const response = await fetch(targetUrl, {headers});
-        console.log(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText}`, {headers: [...response.headers]});
+        logger.info(`Response from upstream ${targetUrl}: ${response.status} ${response.statusText} content-type=${response.headers.get('content-type')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}`);
         return response.ok ? response : null;
     } catch (e) {
         if (e instanceof Error) {
-            console.error(
+            logger.error(
                 (e as any).code === 'ECONNREFUSED'
                     ? `Registry ${registry.normalizedRegistryUrl} unreachable [ECONNREFUSED]`
                     : `Error from ${registry.normalizedRegistryUrl}: ${e.message}`
@@ -266,7 +267,7 @@ async function writeSuccessfulResponse(
         } else {
             // 二进制流处理
             if (!upstreamResponse.body) {
-                console.error(`Empty response body from ${targetUrl}`);
+                logger.error(`Empty response body from ${targetUrl}`);
                 res.writeHead(502).end('Empty Upstream Response');
             } else {
                 // write back to client
@@ -282,7 +283,7 @@ async function writeSuccessfulResponse(
             }
         }
     } catch (err) {
-        console.error('Failed to write upstreamResponse:', err);
+        logger.error('Failed to write upstreamResponse:', err);
         if (!res.headersSent) {
             res.writeHead(502).end('Internal Server Error');
         }
@@ -299,9 +300,9 @@ export async function startProxyServer(
     const registryInfos = proxyInfo.registries;
     const basePathPrefixedWithSlash: string = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
 
-    console.log('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
-    console.log('Proxy base path:', basePathPrefixedWithSlash);
-    console.log('HTTPS:', !!proxyInfo.https);
+    logger.info('Active registries:', registryInfos.map(r => r.normalizedRegistryUrl));
+    logger.info('Proxy base path:', basePathPrefixedWithSlash);
+    logger.info('HTTPS:', !!proxyInfo.https);
 
     let proxyPort: number;
 
@@ -354,7 +355,7 @@ export async function startProxyServer(
             await fsPromises.access(keyPath);
             await fsPromises.access(certPath);
         } catch (e) {
-            console.error(`HTTPS config error: key or cert file not found`, e);
+            logger.error(`HTTPS config error: key or cert file not found`, e);
             process.exit(1);
         }
         const httpsOptions = {
@@ -369,18 +370,18 @@ export async function startProxyServer(
     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.`);
+                logger.error(`Port ${port} is in use, please specify a different port or free it.`);
                 process.exit(1);
             }
-            console.error('Server error:', err);
+            logger.error('Server error:', err);
             reject(err);
         });
         server.listen(port, () => {
             const address = server.address() as AddressInfo;
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-            writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
-            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
+            writeFile(portFile, proxyPort.toString()).catch(e => logger.error('Failed to write port file:', e));
+            logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });
@@ -396,7 +397,7 @@ if (import.meta.url === `file://${process.argv[1]}`) {
         globalYarnPath,
         parseInt(port, 10) || 0
     ).catch(err => {
-        console.error('Failed to start server:', err);
+        logger.error('Failed to start server:', err);
         process.exit(1);
     });
 }

package/src/utils/logger.ts

@@ -0,0 +1,36 @@
+// utils/logger.ts
+const COLORS = {
+    reset: '\x1b[0m',
+    proxy: '\x1b[36m',     // 青色
+    success: '\x1b[32m',   // 绿色
+    error: '\x1b[31m',     // 红色
+    warn: '\x1b[33m',      // 黄色
+    debug: '\x1b[35m'      // 紫色
+};
+
+const PREFIX = {
+    proxy: `${COLORS.proxy}[PROXY]${COLORS.reset}`,
+    error: `${COLORS.error}[ERROR]${COLORS.reset}`,
+    warn: `${COLORS.warn}[WARN]${COLORS.reset}`,
+    debug: `${COLORS.debug}[DEBUG]${COLORS.reset}`
+};
+
+// 代理服务器专用日志
+const log = {
+    info: (...args: any[]) =>
+        console.log(`${PREFIX.proxy}`, ...args),
+
+    success: (...args: any[]) =>
+        console.log(`${PREFIX.proxy} ${COLORS.success}✓${COLORS.reset}`, ...args),
+
+    error: (...args: any[]) =>
+        console.error(`${PREFIX.error}`, ...args),
+
+    warn: (...args: any[]) =>
+        console.warn(`${PREFIX.warn}`, ...args),
+
+    debug: (...args: any[]) =>
+        process.env.DEBUG && console.debug(`${PREFIX.debug}`, ...args)
+};
+
+export default log;