bullmq 5.77.3 → 5.77.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/dist/cjs/commands/includes/requeueDeduplicatedJob.lua +10 -2
  2. package/dist/cjs/commands/includes/storeDeduplicatedNextJob.lua +3 -1
  3. package/dist/cjs/scripts/addDelayedJob-6.js +3 -1
  4. package/dist/cjs/scripts/addParentJob-6.js +3 -1
  5. package/dist/cjs/scripts/addPrioritizedJob-9.js +3 -1
  6. package/dist/cjs/scripts/addStandardJob-9.js +3 -1
  7. package/dist/cjs/scripts/moveToFinished-14.js +10 -2
  8. package/dist/cjs/tsconfig-cjs.tsbuildinfo +1 -1
  9. package/dist/cjs/version.js +1 -1
  10. package/dist/esm/commands/includes/requeueDeduplicatedJob.lua +10 -2
  11. package/dist/esm/commands/includes/storeDeduplicatedNextJob.lua +3 -1
  12. package/dist/esm/scripts/addDelayedJob-6.js +3 -1
  13. package/dist/esm/scripts/addParentJob-6.js +3 -1
  14. package/dist/esm/scripts/addPrioritizedJob-9.js +3 -1
  15. package/dist/esm/scripts/addStandardJob-9.js +3 -1
  16. package/dist/esm/scripts/moveToFinished-14.js +10 -2
  17. package/dist/esm/tsconfig.tsbuildinfo +1 -1
  18. package/dist/esm/version.d.ts +1 -1
  19. package/dist/esm/version.js +1 -1
  20. package/package.json +1 -1
package/dist/cjs/commands/includes/requeueDeduplicatedJob.lua CHANGED
@@ -17,9 +17,17 @@ local function requeueDeduplicatedJob(prefix, deduplicationId, eventStreamKey,
17
17
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
18
18
  if rcall("EXISTS", deduplicationNextKey) == 1 then
19
19
  local nextData = rcall("HMGET", deduplicationNextKey,
20
- "name", "data", "opts", "pk", "pd", "pdk", "rjk")
20
+ "name", "data", "opts", "pk", "pd", "pdk", "rjk", "jid")
21
21
 
22
- local newJobId = rcall("INCR", prefix .. "id") .. ""
22
+ -- Always increment the counter to keep it monotonic
23
+ local nextId = rcall("INCR", prefix .. "id") .. ""
24
+ local storedJobId = nextData[8] -- index 8 = "jid" (8th field in the HMGET call above)
25
+ local newJobId
26
+ if storedJobId then
27
+ newJobId = storedJobId
28
+ else
29
+ newJobId = nextId
30
+ end
23
31
  local newJobIdKey = prefix .. newJobId
24
32
  local newOpts = cjson.decode(nextData[3])
25
33
  local deduplicationKey = prefix .. "de:" .. deduplicationId
package/dist/cjs/commands/includes/storeDeduplicatedNextJob.lua CHANGED
@@ -14,7 +14,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
14
14
  local activeItems = rcall('LRANGE', activeKey, 0, -1)
15
15
  if checkItemInList(activeItems, currentDebounceJobId) then
16
16
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
17
- local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
17
+ local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
18
+ 'jid', jobId}
18
19
 
19
20
  if parentKey then
