com.jimuwd.xian.registry-proxy 1.0.22 → 1.0.24

package/dist/index.js

@@ -176,13 +176,19 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             try {
                 const data = await successResponse.json();
                 if (data.versions) {
-                    const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePathPrefixedWithSlash}`;
+                    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}`;
+                    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 tarballPath = removeRegistryPrefix(dist.tarball, registries);
-                            dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
+                            const originalSearchParamsStr = originalUrl.search || '';
+                            const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
+                            dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
+                            console.log("tarballPathPrefixedWithSlash", tarballPathPrefixedWithSlash);
+                            console.log("dist.tarballUrl", dist.tarball);
                         }
                     }
                 }
@@ -202,7 +208,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             }
             const contentLength = successResponse.headers.get('Content-Length');
             const safeHeaders = {
-                'Content-Type': successResponse.headers.get('Content-Type'),
+                'Content-Type': successResponse.headers.get('Content-Type') || undefined,
                 'Content-Length': contentLength && !isNaN(Number(contentLength)) ? contentLength : undefined,
             };
             res.writeHead(successResponse.status, safeHeaders);

package/package.json

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

package/src/index.ts

@@ -1,27 +1,47 @@
 #!/usr/bin/env node
-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;
-
-interface RegistryConfig { npmAuthToken?: string; }
-interface HttpsConfig { key: string; cert: string; }
+import {createServer, Server as HttpServer, IncomingMessage, ServerResponse, OutgoingHttpHeaders} 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;
+
+interface RegistryConfig {
+    npmAuthToken?: string;
+}
+
+interface HttpsConfig {
+    key: string;
+    cert: string;
+}
+
 interface ProxyConfig {
     registries: Record<string, RegistryConfig | null>;
     https?: HttpsConfig;
     basePath?: string;
 }
-interface YarnConfig { npmRegistries?: Record<string, RegistryConfig | null>; }
-interface RegistryInfo { url: string; token?: string; }
-interface PackageVersion { dist?: { tarball?: string }; }
-interface PackageData { versions?: Record<string, PackageVersion>; }
+
+interface YarnConfig {
+    npmRegistries?: Record<string, RegistryConfig | null>;
+}
+
+interface RegistryInfo {
+    url: string;
+    token?: string;
+}
+
+interface PackageVersion {
+    dist?: { tarball?: string };
+}
+
+interface PackageData {
+    versions?: Record<string, PackageVersion>;
+}
 
 class ConcurrencyLimiter {
     private maxConcurrency: number;
@@ -144,7 +164,7 @@ async function loadRegistries(
                 }
             }
         }
-        registryMap.set(normalizedUrl, { url: normalizedUrl, token });
+        registryMap.set(normalizedUrl, {url: normalizedUrl, token});
     }
     return Array.from(registryMap.values());
 }
@@ -165,7 +185,7 @@ export async function startProxyServer(
 
     let proxyPort: number;
 
-    const requestHandler = async (req: any, res: any) => {
+    const requestHandler = async (req: IncomingMessage, res: ServerResponse) => {
         if (!req.url || !req.headers.host) {
             console.error('Invalid request: missing URL or host header');
             res.writeHead(400).end('Invalid Request');
@@ -184,14 +204,14 @@ export async function startProxyServer(
             : fullUrl.pathname;
         console.log(`Proxying: ${relativePathPrefixedWithSlash}`);
 
-        const fetchPromises = registries.map(async ({ url, token }) => {
+        const fetchPromises = registries.map(async ({url, token}) => {
             await limiter.acquire();
             try {
                 const cleanRelativePath = relativePathPrefixedWithSlash.replace(/^\/+|\/+$/g, '');
                 const targetUrl = `${url}/${cleanRelativePath}${fullUrl.search || ''}`;
                 console.log(`Fetching from: ${targetUrl}`);
-                const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
-                const response = await fetch(targetUrl, { headers, });
+                const headers = token ? {Authorization: `Bearer ${token}`} : undefined;
+                const response = await fetch(targetUrl, {headers,});
                 console.log(`Response from ${targetUrl}: ${response.status} ${response.statusText}`);
                 return response.ok ? response : null;
             } catch (e) {
@@ -215,17 +235,23 @@ export async function startProxyServer(
             try {
                 const data = await successResponse.json() as PackageData;
                 if (data.versions) {
-                    const proxyBase = `${proxyConfig.https ? 'https' : 'http'}://${req.headers.host || 'localhost:' + proxyPort}${basePathPrefixedWithSlash}`;
+                    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}`;
+                    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 tarballPath = removeRegistryPrefix(dist.tarball, registries);
-                            dist.tarball = `${proxyBase}${tarballPath}${originalUrl.search || ''}`;
+                            const originalSearchParamsStr = originalUrl.search || '';
+                            const tarballPathPrefixedWithSlash = removeRegistryPrefix(dist.tarball, registries);
+                            dist.tarball = `${proxyBaseUrlNoSuffixedWithSlash}${tarballPathPrefixedWithSlash}${originalSearchParamsStr}`;
+                            console.log("tarballPathPrefixedWithSlash",tarballPathPrefixedWithSlash);
+                            console.log("dist.tarballUrl",dist.tarball);
                         }
                     }
                 }
-                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.writeHead(200, {'Content-Type': 'application/json'});
                 res.end(JSON.stringify(data));
             } catch (e) {
                 console.error('Failed to parse JSON response:', e);
@@ -238,12 +264,12 @@ export async function startProxyServer(
                 return;
             }
             const contentLength = successResponse.headers.get('Content-Length');
-            const safeHeaders = {
-                'Content-Type': successResponse.headers.get('Content-Type'),
+            const safeHeaders: OutgoingHttpHeaders = {
+                'Content-Type': successResponse.headers.get('Content-Type') || undefined,
                 'Content-Length': contentLength && !isNaN(Number(contentLength)) ? contentLength : undefined,
             };
             res.writeHead(successResponse.status, safeHeaders);
-            successResponse.body.pipe(res).on('error', (err:any) => {
+            successResponse.body.pipe(res).on('error', (err: any) => {
                 console.error(`Stream error for ${relativePathPrefixedWithSlash}:`, err);
                 res.writeHead(502).end('Stream Error');
             });
@@ -252,7 +278,7 @@ export async function startProxyServer(
 
     let server: HttpServer | HttpsServer;
     if (proxyConfig.https) {
-        const { key, cert } = proxyConfig.https;
+        const {key, cert} = proxyConfig.https;
         const keyPath = resolvePath(key);
         const certPath = resolvePath(cert);
         try {
@@ -292,7 +318,7 @@ export async function startProxyServer(
 }
 
 if (import.meta.url === `file://${process.argv[1]}`) {
-    const [,, configPath, localYarnPath, globalYarnPath, port] = process.argv;
+    const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
     startProxyServer(
         configPath,
         localYarnPath,