com.jimuwd.xian.registry-proxy 1.0.29 → 1.0.30

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { createServer } from 'http';
 import { createServer as createHttpsServer } from 'https';
-import { readFileSync, promises as fsPromises } from 'fs';
+import { promises as fsPromises, readFileSync } from 'fs';
 import { load } from 'js-yaml';
 import fetch from 'node-fetch';
 import { homedir } from 'os';
@@ -78,13 +78,14 @@ function removeRegistryPrefix(tarballUrl, registries) {
     }
     throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`);
 }
-async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
+async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
     const resolvedPath = resolvePath(proxyConfigPath);
     try {
         const content = await readFile(resolvedPath, 'utf8');
         const config = load(content);
         if (!config.registries) {
-            throw new Error('Missing required "registries" field in config');
+            console.error('Missing required "registries" field in config');
+            process.exit(1);
         }
         return config;
     }
@@ -93,7 +94,7 @@ async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
         process.exit(1);
     }
 }
-async function loadYarnConfig(path) {
+async function readYarnConfig(path) {
     try {
         const content = await readFile(resolvePath(path), 'utf8');
         return load(content);
@@ -103,11 +104,11 @@ async function loadYarnConfig(path) {
         return {};
     }
 }
-async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
+async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
     const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
-        loadProxyConfig(proxyConfigPath),
-        loadYarnConfig(localYarnConfigPath),
-        loadYarnConfig(globalYarnConfigPath)
+        readProxyConfig(proxyConfigPath),
+        readYarnConfig(localYarnConfigPath),
+        readYarnConfig(globalYarnConfigPath)
     ]);
     const registryMap = new Map();
     for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
@@ -126,15 +127,18 @@ async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYa
         }
         registryMap.set(normalizedUrl, { url: normalizedUrl, token });
     }
-    return Array.from(registryMap.values());
+    const registries = Array.from(registryMap.values());
+    const https = proxyConfig.https;
+    const basePath = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
+    return { registries, https, basePath };
 }
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
-    const proxyConfig = await loadProxyConfig(proxyConfigPath);
-    const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const basePathPrefixedWithSlash = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
+    const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
+    const registries = proxyInfo.registries;
+    const basePathPrefixedWithSlash = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
     console.log('Active registries:', registries.map(r => r.url));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
-    console.log('HTTPS:', !!proxyConfig.https);
+    console.log('HTTPS:', !!proxyInfo.https);
     let proxyPort;
     const requestHandler = async (req, res) => {
         if (!req.url || !req.headers.host) {
@@ -142,7 +146,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             res.writeHead(400).end('Invalid Request');
             return;
         }
-        const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
+        const fullUrl = new URL(req.url, `${proxyInfo.https ? 'https' : 'http'}://${req.headers.host}`);
         console.log(`Proxy server received request on ${fullUrl.toString()}`);
         if (!fullUrl.pathname.startsWith(basePathPrefixedWithSlash)) {
             console.error(`Path ${fullUrl.pathname} does not match basePath ${basePathPrefixedWithSlash}`);
@@ -184,7 +188,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 if (data.versions) {
                     const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
                     console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
-                    const proxyBaseUrlNoSuffixedWithSlash = `${proxyConfig.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
+                    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;
@@ -225,8 +229,8 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
     };
     let server;
-    if (proxyConfig.https) {
-        const { key, cert } = proxyConfig.https;
+    if (proxyInfo.https) {
+        const { key, cert } = proxyInfo.https;
         const keyPath = resolvePath(key);
         const certPath = resolvePath(cert);
         try {
@@ -260,7 +264,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             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 ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
+            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });

package/package.json

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

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import {createServer, Server as HttpServer, IncomingMessage, ServerResponse, OutgoingHttpHeaders} from 'http';
+import {createServer, IncomingMessage, OutgoingHttpHeaders, Server as HttpServer, ServerResponse} from 'http';
 import {createServer as createHttpsServer, Server as HttpsServer} from 'https';
-import {readFileSync, promises as fsPromises} from 'fs';
+import {promises as fsPromises, readFileSync} from 'fs';
 import {AddressInfo} from 'net';
 import {load} from 'js-yaml';
 import fetch, {Response} from 'node-fetch';
@@ -35,6 +35,12 @@ interface RegistryInfo {
     token?: string;
 }
 
+interface ProxyInfo {
+    registries: RegistryInfo[];
+    https?: HttpsConfig;
+    basePath?: string;
+}
+
 interface PackageVersion {
     dist?: { tarball?: string };
 }
@@ -115,13 +121,14 @@ function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): s
     throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`)
 }
 
