@shrub/queue-local 0.5.60 → 0.5.61
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 +24 -5
- package/package.json +5 -5
package/dist/module.js
CHANGED
|
@@ -55,9 +55,21 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
55
55
|
let finished;
|
|
56
56
|
const waitUntilFinished = new Promise(resolve => finished = resolve);
|
|
57
57
|
const job = {
|
|
58
|
-
id: unique_id_1.default(),
|
|
58
|
+
id: options.id || unique_id_1.default(),
|
|
59
59
|
name: options.name || "",
|
|
60
60
|
data: options.data || {},
|
|
61
|
+
_isActive: false,
|
|
62
|
+
_isCompleted: false,
|
|
63
|
+
_isFailed: false,
|
|
64
|
+
get isActive() {
|
|
65
|
+
return Promise.resolve(this._isActive);
|
|
66
|
+
},
|
|
67
|
+
get isCompleted() {
|
|
68
|
+
return Promise.resolve(this._isCompleted);
|
|
69
|
+
},
|
|
70
|
+
get isFailed() {
|
|
71
|
+
return Promise.resolve(this._isFailed);
|
|
72
|
+
},
|
|
61
73
|
progress: 0,
|
|
62
74
|
updateProgress(progress) {
|
|
63
75
|
this.progress = progress;
|
|
@@ -125,16 +137,23 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
125
137
|
const jobFailed = new event_emitter_1.EventEmitter();
|
|
126
138
|
const jobProgress = new event_emitter_1.EventEmitter();
|
|
127
139
|
const options = this.getWorkerOptions(optionsOrCallback);
|
|
128
|
-
const callback = (job) => {
|
|
140
|
+
const callback = ((job) => {
|
|
141
|
+
job._isActive = true;
|
|
129
142
|
job.worker = worker;
|
|
130
143
|
jobActive.emit({ job });
|
|
131
144
|
return options.callback(job)
|
|
132
145
|
.then(returnValue => {
|
|
146
|
+
job._isActive = false;
|
|
147
|
+
job._isCompleted = true;
|
|
133
148
|
jobCompleted.emit({ job, returnValue });
|
|
134
149
|
return returnValue;
|
|
135
150
|
})
|
|
136
|
-
.catch(error =>
|
|
137
|
-
|
|
151
|
+
.catch(error => {
|
|
152
|
+
job._isActive = false;
|
|
153
|
+
job._isFailed = true;
|
|
154
|
+
jobFailed.emit({ job, error });
|
|
155
|
+
});
|
|
156
|
+
});
|
|
138
157
|
callbacks.push(callback);
|
|
139
158
|
const worker = {
|
|
140
159
|
get onJobActive() {
|
|
@@ -169,4 +188,4 @@ class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
|
169
188
|
}
|
|
170
189
|
}
|
|
171
190
|
exports.QueueLocalAdapter = QueueLocalAdapter;
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxzQ0FBNkY7QUFDN0Ysd0NBR3NCO0FBQ3RCLG9EQUFnRDtBQUNoRCx3REFBb0Q7QUFDcEQsaUVBQXdDO0FBQ3hDLDZDQUE4QztBQUlqQyxRQUFBLHdCQUF3QixHQUFHLG1CQUFZLEVBQTRCLENBQUM7QUF1QmpGLE1BQWEsZ0JBQWdCO0lBQTdCO1FBQ3FCLFlBQU8sR0FBRyxJQUFJLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBRTVDLFNBQUksR0FBRyxhQUFhLENBQUM7UUFDckIsaUJBQVksR0FBRyxDQUFDLG1CQUFXLENBQUMsQ0FBQztJQVcxQyxDQUFDO0lBVEcsVUFBVSxDQUFDLElBQXdCO1FBQy9CLElBQUksQ0FBQyxNQUFNLENBQUMsZ0NBQXdCLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztZQUNsRCxRQUFRLEVBQUUsT0FBTyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLE9BQU8sSUFBSSxPQUFPLENBQUMsaUJBQWlCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUN4RyxDQUFDLENBQUMsQ0FBQztJQUNSLENBQUM7SUFFRCxTQUFTLENBQUMsRUFBRSxNQUFNLEVBQXVCO1FBQ3JDLE1BQU0sQ0FBQyxHQUFHLENBQUMsMkJBQW1CLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzNELENBQUM7Q0FDSjtBQWZELDRDQWVDO0FBRUQsTUFBYSxpQkFBa0IsU0FBUSxvQkFBWTtJQUFuRDs7UUFDcUIsV0FBTSxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBMEt4RCxDQUFDO0lBeEthLGdCQUFnQixDQUFDLElBQVk7UUFDbkMsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FB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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.61",
|
|
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.61",
|
|
28
|
+
"@shrub/logging": "0.5.61",
|
|
29
|
+
"@shrub/queue": "0.5.61",
|
|
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": "0a4e453ffba2dd3452fb25c199b6129323d5141c"
|
|
36
36
|
}
|