com.jimuwd.xian.registry-proxy 1.0.97 → 1.0.98

package/dist/index.js

@@ -8,32 +8,8 @@ import { homedir } from 'os';
 import { join, resolve } from 'path';
 import { URL } from 'url';
 import logger from "./utils/logger.js";
+import ConcurrencyLimiter from "./utils/ConcurrencyLimiter.js";
 const { readFile, writeFile } = fsPromises;
-class ConcurrencyLimiter {
-    maxConcurrency;
-    current = 0;
-    queue = [];
-    constructor(maxConcurrency) {
-        this.maxConcurrency = maxConcurrency;
-    }
-    async acquire() {
-        if (this.current < this.maxConcurrency) {
-            this.current++;
-            return Promise.resolve();
-        }
-        return new Promise((resolve) => {
-            this.queue.push(resolve);
-        });
-    }
-    release() {
-        this.current--;
-        const next = this.queue.shift();
-        if (next) {
-            this.current++;
-            next();
-        }
-    }
-}
 const limiter = new ConcurrencyLimiter(Infinity);
 function removeEndingSlashAndForceStartingSlash(str) {
     if (!str)
@@ -309,7 +285,8 @@ export async function startProxyServer(proxyConfigPath, localYarnConfigPath, glo
         const downstreamRequestedHttpMethod = reqFromDownstreamClient.method; // "GET", "POST", etc.
         const downstreamRequestedHost = reqFromDownstreamClient.headers.host; // "example.com:8080"
         const downstreamRequestedFullPath = reqFromDownstreamClient.url; //  "/some/path?param=1&param=2"
-        logger.info(`Received downstream request ${downstreamUserAgent} ${downstreamIp} ${downstreamRequestedHttpMethod} ${downstreamRequestedHost} ${downstreamRequestedFullPath}`);
+        logger.info(`Received downstream request from '${downstreamUserAgent}' ${downstreamIp} ${downstreamRequestedHttpMethod} ${downstreamRequestedHost} ${downstreamRequestedFullPath}
+        Proxy server request handler rate limit is ${limiter.maxConcurrency}`);
         if (!downstreamRequestedFullPath || !downstreamRequestedHost) {
             logger.warn(`400 Invalid Request, downstream ${downstreamUserAgent} req.url is absent or downstream.headers.host is absent.`);
             resToDownstreamClient.writeHead(400).end('Invalid Request');

package/dist/utils/ConcurrencyLimiter.d.ts

@@ -0,0 +1,9 @@
+export default class ConcurrencyLimiter {
+    readonly maxConcurrency: number;
+    private current;
+    private queue;
+    constructor(maxConcurrency: number);
+    acquire(): Promise<void>;
+    release(): void;
+    run<T>(task: () => Promise<T>): Promise<T>;
+}

package/dist/utils/ConcurrencyLimiter.js

@@ -0,0 +1,43 @@
+export default class ConcurrencyLimiter {
+    maxConcurrency;
+    current = 0;
+    queue = [];
+    constructor(maxConcurrency) {
+        if (maxConcurrency <= 0) {
+            throw new Error("maxConcurrency must be positive");
+        }
+        this.maxConcurrency = maxConcurrency;
+    }
+    async acquire() {
+        if (this.current < this.maxConcurrency) {
+            this.current++;
+            return;
+        }
+        return new Promise((resolve) => {
+            this.queue.push(resolve);
+        });
+    }
+    release() {
+        if (this.current <= 0) {
+            throw new Error("release() called without acquire()");
+        }
+        this.current--;
+        const next = this.queue.shift();
+        if (next) {
+            // 异步执行，避免递归调用栈溢出
+            Promise.resolve().then(() => {
+                this.current++;
+                next();
+            });
+        }
+    }
+    async run(task) {
+        await this.acquire();
+        try {
+            return await task();
+        }
+        finally {
+            this.release();
+        }
+    }
+}

package/package.json

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