bunqueue 1.9.9 → 2.0.1
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.
- package/dist/application/backgroundTasks.d.ts +10 -0
- package/dist/application/backgroundTasks.d.ts.map +1 -1
- package/dist/application/backgroundTasks.js +67 -6
- package/dist/application/backgroundTasks.js.map +1 -1
- package/dist/application/cleanupTasks.js +1 -1
- package/dist/application/cleanupTasks.js.map +1 -1
- package/dist/application/clientTracking.d.ts.map +1 -1
- package/dist/application/clientTracking.js +23 -10
- package/dist/application/clientTracking.js.map +1 -1
- package/dist/application/dependencyProcessor.d.ts.map +1 -1
- package/dist/application/dependencyProcessor.js +14 -13
- package/dist/application/dependencyProcessor.js.map +1 -1
- package/dist/application/eventsManager.d.ts.map +1 -1
- package/dist/application/eventsManager.js +16 -4
- package/dist/application/eventsManager.js.map +1 -1
- package/dist/application/jobLogsManager.d.ts +2 -2
- package/dist/application/jobLogsManager.d.ts.map +1 -1
- package/dist/application/jobLogsManager.js +13 -3
- package/dist/application/jobLogsManager.js.map +1 -1
- package/dist/application/lockManager.js +1 -1
- package/dist/application/lockManager.js.map +1 -1
- package/dist/application/operations/ack.d.ts +2 -1
- package/dist/application/operations/ack.d.ts.map +1 -1
- package/dist/application/operations/ack.js +12 -0
- package/dist/application/operations/ack.js.map +1 -1
- package/dist/application/operations/jobManagement.d.ts +1 -1
- package/dist/application/operations/jobManagement.d.ts.map +1 -1
- package/dist/application/operations/jobManagement.js +23 -3
- package/dist/application/operations/jobManagement.js.map +1 -1
- package/dist/application/operations/push.d.ts +1 -1
- package/dist/application/operations/push.d.ts.map +1 -1
- package/dist/application/operations/push.js +13 -5
- package/dist/application/operations/push.js.map +1 -1
- package/dist/application/operations/queryOperations.d.ts +3 -0
- package/dist/application/operations/queryOperations.d.ts.map +1 -1
- package/dist/application/operations/queryOperations.js +29 -0
- package/dist/application/operations/queryOperations.js.map +1 -1
- package/dist/application/queueManager.d.ts +15 -1
- package/dist/application/queueManager.d.ts.map +1 -1
- package/dist/application/queueManager.js +69 -2
- package/dist/application/queueManager.js.map +1 -1
- package/dist/application/stallDetection.js +25 -20
- package/dist/application/stallDetection.js.map +1 -1
- package/dist/application/webhookManager.d.ts.map +1 -1
- package/dist/application/webhookManager.js +18 -2
- package/dist/application/webhookManager.js.map +1 -1
- package/dist/application/workerManager.d.ts.map +1 -1
- package/dist/application/workerManager.js +4 -2
- package/dist/application/workerManager.js.map +1 -1
- package/dist/client/events.d.ts +29 -0
- package/dist/client/events.d.ts.map +1 -1
- package/dist/client/events.js +92 -21
- package/dist/client/events.js.map +1 -1
- package/dist/client/flow.d.ts +122 -3
- package/dist/client/flow.d.ts.map +1 -1
- package/dist/client/flow.js +374 -2
- package/dist/client/flow.js.map +1 -1
- package/dist/client/index.d.ts +2 -2
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/queue/queue.d.ts +260 -1
- package/dist/client/queue/queue.d.ts.map +1 -1
- package/dist/client/queue/queue.js +1343 -16
- package/dist/client/queue/queue.js.map +1 -1
- package/dist/client/tcpPool.d.ts.map +1 -1
- package/dist/client/tcpPool.js +19 -8
- package/dist/client/tcpPool.js.map +1 -1
- package/dist/client/types.d.ts +430 -13
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js +346 -5
- package/dist/client/types.js.map +1 -1
- package/dist/client/worker/ackBatcher.d.ts +1 -0
- package/dist/client/worker/ackBatcher.d.ts.map +1 -1
- package/dist/client/worker/ackBatcher.js +9 -0
- package/dist/client/worker/ackBatcher.js.map +1 -1
- package/dist/client/worker/processor.js +6 -1
- package/dist/client/worker/processor.js.map +1 -1
- package/dist/client/worker/worker.d.ts +117 -0
- package/dist/client/worker/worker.d.ts.map +1 -1
- package/dist/client/worker/worker.js +375 -3
- package/dist/client/worker/worker.js.map +1 -1
- package/dist/domain/queue/priorityQueue.d.ts.map +1 -1
- package/dist/domain/queue/priorityQueue.js +24 -18
- package/dist/domain/queue/priorityQueue.js.map +1 -1
- package/dist/domain/queue/shard.d.ts +4 -0
- package/dist/domain/queue/shard.d.ts.map +1 -1
- package/dist/domain/queue/shard.js +21 -7
- package/dist/domain/queue/shard.js.map +1 -1
- package/dist/domain/types/job.d.ts +89 -2
- package/dist/domain/types/job.d.ts.map +1 -1
- package/dist/domain/types/job.js +94 -26
- package/dist/domain/types/job.js.map +1 -1
- package/dist/domain/types/queue.d.ts +11 -1
- package/dist/domain/types/queue.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.d.ts +9 -4
- package/dist/infrastructure/persistence/sqliteBatch.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.js +34 -17
- package/dist/infrastructure/persistence/sqliteBatch.js.map +1 -1
- package/dist/infrastructure/persistence/sqliteSerializer.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteSerializer.js +14 -0
- package/dist/infrastructure/persistence/sqliteSerializer.js.map +1 -1
- package/dist/infrastructure/scheduler/cronScheduler.d.ts.map +1 -1
- package/dist/infrastructure/scheduler/cronScheduler.js +29 -15
- package/dist/infrastructure/scheduler/cronScheduler.js.map +1 -1
- package/dist/infrastructure/server/handlers/query.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/query.js +1 -16
- package/dist/infrastructure/server/handlers/query.js.map +1 -1
- package/dist/infrastructure/server/rateLimiter.d.ts.map +1 -1
- package/dist/infrastructure/server/rateLimiter.js +5 -3
- package/dist/infrastructure/server/rateLimiter.js.map +1 -1
- package/dist/infrastructure/server/tcp.d.ts.map +1 -1
- package/dist/infrastructure/server/tcp.js +36 -4
- package/dist/infrastructure/server/tcp.js.map +1 -1
- package/dist/main.js +5 -2
- package/dist/main.js.map +1 -1
- package/dist/shared/lock.d.ts +1 -1
- package/dist/shared/lock.d.ts.map +1 -1
- package/dist/shared/lock.js +6 -4
- package/dist/shared/lock.js.map +1 -1
- package/dist/shared/lru.d.ts +28 -0
- package/dist/shared/lru.d.ts.map +1 -1
- package/dist/shared/lru.js +28 -0
- package/dist/shared/lru.js.map +1 -1
- package/package.json +1 -1
package/dist/client/types.js
CHANGED
|
@@ -9,10 +9,114 @@ function extractUserData(jobData) {
|
|
|
9
9
|
}
|
|
10
10
|
return jobData;
|
|
11
11
|
}
|
|
12
|
+
/** Extract parent info from job data if present */
|
|
13
|
+
function extractParent(jobData) {
|
|
14
|
+
if (typeof jobData === 'object' && jobData !== null) {
|
|
15
|
+
const data = jobData;
|
|
16
|
+
const parentId = data.__parentId;
|
|
17
|
+
const parentQueue = data.__parentQueue;
|
|
18
|
+
if (parentId !== undefined &&
|
|
19
|
+
parentQueue !== undefined &&
|
|
20
|
+
(typeof parentId === 'string' || typeof parentId === 'number') &&
|
|
21
|
+
(typeof parentQueue === 'string' || typeof parentQueue === 'number')) {
|
|
22
|
+
return {
|
|
23
|
+
id: String(parentId),
|
|
24
|
+
queueQualifiedName: String(parentQueue),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
/** Build repeat options from internal job repeat config */
|
|
31
|
+
function buildRepeatOpts(repeat) {
|
|
32
|
+
if (!repeat)
|
|
33
|
+
return undefined;
|
|
34
|
+
return {
|
|
35
|
+
every: repeat.every,
|
|
36
|
+
limit: repeat.limit,
|
|
37
|
+
pattern: repeat.pattern,
|
|
38
|
+
count: repeat.count,
|
|
39
|
+
startDate: repeat.startDate,
|
|
40
|
+
endDate: repeat.endDate,
|
|
41
|
+
tz: repeat.tz,
|
|
42
|
+
immediately: repeat.immediately,
|
|
43
|
+
prevMillis: repeat.prevMillis,
|
|
44
|
+
offset: repeat.offset,
|
|
45
|
+
jobId: repeat.jobId,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
/** Build parent reference from job data */
|
|
49
|
+
function buildParentOpts(job) {
|
|
50
|
+
const data = job.data;
|
|
51
|
+
const rawParentId = job.parentId ?? data?.__parentId;
|
|
52
|
+
const rawParentQueue = data?.__parentQueue;
|
|
53
|
+
// Only create parent if both values are string-coercible
|
|
54
|
+
const isStringLike = (v) => typeof v === 'string' || typeof v === 'number';
|
|
55
|
+
if (isStringLike(rawParentId) && isStringLike(rawParentQueue)) {
|
|
56
|
+
return { id: String(rawParentId), queue: String(rawParentQueue) };
|
|
57
|
+
}
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
/** Build JobOptions from internal job */
|
|
61
|
+
function buildJobOpts(job) {
|
|
62
|
+
const backoff = job.backoffConfig
|
|
63
|
+
? { type: job.backoffConfig.type, delay: job.backoffConfig.delay }
|
|
64
|
+
: job.backoff;
|
|
65
|
+
return {
|
|
66
|
+
priority: job.priority,
|
|
67
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
68
|
+
attempts: job.maxAttempts,
|
|
69
|
+
backoff,
|
|
70
|
+
timeout: job.timeout ?? undefined,
|
|
71
|
+
jobId: job.customId ?? undefined,
|
|
72
|
+
removeOnComplete: job.removeOnComplete,
|
|
73
|
+
removeOnFail: job.removeOnFail,
|
|
74
|
+
stallTimeout: job.stallTimeout ?? undefined,
|
|
75
|
+
repeat: buildRepeatOpts(job.repeat),
|
|
76
|
+
parent: buildParentOpts(job),
|
|
77
|
+
lifo: job.lifo,
|
|
78
|
+
stackTraceLimit: job.stackTraceLimit,
|
|
79
|
+
keepLogs: job.keepLogs ?? undefined,
|
|
80
|
+
sizeLimit: job.sizeLimit ?? undefined,
|
|
81
|
+
failParentOnFailure: job.failParentOnFailure,
|
|
82
|
+
removeDependencyOnFailure: job.removeDependencyOnFailure,
|
|
83
|
+
deduplication: job.deduplicationTtl !== null
|
|
84
|
+
? { id: job.customId ?? '', ttl: job.deduplicationTtl }
|
|
85
|
+
: undefined,
|
|
86
|
+
debounce: job.debounceId && job.debounceTtl !== null
|
|
87
|
+
? { id: job.debounceId, ttl: job.debounceTtl }
|
|
88
|
+
: undefined,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
/** Build parent key from job */
|
|
92
|
+
function buildParentKey(job) {
|
|
93
|
+
if (job.parentId) {
|
|
94
|
+
// Try to get parent queue from job data
|
|
95
|
+
const data = job.data;
|
|
96
|
+
const parentQueue = data?.__parentQueue;
|
|
97
|
+
if (parentQueue && (typeof parentQueue === 'string' || typeof parentQueue === 'number')) {
|
|
98
|
+
return `${String(parentQueue)}:${job.parentId}`;
|
|
99
|
+
}
|
|
100
|
+
return `unknown:${job.parentId}`;
|
|
101
|
+
}
|
|
102
|
+
return undefined;
|
|
103
|
+
}
|
|
104
|
+
/** Build repeat job key from job */
|
|
105
|
+
function buildRepeatJobKey(job) {
|
|
106
|
+
if (job.repeat) {
|
|
107
|
+
const pattern = job.repeat.pattern ?? (job.repeat.every ? `every:${job.repeat.every}` : '');
|
|
108
|
+
return `${job.queue}:${job.id}:${pattern}`;
|
|
109
|
+
}
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
12
112
|
/** Convert internal job to public job (with methods) */
|
|
13
|
-
export function createPublicJob(
|
|
113
|
+
export function createPublicJob(opts) {
|
|
114
|
+
const { job, name, updateProgress, log, getState, remove, retry, getChildrenValues, updateData, promote, changeDelay, changePriority, extendLock, clearLogs, getDependencies, getDependenciesCount, moveToCompleted, moveToFailed, moveToWait, moveToDelayed, moveToWaitingChildren, waitUntilFinished, discard, getFailedChildrenValues, getIgnoredChildrenFailures, removeChildDependency, removeDeduplicationKey, removeUnprocessedChildren, token, processedBy, stacktrace, } = opts;
|
|
14
115
|
const id = String(job.id);
|
|
15
|
-
|
|
116
|
+
const parent = extractParent(job.data);
|
|
117
|
+
const jobOpts = buildJobOpts(job);
|
|
118
|
+
const publicJob = {
|
|
119
|
+
// Core properties
|
|
16
120
|
id,
|
|
17
121
|
name,
|
|
18
122
|
data: extractUserData(job.data),
|
|
@@ -20,14 +124,135 @@ export function createPublicJob(job, name, updateProgress, log) {
|
|
|
20
124
|
attemptsMade: job.attempts,
|
|
21
125
|
timestamp: job.createdAt,
|
|
22
126
|
progress: job.progress,
|
|
127
|
+
parent,
|
|
128
|
+
// BullMQ v5 properties
|
|
129
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
130
|
+
processedOn: job.startedAt ?? undefined,
|
|
131
|
+
finishedOn: job.completedAt ?? undefined,
|
|
132
|
+
stacktrace: stacktrace ?? null,
|
|
133
|
+
stalledCounter: job.stallCount,
|
|
134
|
+
priority: job.priority,
|
|
135
|
+
parentKey: buildParentKey(job),
|
|
136
|
+
opts: jobOpts,
|
|
137
|
+
token,
|
|
138
|
+
processedBy,
|
|
139
|
+
deduplicationId: job.customId ?? undefined,
|
|
140
|
+
repeatJobKey: buildRepeatJobKey(job),
|
|
141
|
+
attemptsStarted: job.attempts,
|
|
142
|
+
// Core methods
|
|
23
143
|
updateProgress: (progress, message) => updateProgress(id, progress, message),
|
|
24
144
|
log: (message) => log(id, message),
|
|
145
|
+
getState: () => (getState ? getState(id) : Promise.resolve('unknown')),
|
|
146
|
+
remove: () => (remove ? remove(id) : Promise.resolve()),
|
|
147
|
+
retry: () => (retry ? retry(id) : Promise.resolve()),
|
|
148
|
+
getChildrenValues: () => getChildrenValues ? getChildrenValues(id) : Promise.resolve({}),
|
|
149
|
+
// BullMQ v5 state check methods
|
|
150
|
+
isWaiting: async () => {
|
|
151
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
152
|
+
return state === 'waiting';
|
|
153
|
+
},
|
|
154
|
+
isActive: async () => {
|
|
155
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
156
|
+
return state === 'active';
|
|
157
|
+
},
|
|
158
|
+
isDelayed: async () => {
|
|
159
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
160
|
+
return state === 'delayed';
|
|
161
|
+
},
|
|
162
|
+
isCompleted: async () => {
|
|
163
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
164
|
+
return state === 'completed';
|
|
165
|
+
},
|
|
166
|
+
isFailed: async () => {
|
|
167
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
168
|
+
return state === 'failed';
|
|
169
|
+
},
|
|
170
|
+
isWaitingChildren: async () => {
|
|
171
|
+
// Check if job has pending children
|
|
172
|
+
if (getDependenciesCount) {
|
|
173
|
+
const counts = await getDependenciesCount(id);
|
|
174
|
+
return counts.unprocessed > 0;
|
|
175
|
+
}
|
|
176
|
+
return false;
|
|
177
|
+
},
|
|
178
|
+
// BullMQ v5 mutation methods
|
|
179
|
+
updateData: (data) => (updateData ? updateData(id, data) : Promise.resolve()),
|
|
180
|
+
promote: () => (promote ? promote(id) : Promise.resolve()),
|
|
181
|
+
changeDelay: (delay) => (changeDelay ? changeDelay(id, delay) : Promise.resolve()),
|
|
182
|
+
changePriority: (prioOpts) => changePriority ? changePriority(id, prioOpts) : Promise.resolve(),
|
|
183
|
+
extendLock: (lockToken, duration) => extendLock ? extendLock(id, lockToken, duration) : Promise.resolve(0),
|
|
184
|
+
clearLogs: (keepLogs) => (clearLogs ? clearLogs(id, keepLogs) : Promise.resolve()),
|
|
185
|
+
// BullMQ v5 dependency methods
|
|
186
|
+
getDependencies: (depOpts) => getDependencies
|
|
187
|
+
? getDependencies(id, depOpts)
|
|
188
|
+
: Promise.resolve({ processed: {}, unprocessed: [] }),
|
|
189
|
+
getDependenciesCount: (depOpts) => getDependenciesCount
|
|
190
|
+
? getDependenciesCount(id, depOpts)
|
|
191
|
+
: Promise.resolve({ processed: 0, unprocessed: 0 }),
|
|
192
|
+
// BullMQ v5 serialization methods
|
|
193
|
+
toJSON: () => ({
|
|
194
|
+
id,
|
|
195
|
+
name,
|
|
196
|
+
data: extractUserData(job.data),
|
|
197
|
+
opts: jobOpts,
|
|
198
|
+
progress: job.progress,
|
|
199
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
200
|
+
timestamp: job.createdAt,
|
|
201
|
+
attemptsMade: job.attempts,
|
|
202
|
+
stacktrace: stacktrace ?? null,
|
|
203
|
+
returnvalue: undefined,
|
|
204
|
+
failedReason: undefined,
|
|
205
|
+
finishedOn: job.completedAt ?? undefined,
|
|
206
|
+
processedOn: job.startedAt ?? undefined,
|
|
207
|
+
queueQualifiedName: `bull:${job.queue}`,
|
|
208
|
+
parentKey: buildParentKey(job),
|
|
209
|
+
}),
|
|
210
|
+
asJSON: () => ({
|
|
211
|
+
id,
|
|
212
|
+
name,
|
|
213
|
+
data: JSON.stringify(extractUserData(job.data)),
|
|
214
|
+
opts: JSON.stringify(jobOpts),
|
|
215
|
+
progress: JSON.stringify(job.progress),
|
|
216
|
+
delay: String(job.runAt > job.createdAt ? job.runAt - job.createdAt : 0),
|
|
217
|
+
timestamp: String(job.createdAt),
|
|
218
|
+
attemptsMade: String(job.attempts),
|
|
219
|
+
stacktrace: stacktrace ? JSON.stringify(stacktrace) : null,
|
|
220
|
+
returnvalue: undefined,
|
|
221
|
+
failedReason: undefined,
|
|
222
|
+
finishedOn: job.completedAt ? String(job.completedAt) : undefined,
|
|
223
|
+
processedOn: job.startedAt ? String(job.startedAt) : undefined,
|
|
224
|
+
parentKey: buildParentKey(job),
|
|
225
|
+
}),
|
|
226
|
+
// BullMQ v5 move methods
|
|
227
|
+
moveToCompleted: (returnValue, lockToken, _fetchNext) => moveToCompleted ? moveToCompleted(id, returnValue, lockToken) : Promise.resolve(null),
|
|
228
|
+
moveToFailed: (error, lockToken, _fetchNext) => moveToFailed ? moveToFailed(id, error, lockToken) : Promise.resolve(),
|
|
229
|
+
moveToWait: (lockToken) => moveToWait ? moveToWait(id, lockToken) : Promise.resolve(false),
|
|
230
|
+
moveToDelayed: (timestamp, lockToken) => moveToDelayed ? moveToDelayed(id, timestamp, lockToken) : Promise.resolve(),
|
|
231
|
+
moveToWaitingChildren: (lockToken, moveOpts) => moveToWaitingChildren
|
|
232
|
+
? moveToWaitingChildren(id, lockToken, moveOpts)
|
|
233
|
+
: Promise.resolve(false),
|
|
234
|
+
waitUntilFinished: (queueEvents, ttl) => waitUntilFinished ? waitUntilFinished(id, queueEvents, ttl) : Promise.resolve(undefined),
|
|
235
|
+
// BullMQ v5 additional methods
|
|
236
|
+
discard: () => {
|
|
237
|
+
if (discard)
|
|
238
|
+
discard(id);
|
|
239
|
+
},
|
|
240
|
+
getFailedChildrenValues: () => getFailedChildrenValues ? getFailedChildrenValues(id) : Promise.resolve({}),
|
|
241
|
+
getIgnoredChildrenFailures: () => getIgnoredChildrenFailures ? getIgnoredChildrenFailures(id) : Promise.resolve({}),
|
|
242
|
+
removeChildDependency: () => removeChildDependency ? removeChildDependency(id) : Promise.resolve(false),
|
|
243
|
+
removeDeduplicationKey: () => removeDeduplicationKey ? removeDeduplicationKey(id) : Promise.resolve(false),
|
|
244
|
+
removeUnprocessedChildren: () => removeUnprocessedChildren ? removeUnprocessedChildren(id) : Promise.resolve(),
|
|
25
245
|
};
|
|
246
|
+
return publicJob;
|
|
26
247
|
}
|
|
27
248
|
/** Simple public job without methods (for Queue.getJob) */
|
|
28
|
-
export function toPublicJob(
|
|
249
|
+
export function toPublicJob(opts) {
|
|
250
|
+
const { job, name, getState, remove, retry, getChildrenValues, updateData, promote, changeDelay, changePriority, extendLock, clearLogs, getDependencies, getDependenciesCount, moveToCompleted, moveToFailed, moveToWait, moveToDelayed, moveToWaitingChildren, waitUntilFinished, discard, getFailedChildrenValues, getIgnoredChildrenFailures, removeChildDependency, removeDeduplicationKey, removeUnprocessedChildren, stacktrace, } = opts;
|
|
29
251
|
const id = String(job.id);
|
|
30
|
-
|
|
252
|
+
const parent = extractParent(job.data);
|
|
253
|
+
const jobOpts = buildJobOpts(job);
|
|
254
|
+
const publicJob = {
|
|
255
|
+
// Core properties
|
|
31
256
|
id,
|
|
32
257
|
name,
|
|
33
258
|
data: extractUserData(job.data),
|
|
@@ -35,15 +260,131 @@ export function toPublicJob(job, name) {
|
|
|
35
260
|
attemptsMade: job.attempts,
|
|
36
261
|
timestamp: job.createdAt,
|
|
37
262
|
progress: job.progress,
|
|
263
|
+
parent,
|
|
264
|
+
// BullMQ v5 properties
|
|
265
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
266
|
+
processedOn: job.startedAt ?? undefined,
|
|
267
|
+
finishedOn: job.completedAt ?? undefined,
|
|
268
|
+
stacktrace: stacktrace ?? null,
|
|
269
|
+
stalledCounter: job.stallCount,
|
|
270
|
+
priority: job.priority,
|
|
271
|
+
parentKey: buildParentKey(job),
|
|
272
|
+
opts: jobOpts,
|
|
273
|
+
token: undefined,
|
|
274
|
+
processedBy: undefined,
|
|
275
|
+
deduplicationId: job.customId ?? undefined,
|
|
276
|
+
repeatJobKey: buildRepeatJobKey(job),
|
|
277
|
+
attemptsStarted: job.attempts,
|
|
278
|
+
// Core methods (no-op for simple jobs)
|
|
38
279
|
updateProgress: async () => { },
|
|
39
280
|
log: async () => { },
|
|
281
|
+
getState: () => (getState ? getState(id) : Promise.resolve('unknown')),
|
|
282
|
+
remove: () => (remove ? remove(id) : Promise.resolve()),
|
|
283
|
+
retry: () => (retry ? retry(id) : Promise.resolve()),
|
|
284
|
+
getChildrenValues: () => getChildrenValues ? getChildrenValues(id) : Promise.resolve({}),
|
|
285
|
+
// BullMQ v5 state check methods
|
|
286
|
+
isWaiting: async () => {
|
|
287
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
288
|
+
return state === 'waiting';
|
|
289
|
+
},
|
|
290
|
+
isActive: async () => {
|
|
291
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
292
|
+
return state === 'active';
|
|
293
|
+
},
|
|
294
|
+
isDelayed: async () => {
|
|
295
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
296
|
+
return state === 'delayed';
|
|
297
|
+
},
|
|
298
|
+
isCompleted: async () => {
|
|
299
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
300
|
+
return state === 'completed';
|
|
301
|
+
},
|
|
302
|
+
isFailed: async () => {
|
|
303
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
304
|
+
return state === 'failed';
|
|
305
|
+
},
|
|
306
|
+
isWaitingChildren: async () => {
|
|
307
|
+
if (getDependenciesCount) {
|
|
308
|
+
const counts = await getDependenciesCount(id);
|
|
309
|
+
return counts.unprocessed > 0;
|
|
310
|
+
}
|
|
311
|
+
return false;
|
|
312
|
+
},
|
|
313
|
+
// BullMQ v5 mutation methods
|
|
314
|
+
updateData: (data) => (updateData ? updateData(id, data) : Promise.resolve()),
|
|
315
|
+
promote: () => (promote ? promote(id) : Promise.resolve()),
|
|
316
|
+
changeDelay: (delay) => (changeDelay ? changeDelay(id, delay) : Promise.resolve()),
|
|
317
|
+
changePriority: (prioOpts) => changePriority ? changePriority(id, prioOpts) : Promise.resolve(),
|
|
318
|
+
extendLock: (lockToken, duration) => extendLock ? extendLock(id, lockToken, duration) : Promise.resolve(0),
|
|
319
|
+
clearLogs: (keepLogs) => (clearLogs ? clearLogs(id, keepLogs) : Promise.resolve()),
|
|
320
|
+
// BullMQ v5 dependency methods
|
|
321
|
+
getDependencies: (depOpts) => getDependencies
|
|
322
|
+
? getDependencies(id, depOpts)
|
|
323
|
+
: Promise.resolve({ processed: {}, unprocessed: [] }),
|
|
324
|
+
getDependenciesCount: (depOpts) => getDependenciesCount
|
|
325
|
+
? getDependenciesCount(id, depOpts)
|
|
326
|
+
: Promise.resolve({ processed: 0, unprocessed: 0 }),
|
|
327
|
+
// BullMQ v5 serialization methods
|
|
328
|
+
toJSON: () => ({
|
|
329
|
+
id,
|
|
330
|
+
name,
|
|
331
|
+
data: extractUserData(job.data),
|
|
332
|
+
opts: jobOpts,
|
|
333
|
+
progress: job.progress,
|
|
334
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
335
|
+
timestamp: job.createdAt,
|
|
336
|
+
attemptsMade: job.attempts,
|
|
337
|
+
stacktrace: stacktrace ?? null,
|
|
338
|
+
returnvalue: undefined,
|
|
339
|
+
failedReason: undefined,
|
|
340
|
+
finishedOn: job.completedAt ?? undefined,
|
|
341
|
+
processedOn: job.startedAt ?? undefined,
|
|
342
|
+
queueQualifiedName: `bull:${job.queue}`,
|
|
343
|
+
parentKey: buildParentKey(job),
|
|
344
|
+
}),
|
|
345
|
+
asJSON: () => ({
|
|
346
|
+
id,
|
|
347
|
+
name,
|
|
348
|
+
data: JSON.stringify(extractUserData(job.data)),
|
|
349
|
+
opts: JSON.stringify(jobOpts),
|
|
350
|
+
progress: JSON.stringify(job.progress),
|
|
351
|
+
delay: String(job.runAt > job.createdAt ? job.runAt - job.createdAt : 0),
|
|
352
|
+
timestamp: String(job.createdAt),
|
|
353
|
+
attemptsMade: String(job.attempts),
|
|
354
|
+
stacktrace: stacktrace ? JSON.stringify(stacktrace) : null,
|
|
355
|
+
returnvalue: undefined,
|
|
356
|
+
failedReason: undefined,
|
|
357
|
+
finishedOn: job.completedAt ? String(job.completedAt) : undefined,
|
|
358
|
+
processedOn: job.startedAt ? String(job.startedAt) : undefined,
|
|
359
|
+
parentKey: buildParentKey(job),
|
|
360
|
+
}),
|
|
361
|
+
// BullMQ v5 move methods
|
|
362
|
+
moveToCompleted: (returnValue, lockToken, _fetchNext) => moveToCompleted ? moveToCompleted(id, returnValue, lockToken) : Promise.resolve(null),
|
|
363
|
+
moveToFailed: (error, lockToken, _fetchNext) => moveToFailed ? moveToFailed(id, error, lockToken) : Promise.resolve(),
|
|
364
|
+
moveToWait: (lockToken) => moveToWait ? moveToWait(id, lockToken) : Promise.resolve(false),
|
|
365
|
+
moveToDelayed: (timestamp, lockToken) => moveToDelayed ? moveToDelayed(id, timestamp, lockToken) : Promise.resolve(),
|
|
366
|
+
moveToWaitingChildren: (lockToken, moveOpts) => moveToWaitingChildren
|
|
367
|
+
? moveToWaitingChildren(id, lockToken, moveOpts)
|
|
368
|
+
: Promise.resolve(false),
|
|
369
|
+
waitUntilFinished: (queueEvents, ttl) => waitUntilFinished ? waitUntilFinished(id, queueEvents, ttl) : Promise.resolve(undefined),
|
|
370
|
+
// BullMQ v5 additional methods
|
|
371
|
+
discard: () => {
|
|
372
|
+
if (discard)
|
|
373
|
+
discard(id);
|
|
374
|
+
},
|
|
375
|
+
getFailedChildrenValues: () => getFailedChildrenValues ? getFailedChildrenValues(id) : Promise.resolve({}),
|
|
376
|
+
getIgnoredChildrenFailures: () => getIgnoredChildrenFailures ? getIgnoredChildrenFailures(id) : Promise.resolve({}),
|
|
377
|
+
removeChildDependency: () => removeChildDependency ? removeChildDependency(id) : Promise.resolve(false),
|
|
378
|
+
removeDeduplicationKey: () => removeDeduplicationKey ? removeDeduplicationKey(id) : Promise.resolve(false),
|
|
379
|
+
removeUnprocessedChildren: () => removeUnprocessedChildren ? removeUnprocessedChildren(id) : Promise.resolve(),
|
|
40
380
|
};
|
|
381
|
+
return publicJob;
|
|
41
382
|
}
|
|
42
383
|
/** Convert internal DLQ entry to public DLQ entry */
|
|
43
384
|
export function toDlqEntry(entry) {
|
|
44
385
|
const jobData = entry.job.data;
|
|
45
386
|
return {
|
|
46
|
-
job: toPublicJob(entry.job, jobData?.name ?? 'default'),
|
|
387
|
+
job: toPublicJob({ job: entry.job, name: jobData?.name ?? 'default' }),
|
|
47
388
|
enteredAt: entry.enteredAt,
|
|
48
389
|
reason: entry.reason,
|
|
49
390
|
error: entry.error,
|
package/dist/client/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AA0LH,6EAA6E;AAC7E,SAAS,eAAe,CAAC,OAAgB;IACvC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACpD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAkC,CAAC;QACxE,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,eAAe,CAC7B,GAAgB,EAChB,IAAY,EACZ,cAAiF,EACjF,GAAmD;IAEnD,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1B,OAAO;QACL,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,CAAM;QACpC,SAAS,EAAE,GAAG,CAAC,KAAK;QACpB,YAAY,EAAE,GAAG,CAAC,QAAQ;QAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,cAAc,EAAE,CAAC,QAAgB,EAAE,OAAgB,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC;QAC7F,GAAG,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,WAAW,CAAI,GAAgB,EAAE,IAAY;IAC3D,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1B,OAAO;QACL,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC,IAAI,CAAM;QACpC,SAAS,EAAE,GAAG,CAAC,KAAK;QACpB,YAAY,EAAE,GAAG,CAAC,QAAQ;QAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,cAAc,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;QAC9B,GAAG,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;KACpB,CAAC;AACJ,CAAC;AAID,qDAAqD;AACrD,MAAM,UAAU,UAAU,CAAI,KAAuB;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,IAAgC,CAAC;IAC3D,OAAO;QACL,GAAG,EAAE,WAAW,CAAI,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,SAAS,CAAC;QAC1D,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,MAAM,EAAE,KAAK,CAAC,MAAuB;QACrC,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnC,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,MAAM,EAAE,CAAC,CAAC,MAAuB;YACjC,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,QAAQ,EAAE,CAAC,CAAC,QAAQ;SACrB,CAAC,CAAC;QACH,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ackBatcher.d.ts","sourceRoot":"","sources":["../../../src/client/worker/ackBatcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,SAAS,CAAC;AAIzD,gCAAgC;AAChC,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,GAAG,CAA8B;IACzC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiC;gBAErD,MAAM,EAAE,gBAAgB;IAIpC,yBAAyB;IACzB,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;IAIvC,gEAAgE;IAChE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ackBatcher.d.ts","sourceRoot":"","sources":["../../../src/client/worker/ackBatcher.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,SAAS,CAAC;AAIzD,gCAAgC;AAChC,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAKD;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAA8C;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,GAAG,CAA8B;IACzC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiC;gBAErD,MAAM,EAAE,gBAAgB;IAIpC,yBAAyB;IACzB,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;IAIvC,gEAAgE;IAChE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCjE,0CAA0C;IACpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAa5B,gDAAgD;YAClC,kBAAkB;IA8DhC,gEAAgE;IAChE,IAAI,IAAI,IAAI;IAUZ,sCAAsC;IACtC,UAAU,IAAI,OAAO;IAIrB,0DAA0D;IACpD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAIvC"}
|
|
@@ -10,6 +10,7 @@ const DEFAULT_RETRY_DELAY_MS = 100;
|
|
|
10
10
|
* Batches ACK operations for efficient processing
|
|
11
11
|
*/
|
|
12
12
|
export class AckBatcher {
|
|
13
|
+
MAX_PENDING_ACKS = 10000;
|
|
13
14
|
pendingAcks = [];
|
|
14
15
|
ackTimer = null;
|
|
15
16
|
config;
|
|
@@ -27,6 +28,14 @@ export class AckBatcher {
|
|
|
27
28
|
/** Queue ACK for batch processing (with optional lock token) */
|
|
28
29
|
queue(id, result, token) {
|
|
29
30
|
return new Promise((resolve, reject) => {
|
|
31
|
+
// Prevent unbounded memory growth during server outages
|
|
32
|
+
if (this.pendingAcks.length >= this.MAX_PENDING_ACKS) {
|
|
33
|
+
// Drop oldest entries (10%) and reject their promises
|
|
34
|
+
const dropped = this.pendingAcks.splice(0, Math.floor(this.MAX_PENDING_ACKS * 0.1));
|
|
35
|
+
for (const ack of dropped) {
|
|
36
|
+
ack.reject(new Error('Ack buffer overflow - oldest entries dropped'));
|
|
37
|
+
}
|
|
38
|
+
}
|
|
30
39
|
this.pendingAcks.push({
|
|
31
40
|
id,
|
|
32
41
|
result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ackBatcher.js","sourceRoot":"","sources":["../../../src/client/worker/ackBatcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ackBatcher.js","sourceRoot":"","sources":["../../../src/client/worker/ackBatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,12 @@ export async function processJob(internalJob, config) {
|
|
|
15
15
|
const jobIdStr = String(internalJob.id);
|
|
16
16
|
// Use a holder to break the circular reference between job and progress handler
|
|
17
17
|
const jobHolder = { current: null };
|
|
18
|
-
const job = createPublicJob(
|
|
18
|
+
const job = createPublicJob({
|
|
19
|
+
job: internalJob,
|
|
20
|
+
name: jobName,
|
|
21
|
+
updateProgress: createProgressHandler(embedded, tcp, emitter, jobHolder),
|
|
22
|
+
log: createLogHandler(embedded, tcp),
|
|
23
|
+
});
|
|
19
24
|
jobHolder.current = job;
|
|
20
25
|
emitter.emit('active', job);
|
|
21
26
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../../src/client/worker/processor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAc9C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,WAAwB,EACxB,MAA6B;IAE7B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACxE,MAAM,OAAO,GAAG,WAAW,CAAC,IAAgC,CAAC;IAC7D,MAAM,OAAO,GAAG,OAAO,EAAE,IAAI,IAAI,SAAS,CAAC;IAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAExC,gFAAgF;IAChF,MAAM,SAAS,GAA+B,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAEhE,MAAM,GAAG,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"processor.js","sourceRoot":"","sources":["../../../src/client/worker/processor.ts"],"names":[],"mappings":"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"}
|