com.jimuwd.xian.registry-proxy 1.1.20-beta01 → 1.1.23

package/dist/client/yarn-install.js

@@ -5,6 +5,7 @@ import path from 'node:path';
 import { execa } from 'execa';
 import findProjectRoot from "../utils/findProjectRoot.js";
 import { isPortConnectable } from "../utils/portTester.js";
+import { readYarnConfig } from "../utils/configFileReader.js";
 // Constants
 const REGISTRY_PROXY_VERSION = process.env.REGISTRY_PROXY_VERSION || 'latest';
 const LOCK_FILE_NAME = '.registry-proxy-install.lock';
@@ -36,7 +37,7 @@ async function readPortFile(filePath) {
     const content = await fs.readFile(filePath, 'utf-8');
     const port = parseInt(content.trim(), 10);
     if (isNaN(port) || port < 1 || port > 65535) {
-        throw new Error(`Invalid port number in ${filePath}`);
+        throw new Error(`Invalid port number ${port} in ${filePath}`);
     }
     return port;
 }
@@ -51,6 +52,7 @@ async function cleanup(exitCode = 1) {
             console.error('Cleanup handler error:', err);
         }
     }
+    console.log("Process exited with exitCode", exitCode);
     process.exit(exitCode);
 }
 function registerCleanup(handler) {
@@ -81,20 +83,22 @@ async function main() {
             try {
                 await fs.unlink(LOCK_FILE);
             }
-            catch {
+            catch (err) { //cleanup程序不要抛出任何异常
+                console.error(`Failed to delete lock file: ${LOCK_FILE}`, err);
             }
         });
         // Change to project root
         process.chdir(INSTALLATION_ROOT);
         // Start registry proxy
         console.log(`Starting registry-proxy@${REGISTRY_PROXY_VERSION} in the background...`);
+        // 提示：这里借助了execa调用"yarn dlx"后台运行registry proxy server的功能，没有直接使用本地ts函数调用的方式启动本地代理服务器，因为后者不太容易达到后台运行的效果。
         proxyProcess = execa('yarn', [
             'dlx', '-p', `com.jimuwd.xian.registry-proxy@${REGISTRY_PROXY_VERSION}`,
             'registry-proxy',
             '.registry-proxy.yml',
             '.yarnrc.yml',
             path.join(process.env.HOME || '', '.yarnrc.yml'),
-            '40061'
+            /*之前是写死的静态端口40061，它有个缺点就是本地无法为多个项目工程并发执行yarn-install，现改为使用随机可用端口作为本地代理服务器端口，传'0'/''空串即可*/ '0'
         ], {
             detached: true,
             stdio: 'inherit'
@@ -105,11 +109,11 @@ async function main() {
                 try {
                     proxyProcess.kill('SIGTERM');
                     await proxyProcess;
+                    console.log('Proxy server stopped.');
                 }
-                catch {
-                    // Ignore errors
+                catch (err) { // cleanup程序不要抛出异常
+                    console.error('Proxy server stopping with error', err);
                 }
-                console.log('Proxy server stopped.');
             }
         });
         // Wait for proxy to start
@@ -124,14 +128,32 @@ async function main() {
             throw new Error(`Proxy server not listening on port ${PROXY_PORT}`);
         }
         // Configure yarn
+        const { exitCode, stdout } = await execa('yarn', ['config', 'get', 'npmRegistryServer']);
+        let npmRegistryServer = stdout.trim();
+        let localNpmRegistryServer;
+        try {
+            const localYarnConfig = await readYarnConfig('.yarnrc.yml');
+            localNpmRegistryServer = localYarnConfig.npmRegistryServer;
+        }
+        catch {
+            localNpmRegistryServer = undefined;
+        }
         await execa('yarn', ['config', 'set', 'npmRegistryServer', `http://127.0.0.1:${PROXY_PORT}`]);
         console.log(`Set npmRegistryServer to http://127.0.0.1:${PROXY_PORT}`);
         registerCleanup(async () => {
             try {
-                await execa('yarn', ['config', 'unset', 'npmRegistryServer']); //fixme：这里使用unset，有个缺点就是如果工程中.yarnrc.yml原本配置的只读registryServer没有恢复而是被清空了！国内的网络再执行任何拉取操作或yarn dlx命令容易超时！
-                console.log('Cleared npmRegistryServer configuration：这里清空npmRegistryServer而不是恢复，有个缺点就是如果工程中.yarnrc.yml原本配置的只读registryServer没有恢复而是被清空了！国内的网络再执行任何拉取操作或yarn dlx命令容易超时！');
+                //if (exitCode === 0 && npmRegistryServer) {//不能用这个变量来恢复为原来的 npmRegistryServer，因为它可能是全局配置~/.yarnrc.yml内的配置值或yarn工具官方默认值，而非本地.yarnrc.yml配置值。
+                if (localNpmRegistryServer && localNpmRegistryServer.trim()) { //恢复为本地配置文件原来的 npmRegistryServer 配置值
+                    await execa('yarn', ['config', 'set', 'npmRegistryServer', localNpmRegistryServer]);
+                    console.log(`Recover npmRegistryServer to ${localNpmRegistryServer}`);
+                }
+                else { //原来本地配置文件中没有npmRegistryServer，则重置npmRegistryServer
+                    await execa('yarn', ['config', 'unset', 'npmRegistryServer']);
+                    console.log(`Unset npmRegistryServer.`);
+                }
             }
-            catch {
+            catch (err) { //cleanup程序不要抛出异常
+                console.error('Recover yarn config npmRegistryServer error.', err);
             }
         });
         // Run yarn install
@@ -143,6 +165,7 @@ async function main() {
             throw new Error('yarn install failed');
         }
         // Success
+        console.info("Yarn install with local registry-proxy server success.");
         await cleanup(0);
     }
     catch (err) {
@@ -168,8 +191,5 @@ if (import.meta.url === `file://${process.argv[1]}`) {
         });
     });
     // Start the program
