bullmq 1.87.0 → 1.88.0

package/dist/esm/commands/includes/cleanList.lua

@@ -7,7 +7,8 @@
 --- @include "getTimestamp"
 --- @include "removeJob"
 
-local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd, timestamp, skipCheckLock)
+local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd,
+  timestamp, isWaiting)
   local jobs = rcall("LRANGE", listKey, rangeStart, rangeEnd)
   local deleted = {}
   local deletedCount = 0
@@ -20,7 +21,7 @@ local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd, timestamp,
     end
   
     local jobKey = jobKeyPrefix .. job
-    if (skipCheckLock or rcall("EXISTS", jobKey .. ":lock") == 0) then
+    if (isWaiting or rcall("EXISTS", jobKey .. ":lock") == 0) then
       -- Find the right timestamp of the job to compare to maxTimestamp:
       -- * finishedOn says when the job was completed, but it isn't set unless the job has actually completed
       -- * processedOn represents when the job was last attempted, but it doesn't get populated until the job is first tried
@@ -32,6 +33,9 @@ local function cleanList(listKey, jobKeyPrefix, rangeStart, rangeEnd, timestamp,
         -- occur at the end of the script
         rcall("LSET", listKey, rangeEnd - jobIdsLen + i, deletionMarker)
         removeJob(job, true, jobKeyPrefix)
+        if isWaiting then
+          rcall("ZREM", jobKeyPrefix .. "priority", job)
+        end
         deletedCount = deletedCount + 1
         table.insert(deleted, job)
       end

package/dist/esm/commands/includes/removeJob.lua

@@ -5,8 +5,8 @@
 -- Includes
 --- @include "removeParentDependencyKey"
 
-local function removeJob(key, hard, baseKey)
-  local jobKey = baseKey .. key
+local function removeJob(jobId, hard, baseKey)
+  local jobKey = baseKey .. jobId
   removeParentDependencyKey(jobKey, hard, nil, baseKey)
   rcall("DEL", jobKey, jobKey .. ':logs',
     jobKey .. ':dependencies', jobKey .. ':processed')

package/dist/esm/commands/includes/removeJobFromAnyState.lua

@@ -21,6 +21,6 @@ local function removeJobFromAnyState( prefix, jobId)
   elseif rcall("ZREM", prefix .. "failed", jobId) == 1 then
       return "failed"
   end
-  
+
   return "unknown"
 end

package/dist/esm/commands/includes/removeParentDependencyKey.lua

@@ -5,17 +5,15 @@
 ]]
 
 --- @include "destructureJobKey"
+--- @include "getTargetQueueList"
 
 local function moveParentToWait(parentPrefix, parentId, emitEvent)
-  if rcall("HEXISTS", parentPrefix .. "meta", "paused") ~= 1 then
-    rcall("RPUSH", parentPrefix .. "wait", parentId)
-  else
-    rcall("RPUSH", parentPrefix .. "paused", parentId)
-  end
+  local parentTarget = getTargetQueueList(parentPrefix .. "meta", parentPrefix .. "wait", parentPrefix .. "paused")
+  rcall("RPUSH", parentTarget, parentId)
 
   if emitEvent then
     local parentEventStream = parentPrefix .. "events"
-    rcall("XADD", parentEventStream, "*", "event", "active", "jobId", parentId, "prev", "waiting-children")
+    rcall("XADD", parentEventStream, "*", "event", "waiting", "jobId", parentId, "prev", "waiting-children")
   end
 end
 
@@ -78,6 +76,6 @@ local function removeParentDependencyKey(jobKey, hard, parentKey, baseKey)
           end
         end
       end
-    end  
+    end
   end
 end

package/dist/esm/commands/includes/updateParentDepsIfNeeded.lua

