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

package/dist/index.js

@@ -161,36 +161,78 @@ async function fetchFromRegistry(registry, path, search, limiter) {
         limiter.release();
     }
 }
+// 修改后的 writeResponse 函数
 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 || ''}`;
+    // 准备通用头信息
+    const safeHeaders = {
+        'content-type': contentType,
+        'connection': 'keep-alive'
+    };
+    // 复制所有可能需要的头信息
+    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;
+    });
+    try {
+        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.writeHead(200, safeHeaders);
+            res.end(JSON.stringify(data));
+        }
+        else {
+            // 二进制流处理
+            if (!response.body) {
+                console.error('Empty response body');
+                process.exit(1);
+            }
+            // 修复流类型转换问题
+            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;
+            }
+            res.writeHead(response.status, safeHeaders);
+            await pipeline(nodeStream, res);
         }
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify(data));
     }
-    else {
-        const safeHeaders = {
-            'content-type': contentType,
-            'connection': 'keep-alive',
-        };
-        ['cache-control', 'etag', 'last-modified', 'content-encoding'].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);
+    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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.jimuwd.xian.registry-proxy",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "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> = [];
 
@@ -215,6 +215,7 @@ async function fetchFromRegistry(
     }
 }
 
+// 修改后的 writeResponse 函数
 async function writeResponse(
     res: ServerResponse,
     response: Response,
@@ -225,38 +226,78 @@ async function writeResponse(
 ): 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 || ''}`;
+    // 准备通用头信息
+    const safeHeaders: OutgoingHttpHeaders = {
+        'content-type': contentType,
+        'connection': 'keep-alive'
+    };
+
+    // 复制所有可能需要的头信息
+    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;
+    });
+
+    try {
+        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.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify(data));
-    } else {
-        const safeHeaders: OutgoingHttpHeaders = {
-            'content-type': contentType,
-            'connection': 'keep-alive',
-        };
+            res.writeHead(200, safeHeaders);
+            res.end(JSON.stringify(data));
+        } else {
+            // 二进制流处理
+            if (!response.body) {
+                console.error('Empty response body');
+                process.exit(1);
+            }
 
-        ['cache-control', 'etag', 'last-modified', 'content-encoding'].forEach(header => {
-            const value = response.headers.get(header);
-            if (value) safeHeaders[header] = value;
-        });
+            // 修复流类型转换问题
+            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;
+            }
 
-        res.writeHead(response.status, safeHeaders);
-        await pipeline(
-            Readable.fromWeb(response.body as any),
-            res
-        );
+            res.writeHead(response.status, safeHeaders);
+            await pipeline(nodeStream, res);
+        }
+    } catch (err) {
+        console.error('Failed to write response:', err);
+        if (!res.headersSent) {
+            res.writeHead(502).end('Internal Server Error');
+        }
     }
 }