-    main().catch(err => {
-        console.error('Unhandled error:', err);
-        cleanup(1);
-    });
+    await main();
 }

package/dist/models.d.ts

@@ -0,0 +1,34 @@
+interface RegistryConfig {
+    npmAuthToken?: string;
+}
+interface HttpsConfig {
+    key: string;
+    cert: string;
+}
+interface ProxyConfig {
+    registries: Record<string, RegistryConfig | null>;
+    https?: HttpsConfig;
+    basePath?: string;
+}
+interface YarnConfig {
+    npmRegistryServer?: string | null | undefined;
+    npmRegistries?: Record<string, RegistryConfig | null>;
+}
+interface RegistryInfo {
+    normalizedRegistryUrl: string;
+    token?: string;
+}
+interface ProxyInfo {
+    registries: RegistryInfo[];
+    https?: HttpsConfig;
+    basePath?: string;
+}
+interface PackageVersion {
+    dist?: {
+        tarball?: string;
+    };
+}
+interface PackageData {
+    versions?: Record<string, PackageVersion>;
+}
+export { RegistryConfig, HttpsConfig, ProxyConfig, YarnConfig, RegistryInfo, ProxyInfo, PackageVersion, PackageData };

package/dist/models.js

@@ -0,0 +1 @@
+export {};

package/dist/server/index.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import http, { createServer } from 'node:http';
 import https, { createServer as createHttpsServer } from 'node:https';
-import { existsSync, promises as fsPromises, readFileSync } from 'node:fs';
-import { load } from 'js-yaml';
+import { promises as fsPromises, readFileSync } from 'node:fs';
 import fetch from 'node-fetch';
 import { homedir } from 'os';
-import { join, resolve } from 'path';
+import { join } from 'path';
 import { URL } from 'url';
 import logger from "../utils/logger.js";
 import ConcurrencyLimiter from "../utils/ConcurrencyLimiter.js";
 import { gracefulShutdown, registerProcessShutdownHook } from "./gracefullShutdown.js";
 import { writePortFile } from "../port.js";
 import resolveEnvValue from "../utils/resolveEnvValue.js";
-const { readFile } = fsPromises;
+import { readYarnConfig, resolvePath, } from "../utils/configFileReader.js";
+import { readProxyConfig, } from "./serverConfigReader.js";
 // 整个registry-proxy server实例 使用的全局限流器
 const LIMITER = new ConcurrencyLimiter(5);
 function removeEndingSlashAndForceStartingSlash(str) {
@@ -44,9 +44,6 @@ function normalizeUrl(httpOrHttpsUrl) {
         throw new Error(`Invalid URL: ${httpOrHttpsUrl}`, { cause: e });
     }
 }
-function resolvePath(path) {
-    return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
-}
 function removeRegistryPrefix(tarballUrl, registries) {
     const normalizedTarball = normalizeUrl(tarballUrl);
     const normalizedRegistries = registries
@@ -59,48 +56,6 @@ function removeRegistryPrefix(tarballUrl, registries) {
     }
     throw new Error(`Can't find tarball url ${tarballUrl} does not match given registries ${normalizedRegistries}`);
 }