@@ -14,7 +14,7 @@ local function updateParentDepsIfNeeded(parentKey, parentQueueKey, parentDepende
   if rcall("SCARD", parentDependenciesKey) == 0 and activeParent then 
     rcall("ZREM", parentQueueKey .. ":waiting-children", parentId)
     local parentTarget = getTargetQueueList(parentQueueKey .. ":meta", parentQueueKey .. ":wait", parentQueueKey .. ":paused")
-    local priority = rcall("HGET", parentKey, "priority")
+    local priority = tonumber(rcall("HGET", parentKey, "priority"))
     -- Standard or priority add
     if priority == 0 then
       rcall("RPUSH", parentTarget, parentId)

package/dist/esm/commands/removeJob-1.lua

@@ -48,7 +48,7 @@ local function removeJob( prefix, jobId, parentKey)
     end
 
     local prev = removeJobFromAnyState(prefix, jobId)
-    
+
     rcall("ZREM", prefix .. "priority", jobId)
     rcall("DEL", jobKey, jobKey .. ":logs", jobKey .. ":dependencies", jobKey .. ":processed")
 

package/dist/esm/commands/retryJobs-6.lua

@@ -25,7 +25,6 @@ local rcall = redis.call;
 -- Includes
 --- @include "includes/batches"
 --- @include "includes/getTargetQueueList"
---- @include "includes/getZSetItems"
 
 local target = getTargetQueueList(KEYS[6], KEYS[4], KEYS[5])
 

package/dist/esm/utils.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Cluster, Redis } from 'ioredis';
 import { ChildMessage, JobsOptions, ParentMessage, QueueOptions, RedisClient } from './interfaces';
 import { ChildProcess } from 'child_process';

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "bullmq",
-  "version": "1.87.0",
+  "version": "1.88.0",
   "description": "Queue for messages and jobs based on Redis",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "jsnext:main": "dist/esm/index.js",
