com.jimuwd.xian.registry-proxy 1.1.13 → 1.1.15

package/dist/server/index.js

@@ -152,7 +152,7 @@ async function fetchFromRegistry(registry, targetUrl, reqFromDownstreamClient, l
             logger.debug(() => `Replace 'Host=${mergedHeaders.host}' header in downstream request to upstream 'Host=${upstreamHost}' header when proxying to upstream ${targetUrl}.`);
             mergedHeaders.host = upstreamHost;
         }
-        const response = await fetch(targetUrl, { headers: mergedHeaders });
+        const response = await fetch(targetUrl, { headers: mergedHeaders, redirect: 'manual' });
         if (response.ok) {
             logger.debug(() => `Success response from upstream ${targetUrl}: ${response.status} ${response.statusText}
             content-type=${response.headers.get('content-type')} content-encoding=${response.headers.get('content-encoding')} content-length=${response.headers.get('content-length')} transfer-encoding=${response.headers.get('transfer-encoding')}`);

package/dist/utils/ConcurrencyLimiter.d.ts

@@ -1,8 +1,10 @@
-export default class ConcurrencyLimiter {
+export default class ReentrantConcurrencyLimiter {
     readonly maxConcurrency: number;
     private current;
     private queue;
+    private executionContexts;
     constructor(maxConcurrency: number);
+    private getContextId;
     acquire(): Promise<void>;
     release(): void;
     run<T>(task: () => Promise<T>): Promise<T>;

package/dist/utils/ConcurrencyLimiter.js

@@ -1,34 +1,61 @@
-export default class ConcurrencyLimiter {
+export default class ReentrantConcurrencyLimiter {
     maxConcurrency;
     current = 0;
     queue = [];
+    executionContexts = new Map(); // 跟踪执行上下文及其嵌套深度
     constructor(maxConcurrency) {
         if (maxConcurrency <= 0) {
             throw new Error("maxConcurrency must be positive");
         }
         this.maxConcurrency = maxConcurrency;
     }
+    getContextId() {
+        // 使用Error堆栈生成唯一上下文ID（适用于同步/异步嵌套）
+        try {
+            throw new Error();
+        }
+        catch (e) {
+            return e.stack;
+        }
+    }
     async acquire() {
+        const contextId = this.getContextId();
+        const depth = this.executionContexts.get(contextId) || 0;
+        if (depth > 0) {
+            // 嵌套调用，不占用新槽位
+            this.executionContexts.set(contextId, depth + 1);
+            return;
+        }
         if (this.current < this.maxConcurrency) {
             this.current++;
+            this.executionContexts.set(contextId, 1);
             return;
         }
         return new Promise((resolve) => {
-            this.queue.push(resolve);
+            this.queue.push(() => {
+                this.current++;
+                this.executionContexts.set(contextId, 1);
+                resolve();
+            });
         });
     }
     release() {
-        if (this.current <= 0) {
+        const contextId = this.getContextId();
+        const depth = this.executionContexts.get(contextId);
+        if (!depth) {
             throw new Error("release() called without acquire()");
         }
+        if (depth > 1) {
+            // 嵌套调用退出，减少深度
+            this.executionContexts.set(contextId, depth - 1);
+            return;
+        }
+        // 最外层调用结束
+        this.executionContexts.delete(contextId);
         this.current--;
         const next = this.queue.shift();
         if (next) {
-            // 异步执行，避免递归调用栈溢出
-            Promise.resolve().then(() => {
-                this.current++;
-                next();
-            });
+            Promise.resolve().then(next); // 异步触发下一个任务
         }
     }
     async run(task) {

package/package.json

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