-/**
- * 读取yml配置文件得到配置值对象{@link ProxyConfig}
- * @note 本读取操作不会解析环境变量值
- * @param proxyConfigPath 配置文件路径
- */
-async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
-    let config = undefined;
-    const resolvedPath = resolvePath(proxyConfigPath);
-    try {
-        const content = await readFile(resolvedPath, 'utf8');
-        config = load(content);
-    }
-    catch (e) {
-        logger.error(`Failed to load proxy config from ${resolvedPath}:`, e);
-        await gracefulShutdown();
-    }
-    if (!config?.registries) {
-        logger.error('Missing required "registries" field in config');
-        await gracefulShutdown();
-    }
-    return config;
-}
-/**
- * 读取yml配置文件为yml对象
- * @param path yml文件路径
- */
-async function readYarnConfig(path) {
-    try {
-        if (existsSync(path)) {
-            const content = await readFile(resolvePath(path), 'utf8');
-            return load(content);
-        }
-        else {
-            logger.info(`Skip reading ${path}, because it does not exist.`);
-            return {};
-        }
-    }
-    catch (e) {
-        logger.warn(`Failed to load Yarn config from ${path}:`, e);
-        return {};
-    }
-}
 async function loadProxyInfo(proxyConfigPath = './.registry-proxy.yml', localYarnConfigPath = './.yarnrc.yml', globalYarnConfigPath = join(homedir(), '.yarnrc.yml')) {
     const [proxyConfig, localYarnConfig, globalYarnConfig] = await Promise.all([
         readProxyConfig(proxyConfigPath),

package/dist/server/serverConfigReader.d.ts

@@ -0,0 +1,8 @@
+import { ProxyConfig } from "../models.js";
+/**
+ * 读取yml配置文件得到配置值对象{@link ProxyConfig}
+ * @note 本读取操作不会解析环境变量值
+ * @param proxyConfigPath 配置文件路径
+ */
+declare function readProxyConfig(proxyConfigPath?: string): Promise<ProxyConfig>;
+export { readProxyConfig };

package/dist/server/serverConfigReader.js

@@ -0,0 +1,29 @@
+import { load } from "js-yaml";
+import { promises as fsPromises } from 'node:fs';
+import { gracefulShutdown } from "./gracefullShutdown.js";
+import { resolvePath } from "../utils/configFileReader.js";
+import logger from "../utils/logger.js";
+const { readFile } = fsPromises;
+/**
+ * 读取yml配置文件得到配置值对象{@link ProxyConfig}
+ * @note 本读取操作不会解析环境变量值
+ * @param proxyConfigPath 配置文件路径
+ */
+async function readProxyConfig(proxyConfigPath = './.registry-proxy.yml') {
+    let config = undefined;
+    const resolvedPath = resolvePath(proxyConfigPath);
+    try {
+        const content = await readFile(resolvedPath, 'utf8');
+        config = load(content);
+    }
+    catch (e) {
+        logger.error(`Failed to load proxy config from ${resolvedPath}:`, e);
+        await gracefulShutdown();
+    }
+    if (!config?.registries) {
+        logger.error('Missing required "registries" field in config');
+        await gracefulShutdown();
+    }
+    return config;
+}
+export { readProxyConfig };

package/dist/utils/configFileReader.d.ts

@@ -0,0 +1,12 @@
+import { YarnConfig } from "../models.js";
+/**
+ * 读取yml配置文件为yml对象
+ * @param path yml文件路径
+ */
+declare function readYarnConfig(path: string): Promise<YarnConfig>;
+/**
+ * 标准化处理路径值
+ * @param path
+ */
+declare function resolvePath(path: string): string;
+export { readYarnConfig, resolvePath, };

package/dist/utils/configFileReader.js

@@ -0,0 +1,34 @@
+import { load } from "js-yaml";
+import { join, resolve } from "path";
+import { homedir } from "os";
+import { existsSync, promises as fsPromises } from 'node:fs';
+import logger from "./logger.js";
+const { readFile } = fsPromises;
+/**
+ * 读取yml配置文件为yml对象
+ * @param path yml文件路径
+ */
+async function readYarnConfig(path) {
+    try {
+        if (existsSync(path)) {
+            const content = await readFile(resolvePath(path), 'utf8');
+            return load(content);
+        }
+        else {
+            logger.info(`Skip reading ${path}, because it does not exist.`);
+            return {};
+        }
+    }
+    catch (e) {
+        logger.warn(`Failed to load Yarn config from ${path}:`, e);
+        return {};
+    }
+}
+/**
+ * 标准化处理路径值
+ * @param path
+ */
+function resolvePath(path) {
+    return path.startsWith('~/') ? join(homedir(), path.slice(2)) : resolve(path);
+}
+export { readYarnConfig, resolvePath, };

package/dist/utils/logger.js

@@ -15,10 +15,10 @@ const PREFIX = {
 };
 // 代理服务器专用日志
 const logger = {
-    info: (...args) => console.log(`${PREFIX.proxy}`, ...args),
-    success: (...args) => console.log(`${PREFIX.proxy} ${COLORS.success}✓${COLORS.reset}`, ...args),
+    info: (...args) => { },
+    success: (...args) => { },
     error: (...args) => console.error(`${PREFIX.error}`, ...args),
-    warn: (...args) => console.warn(`${PREFIX.warn}`, ...args),
+    warn: (...args) => { },
     debug: (...args) => process.env.DEBUG && console.debug(`${PREFIX.debug}`, ...args)
 };
 export default logger;

package/package.json

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