bunqueue 2.0.3 → 2.0.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.
- package/dist/application/webhookManager.js +3 -3
- package/dist/application/webhookManager.js.map +1 -1
- package/dist/application/workerManager.js +2 -2
- package/dist/application/workerManager.js.map +1 -1
- package/dist/cli/commands/backup.js +1 -1
- package/dist/cli/commands/backup.js.map +1 -1
- package/dist/cli/commands/server.js +10 -10
- package/dist/cli/commands/server.js.map +1 -1
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +15 -9
- package/dist/cli/output.js.map +1 -1
- package/dist/client/flow.d.ts +20 -175
- package/dist/client/flow.d.ts.map +1 -1
- package/dist/client/flow.js +122 -475
- package/dist/client/flow.js.map +1 -1
- package/dist/client/flowJobFactory.d.ts +10 -0
- package/dist/client/flowJobFactory.d.ts.map +1 -0
- package/dist/client/flowJobFactory.js +104 -0
- package/dist/client/flowJobFactory.js.map +1 -0
- package/dist/client/flowPush.d.ts +27 -0
- package/dist/client/flowPush.d.ts.map +1 -0
- package/dist/client/flowPush.js +129 -0
- package/dist/client/flowPush.js.map +1 -0
- package/dist/client/flowTypes.d.ts +70 -0
- package/dist/client/flowTypes.d.ts.map +1 -0
- package/dist/client/flowTypes.js +6 -0
- package/dist/client/flowTypes.js.map +1 -0
- package/dist/client/jobConversion.d.ts +88 -0
- package/dist/client/jobConversion.d.ts.map +1 -0
- package/dist/client/jobConversion.js +235 -0
- package/dist/client/jobConversion.js.map +1 -0
- package/dist/client/jobHelpers.d.ts +27 -0
- package/dist/client/jobHelpers.d.ts.map +1 -0
- package/dist/client/jobHelpers.js +113 -0
- package/dist/client/jobHelpers.js.map +1 -0
- package/dist/client/manager.js +1 -1
- package/dist/client/manager.js.map +1 -1
- package/dist/client/queue/helpers.d.ts.map +1 -1
- package/dist/client/queue/helpers.js +1 -1
- package/dist/client/queue/helpers.js.map +1 -1
- package/dist/client/sandboxed/worker.d.ts +1 -1
- package/dist/client/sandboxed/worker.d.ts.map +1 -1
- package/dist/client/sandboxed/worker.js +3 -3
- package/dist/client/sandboxed/worker.js.map +1 -1
- package/dist/client/sandboxed/wrapper.d.ts +2 -2
- package/dist/client/sandboxed/wrapper.d.ts.map +1 -1
- package/dist/client/sandboxed/wrapper.js +20 -17
- package/dist/client/sandboxed/wrapper.js.map +1 -1
- package/dist/client/types.d.ts +3 -82
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js +3 -401
- package/dist/client/types.js.map +1 -1
- package/dist/client/worker/ackBatcher.js +1 -1
- package/dist/client/worker/ackBatcher.js.map +1 -1
- package/dist/client/worker/types.d.ts.map +1 -1
- package/dist/client/worker/types.js +1 -1
- package/dist/client/worker/types.js.map +1 -1
- package/dist/client/worker/worker.js +2 -2
- package/dist/client/worker/worker.js.map +1 -1
- package/dist/infrastructure/backup/s3BackupConfig.d.ts +5 -0
- package/dist/infrastructure/backup/s3BackupConfig.d.ts.map +1 -1
- package/dist/infrastructure/backup/s3BackupConfig.js +9 -9
- package/dist/infrastructure/backup/s3BackupConfig.js.map +1 -1
- package/dist/infrastructure/backup/s3BackupOperations.d.ts.map +1 -1
- package/dist/infrastructure/backup/s3BackupOperations.js +35 -13
- package/dist/infrastructure/backup/s3BackupOperations.js.map +1 -1
- package/dist/infrastructure/server/rateLimiter.js +4 -4
- package/dist/infrastructure/server/rateLimiter.js.map +1 -1
- package/dist/infrastructure/server/tcp.js +1 -1
- package/dist/infrastructure/server/tcp.js.map +1 -1
- package/dist/main.js +15 -16
- package/dist/main.js.map +1 -1
- package/dist/mcp/index.js +1 -1
- package/dist/mcp/index.js.map +1 -1
- package/dist/shared/hash.d.ts.map +1 -1
- package/dist/shared/hash.js +1 -2
- package/dist/shared/hash.js.map +1 -1
- package/dist/shared/lock.js +1 -1
- package/dist/shared/lock.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,235 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Job Conversion Functions
|
|
3
|
+
* Convert internal job types to public API types
|
|
4
|
+
*/
|
|
5
|
+
import { extractUserData, extractParent, buildJobOpts, buildParentKey, buildRepeatJobKey, } from './jobHelpers';
|
|
6
|
+
/** Build common job properties from internal job */
|
|
7
|
+
function buildJobProperties(job, name, stacktrace, token, processedBy) {
|
|
8
|
+
const id = String(job.id);
|
|
9
|
+
const parent = extractParent(job.data);
|
|
10
|
+
const jobOpts = buildJobOpts(job);
|
|
11
|
+
return {
|
|
12
|
+
id,
|
|
13
|
+
name,
|
|
14
|
+
data: extractUserData(job.data),
|
|
15
|
+
queueName: job.queue,
|
|
16
|
+
attemptsMade: job.attempts,
|
|
17
|
+
timestamp: job.createdAt,
|
|
18
|
+
progress: job.progress,
|
|
19
|
+
parent,
|
|
20
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
21
|
+
processedOn: job.startedAt ?? undefined,
|
|
22
|
+
finishedOn: job.completedAt ?? undefined,
|
|
23
|
+
stacktrace: stacktrace ?? null,
|
|
24
|
+
stalledCounter: job.stallCount,
|
|
25
|
+
priority: job.priority,
|
|
26
|
+
parentKey: buildParentKey(job),
|
|
27
|
+
opts: jobOpts,
|
|
28
|
+
token,
|
|
29
|
+
processedBy,
|
|
30
|
+
deduplicationId: job.customId ?? undefined,
|
|
31
|
+
repeatJobKey: buildRepeatJobKey(job),
|
|
32
|
+
attemptsStarted: job.attempts,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
/** Build state check methods */
|
|
36
|
+
function buildStateCheckMethods(id, getState, getDependenciesCount) {
|
|
37
|
+
return {
|
|
38
|
+
isWaiting: async () => {
|
|
39
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
40
|
+
return state === 'waiting';
|
|
41
|
+
},
|
|
42
|
+
isActive: async () => {
|
|
43
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
44
|
+
return state === 'active';
|
|
45
|
+
},
|
|
46
|
+
isDelayed: async () => {
|
|
47
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
48
|
+
return state === 'delayed';
|
|
49
|
+
},
|
|
50
|
+
isCompleted: async () => {
|
|
51
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
52
|
+
return state === 'completed';
|
|
53
|
+
},
|
|
54
|
+
isFailed: async () => {
|
|
55
|
+
const state = await (getState ? getState(id) : Promise.resolve('unknown'));
|
|
56
|
+
return state === 'failed';
|
|
57
|
+
},
|
|
58
|
+
isWaitingChildren: async () => {
|
|
59
|
+
if (getDependenciesCount) {
|
|
60
|
+
const counts = await getDependenciesCount(id);
|
|
61
|
+
return counts.unprocessed > 0;
|
|
62
|
+
}
|
|
63
|
+
return false;
|
|
64
|
+
},
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
/** Build serialization methods */
|
|
68
|
+
function buildSerializationMethods(job, id, name, jobOpts, stacktrace) {
|
|
69
|
+
return {
|
|
70
|
+
toJSON: () => ({
|
|
71
|
+
id,
|
|
72
|
+
name,
|
|
73
|
+
data: extractUserData(job.data),
|
|
74
|
+
opts: jobOpts,
|
|
75
|
+
progress: job.progress,
|
|
76
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
77
|
+
timestamp: job.createdAt,
|
|
78
|
+
attemptsMade: job.attempts,
|
|
79
|
+
stacktrace: stacktrace ?? null,
|
|
80
|
+
returnvalue: undefined,
|
|
81
|
+
failedReason: undefined,
|
|
82
|
+
finishedOn: job.completedAt ?? undefined,
|
|
83
|
+
processedOn: job.startedAt ?? undefined,
|
|
84
|
+
queueQualifiedName: `bull:${job.queue}`,
|
|
85
|
+
parentKey: buildParentKey(job),
|
|
86
|
+
}),
|
|
87
|
+
asJSON: () => ({
|
|
88
|
+
id,
|
|
89
|
+
name,
|
|
90
|
+
data: JSON.stringify(extractUserData(job.data)),
|
|
91
|
+
opts: JSON.stringify(jobOpts),
|
|
92
|
+
progress: JSON.stringify(job.progress),
|
|
93
|
+
delay: String(job.runAt > job.createdAt ? job.runAt - job.createdAt : 0),
|
|
94
|
+
timestamp: String(job.createdAt),
|
|
95
|
+
attemptsMade: String(job.attempts),
|
|
96
|
+
stacktrace: stacktrace ? JSON.stringify(stacktrace) : null,
|
|
97
|
+
returnvalue: undefined,
|
|
98
|
+
failedReason: undefined,
|
|
99
|
+
finishedOn: job.completedAt ? String(job.completedAt) : undefined,
|
|
100
|
+
processedOn: job.startedAt ? String(job.startedAt) : undefined,
|
|
101
|
+
parentKey: buildParentKey(job),
|
|
102
|
+
}),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
/** Convert internal job to public job (with methods) */
|
|
106
|
+
export function createPublicJob(opts) {
|
|
107
|
+
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;
|
|
108
|
+
const id = String(job.id);
|
|
109
|
+
const jobOpts = buildJobOpts(job);
|
|
110
|
+
const props = buildJobProperties(job, name, stacktrace, token, processedBy);
|
|
111
|
+
const stateChecks = buildStateCheckMethods(id, getState, getDependenciesCount);
|
|
112
|
+
const serialization = buildSerializationMethods(job, id, name, jobOpts, stacktrace);
|
|
113
|
+
return {
|
|
114
|
+
...props,
|
|
115
|
+
...stateChecks,
|
|
116
|
+
...serialization,
|
|
117
|
+
// Core methods
|
|
118
|
+
updateProgress: (progress, message) => updateProgress(id, progress, message),
|
|
119
|
+
log: (message) => log(id, message),
|
|
120
|
+
getState: () => (getState ? getState(id) : Promise.resolve('unknown')),
|
|
121
|
+
remove: () => (remove ? remove(id) : Promise.resolve()),
|
|
122
|
+
retry: () => (retry ? retry(id) : Promise.resolve()),
|
|
123
|
+
getChildrenValues: () => getChildrenValues ? getChildrenValues(id) : Promise.resolve({}),
|
|
124
|
+
// BullMQ v5 mutation methods
|
|
125
|
+
updateData: (data) => (updateData ? updateData(id, data) : Promise.resolve()),
|
|
126
|
+
promote: () => (promote ? promote(id) : Promise.resolve()),
|
|
127
|
+
changeDelay: (delay) => (changeDelay ? changeDelay(id, delay) : Promise.resolve()),
|
|
128
|
+
changePriority: (prioOpts) => changePriority ? changePriority(id, prioOpts) : Promise.resolve(),
|
|
129
|
+
extendLock: (lockToken, duration) => extendLock ? extendLock(id, lockToken, duration) : Promise.resolve(0),
|
|
130
|
+
clearLogs: (keepLogs) => (clearLogs ? clearLogs(id, keepLogs) : Promise.resolve()),
|
|
131
|
+
// BullMQ v5 dependency methods
|
|
132
|
+
getDependencies: (depOpts) => getDependencies
|
|
133
|
+
? getDependencies(id, depOpts)
|
|
134
|
+
: Promise.resolve({ processed: {}, unprocessed: [] }),
|
|
135
|
+
getDependenciesCount: (depOpts) => getDependenciesCount
|
|
136
|
+
? getDependenciesCount(id, depOpts)
|
|
137
|
+
: Promise.resolve({ processed: 0, unprocessed: 0 }),
|
|
138
|
+
// BullMQ v5 move methods
|
|
139
|
+
moveToCompleted: (returnValue, lockToken, _fetchNext) => moveToCompleted ? moveToCompleted(id, returnValue, lockToken) : Promise.resolve(null),
|
|
140
|
+
moveToFailed: (error, lockToken, _fetchNext) => moveToFailed ? moveToFailed(id, error, lockToken) : Promise.resolve(),
|
|
141
|
+
moveToWait: (lockToken) => moveToWait ? moveToWait(id, lockToken) : Promise.resolve(false),
|
|
142
|
+
moveToDelayed: (timestamp, lockToken) => moveToDelayed ? moveToDelayed(id, timestamp, lockToken) : Promise.resolve(),
|
|
143
|
+
moveToWaitingChildren: (lockToken, moveOpts) => moveToWaitingChildren
|
|
144
|
+
? moveToWaitingChildren(id, lockToken, moveOpts)
|
|
145
|
+
: Promise.resolve(false),
|
|
146
|
+
waitUntilFinished: (queueEvents, ttl) => waitUntilFinished ? waitUntilFinished(id, queueEvents, ttl) : Promise.resolve(undefined),
|
|
147
|
+
// BullMQ v5 additional methods
|
|
148
|
+
discard: () => {
|
|
149
|
+
if (discard)
|
|
150
|
+
discard(id);
|
|
151
|
+
},
|
|
152
|
+
getFailedChildrenValues: () => getFailedChildrenValues ? getFailedChildrenValues(id) : Promise.resolve({}),
|
|
153
|
+
getIgnoredChildrenFailures: () => getIgnoredChildrenFailures ? getIgnoredChildrenFailures(id) : Promise.resolve({}),
|
|
154
|
+
removeChildDependency: () => removeChildDependency ? removeChildDependency(id) : Promise.resolve(false),
|
|
155
|
+
removeDeduplicationKey: () => removeDeduplicationKey ? removeDeduplicationKey(id) : Promise.resolve(false),
|
|
156
|
+
removeUnprocessedChildren: () => removeUnprocessedChildren ? removeUnprocessedChildren(id) : Promise.resolve(),
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
/** Simple public job without methods (for Queue.getJob) */
|
|
160
|
+
export function toPublicJob(opts) {
|
|
161
|
+
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;
|
|
162
|
+
const id = String(job.id);
|
|
163
|
+
const jobOpts = buildJobOpts(job);
|
|
164
|
+
const props = buildJobProperties(job, name, stacktrace, undefined, undefined);
|
|
165
|
+
const stateChecks = buildStateCheckMethods(id, getState, getDependenciesCount);
|
|
166
|
+
const serialization = buildSerializationMethods(job, id, name, jobOpts, stacktrace);
|
|
167
|
+
return {
|
|
168
|
+
...props,
|
|
169
|
+
...stateChecks,
|
|
170
|
+
...serialization,
|
|
171
|
+
// Core methods (no-op for simple jobs)
|
|
172
|
+
updateProgress: async () => { },
|
|
173
|
+
log: async () => { },
|
|
174
|
+
getState: () => (getState ? getState(id) : Promise.resolve('unknown')),
|
|
175
|
+
remove: () => (remove ? remove(id) : Promise.resolve()),
|
|
176
|
+
retry: () => (retry ? retry(id) : Promise.resolve()),
|
|
177
|
+
getChildrenValues: () => getChildrenValues ? getChildrenValues(id) : Promise.resolve({}),
|
|
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 move methods
|
|
193
|
+
moveToCompleted: (returnValue, lockToken, _fetchNext) => moveToCompleted ? moveToCompleted(id, returnValue, lockToken) : Promise.resolve(null),
|
|
194
|
+
moveToFailed: (error, lockToken, _fetchNext) => moveToFailed ? moveToFailed(id, error, lockToken) : Promise.resolve(),
|
|
195
|
+
moveToWait: (lockToken) => moveToWait ? moveToWait(id, lockToken) : Promise.resolve(false),
|
|
196
|
+
moveToDelayed: (timestamp, lockToken) => moveToDelayed ? moveToDelayed(id, timestamp, lockToken) : Promise.resolve(),
|
|
197
|
+
moveToWaitingChildren: (lockToken, moveOpts) => moveToWaitingChildren
|
|
198
|
+
? moveToWaitingChildren(id, lockToken, moveOpts)
|
|
199
|
+
: Promise.resolve(false),
|
|
200
|
+
waitUntilFinished: (queueEvents, ttl) => waitUntilFinished ? waitUntilFinished(id, queueEvents, ttl) : Promise.resolve(undefined),
|
|
201
|
+
// BullMQ v5 additional methods
|
|
202
|
+
discard: () => {
|
|
203
|
+
if (discard)
|
|
204
|
+
discard(id);
|
|
205
|
+
},
|
|
206
|
+
getFailedChildrenValues: () => getFailedChildrenValues ? getFailedChildrenValues(id) : Promise.resolve({}),
|
|
207
|
+
getIgnoredChildrenFailures: () => getIgnoredChildrenFailures ? getIgnoredChildrenFailures(id) : Promise.resolve({}),
|
|
208
|
+
removeChildDependency: () => removeChildDependency ? removeChildDependency(id) : Promise.resolve(false),
|
|
209
|
+
removeDeduplicationKey: () => removeDeduplicationKey ? removeDeduplicationKey(id) : Promise.resolve(false),
|
|
210
|
+
removeUnprocessedChildren: () => removeUnprocessedChildren ? removeUnprocessedChildren(id) : Promise.resolve(),
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
/** Convert internal DLQ entry to public DLQ entry */
|
|
214
|
+
export function toDlqEntry(entry) {
|
|
215
|
+
const jobData = entry.job.data;
|
|
216
|
+
return {
|
|
217
|
+
job: toPublicJob({ job: entry.job, name: jobData?.name ?? 'default' }),
|
|
218
|
+
enteredAt: entry.enteredAt,
|
|
219
|
+
reason: entry.reason,
|
|
220
|
+
error: entry.error,
|
|
221
|
+
attempts: entry.attempts.map((a) => ({
|
|
222
|
+
attempt: a.attempt,
|
|
223
|
+
startedAt: a.startedAt,
|
|
224
|
+
failedAt: a.failedAt,
|
|
225
|
+
reason: a.reason,
|
|
226
|
+
error: a.error,
|
|
227
|
+
duration: a.duration,
|
|
228
|
+
})),
|
|
229
|
+
retryCount: entry.retryCount,
|
|
230
|
+
lastRetryAt: entry.lastRetryAt,
|
|
231
|
+
nextRetryAt: entry.nextRetryAt,
|
|
232
|
+
expiresAt: entry.expiresAt,
|
|
233
|
+
};
|
|
234
|
+
}
|
|
235
|
+
//# sourceMappingURL=jobConversion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jobConversion.js","sourceRoot":"","sources":["../../src/client/jobConversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Job Helper Functions
|
|
3
|
+
* Internal utilities for extracting and building job data
|
|
4
|
+
*/
|
|
5
|
+
import type { Job as InternalJob } from '../domain/types/job';
|
|
6
|
+
import type { RepeatOptions, JobOptions } from './types';
|
|
7
|
+
/** Extract user data from stored job data (removes internal 'name' field) */
|
|
8
|
+
export declare function extractUserData(jobData: unknown): unknown;
|
|
9
|
+
/** Extract parent info from job data if present */
|
|
10
|
+
export declare function extractParent(jobData: unknown): {
|
|
11
|
+
id: string;
|
|
12
|
+
queueQualifiedName: string;
|
|
13
|
+
} | undefined;
|
|
14
|
+
/** Build repeat options from internal job repeat config */
|
|
15
|
+
export declare function buildRepeatOpts(repeat: InternalJob['repeat']): RepeatOptions | undefined;
|
|
16
|
+
/** Build parent reference from job data */
|
|
17
|
+
export declare function buildParentOpts(job: InternalJob): {
|
|
18
|
+
id: string;
|
|
19
|
+
queue: string;
|
|
20
|
+
} | undefined;
|
|
21
|
+
/** Build JobOptions from internal job */
|
|
22
|
+
export declare function buildJobOpts(job: InternalJob): JobOptions;
|
|
23
|
+
/** Build parent key from job */
|
|
24
|
+
export declare function buildParentKey(job: InternalJob): string | undefined;
|
|
25
|
+
/** Build repeat job key from job */
|
|
26
|
+
export declare function buildRepeatJobKey(job: InternalJob): string | undefined;
|
|
27
|
+
//# sourceMappingURL=jobHelpers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jobHelpers.d.ts","sourceRoot":"","sources":["../../src/client/jobHelpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,GAAG,IAAI,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEzD,6EAA6E;AAC7E,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAMzD;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,OAAO,GACf;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAkBxD;AAED,2DAA2D;AAC3D,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,aAAa,GAAG,SAAS,CAexF;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,GAAG,EAAE,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAW3F;AAED,yCAAyC;AACzC,wBAAgB,YAAY,CAAC,GAAG,EAAE,WAAW,GAAG,UAAU,CAgCzD;AAED,gCAAgC;AAChC,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAWnE;AAED,oCAAoC;AACpC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAMtE"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Job Helper Functions
|
|
3
|
+
* Internal utilities for extracting and building job data
|
|
4
|
+
*/
|
|
5
|
+
/** Extract user data from stored job data (removes internal 'name' field) */
|
|
6
|
+
export function extractUserData(jobData) {
|
|
7
|
+
if (typeof jobData === 'object' && jobData !== null) {
|
|
8
|
+
const { name: _name, ...userData } = jobData;
|
|
9
|
+
return userData;
|
|
10
|
+
}
|
|
11
|
+
return jobData;
|
|
12
|
+
}
|
|
13
|
+
/** Extract parent info from job data if present */
|
|
14
|
+
export function extractParent(jobData) {
|
|
15
|
+
if (typeof jobData === 'object' && jobData !== null) {
|
|
16
|
+
const data = jobData;
|
|
17
|
+
const parentId = data.__parentId;
|
|
18
|
+
const parentQueue = data.__parentQueue;
|
|
19
|
+
if (parentId !== undefined &&
|
|
20
|
+
parentQueue !== undefined &&
|
|
21
|
+
(typeof parentId === 'string' || typeof parentId === 'number') &&
|
|
22
|
+
(typeof parentQueue === 'string' || typeof parentQueue === 'number')) {
|
|
23
|
+
return {
|
|
24
|
+
id: String(parentId),
|
|
25
|
+
queueQualifiedName: String(parentQueue),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
/** Build repeat options from internal job repeat config */
|
|
32
|
+
export function buildRepeatOpts(repeat) {
|
|
33
|
+
if (!repeat)
|
|
34
|
+
return undefined;
|
|
35
|
+
return {
|
|
36
|
+
every: repeat.every,
|
|
37
|
+
limit: repeat.limit,
|
|
38
|
+
pattern: repeat.pattern,
|
|
39
|
+
count: repeat.count,
|
|
40
|
+
startDate: repeat.startDate,
|
|
41
|
+
endDate: repeat.endDate,
|
|
42
|
+
tz: repeat.tz,
|
|
43
|
+
immediately: repeat.immediately,
|
|
44
|
+
prevMillis: repeat.prevMillis,
|
|
45
|
+
offset: repeat.offset,
|
|
46
|
+
jobId: repeat.jobId,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/** Build parent reference from job data */
|
|
50
|
+
export function buildParentOpts(job) {
|
|
51
|
+
const data = job.data;
|
|
52
|
+
const rawParentId = job.parentId ?? data?.__parentId;
|
|
53
|
+
const rawParentQueue = data?.__parentQueue;
|
|
54
|
+
// Only create parent if both values are string-coercible
|
|
55
|
+
const isStringLike = (v) => typeof v === 'string' || typeof v === 'number';
|
|
56
|
+
if (isStringLike(rawParentId) && isStringLike(rawParentQueue)) {
|
|
57
|
+
return { id: String(rawParentId), queue: String(rawParentQueue) };
|
|
58
|
+
}
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
/** Build JobOptions from internal job */
|
|
62
|
+
export function buildJobOpts(job) {
|
|
63
|
+
const backoff = job.backoffConfig
|
|
64
|
+
? { type: job.backoffConfig.type, delay: job.backoffConfig.delay }
|
|
65
|
+
: job.backoff;
|
|
66
|
+
return {
|
|
67
|
+
priority: job.priority,
|
|
68
|
+
delay: job.runAt > job.createdAt ? job.runAt - job.createdAt : 0,
|
|
69
|
+
attempts: job.maxAttempts,
|
|
70
|
+
backoff,
|
|
71
|
+
timeout: job.timeout ?? undefined,
|
|
72
|
+
jobId: job.customId ?? undefined,
|
|
73
|
+
removeOnComplete: job.removeOnComplete,
|
|
74
|
+
removeOnFail: job.removeOnFail,
|
|
75
|
+
stallTimeout: job.stallTimeout ?? undefined,
|
|
76
|
+
repeat: buildRepeatOpts(job.repeat),
|
|
77
|
+
parent: buildParentOpts(job),
|
|
78
|
+
lifo: job.lifo,
|
|
79
|
+
stackTraceLimit: job.stackTraceLimit,
|
|
80
|
+
keepLogs: job.keepLogs ?? undefined,
|
|
81
|
+
sizeLimit: job.sizeLimit ?? undefined,
|
|
82
|
+
failParentOnFailure: job.failParentOnFailure,
|
|
83
|
+
removeDependencyOnFailure: job.removeDependencyOnFailure,
|
|
84
|
+
deduplication: job.deduplicationTtl !== null
|
|
85
|
+
? { id: job.customId ?? '', ttl: job.deduplicationTtl }
|
|
86
|
+
: undefined,
|
|
87
|
+
debounce: job.debounceId && job.debounceTtl !== null
|
|
88
|
+
? { id: job.debounceId, ttl: job.debounceTtl }
|
|
89
|
+
: undefined,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
/** Build parent key from job */
|
|
93
|
+
export function buildParentKey(job) {
|
|
94
|
+
if (job.parentId) {
|
|
95
|
+
// Try to get parent queue from job data
|
|
96
|
+
const data = job.data;
|
|
97
|
+
const parentQueue = data?.__parentQueue;
|
|
98
|
+
if (parentQueue && (typeof parentQueue === 'string' || typeof parentQueue === 'number')) {
|
|
99
|
+
return `${String(parentQueue)}:${job.parentId}`;
|
|
100
|
+
}
|
|
101
|
+
return `unknown:${job.parentId}`;
|
|
102
|
+
}
|
|
103
|
+
return undefined;
|
|
104
|
+
}
|
|
105
|
+
/** Build repeat job key from job */
|
|
106
|
+
export function buildRepeatJobKey(job) {
|
|
107
|
+
if (job.repeat) {
|
|
108
|
+
const pattern = job.repeat.pattern ?? (job.repeat.every ? `every:${job.repeat.every}` : '');
|
|
109
|
+
return `${job.queue}:${job.id}:${pattern}`;
|
|
110
|
+
}
|
|
111
|
+
return undefined;
|
|
112
|
+
}
|
|
113
|
+
//# sourceMappingURL=jobHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jobHelpers.js","sourceRoot":"","sources":["../../src/client/jobHelpers.ts"],"names":[],"mappings":"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"}
|
package/dist/client/manager.js
CHANGED
|
@@ -5,7 +5,7 @@ import { QueueManager } from '../application/queueManager';
|
|
|
5
5
|
let instance = null;
|
|
6
6
|
/** Get data path from environment */
|
|
7
7
|
function getDataPath() {
|
|
8
|
-
return
|
|
8
|
+
return Bun.env.DATA_PATH ?? Bun.env.SQLITE_PATH;
|
|
9
9
|
}
|
|
10
10
|
/** Get shared QueueManager instance */
|
|
11
11
|
export function getSharedManager() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/client/manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,IAAI,QAAQ,GAAwB,IAAI,CAAC;AAEzC,qCAAqC;AACrC,SAAS,WAAW;IAClB,OAAO,
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/client/manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,IAAI,QAAQ,GAAwB,IAAI,CAAC;AAEzC,qCAAqC;AACrC,SAAS,WAAW;IAClB,OAAO,GAAG,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;AAClD,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,gBAAgB;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;QAC/B,QAAQ,GAAG,IAAI,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,eAAe;IAC7B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACpB,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/client/queue/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,8BAA8B,CAAC;AAE5D,0DAA0D;AAC1D,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/client/queue/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,8BAA8B,CAAC;AAE5D,0DAA0D;AAC1D,eAAO,MAAM,cAAc,SAAoC,CAAC;AAYhE,kDAAkD;AAClD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAG3F;AAED,8CAA8C;AAC9C,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,GAAG,MAAM,CAAC,UAAU,CAK7F;AAED,6CAA6C;AAC7C,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAGzF;AAED,iDAAiD;AACjD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAE3F"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { shardIndex } from '../../shared/hash';
|
|
6
6
|
/** Check if embedded mode should be forced (for tests) */
|
|
7
|
-
export const FORCE_EMBEDDED =
|
|
7
|
+
export const FORCE_EMBEDDED = Bun.env.BUNQUEUE_EMBEDDED === '1';
|
|
8
8
|
/** Extract shards from manager (embedded mode only, accesses private property) */
|
|
9
9
|
function getShards(manager) {
|
|
10
10
|
return manager.shards;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/client/queue/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM/C,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/client/queue/helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAM/C,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,KAAK,GAAG,CAAC;AAOhE,kFAAkF;AAClF,SAAS,SAAS,CAAC,OAA4C;IAC7D,OAAQ,OAAuC,CAAC,MAAM,CAAC;AACzD,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,QAAQ,CAAC,OAA4C,EAAE,KAAa;IAClF,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,aAAa,CAAC,OAA4C;IACxE,OAAO;QACL,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC;QAC1B,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE;KAChC,CAAC;AACJ,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,cAAc,CAAC,MAAmC;IAChE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,OAAO,MAA8B,CAAC;AACxC,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,iBAAiB,CAAC,MAA+B;IAC/D,OAAO,MAAkC,CAAC;AAC5C,CAAC"}
|
|
@@ -17,7 +17,7 @@ export declare class SandboxedWorker {
|
|
|
17
17
|
private readonly workerId;
|
|
18
18
|
constructor(queueName: string, options: SandboxedWorkerOptions);
|
|
19
19
|
/** Start the sandboxed worker pool */
|
|
20
|
-
start(): void
|
|
20
|
+
start(): Promise<void>;
|
|
21
21
|
/** Stop all workers gracefully */
|
|
22
22
|
stop(): Promise<void>;
|
|
23
23
|
/** Get worker pool stats */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/worker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,sBAAsB,EAKvB,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAEtB,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAe9D,sCAAsC;
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/worker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EACV,sBAAsB,EAKvB,MAAM,SAAS,CAAC;AAGjB;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;gBAEtB,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAe9D,sCAAsC;IAChC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B,kCAAkC;IAC5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B,4BAA4B;IAC5B,QAAQ,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAM3E,OAAO,CAAC,WAAW;YAyBL,QAAQ;IAatB,OAAO,CAAC,QAAQ;IAyBhB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,QAAQ;IAiBhB,OAAO,CAAC,IAAI;IAiBZ,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,WAAW;CA0BpB"}
|
|
@@ -31,11 +31,11 @@ export class SandboxedWorker {
|
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
/** Start the sandboxed worker pool */
|
|
34
|
-
start() {
|
|
34
|
+
async start() {
|
|
35
35
|
if (this.running)
|
|
36
36
|
return;
|
|
37
37
|
this.running = true;
|
|
38
|
-
this.wrapperPath = createWrapperScript(this.queueName, this.options.processor);
|
|
38
|
+
this.wrapperPath = await createWrapperScript(this.queueName, this.options.processor);
|
|
39
39
|
for (let i = 0; i < this.options.concurrency; i++) {
|
|
40
40
|
this.spawnWorker(i);
|
|
41
41
|
}
|
|
@@ -52,7 +52,7 @@ export class SandboxedWorker {
|
|
|
52
52
|
this.workers.length = 0;
|
|
53
53
|
if (this.pullPromise)
|
|
54
54
|
await this.pullPromise;
|
|
55
|
-
cleanupWrapperScript(this.wrapperPath);
|
|
55
|
+
await cleanupWrapperScript(this.wrapperPath);
|
|
56
56
|
}
|
|
57
57
|
/** Get worker pool stats */
|
|
58
58
|
getStats() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/client/sandboxed/worker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAsB,MAAM,YAAY,CAAC;AASlE,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEtE;;GAEG;AACH,MAAM,OAAO,eAAe;IACT,SAAS,CAAS;IAClB,OAAO,CAAiC;IACxC,OAAO,GAAoB,EAAE,CAAC;IACvC,OAAO,GAAG,KAAK,CAAC;IAChB,WAAW,GAAyB,IAAI,CAAC;IACzC,WAAW,GAAkB,IAAI,CAAC;IACzB,OAAO,CAAgB;IACvB,QAAQ,CAAS;IAElC,YAAY,SAAiB,EAAE,OAA+B;QAC5D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,oBAAoB,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;QACzG,IAAI,CAAC,OAAO,GAAG;YACb,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,CAAC;YACrC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,GAAG;YACnC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,KAAK;YACjC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;YACtC,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,EAAE;SACzC,CAAC;IACJ,CAAC;IAED,sCAAsC;IACtC,KAAK;
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/client/sandboxed/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* Create wrapper script file that loads the processor
|
|
7
7
|
*/
|
|
8
|
-
export declare function createWrapperScript(queueName: string, processorPath: string): string
|
|
8
|
+
export declare function createWrapperScript(queueName: string, processorPath: string): Promise<string>;
|
|
9
9
|
/**
|
|
10
10
|
* Cleanup wrapper script file
|
|
11
11
|
*/
|
|
12
|
-
export declare function cleanupWrapperScript(wrapperPath: string | null): void
|
|
12
|
+
export declare function cleanupWrapperScript(wrapperPath: string | null): Promise<void>;
|
|
13
13
|
//# sourceMappingURL=wrapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/client/sandboxed/wrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAgDjB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAYpF"}
|
|
@@ -2,9 +2,7 @@
|
|
|
2
2
|
* Worker Wrapper Script Generator
|
|
3
3
|
* Creates the wrapper script that loads processor in worker process
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
6
|
-
import { writeFileSync, existsSync, mkdirSync, unlinkSync } from 'fs';
|
|
7
|
-
import { tmpdir } from 'os';
|
|
5
|
+
import { mkdir } from 'fs/promises';
|
|
8
6
|
/**
|
|
9
7
|
* Escape a string for safe embedding in a template literal
|
|
10
8
|
* Prevents code injection via backticks or backslashes in paths
|
|
@@ -15,10 +13,10 @@ function escapeForTemplateLiteral(str) {
|
|
|
15
13
|
/**
|
|
16
14
|
* Create wrapper script file that loads the processor
|
|
17
15
|
*/
|
|
18
|
-
export function createWrapperScript(queueName, processorPath) {
|
|
16
|
+
export async function createWrapperScript(queueName, processorPath) {
|
|
19
17
|
const fullPath = processorPath.startsWith('/')
|
|
20
18
|
? processorPath
|
|
21
|
-
:
|
|
19
|
+
: `${process.cwd()}/${processorPath}`;
|
|
22
20
|
// Escape the path to prevent code injection via backticks or template expressions
|
|
23
21
|
const escapedPath = escapeForTemplateLiteral(fullPath);
|
|
24
22
|
const wrapperCode = `
|
|
@@ -50,25 +48,30 @@ self.onmessage = async (event) => {
|
|
|
50
48
|
}
|
|
51
49
|
};
|
|
52
50
|
`;
|
|
53
|
-
const tempDir =
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
const tempDir = `${Bun.env.TMPDIR ?? '/tmp'}/bunqueue-workers`;
|
|
52
|
+
const tempDirFile = Bun.file(tempDir);
|
|
53
|
+
if (!(await tempDirFile.exists())) {
|
|
54
|
+
await mkdir(tempDir, { recursive: true });
|
|
56
55
|
}
|
|
57
|
-
const wrapperPath =
|
|
58
|
-
|
|
56
|
+
const wrapperPath = `${tempDir}/worker-${queueName}-${Date.now()}.ts`;
|
|
57
|
+
await Bun.write(wrapperPath, wrapperCode);
|
|
59
58
|
return wrapperPath;
|
|
60
59
|
}
|
|
61
60
|
/**
|
|
62
61
|
* Cleanup wrapper script file
|
|
63
62
|
*/
|
|
64
|
-
export function cleanupWrapperScript(wrapperPath) {
|
|
65
|
-
if (wrapperPath
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
63
|
+
export async function cleanupWrapperScript(wrapperPath) {
|
|
64
|
+
if (!wrapperPath)
|
|
65
|
+
return;
|
|
66
|
+
try {
|
|
67
|
+
const file = Bun.file(wrapperPath);
|
|
68
|
+
if (await file.exists()) {
|
|
69
|
+
const { unlink } = await import('fs/promises');
|
|
70
|
+
await unlink(wrapperPath);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
+
catch {
|
|
74
|
+
// Ignore cleanup errors
|
|
75
|
+
}
|
|
73
76
|
}
|
|
74
77
|
//# sourceMappingURL=wrapper.js.map
|