@shrub/queue-local 0.5.55 → 0.5.58
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.d.ts +5 -1
- package/dist/module.js +12 -7
- package/package.json +5 -5
package/dist/module.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IModule, IModuleConfigurator, IModuleInitializer } from "@shrub/core";
|
|
2
|
-
import { QueueModule } from "@shrub/queue";
|
|
2
|
+
import { IQueue, QueueAdapter, QueueModule } from "@shrub/queue";
|
|
3
3
|
export declare const IQueueLocalConfiguration: import("@shrub/core").IModuleConfigurationType<IQueueLocalConfiguration>;
|
|
4
4
|
export interface IQueueLocalConfiguration {
|
|
5
5
|
/** Enables the use of the local job queue. */
|
|
@@ -17,3 +17,7 @@ export declare class QueueLocalModule implements IModule {
|
|
|
17
17
|
initialize(init: IModuleInitializer): void;
|
|
18
18
|
configure({ config }: IModuleConfigurator): void;
|
|
19
19
|
}
|
|
20
|
+
export declare class QueueLocalAdapter extends QueueAdapter {
|
|
21
|
+
private readonly queues;
|
|
22
|
+
protected getQueueInstance(name: string): IQueue;
|
|
23
|
+
}
|
package/dist/module.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.QueueLocalModule = exports.IQueueLocalConfiguration = void 0;
|
|
6
|
+
exports.QueueLocalAdapter = exports.QueueLocalModule = exports.IQueueLocalConfiguration = void 0;
|
|
7
7
|
const core_1 = require("@shrub/core");
|
|
8
8
|
const queue_1 = require("@shrub/queue");
|
|
9
9
|
const async_queue_1 = require("@sprig/async-queue");
|
|
@@ -13,7 +13,7 @@ const cron_parser_1 = require("cron-parser");
|
|
|
13
13
|
exports.IQueueLocalConfiguration = core_1.createConfig();
|
|
14
14
|
class QueueLocalModule {
|
|
15
15
|
constructor() {
|
|
16
|
-
this.adapter = new
|
|
16
|
+
this.adapter = new QueueLocalAdapter([]);
|
|
17
17
|
this.name = "queue-local";
|
|
18
18
|
this.dependencies = [queue_1.QueueModule];
|
|
19
19
|
}
|
|
@@ -27,7 +27,7 @@ class QueueLocalModule {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.QueueLocalModule = QueueLocalModule;
|
|
30
|
-
class
|
|
30
|
+
class QueueLocalAdapter extends queue_1.QueueAdapter {
|
|
31
31
|
constructor() {
|
|
32
32
|
super(...arguments);
|
|
33
33
|
this.queues = new Map();
|
|
@@ -72,6 +72,8 @@ class LocalQueueAdapter extends queue_1.QueueAdapter {
|
|
|
72
72
|
return jobProgress.event;
|
|
73
73
|
},
|
|
74
74
|
add: options => {
|
|
75
|
+
let finished;
|
|
76
|
+
const waitUntilFinished = new Promise(resolve => finished = resolve);
|
|
75
77
|
const job = {
|
|
76
78
|
id: unique_id_1.default(),
|
|
77
79
|
name: options.name || "",
|
|
@@ -81,7 +83,8 @@ class LocalQueueAdapter extends queue_1.QueueAdapter {
|
|
|
81
83
|
this.progress = progress;
|
|
82
84
|
jobProgress.emit({ job, progress });
|
|
83
85
|
return Promise.resolve();
|
|
84
|
-
}
|
|
86
|
+
},
|
|
87
|
+
waitUntilFinished: () => waitUntilFinished
|
|
85
88
|
};
|
|
86
89
|
const getDelay = (options) => {
|
|
87
90
|
if (options.delay) {
|
|
@@ -98,6 +101,7 @@ class LocalQueueAdapter extends queue_1.QueueAdapter {
|
|
|
98
101
|
return undefined;
|
|
99
102
|
};
|
|
100
103
|
const onFinished = () => {
|
|
104
|
+
finished();
|
|
101
105
|
if (options.repeat && options.repeat.cron) {
|
|
102
106
|
queue.add({
|
|
103
107
|
name: options.name,
|
|
@@ -133,8 +137,8 @@ class LocalQueueAdapter extends queue_1.QueueAdapter {
|
|
|
133
137
|
});
|
|
134
138
|
},
|
|
135
139
|
// TODO: need to support concurrent job processing
|
|
136
|
-
|
|
137
|
-
const options = this.
|
|
140
|
+
createWorker: optionsOrCallback => {
|
|
141
|
+
const options = this.getWorkerOptions(optionsOrCallback);
|
|
138
142
|
const callback = options.callback;
|
|
139
143
|
callbacks.push(callback);
|
|
140
144
|
return {
|
|
@@ -155,4 +159,5 @@ class LocalQueueAdapter extends queue_1.QueueAdapter {
|
|
|
155
159
|
return queue;
|
|
156
160
|
}
|
|
157
161
|
}
|
|
158
|
-
|
|
162
|
+
exports.QueueLocalAdapter = QueueLocalAdapter;
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxzQ0FBNkY7QUFDN0Ysd0NBR3NCO0FBQ3RCLG9EQUFnRDtBQUNoRCx3REFBb0Q7QUFDcEQsaUVBQXdDO0FBQ3hDLDZDQUE4QztBQUlqQyxRQUFBLHdCQUF3QixHQUFHLG1CQUFZLEVBQTRCLENBQUM7QUFZakYsTUFBYSxnQkFBZ0I7SUFBN0I7UUFDcUIsWUFBTyxHQUFHLElBQUksaUJBQWlCLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFNUMsU0FBSSxHQUFHLGFBQWEsQ0FBQztRQUNyQixpQkFBWSxHQUFHLENBQUMsbUJBQVcsQ0FBQyxDQUFDO0lBVzFDLENBQUM7SUFURyxVQUFVLENBQUMsSUFBd0I7UUFDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxnQ0FBd0IsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQ2xELFFBQVEsRUFBRSxPQUFPLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxpQkFBaUIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3hHLENBQUMsQ0FBQyxDQUFDO0lBQ1IsQ0FBQztJQUVELFNBQVMsQ0FBQyxFQUFFLE1BQU0sRUFBdUI7UUFDckMsTUFBTSxDQUFDLEdBQUcsQ0FBQywyQkFBbUIsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDM0QsQ0FBQztDQUNKO0FBZkQsNENBZUM7QUFFRCxNQUFhLGlCQUFrQixTQUFRLG9CQUFZO0lBQW5EOztRQUNxQixXQUFNLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUE2SXhELENBQUM7SUEzSWEsZ0JBQWdCLENBQUMsSUFBWTtRQUNuQyxJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1IsTUFBTSxTQUFTLEdBQUcsSUFBSSw0QkFBWSxFQUF1QixDQUFDO1lBQzFELE1BQU0sWUFBWSxHQUFHLElBQUksNEJBQVksRUFBMEIsQ0FBQztZQUNoRSxNQUFNLFNBQVMsR0FBRyxJQUFJLDRCQUFZLEVBQXVCLENBQUM7WUFDMUQsTUFBTSxXQUFXLEdBQUcsSUFBSSw0QkFBWSxFQUF5QixDQUFDO1lBQzlELE1BQU0sVUFBVSxHQUFHLElBQUksd0JBQVUsRUFBRSxDQUFDO1lBQ3BDLE1BQU0sU0FBUyxHQUFxQixFQUFFLENBQUM7WUFDdkMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO1lBRWQsTUFBTSxXQUFXLEdBQUcsR0FBRyxFQUFFO2dCQUNyQixjQUFjO2dCQUNkLEtBQUssR0FBRyxTQUFTLENBQUMsTUFBTSxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7Z0JBQzlDLE9BQU8sU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztZQUM3RCxDQUFDLENBQUM7WUFFRixNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQVMsRUFBRSxVQUFzQixFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFO2dCQUM5RSw4REFBOEQ7Z0JBQzlELE1BQU0sUUFBUSxHQUFHLFdBQVcsRUFBRSxDQUFDO2dCQUMvQixJQUFJLFFBQVEsRUFBRTtvQkFDVixTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztvQkFDeEIsTUFBTSxRQUFRLENBQUMsR0FBRyxDQUFDO3lCQUNkLElBQUksQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQzt5QkFDNUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO3lCQUM5QyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztpQkFDcEM7WUFDTCxDQUFDLENBQUMsQ0FBQztZQUVILEtBQUssR0FBRztnQkFDSixJQUFJLFdBQVc7b0JBQ1gsT0FBTyxTQUFTLENBQUMsS0FBSyxDQUFDO2dCQUMzQixDQUFDO2dCQUNELElBQUksY0FBYztvQkFDZCxPQUFPLFlBQVksQ0FBQyxLQUFLLENBQUM7Z0JBQzlCLENBQUM7Z0JBQ0QsSUFBSSxXQUFXO29CQUNYLE9BQU8sU0FBUyxDQUFDLEtBQUssQ0FBQztnQkFDM0IsQ0FBQztnQkFDRCxJQUFJLGFBQWE7b0JBQ2IsT0FBTyxXQUFXLENBQUMsS0FBSyxDQUFDO2dCQUM3QixDQUFDO2dCQUNELEdBQUcsRUFBRSxPQUFPLENBQUMsRUFBRTtvQkFDWCxJQUFJLFFBQW9CLENBQUM7b0JBQ3pCLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxPQUFPLENBQU8sT0FBTyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLENBQUM7b0JBQzNFLE1BQU0sR0FBRyxHQUFTO3dCQUNkLEVBQUUsRUFBRSxtQkFBUSxFQUFFO3dCQUNkLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUU7d0JBQ3hCLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUU7d0JBQ3hCLFFBQVEsRUFBRSxDQUFDO3dCQUNYLGNBQWMsQ0FBQyxRQUF5Qjs0QkFDcEIsSUFBSyxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7NEJBQzFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQzs0QkFDcEMsT0FBTyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7d0JBQzdCLENBQUM7d0JBQ0QsaUJBQWlCLEVBQUUsR0FBRyxFQUFFLENBQUMsaUJBQWlCO3FCQUM3QyxDQUFDO29CQUVGLE1BQU0sUUFBUSxHQUFHLENBQUMsT0FBb0IsRUFBRSxFQUFFO3dCQUN0QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUU7NEJBQ2YsT0FBTyxPQUFPLENBQUMsS0FBSyxDQUFDO3lCQUN4Qjt3QkFFRCxJQUFJLE9BQU8sQ0FBQyxNQUFNLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7NEJBQ3ZDLGtFQUFrRTs0QkFDbEUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFO2dDQUMzQixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7Z0NBQ3ZCLE1BQU0sSUFBSSxHQUFHLDZCQUFlLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQ0FDbkUsT0FBTyxJQUFJLEdBQUcsR0FBRyxDQUFDOzZCQUNyQjt5QkFDSjt3QkFFRCxPQUFPLFNBQVMsQ0FBQztvQkFDckIsQ0FBQyxDQUFDO29CQUVGLE1BQU0sVUFBVSxHQUFHLEdBQUcsRUFBRTt3QkFDcEIsUUFBUSxFQUFFLENBQUM7d0JBQ1gsSUFBSSxPQUFPLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFOzRCQUN2QyxLQUFNLENBQUMsR0FBRyxDQUFDO2dDQUNQLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtnQ0FDbEIsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJO2dDQUNsQixLQUFLLEVBQUUsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQztnQ0FDMUQsaUNBQWlDO2dDQUNqQyxNQUFNLEVBQUUsRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7NkJBQ3hDLENBQUMsQ0FBQzt5QkFDTjtvQkFDTCxDQUFDLENBQUM7b0JBRUYsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO29CQUNoQyxJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUU7d0JBQ3JCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDO3FCQUNyRDt5QkFDSTt3QkFDRCxPQUFPLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFDO3FCQUM1QjtvQkFFRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2hDLENBQUM7Z0JBQ0QsS0FBSyxFQUFFLEdBQUcsRUFBRTtvQkFDUixJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDekIsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRTt3QkFDekIsSUFBSSxVQUFVLENBQUMsTUFBTSxFQUFFOzRCQUNuQixTQUFTLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQzs0QkFDckIsT0FBTyxFQUFFLENBQUM7eUJBQ2I7NkJBQ0k7NEJBQ0QsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO2dDQUN4QixTQUFTLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztnQ0FDckIsT0FBTyxFQUFFLENBQUM7NEJBQ2QsQ0FBQyxDQUFDLENBQUM7eUJBQ047b0JBQ0wsQ0FBQyxDQUFDLENBQUM7Z0JBQ1AsQ0FBQztnQkFDRCxrREFBa0Q7Z0JBQ2xELFlBQVksRUFBRSxpQkFBaUIsQ0FBQyxFQUFFO29CQUM5QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsaUJBQWlCLENBQUMsQ0FBQztvQkFDekQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQztvQkFDbEMsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztvQkFDekIsT0FBTzt3QkFDSCxLQUFLLEVBQUUsR0FBRyxFQUFFOzRCQUNSLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO2dDQUN2QyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLEVBQUU7b0NBQzNCLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO29DQUN2QixNQUFNO2lDQUNUOzZCQUNKOzRCQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO3dCQUM3QixDQUFDO3FCQUNKLENBQUM7Z0JBQ04sQ0FBQzthQUNKLENBQUM7WUFFRixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDaEM7UUFFRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0NBQ0o7QUE5SUQsOENBOElDIn0=
|
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.58",
|
|
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.58",
|
|
28
|
+
"@shrub/logging": "0.5.58",
|
|
29
|
+
"@shrub/queue": "0.5.58",
|
|
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": "4af976e3b4276487f8661ae89d8de06aa4757481"
|
|
36
36
|
}
|