feat: semaphore optional disposer

Author: AVVS

.babelrc

@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "transform-strict-mode"
+    "@babel/plugin-transform-strict-mode"
   ],
   "env": {
     "test": {

.nycrc

@@ -7,7 +7,7 @@
     "src/**/*.spec.js"
   ],
   "require": [
-    "babel-register"
+    "@babel/register"
   ],
   "sourceMap": false,
   "instrument": false,

README.md

@@ -177,8 +177,8 @@ Promise.using(semaphore.take(), () => {
   // do some work, return promise
 });
 
-// option 2
-await semaphore.take();
+// option 2 - without disposer
+await semaphore.take(false);
 try {
   // perform some async work and ensure we call leave afterwards
 } finally {

__tests__/docker-compose.yml

@@ -2,14 +2,14 @@ version: '2'
 
 services:
   redis:
-    image: redis:3.2.9-alpine
+    image: redis:4.0.11-alpine
     container_name: redis
     hostname: redis
     expose:
       - 6379
 
   tester:
-    image: makeomatic/node:9.3.0-tester
+    image: makeomatic/node:10.8.0-tester
     container_name: tester
     hostname: tester
     links:

__tests__/integration.js

@@ -197,8 +197,8 @@ describe('integration tests', () => {
       .catch(unexpectedError)
       .then(() => {
         assert.equal(job.callCount, 3);
-        assert.ifError(failedToQueue.called, 'unexpected error was raised');
-        assert.ifError(unexpectedError.called, 'fatal error was raised');
+        assert.ok(!failedToQueue.called, 'unexpected error was raised');
+        assert.ok(!unexpectedError.called, 'fatal error was raised');
         return null;
       });
   });
@@ -217,7 +217,7 @@ describe('integration tests', () => {
       .then(() => {
         assert.equal(job.callCount, 1);
         assert.equal(failedToQueue.callCount, 1, 'unexpected error was raised');
-        assert.ifError(unexpectedError.called, 'fatal error was raised');
+        assert.ok(!unexpectedError.called, 'fatal error was raised');
         return null;
       });
   });

package.json

@@ -6,10 +6,12 @@
   "scripts": {
     "test": "yarn lint && mdep test run",
     "pretest": "yarn compile",
-    "prepublish": "yarn compile",
+    "prepare": "yarn compile",
     "lint": "eslint ./src",
     "compile": "babel -d ./lib src",
-    "semantic-release": "semantic-release"
+    "semantic-release": "semantic-release",
+    "commitmsg": "commitlint -e $GIT_PARAMS",
+    "preparecommitmsg": "./node_modules/@makeomatic/deploy/git-hooks/prepare-commit-msg $GIT_PARAMS"
   },
   "repository": {
     "type": "git",
@@ -37,31 +39,34 @@
     "bluebird": "^3.5.1",
     "bunyan": "^1.8.12",
     "callback-queue": "^2.0.0",
-    "denque": "^1.2.2",
+    "denque": "^1.3.0",
     "ioredis-lock": "^3.4.0",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "serialize-error": "^2.1.0"
   },
   "devDependencies": {
+    "@babel/cli": "^7.0.0-rc.1",
+    "@babel/core": "^7.0.0-rc.1",
+    "@babel/plugin-transform-strict-mode": "^7.0.0-rc.1",
+    "@babel/register": "^7.0.0-rc.1",
     "@makeomatic/condition-semaphore": "^2.0.0",
-    "@makeomatic/deploy": "^5.0.2",
+    "@makeomatic/deploy": "^7.0.1",
     "@makeomatic/last-release-npm": "^1.0.1",
-    "babel-cli": "^6.26.0",
-    "babel-eslint": "^8.2.1",
-    "babel-plugin-istanbul": "^4.1.5",
-    "babel-plugin-transform-strict-mode": "^6.24.1",
-    "babel-register": "^6.26.0",
-    "codecov": "^3.0.0",
-    "cross-env": "^5.1.3",
-    "eslint": "^4.15.0",
-    "eslint-config-makeomatic": "^2.0.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-promise": "^3.6.0",
+    "babel-core": "^7.0.0-0",
+    "babel-eslint": "^8.2.6",
+    "babel-jest": "^23.4.2",
+    "babel-plugin-istanbul": "^5.0.0",
+    "codecov": "^3.0.4",
+    "cross-env": "^5.2.0",
+    "eslint": "^5.3.0",
+    "eslint-config-makeomatic": "^3.0.0",
+    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-promise": "^3.8.0",
     "ioredis": "^3.2.2",
-    "jest-cli": "^22.1.1",
-    "mocha": "^4.1.0",
-    "nyc": "^11.4.1",
-    "sinon": "^4.1.6"
+    "jest-cli": "^23.5.0",
+    "mocha": "^5.2.0",
+    "nyc": "^12.0.2",
+    "sinon": "^6.1.5"
   },
   "engine": {
     "node": ">= 8.9.0"

src/semaphore.js

@@ -15,10 +15,15 @@ class Semaphore {
     this._take = this._take.bind(this);
   }
 
-  take() {
-    return Promise
-      .fromCallback(this._take)
-      .disposer(this.leave);
+  take(disposer = true) {
+    const promise = Promise.fromCallback(this._take);
+
+    // with disposer by default
+    if (disposer === true) {
+      return promise.disposer(this.leave);
+    }
+
+    return promise;
   }
 
   _take(next) {
@@ -40,9 +45,11 @@ class Semaphore {
       })
       .catch((e) => {
         this.dlock.logger.error('semaphore operational error', e);
-        return Promise.bind(this, next)
+        return Promise
           .delay(50)
-          .then(this._take);
+          .return(next)
+          .then(this._take)
+          .then(this.next);
       });
   }