com.jimuwd.xian.registry-proxy 1.1.14 → 1.1.16

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 executionContext;
     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,52 @@
-export default class ConcurrencyLimiter {
+export default class ReentrantConcurrencyLimiter {
     maxConcurrency;
     current = 0;
     queue = [];
+    executionContext = new WeakMap();
     constructor(maxConcurrency) {
-        if (maxConcurrency <= 0) {
+        if (maxConcurrency <= 0)
             throw new Error("maxConcurrency must be positive");
-        }
         this.maxConcurrency = maxConcurrency;
     }
+    getContextId() {
+        return {}; // 每次调用生成唯一对象引用
+    }
     async acquire() {
+        const contextId = this.getContextId();
+        const depth = this.executionContext.get(contextId) || 0;
+        if (depth > 0) {
+            this.executionContext.set(contextId, depth + 1);
+            return;
+        }
         if (this.current < this.maxConcurrency) {
             this.current++;
+            this.executionContext.set(contextId, 1);
             return;
         }
         return new Promise((resolve) => {
-            this.queue.push(resolve);
+            this.queue.push(() => {
+                this.current++;
+                this.executionContext.set(contextId, 1);
+                resolve();
+            });
         });
     }
     release() {
-        if (this.current <= 0) {
+        const contextId = this.getContextId();
+        const depth = this.executionContext.get(contextId);
+        if (depth === undefined) {
             throw new Error("release() called without acquire()");
         }
+        if (depth > 1) {
+            this.executionContext.set(contextId, depth - 1);
+            return;
+        }
+        this.executionContext.delete(contextId);
         this.current--;
-        const next = this.queue.shift();
-        if (next) {
-            // 异步执行，避免递归调用栈溢出
-            Promise.resolve().then(() => {
-                this.current++;
-                next();
-            });
+        if (this.queue.length > 0) {
+            const next = this.queue.shift();
+            // 仍异步执行，但需确保顺序
+            Promise.resolve().then(next);
         }
     }
     async run(task) {

package/package.json

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