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

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';
@@ -39,13 +39,21 @@ const limiter = new ConcurrencyLimiter(5); // 限制为 5 个并发请求
 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 = '';
         }
-        if (!urlObj.pathname.endsWith('/')) {
+        // 处理路径末尾斜杠
+        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()}`);
@@ -53,13 +61,11 @@ function normalizeUrl(url) {
     }
     catch (e) {
         console.error(`Invalid URL: ${url}`, e);
-        return url.endsWith('/') ? url : `${url}/`;
+        return url.endsWith('/') ? url.slice(0, -1) : url; // 默认去除末尾斜杠
     }
 }
 function resolvePath(path) {
-    const resolved = path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
-    console.debug(`Resolved path: ${path} -> ${resolved}`);
-    return resolved;
+    return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
 }
 function removeRegistryPrefix(tarballUrl, registries) {
     try {
@@ -176,7 +182,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
                 const response = await fetch(targetUrl, { headers });
                 console.log(`Response from ${url}: ${response.status} ${response.statusText}`);
-                console.debug(`Response headers from ${url}:`, Object.fromEntries(response.headers.entries()));
                 return response.ok ? response : null;
             }
             catch (e) {
@@ -195,7 +200,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             return;
         }
         const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
-        console.debug(`Content-Type: ${contentType}`);
         if (contentType.includes('application/json')) {
             try {
                 const data = await successResponse.json();
@@ -231,7 +235,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
                 'Content-Type': successResponse.headers.get('Content-Type'),
                 'Content-Length': successResponse.headers.get('Content-Length'),
             };
-            console.debug(`Streaming response with headers:`, safeHeaders);
             res.writeHead(successResponse.status, safeHeaders);
             successResponse.body.pipe(res).on('error', (err) => {
                 console.error(`Stream error for ${relativePath}:`, err);
@@ -244,7 +247,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         const { key, cert } = proxyConfig.https;
         const keyPath = resolvePath(key);
         const certPath = resolvePath(cert);
-        console.debug(`Loading HTTPS key: ${keyPath}, cert: ${certPath}`);
         try {
             await fsPromises.access(keyPath);
             await fsPromises.access(certPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.jimuwd.xian.registry-proxy",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "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 { 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';
+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';
 
 const { readFile, writeFile } = fsPromises;
 
@@ -59,26 +59,31 @@ const limiter = new ConcurrencyLimiter(5); // 限制为 5 个并发请求
 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 = '';
         }
-        if (!urlObj.pathname.endsWith('/')) {
+        // 处理路径末尾斜杠
+        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()}`);
         return urlObj.toString();
     } catch (e) {
         console.error(`Invalid URL: ${url}`, e);
-        return url.endsWith('/') ? url : `${url}/`;
+        return url.endsWith('/') ? url.slice(0, -1) : url; // 默认去除末尾斜杠
     }
 }
 
 function resolvePath(path: string): string {
-    const resolved = path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
-    console.debug(`Resolved path: ${path} -> ${resolved}`);
-    return resolved;
+    return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
 }
 
 function removeRegistryPrefix(tarballUrl: string, registries: RegistryInfo[]): string {
@@ -215,7 +220,6 @@ export async function startProxyServer(
                 const headers = token ? { Authorization: `Bearer ${token}` } : undefined;
                 const response = await fetch(targetUrl, { headers });
                 console.log(`Response from ${url}: ${response.status} ${response.statusText}`);
-                console.debug(`Response headers from ${url}:`, Object.fromEntries(response.headers.entries()));
                 return response.ok ? response : null;
             } catch (e) {
                 console.error(`Failed to fetch from ${url}:`, e);
@@ -234,7 +238,6 @@ export async function startProxyServer(
         }
 
         const contentType = successResponse.headers.get('Content-Type') || 'application/octet-stream';
-        console.debug(`Content-Type: ${contentType}`);
         if (contentType.includes('application/json')) {
             try {
                 const data = await successResponse.json() as PackageData;
@@ -268,7 +271,6 @@ export async function startProxyServer(
                 'Content-Type': successResponse.headers.get('Content-Type'),
                 'Content-Length': successResponse.headers.get('Content-Length'),
             };
-            console.debug(`Streaming response with headers:`, safeHeaders);
             res.writeHead(successResponse.status, safeHeaders);
             successResponse.body.pipe(res).on('error', (err:any) => {
                 console.error(`Stream error for ${relativePath}:`, err);
@@ -282,7 +284,6 @@ export async function startProxyServer(
         const { key, cert } = proxyConfig.https;
         const keyPath = resolvePath(key);
         const certPath = resolvePath(cert);
-        console.debug(`Loading HTTPS key: ${keyPath}, cert: ${certPath}`);
         try {
             await fsPromises.access(keyPath);
             await fsPromises.access(certPath);