@alterior/tasks 3.0.0-beta.98 → 3.0.0-rc.0
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/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/task-runner.js +3 -3
- package/dist/task-runner.js.map +1 -1
- package/dist/task-worker.js +8 -8
- package/dist/task-worker.js.map +1 -1
- package/dist/tasks.d.ts +7 -2
- package/dist/tasks.d.ts.map +1 -1
- package/dist/tasks.js +35 -30
- package/dist/tasks.js.map +1 -1
- package/dist/tasks.module.js +9 -9
- package/dist/tasks.module.js.map +1 -1
- package/dist/test.js.map +1 -1
- package/dist.esm/tasks.d.ts +7 -2
- package/dist.esm/tasks.d.ts.map +1 -1
- package/dist.esm/tasks.js +17 -6
- package/dist.esm/tasks.js.map +1 -1
- package/package.json +9 -8
package/dist/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./tasks"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./task-runner"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./task-worker"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./tasks.module"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./tasks"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./task-runner"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./task-worker"), exports);
|
|
7
|
+
(0, tslib_1.__exportStar)(require("./tasks.module"), exports);
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uDAAwB;AACxB,6DAA8B;AAC9B,6DAA8B;AAE9B,8DAA+B"}
|
package/dist/task-runner.js
CHANGED
|
@@ -31,9 +31,9 @@ var TaskRunner = /** @class */ (function () {
|
|
|
31
31
|
TaskRunner.prototype.service = function (workerClass) {
|
|
32
32
|
return this.registry.get(workerClass).sync;
|
|
33
33
|
};
|
|
34
|
-
TaskRunner = tslib_1.__decorate([
|
|
35
|
-
di_1.Injectable(),
|
|
36
|
-
tslib_1.__metadata("design:paramtypes", [tasks_1.TaskWorkerRegistry])
|
|
34
|
+
TaskRunner = (0, tslib_1.__decorate)([
|
|
35
|
+
(0, di_1.Injectable)(),
|
|
36
|
+
(0, tslib_1.__metadata)("design:paramtypes", [tasks_1.TaskWorkerRegistry])
|
|
37
37
|
], TaskRunner);
|
|
38
38
|
return TaskRunner;
|
|
39
39
|
}());
|
package/dist/task-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";;;;AAAA,mCAAkD;AAClD,iCAAgL;AAIhL;IACI,oBACY,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAE1C,CAAC;IAED,sBAAI,gCAAQ;aAAZ;YACI,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;;;OAAA;IAED;;;;OAIG;IACH,2BAAM,GAAN,UAAyB,WAA4B;QACjD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,4BAAO,GAAP,UAA0B,WAA4B;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;IA1BQ,UAAU;QADtB,eAAU,
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";;;;AAAA,mCAAkD;AAClD,iCAAgL;AAIhL;IACI,oBACY,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAE1C,CAAC;IAED,sBAAI,gCAAQ;aAAZ;YACI,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;;;OAAA;IAED;;;;OAIG;IACH,2BAAM,GAAN,UAAyB,WAA4B;QACjD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,4BAAO,GAAP,UAA0B,WAA4B;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;IA1BQ,UAAU;QADtB,IAAA,eAAU,GAAE;sDAGe,0BAAkB;OAFjC,UAAU,CA2BtB;IAAD,iBAAC;CAAA,AA3BD,IA2BC;AA3BY,gCAAU"}
|
package/dist/task-worker.js
CHANGED
|
@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var common_1 = require("@alterior/common");
|
|
6
6
|
var di_1 = require("@alterior/di");
|
|
7
7
|
var tasks_1 = require("./tasks");
|
|
8
|
-
var util = tslib_1.__importStar(require("util"));
|
|
8
|
+
var util = (0, tslib_1.__importStar)(require("util"));
|
|
9
9
|
var TaskWorker = /** @class */ (function () {
|
|
10
10
|
function TaskWorker(_injector, _client, _options, _appOptions, _logger) {
|
|
11
11
|
this._injector = _injector;
|
|
@@ -54,10 +54,10 @@ var TaskWorker = /** @class */ (function () {
|
|
|
54
54
|
};
|
|
55
55
|
TaskWorker.prototype.start = function () {
|
|
56
56
|
var _this = this;
|
|
57
|
-
this.queue.process(function (job, done) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
57
|
+
this.queue.process(function (job, done) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
|
|
58
58
|
var task, handler;
|
|
59
59
|
var _this = this;
|
|
60
|
-
return tslib_1.__generator(this, function (_a) {
|
|
60
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
61
61
|
switch (_a.label) {
|
|
62
62
|
case 0:
|
|
63
63
|
task = job.data;
|
|
@@ -79,9 +79,9 @@ var TaskWorker = /** @class */ (function () {
|
|
|
79
79
|
console.dir(task, { depth: 3 });
|
|
80
80
|
console.info("Registered worker IDs: " + Object.keys(this._taskHandlers).join(', '));
|
|
81
81
|
}
|
|
82
|
-
return [4 /*yield*/, this._logger.withContext({ host: 'tasks', worker: handler.worker }, "TaskWorker | " + handler.worker.constructor.name + "." + task.method + "(" + task.args.map(function (x) { return util.inspect(x, false, 2); }).join(', ') + ")", function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
82
|
+
return [4 /*yield*/, this._logger.withContext({ host: 'tasks', worker: handler.worker }, "TaskWorker | " + handler.worker.constructor.name + "." + task.method + "(" + task.args.map(function (x) { return util.inspect(x, false, 2); }).join(', ') + ")", function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
|
|
83
83
|
var result, e_1;
|
|
84
|
-
return tslib_1.__generator(this, function (_a) {
|
|
84
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
85
85
|
switch (_a.label) {
|
|
86
86
|
case 0:
|
|
87
87
|
this._logger.info("TaskWorker: " + task.method + "() of worker " + handler.worker.constructor.name + " (ID '" + task.id + "')");
|
|
@@ -128,15 +128,15 @@ var TaskWorker = /** @class */ (function () {
|
|
|
128
128
|
id = annotation.id;
|
|
129
129
|
_this.registerHandler(id, {
|
|
130
130
|
worker: instance,
|
|
131
|
-
handler: function (methodName, args) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
131
|
+
handler: function (methodName, args) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
|
|
132
132
|
var impl;
|
|
133
|
-
return tslib_1.__generator(this, function (_a) {
|
|
133
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
134
134
|
switch (_a.label) {
|
|
135
135
|
case 0:
|
|
136
136
|
impl = instance.constructor.prototype[methodName];
|
|
137
137
|
if (typeof impl !== 'function' || methodName.startsWith('_'))
|
|
138
138
|
throw new common_1.InvalidOperationError("Invalid task method " + methodName);
|
|
139
|
-
return [4 /*yield*/, instance[methodName].apply(instance, tslib_1.
|
|
139
|
+
return [4 /*yield*/, instance[methodName].apply(instance, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(args), false))];
|
|
140
140
|
case 1: return [2 /*return*/, _a.sent()];
|
|
141
141
|
}
|
|
142
142
|
});
|
package/dist/task-worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-worker.js","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":";;;;AAAA,2CAA2F;AAC3F,mCAAsE;AACtE,iCAA8F;AAK9F,
|
|
1
|
+
{"version":3,"file":"task-worker.js","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"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"}
|
package/dist/tasks.d.ts
CHANGED
|
@@ -30,13 +30,18 @@ export declare class TaskAnnotation extends Annotation {
|
|
|
30
30
|
export declare const Task: AnnotationDecorator<[id?: string]>;
|
|
31
31
|
export declare abstract class Worker {
|
|
32
32
|
abstract get name(): string;
|
|
33
|
+
get options(): JobOptions;
|
|
33
34
|
protected get currentJob(): QueueJob<TaskJob>;
|
|
34
35
|
}
|
|
35
36
|
export declare type RemoteService<T> = {
|
|
36
37
|
[P in keyof T]: T[P] extends (...args: any[]) => any ? (ReturnType<T[P]> extends Promise<any> ? T[P] : (...args: Parameters<T[P]>) => Promise<ReturnType<T[P]>>) : never;
|
|
38
|
+
} & {
|
|
39
|
+
withOptions(options: JobOptions): RemoteService<T>;
|
|
37
40
|
};
|
|
38
41
|
export declare type RemoteWorker<T> = {
|
|
39
42
|
[P in keyof T]: T[P] extends (...args: any[]) => any ? (...args: Parameters<T[P]>) => Promise<QueueJob<TaskJob>> : never;
|
|
43
|
+
} & {
|
|
44
|
+
withOptions(options: JobOptions): RemoteWorker<T>;
|
|
40
45
|
};
|
|
41
46
|
export declare type QueueOptions = BullQueue.QueueOptions;
|
|
42
47
|
export declare type JobOptions = BullQueue.JobOptions;
|
|
@@ -48,8 +53,8 @@ export interface Constructor<T> {
|
|
|
48
53
|
export declare type PromiseWrap<T> = T extends PromiseLike<any> ? T : Promise<T>;
|
|
49
54
|
export declare class TaskWorkerProxy {
|
|
50
55
|
private static create;
|
|
51
|
-
static createAsync<T extends Worker>(queueClient: TaskQueueClient, id: string): RemoteWorker<T>;
|
|
52
|
-
static createSync<T extends Worker>(queueClient: TaskQueueClient, id: string): RemoteService<T>;
|
|
56
|
+
static createAsync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteWorker<T>;
|
|
57
|
+
static createSync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteService<T>;
|
|
53
58
|
}
|
|
54
59
|
interface TaskWorkerEntry<T extends Worker = any> {
|
|
55
60
|
type: Constructor<T>;
|
package/dist/tasks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAc,cAAc,EAAY,QAAQ,EAAgC,MAAM,cAAc,CAAC;AAC5G,OAAO,SAAS,MAAM,MAAM,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAG,MAAM,CAAC;IACpB,YAAY,CAAC,EAAG,SAAS,CAAC,YAAY,CAAC;CAC1C;AAGD;;;;;;;GAOG;AACH,qBACa,oBAAoB;gBACjB,OAAO,EAAG,iBAAiB;IAIhC,OAAO,EAAG,iBAAiB,CAAC;CACtC;AAED,MAAM,WAAW,OAAO;IACpB,EAAE,EAAG,MAAM,CAAC;IACZ,MAAM,EAAG,MAAM,CAAC;IAChB,IAAI,EAAG,GAAG,EAAE,CAAC;CAChB;AAED,eAAO,MAAM,aAAa,wCAA6D,CAAC;AAExF,qBACa,cAAe,SAAQ,UAAU;IAC9B,QAAQ,CAAC,EAAE,CAAC,EAAG,MAAM;gBAAZ,EAAE,CAAC,EAAG,MAAM;CAGpC;AAED,eAAO,MAAM,IAAI,oCAA6B,CAAC;AAE/C,8BAAsB,MAAM;IACxB,QAAQ,KAAK,IAAI,IAAK,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
package/dist/tasks.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.TaskWorkerRegistry = exports.TaskQueueClient = exports.TaskWorkerProxy =
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var annotations_1 = require("@alterior/annotations");
|
|
6
6
|
var di_1 = require("@alterior/di");
|
|
7
|
-
var bull_1 = tslib_1.__importDefault(require("bull"));
|
|
7
|
+
var bull_1 = (0, tslib_1.__importDefault)(require("bull"));
|
|
8
8
|
/**
|
|
9
9
|
* This injectable allows configuration of the task system.
|
|
10
10
|
* Include a provider for the injection token `QUEUE_OPTIONS`
|
|
@@ -17,24 +17,24 @@ var TaskModuleOptionsRef = /** @class */ (function () {
|
|
|
17
17
|
function TaskModuleOptionsRef(options) {
|
|
18
18
|
this.options = options;
|
|
19
19
|
}
|
|
20
|
-
TaskModuleOptionsRef = tslib_1.__decorate([
|
|
21
|
-
di_1.Injectable(),
|
|
22
|
-
tslib_1.__metadata("design:paramtypes", [Object])
|
|
20
|
+
TaskModuleOptionsRef = (0, tslib_1.__decorate)([
|
|
21
|
+
(0, di_1.Injectable)(),
|
|
22
|
+
(0, tslib_1.__metadata)("design:paramtypes", [Object])
|
|
23
23
|
], TaskModuleOptionsRef);
|
|
24
24
|
return TaskModuleOptionsRef;
|
|
25
25
|
}());
|
|
26
26
|
exports.TaskModuleOptionsRef = TaskModuleOptionsRef;
|
|
27
27
|
exports.QUEUE_OPTIONS = new di_1.InjectionToken('QueueOptions');
|
|
28
28
|
var TaskAnnotation = /** @class */ (function (_super) {
|
|
29
|
-
tslib_1.__extends(TaskAnnotation, _super);
|
|
29
|
+
(0, tslib_1.__extends)(TaskAnnotation, _super);
|
|
30
30
|
function TaskAnnotation(id) {
|
|
31
31
|
var _this = _super.call(this) || this;
|
|
32
32
|
_this.id = id;
|
|
33
33
|
return _this;
|
|
34
34
|
}
|
|
35
|
-
TaskAnnotation = tslib_1.__decorate([
|
|
36
|
-
annotations_1.MetadataName('@alterior/tasks:Task'),
|
|
37
|
-
tslib_1.__metadata("design:paramtypes", [String])
|
|
35
|
+
TaskAnnotation = (0, tslib_1.__decorate)([
|
|
36
|
+
(0, annotations_1.MetadataName)('@alterior/tasks:Task'),
|
|
37
|
+
(0, tslib_1.__metadata)("design:paramtypes", [String])
|
|
38
38
|
], TaskAnnotation);
|
|
39
39
|
return TaskAnnotation;
|
|
40
40
|
}(annotations_1.Annotation));
|
|
@@ -43,6 +43,11 @@ exports.Task = TaskAnnotation.decorator();
|
|
|
43
43
|
var Worker = /** @class */ (function () {
|
|
44
44
|
function Worker() {
|
|
45
45
|
}
|
|
46
|
+
Object.defineProperty(Worker.prototype, "options", {
|
|
47
|
+
get: function () { return undefined; },
|
|
48
|
+
enumerable: false,
|
|
49
|
+
configurable: true
|
|
50
|
+
});
|
|
46
51
|
Object.defineProperty(Worker.prototype, "currentJob", {
|
|
47
52
|
get: function () {
|
|
48
53
|
return Zone.current.get('workerStateJob');
|
|
@@ -64,33 +69,33 @@ var TaskWorkerProxy = /** @class */ (function () {
|
|
|
64
69
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
65
70
|
args[_i] = arguments[_i];
|
|
66
71
|
}
|
|
67
|
-
return handler.apply(void 0, tslib_1.
|
|
72
|
+
return handler.apply(void 0, (0, tslib_1.__spreadArray)([key], (0, tslib_1.__read)(args), false));
|
|
68
73
|
};
|
|
69
74
|
}
|
|
70
75
|
});
|
|
71
76
|
};
|
|
72
|
-
TaskWorkerProxy.createAsync = function (queueClient, id) {
|
|
77
|
+
TaskWorkerProxy.createAsync = function (queueClient, id, options) {
|
|
73
78
|
return this.create(function (method) {
|
|
74
79
|
var args = [];
|
|
75
80
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
76
81
|
args[_i - 1] = arguments[_i];
|
|
77
82
|
}
|
|
78
|
-
|
|
83
|
+
if (method === 'withOptions')
|
|
84
|
+
return TaskWorkerProxy.createAsync(queueClient, id, Object.assign({}, options, args[0]));
|
|
85
|
+
else
|
|
86
|
+
return queueClient.enqueue({ id: id, method: method, args: args }, options);
|
|
79
87
|
});
|
|
80
88
|
};
|
|
81
|
-
TaskWorkerProxy.createSync = function (queueClient, id) {
|
|
82
|
-
var _this = this;
|
|
89
|
+
TaskWorkerProxy.createSync = function (queueClient, id, options) {
|
|
83
90
|
return this.create(function (method) {
|
|
84
91
|
var args = [];
|
|
85
92
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
86
93
|
args[_i - 1] = arguments[_i];
|
|
87
94
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
}); });
|
|
95
|
+
if (method === 'withOptions')
|
|
96
|
+
return TaskWorkerProxy.createSync(queueClient, id, Object.assign({}, options, args[0]));
|
|
97
|
+
else
|
|
98
|
+
return queueClient.enqueue({ id: id, method: method, args: args }, options).then(function (v) { return v.finished; });
|
|
94
99
|
});
|
|
95
100
|
};
|
|
96
101
|
return TaskWorkerProxy;
|
|
@@ -144,8 +149,8 @@ var TaskQueueClient = /** @class */ (function () {
|
|
|
144
149
|
* Enqueue a new task. To handle the task on the worker side, register for it with `.process()`
|
|
145
150
|
*/
|
|
146
151
|
TaskQueueClient.prototype.enqueue = function (data, opts) {
|
|
147
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
148
|
-
return tslib_1.__generator(this, function (_a) {
|
|
152
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
153
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
149
154
|
switch (_a.label) {
|
|
150
155
|
case 0: return [4 /*yield*/, this._queue.add(data, opts)];
|
|
151
156
|
case 1: return [2 /*return*/, _a.sent()];
|
|
@@ -153,10 +158,10 @@ var TaskQueueClient = /** @class */ (function () {
|
|
|
153
158
|
});
|
|
154
159
|
});
|
|
155
160
|
};
|
|
156
|
-
TaskQueueClient = tslib_1.__decorate([
|
|
157
|
-
di_1.Injectable(),
|
|
158
|
-
tslib_1.__param(0, di_1.Optional()),
|
|
159
|
-
tslib_1.__metadata("design:paramtypes", [TaskModuleOptionsRef])
|
|
161
|
+
TaskQueueClient = (0, tslib_1.__decorate)([
|
|
162
|
+
(0, di_1.Injectable)(),
|
|
163
|
+
(0, tslib_1.__param)(0, (0, di_1.Optional)()),
|
|
164
|
+
(0, tslib_1.__metadata)("design:paramtypes", [TaskModuleOptionsRef])
|
|
160
165
|
], TaskQueueClient);
|
|
161
166
|
return TaskQueueClient;
|
|
162
167
|
}());
|
|
@@ -175,8 +180,8 @@ var TaskWorkerRegistry = /** @class */ (function () {
|
|
|
175
180
|
this._entries[id] = {
|
|
176
181
|
type: taskClass,
|
|
177
182
|
local: instance,
|
|
178
|
-
sync: TaskWorkerProxy.createSync(this.client, id),
|
|
179
|
-
async: TaskWorkerProxy.createAsync(this.client, id)
|
|
183
|
+
sync: TaskWorkerProxy.createSync(this.client, id, instance.options),
|
|
184
|
+
async: TaskWorkerProxy.createAsync(this.client, id, instance.options)
|
|
180
185
|
};
|
|
181
186
|
};
|
|
182
187
|
Object.defineProperty(TaskWorkerRegistry.prototype, "all", {
|
|
@@ -201,9 +206,9 @@ var TaskWorkerRegistry = /** @class */ (function () {
|
|
|
201
206
|
var ownInjector = di_1.ReflectiveInjector.resolveAndCreate(taskClasses, this.injector);
|
|
202
207
|
taskClasses.forEach(function (taskClass) { return _this.registerClass(ownInjector, taskClass); });
|
|
203
208
|
};
|
|
204
|
-
TaskWorkerRegistry = tslib_1.__decorate([
|
|
205
|
-
di_1.Injectable(),
|
|
206
|
-
tslib_1.__metadata("design:paramtypes", [di_1.Injector,
|
|
209
|
+
TaskWorkerRegistry = (0, tslib_1.__decorate)([
|
|
210
|
+
(0, di_1.Injectable)(),
|
|
211
|
+
(0, tslib_1.__metadata)("design:paramtypes", [di_1.Injector,
|
|
207
212
|
TaskQueueClient])
|
|
208
213
|
], TaskWorkerRegistry);
|
|
209
214
|
return TaskWorkerRegistry;
|
package/dist/tasks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":";;;;AAAA,qDAAsF;AACtF,mCAA4G;AAC5G,
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
package/dist/tasks.module.js
CHANGED
|
@@ -53,7 +53,7 @@ var TasksModule = /** @class */ (function () {
|
|
|
53
53
|
});
|
|
54
54
|
Object.defineProperty(TasksModule.prototype, "tasks", {
|
|
55
55
|
get: function () {
|
|
56
|
-
return [].concat.apply([], tslib_1.
|
|
56
|
+
return [].concat.apply([], (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(this.app.runtime.definitions.map(function (x) { return x.metadata.tasks || []; })), false));
|
|
57
57
|
},
|
|
58
58
|
enumerable: false,
|
|
59
59
|
configurable: true
|
|
@@ -69,16 +69,16 @@ var TasksModule = /** @class */ (function () {
|
|
|
69
69
|
name: 'Task Worker',
|
|
70
70
|
summary: 'Pulls from the task queue and executes them using task classes registered in the module tree',
|
|
71
71
|
start: function () {
|
|
72
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
73
|
-
return tslib_1.__generator(this, function (_a) {
|
|
72
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
73
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
74
74
|
self.worker.start();
|
|
75
75
|
return [2 /*return*/];
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
78
|
},
|
|
79
79
|
stop: function () {
|
|
80
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
81
|
-
return tslib_1.__generator(this, function (_a) {
|
|
80
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
81
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
82
82
|
self.worker.stop();
|
|
83
83
|
return [2 /*return*/];
|
|
84
84
|
});
|
|
@@ -87,8 +87,8 @@ var TasksModule = /** @class */ (function () {
|
|
|
87
87
|
});
|
|
88
88
|
};
|
|
89
89
|
var TasksModule_1;
|
|
90
|
-
TasksModule = TasksModule_1 = tslib_1.__decorate([
|
|
91
|
-
di_1.Module({
|
|
90
|
+
TasksModule = TasksModule_1 = (0, tslib_1.__decorate)([
|
|
91
|
+
(0, di_1.Module)({
|
|
92
92
|
providers: [
|
|
93
93
|
tasks_1.TaskQueueClient,
|
|
94
94
|
tasks_1.TaskWorkerRegistry,
|
|
@@ -98,8 +98,8 @@ var TasksModule = /** @class */ (function () {
|
|
|
98
98
|
logging_1.LoggingModule
|
|
99
99
|
]
|
|
100
100
|
}),
|
|
101
|
-
tslib_1.__param(5, di_1.Optional()),
|
|
102
|
-
tslib_1.__metadata("design:paramtypes", [runtime_1.Application,
|
|
101
|
+
(0, tslib_1.__param)(5, (0, di_1.Optional)()),
|
|
102
|
+
(0, tslib_1.__metadata)("design:paramtypes", [runtime_1.Application,
|
|
103
103
|
runtime_1.RolesService,
|
|
104
104
|
tasks_1.TaskQueueClient,
|
|
105
105
|
tasks_1.TaskWorkerRegistry,
|
package/dist/tasks.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.module.js","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":";;;;AAAA,mCAA4D;AAC5D,6CAAmF;AAEnF,iCAAuG;AACvG,6CAA2C;AAC3C,6CAA2C;AAC3C,6CAA0D;AAE1D;;;;GAIG;AAWH;IACI,qBACY,GAAiB,EACjB,YAA2B,EAC3B,MAAwB,EACxB,cAAmC,EACnC,MAAe,EACH,QAA+B;QAL3C,QAAG,GAAH,GAAG,CAAc;QACjB,iBAAY,GAAZ,YAAY,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAkB;QACxB,mBAAc,GAAd,cAAc,CAAqB;QACnC,WAAM,GAAN,MAAM,CAAS;QACH,aAAQ,GAAR,QAAQ,CAAuB;IAGvD,CAAC;oBAVQ,WAAW;IAYpB;;;;OAIG;IACW,mBAAO,GAArB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACW,qBAAS,GAAvB,UAAwB,OAA2B;QAC/C,OAAO;YACH,OAAO,EAAE,aAAW;YACpB,SAAS,EAAE;gBACP,EAAE,OAAO,EAAE,4BAAoB,EAAE,QAAQ,EAAE,IAAI,4BAAoB,CAAC,OAAO,CAAC,EAAE;aACjF;SACJ,CAAA;IACL,CAAC;IAID,sBAAI,gCAAO;aAAX;YACI,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC5D,CAAC;;;OAAA;IAED,sBAAI,8BAAK;aAAT;YACI,OAAO,EAAE,CAAC,MAAM,OAAT,EAAE,
|
|
1
|
+
{"version":3,"file":"tasks.module.js","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":";;;;AAAA,mCAA4D;AAC5D,6CAAmF;AAEnF,iCAAuG;AACvG,6CAA2C;AAC3C,6CAA2C;AAC3C,6CAA0D;AAE1D;;;;GAIG;AAWH;IACI,qBACY,GAAiB,EACjB,YAA2B,EAC3B,MAAwB,EACxB,cAAmC,EACnC,MAAe,EACH,QAA+B;QAL3C,QAAG,GAAH,GAAG,CAAc;QACjB,iBAAY,GAAZ,YAAY,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAkB;QACxB,mBAAc,GAAd,cAAc,CAAqB;QACnC,WAAM,GAAN,MAAM,CAAS;QACH,aAAQ,GAAR,QAAQ,CAAuB;IAGvD,CAAC;oBAVQ,WAAW;IAYpB;;;;OAIG;IACW,mBAAO,GAArB;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACW,qBAAS,GAAvB,UAAwB,OAA2B;QAC/C,OAAO;YACH,OAAO,EAAE,aAAW;YACpB,SAAS,EAAE;gBACP,EAAE,OAAO,EAAE,4BAAoB,EAAE,QAAQ,EAAE,IAAI,4BAAoB,CAAC,OAAO,CAAC,EAAE;aACjF;SACJ,CAAA;IACL,CAAC;IAID,sBAAI,gCAAO;aAAX;YACI,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC5D,CAAC;;;OAAA;IAED,sBAAI,8BAAK;aAAT;YACI,OAAO,EAAE,CAAC,MAAM,OAAT,EAAE,qDAAW,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,EAAtB,CAAsB,CAAC,WAAE;QACvF,CAAC;;;OAAA;IAED,+BAAS,GAAT;QAEI,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,GAAG,IAAI,wBAAU,CACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EACzB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,GAAG,CAAC,OAAO,EAChB,IAAI,CAAC,MAAM,CACd,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExC,IAAI,IAAI,GAAG,IAAI,CAAC;QAEhB,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;YAC3B,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,8FAA8F;YACjG,KAAK;;;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;;;;aACvB;YAEK,IAAI;;;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;;;;aACtB;SACJ,CAAC,CAAA;IAEN,CAAC;;IA1EQ,WAAW;QAVvB,IAAA,WAAM,EAAC;YACJ,SAAS,EAAE;gBACP,uBAAe;gBACf,0BAAkB;gBAClB,wBAAU;aACb;YACD,OAAO,EAAE;gBACL,uBAAa;aAChB;SACJ,CAAC;QAQO,wBAAA,IAAA,aAAQ,GAAE,CAAA;sDALG,qBAAW;YACF,sBAAY;YAClB,uBAAe;YACP,0BAAkB;YAC1B,gBAAM;YACQ,4BAAoB;OAP9C,WAAW,CA2EvB;IAAD,kBAAC;CAAA,AA3ED,IA2EC;AA3EY,kCAAW"}
|
package/dist/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAC1B,iCAA+B;AAE/B,cAAK,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,4BAA0B;AAC1B,iCAA+B;AAE/B,IAAA,cAAK,GAAE;KACF,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC;KACtB,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC;KACzB,GAAG,EAAE,CACT"}
|
package/dist.esm/tasks.d.ts
CHANGED
|
@@ -30,13 +30,18 @@ export declare class TaskAnnotation extends Annotation {
|
|
|
30
30
|
export declare const Task: AnnotationDecorator<[id?: string]>;
|
|
31
31
|
export declare abstract class Worker {
|
|
32
32
|
abstract get name(): string;
|
|
33
|
+
get options(): JobOptions;
|
|
33
34
|
protected get currentJob(): QueueJob<TaskJob>;
|
|
34
35
|
}
|
|
35
36
|
export declare type RemoteService<T> = {
|
|
36
37
|
[P in keyof T]: T[P] extends (...args: any[]) => any ? (ReturnType<T[P]> extends Promise<any> ? T[P] : (...args: Parameters<T[P]>) => Promise<ReturnType<T[P]>>) : never;
|
|
38
|
+
} & {
|
|
39
|
+
withOptions(options: JobOptions): RemoteService<T>;
|
|
37
40
|
};
|
|
38
41
|
export declare type RemoteWorker<T> = {
|
|
39
42
|
[P in keyof T]: T[P] extends (...args: any[]) => any ? (...args: Parameters<T[P]>) => Promise<QueueJob<TaskJob>> : never;
|
|
43
|
+
} & {
|
|
44
|
+
withOptions(options: JobOptions): RemoteWorker<T>;
|
|
40
45
|
};
|
|
41
46
|
export declare type QueueOptions = BullQueue.QueueOptions;
|
|
42
47
|
export declare type JobOptions = BullQueue.JobOptions;
|
|
@@ -48,8 +53,8 @@ export interface Constructor<T> {
|
|
|
48
53
|
export declare type PromiseWrap<T> = T extends PromiseLike<any> ? T : Promise<T>;
|
|
49
54
|
export declare class TaskWorkerProxy {
|
|
50
55
|
private static create;
|
|
51
|
-
static createAsync<T extends Worker>(queueClient: TaskQueueClient, id: string): RemoteWorker<T>;
|
|
52
|
-
static createSync<T extends Worker>(queueClient: TaskQueueClient, id: string): RemoteService<T>;
|
|
56
|
+
static createAsync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteWorker<T>;
|
|
57
|
+
static createSync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteService<T>;
|
|
53
58
|
}
|
|
54
59
|
interface TaskWorkerEntry<T extends Worker = any> {
|
|
55
60
|
type: Constructor<T>;
|
package/dist.esm/tasks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAc,cAAc,EAAY,QAAQ,EAAgC,MAAM,cAAc,CAAC;AAC5G,OAAO,SAAS,MAAM,MAAM,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAG,MAAM,CAAC;IACpB,YAAY,CAAC,EAAG,SAAS,CAAC,YAAY,CAAC;CAC1C;AAGD;;;;;;;GAOG;AACH,qBACa,oBAAoB;gBACjB,OAAO,EAAG,iBAAiB;IAIhC,OAAO,EAAG,iBAAiB,CAAC;CACtC;AAED,MAAM,WAAW,OAAO;IACpB,EAAE,EAAG,MAAM,CAAC;IACZ,MAAM,EAAG,MAAM,CAAC;IAChB,IAAI,EAAG,GAAG,EAAE,CAAC;CAChB;AAED,eAAO,MAAM,aAAa,wCAA6D,CAAC;AAExF,qBACa,cAAe,SAAQ,UAAU;IAC9B,QAAQ,CAAC,EAAE,CAAC,EAAG,MAAM;gBAAZ,EAAE,CAAC,EAAG,MAAM;CAGpC;AAED,eAAO,MAAM,IAAI,oCAA6B,CAAC;AAE/C,8BAAsB,MAAM;IACxB,QAAQ,KAAK,IAAI,IAAK,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
package/dist.esm/tasks.js
CHANGED
|
@@ -34,6 +34,7 @@ TaskAnnotation = __decorate([
|
|
|
34
34
|
export { TaskAnnotation };
|
|
35
35
|
export const Task = TaskAnnotation.decorator();
|
|
36
36
|
export class Worker {
|
|
37
|
+
get options() { return undefined; }
|
|
37
38
|
get currentJob() {
|
|
38
39
|
return Zone.current.get('workerStateJob');
|
|
39
40
|
}
|
|
@@ -46,11 +47,21 @@ export class TaskWorkerProxy {
|
|
|
46
47
|
}
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
|
-
static createAsync(queueClient, id) {
|
|
50
|
-
return this.create((method, ...args) =>
|
|
50
|
+
static createAsync(queueClient, id, options) {
|
|
51
|
+
return this.create((method, ...args) => {
|
|
52
|
+
if (method === 'withOptions')
|
|
53
|
+
return TaskWorkerProxy.createAsync(queueClient, id, Object.assign({}, options, args[0]));
|
|
54
|
+
else
|
|
55
|
+
return queueClient.enqueue({ id, method, args }, options);
|
|
56
|
+
});
|
|
51
57
|
}
|
|
52
|
-
static createSync(queueClient, id) {
|
|
53
|
-
return this.create((method, ...args) =>
|
|
58
|
+
static createSync(queueClient, id, options) {
|
|
59
|
+
return this.create((method, ...args) => {
|
|
60
|
+
if (method === 'withOptions')
|
|
61
|
+
return TaskWorkerProxy.createSync(queueClient, id, Object.assign({}, options, args[0]));
|
|
62
|
+
else
|
|
63
|
+
return queueClient.enqueue({ id, method, args }, options).then(v => v.finished);
|
|
64
|
+
});
|
|
54
65
|
}
|
|
55
66
|
}
|
|
56
67
|
let TaskQueueClient = class TaskQueueClient {
|
|
@@ -110,8 +121,8 @@ let TaskWorkerRegistry = class TaskWorkerRegistry {
|
|
|
110
121
|
this._entries[id] = {
|
|
111
122
|
type: taskClass,
|
|
112
123
|
local: instance,
|
|
113
|
-
sync: TaskWorkerProxy.createSync(this.client, id),
|
|
114
|
-
async: TaskWorkerProxy.createAsync(this.client, id)
|
|
124
|
+
sync: TaskWorkerProxy.createSync(this.client, id, instance.options),
|
|
125
|
+
async: TaskWorkerProxy.createAsync(this.client, id, instance.options)
|
|
115
126
|
};
|
|
116
127
|
}
|
|
117
128
|
get all() {
|
package/dist.esm/tasks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAuB,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAY,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC5G,OAAO,SAAS,MAAM,MAAM,CAAC;AAQ7B;;;;;;;GAOG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YAAY,OAA2B;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;CAGJ,CAAA;AANY,oBAAoB;IADhC,UAAU,EAAE;;GACA,oBAAoB,CAMhC;SANY,oBAAoB;AAcjC,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAAyB,cAAc,CAAC,CAAC;AAGxF,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,UAAU;IAC1C,YAAqB,EAAY;QAC7B,KAAK,EAAE,CAAC;QADS,OAAE,GAAF,EAAE,CAAU;IAEjC,CAAC;CACJ,CAAA;AAJY,cAAc;IAD1B,YAAY,CAAC,sBAAsB,CAAC;;GACxB,cAAc,CAI1B;SAJY,cAAc;AAM3B,MAAM,CAAC,MAAM,IAAI,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;AAE/C,MAAM,OAAgB,MAAM;
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alterior/tasks",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc.0",
|
|
4
4
|
"description": "Flexible background task system",
|
|
5
5
|
"author": "The Alterior Project (https://github.com/alterior-mvc)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -40,18 +40,19 @@
|
|
|
40
40
|
"docs": "typedoc ."
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@alterior/annotations": "^3.0.0-beta.
|
|
44
|
-
"@alterior/common": "^3.0.0-beta.
|
|
45
|
-
"@alterior/di": "^3.0.0-beta.
|
|
46
|
-
"@alterior/logging": "^3.0.0-
|
|
47
|
-
"@alterior/runtime": "^3.0.0-
|
|
43
|
+
"@alterior/annotations": "^3.0.0-beta.100",
|
|
44
|
+
"@alterior/common": "^3.0.0-beta.100",
|
|
45
|
+
"@alterior/di": "^3.0.0-beta.100",
|
|
46
|
+
"@alterior/logging": "^3.0.0-rc.0",
|
|
47
|
+
"@alterior/runtime": "^3.0.0-rc.0",
|
|
48
48
|
"@avejidah/get-parameter-names": "^0.3.2",
|
|
49
49
|
"@types/ejs": "^2.7.0",
|
|
50
50
|
"bull": "^3.18.0",
|
|
51
51
|
"ejs": "^2.7.4",
|
|
52
52
|
"express": "^4.17.1",
|
|
53
53
|
"kind-of": ">=6.0.3",
|
|
54
|
-
"reflect-metadata": "^0.1.12"
|
|
54
|
+
"reflect-metadata": "^0.1.12",
|
|
55
|
+
"tslib": "^2.3.1"
|
|
55
56
|
},
|
|
56
57
|
"peerDependencies": {
|
|
57
58
|
"zone.js": "^0.11.4"
|
|
@@ -71,5 +72,5 @@
|
|
|
71
72
|
"typescript": "^4.1.5",
|
|
72
73
|
"wtfnode": "^0.7.0"
|
|
73
74
|
},
|
|
74
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "c6430cd3c3b4c6a5ca54ce28d1811a506a6d257a"
|
|
75
76
|
}
|