bunqueue 2.8.0 → 2.8.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/README.md +26 -11
- package/dist/application/backgroundTasks.d.ts.map +1 -1
- package/dist/application/backgroundTasks.js +83 -0
- package/dist/application/backgroundTasks.js.map +1 -1
- package/dist/application/clientTracking.d.ts +23 -0
- package/dist/application/clientTracking.d.ts.map +1 -1
- package/dist/application/clientTracking.js +80 -25
- package/dist/application/clientTracking.js.map +1 -1
- package/dist/application/contextFactory.d.ts +6 -0
- package/dist/application/contextFactory.d.ts.map +1 -1
- package/dist/application/contextFactory.js +7 -0
- package/dist/application/contextFactory.js.map +1 -1
- package/dist/application/dlqManager.d.ts.map +1 -1
- package/dist/application/dlqManager.js +5 -0
- package/dist/application/dlqManager.js.map +1 -1
- package/dist/application/eventsManager.js.map +1 -1
- package/dist/application/lockManager.d.ts +1 -1
- package/dist/application/lockManager.d.ts.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.map +1 -1
- package/dist/application/operations/ack.js +32 -33
- 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 +3 -2
- package/dist/application/operations/jobManagement.js.map +1 -1
- package/dist/application/operations/push.js.map +1 -1
- package/dist/application/operations/queryOperations.d.ts.map +1 -1
- package/dist/application/operations/queryOperations.js +37 -3
- package/dist/application/operations/queryOperations.js.map +1 -1
- package/dist/application/operations/queueControl.d.ts +16 -4
- package/dist/application/operations/queueControl.d.ts.map +1 -1
- package/dist/application/operations/queueControl.js +119 -23
- package/dist/application/operations/queueControl.js.map +1 -1
- package/dist/application/queueManager.d.ts +17 -3
- package/dist/application/queueManager.d.ts.map +1 -1
- package/dist/application/queueManager.js +106 -27
- package/dist/application/queueManager.js.map +1 -1
- package/dist/application/stallDetection.js +1 -0
- package/dist/application/stallDetection.js.map +1 -1
- package/dist/application/types.d.ts +2 -1
- package/dist/application/types.d.ts.map +1 -1
- package/dist/cli/client.d.ts.map +1 -1
- package/dist/cli/client.js +15 -2
- package/dist/cli/client.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +31 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +1 -1
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +71 -9
- package/dist/cli/output.js.map +1 -1
- package/dist/client/bunqueue/batch.js +2 -2
- package/dist/client/bunqueue/batch.js.map +1 -1
- package/dist/client/bunqueue.d.ts.map +1 -1
- package/dist/client/bunqueue.js +3 -3
- package/dist/client/bunqueue.js.map +1 -1
- package/dist/client/flow.d.ts.map +1 -1
- package/dist/client/flow.js +3 -1
- package/dist/client/flow.js.map +1 -1
- package/dist/client/flowJobFactory.d.ts +8 -1
- package/dist/client/flowJobFactory.d.ts.map +1 -1
- package/dist/client/flowJobFactory.js +328 -56
- package/dist/client/flowJobFactory.js.map +1 -1
- package/dist/client/flowPush.d.ts.map +1 -1
- package/dist/client/flowPush.js +95 -46
- package/dist/client/flowPush.js.map +1 -1
- package/dist/client/jobConversion.d.ts.map +1 -1
- package/dist/client/jobConversion.js +12 -4
- package/dist/client/jobConversion.js.map +1 -1
- package/dist/client/queue/bullmqCompat.d.ts +1 -0
- package/dist/client/queue/bullmqCompat.d.ts.map +1 -1
- package/dist/client/queue/dlq.js.map +1 -1
- package/dist/client/queue/dlqOps.d.ts.map +1 -1
- package/dist/client/queue/dlqOps.js.map +1 -1
- package/dist/client/queue/helpers.js.map +1 -1
- package/dist/client/queue/jobProxy.d.ts +22 -3
- package/dist/client/queue/jobProxy.d.ts.map +1 -1
- package/dist/client/queue/jobProxy.js +347 -66
- package/dist/client/queue/jobProxy.js.map +1 -1
- package/dist/client/queue/operations/add.d.ts +1 -0
- package/dist/client/queue/operations/add.d.ts.map +1 -1
- package/dist/client/queue/operations/add.js +126 -29
- package/dist/client/queue/operations/add.js.map +1 -1
- package/dist/client/queue/operations/management.d.ts +1 -1
- package/dist/client/queue/operations/management.d.ts.map +1 -1
- package/dist/client/queue/operations/management.js +27 -9
- package/dist/client/queue/operations/management.js.map +1 -1
- package/dist/client/queue/operations/query.d.ts +12 -0
- package/dist/client/queue/operations/query.d.ts.map +1 -1
- package/dist/client/queue/operations/query.js +44 -4
- package/dist/client/queue/operations/query.js.map +1 -1
- package/dist/client/queue/queue.d.ts.map +1 -1
- package/dist/client/queue/queue.js +8 -1
- package/dist/client/queue/queue.js.map +1 -1
- package/dist/client/queue/scheduler.d.ts +2 -0
- package/dist/client/queue/scheduler.d.ts.map +1 -1
- package/dist/client/queue/scheduler.js +28 -0
- package/dist/client/queue/scheduler.js.map +1 -1
- package/dist/client/queue/stall.js.map +1 -1
- package/dist/client/sandboxed/worker.d.ts.map +1 -1
- package/dist/client/sandboxed/worker.js +57 -15
- package/dist/client/sandboxed/worker.js.map +1 -1
- package/dist/client/sandboxed/wrapper.d.ts.map +1 -1
- package/dist/client/sandboxed/wrapper.js +62 -10
- package/dist/client/sandboxed/wrapper.js.map +1 -1
- package/dist/client/tcp/client.d.ts +9 -0
- package/dist/client/tcp/client.d.ts.map +1 -1
- package/dist/client/tcp/client.js +84 -28
- package/dist/client/tcp/client.js.map +1 -1
- package/dist/client/tcp/connection.d.ts.map +1 -1
- package/dist/client/tcp/connection.js +6 -1
- package/dist/client/tcp/connection.js.map +1 -1
- package/dist/client/tcp/types.d.ts +7 -0
- package/dist/client/tcp/types.d.ts.map +1 -1
- package/dist/client/types.d.ts +8 -4
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js.map +1 -1
- package/dist/client/worker/ackBatcher.d.ts.map +1 -1
- package/dist/client/worker/ackBatcher.js +18 -8
- package/dist/client/worker/ackBatcher.js.map +1 -1
- package/dist/client/worker/processor.d.ts.map +1 -1
- package/dist/client/worker/processor.js +54 -99
- package/dist/client/worker/processor.js.map +1 -1
- package/dist/client/worker/processorHandlers.d.ts +55 -0
- package/dist/client/worker/processorHandlers.d.ts.map +1 -0
- package/dist/client/worker/processorHandlers.js +373 -0
- package/dist/client/worker/processorHandlers.js.map +1 -0
- package/dist/client/workflow/compensator.d.ts +15 -0
- package/dist/client/workflow/compensator.d.ts.map +1 -0
- package/dist/client/workflow/compensator.js +46 -0
- package/dist/client/workflow/compensator.js.map +1 -0
- package/dist/client/workflow/emitter.d.ts.map +1 -1
- package/dist/client/workflow/emitter.js +15 -3
- package/dist/client/workflow/emitter.js.map +1 -1
- package/dist/client/workflow/engine.d.ts +8 -1
- package/dist/client/workflow/engine.d.ts.map +1 -1
- package/dist/client/workflow/engine.js +9 -0
- package/dist/client/workflow/engine.js.map +1 -1
- package/dist/client/workflow/executor.d.ts +5 -2
- package/dist/client/workflow/executor.d.ts.map +1 -1
- package/dist/client/workflow/executor.js +43 -60
- package/dist/client/workflow/executor.js.map +1 -1
- package/dist/client/workflow/index.d.ts +1 -1
- package/dist/client/workflow/index.d.ts.map +1 -1
- package/dist/client/workflow/loops.d.ts +1 -1
- package/dist/client/workflow/loops.d.ts.map +1 -1
- package/dist/client/workflow/loops.js +10 -1
- package/dist/client/workflow/loops.js.map +1 -1
- package/dist/client/workflow/recovery.d.ts +23 -0
- package/dist/client/workflow/recovery.d.ts.map +1 -0
- package/dist/client/workflow/recovery.js +74 -0
- package/dist/client/workflow/recovery.js.map +1 -0
- package/dist/client/workflow/runner.d.ts.map +1 -1
- package/dist/client/workflow/runner.js +7 -5
- package/dist/client/workflow/runner.js.map +1 -1
- package/dist/client/workflow/store.d.ts +2 -0
- package/dist/client/workflow/store.d.ts.map +1 -1
- package/dist/client/workflow/store.js +6 -0
- package/dist/client/workflow/store.js.map +1 -1
- package/dist/client/workflow/types.d.ts +41 -22
- package/dist/client/workflow/types.d.ts.map +1 -1
- package/dist/client/workflow/workflow.d.ts +17 -14
- package/dist/client/workflow/workflow.d.ts.map +1 -1
- package/dist/client/workflow/workflow.js +30 -20
- package/dist/client/workflow/workflow.js.map +1 -1
- package/dist/domain/queue/dlqShard.d.ts.map +1 -1
- package/dist/domain/queue/dlqShard.js +6 -0
- package/dist/domain/queue/dlqShard.js.map +1 -1
- package/dist/domain/queue/priorityQueue.d.ts +2 -2
- package/dist/domain/queue/priorityQueue.d.ts.map +1 -1
- package/dist/domain/queue/priorityQueue.js +5 -3
- package/dist/domain/queue/priorityQueue.js.map +1 -1
- package/dist/domain/types/command.d.ts +22 -0
- package/dist/domain/types/command.d.ts.map +1 -1
- package/dist/domain/types/cron.d.ts +21 -0
- package/dist/domain/types/cron.d.ts.map +1 -1
- package/dist/domain/types/cron.js +1 -0
- package/dist/domain/types/cron.js.map +1 -1
- package/dist/domain/types/job.d.ts.map +1 -1
- package/dist/domain/types/job.js +9 -2
- package/dist/domain/types/job.js.map +1 -1
- package/dist/domain/types/response.d.ts +2 -0
- package/dist/domain/types/response.d.ts.map +1 -1
- package/dist/domain/types/response.js.map +1 -1
- package/dist/infrastructure/backup/s3BackupOperations.d.ts.map +1 -1
- package/dist/infrastructure/backup/s3BackupOperations.js +44 -6
- package/dist/infrastructure/backup/s3BackupOperations.js.map +1 -1
- package/dist/infrastructure/cloud/cloudAgent.d.ts +1 -1
- package/dist/infrastructure/cloud/cloudAgent.d.ts.map +1 -1
- package/dist/infrastructure/cloud/cloudAgent.js +9 -11
- package/dist/infrastructure/cloud/cloudAgent.js.map +1 -1
- package/dist/infrastructure/cloud/commands.js +2 -2
- package/dist/infrastructure/cloud/commands.js.map +1 -1
- package/dist/infrastructure/cloud/redact.d.ts +11 -0
- package/dist/infrastructure/cloud/redact.d.ts.map +1 -0
- package/dist/infrastructure/cloud/redact.js +22 -0
- package/dist/infrastructure/cloud/redact.js.map +1 -0
- package/dist/infrastructure/cloud/snapshotCollector.d.ts +4 -0
- package/dist/infrastructure/cloud/snapshotCollector.d.ts.map +1 -1
- package/dist/infrastructure/cloud/snapshotCollector.js +32 -17
- package/dist/infrastructure/cloud/snapshotCollector.js.map +1 -1
- package/dist/infrastructure/cloud/snapshotHelpers.d.ts +9 -2
- package/dist/infrastructure/cloud/snapshotHelpers.d.ts.map +1 -1
- package/dist/infrastructure/cloud/snapshotHelpers.js +10 -8
- package/dist/infrastructure/cloud/snapshotHelpers.js.map +1 -1
- package/dist/infrastructure/persistence/schema.d.ts +2 -2
- package/dist/infrastructure/persistence/schema.d.ts.map +1 -1
- package/dist/infrastructure/persistence/schema.js +16 -2
- package/dist/infrastructure/persistence/schema.js.map +1 -1
- package/dist/infrastructure/persistence/sqlite.d.ts +54 -1
- package/dist/infrastructure/persistence/sqlite.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqlite.js +174 -2
- package/dist/infrastructure/persistence/sqlite.js.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.d.ts +14 -0
- package/dist/infrastructure/persistence/sqliteBatch.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteBatch.js +29 -0
- package/dist/infrastructure/persistence/sqliteBatch.js.map +1 -1
- package/dist/infrastructure/persistence/sqliteSerializer.d.ts +16 -0
- package/dist/infrastructure/persistence/sqliteSerializer.d.ts.map +1 -1
- package/dist/infrastructure/persistence/sqliteSerializer.js +73 -8
- package/dist/infrastructure/persistence/sqliteSerializer.js.map +1 -1
- package/dist/infrastructure/persistence/statements.d.ts +2 -1
- package/dist/infrastructure/persistence/statements.d.ts.map +1 -1
- package/dist/infrastructure/persistence/statements.js +3 -2
- package/dist/infrastructure/persistence/statements.js.map +1 -1
- package/dist/infrastructure/scheduler/cronScheduler.d.ts.map +1 -1
- package/dist/infrastructure/scheduler/cronScheduler.js +19 -1
- package/dist/infrastructure/scheduler/cronScheduler.js.map +1 -1
- package/dist/infrastructure/server/handlers/advanced.d.ts +7 -1
- package/dist/infrastructure/server/handlers/advanced.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/advanced.js +41 -10
- package/dist/infrastructure/server/handlers/advanced.js.map +1 -1
- package/dist/infrastructure/server/handlers/core.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/core.js +8 -0
- package/dist/infrastructure/server/handlers/core.js.map +1 -1
- package/dist/infrastructure/server/handlers/cron.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/cron.js +1 -0
- package/dist/infrastructure/server/handlers/cron.js.map +1 -1
- package/dist/infrastructure/server/handlers/dashboard.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/dashboard.js +1 -0
- package/dist/infrastructure/server/handlers/dashboard.js.map +1 -1
- package/dist/infrastructure/server/handlers/dlq.js.map +1 -1
- package/dist/infrastructure/server/handlers/management.d.ts +1 -1
- package/dist/infrastructure/server/handlers/management.d.ts.map +1 -1
- package/dist/infrastructure/server/handlers/management.js +27 -12
- package/dist/infrastructure/server/handlers/management.js.map +1 -1
- package/dist/infrastructure/server/handlers/monitoring.js.map +1 -1
- package/dist/infrastructure/server/handlers/query.js.map +1 -1
- package/dist/infrastructure/server/httpRouteJobs.js.map +1 -1
- package/dist/infrastructure/server/httpRouteQueueConfig.js.map +1 -1
- package/dist/infrastructure/server/httpRouteQueues.js.map +1 -1
- package/dist/infrastructure/server/httpRouteResources.js.map +1 -1
- package/dist/infrastructure/server/protocol.d.ts +4 -0
- package/dist/infrastructure/server/protocol.d.ts.map +1 -1
- package/dist/infrastructure/server/protocol.js +17 -2
- package/dist/infrastructure/server/protocol.js.map +1 -1
- package/dist/infrastructure/server/socketWriteQueue.d.ts +67 -0
- package/dist/infrastructure/server/socketWriteQueue.d.ts.map +1 -0
- package/dist/infrastructure/server/socketWriteQueue.js +127 -0
- package/dist/infrastructure/server/socketWriteQueue.js.map +1 -0
- package/dist/infrastructure/server/tcp.d.ts +17 -0
- package/dist/infrastructure/server/tcp.d.ts.map +1 -1
- package/dist/infrastructure/server/tcp.js +112 -14
- package/dist/infrastructure/server/tcp.js.map +1 -1
- package/dist/infrastructure/server/wsHandler.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +48 -43
- package/dist/main.js.map +1 -1
- package/dist/mcp/adapter.d.ts +3 -3
- package/dist/mcp/adapter.d.ts.map +1 -1
- package/dist/mcp/adapter.js +48 -15
- package/dist/mcp/adapter.js.map +1 -1
- package/dist/mcp/index.d.ts +3 -3
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js +26 -89
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/server.d.ts +16 -0
- package/dist/mcp/server.d.ts.map +1 -0
- package/dist/mcp/server.js +101 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/mcp/tools/queueTools.d.ts.map +1 -1
- package/dist/mcp/tools/queueTools.js +6 -3
- package/dist/mcp/tools/queueTools.js.map +1 -1
- package/dist/mcp/tools/webhookTools.js +1 -1
- package/dist/mcp/tools/webhookTools.js.map +1 -1
- package/dist/shared/lock.d.ts.map +1 -1
- package/dist/shared/lock.js +15 -0
- package/dist/shared/lock.js.map +1 -1
- package/package.json +12 -7
|
@@ -68,6 +68,9 @@ export async function add(ctx, jobName, data, opts = {}) {
|
|
|
68
68
|
sizeLimit: merged.sizeLimit,
|
|
69
69
|
failParentOnFailure: merged.failParentOnFailure,
|
|
70
70
|
removeDependencyOnFailure: merged.removeDependencyOnFailure,
|
|
71
|
+
continueParentOnFailure: merged.continueParentOnFailure,
|
|
72
|
+
ignoreDependencyOnFailure: merged.ignoreDependencyOnFailure,
|
|
73
|
+
timestamp: merged.timestamp,
|
|
71
74
|
debounceId: merged.debounce?.id,
|
|
72
75
|
debounceTtl: merged.debounce?.ttl,
|
|
73
76
|
});
|
|
@@ -94,25 +97,9 @@ export async function add(ctx, jobName, data, opts = {}) {
|
|
|
94
97
|
waitUntilFinished: (jid, queueEvents, ttl) => ctx.waitJobUntilFinished(jid, queueEvents, ttl),
|
|
95
98
|
});
|
|
96
99
|
}
|
|
97
|
-
// TCP mode
|
|
100
|
+
// TCP mode — forward the full option set so nothing is silently dropped (#88)
|
|
98
101
|
const tcp = ctx.tcp;
|
|
99
|
-
const response = await tcp.send(
|
|
100
|
-
cmd: 'PUSH',
|
|
101
|
-
queue: ctx.name,
|
|
102
|
-
data: jobData,
|
|
103
|
-
priority: merged.priority,
|
|
104
|
-
delay: merged.delay,
|
|
105
|
-
maxAttempts: merged.attempts,
|
|
106
|
-
backoff: merged.backoff,
|
|
107
|
-
timeout: merged.timeout,
|
|
108
|
-
jobId: merged.jobId,
|
|
109
|
-
removeOnComplete: merged.removeOnComplete,
|
|
110
|
-
removeOnFail: merged.removeOnFail,
|
|
111
|
-
stallTimeout: merged.stallTimeout,
|
|
112
|
-
durable: merged.durable,
|
|
113
|
-
repeat: merged.repeat,
|
|
114
|
-
parentId: merged.parent?.id,
|
|
115
|
-
});
|
|
102
|
+
const response = await tcp.send(buildPushPayload(ctx.name, jobData, merged));
|
|
116
103
|
if (!response.ok) {
|
|
117
104
|
throw new Error(response.error ?? 'Failed to add job');
|
|
118
105
|
}
|
|
@@ -124,27 +111,111 @@ export async function add(ctx, jobName, data, opts = {}) {
|
|
|
124
111
|
removeAsync: ctx.removeAsync,
|
|
125
112
|
retryJob: ctx.retryJob,
|
|
126
113
|
getChildrenValues: ctx.getChildrenValues,
|
|
114
|
+
}, { priority: merged.priority, delay: merged.delay, opts: merged });
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Strip undefined-valued keys so the msgpack frame stays compact. Sending a
|
|
118
|
+
* field as `undefined` still serializes a nil entry; for large batches this
|
|
119
|
+
* bloats the frame (and intermittently trips large-frame delivery). Omitting
|
|
120
|
+
* undefined keeps option-less jobs minimal while still forwarding real options.
|
|
121
|
+
*/
|
|
122
|
+
function compact(obj) {
|
|
123
|
+
const out = {};
|
|
124
|
+
for (const k in obj) {
|
|
125
|
+
if (obj[k] !== undefined)
|
|
126
|
+
out[k] = obj[k];
|
|
127
|
+
}
|
|
128
|
+
return out;
|
|
129
|
+
}
|
|
130
|
+
/** Build the compacted PUSH command payload, forwarding the full option set (#88) */
|
|
131
|
+
function buildPushPayload(queue, jobData, m) {
|
|
132
|
+
return compact({
|
|
133
|
+
cmd: 'PUSH',
|
|
134
|
+
queue,
|
|
135
|
+
data: jobData,
|
|
136
|
+
priority: m.priority,
|
|
137
|
+
delay: m.delay,
|
|
138
|
+
maxAttempts: m.attempts,
|
|
139
|
+
backoff: m.backoff,
|
|
140
|
+
ttl: m.ttl,
|
|
141
|
+
timeout: m.timeout,
|
|
142
|
+
jobId: m.jobId,
|
|
143
|
+
uniqueKey: m.deduplication?.id,
|
|
144
|
+
dedup: m.deduplication
|
|
145
|
+
? {
|
|
146
|
+
ttl: m.deduplication.ttl,
|
|
147
|
+
extend: m.deduplication.extend,
|
|
148
|
+
replace: m.deduplication.replace,
|
|
149
|
+
}
|
|
150
|
+
: undefined,
|
|
151
|
+
dependsOn: m.dependsOn,
|
|
152
|
+
tags: m.tags,
|
|
153
|
+
groupId: m.groupId,
|
|
154
|
+
lifo: m.lifo,
|
|
155
|
+
// Coerce to boolean for parity with embedded (which ignores non-boolean). #90
|
|
156
|
+
removeOnComplete: typeof m.removeOnComplete === 'boolean' ? m.removeOnComplete : undefined,
|
|
157
|
+
removeOnFail: typeof m.removeOnFail === 'boolean' ? m.removeOnFail : undefined,
|
|
158
|
+
stallTimeout: m.stallTimeout,
|
|
159
|
+
stackTraceLimit: m.stackTraceLimit,
|
|
160
|
+
keepLogs: m.keepLogs,
|
|
161
|
+
sizeLimit: m.sizeLimit,
|
|
162
|
+
failParentOnFailure: m.failParentOnFailure,
|
|
163
|
+
removeDependencyOnFailure: m.removeDependencyOnFailure,
|
|
164
|
+
continueParentOnFailure: m.continueParentOnFailure,
|
|
165
|
+
ignoreDependencyOnFailure: m.ignoreDependencyOnFailure,
|
|
166
|
+
debounceId: m.debounce?.id,
|
|
167
|
+
debounceTtl: m.debounce?.ttl,
|
|
168
|
+
timestamp: m.timestamp,
|
|
169
|
+
durable: m.durable,
|
|
170
|
+
repeat: m.repeat,
|
|
171
|
+
parentId: m.parent?.id,
|
|
127
172
|
});
|
|
128
173
|
}
|
|
174
|
+
/** Build the data payload for a bulk job, injecting parent refs when present */
|
|
175
|
+
function buildBulkData(name, data, m) {
|
|
176
|
+
const jobData = { name, ...data };
|
|
177
|
+
if (m.parent) {
|
|
178
|
+
jobData.__parentId = m.parent.id;
|
|
179
|
+
jobData.__parentQueue = m.parent.queue;
|
|
180
|
+
}
|
|
181
|
+
return jobData;
|
|
182
|
+
}
|
|
183
|
+
/** Reflection meta so the returned bulk Job reflects the requested options (#88) */
|
|
184
|
+
function reflectionMeta(m) {
|
|
185
|
+
return { priority: m.priority, delay: m.delay, opts: m };
|
|
186
|
+
}
|
|
129
187
|
/** Add multiple jobs in bulk */
|
|
130
188
|
export async function addBulk(ctx, jobs) {
|
|
131
189
|
if (jobs.length === 0)
|
|
132
190
|
return [];
|
|
133
191
|
const now = Date.now();
|
|
192
|
+
// Merge defaults once per job so input building and reflection stay in sync
|
|
193
|
+
const merged = jobs.map(({ opts }) => ({
|
|
194
|
+
...ctx.opts.defaultJobOptions,
|
|
195
|
+
...opts,
|
|
196
|
+
}));
|
|
134
197
|
if (ctx.embedded) {
|
|
135
198
|
const manager = getSharedManager();
|
|
136
|
-
const inputs = jobs.map(({ name, data,
|
|
137
|
-
const m =
|
|
199
|
+
const inputs = jobs.map(({ name, data }, i) => {
|
|
200
|
+
const m = merged[i];
|
|
138
201
|
const removeOnComplete = typeof m.removeOnComplete === 'boolean' ? m.removeOnComplete : false;
|
|
139
202
|
const removeOnFail = typeof m.removeOnFail === 'boolean' ? m.removeOnFail : false;
|
|
140
203
|
return {
|
|
141
|
-
data:
|
|
204
|
+
data: buildBulkData(name, data, m),
|
|
142
205
|
priority: m.priority,
|
|
143
206
|
delay: m.delay,
|
|
144
207
|
maxAttempts: m.attempts,
|
|
145
208
|
backoff: m.backoff,
|
|
146
209
|
timeout: m.timeout,
|
|
210
|
+
ttl: m.ttl,
|
|
147
211
|
customId: m.jobId,
|
|
212
|
+
uniqueKey: m.deduplication?.id,
|
|
213
|
+
dependsOn: m.dependsOn?.map((id) => jobId(id)),
|
|
214
|
+
parentId: m.parent ? jobId(m.parent.id) : undefined,
|
|
215
|
+
tags: m.tags,
|
|
216
|
+
groupId: m.groupId,
|
|
217
|
+
stallTimeout: m.stallTimeout,
|
|
218
|
+
timestamp: m.timestamp,
|
|
148
219
|
removeOnComplete,
|
|
149
220
|
removeOnFail,
|
|
150
221
|
repeat: m.repeat
|
|
@@ -170,6 +241,15 @@ export async function addBulk(ctx, jobs) {
|
|
|
170
241
|
sizeLimit: m.sizeLimit,
|
|
171
242
|
failParentOnFailure: m.failParentOnFailure,
|
|
172
243
|
removeDependencyOnFailure: m.removeDependencyOnFailure,
|
|
244
|
+
continueParentOnFailure: m.continueParentOnFailure,
|
|
245
|
+
ignoreDependencyOnFailure: m.ignoreDependencyOnFailure,
|
|
246
|
+
dedup: m.deduplication
|
|
247
|
+
? {
|
|
248
|
+
ttl: m.deduplication.ttl,
|
|
249
|
+
extend: m.deduplication.extend,
|
|
250
|
+
replace: m.deduplication.replace,
|
|
251
|
+
}
|
|
252
|
+
: undefined,
|
|
173
253
|
debounceId: m.debounce?.id,
|
|
174
254
|
debounceTtl: m.debounce?.ttl,
|
|
175
255
|
};
|
|
@@ -177,18 +257,23 @@ export async function addBulk(ctx, jobs) {
|
|
|
177
257
|
const ids = await manager.pushBatch(ctx.name, inputs);
|
|
178
258
|
return ids.map((id, i) => createSimpleJob(String(id), jobs[i].name, jobs[i].data, now, {
|
|
179
259
|
queueName: ctx.name,
|
|
260
|
+
embedded: ctx.embedded,
|
|
261
|
+
tcp: ctx.tcp,
|
|
180
262
|
getJobState: ctx.getJobState,
|
|
181
263
|
removeAsync: ctx.removeAsync,
|
|
182
264
|
retryJob: ctx.retryJob,
|
|
183
265
|
getChildrenValues: ctx.getChildrenValues,
|
|
266
|
+
meta: reflectionMeta(merged[i]),
|
|
184
267
|
}));
|
|
185
268
|
}
|
|
186
269
|
// TCP mode
|
|
187
270
|
const tcp = ctx.tcp;
|
|
188
|
-
const batchJobs = jobs.map(({ name, data,
|
|
189
|
-
const m =
|
|
190
|
-
|
|
191
|
-
|
|
271
|
+
const batchJobs = jobs.map(({ name, data }, i) => {
|
|
272
|
+
const m = merged[i];
|
|
273
|
+
const removeOnComplete = typeof m.removeOnComplete === 'boolean' ? m.removeOnComplete : false;
|
|
274
|
+
const removeOnFail = typeof m.removeOnFail === 'boolean' ? m.removeOnFail : false;
|
|
275
|
+
return compact({
|
|
276
|
+
data: buildBulkData(name, data, m),
|
|
192
277
|
priority: m.priority,
|
|
193
278
|
delay: m.delay,
|
|
194
279
|
maxAttempts: m.attempts,
|
|
@@ -198,6 +283,8 @@ export async function addBulk(ctx, jobs) {
|
|
|
198
283
|
customId: m.jobId,
|
|
199
284
|
tags: m.tags,
|
|
200
285
|
groupId: m.groupId,
|
|
286
|
+
dependsOn: m.dependsOn?.map((id) => jobId(id)),
|
|
287
|
+
parentId: m.parent ? jobId(m.parent.id) : undefined,
|
|
201
288
|
uniqueKey: m.deduplication?.id,
|
|
202
289
|
dedup: m.deduplication
|
|
203
290
|
? {
|
|
@@ -208,6 +295,9 @@ export async function addBulk(ctx, jobs) {
|
|
|
208
295
|
: undefined,
|
|
209
296
|
lifo: m.lifo,
|
|
210
297
|
stallTimeout: m.stallTimeout,
|
|
298
|
+
timestamp: m.timestamp,
|
|
299
|
+
removeOnComplete,
|
|
300
|
+
removeOnFail,
|
|
211
301
|
repeat: m.repeat,
|
|
212
302
|
durable: m.durable,
|
|
213
303
|
stackTraceLimit: m.stackTraceLimit,
|
|
@@ -215,17 +305,24 @@ export async function addBulk(ctx, jobs) {
|
|
|
215
305
|
sizeLimit: m.sizeLimit,
|
|
216
306
|
failParentOnFailure: m.failParentOnFailure,
|
|
217
307
|
removeDependencyOnFailure: m.removeDependencyOnFailure,
|
|
308
|
+
continueParentOnFailure: m.continueParentOnFailure,
|
|
309
|
+
ignoreDependencyOnFailure: m.ignoreDependencyOnFailure,
|
|
218
310
|
debounceId: m.debounce?.id,
|
|
219
311
|
debounceTtl: m.debounce?.ttl,
|
|
220
|
-
};
|
|
312
|
+
});
|
|
221
313
|
});
|
|
222
314
|
const response = await tcp.send({
|
|
223
315
|
cmd: 'PUSHB',
|
|
224
316
|
queue: ctx.name,
|
|
225
317
|
jobs: batchJobs,
|
|
226
318
|
});
|
|
227
|
-
|
|
228
|
-
|
|
319
|
+
// Mirror the single-PUSH path (~line 168): a rejected response (e.g. auth
|
|
320
|
+
// failure) must propagate as a thrown error so the AddBatcher rejects the
|
|
321
|
+
// queued callers, instead of resolving them with undefined jobs. An OK
|
|
322
|
+
// response with zero jobs is a legitimate empty result and is NOT an error.
|
|
323
|
+
if (!response.ok) {
|
|
324
|
+
throw new Error(response.error ?? 'Failed to add jobs');
|
|
325
|
+
}
|
|
229
326
|
const ids = (response.ids ?? []);
|
|
230
327
|
return ids.map((id, i) => createJobProxy(id, jobs[i].name, jobs[i].data, {
|
|
231
328
|
queueName: ctx.name,
|
|
@@ -234,7 +331,7 @@ export async function addBulk(ctx, jobs) {
|
|
|
234
331
|
removeAsync: ctx.removeAsync,
|
|
235
332
|
retryJob: ctx.retryJob,
|
|
236
333
|
getChildrenValues: ctx.getChildrenValues,
|
|
237
|
-
}));
|
|
334
|
+
}, reflectionMeta(merged[i])));
|
|
238
335
|
}
|
|
239
336
|
function parseDate(date) {
|
|
240
337
|
if (date instanceof Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/add.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ interface ManagementContext {
|
|
|
12
12
|
export declare function remove(ctx: ManagementContext, id: string): void;
|
|
13
13
|
/** Remove a job (async) */
|
|
14
14
|
export declare function removeAsync(ctx: ManagementContext, id: string): Promise<void>;
|
|
15
|
-
/** Retry a specific job */
|
|
15
|
+
/** Retry a specific job — BullMQ contract: failed → waiting. */
|
|
16
16
|
export declare function retryJob(ctx: ManagementContext, id: string): Promise<void>;
|
|
17
17
|
/** Retry jobs matching criteria */
|
|
18
18
|
export declare function retryJobs(ctx: ManagementContext, opts?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"management.d.ts","sourceRoot":"","sources":["../../../../src/client/queue/operations/management.ts"],"names":[],"mappings":"AACA;;;GAGG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGvD,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAC/B;AAID,0BAA0B;AAC1B,wBAAgB,MAAM,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAG/D;AAED,2BAA2B;AAC3B,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMnF;AAID,
|
|
1
|
+
{"version":3,"file":"management.d.ts","sourceRoot":"","sources":["../../../../src/client/queue/operations/management.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,13 +22,32 @@ export async function removeAsync(ctx, id) {
|
|
|
22
22
|
await ctx.tcp.send({ cmd: 'Cancel', id });
|
|
23
23
|
}
|
|
24
24
|
// ============ Retry Operations ============
|
|
25
|
-
/** Retry a specific job */
|
|
25
|
+
/** Retry a specific job — BullMQ contract: failed → waiting. */
|
|
26
26
|
export async function retryJob(ctx, id) {
|
|
27
27
|
if (ctx.embedded) {
|
|
28
|
-
getSharedManager()
|
|
29
|
-
|
|
28
|
+
const mgr = getSharedManager();
|
|
29
|
+
const state = await mgr.getJobState(jobId(id));
|
|
30
|
+
if (state === 'failed') {
|
|
31
|
+
const count = mgr.retryDlq(ctx.name, jobId(id));
|
|
32
|
+
if (count === 0)
|
|
33
|
+
throw new Error(`Job ${id} is failed but not present in DLQ`);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
if (state === 'active') {
|
|
37
|
+
const ok = await mgr.moveActiveToWait(jobId(id));
|
|
38
|
+
if (!ok)
|
|
39
|
+
throw new Error(`Failed to retry active job ${id}`);
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
if (state === 'waiting' || state === 'prioritized' || state === 'delayed')
|
|
43
|
+
return;
|
|
44
|
+
throw new Error(`Cannot retry job ${id} from state '${state}'`);
|
|
45
|
+
}
|
|
46
|
+
const res = await ctx.tcp.send({ cmd: 'MoveToWait', id });
|
|
47
|
+
if (res.ok !== true) {
|
|
48
|
+
const err = typeof res.error === 'string' ? res.error : 'retry failed';
|
|
49
|
+
throw new Error(err);
|
|
30
50
|
}
|
|
31
|
-
await ctx.tcp.send({ cmd: 'RetryDlq', queue: ctx.name, id });
|
|
32
51
|
}
|
|
33
52
|
/** Retry jobs matching criteria */
|
|
34
53
|
export async function retryJobs(ctx, opts) {
|
|
@@ -47,8 +66,7 @@ export async function retryJobs(ctx, opts) {
|
|
|
47
66
|
export function clean(ctx, grace, limit, type) {
|
|
48
67
|
if (!ctx.embedded)
|
|
49
68
|
return [];
|
|
50
|
-
|
|
51
|
-
return new Array(count).fill('');
|
|
69
|
+
return getSharedManager().clean(ctx.name, grace, type, limit);
|
|
52
70
|
}
|
|
53
71
|
/** Clean old jobs (async) */
|
|
54
72
|
export async function cleanAsync(ctx, grace, limit, type) {
|
|
@@ -156,7 +174,7 @@ export async function updateJobData(ctx, id, data) {
|
|
|
156
174
|
/** Change job delay */
|
|
157
175
|
export async function changeJobDelay(ctx, id, delay) {
|
|
158
176
|
if (ctx.embedded) {
|
|
159
|
-
|
|
177
|
+
await getSharedManager().changeDelay(jobId(id), delay);
|
|
160
178
|
return;
|
|
161
179
|
}
|
|
162
180
|
await ctx.tcp.send({ cmd: 'ChangeDelay', id, delay });
|
|
@@ -164,10 +182,10 @@ export async function changeJobDelay(ctx, id, delay) {
|
|
|
164
182
|
/** Change job priority */
|
|
165
183
|
export async function changeJobPriority(ctx, id, opts) {
|
|
166
184
|
if (ctx.embedded) {
|
|
167
|
-
await getSharedManager().changePriority(jobId(id), opts.priority);
|
|
185
|
+
await getSharedManager().changePriority(jobId(id), opts.priority, opts.lifo);
|
|
168
186
|
return;
|
|
169
187
|
}
|
|
170
|
-
await ctx.tcp.send({ cmd: 'ChangePriority', id, priority: opts.priority });
|
|
188
|
+
await ctx.tcp.send({ cmd: 'ChangePriority', id, priority: opts.priority, lifo: opts.lifo });
|
|
171
189
|
}
|
|
172
190
|
/** Extend job lock */
|
|
173
191
|
export async function extendJobLock(ctx, id, token, duration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"management.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/management.ts"],"names":[],"mappings":"AAAA,mJAAmJ;AACnJ;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAQlD,8CAA8C;AAE9C,0BAA0B;AAC1B,MAAM,UAAU,MAAM,CAAC,GAAsB,EAAE,EAAU;IACvD,IAAI,GAAG,CAAC,QAAQ;QAAE,gBAAgB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;;QAClD,GAAG,CAAC,GAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAsB,EAAE,EAAU;IAClE,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QACrC,OAAO;IACT,CAAC;IACD,MAAM,GAAG,CAAC,GAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED,6CAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"management.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/management.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,11 +17,23 @@ interface QueryContext {
|
|
|
17
17
|
changeJobDelay?: (id: string, delay: number) => Promise<void>;
|
|
18
18
|
changeJobPriority?: (id: string, opts: {
|
|
19
19
|
priority: number;
|
|
20
|
+
lifo?: boolean;
|
|
20
21
|
}) => Promise<void>;
|
|
21
22
|
extendJobLock?: (id: string, token: string, duration: number) => Promise<number>;
|
|
22
23
|
clearJobLogs?: (id: string, keepLogs?: number) => Promise<void>;
|
|
23
24
|
getJobDependencies?: (id: string, opts?: GetDependenciesOpts) => Promise<JobDependencies>;
|
|
24
25
|
getJobDependenciesCount?: (id: string, opts?: GetDependenciesOpts) => Promise<JobDependenciesCount>;
|
|
26
|
+
moveJobToCompleted?: (id: string, returnValue: unknown, token?: string) => Promise<unknown>;
|
|
27
|
+
moveJobToFailed?: (id: string, error: Error, token?: string) => Promise<void>;
|
|
28
|
+
moveJobToWait?: (id: string, token?: string) => Promise<boolean>;
|
|
29
|
+
moveJobToDelayed?: (id: string, timestamp: number, token?: string) => Promise<void>;
|
|
30
|
+
moveJobToWaitingChildren?: (id: string, token?: string, opts?: {
|
|
31
|
+
child?: {
|
|
32
|
+
id: string;
|
|
33
|
+
queue: string;
|
|
34
|
+
};
|
|
35
|
+
}) => Promise<boolean>;
|
|
36
|
+
waitJobUntilFinished?: (id: string, queueEvents: unknown, ttl?: number) => Promise<unknown>;
|
|
25
37
|
}
|
|
26
38
|
/** Get a single job by ID */
|
|
27
39
|
export declare function getJob<T>(ctx: QueryContext, id: string): Promise<Job<T> | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/client/queue/operations/query.ts"],"names":[],"mappings":"AACA;;;GAGG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EACV,GAAG,EACH,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,oBAAoB,EACrB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/client/queue/operations/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,12 @@ import { getSharedManager } from '../../manager';
|
|
|
7
7
|
import { toPublicJob } from '../../types';
|
|
8
8
|
import { jobId } from '../../../domain/types/job';
|
|
9
9
|
import { createSimpleJob } from '../jobProxy';
|
|
10
|
+
import { buildJobOpts } from '../../jobHelpers';
|
|
11
|
+
/** Build reflection meta (priority/delay/opts) from an internal job shape */
|
|
12
|
+
function metaFromJob(job) {
|
|
13
|
+
const opts = buildJobOpts(job);
|
|
14
|
+
return { priority: job.priority ?? 0, delay: opts.delay ?? 0, opts };
|
|
15
|
+
}
|
|
10
16
|
/** Get a single job by ID */
|
|
11
17
|
export async function getJob(ctx, id) {
|
|
12
18
|
if (ctx.embedded) {
|
|
@@ -14,8 +20,9 @@ export async function getJob(ctx, id) {
|
|
|
14
20
|
if (!job)
|
|
15
21
|
return null;
|
|
16
22
|
const name = job.data?.name ?? 'unknown';
|
|
17
|
-
// Use toPublicJob
|
|
23
|
+
// Use toPublicJob with full wiring (all callbacks route to the shared manager)
|
|
18
24
|
if (ctx.updateJobData) {
|
|
25
|
+
const mgr = getSharedManager();
|
|
19
26
|
return toPublicJob({
|
|
20
27
|
job,
|
|
21
28
|
name,
|
|
@@ -31,15 +38,37 @@ export async function getJob(ctx, id) {
|
|
|
31
38
|
clearLogs: ctx.clearJobLogs,
|
|
32
39
|
getDependencies: ctx.getJobDependencies,
|
|
33
40
|
getDependenciesCount: ctx.getJobDependenciesCount,
|
|
41
|
+
// Move / wait callbacks
|
|
42
|
+
moveToCompleted: ctx.moveJobToCompleted,
|
|
43
|
+
moveToFailed: ctx.moveJobToFailed,
|
|
44
|
+
moveToWait: ctx.moveJobToWait,
|
|
45
|
+
moveToDelayed: ctx.moveJobToDelayed
|
|
46
|
+
? (jid, ts, tok) => ctx.moveJobToDelayed(jid, ts, tok)
|
|
47
|
+
: undefined,
|
|
48
|
+
moveToWaitingChildren: ctx.moveJobToWaitingChildren,
|
|
49
|
+
waitUntilFinished: ctx.waitJobUntilFinished,
|
|
50
|
+
// Direct-to-manager callbacks (no server primitive or Queue-level wrapper)
|
|
51
|
+
discard: (jid) => {
|
|
52
|
+
void mgr.discard(jobId(jid));
|
|
53
|
+
},
|
|
54
|
+
getFailedChildrenValues: (jid) => mgr.getFailedChildrenValues(jobId(jid)),
|
|
55
|
+
getIgnoredChildrenFailures: (jid) => mgr.getIgnoredChildrenFailures(jobId(jid)),
|
|
56
|
+
removeChildDependency: (jid) => mgr.removeChildDependency(jobId(jid)),
|
|
57
|
+
removeUnprocessedChildren: async (jid) => {
|
|
58
|
+
await mgr.removeUnprocessedChildren(jobId(jid));
|
|
59
|
+
},
|
|
34
60
|
});
|
|
35
61
|
}
|
|
36
|
-
// Fallback to simple job
|
|
62
|
+
// Fallback to simple job — reflect priority/delay/opts from the real job (#88)
|
|
37
63
|
return createSimpleJob(String(job.id), name, job.data, job.createdAt, {
|
|
38
64
|
queueName: ctx.name,
|
|
65
|
+
embedded: ctx.embedded,
|
|
66
|
+
tcp: ctx.tcp,
|
|
39
67
|
getJobState: ctx.getJobState,
|
|
40
68
|
removeAsync: ctx.removeAsync,
|
|
41
69
|
retryJob: ctx.retryJob,
|
|
42
70
|
getChildrenValues: ctx.getChildrenValues,
|
|
71
|
+
meta: metaFromJob(job),
|
|
43
72
|
});
|
|
44
73
|
}
|
|
45
74
|
const response = await ctx.tcp.send({ cmd: 'GetJob', id });
|
|
@@ -47,12 +76,15 @@ export async function getJob(ctx, id) {
|
|
|
47
76
|
return null;
|
|
48
77
|
const j = response.job;
|
|
49
78
|
const name = j.data?.name ?? 'unknown';
|
|
50
|
-
const result = createSimpleJob(j.id, name, j.data, Date.now(), {
|
|
79
|
+
const result = createSimpleJob(String(j.id), name, j.data, j.createdAt ?? Date.now(), {
|
|
51
80
|
queueName: ctx.name,
|
|
81
|
+
embedded: ctx.embedded,
|
|
82
|
+
tcp: ctx.tcp,
|
|
52
83
|
getJobState: ctx.getJobState,
|
|
53
84
|
removeAsync: ctx.removeAsync,
|
|
54
85
|
retryJob: ctx.retryJob,
|
|
55
86
|
getChildrenValues: ctx.getChildrenValues,
|
|
87
|
+
meta: metaFromJob(j),
|
|
56
88
|
});
|
|
57
89
|
if (j.progress !== undefined)
|
|
58
90
|
result.progress = j.progress;
|
|
@@ -112,6 +144,8 @@ export function getJobs(ctx, options = {}) {
|
|
|
112
144
|
const name = j.data?.name ?? 'unknown';
|
|
113
145
|
return createSimpleJob(String(j.id), name, j.data, j.createdAt, {
|
|
114
146
|
queueName: ctx.name,
|
|
147
|
+
embedded: ctx.embedded,
|
|
148
|
+
tcp: ctx.tcp,
|
|
115
149
|
getJobState: ctx.getJobState,
|
|
116
150
|
removeAsync: ctx.removeAsync,
|
|
117
151
|
retryJob: ctx.retryJob,
|
|
@@ -136,16 +170,22 @@ export async function getJobsAsync(ctx, options = {}) {
|
|
|
136
170
|
if (!response.ok || !Array.isArray(response.jobs)) {
|
|
137
171
|
return [];
|
|
138
172
|
}
|
|
173
|
+
// handleGetJobs returns the full internal job per element ({ ...job, state }),
|
|
174
|
+
// so reflect the complete opts via metaFromJob instead of a slim subset (#90).
|
|
139
175
|
const jobs = response.jobs;
|
|
140
176
|
const now = Date.now();
|
|
141
177
|
return jobs.map((j) => {
|
|
142
178
|
const name = j.data?.name ?? 'unknown';
|
|
143
|
-
const
|
|
179
|
+
const createdAt = j.createdAt ?? now;
|
|
180
|
+
const result = createSimpleJob(String(j.id), name, j.data, createdAt, {
|
|
144
181
|
queueName: ctx.name,
|
|
182
|
+
embedded: ctx.embedded,
|
|
183
|
+
tcp: ctx.tcp,
|
|
145
184
|
getJobState: ctx.getJobState,
|
|
146
185
|
removeAsync: ctx.removeAsync,
|
|
147
186
|
retryJob: ctx.retryJob,
|
|
148
187
|
getChildrenValues: ctx.getChildrenValues,
|
|
188
|
+
meta: metaFromJob(j),
|
|
149
189
|
});
|
|
150
190
|
if (j.progress !== undefined)
|
|
151
191
|
result.progress = j.progress;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/query.ts"],"names":[],"mappings":"AAAA,0JAA0J;AAC1J;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AASjD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/client/queue/operations/query.ts"],"names":[],"mappings":"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"}
|