-async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promise<ProxyConfig> {
+async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promise<ProxyConfig> {
     const resolvedPath = resolvePath(proxyConfigPath);
     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.error('Missing required "registries" field in config');
+            process.exit(1);
         }
         return config;
     } catch (e) {
@@ -130,7 +137,7 @@ async function loadProxyConfig(proxyConfigPath = './.registry-proxy.yml'): Promi
     }
 }
 
-async function loadYarnConfig(path: string): Promise<YarnConfig> {
+async function readYarnConfig(path: string): Promise<YarnConfig> {
     try {
         const content = await readFile(resolvePath(path), 'utf8');
         return load(content) as YarnConfig;
@@ -140,22 +147,20 @@ async function loadYarnConfig(path: string): Promise<YarnConfig> {
     }
 }
 
-async function loadRegistries(
+async function loadProxyInfo(
     proxyConfigPath = './.registry-proxy.yml',
     localYarnConfigPath = './.yarnrc.yml',
     globalYarnConfigPath = join(homedir(), '.yarnrc.yml')
-): Promise<RegistryInfo[]> {
+): Promise<ProxyInfo> {
     const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
-        loadProxyConfig(proxyConfigPath),
-        loadYarnConfig(localYarnConfigPath),
-        loadYarnConfig(globalYarnConfigPath)
+        readProxyConfig(proxyConfigPath),
+        readYarnConfig(localYarnConfigPath),
+        readYarnConfig(globalYarnConfigPath)
     ]);
-
     const registryMap = new Map<string, RegistryInfo>();
     for (const [url, regConfig] of Object.entries(proxyConfig.registries)) {
         const normalizedUrl = normalizeUrl(url);
         let token = regConfig?.npmAuthToken;
-
         if (!token) {
             const yarnConfigs = [localYarnConfig, globalYarnConfig];
             for (const config of yarnConfigs) {
@@ -169,7 +174,10 @@ async function loadRegistries(
         }
         registryMap.set(normalizedUrl, {url: normalizedUrl, token});
     }
-    return Array.from(registryMap.values());
+    const registries = Array.from(registryMap.values());
+    const https = proxyConfig.https;
+    const basePath = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
+    return {registries, https, basePath};
 }
 
 export async function startProxyServer(
@@ -178,13 +186,13 @@ export async function startProxyServer(
     globalYarnConfigPath?: string,
     port: number = 0
 ): Promise<HttpServer | HttpsServer> {
-    const proxyConfig = await loadProxyConfig(proxyConfigPath);
-    const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const basePathPrefixedWithSlash: string = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
+    const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
+    const registries = proxyInfo.registries;
+    const basePathPrefixedWithSlash: string = removeEndingSlashAndForceStartingSlash(proxyInfo.basePath);
 
     console.log('Active registries:', registries.map(r => r.url));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
-    console.log('HTTPS:', !!proxyConfig.https);
+    console.log('HTTPS:', !!proxyInfo.https);
 
     let proxyPort: number;
 
@@ -195,7 +203,7 @@ export async function startProxyServer(
             return;
         }
 
-        const fullUrl = new URL(req.url, `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host}`);
+        const fullUrl = new URL(req.url, `${proxyInfo.https ? 'https' : 'http'}://${req.headers.host}`);
         console.log(`Proxy server received request on ${fullUrl.toString()}`)
         if (!fullUrl.pathname.startsWith(basePathPrefixedWithSlash)) {
             console.error(`Path ${fullUrl.pathname} does not match basePath ${basePathPrefixedWithSlash}`);
@@ -239,7 +247,7 @@ export async function startProxyServer(
                 if (data.versions) {
                     const requestHeadersHostFromYarnClient = req.headers.host || 'localhost:' + proxyPort;
                     console.log("Request headers.host from yarn client is", requestHeadersHostFromYarnClient);
-                    const proxyBaseUrlNoSuffixedWithSlash = `${proxyConfig.https ? 'https' : 'http'}://${requestHeadersHostFromYarnClient}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`;
+                    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;
@@ -277,8 +285,8 @@ export async function startProxyServer(
     };
 
     let server: HttpServer | HttpsServer;
-    if (proxyConfig.https) {
-        const {key, cert} = proxyConfig.https;
+    if (proxyInfo.https) {
+        const {key, cert} = proxyInfo.https;
         const keyPath = resolvePath(key);
         const certPath = resolvePath(cert);
         try {
@@ -311,7 +319,7 @@ export async function startProxyServer(
             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 ${proxyConfig.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
+            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });