com.jimuwd.xian.registry-proxy 1.0.125 → 1.0.126

package/dist/index.js

@@ -11,7 +11,7 @@ import logger from "./utils/logger.js";
 import ConcurrencyLimiter from "./utils/ConcurrencyLimiter.js";
 import { gracefulShutdown } from "./gracefullShutdown.js";
 import { writePortFile } from "./port.js";
-const { readFile, writeFile } = fsPromises;
+const { readFile } = fsPromises;
 const limiter = new ConcurrencyLimiter(Infinity);
 function removeEndingSlashAndForceStartingSlash(str) {
     if (!str)
@@ -165,12 +165,12 @@ async function writeResponseToDownstreamClient(registryInfo, targetUrl, resToDow
     if (!upstreamResponse.ok)
         throw new Error("Only 2xx upstream response is supported");
     try {
-        const contentType = upstreamResponse.headers.get("content-type") /*|| "application/octet-stream"*/;
+        const contentType = upstreamResponse.headers.get("content-type");
         if (!contentType) {
             logger.error(`Response from upstream content-type header is absent, ${targetUrl} `);
-            process.exit(1);
+            await gracefulShutdown();
         }
-        if (contentType.includes('application/json')) { // JSON 处理逻辑
+        else if (contentType.includes('application/json')) { // JSON 处理逻辑
             const data = await upstreamResponse.json();
             if (data.versions) { // 处理node依赖包元数据
                 logger.info("Write package meta data application/json response from upstream to downstream", targetUrl);
@@ -371,7 +371,7 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         }
         catch (e) {
             logger.error(`HTTPS config error: key or cert file not found`, e);
-            process.exit(1);
+            await gracefulShutdown();
         }
         const httpsOptions = {
             key: readFileSync(keyPath),
@@ -392,10 +392,10 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     logger.info(`Proxy server's initial timeout is ${server.timeout}ms, adjusting to ${serverTimeoutMs}ms`);
     server.timeout = serverTimeoutMs;
     const promisedServer = new Promise((resolve, reject) => {
-        const errHandler = (err) => {
+        const errHandler = async (err) => {
             if (err.code === 'EADDRINUSE') {
                 logger.error(`Port ${port} is in use, please specify a different port or free it.`, err);
-                process.exit(1);
+                await gracefulShutdown();
             }
             logger.error('Server error:', err);
             reject(err);
@@ -421,14 +421,9 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
     return promisedServer;
 }
 if (import.meta.url === `file://${process.argv[1]}`) {
-    // 确保进程捕获异常
-    process.on('uncaughtException', (err) => {
-        logger.error('Fatal error:', err);
-        process.exit(1);
-    });
     const [, , configPath, localYarnPath, globalYarnPath, port] = process.argv;
-    startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(err => {
+    startProxyServer(configPath, localYarnPath, globalYarnPath, parseInt(port, 10) || 0).catch(async (err) => {
         logger.error('Failed to start server:', err);
-        process.exit(1);
+        await gracefulShutdown();
     });
 }

package/package.json

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