@alterior/tasks 3.15.0 → 3.16.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/task-runner.d.ts +2 -1
- package/dist/task-runner.d.ts.map +1 -1
- package/dist/task-runner.js.map +1 -1
- package/dist/task-worker.d.ts +4 -4
- package/dist/task-worker.d.ts.map +1 -1
- package/dist/task-worker.js +1 -1
- package/dist/task-worker.js.map +1 -1
- package/dist/tasks.d.ts +5 -7
- package/dist/tasks.d.ts.map +1 -1
- package/dist/tasks.js.map +1 -1
- package/dist/tasks.module.d.ts.map +1 -1
- package/dist/tasks.module.js.map +1 -1
- package/dist.esm/task-runner.d.ts +2 -1
- package/dist.esm/task-runner.d.ts.map +1 -1
- package/dist.esm/task-runner.js.map +1 -1
- package/dist.esm/task-worker.d.ts +4 -4
- package/dist.esm/task-worker.d.ts.map +1 -1
- package/dist.esm/task-worker.js +3 -3
- package/dist.esm/task-worker.js.map +1 -1
- package/dist.esm/tasks.d.ts +5 -7
- package/dist.esm/tasks.d.ts.map +1 -1
- package/dist.esm/tasks.js.map +1 -1
- package/dist.esm/tasks.module.d.ts.map +1 -1
- package/dist.esm/tasks.module.js.map +1 -1
- package/package.json +8 -8
- package/src/task-runner.ts +3 -3
- package/src/task-worker.ts +101 -101
- package/src/tasks.module.ts +14 -14
- package/src/tasks.ts +60 -63
package/dist/task-runner.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RemoteService, RemoteWorker, TaskWorkerRegistry, Worker } from "./tasks";
|
|
2
|
+
import { Constructor } from "@alterior/runtime";
|
|
2
3
|
export declare class TaskRunner {
|
|
3
4
|
private _registry;
|
|
4
5
|
constructor(_registry: TaskWorkerRegistry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBACa,UAAU;IAEf,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAG,kBAAkB;IAI1C,IAAI,QAAQ,uBAEX;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAG,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAIvE;;;;OAIG;IACH,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAG,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;CAG5E"}
|
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,
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,mCAAkF;AAI3E,IAAM,UAAU,GAAhB,MAAM,UAAU;IACnB,YACY,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAE1C,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAmB,WAA4B;QACjD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAmB,WAA4B;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;CACJ,CAAA;AA3BY,gCAAU;qBAAV,UAAU;IADtB,IAAA,eAAU,GAAE;6CAGe,0BAAkB;GAFjC,UAAU,CA2BtB"}
|
package/dist/task-worker.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Injector } from
|
|
2
|
-
import {
|
|
3
|
-
import { ApplicationOptions } from
|
|
4
|
-
import {
|
|
1
|
+
import { Injector } from '@alterior/di';
|
|
2
|
+
import { Logger } from '@alterior/logging';
|
|
3
|
+
import { ApplicationOptions } from '@alterior/runtime';
|
|
4
|
+
import { TaskJob, TaskModuleOptions, TaskQueueClient, Worker } from './tasks';
|
|
5
5
|
export interface TaskHandler {
|
|
6
6
|
worker: Worker;
|
|
7
7
|
handler: (methodName: string, args: any[]) => Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-worker.d.ts","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-worker.d.ts","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAgC,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAkB,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE9F,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAED,qBAAa,UAAU;IAEf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,OAAO;gBAJP,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,iBAAiB,EAC3B,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,MAAM;IAa3B,IAAW,QAAQ,aAElB;IAED,IAAW,OAAO,sBAEjB;IAED,IAAW,UAAU,uBAEpB;IAED,OAAO,CAAC,aAAa,CAAmC;IAExD,IAAI,KAAK,qCAER;IAED,IAAI;IAIJ,KAAK;IA6CL,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAIlD,eAAe,CAAC,WAAW,EAAE,QAAQ,EAAE;CA+B1C"}
|
package/dist/task-worker.js
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TaskWorker = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const util = tslib_1.__importStar(require("util"));
|
|
5
6
|
const common_1 = require("@alterior/common");
|
|
6
7
|
const di_1 = require("@alterior/di");
|
|
7
8
|
const tasks_1 = require("./tasks");
|
|
8
|
-
const util = tslib_1.__importStar(require("util"));
|
|
9
9
|
class TaskWorker {
|
|
10
10
|
constructor(_injector, _client, _options, _appOptions, _logger) {
|
|
11
11
|
this._injector = _injector;
|
package/dist/task-worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-worker.js","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":";;;;
|
|
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
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Annotation } from "@alterior/annotations";
|
|
2
2
|
import { InjectionToken, Injector } from "@alterior/di";
|
|
3
|
+
import { Constructor } from "@alterior/runtime";
|
|
3
4
|
import BullQueue from "bull";
|
|
4
5
|
export interface TaskModuleOptions {
|
|
5
6
|
queueName?: string;
|
|
@@ -24,13 +25,13 @@ export interface TaskJob {
|
|
|
24
25
|
}
|
|
25
26
|
export declare const QUEUE_OPTIONS: InjectionToken<BullQueue.QueueOptions>;
|
|
26
27
|
export declare class TaskAnnotation extends Annotation {
|
|
27
|
-
readonly id?: string;
|
|
28
|
-
constructor(id?: string);
|
|
28
|
+
readonly id?: string | undefined;
|
|
29
|
+
constructor(id?: string | undefined);
|
|
29
30
|
}
|
|
30
|
-
export declare const Task: (id?: string) => ClassDecorator & MethodDecorator & PropertyDecorator & ParameterDecorator;
|
|
31
|
+
export declare const Task: (id?: string | undefined) => ClassDecorator & MethodDecorator & PropertyDecorator & ParameterDecorator;
|
|
31
32
|
export declare abstract class Worker {
|
|
32
33
|
abstract get name(): string;
|
|
33
|
-
get options(): JobOptions;
|
|
34
|
+
get options(): JobOptions | undefined;
|
|
34
35
|
protected get currentJob(): QueueJob<TaskJob>;
|
|
35
36
|
}
|
|
36
37
|
export type RemoteService<T> = {
|
|
@@ -47,9 +48,6 @@ export type QueueOptions = BullQueue.QueueOptions;
|
|
|
47
48
|
export type JobOptions = BullQueue.JobOptions;
|
|
48
49
|
export type QueueJob<T> = BullQueue.Job<T>;
|
|
49
50
|
export type Queue<T> = BullQueue.Queue<T>;
|
|
50
|
-
export interface Constructor<T> {
|
|
51
|
-
new (...args: any[]): T;
|
|
52
|
-
}
|
|
53
51
|
export type PromiseWrap<T> = T extends PromiseLike<any> ? T : Promise<T>;
|
|
54
52
|
export declare class TaskWorkerProxy {
|
|
55
53
|
private static create;
|
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,EAAqC,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,
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqC,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAc,cAAc,EAAY,QAAQ,EAAgC,MAAM,cAAc,CAAC;AAC5G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,SAAS,MAAM,MAAM,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC;CACzC;AAGD;;;;;;;GAOG;AACH,qBACa,oBAAoB;gBACjB,OAAO,EAAE,iBAAiB;IAI/B,OAAO,EAAE,iBAAiB,CAAC;CACrC;AAED,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,CAAC;CACf;AAED,eAAO,MAAM,aAAa,wCAA6D,CAAC;AAExF,qBACa,cAAe,SAAQ,UAAU;IAC9B,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM;gBAAX,EAAE,CAAC,EAAE,MAAM,YAAA;CAGnC;AAED,eAAO,MAAM,IAAI,wGAA6B,CAAC;AAE/C,8BAAsB,MAAM;IACxB,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC;IAC5B,IAAI,OAAO,IAAI,UAAU,GAAG,SAAS,CAAsB;IAE3D,SAAS,KAAK,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE5C;CACJ;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GACb,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAEpC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAClC,CAAC,CAAC,CAAC,CAAC,GACF,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7D,GAEC,KAAK;CAEV,GAAG;IACA,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;CACtD,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI;KACzB,CAAC,IAAI,MAAM,CAAC,GACb,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAEpC,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAGvD,KAAK;CAEV,GAAG;IACA,WAAW,CAAC,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;AAC9C,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC3C,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAE1C,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEzE,qBAAa,eAAe;IACxB,OAAO,CAAC,MAAM,CAAC,MAAM;IAQrB,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC;IAWrH,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;CAUxH;AAED,UAAU,eAAe,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG;IAC5C,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACrB,KAAK,EAAE,CAAC,CAAC;IACT,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;CAC1B;AAGD,qBACa,eAAe;IAGpB,OAAO,CAAC,UAAU;gBAAV,UAAU,EAAE,oBAAoB;IAK5C,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC;IAExB,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAE1B;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,iBAAiB,CAE/B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,YAAY,2BAYf;IAED;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;CAG9E;AAED,qBACa,kBAAkB;IAEvB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;gBADN,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,eAAe;IAKnC,OAAO,CAAC,QAAQ,CAA2C;IAE3D,OAAO,CAAC,aAAa;IAerB,IAAI,GAAG,IAAI,eAAe,EAAE,CAE3B;IAED,GAAG,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;IAS9D,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE;CAKtC"}
|
package/dist/tasks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":";;;;AAAA,uDAAsF;AACtF,qCAA4G;
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.module.d.ts","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AACH,qBAUa,WAAY,YAAW,MAAM;IAElC,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,MAAM;IACF,OAAO,CAAC,QAAQ;gBALpB,GAAG,
|
|
1
|
+
{"version":3,"file":"tasks.module.d.ts","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AACH,qBAUa,WAAY,YAAW,MAAM;IAElC,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,MAAM;IACF,OAAO,CAAC,QAAQ;gBALpB,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,kBAAkB,EAClC,MAAM,EAAE,MAAM,EACF,QAAQ,EAAE,oBAAoB;IAKtD;;;;OAIG;WACW,OAAO;;;;;;;IAIrB;;;;OAIG;WACW,SAAS,CAAC,OAAO,EAAE,iBAAiB;;;;;;;IASlD,MAAM,EAAG,UAAU,CAAC;IAEpB,IAAI,OAAO,IAAI,iBAAiB,CAE/B;IAED,IAAI,KAAK,IAAI,QAAQ,EAAE,CAEtB;IAED,SAAS;CA8BZ"}
|
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,qCAA4D;AAC5D,+CAAmF;AAEnF,mCAAuG;AACvG,+CAA2C;AAC3C,+CAA2C;AAC3C,+CAA0D;AAE1D;;;;GAIG;AAWI,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACpB,YACY,
|
|
1
|
+
{"version":3,"file":"tasks.module.js","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":";;;;;AAAA,qCAA4D;AAC5D,+CAAmF;AAEnF,mCAAuG;AACvG,+CAA2C;AAC3C,+CAA2C;AAC3C,+CAA0D;AAE1D;;;;GAIG;AAWI,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACpB,YACY,GAAgB,EAChB,YAA0B,EAC1B,MAAuB,EACvB,cAAkC,EAClC,MAAc,EACF,QAA8B;QAL1C,QAAG,GAAH,GAAG,CAAa;QAChB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAiB;QACvB,mBAAc,GAAd,cAAc,CAAoB;QAClC,WAAM,GAAN,MAAM,CAAQ;QACF,aAAQ,GAAR,QAAQ,CAAsB;IAGtD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAO;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,SAAS,CAAC,OAA0B;QAC9C,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,IAAI,OAAO;;QACP,OAAO,MAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,OAAO,mCAAI,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,KAAK;QACL,OAAQ,EAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;IACvG,CAAC;IAED,SAAS;QAEL,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;;oBACP,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBACxB,CAAC;aAAA;YAEK,IAAI;;oBACN,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACvB,CAAC;aAAA;SACJ,CAAC,CAAA;IAEN,CAAC;CACJ,CAAA;AA3EY,kCAAW;sBAAX,WAAW;IAVvB,IAAA,WAAM,EAAC;QACJ,SAAS,EAAE;YACP,uBAAe;YACf,0BAAkB;YAClB,wBAAU;SACb;QACD,OAAO,EAAE;YACL,uBAAa;SAChB;KACJ,CAAC;IAQO,mBAAA,IAAA,aAAQ,GAAE,CAAA;6CALE,qBAAW;QACF,sBAAY;QAClB,uBAAe;QACP,0BAAkB;QAC1B,gBAAM;QACQ,4BAAoB;GAP7C,WAAW,CA2EvB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RemoteService, RemoteWorker, TaskWorkerRegistry, Worker } from "./tasks";
|
|
2
|
+
import { Constructor } from "@alterior/runtime";
|
|
2
3
|
export declare class TaskRunner {
|
|
3
4
|
private _registry;
|
|
4
5
|
constructor(_registry: TaskWorkerRegistry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"task-runner.d.ts","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBACa,UAAU;IAEf,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAG,kBAAkB;IAI1C,IAAI,QAAQ,uBAEX;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAG,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAIvE;;;;OAIG;IACH,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,WAAW,EAAG,WAAW,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;CAG5E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"task-runner.js","sourceRoot":"","sources":["../src/task-runner.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAA+B,kBAAkB,EAAU,MAAM,SAAS,CAAC;AAI3E,IAAM,UAAU,GAAhB,MAAM,UAAU;IACnB,YACY,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAE1C,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAmB,WAA4B;QACjD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAmB,WAA4B;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAI,WAAW,CAAC,CAAC,IAAI,CAAC;IAClD,CAAC;CACJ,CAAA;AA3BY,UAAU;IADtB,UAAU,EAAE;qCAGe,kBAAkB;GAFjC,UAAU,CA2BtB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Injector } from
|
|
2
|
-
import {
|
|
3
|
-
import { ApplicationOptions } from
|
|
4
|
-
import {
|
|
1
|
+
import { Injector } from '@alterior/di';
|
|
2
|
+
import { Logger } from '@alterior/logging';
|
|
3
|
+
import { ApplicationOptions } from '@alterior/runtime';
|
|
4
|
+
import { TaskJob, TaskModuleOptions, TaskQueueClient, Worker } from './tasks';
|
|
5
5
|
export interface TaskHandler {
|
|
6
6
|
worker: Worker;
|
|
7
7
|
handler: (methodName: string, args: any[]) => Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-worker.d.ts","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-worker.d.ts","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAgC,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAkB,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE9F,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9D;AAED,qBAAa,UAAU;IAEf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,OAAO;gBAJP,SAAS,EAAE,QAAQ,EACnB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,iBAAiB,EAC3B,WAAW,EAAE,kBAAkB,EAC/B,OAAO,EAAE,MAAM;IAa3B,IAAW,QAAQ,aAElB;IAED,IAAW,OAAO,sBAEjB;IAED,IAAW,UAAU,uBAEpB;IAED,OAAO,CAAC,aAAa,CAAmC;IAExD,IAAI,KAAK,qCAER;IAED,IAAI;IAIJ,KAAK;IA6CL,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAIlD,eAAe,CAAC,WAAW,EAAE,QAAQ,EAAE;CA+B1C"}
|
package/dist.esm/task-worker.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
|
-
import { InvalidOperationError, ArgumentNullError } from "@alterior/common";
|
|
3
|
-
import { ReflectiveInjector } from "@alterior/di";
|
|
4
|
-
import { TaskAnnotation } from "./tasks";
|
|
5
2
|
import * as util from 'util';
|
|
3
|
+
import { ArgumentNullError, InvalidOperationError } from '@alterior/common';
|
|
4
|
+
import { ReflectiveInjector } from '@alterior/di';
|
|
5
|
+
import { TaskAnnotation } from './tasks';
|
|
6
6
|
export class TaskWorker {
|
|
7
7
|
constructor(_injector, _client, _options, _appOptions, _logger) {
|
|
8
8
|
this._injector = _injector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-worker.js","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"task-worker.js","sourceRoot":"","sources":["../src/task-worker.ts"],"names":[],"mappings":"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"}
|
package/dist.esm/tasks.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Annotation } from "@alterior/annotations";
|
|
2
2
|
import { InjectionToken, Injector } from "@alterior/di";
|
|
3
|
+
import { Constructor } from "@alterior/runtime";
|
|
3
4
|
import BullQueue from "bull";
|
|
4
5
|
export interface TaskModuleOptions {
|
|
5
6
|
queueName?: string;
|
|
@@ -24,13 +25,13 @@ export interface TaskJob {
|
|
|
24
25
|
}
|
|
25
26
|
export declare const QUEUE_OPTIONS: InjectionToken<BullQueue.QueueOptions>;
|
|
26
27
|
export declare class TaskAnnotation extends Annotation {
|
|
27
|
-
readonly id?: string;
|
|
28
|
-
constructor(id?: string);
|
|
28
|
+
readonly id?: string | undefined;
|
|
29
|
+
constructor(id?: string | undefined);
|
|
29
30
|
}
|
|
30
|
-
export declare const Task: (id?: string) => ClassDecorator & MethodDecorator & PropertyDecorator & ParameterDecorator;
|
|
31
|
+
export declare const Task: (id?: string | undefined) => ClassDecorator & MethodDecorator & PropertyDecorator & ParameterDecorator;
|
|
31
32
|
export declare abstract class Worker {
|
|
32
33
|
abstract get name(): string;
|
|
33
|
-
get options(): JobOptions;
|
|
34
|
+
get options(): JobOptions | undefined;
|
|
34
35
|
protected get currentJob(): QueueJob<TaskJob>;
|
|
35
36
|
}
|
|
36
37
|
export type RemoteService<T> = {
|
|
@@ -47,9 +48,6 @@ export type QueueOptions = BullQueue.QueueOptions;
|
|
|
47
48
|
export type JobOptions = BullQueue.JobOptions;
|
|
48
49
|
export type QueueJob<T> = BullQueue.Job<T>;
|
|
49
50
|
export type Queue<T> = BullQueue.Queue<T>;
|
|
50
|
-
export interface Constructor<T> {
|
|
51
|
-
new (...args: any[]): T;
|
|
52
|
-
}
|
|
53
51
|
export type PromiseWrap<T> = T extends PromiseLike<any> ? T : Promise<T>;
|
|
54
52
|
export declare class TaskWorkerProxy {
|
|
55
53
|
private static create;
|
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,EAAqC,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,
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
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;
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.module.d.ts","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AACH,qBAUa,WAAY,YAAW,MAAM;IAElC,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,MAAM;IACF,OAAO,CAAC,QAAQ;gBALpB,GAAG,
|
|
1
|
+
{"version":3,"file":"tasks.module.d.ts","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAEvG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AACH,qBAUa,WAAY,YAAW,MAAM;IAElC,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,MAAM;IACF,OAAO,CAAC,QAAQ;gBALpB,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,kBAAkB,EAClC,MAAM,EAAE,MAAM,EACF,QAAQ,EAAE,oBAAoB;IAKtD;;;;OAIG;WACW,OAAO;;;;;;;IAIrB;;;;OAIG;WACW,SAAS,CAAC,OAAO,EAAE,iBAAiB;;;;;;;IASlD,MAAM,EAAG,UAAU,CAAC;IAEpB,IAAI,OAAO,IAAI,iBAAiB,CAE/B;IAED,IAAI,KAAK,IAAI,QAAQ,EAAE,CAEtB;IAED,SAAS;CA8BZ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.module.js","sourceRoot":"","sources":["../src/tasks.module.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,MAAM,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAU,WAAW,EAAE,YAAY,EAAe,MAAM,mBAAmB,CAAC;AAEnF,OAAO,EAAqB,oBAAoB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACvG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;;;GAIG;AAWI,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACpB,YACY,
|
|
1
|
+
{"version":3,"file":"tasks.module.js","sourceRoot":"","sources":["../src/tasks.module.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.
|
|
3
|
+
"version": "3.16.0",
|
|
4
4
|
"description": "Flexible background task system",
|
|
5
5
|
"author": "The Alterior Project (https://github.com/alterior-mvc)",
|
|
6
6
|
"license": "MIT",
|
|
@@ -40,12 +40,12 @@
|
|
|
40
40
|
"docs": "typedoc src/index.ts"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@alterior/annotations": "^3.
|
|
44
|
-
"@alterior/common": "^3.
|
|
45
|
-
"@alterior/di": "^3.
|
|
46
|
-
"@alterior/logging": "^3.
|
|
47
|
-
"@alterior/runtime": "^3.
|
|
48
|
-
"bull": "^
|
|
43
|
+
"@alterior/annotations": "^3.16.0",
|
|
44
|
+
"@alterior/common": "^3.16.0",
|
|
45
|
+
"@alterior/di": "^3.16.0",
|
|
46
|
+
"@alterior/logging": "^3.16.0",
|
|
47
|
+
"@alterior/runtime": "^3.16.0",
|
|
48
|
+
"bull": "^4.16.5",
|
|
49
49
|
"kind-of": ">=6.0.3",
|
|
50
50
|
"tslib": "^2.3.1"
|
|
51
51
|
},
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"zone.js": "^0.14.3"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@types/bull": "^
|
|
57
|
+
"@types/bull": "^4.10.4",
|
|
58
58
|
"@types/supertest": "^2.0.9",
|
|
59
59
|
"supertest": "^3.1.0",
|
|
60
60
|
"swagger-editor-dist": "^3.9.0",
|
package/src/task-runner.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Injectable
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { Injectable } from "@alterior/di";
|
|
2
|
+
import { RemoteService, RemoteWorker, TaskWorkerRegistry, Worker } from "./tasks";
|
|
3
|
+
import { Constructor } from "@alterior/runtime";
|
|
4
4
|
|
|
5
5
|
@Injectable()
|
|
6
6
|
export class TaskRunner {
|
package/src/task-worker.ts
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { Injector, Provider, ReflectiveInjector } from "@alterior/di";
|
|
3
|
-
import { TaskAnnotation, TaskJob, TaskModuleOptions, TaskQueueClient, Worker } from "./tasks";
|
|
4
|
-
import { ApplicationOptions } from "@alterior/runtime";
|
|
5
|
-
import { Type } from "@alterior/runtime";
|
|
6
|
-
import * as Queue from "bull";
|
|
7
|
-
import { Logger } from "@alterior/logging";
|
|
1
|
+
import * as Queue from 'bull';
|
|
8
2
|
import * as util from 'util';
|
|
9
3
|
|
|
4
|
+
import { ArgumentNullError, InvalidOperationError } from '@alterior/common';
|
|
5
|
+
import { Injector, Provider, ReflectiveInjector } from '@alterior/di';
|
|
6
|
+
import { Logger } from '@alterior/logging';
|
|
7
|
+
import { ApplicationOptions } from '@alterior/runtime';
|
|
8
|
+
import { TaskAnnotation, TaskJob, TaskModuleOptions, TaskQueueClient, Worker } from './tasks';
|
|
9
|
+
|
|
10
10
|
export interface TaskHandler {
|
|
11
|
-
|
|
12
|
-
handler
|
|
11
|
+
worker: Worker;
|
|
12
|
+
handler: (methodName: string, args: any[]) => Promise<any>;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export class TaskWorker {
|
|
16
16
|
constructor(
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
private _options
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
private _injector: Injector,
|
|
18
|
+
private _client: TaskQueueClient,
|
|
19
|
+
private _options: TaskModuleOptions,
|
|
20
|
+
private _appOptions: ApplicationOptions,
|
|
21
|
+
private _logger: Logger
|
|
22
22
|
) {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
if (!_injector)
|
|
24
|
+
throw new ArgumentNullError(`injector`);
|
|
25
25
|
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
if (!_options)
|
|
27
|
+
throw new ArgumentNullError(`options`);
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
if (!_appOptions)
|
|
30
|
+
throw new ArgumentNullError(`appOptions`);
|
|
31
31
|
|
|
32
32
|
}
|
|
33
33
|
|
|
@@ -43,94 +43,94 @@ export class TaskWorker {
|
|
|
43
43
|
return this._appOptions;
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
private _taskHandlers = {};
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
registerHandler(name
|
|
46
|
+
private _taskHandlers: Record<string, TaskHandler> = {};
|
|
47
|
+
|
|
48
|
+
get queue() {
|
|
49
|
+
return this._client.queue;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
stop() {
|
|
53
|
+
this.queue.close();
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
start() {
|
|
57
|
+
this.queue.process(async (job: Queue.Job<TaskJob>, done) => {
|
|
58
|
+
let task = job.data;
|
|
59
|
+
|
|
60
|
+
if (!task || !task.id) {
|
|
61
|
+
console.log(`TaskWorker: Could not process invalid task:`);
|
|
62
|
+
console.dir(task, { depth: 3 });
|
|
63
|
+
console.log(`Associated job data:`);
|
|
64
|
+
console.dir(job, { depth: 3 });
|
|
65
|
+
|
|
66
|
+
await job.discard();
|
|
67
|
+
|
|
68
|
+
done(new Error(`Invalid job task`), null);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
let handler: TaskHandler = this._taskHandlers[task.id];
|
|
72
|
+
|
|
73
|
+
if (!handler) {
|
|
74
|
+
console.error(`No handler for task ID '${task.id}'! Check that your worker class declares this task ID!`);
|
|
75
|
+
|
|
76
|
+
console.info(`Task was: `);
|
|
77
|
+
console.dir(task, { depth: 3 });
|
|
78
|
+
|
|
79
|
+
console.info(`Registered worker IDs: ${Object.keys(this._taskHandlers).join(', ')}`);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
await this._logger.withContext(
|
|
83
|
+
{ host: 'tasks', worker: handler.worker },
|
|
84
|
+
`TaskWorker | ${handler.worker.constructor.name}.${task.method}(${task.args.map(x => util.inspect(x, false, 2)).join(', ')})`,
|
|
85
|
+
async () => {
|
|
86
|
+
this._logger.info(`TaskWorker: ${task.method}() of worker ${handler.worker.constructor.name} (ID '${task.id}')`);
|
|
87
|
+
try {
|
|
88
|
+
let result = await handler.handler(task.method, task.args);
|
|
89
|
+
done(undefined, result);
|
|
90
|
+
} catch (e: any) {
|
|
91
|
+
console.error(`Caught error while running task ${job.data.id}.${job.data.method || 'execute'}():`);
|
|
92
|
+
console.error(e);
|
|
93
|
+
|
|
94
|
+
done(e);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
registerHandler(name: string, handler: TaskHandler) {
|
|
102
102
|
this._taskHandlers[name] = handler;
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
registerClasses(taskClasses : Function[]) {
|
|
103
|
+
}
|
|
106
104
|
|
|
107
|
-
|
|
105
|
+
registerClasses(taskClasses: Function[]) {
|
|
106
|
+
|
|
107
|
+
let providers: Provider[] = taskClasses as Provider[];
|
|
108
108
|
let ownInjector = ReflectiveInjector.resolveAndCreate(providers, this.injector);
|
|
109
|
-
|
|
109
|
+
let allRoutes = [];
|
|
110
|
+
|
|
111
|
+
let tasks = taskClasses.map(taskClass => {
|
|
110
112
|
|
|
111
|
-
|
|
113
|
+
let id = taskClass.name;
|
|
114
|
+
let annotation = TaskAnnotation.getForClass(taskClass);
|
|
115
|
+
let instance: Worker = ownInjector.get(taskClass);
|
|
112
116
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
let instance : Worker = ownInjector.get(taskClass);
|
|
117
|
+
if (instance.name)
|
|
118
|
+
id = instance.name;
|
|
116
119
|
|
|
117
|
-
|
|
118
|
-
|
|
120
|
+
if (annotation && annotation.id)
|
|
121
|
+
id = annotation.id;
|
|
119
122
|
|
|
120
|
-
|
|
121
|
-
|
|
123
|
+
this.registerHandler(id, {
|
|
124
|
+
worker: instance,
|
|
125
|
+
handler: async (methodName, args) => {
|
|
126
|
+
let impl = instance.constructor.prototype[methodName];
|
|
122
127
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
handler: async (methodName, args) => {
|
|
126
|
-
let impl = instance.constructor.prototype[methodName];
|
|
128
|
+
if (typeof impl !== 'function' || methodName.startsWith('_'))
|
|
129
|
+
throw new InvalidOperationError(`Invalid task method ${methodName}`);
|
|
127
130
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
});
|
|
134
|
-
});
|
|
135
|
-
}
|
|
131
|
+
return await (instance as any)[methodName](...args);
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
136
|
}
|
package/src/tasks.module.ts
CHANGED
|
@@ -13,8 +13,8 @@ import { Logger, LoggingModule } from "@alterior/logging";
|
|
|
13
13
|
*/
|
|
14
14
|
@Module({
|
|
15
15
|
providers: [
|
|
16
|
-
TaskQueueClient,
|
|
17
|
-
TaskWorkerRegistry,
|
|
16
|
+
TaskQueueClient,
|
|
17
|
+
TaskWorkerRegistry,
|
|
18
18
|
TaskRunner
|
|
19
19
|
],
|
|
20
20
|
imports: [
|
|
@@ -23,12 +23,12 @@ import { Logger, LoggingModule } from "@alterior/logging";
|
|
|
23
23
|
})
|
|
24
24
|
export class TasksModule implements OnInit {
|
|
25
25
|
constructor(
|
|
26
|
-
private app
|
|
27
|
-
private rolesService
|
|
28
|
-
private client
|
|
29
|
-
private workerRegistry
|
|
30
|
-
private logger
|
|
31
|
-
@Optional() private _options
|
|
26
|
+
private app: Application,
|
|
27
|
+
private rolesService: RolesService,
|
|
28
|
+
private client: TaskQueueClient,
|
|
29
|
+
private workerRegistry: TaskWorkerRegistry,
|
|
30
|
+
private logger: Logger,
|
|
31
|
+
@Optional() private _options: TaskModuleOptionsRef
|
|
32
32
|
) {
|
|
33
33
|
|
|
34
34
|
}
|
|
@@ -47,7 +47,7 @@ export class TasksModule implements OnInit {
|
|
|
47
47
|
* be imported into an entry module (or feature module).
|
|
48
48
|
* @param options The options to use for the web server
|
|
49
49
|
*/
|
|
50
|
-
public static configure(options
|
|
50
|
+
public static configure(options: TaskModuleOptions) {
|
|
51
51
|
return {
|
|
52
52
|
$module: TasksModule,
|
|
53
53
|
providers: [
|
|
@@ -56,14 +56,14 @@ export class TasksModule implements OnInit {
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
worker
|
|
59
|
+
worker!: TaskWorker;
|
|
60
60
|
|
|
61
61
|
get options(): TaskModuleOptions {
|
|
62
62
|
return this._options?.options ?? {};
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
get tasks(): Function[] {
|
|
66
|
-
return [].concat(...this.app.runtime.definitions.map(x => x.metadata.tasks || []));
|
|
66
|
+
return ([] as Function[]).concat(...this.app.runtime.definitions.map(x => x.metadata.tasks || []));
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
altOnInit() {
|
|
@@ -71,9 +71,9 @@ export class TasksModule implements OnInit {
|
|
|
71
71
|
this.workerRegistry.registerClasses(this.tasks);
|
|
72
72
|
|
|
73
73
|
this.worker = new TaskWorker(
|
|
74
|
-
this.app.runtime.injector,
|
|
75
|
-
this.client,
|
|
76
|
-
this.options,
|
|
74
|
+
this.app.runtime.injector,
|
|
75
|
+
this.client,
|
|
76
|
+
this.options,
|
|
77
77
|
this.app.options,
|
|
78
78
|
this.logger
|
|
79
79
|
);
|
package/src/tasks.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Annotation, MetadataName, AnnotationDecorator } from "@alterior/annotations";
|
|
2
2
|
import { Injectable, InjectionToken, Optional, Injector, Provider, ReflectiveInjector } from "@alterior/di";
|
|
3
|
+
import { Constructor } from "@alterior/runtime";
|
|
3
4
|
import BullQueue from "bull";
|
|
4
5
|
|
|
5
6
|
export interface TaskModuleOptions {
|
|
6
|
-
queueName
|
|
7
|
-
queueOptions
|
|
7
|
+
queueName?: string;
|
|
8
|
+
queueOptions?: BullQueue.QueueOptions;
|
|
8
9
|
}
|
|
9
10
|
|
|
10
11
|
|
|
@@ -18,24 +19,24 @@ export interface TaskModuleOptions {
|
|
|
18
19
|
*/
|
|
19
20
|
@Injectable()
|
|
20
21
|
export class TaskModuleOptionsRef {
|
|
21
|
-
constructor(options
|
|
22
|
+
constructor(options: TaskModuleOptions) {
|
|
22
23
|
this.options = options;
|
|
23
24
|
}
|
|
24
25
|
|
|
25
|
-
public options
|
|
26
|
+
public options: TaskModuleOptions;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
export interface TaskJob {
|
|
29
|
-
id
|
|
30
|
-
method
|
|
31
|
-
args
|
|
30
|
+
id: string;
|
|
31
|
+
method: string;
|
|
32
|
+
args: any[];
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
export const QUEUE_OPTIONS = new InjectionToken<BullQueue.QueueOptions>('QueueOptions');
|
|
35
36
|
|
|
36
37
|
@MetadataName('@alterior/tasks:Task')
|
|
37
38
|
export class TaskAnnotation extends Annotation {
|
|
38
|
-
constructor(readonly id
|
|
39
|
+
constructor(readonly id?: string) {
|
|
39
40
|
super();
|
|
40
41
|
}
|
|
41
42
|
}
|
|
@@ -43,40 +44,40 @@ export class TaskAnnotation extends Annotation {
|
|
|
43
44
|
export const Task = TaskAnnotation.decorator();
|
|
44
45
|
|
|
45
46
|
export abstract class Worker {
|
|
46
|
-
abstract get name()
|
|
47
|
-
get options()
|
|
47
|
+
abstract get name(): string;
|
|
48
|
+
get options(): JobOptions | undefined { return undefined; }
|
|
48
49
|
|
|
49
|
-
protected get currentJob()
|
|
50
|
+
protected get currentJob(): QueueJob<TaskJob> {
|
|
50
51
|
return Zone.current.get('workerStateJob');
|
|
51
52
|
}
|
|
52
53
|
}
|
|
53
54
|
|
|
54
55
|
export type RemoteService<T> = {
|
|
55
|
-
[P in keyof T]:
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
56
|
+
[P in keyof T]:
|
|
57
|
+
T[P] extends (...args: any[]) => any ?
|
|
58
|
+
// methods
|
|
59
|
+
(ReturnType<T[P]> extends Promise<any> ?
|
|
60
|
+
T[P] // dont modify methods that are already promises
|
|
61
|
+
: (...args: Parameters<T[P]>) => Promise<ReturnType<T[P]>>
|
|
62
|
+
)
|
|
63
|
+
// fields
|
|
64
|
+
: never
|
|
64
65
|
;
|
|
65
66
|
} & {
|
|
66
|
-
withOptions(options
|
|
67
|
+
withOptions(options: JobOptions): RemoteService<T>;
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
export type RemoteWorker<T> = {
|
|
70
|
-
[P in keyof T]:
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
71
|
+
[P in keyof T]:
|
|
72
|
+
T[P] extends (...args: any[]) => any ?
|
|
73
|
+
// methods
|
|
74
|
+
(...args: Parameters<T[P]>) => Promise<QueueJob<TaskJob>>
|
|
75
|
+
|
|
76
|
+
// fields
|
|
77
|
+
: never
|
|
77
78
|
;
|
|
78
79
|
} & {
|
|
79
|
-
withOptions(options
|
|
80
|
+
withOptions(options: JobOptions): RemoteWorker<T>;
|
|
80
81
|
};
|
|
81
82
|
|
|
82
83
|
export type QueueOptions = BullQueue.QueueOptions;
|
|
@@ -84,22 +85,18 @@ export type JobOptions = BullQueue.JobOptions;
|
|
|
84
85
|
export type QueueJob<T> = BullQueue.Job<T>;
|
|
85
86
|
export type Queue<T> = BullQueue.Queue<T>;
|
|
86
87
|
|
|
87
|
-
export interface Constructor<T> {
|
|
88
|
-
new (...args) : T;
|
|
89
|
-
}
|
|
90
|
-
|
|
91
88
|
export type PromiseWrap<T> = T extends PromiseLike<any> ? T : Promise<T>;
|
|
92
89
|
|
|
93
90
|
export class TaskWorkerProxy {
|
|
94
|
-
private static create<T extends Worker>(handler
|
|
95
|
-
return <RemoteWorker<T>>
|
|
96
|
-
get(t, key
|
|
97
|
-
return (...args) => handler(key, ...args);
|
|
91
|
+
private static create<T extends Worker>(handler: (key: string, ...args: string[]) => any): any {
|
|
92
|
+
return <RemoteWorker<T>>new Proxy({}, {
|
|
93
|
+
get(t, key: string, receiver) {
|
|
94
|
+
return (...args: any[]) => handler(key, ...args);
|
|
98
95
|
}
|
|
99
96
|
})
|
|
100
97
|
}
|
|
101
98
|
|
|
102
|
-
static createAsync<T extends Worker>(queueClient
|
|
99
|
+
static createAsync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteWorker<T> {
|
|
103
100
|
return this.create(
|
|
104
101
|
(method, ...args) => {
|
|
105
102
|
if (method === 'withOptions')
|
|
@@ -109,9 +106,9 @@ export class TaskWorkerProxy {
|
|
|
109
106
|
}
|
|
110
107
|
);
|
|
111
108
|
}
|
|
112
|
-
|
|
113
|
-
static createSync<T extends Worker>(queueClient
|
|
114
|
-
return this.create(
|
|
109
|
+
|
|
110
|
+
static createSync<T extends Worker>(queueClient: TaskQueueClient, id: string, options?: JobOptions): RemoteService<T> {
|
|
111
|
+
return this.create(
|
|
115
112
|
(method, ...args) => {
|
|
116
113
|
if (method === 'withOptions')
|
|
117
114
|
return TaskWorkerProxy.createSync(queueClient, id, Object.assign({}, options, args[0]));
|
|
@@ -123,10 +120,10 @@ export class TaskWorkerProxy {
|
|
|
123
120
|
}
|
|
124
121
|
|
|
125
122
|
interface TaskWorkerEntry<T extends Worker = any> {
|
|
126
|
-
type
|
|
127
|
-
local
|
|
128
|
-
async
|
|
129
|
-
sync
|
|
123
|
+
type: Constructor<T>;
|
|
124
|
+
local: T;
|
|
125
|
+
async: RemoteWorker<T>;
|
|
126
|
+
sync: RemoteService<T>;
|
|
130
127
|
}
|
|
131
128
|
|
|
132
129
|
|
|
@@ -134,17 +131,17 @@ interface TaskWorkerEntry<T extends Worker = any> {
|
|
|
134
131
|
export class TaskQueueClient {
|
|
135
132
|
constructor(
|
|
136
133
|
@Optional()
|
|
137
|
-
private optionsRef
|
|
134
|
+
private optionsRef: TaskModuleOptionsRef
|
|
138
135
|
) {
|
|
139
136
|
this._queue = new BullQueue(this.queueName, this.queueOptions);
|
|
140
137
|
}
|
|
141
138
|
|
|
142
|
-
_queue
|
|
139
|
+
_queue: BullQueue.Queue;
|
|
143
140
|
|
|
144
141
|
get queue(): Queue<TaskJob> {
|
|
145
142
|
return this._queue;
|
|
146
143
|
}
|
|
147
|
-
|
|
144
|
+
|
|
148
145
|
/**
|
|
149
146
|
* Get the task client options. See
|
|
150
147
|
*/
|
|
@@ -173,7 +170,7 @@ export class TaskQueueClient {
|
|
|
173
170
|
/**
|
|
174
171
|
* Enqueue a new task. To handle the task on the worker side, register for it with `.process()`
|
|
175
172
|
*/
|
|
176
|
-
async enqueue(data
|
|
173
|
+
async enqueue(data: TaskJob, opts?: JobOptions): Promise<QueueJob<TaskJob>> {
|
|
177
174
|
return await this._queue.add(data, opts);
|
|
178
175
|
}
|
|
179
176
|
}
|
|
@@ -181,48 +178,48 @@ export class TaskQueueClient {
|
|
|
181
178
|
@Injectable()
|
|
182
179
|
export class TaskWorkerRegistry {
|
|
183
180
|
constructor(
|
|
184
|
-
private injector
|
|
185
|
-
private client
|
|
181
|
+
private injector: Injector,
|
|
182
|
+
private client: TaskQueueClient
|
|
186
183
|
) {
|
|
187
184
|
|
|
188
185
|
}
|
|
189
186
|
|
|
190
|
-
private _entries
|
|
187
|
+
private _entries: { [name: string]: TaskWorkerEntry } = {};
|
|
191
188
|
|
|
192
|
-
private registerClass(injector
|
|
193
|
-
let instance = <Worker>
|
|
189
|
+
private registerClass(injector: Injector, taskClass: Constructor<Worker>) {
|
|
190
|
+
let instance = <Worker>injector.get(taskClass);
|
|
194
191
|
let id = instance.name;
|
|
195
|
-
|
|
192
|
+
|
|
196
193
|
if (this._entries[id])
|
|
197
194
|
throw new Error(`Another worker is already registered with name '${id}'`);
|
|
198
195
|
|
|
199
196
|
this._entries[id] = {
|
|
200
|
-
type: <any>
|
|
197
|
+
type: <any>taskClass,
|
|
201
198
|
local: instance,
|
|
202
199
|
sync: TaskWorkerProxy.createSync(this.client, id, instance.options),
|
|
203
200
|
async: TaskWorkerProxy.createAsync(this.client, id, instance.options)
|
|
204
201
|
};
|
|
205
202
|
}
|
|
206
203
|
|
|
207
|
-
get all()
|
|
204
|
+
get all(): TaskWorkerEntry[] {
|
|
208
205
|
return Object.values(this._entries);
|
|
209
206
|
}
|
|
210
207
|
|
|
211
|
-
get<T extends Worker>(cls
|
|
208
|
+
get<T extends Worker>(cls: Constructor<T>): TaskWorkerEntry<T> {
|
|
212
209
|
let entry = this.all.find(x => x.type === cls);
|
|
213
210
|
|
|
214
211
|
if (!entry)
|
|
215
212
|
throw new Error(`Worker class ${cls.name} is not registered. Add it to the 'tasks' property of a module or call TaskWorkerRegistry.register(${cls.name})`);
|
|
216
|
-
|
|
217
|
-
return <TaskWorkerEntry<T>>
|
|
213
|
+
|
|
214
|
+
return <TaskWorkerEntry<T>>entry;
|
|
218
215
|
}
|
|
219
216
|
|
|
220
|
-
getByName(name
|
|
217
|
+
getByName(name: string) {
|
|
221
218
|
return this._entries[name];
|
|
222
219
|
}
|
|
223
220
|
|
|
224
|
-
registerClasses(classes
|
|
225
|
-
let taskClasses
|
|
221
|
+
registerClasses(classes: Function[]) {
|
|
222
|
+
let taskClasses: Constructor<Worker>[] = classes as any;
|
|
226
223
|
let ownInjector = ReflectiveInjector.resolveAndCreate(taskClasses as Provider[], this.injector);
|
|
227
224
|
taskClasses.forEach(taskClass => this.registerClass(ownInjector, taskClass));
|
|
228
225
|
}
|