@vnejs/semaphore 0.2.0 → 0.2.1

package/dist/index.js

@@ -42,7 +42,10 @@ export class Semaphore {
         this.weight += e.weight;
         e.inProcess = true;
         this.queueCurrent.push(e);
-        e.func().then(() => {
+        Promise.resolve()
+            .then(() => e.func())
+            .catch(() => undefined)
+            .finally(() => {
             this.weight -= e.weight;
             this.queueCurrent = this.queueCurrent.filter((a) => a.key !== e.key);
             this.length--;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/semaphore",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
     "tsconfig.json"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "npx @vnejs/monorepo test",
     "build": "npx @vnejs/monorepo package",
     "publish:major": "npx @vnejs/monorepo publish major --access public",
     "publish:minor": "npx @vnejs/monorepo publish minor --access public",
@@ -19,6 +19,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@vnejs/configs.ts-common": "~0.2.0"
+    "@vnejs/configs.ts-common": "~0.2.0",
+    "@vnejs/configs.vitest": "~0.2.0"
   }
 }

package/src/index.ts

@@ -47,12 +47,15 @@ export class Semaphore {
     this.weight += e.weight;
     e.inProcess = true;
     this.queueCurrent.push(e);
-    e.func().then(() => {
-      this.weight -= e.weight;
-      this.queueCurrent = this.queueCurrent.filter((a) => a.key !== e.key);
-      this.length--;
-      delete this.queue[e.key];
-      e.resolve?.();
-    });
+    Promise.resolve()
+      .then(() => e.func())
+      .catch(() => undefined)
+      .finally(() => {
+        this.weight -= e.weight;
+        this.queueCurrent = this.queueCurrent.filter((a) => a.key !== e.key);
+        this.length--;
+        delete this.queue[e.key];
+        e.resolve?.();
+      });
   }
 }

package/src/tests/semaphore.test.ts

@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vitest";
+
+import { Semaphore } from "../index.js";
+
+describe("Semaphore", () => {
+  it("releases the slot when func rejects so the next push can start", async () => {
+    const semaphore = new Semaphore(1);
+    let secondStarted = false;
+
+    const first = semaphore.push("fail", 1, async () => {
+      throw new Error("load failed");
+    });
+    const second = semaphore.push("ok", 1, async () => {
+      secondStarted = true;
+    });
+
+    await first;
+    await second;
+
+    expect(secondStarted).toBe(true);
+    expect(semaphore.weight).toBe(0);
+    expect(semaphore.length).toBe(0);
+  });
+
+  it("resolves push when func rejects", async () => {
+    const semaphore = new Semaphore(1);
+
+    await expect(
+      semaphore.push("fail", 1, async () => {
+        throw new Error("load failed");
+      }),
+    ).resolves.toBeUndefined();
+  });
+});

package/tsconfig.json

@@ -9,6 +9,7 @@
   ],
   "exclude": [
     "dist",
-    "node_modules"
+    "node_modules",
+    "src/tests"
   ]
 }