Fix Procedure level queue

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [Unreleased][unreleased]
 
+- Fixed API endpoints local queue settings applying
+
 ## [3.0.13][] - 2023-10-22
 
 - Fix serve static not in cache (e.g. certbot challenge)

lib/procedure.js

@@ -41,7 +41,7 @@ class Procedure {
 
   async enter() {
     await this.application.semaphore.enter();
-    if (this.concurrency) {
+    if (this.semaphore) {
       try {
         await this.semaphore.enter();
       } catch (error) {
@@ -53,7 +53,7 @@ class Procedure {
 
   leave() {
     this.application.semaphore.leave();
-    if (this.concurrency) this.semaphore.leave();
+    if (this.semaphore) this.semaphore.leave();
   }
 
   async invoke(context, args = {}) {

test/procedure.js

@@ -10,11 +10,10 @@ metatests.testAsync('lib/procedure', async (test) => {
   });
 
   const application = {
-    server: {
-      semaphore: {
-        async enter() {},
-        leave() {},
-      },
+    Error,
+    semaphore: {
+      async enter() {},
+      leave() {},
     },
   };
 
@@ -62,11 +61,9 @@ metatests.testAsync('lib/procedure validate', async (test) => {
 
   const application = {
     Error,
-    server: {
-      semaphore: {
-        async enter() {},
-        leave() {},
-      },
+    semaphore: {
+      async enter() {},
+      leave() {},
     },
   };
   const procedure = new Procedure(script, 'method', application);
@@ -93,11 +90,9 @@ metatests.testAsync('lib/procedure validate async', async (test) => {
 
   const application = {
     Error,
-    server: {
-      semaphore: {
-        async enter() {},
-        leave() {},
-      },
+    semaphore: {
+      async enter() {},
+      leave() {},
     },
   };
   const procedure = new Procedure(script, 'method', application);
@@ -124,11 +119,9 @@ metatests.testAsync('lib/procedure timeout', async (test) => {
 
   const application = {
     Error,
-    server: {
-      semaphore: {
-        async enter() {},
-        leave() {},
-      },
+    semaphore: {
+      async enter() {},
+      leave() {},
     },
   };
 
@@ -141,3 +134,72 @@ metatests.testAsync('lib/procedure timeout', async (test) => {
 
   await test.resolves(() => procedure.invoke({}, { waitTime: 50 }), DONE);
 });
+
+metatests.testAsync('lib/procedure queue', async (test) => {
+  const DONE = 'success';
+
+  const script = () => ({
+    queue: {
+      concurrency: 1,
+      size: 1,
+      timeout: 15,
+    },
+
+    method: async ({ waitTime }) =>
+      new Promise((resolve) => {
+        setTimeout(() => resolve(DONE), waitTime);
+      }),
+  });
+
+  const application = {
+    Error,
+    semaphore: {
+      async enter() {},
+      leave() {},
+    },
+  };
+
+  const rpc = async (proc, args) => {
+    let result = null;
+    await proc.enter();
+    try {
+      result = await proc.invoke({}, args);
+    } catch (error) {
+      throw new Error('Procedure.invoke failed. Check your script.method');
+    }
+    proc.leave();
+    return result;
+  };
+
+  const procedure = new Procedure(script, 'method', application);
+
+  await test.resolves(async () => {
+    const invokes = await Promise.allSettled([
+      rpc(procedure, { waitTime: 2 }),
+      rpc(procedure, { waitTime: 1 }),
+    ]);
+    const last = invokes[1];
+    return last.value;
+  }, DONE);
+
+  await test.rejects(async () => {
+    const invokes = await Promise.allSettled([
+      rpc(procedure, { waitTime: 16 }),
+      rpc(procedure, { waitTime: 1 }),
+    ]);
+    const last = invokes[1];
+    if (last.status === 'rejected') throw last.reason;
+    return last.value;
+  }, new Error('Semaphore timeout'));
+
+  await test.rejects(async () => {
+    const invokes = await Promise.allSettled([
+      rpc(procedure, { waitTime: 1 }),
+      rpc(procedure, { waitTime: 1 }),
+      rpc(procedure, { waitTime: 1 }),
+    ]);
+    const last = invokes[2];
+    if (last.status === 'rejected') throw last.reason;
+    return last.value;
+  }, new Error('Semaphore queue is full'));
+});