com.jimuwd.xian.registry-proxy 1.1.19 → 1.1.21

package/dist/client/yarn-install.js

@@ -36,7 +36,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 +51,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 +82,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 +108,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 +127,23 @@ 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']);
         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']);
-                console.log('Cleared npmRegistryServer configuration');
+                let npmRegistryServer = stdout.trim();
+                if (exitCode === 0 && npmRegistryServer) { //恢复为原来的 npmRegistryServer
+                    await execa('yarn', ['config', 'set', 'npmRegistryServer', npmRegistryServer]);
+                    console.log(`Recover npmRegistryServer to ${npmRegistryServer}`);
+                }
+                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 +155,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 +181,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/package.json

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