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

package/dist/index.js

@@ -165,7 +165,9 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, response, r
     if (!response.ok)
         throw new Error("Only 2xx response is supported");
     try {
-        const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+        const upstreamContentType = response.headers.get('Content-Type');
+        console.log("Upstream Content-Type", upstreamContentType);
+        const contentType = upstreamContentType || 'application/octet-stream';
         // 准备通用头信息
         const safeHeaders = {
             'content-type': contentType,
@@ -192,7 +194,8 @@ async function writeSuccessfulResponse(registryInfo, targetUrl, res, response, r
                     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 proxiedTarballUrl = `${baseUrl}${path}${new URL(tarball).search || ''}`;
+                        data.versions[version].dist.tarball = proxiedTarballUrl;
                     }
                 }
             }
@@ -316,7 +319,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
             writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
-            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
+            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });

package/package.json

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

package/src/index.ts

@@ -228,7 +228,9 @@ async function writeSuccessfulResponse(
     if (!response.ok) throw new Error("Only 2xx response is supported");
 
     try {
-        const contentType = response.headers.get('Content-Type') || 'application/octet-stream';
+        const upstreamContentType = response.headers.get('Content-Type');
+        console.log("Upstream Content-Type", upstreamContentType);
+        const contentType = upstreamContentType || 'application/octet-stream';
 
         // 准备通用头信息
         const safeHeaders: OutgoingHttpHeaders = {
@@ -261,7 +263,8 @@ async function writeSuccessfulResponse(
                     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 proxiedTarballUrl: string = `${baseUrl}${path}${new URL(tarball).search || ''}`;
+                        data.versions[version]!.dist!.tarball = proxiedTarballUrl as string;
                     }
                 }
             }
@@ -394,7 +397,7 @@ export async function startProxyServer(
             proxyPort = address.port;
             const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
             writeFile(portFile, proxyPort.toString()).catch(e => console.error('Failed to write port file:', e));
-            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash}`);
+            console.log(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${proxyPort}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
     });