20
21
  fields[#fields+1] = 'pk'
@@ -36,6 +37,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
36
37
  fields[#fields+1] = repeatJobKey
37
38
  end
38
39
 
40
+ rcall('DEL', deduplicationNextKey)
39
41
  rcall('HSET', deduplicationNextKey, unpack(fields))
40
42
 
41
43
  -- Ensure the dedup key does not expire while the job is active,
package/dist/cjs/scripts/addDelayedJob-6.js CHANGED
@@ -155,7 +155,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
155
155
  local activeItems = rcall('LRANGE', activeKey, 0, -1)
156
156
  if checkItemInList(activeItems, currentDebounceJobId) then
157
157
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
158
- local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
158
+ local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
159
+ 'jid', jobId}
159
160
  if parentKey then
160
161
  fields[#fields+1] = 'pk'
161
162
  fields[#fields+1] = parentKey
@@ -172,6 +173,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
172
173
  fields[#fields+1] = 'rjk'
173
174
  fields[#fields+1] = repeatJobKey
174
175
  end
176
+ rcall('DEL', deduplicationNextKey)
175
177
  rcall('HSET', deduplicationNextKey, unpack(fields))
176
178
  -- Ensure the dedup key does not expire while the job is active,
177
179
  -- so subsequent adds always hit the dedup path and never bypass
package/dist/cjs/scripts/addParentJob-6.js CHANGED
@@ -86,7 +86,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
86
86
  local activeItems = rcall('LRANGE', activeKey, 0, -1)
87
87
  if checkItemInList(activeItems, currentDebounceJobId) then
88
88
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
89
- local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
89
+ local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
90
+ 'jid', jobId}
90
91
  if parentKey then
91
92
  fields[#fields+1] = 'pk'
92
93
  fields[#fields+1] = parentKey
@@ -103,6 +104,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
103
104
  fields[#fields+1] = 'rjk'
104
105
  fields[#fields+1] = repeatJobKey
105
106
  end
107
+ rcall('DEL', deduplicationNextKey)
106
108
  rcall('HSET', deduplicationNextKey, unpack(fields))
107
109
  -- Ensure the dedup key does not expire while the job is active,
108
110
  -- so subsequent adds always hit the dedup path and never bypass
package/dist/cjs/scripts/addPrioritizedJob-9.js CHANGED
@@ -120,7 +120,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
120
120
  local activeItems = rcall('LRANGE', activeKey, 0, -1)
121
121
  if checkItemInList(activeItems, currentDebounceJobId) then
122
122
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
123
- local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
123
+ local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
124
+ 'jid', jobId}
124
125
  if parentKey then
125
126
  fields[#fields+1] = 'pk'
126
127
  fields[#fields+1] = parentKey
@@ -137,6 +138,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
137
138
  fields[#fields+1] = 'rjk'
138
139
  fields[#fields+1] = repeatJobKey
139
140
  end
141
+ rcall('DEL', deduplicationNextKey)
140
142
  rcall('HSET', deduplicationNextKey, unpack(fields))
141
143
  -- Ensure the dedup key does not expire while the job is active,
142
144
  -- so subsequent adds always hit the dedup path and never bypass
package/dist/cjs/scripts/addStandardJob-9.js CHANGED
@@ -114,7 +114,8 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
114
114
  local activeItems = rcall('LRANGE', activeKey, 0, -1)
115
115
  if checkItemInList(activeItems, currentDebounceJobId) then
116
116
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
117
- local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts)}
117
+ local fields = {'name', jobName, 'data', jobData, 'opts', cjson.encode(fullOpts),
118
+ 'jid', jobId}
118
119
  if parentKey then
119
120
  fields[#fields+1] = 'pk'
120
121
  fields[#fields+1] = parentKey
@@ -131,6 +132,7 @@ local function storeDeduplicatedNextJob(deduplicationOpts, currentDebounceJobId,
131
132
  fields[#fields+1] = 'rjk'
132
133
  fields[#fields+1] = repeatJobKey
133
134
  end
135
+ rcall('DEL', deduplicationNextKey)
134
136
  rcall('HSET', deduplicationNextKey, unpack(fields))
135
137
  -- Ensure the dedup key does not expire while the job is active,
136
138
  -- so subsequent adds always hit the dedup path and never bypass
package/dist/cjs/scripts/moveToFinished-14.js CHANGED
@@ -829,8 +829,16 @@ local function requeueDeduplicatedJob(prefix, deduplicationId, eventStreamKey,
829
829
  local deduplicationNextKey = prefix .. "dn:" .. deduplicationId
830
830
  if rcall("EXISTS", deduplicationNextKey) == 1 then
831
831
  local nextData = rcall("HMGET", deduplicationNextKey,
832
- "name", "data", "opts", "pk", "pd", "pdk", "rjk")
833
- local newJobId = rcall("INCR", prefix .. "id") .. ""
832
+ "name", "data", "opts", "pk", "pd", "pdk", "rjk", "jid")
833
+ -- Always increment the counter to keep it monotonic
834
+ local nextId = rcall("INCR", prefix .. "id") .. ""
835
+ local storedJobId = nextData[8] -- index 8 = "jid" (8th field in the HMGET call above)
836
+ local newJobId
837
+ if storedJobId then
838
+ newJobId = storedJobId
839
+ else
840
+ newJobId = nextId
841
+ end
834
842
  local newJobIdKey = prefix .. newJobId
835
843
  local newOpts = cjson.decode(nextData[3])
836
844
  local deduplicationKey = prefix .. "de:" .. deduplicationId