@shrub/queue-local 0.5.60 → 0.5.63
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/module.js +29 -7
- package/package.json +5 -5
package/dist/module.js
CHANGED
|
@@ -51,13 +51,26 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
51
51
|
}
|
|
52
52
|
});
|
|
53
53
|
queue = {
|
|
54
|
+
name,
|
|
54
55
|
add: options => {
|
|
55
56
|
let finished;
|
|
56
57
|
const waitUntilFinished = new Promise(resolve => finished = resolve);
|
|
57
58
|
const job = {
|
|
58
|
-
id: unique_id_1.default(),
|
|
59
|
+
id: options.id || unique_id_1.default(),
|
|
59
60
|
name: options.name || "",
|
|
60
61
|
data: options.data || {},
|
|
62
|
+
_isActive: false,
|
|
63
|
+
_isCompleted: false,
|
|
64
|
+
_isFailed: false,
|
|
65
|
+
get isActive() {
|
|
66
|
+
return Promise.resolve(this._isActive);
|
|
67
|
+
},
|
|
68
|
+
get isCompleted() {
|
|
69
|
+
return Promise.resolve(this._isCompleted);
|
|
70
|
+
},
|
|
71
|
+
get isFailed() {
|
|
72
|
+
return Promise.resolve(this._isFailed);
|
|
73
|
+
},
|
|
61
74
|
progress: 0,
|
|
62
75
|
updateProgress(progress) {
|
|
63
76
|
this.progress = progress;
|
|
@@ -125,16 +138,23 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
125
138
|
const jobFailed = new event_emitter_1.EventEmitter();
|
|
126
139
|
const jobProgress = new event_emitter_1.EventEmitter();
|
|
127
140
|
const options = this.getWorkerOptions(optionsOrCallback);
|
|
128
|
-
const callback = (job) => {
|
|
141
|
+
const callback = ((job) => {
|
|
142
|
+
job._isActive = true;
|
|
129
143
|
job.worker = worker;
|
|
130
144
|
jobActive.emit({ job });
|
|
131
145
|
return options.callback(job)
|
|
132
146
|
.then(returnValue => {
|
|
147
|
+
job._isActive = false;
|
|
148
|
+
job._isCompleted = true;
|
|
133
149
|
jobCompleted.emit({ job, returnValue });
|
|
134
150
|
return returnValue;
|
|
135
151
|
})
|
|
136
|
-
.catch(error =>
|
|
137
|
-
|
|
152
|
+
.catch(error => {
|
|
153
|
+
job._isActive = false;
|
|
154
|
+
job._isFailed = true;
|
|
155
|
+
jobFailed.emit({ job, error });
|
|
156
|
+
});
|
|
157
|
+
});
|
|
138
158
|
callbacks.push(callback);
|
|
139
159
|
const worker = {
|
|
140
160
|
get onJobActive() {
|
|
@@ -158,10 +178,12 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
158
178
|
}
|
|
159
179
|
return Promise.resolve();
|
|
160
180
|
},
|
|
161
|
-
emitJobProgress: args => jobProgress.emit(args)
|
|
181
|
+
emitJobProgress: args => jobProgress.emit(args),
|
|
182
|
+
waitUntilReady: () => Promise.resolve()
|
|
162
183
|
};
|
|
163
184
|
return worker;
|
|
164
|
-
}
|
|
185
|
+
},
|
|
186
|
+
waitUntilReady: () => Promise.resolve()
|
|
165
187
|
};
|
|
166
188
|
this.queues.set(name, queue);
|
|
167
189
|
}
|
|
@@ -169,4 +191,4 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
169
191
|
}
|
|
170
192
|
}
|
|
171
193
|
exports.QueueLocalAdapter = QueueLocalAdapter;
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
194
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxzQ0FBNkY7QUFDN0Ysd0NBR3NCO0FBQ3RCLG9EQUFnRDtBQUNoRCx3REFBb0Q7QUFDcEQsaUVBQXdDO0FBQ3hDLDZDQUE4QztBQUlqQyxRQUFBLHdCQUF3QixHQUFHLG1CQUFZLEVBQTRCLENBQUM7QUF1QmpGLE1BQWEsZ0JBQWdCO0lBQTdCO1FBQ3FCLFlBQU8sR0FBRyxJQUFJLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRTVDLFNBQUksR0FBRyxhQUFhLENBQUM7UUFDckIsaUJBQVksR0FBRyxDQUFDLG1CQUFXLENBQUMsQ0FBQztJQVcxQyxDQUFDO0lBVEcsVUFBVSxDQUFDLElBQXdCO1FBQy9CLElBQUksQ0FBQyxNQUFNLENBQUMsZ0NBQXdCLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNsRCxRQUFRLEVBQUUsT0FBTyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUMsaUJBQWlCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUN4RyxDQUFDLENBQUMsQ0FBQztJQUNSLENBQUM7SUFFRCxTQUFTLENBQUMsRUFBRSxNQUFNLEVBQXVCO1FBQ3JDLE1BQU0sQ0FBQyxHQUFHLENBQUMsMkJBQW1CLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzNELENBQUM7Q0FDSjtBQWZELDRDQWVDO0FBRUQsTUFBYSxpQkFBa0IsU0FBUSxvQkFBWTtJQUFuRDs7UUFDcUIsV0FBTSxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBNkt4RCxDQUFDO0lBM0thLGdCQUFnQixDQUFDLElBQVk7UUFDbkMsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FB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
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shrub/queue-local",
|
|
3
3
|
"description": "Provides a job/worker queue that runs locally.",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.63",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
"clean": "rimraf ./dist && rimraf tsconfig.tsbuildinfo"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@shrub/core": "0.5.
|
|
28
|
-
"@shrub/logging": "0.5.
|
|
29
|
-
"@shrub/queue": "0.5.
|
|
27
|
+
"@shrub/core": "0.5.63",
|
|
28
|
+
"@shrub/logging": "0.5.63",
|
|
29
|
+
"@shrub/queue": "0.5.63",
|
|
30
30
|
"@sprig/async-queue": "0.2.0",
|
|
31
31
|
"@sprig/event-emitter": "^0.2.0",
|
|
32
32
|
"@sprig/unique-id": "^0.2.0",
|
|
33
33
|
"cron-parser": "^4.3.0"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "5707c44f7cba7e1db6a1df20af24ad8d781f1d97"
|
|
36
36
|
}
|