ac-bootstrap-bull 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="1.0.3"></a>
+
+## [1.0.3](https://github.com/admiralcloud/ac-bootstrap-bull/compare/v1.0.2..v1.0.3) (2021-11-27 07:46:38)
+
+
+### Bug Fix
+
+* **App:** Fixed Redis key, update Redis config, improved function naming | MP | [eafc58717551dc494bb1eae690c7081b44314487](https://github.com/admiralcloud/ac-bootstrap-bull/commit/eafc58717551dc494bb1eae690c7081b44314487)    
+Prepare processing is now postProcessing in order to avoid confusion. Redis config is now prepared for Bull 4 (breaking change in Bull), Fixed Redis key
+### Chores
+
+* **App:** Updated packages | MP | [f55e9cd6e0f984fbeb78eaf35fcbb5604c6c5687](https://github.com/admiralcloud/ac-bootstrap-bull/commit/f55e9cd6e0f984fbeb78eaf35fcbb5604c6c5687)    
+Updated packages
 <a name="1.0.2"></a>
 
 ## [1.0.2](https://github.com/admiralcloud/ac-bootstrap-bull/compare/v1.0.1..v1.0.2) (2021-10-15 09:45:36)

package/index.js

@@ -44,9 +44,11 @@ module.exports = function(acapi) {
       port,
       db: _.get(redisConfig, 'db', 3),
       retryStrategy: (times) => {
-        const delay = Math.min(times * 1000, 300000)
+        const delay = Math.min(Math.pow(2, times) * 1000, 300000)
         return delay
-      }
+      },
+      enableReadyCheck: false,
+      maxRetriesPerRequest: null  
     }
 
     acapi.aclog.serverInfo(redisConf)
@@ -201,13 +203,13 @@ module.exports = function(acapi) {
     })
   }
 
-  const prepareProcessing = function(params, cb) {
-    const functionIdentifier = _.padEnd('prepareProcessing', _.get(acapi.config, 'bull.log.functionIdentifierLength'))
+  const postProcesssing = function(params, cb) {
+    const functionIdentifier = _.padEnd('postProcesssing', _.get(acapi.config, 'bull.log.functionIdentifierLength'))
     const jobList = _.get(params, 'jobList') 
     const jobId = _.get(params, 'jobId')
     const that = this
 
-    const redisKey = acapi.config.environment + ':bull:' + _.get(jobList, 'jobList') + ':' + jobId + ':complete:lock'
+    const redisKey = acapi.config.environment + ':bull:' + jobList + ':' + jobId + ':complete:lock'
     const { queueName, jobListConfig } = this.prepareQueue({ jobList, configPath: _.get(params, 'configPath') })
     if (!queueName) return cb({ message: 'queueNameMissing', additionalInfo: params })
     const retentionTime = _.get(jobListConfig, 'retentionTime', _.get(acapi.config, 'bull.retentionTime', 60000))
@@ -232,6 +234,8 @@ module.exports = function(acapi) {
       })
     })
   }
+  const prepareProcessing = postProcesssing
+
 
   /**
    * Shutdown all queues/redis connections
@@ -248,7 +252,8 @@ module.exports = function(acapi) {
     jobLists,
     prepareQueue,
     handleFailedJobs,
-    prepareProcessing,
+    prepareProcessing, // deprecated - please use postProcessing instead
+    postProcesssing,
     addJob,
     removeJob,
     shutdown

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "ac-bootstrap-bull",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Bull helper",
   "repository": "admiralcloud/ac-bootstrap-bull",
   "author": "Mark Poepping <mark.poepping@admiralcloud.com>",
   "license": "MIT",
   "dependencies": {
     "ac-redislock": "^1.0.11",
-    "async": "^3.2.1",
-    "bull": "^3.29.3",
-    "ioredis": "^4.28.0",
+    "async": "^3.2.2",
+    "bull": "^4.1.1",
+    "ioredis": "^4.28.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "eslint": "^8.0.1"
+    "eslint": "^8.3.0"
   }
 }