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

package/dist/client/yarn-install.js

@@ -128,8 +128,8 @@ async function main() {
         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');
+                await execa('yarn', ['config', 'unset', 'npmRegistryServer']); //fixme：这里使用unset，有个缺点就是如果工程中.yarnrc.yml原本配置的只读registryServer没有恢复而是被清空了！国内的网络再执行任何拉取操作或yarn dlx命令容易超时！
+                console.log('Cleared npmRegistryServer configuration：这里清空npmRegistryServer而不是恢复，有个缺点就是如果工程中.yarnrc.yml原本配置的只读registryServer没有恢复而是被清空了！国内的网络再执行任何拉取操作或yarn dlx命令容易超时！');
             }
             catch {
             }

package/dist/server/index.js

@@ -199,21 +199,19 @@ async function _fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient)
     }
     catch (e) {
         // Fetch form one of the configured upstream registries failed, this is expected behavior, not error.
-        if (e instanceof Error) {
-            const errCode = e.code;
-            if (errCode === 'ECONNREFUSED') {
-                logger.info(`Upstream ${targetUrl} refused connection [ECONNREFUSED], skip fetching from registry ${registry.normalizedRegistryUrl}`);
-            }
-            else if (errCode === 'ENOTFOUND') {
-                logger.info(`Unknown upstream domain name in ${targetUrl} [ENOTFOUND], skip fetching from registry ${registry.normalizedRegistryUrl}.`);
-            }
-            else {
-                // Other net error code, print log with stacktrace
-                logger.warn(`Failed to fetch from ${targetUrl}, ${e.message}`, e);
-            }
+        const errCode = e?.code;
+        if (errCode === 'ECONNREFUSED') {
+            logger.info(`Upstream ${targetUrl} refused connection [ECONNREFUSED], skip fetching from registry ${registry.normalizedRegistryUrl}`);
+        }
+        else if (errCode === 'ENOTFOUND') {
+            logger.info(`Unknown hostname in upstream url ${targetUrl} [ENOTFOUND], skip fetching from registry ${registry.normalizedRegistryUrl}.`);
+        }
+        else if (errCode === 'EAI_AGAIN') {
+            logger.info(`Could not resolve hostname in upstream url ${targetUrl} [EAI_AGAIN], skip fetching from registry ${registry.normalizedRegistryUrl}.`);
         }
         else {
-            logger.error("Unknown error", e);
+            // Other net error code, print log with stacktrace
+            logger.warn(`Failed to fetch from ${targetUrl}`, e);
         }
         // Return null means skipping current upstream registry.
         return null;

package/package.json

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