com.jimuwd.xian.registry-proxy 1.0.35 → 1.0.37

package/dist/index.js

@@ -139,10 +139,9 @@ async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYar
     const basePath = removeEndingSlashAndForceStartingSlash(proxyConfig.basePath);
     return { registries, https, basePath };
 }
-async function fetchFromRegistry(registry, path, search, limiter) {
+async function fetchFromRegistry(registry, targetUrl, limiter) {
     await limiter.acquire();
     try {
-        const targetUrl = `${registry.normalizedRegistryUrl}${path}${search || ''}`;
         console.log(`Fetching from: ${targetUrl}`);
         const headers = registry.token ? { Authorization: `Bearer ${registry.token}` } : undefined;
         const response = await fetch(targetUrl, { headers });
@@ -161,36 +160,79 @@ async function fetchFromRegistry(registry, path, search, limiter) {
         limiter.release();
     }
 }
-async function writeResponse(res, response, req, proxyInfo, proxyPort, registryInfos) {
-    const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
-    if (contentType.includes('application/json')) {
-        const data = await response.json();
-        if (data.versions) {
-            const host = req.headers.host || `localhost:${proxyPort}`;
-            const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
-            for (const version in data.versions) {
-                const tarball = data.versions[version]?.dist?.tarball;
-                if (tarball) {
-                    const path = removeRegistryPrefix(tarball, registryInfos);
-                    data.versions[version].dist.tarball = `${baseUrl}${path}${new URL(tarball).search || ''}`;
-                }
-            }
-        }
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify(data));
-    }
-    else {
+// 修改后的 writeSuccessfulResponse 函数
+async function writeSuccessfulResponse(registryInfo, targetUrl, res, response, req, proxyInfo, proxyPort, registryInfos) {
+    if (!response.ok)
+        throw new Error("Only 2xx response is supported");
+    try {
+        const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+        // 准备通用头信息
         const safeHeaders = {
             'content-type': contentType,
-            'connection': 'keep-alive',
+            'connection': 'keep-alive'
         };
-        ['cache-control', 'etag', 'last-modified', 'content-encoding'].forEach(header => {
+        // 复制所有可能需要的头信息
+        const headersToCopy = [
+            'cache-control', 'etag', 'last-modified',
+            'content-encoding', 'content-length'
+        ];
+        headersToCopy.forEach(header => {
             const value = response.headers.get(header);
             if (value)
                 safeHeaders[header] = value;
         });
         res.writeHead(response.status, safeHeaders);
-        await pipeline(Readable.fromWeb(response.body), res);
+        if (contentType.includes('application/json')) {
+            // JSON 处理逻辑
+            const data = await response.json();
+            if (data.versions) {
+                const host = req.headers.host || `localhost:${proxyPort}`;
+                const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
+                for (const version in data.versions) {
+                    const tarball = data.versions[version]?.dist?.tarball;
+                    if (tarball) {
+                        const path = removeRegistryPrefix(tarball, registryInfos);
+                        data.versions[version].dist.tarball = `${baseUrl}${path}${new URL(tarball).search || ''}`;
+                    }
+                }
+            }
+            res.end(JSON.stringify(data));
+        }
+        else {
+            // 二进制流处理
+            if (!response.body) {
+                console.error(`Empty response body from ${targetUrl}`);
+            }
+            else {
+                let nodeStream;
+                if (typeof Readable.fromWeb === 'function') {
+                    // Node.js 17+ 标准方式
+                    nodeStream = Readable.fromWeb(response.body);
+                }
+                else {
+                    // Node.js 16 及以下版本的兼容方案
+                    const { PassThrough } = await import('stream');
+                    const passThrough = new PassThrough();
+                    const reader = response.body.getReader();
+                    const pump = async () => {
+                        const { done, value } = await reader.read();
+                        if (done)
+                            return passThrough.end();
+                        passThrough.write(value);
+                        await pump();
+                    };
+                    pump().catch(err => passThrough.destroy(err));
+                    nodeStream = passThrough;
+                }
+                await pipeline(nodeStream, res);
+            }
+        }
+    }
+    catch (err) {
+        console.error('Failed to write response:', err);
+        if (!res.headersSent) {
+            res.writeHead(502).end('Internal Server Error');
+        }
     }
 }
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
@@ -216,10 +258,15 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             : fullUrl.pathname.slice(basePathPrefixedWithSlash.length);
         // 顺序尝试注册表，获取第一个成功响应
         let successfulResponse = null;
+        let targetRegistry = null;
+        let targetUrl = null;
         for (const registry of registryInfos) {
             if (req.destroyed)
                 break;
-            const response = await fetchFromRegistry(registry, path, fullUrl.search, limiter);
+            targetRegistry = registry;
+            const search = fullUrl.search || '';
+            targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
+            const response = await fetchFromRegistry(registry, targetUrl, limiter);
             if (response) {
                 successfulResponse = response;
                 break;
@@ -227,7 +274,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
         // 统一回写响应
         if (successfulResponse) {
-            await writeResponse(res, successfulResponse, req, proxyInfo, proxyPort, registryInfos);
+            await writeSuccessfulResponse(targetRegistry, targetUrl, res, successfulResponse, req, proxyInfo, proxyPort, registryInfos);
         }
         else {
             res.writeHead(404).end('All upstream registries failed');

package/package.json

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

package/src/index.ts

@@ -52,7 +52,7 @@ interface PackageData {
 }
 
 class ConcurrencyLimiter {
-    private maxConcurrency: number;
+    private readonly maxConcurrency: number;
     private current: number = 0;
     private queue: Array<() => void> = [];
 
@@ -189,16 +189,14 @@ async function loadProxyInfo(
 
 async function fetchFromRegistry(
     registry: RegistryInfo,
-    path: string,
-    search: string,
+    targetUrl: string,
     limiter: ConcurrencyLimiter
 ): Promise<Response | null> {
     await limiter.acquire();
     try {
-        const targetUrl = `${registry.normalizedRegistryUrl}${path}${search || ''}`;
         console.log(`Fetching from: ${targetUrl}`);
-        const headers = registry.token ? { Authorization: `Bearer ${registry.token}` } : undefined;
-        const response = await fetch(targetUrl, { headers });
+        const headers = registry.token ? {Authorization: `Bearer ${registry.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,7 +213,10 @@ async function fetchFromRegistry(
     }
 }
 
-async function writeResponse(
+// 修改后的 writeSuccessfulResponse 函数
+async function writeSuccessfulResponse(
+    registryInfo: RegistryInfo,
+    targetUrl: string,
     res: ServerResponse,
     response: Response,
     req: IncomingMessage,
@@ -223,40 +224,82 @@ async function writeResponse(
     proxyPort: number,
     registryInfos: RegistryInfo[]
 ): Promise<void> {
-    const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
-
-    if (contentType.includes('application/json')) {
-        const data = await response.json() as PackageData;
-        if (data.versions) {
-            const host = req.headers.host || `localhost:${proxyPort}`;
-            const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
-
-            for (const version in data.versions) {
-                const tarball = data.versions[version]?.dist?.tarball;
-                if (tarball) {
-                    const path = removeRegistryPrefix(tarball, registryInfos);
-                    data.versions[version]!.dist!.tarball = `${baseUrl}${path}${new URL(tarball).search || ''}`;
-                }
-            }
-        }
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify(data));
-    } else {
+
+    if (!response.ok) throw new Error("Only 2xx response is supported");
+
+    try {
+        const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+
+        // 准备通用头信息
         const safeHeaders: OutgoingHttpHeaders = {
             'content-type': contentType,
-            'connection': 'keep-alive',
+            'connection': 'keep-alive'
         };
 
-        ['cache-control', 'etag', 'last-modified', 'content-encoding'].forEach(header => {
+        // 复制所有可能需要的头信息
+        const headersToCopy = [
+            'cache-control', 'etag', 'last-modified',
+            'content-encoding', 'content-length'
+        ];
+
+        headersToCopy.forEach(header => {
             const value = response.headers.get(header);
             if (value) safeHeaders[header] = value;
         });
 
+
         res.writeHead(response.status, safeHeaders);
-        await pipeline(
-            Readable.fromWeb(response.body as any),
-            res
-        );
+
+        if (contentType.includes('application/json')) {
+            // JSON 处理逻辑
+            const data = await response.json() as PackageData;
+            if (data.versions) {
+                const host = req.headers.host || `localhost:${proxyPort}`;
+                const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
+
+                for (const version in data.versions) {
+                    const tarball = data.versions[version]?.dist?.tarball;
+                    if (tarball) {
+                        const path = removeRegistryPrefix(tarball, registryInfos);
+                        data.versions[version]!.dist!.tarball = `${baseUrl}${path}${new URL(tarball).search || ''}`;
+                    }
+                }
+            }
+            res.end(JSON.stringify(data));
+        } else {
+            // 二进制流处理
+            if (!response.body) {
+                console.error(`Empty response body from ${targetUrl}`);
+            } else {
+                let nodeStream: NodeJS.ReadableStream;
+                if (typeof Readable.fromWeb === 'function') {
+                    // Node.js 17+ 标准方式
+                    nodeStream = Readable.fromWeb(response.body as any);
+                } else {
+                    // Node.js 16 及以下版本的兼容方案
+                    const {PassThrough} = await import('stream');
+                    const passThrough = new PassThrough();
+                    const reader = (response.body as any).getReader();
+
+                    const pump = async () => {
+                        const {done, value} = await reader.read();
+                        if (done) return passThrough.end();
+                        passThrough.write(value);
+                        await pump();
+                    };
+
+                    pump().catch(err => passThrough.destroy(err));
+                    nodeStream = passThrough;
+                }
+
+                await pipeline(nodeStream, res);
+            }
+        }
+    } catch (err) {
+        console.error('Failed to write response:', err);
+        if (!res.headersSent) {
+            res.writeHead(502).end('Internal Server Error');
+        }
     }
 }
 
@@ -294,16 +337,14 @@ export async function startProxyServer(
 
         // 顺序尝试注册表，获取第一个成功响应
         let successfulResponse: Response | null = null;
+        let targetRegistry: RegistryInfo | null = null;
+        let targetUrl: string | null = null;
         for (const registry of registryInfos) {
             if (req.destroyed) break;
-
-            const response = await fetchFromRegistry(
-                registry,
-                path,
-                fullUrl.search,
-                limiter
-            );
-
+            targetRegistry = registry;
+            const search = fullUrl.search || '';
+            targetUrl = `${registry.normalizedRegistryUrl}${path}${search}`;
+            const response = await fetchFromRegistry(registry, targetUrl, limiter);
             if (response) {
                 successfulResponse = response;
                 break;
@@ -312,7 +353,7 @@ export async function startProxyServer(
 
         // 统一回写响应
         if (successfulResponse) {
-            await writeResponse(res, successfulResponse, req, proxyInfo, proxyPort, registryInfos);
+            await writeSuccessfulResponse(targetRegistry!, targetUrl!, res, successfulResponse, req, proxyInfo, proxyPort, registryInfos);
         } else {
             res.writeHead(404).end('All upstream registries failed');
         }