-  "types": "dist/esm/index.d.ts",
-  "source": "src/index.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "source": "./src/index.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/cjs/index.js",
+      "import": "./dist/esm/index.js",
+      "types": "./dist/esm/index.d.ts"
+    }
+  },
   "author": "Taskforce.sh Inc.",
   "license": "MIT",
   "keywords": [
@@ -24,8 +30,7 @@
     "clean:temp:files": "rimraf dist/cjs/bullmq.d.ts dist/esm/bullmq.d.ts dist/tsdoc-metadata.json",
     "copy:lua": "copyfiles -f ./src/commands/*.lua ./dist/cjs/commands && copyfiles -f ./src/commands/*.lua ./dist/esm/commands",
     "copy:includes:lua": "copyfiles -f ./src/commands/includes/*.lua ./dist/cjs/commands/includes && copyfiles -f ./src/commands/includes/*.lua ./dist/esm/commands/includes",
-    "coverage": "nyc --reporter=text npm run test",
-    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "coverage": "nyc --reporter=text --reporter=lcovonly yarn test",
     "cm": "git cz",
     "docs": "typedoc --excludeExternals --excludeProtected --excludePrivate --readme none src/index.ts",
     "dc:up": "docker-compose -f docker-compose.yml up -d",
@@ -34,8 +39,9 @@
     "eslint:fix": "./node_modules/.bin/eslint . --ignore-path ./.eslintignore --fix",
     "lint": "./node_modules/.bin/eslint . --ignore-path ./.eslintignore",
     "lint:staged": "lint-staged",
-    "prepare": "yarn build",
+    "prepublishOnly": "yarn build",
     "generate:raw:scripts": "ts-node --project tsconfig-cjs.json generateRawScripts.ts",
+    "postinstall": "husky install",
     "prettier": "prettier --config package.json src/**/*.ts",
     "pretty:quick": "pretty-quick --ignore-path ./.eslintignore --staged",
     "semantic-release": "semantic-release",
@@ -46,68 +52,69 @@
     "tsc:all": "tsc && tsc -p tsconfig-cjs.json"
   },
   "dependencies": {
-    "cron-parser": "^4.2.1",
-    "get-port": "^5.1.1",
-    "glob": "^7.2.0",
-    "ioredis": "^4.28.5",
+    "cron-parser": "^4.6.0",
+    "get-port": "6.1.2",
+    "glob": "^8.0.3",
+    "ioredis": "^5.2.2",
     "lodash": "^4.17.21",
-    "msgpackr": "^1.4.6",
+    "msgpackr": "^1.6.2",
     "semver": "^7.3.7",
-    "tslib": "^1.14.1",
+    "tslib": "^2.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^8.3.5",
-    "@commitlint/config-conventional": "^8.3.4",
+    "@commitlint/cli": "^17.0.3",
+    "@commitlint/config-conventional": "^17.0.3",
     "@istanbuljs/nyc-config-typescript": "^0.1.3",
-    "@semantic-release/changelog": "^6.0.0",
+    "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/commit-analyzer": "^9.0.2",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^8.0.2",
-    "@semantic-release/npm": "^8.0.3",
+    "@semantic-release/github": "^8.0.5",
+    "@semantic-release/npm": "^9.0.1",
     "@semantic-release/release-notes-generator": "^10.0.3",
-    "@types/chai": "^4.2.22",
-    "@types/chai-as-promised": "^7.1.4",
+    "@types/chai": "^4.3.1",
+    "@types/chai-as-promised": "^7.1.5",
     "@types/glob": "^7.2.0",
     "@types/ioredis": "^4.28.2",
-    "@types/lodash": "^4.14.173",
+    "@types/lodash.defaults": "^4.2.7",
+    "@types/lodash.isarguments": "^3.1.7",
     "@types/mocha": "^5.2.7",
     "@types/msgpack": "^0.0.31",
     "@types/node": "^12.20.25",
     "@types/semver": "^7.3.9",
     "@types/sinon": "^7.5.2",
     "@types/uuid": "^3.4.10",
-    "@typescript-eslint/eslint-plugin": "4.5.0",
-    "@typescript-eslint/parser": "4.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "commitizen": "^4.2.4",
+    "commitizen": "^4.2.5",
     "copyfiles": "^2.4.1",
     "coveralls": "^3.1.1",
-    "eslint": "7.0.0",
-    "eslint-config-prettier": "6.7.0",
-    "eslint-plugin-mocha": "^8.2.0",
-    "eslint-plugin-prettier": "3.1.2",
-    "eslint-plugin-promise": "4.2.1",
-    "eslint-plugin-tsdoc": "^0.2.14",
-    "husky": "^3.1.0",
+    "eslint": "^8.22.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-promise": "6.0.0",
+    "eslint-plugin-tsdoc": "^0.2.16",
+    "husky": "^8.0.1",
     "istanbul": "^0.4.5",
-    "lint-staged": "10.5.4",
-    "mocha": "^6.2.3",
+    "lint-staged": "13.0.3",
+    "mocha": "^10.0.0",
     "mocha-lcov-reporter": "^1.3.0",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.1.1",
-    "prettier": "^2.4.1",
-    "pretty-quick": "^3.1.1",
+    "nyc": "^15.1.0",
+    "prettier": "^2.7.1",
+    "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
-    "semantic-release": "^18.0.1",
-    "sinon": "^7.5.0",
+    "semantic-release": "^19.0.3",
+    "sinon": "^14.0.0",
     "test-console": "^2.0.0",
-    "ts-mocha": "^8.0.0",
+    "ts-mocha": "^10.0.0",
     "ts-node": "^10.7.0",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.6.3"
+    "typedoc": "^0.23.0",
+    "typescript": "^4.7.4"
   },
   "nyc": {
     "extends": "@istanbuljs/nyc-config-typescript",
@@ -118,7 +125,29 @@
     ],
     "exclude": [
       "bullmq-tests/test_*.ts"
-    ]
+    ],
+    "lines": 80,
+    "functions": 80,
+    "branches": 70,
+    "statements": 80,
+    "watermarks": {
+      "lines": [
+        80,
+        95
+      ],
+      "functions": [
+        80,
+        95
+      ],
+      "branches": [
+        80,
+        95
+      ],
+      "statements": [
+        80,
+        95
+      ]
+    }
   },
   "config": {
     "commitizen": {
@@ -133,12 +162,6 @@
   "lint-staged": {
     "*.{js,ts}": "yarn eslint:fix"
   },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "npm-run-all pretty:quick lint:staged"
-    }
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/taskforcesh/bullmq.git"