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

package/dist/index.js

@@ -131,7 +131,7 @@ async function loadRegistries(proxyConfigPath = './.registry-proxy.yml', localYa
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
     const proxyConfig = await loadProxyConfig(proxyConfigPath);
     const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const basePathPrefixedWithSlash = proxyConfig.basePath ? `/${proxyConfig.basePath.replace(/^\/|\/$/g, '')}` : '/';
+    const basePathPrefixedWithSlash = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
     console.log('Active registries:', registries.map(r => r.url));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
     console.log('HTTPS:', !!proxyConfig.https);
@@ -143,14 +143,13 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             return;
         }
         const fullUrl = new URL(req.url, `${proxyConfig.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}`);
             res.writeHead(404).end('Not Found');
             return;
         }
-        const relativePathPrefixedWithSlash = basePathPrefixedWithSlash
-            ? fullUrl.pathname.slice(basePathPrefixedWithSlash.length)
-            : fullUrl.pathname;
+        const relativePathPrefixedWithSlash = basePathPrefixedWithSlash === '/' ? fullUrl.pathname : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
         console.log(`Proxying: ${relativePathPrefixedWithSlash}`);
         const fetchPromises = registries.map(async ({ url, token }) => {
             await limiter.acquire();

package/package.json

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

package/src/index.ts

@@ -74,7 +74,7 @@ class ConcurrencyLimiter {
 
 const limiter = new ConcurrencyLimiter(3);
 
-function removeEndingSlashAndForceStartingSlash(str: string): string {
+function removeEndingSlashAndForceStartingSlash(str: string | undefined | null): string {
     if (!str) return '/';
     let trimmed = str.trim();
     if (trimmed === '/') return '/';
@@ -180,7 +180,7 @@ export async function startProxyServer(
 ): Promise<HttpServer | HttpsServer> {
     const proxyConfig = await loadProxyConfig(proxyConfigPath);
     const registries = await loadRegistries(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
-    const basePathPrefixedWithSlash: string = proxyConfig.basePath ? `/${proxyConfig.basePath.replace(/^\/|\/$/g, '')}` : '/';
+    const basePathPrefixedWithSlash: string = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
 
     console.log('Active registries:', registries.map(r => r.url));
     console.log('Proxy base path:', basePathPrefixedWithSlash);
@@ -196,15 +196,14 @@ export async function startProxyServer(
         }
 
         const fullUrl = new URL(req.url, `${proxyConfig.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}`);
             res.writeHead(404).end('Not Found');
             return;
         }
 
-        const relativePathPrefixedWithSlash = basePathPrefixedWithSlash
-            ? fullUrl.pathname.slice(basePathPrefixedWithSlash.length)
-            : fullUrl.pathname;
+        const relativePathPrefixedWithSlash = basePathPrefixedWithSlash === '/' ? fullUrl.pathname : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
         console.log(`Proxying: ${relativePathPrefixedWithSlash}`);
 
         const fetchPromises = registries.map(async ({url, token}) => {