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

package/dist/gracefullShutdown.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 优雅退出
+ * 本函数是对process.exit的封装，同时执行资源释放动作，程序必须统一调用本方法退出，决不允许直接调用{@link process.exit}来退出。
+ */
+export declare function gracefulShutdown(): Promise<void>;

package/dist/gracefullShutdown.js

@@ -0,0 +1,34 @@
+import { deletePortFile } from "./port.js";
+import logger from "./utils/logger.js";
+/**
+ * 优雅退出
+ * 本函数是对process.exit的封装，同时执行资源释放动作，程序必须统一调用本方法退出，决不允许直接调用{@link process.exit}来退出。
+ */
+export async function gracefulShutdown() {
+    try {
+        logger.info('Shutdown...');
+        await doCleanup();
+        logger.info('Shutdown completed.');
+        process.exit(0);
+    }
+    catch (err) {
+        logger.error('Failed to clean:', err);
+        process.exit(1);
+    }
+}
+async function doCleanup() {
+    await deletePortFile();
+}
+// 捕获信号或异常
+process.on('SIGINT', () => {
+    logger.info('收到 SIGINT（Ctrl+C）');
+    process.exit(0); // 触发 exit 事件
+});
+process.on('SIGTERM', () => {
+    logger.info('收到 SIGTERM');
+    process.exit(0); // 触发 exit 事件
+});
+process.on('uncaughtException', (err) => {
+    logger.info('uncaughtException:', err);
+    process.exit(1); // 触发 exit 事件
+});

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import http, { createServer } from 'node:http';
 import https, { createServer as createHttpsServer } from 'node:https';
-import { promises as fsPromises, readFileSync } from 'fs';
+import { promises as fsPromises, readFileSync } from 'node:fs';
 import { load } from 'js-yaml';
 import fetch from 'node-fetch';
 import { homedir } from 'os';
@@ -9,7 +9,9 @@ import { join, resolve } from 'path';
 import { URL } from 'url';
 import logger from "./utils/logger.js";
 import ConcurrencyLimiter from "./utils/ConcurrencyLimiter.js";
-const { readFile, writeFile } = fsPromises;
+import { gracefulShutdown } from "./gracefullShutdown.js";
+import { writePortFile } from "./port.js";
+const { readFile } = fsPromises;
 const limiter = new ConcurrencyLimiter(Infinity);
 function removeEndingSlashAndForceStartingSlash(str) {
     if (!str)
@@ -56,20 +58,21 @@ function removeRegistryPrefix(tarballUrl, registries) {
     throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`);
 }
 async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
+    let config = undefined;
     const resolvedPath = resolvePath(proxyConfigPath);
     try {
         const content = await readFile(resolvedPath, 'utf8');
-        const config = load(content);
-        if (!config.registries) {
-            logger.error('Missing required "registries" field in config');
-            process.exit(1);
-        }
-        return config;
+        config = load(content);
     }
     catch (e) {
         logger.error(`Failed to load proxy config from ${resolvedPath}:`, e);
-        process.exit(1);
+        await gracefulShutdown();
+    }
+    if (!config?.registries) {
+        logger.error('Missing required "registries" field in config');
+        await gracefulShutdown();
     }
+    return config;
 }
 async function readYarnConfig(path) {
     try {
@@ -162,16 +165,16 @@ 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);
-                const host = reqFromDownstreamClient.headers.host || `127.0.0.1:${proxyPort}`;
+                const host = reqFromDownstreamClient.headers.host /*|| `[::1]:${proxyPort}`*/;
                 const baseUrl = `${proxyInfo.https ? 'https' : 'http'}://${host}${proxyInfo.basePath === '/' ? '' : proxyInfo.basePath}`;
                 for (const versionKey in data.versions) {
                     const packageVersion = data.versions[versionKey];
@@ -299,7 +302,6 @@ function getDownstreamClientIp(req) {
     // 直接连接时，取 socket.remoteAddress
     return req.socket.remoteAddress;
 }
-// deprecated 出于安全考虑只监听::1地址，废弃本注释：同时启动ipv6,ipv4监听，比如当客户端访问http://localhost:port时，无论客户端DNS解析到IPV4-127.0.0.1还是IPV6-::1地址，咱server都能轻松应对！
 export async function startProxyServer(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath, port = 0) {
     const proxyInfo = await loadProxyInfo(proxyConfigPath, localYarnConfigPath, globalYarnConfigPath);
     const registryInfos = proxyInfo.registries;
@@ -358,7 +360,6 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
             resToDownstreamClient.writeHead(404).end('All upstream registries failed');
         }
     };
-    // deprecated 废弃本注释：需要同时启动ipv6,ipv4监听，比如当客户端访问http://localhost:port时，无论客户端DNS解析到IPV4-127.0.0.1还是IPV6-::1地址，咱server都能轻松应对！
     let server;
     if (proxyInfo.https) {
         const { key, cert } = proxyInfo.https;
@@ -370,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),
@@ -391,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);
@@ -409,11 +410,10 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         // 为了代理服务器的安全性，暂时只监听本机ipv6地址【::1】，不能对本机之外暴露本代理服务地址避免造成安全隐患
         // 注意：截止目前yarn客户端如果通过localhost:<port>来访问本服务，可能会报错ECONNREFUSED错误码，原因是yarn客户端环境解析“localhost”至多个地址，它会尝试轮询每个地址。
         const listenOptions = { port, host: '::1', ipv6Only: true };
-        server.listen(listenOptions, () => {
+        server.listen(listenOptions, async () => {
             const addressInfo = server.address();
             port = addressInfo.port; // 回写上层局部变量
-            const portFile = join(process.env.PROJECT_ROOT || process.cwd(), '.registry-proxy-port');
-            writeFile(portFile, addressInfo.port.toString()).catch(e => logger.error(`Failed to write port file: ${portFile}`, e));
+            await writePortFile(port);
             logger.info(`Proxy server running on ${proxyInfo.https ? 'https' : 'http'}://localhost:${addressInfo.port}${basePathPrefixedWithSlash === '/' ? '' : basePathPrefixedWithSlash}`);
             resolve(server);
         });
@@ -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/dist/port.d.ts

@@ -0,0 +1,4 @@
+export declare const PORT_FILE_NAME = ".registry-proxy-port";
+export declare const portFile: string;
+export declare function writePortFile(port: number): Promise<void>;
+export declare const deletePortFile: () => Promise<void>;

package/dist/port.js

@@ -0,0 +1,26 @@
+import { basename, join } from "node:path";
+import { promises as nodeFsPromises } from 'node:fs';
+import logger from "./utils/logger.js";
+const { unlink, writeFile, } = nodeFsPromises;
+export const PORT_FILE_NAME = '.registry-proxy-port';
+export const portFile = join(process.env.PROJECT_ROOT || process.cwd(), PORT_FILE_NAME);
+export async function writePortFile(port) {
+    await writeFile(portFile, port.toString()).catch(e => logger.error(`Failed to write port file: ${portFile}`, e));
+}
+export const deletePortFile = async () => {
+    await deleteFile(portFile);
+};
+async function deleteFile(filePath) {
+    try {
+        await unlink(filePath);
+        console.log(`文件 ${basename(filePath)} 已删除`);
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            console.log('文件不存在');
+        }
+        else {
+            console.error('删除失败:', err.message);
+        }
+    }
+}

package/package.json

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