generic-pool - npm Package Compare versions

Comparing version 3.0.0-alpha.5 to 3.0.0-alpha.6

lib/Pool.js

@@ -42,2 +42,3 @@ 'use strict'
 
+    // TODO: fix up this ugly glue-ing
     this._Promise = this._config.Promise
@@ -117,6 +118,7 @@
     // NOTE: this maybe very bad promise usage?
-    const destroyOp = this._factory.destroy(pooledResource.obj)
-    this._factoryDestroyOperations.add(destroyOp)
+    const destroyPromise = this._factory.destroy(pooledResource.obj)
+    const wrappedDestroyPromise = this._Promise.resolve(destroyPromise)
+    this._factoryDestroyOperations.add(wrappedDestroyPromise)
 
-    destroyOp
+    wrappedDestroyPromise
     .catch((reason) => {
@@ -126,3 +128,3 @@ this.emit(FACTORY_DESTROY_ERROR, reason)
     .then(() => {
-      this._factoryDestroyOperations.delete(destroyOp)
+      this._factoryDestroyOperations.delete(wrappedDestroyPromise)
     })
@@ -191,7 +193,8 @@
     this._testOnBorrowResources.add(pooledResource)
-    const validationOp = this._factory.validate(pooledResource.obj)
-    this._validationOperations.add(validationOp)
+    const validationPromise = this._factory.validate(pooledResource.obj)
+    const wrappedValidationPromise = this._Promise.resolve(validationPromise)
+    this._validationOperations.add(wrappedValidationPromise)
 
-    validationOp.then((isValid) => {
-      this._validationOperations.delete(validationOp)
+    wrappedValidationPromise.then((isValid) => {
+      this._validationOperations.delete(wrappedValidationPromise)
       this._testOnBorrowResources.delete(pooledResource)
@@ -330,11 +333,12 @@
     const factoryPromise = this._factory.create()
-    this._factoryCreateOperations.add(factoryPromise)
+    const wrappedFactoryPromise = this._Promise.resolve(factoryPromise)
+    this._factoryCreateOperations.add(wrappedFactoryPromise)
 
-    factoryPromise
+    wrappedFactoryPromise
     .then((resource) => {
-      this._factoryCreateOperations.delete(factoryPromise)
+      this._factoryCreateOperations.delete(wrappedFactoryPromise)
       this._handleNewResource(resource)
     })
     .catch((reason) => {
-      this._factoryCreateOperations.delete(factoryPromise)
+      this._factoryCreateOperations.delete(wrappedFactoryPromise)
       this.emit(FACTORY_CREATE_ERROR, reason)
@@ -341,0 +345,0 @@ this._dispense()

package.json

 {
   "name": "generic-pool",
   "description": "Generic resource pooling for Node.JS",
-  "version": "3.0.0-alpha.5",
+  "version": "3.0.0-alpha.6",
   "author": "James Cooper <[e-mail]>",
@@ -6,0 +6,0 @@ "contributors": [

README.md

@@ -125,2 +125,3 @@ [![build status](https://secure.travis-ci.org/coopernurse/node-pool.png)](http://travis-ci.org/coopernurse/node-pool)
 
+_Note: The values returned from `create`, `destroy`, and `validate` are all wrapped in a `Promise.resolve` by the pool before being used internally._
 
@@ -127,0 +128,0 @@ **opts**

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

78286

increased by0.67%

Lines of code

1876

increased by0.21%

Number of lines in readme file

379

increased by0.26%

No dependency changes