@tsed/agenda 7.4.3 → 7.5.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/lib/cjs/AgendaModule.js +15 -6
- package/lib/cjs/AgendaModule.js.map +1 -1
- package/lib/cjs/decorators/agenda.js.map +1 -1
- package/lib/cjs/interfaces/interfaces.js.map +1 -1
- package/lib/esm/AgendaModule.js +15 -6
- package/lib/esm/AgendaModule.js.map +1 -1
- package/lib/esm/decorators/agenda.js.map +1 -1
- package/lib/esm/interfaces/interfaces.js.map +1 -1
- package/lib/types/AgendaModule.d.ts +1 -0
- package/lib/types/decorators/agenda.d.ts +0 -11
- package/lib/types/interfaces/interfaces.d.ts +1 -0
- package/package.json +4 -4
- package/src/AgendaModule.ts +14 -6
- package/src/decorators/agenda.ts +0 -12
- package/src/interfaces/interfaces.ts +1 -0
package/lib/cjs/AgendaModule.js
CHANGED
|
@@ -11,24 +11,29 @@ let AgendaModule = class AgendaModule {
|
|
|
11
11
|
injector;
|
|
12
12
|
agenda;
|
|
13
13
|
loadAgenda;
|
|
14
|
+
disableJobProcessing;
|
|
14
15
|
async $afterListen() {
|
|
15
16
|
if (this.loadAgenda) {
|
|
16
17
|
const providers = this.getProviders();
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
if (!this.disableJobProcessing) {
|
|
19
|
+
this.logger.info("Agenda add definitions...");
|
|
20
|
+
providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));
|
|
21
|
+
}
|
|
19
22
|
await this.agenda.start();
|
|
20
|
-
this.
|
|
21
|
-
|
|
23
|
+
if (!this.disableJobProcessing) {
|
|
24
|
+
this.logger.info("Agenda add scheduled jobs...");
|
|
25
|
+
await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
|
|
26
|
+
}
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
|
-
this.logger.info("Agenda
|
|
29
|
+
this.logger.info("Agenda disabled...");
|
|
25
30
|
}
|
|
26
31
|
}
|
|
27
32
|
async $onDestroy() {
|
|
28
33
|
if (this.loadAgenda) {
|
|
29
34
|
await this.agenda.stop();
|
|
30
35
|
await this.agenda.close({ force: true });
|
|
31
|
-
this.logger.info("Agenda
|
|
36
|
+
this.logger.info("Agenda stopped...");
|
|
32
37
|
}
|
|
33
38
|
}
|
|
34
39
|
getProviders() {
|
|
@@ -78,6 +83,10 @@ tslib_1.__decorate([
|
|
|
78
83
|
(0, di_1.Constant)("agenda.enabled", false),
|
|
79
84
|
tslib_1.__metadata("design:type", Boolean)
|
|
80
85
|
], AgendaModule.prototype, "loadAgenda", void 0);
|
|
86
|
+
tslib_1.__decorate([
|
|
87
|
+
(0, di_1.Constant)("agenda.disableJobProcessing", false),
|
|
88
|
+
tslib_1.__metadata("design:type", Boolean)
|
|
89
|
+
], AgendaModule.prototype, "disableJobProcessing", void 0);
|
|
81
90
|
AgendaModule = tslib_1.__decorate([
|
|
82
91
|
(0, di_1.Module)()
|
|
83
92
|
], AgendaModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":";;;;AAAA,yCAA4D;AAC5D,iCAA6E;AAE7E,qDAA2D;AAE3D,4DAAuD;AAGvD,IAAa,YAAY,GAAzB,MAAa,YAAY;IAEb,MAAM,CAAS;IAGf,QAAQ,CAAkB;IAG1B,MAAM,CAAgB;IAGxB,UAAU,CAAU;
|
|
1
|
+
{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n @Inject()\n protected logger: Logger;\n\n @Inject()\n protected injector: InjectorService;\n\n @Inject()\n protected agenda: AgendaService;\n\n @Constant(\"agenda.enabled\", false)\n private loadAgenda: boolean;\n\n @Constant(\"agenda.disableJobProcessing\", false)\n private disableJobProcessing: boolean;\n\n async $afterListen(): Promise<any> {\n if (this.loadAgenda) {\n const providers = this.getProviders();\n\n if (!this.disableJobProcessing) {\n this.logger.info(\"Agenda add definitions...\");\n providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n }\n\n await this.agenda.start();\n\n if (!this.disableJobProcessing) {\n this.logger.info(\"Agenda add scheduled jobs...\");\n await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));\n }\n } else {\n this.logger.info(\"Agenda disabled...\");\n }\n }\n\n async $onDestroy(): Promise<any> {\n if (this.loadAgenda) {\n await this.agenda.stop();\n await this.agenda.close({force: true});\n\n this.logger.info(\"Agenda stopped...\");\n }\n }\n\n protected getProviders(): Provider<any>[] {\n return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n }\n\n protected addAgendaDefinitionsForProvider(provider: Provider): void {\n const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n if (!store.define) {\n return;\n }\n\n Object.entries(store.define).forEach(([propertyKey, {name, ...options}]) => {\n const instance = this.injector.get(provider.token);\n\n const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n this.agenda.define(jobName, options, jobProcessor);\n });\n }\n\n protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n if (!store.every) {\n return;\n }\n\n const promises = Object.entries(store.every).map(([propertyKey, {interval, name, ...options}]) => {\n const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n\n return this.agenda.every(interval, jobName, {}, options);\n });\n\n await Promise.all(promises);\n }\n\n protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n const name = customName || propertyKey;\n return namespace ? `${namespace}.${name}` : name;\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,iCAAoC;
|
|
1
|
+
{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":";;;AAAA,qCAAqD;AACrD,iCAAoC;AACpC,sDAA4D;AAM5D,SAAgB,MAAM,CAAC,OAAuB;IAC5C,OAAO,IAAA,oBAAa,EAClB,OAAO,EAAE,SAAS,IAAI,IAAA,iBAAU,EAAC,QAAQ,EAAE,OAAO,CAAC,EACnD,IAAA,eAAU,EAAC;QACT,IAAI,EAAE,gCAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC;AAPD,wBAOC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ninterface AgendaOptions {\n namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n return useDecorators(\n options?.namespace && StoreMerge(\"agenda\", options),\n Injectable({\n type: PROVIDER_TYPE_AGENDA\n })\n );\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/interfaces/interfaces.ts"],"names":[],"mappings":"","sourcesContent":["import {AgendaConfig} from \"agenda\";\n\ndeclare global {\n namespace TsED {\n interface Configuration {\n agenda?: {\n /**\n * Enable Agenda jobs. Default false.\n */\n enabled?: boolean;\n } & AgendaConfig;\n }\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/interfaces/interfaces.ts"],"names":[],"mappings":"","sourcesContent":["import {AgendaConfig} from \"agenda\";\n\ndeclare global {\n namespace TsED {\n interface Configuration {\n agenda?: {\n /**\n * Enable Agenda jobs. Default false.\n */\n enabled?: boolean;\n disableJobProcessing?: boolean;\n } & AgendaConfig;\n }\n }\n}\n"]}
|
package/lib/esm/AgendaModule.js
CHANGED
|
@@ -8,24 +8,29 @@ let AgendaModule = class AgendaModule {
|
|
|
8
8
|
injector;
|
|
9
9
|
agenda;
|
|
10
10
|
loadAgenda;
|
|
11
|
+
disableJobProcessing;
|
|
11
12
|
async $afterListen() {
|
|
12
13
|
if (this.loadAgenda) {
|
|
13
14
|
const providers = this.getProviders();
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
if (!this.disableJobProcessing) {
|
|
16
|
+
this.logger.info("Agenda add definitions...");
|
|
17
|
+
providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));
|
|
18
|
+
}
|
|
16
19
|
await this.agenda.start();
|
|
17
|
-
this.
|
|
18
|
-
|
|
20
|
+
if (!this.disableJobProcessing) {
|
|
21
|
+
this.logger.info("Agenda add scheduled jobs...");
|
|
22
|
+
await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
|
|
23
|
+
}
|
|
19
24
|
}
|
|
20
25
|
else {
|
|
21
|
-
this.logger.info("Agenda
|
|
26
|
+
this.logger.info("Agenda disabled...");
|
|
22
27
|
}
|
|
23
28
|
}
|
|
24
29
|
async $onDestroy() {
|
|
25
30
|
if (this.loadAgenda) {
|
|
26
31
|
await this.agenda.stop();
|
|
27
32
|
await this.agenda.close({ force: true });
|
|
28
|
-
this.logger.info("Agenda
|
|
33
|
+
this.logger.info("Agenda stopped...");
|
|
29
34
|
}
|
|
30
35
|
}
|
|
31
36
|
getProviders() {
|
|
@@ -75,6 +80,10 @@ __decorate([
|
|
|
75
80
|
Constant("agenda.enabled", false),
|
|
76
81
|
__metadata("design:type", Boolean)
|
|
77
82
|
], AgendaModule.prototype, "loadAgenda", void 0);
|
|
83
|
+
__decorate([
|
|
84
|
+
Constant("agenda.disableJobProcessing", false),
|
|
85
|
+
__metadata("design:type", Boolean)
|
|
86
|
+
], AgendaModule.prototype, "disableJobProcessing", void 0);
|
|
78
87
|
AgendaModule = __decorate([
|
|
79
88
|
Module()
|
|
80
89
|
], AgendaModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,MAAM,EAAY,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAW,MAAM,UAAU,CAAC;AAE7E,OAAO,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGvD,IAAa,YAAY,GAAzB,MAAa,YAAY;IAEb,MAAM,CAAS;IAGf,QAAQ,CAAkB;IAG1B,MAAM,CAAgB;IAGxB,UAAU,CAAU;
|
|
1
|
+
{"version":3,"file":"AgendaModule.js","sourceRoot":"","sources":["../../src/AgendaModule.ts"],"names":[],"mappings":"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","sourcesContent":["import {AfterListen, Logger, OnDestroy} from \"@tsed/common\";\nimport {Constant, Inject, InjectorService, Module, Provider} from \"@tsed/di\";\nimport {Processor} from \"agenda\";\nimport {PROVIDER_TYPE_AGENDA} from \"./constants/constants\";\nimport {AgendaStore} from \"./interfaces/AgendaStore\";\nimport {AgendaService} from \"./services/AgendaFactory\";\n\n@Module()\nexport class AgendaModule implements OnDestroy, AfterListen {\n @Inject()\n protected logger: Logger;\n\n @Inject()\n protected injector: InjectorService;\n\n @Inject()\n protected agenda: AgendaService;\n\n @Constant(\"agenda.enabled\", false)\n private loadAgenda: boolean;\n\n @Constant(\"agenda.disableJobProcessing\", false)\n private disableJobProcessing: boolean;\n\n async $afterListen(): Promise<any> {\n if (this.loadAgenda) {\n const providers = this.getProviders();\n\n if (!this.disableJobProcessing) {\n this.logger.info(\"Agenda add definitions...\");\n providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));\n }\n\n await this.agenda.start();\n\n if (!this.disableJobProcessing) {\n this.logger.info(\"Agenda add scheduled jobs...\");\n await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));\n }\n } else {\n this.logger.info(\"Agenda disabled...\");\n }\n }\n\n async $onDestroy(): Promise<any> {\n if (this.loadAgenda) {\n await this.agenda.stop();\n await this.agenda.close({force: true});\n\n this.logger.info(\"Agenda stopped...\");\n }\n }\n\n protected getProviders(): Provider<any>[] {\n return this.injector.getProviders(PROVIDER_TYPE_AGENDA);\n }\n\n protected addAgendaDefinitionsForProvider(provider: Provider): void {\n const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n if (!store.define) {\n return;\n }\n\n Object.entries(store.define).forEach(([propertyKey, {name, ...options}]) => {\n const instance = this.injector.get(provider.token);\n\n const jobProcessor: Processor = instance[propertyKey].bind(instance) as Processor;\n const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n this.agenda.define(jobName, options, jobProcessor);\n });\n }\n\n protected async scheduleJobsForProvider(provider: Provider<any>): Promise<void> {\n const store = provider.store.get<AgendaStore>(\"agenda\", {});\n\n if (!store.every) {\n return;\n }\n\n const promises = Object.entries(store.every).map(([propertyKey, {interval, name, ...options}]) => {\n const jobName = this.getNameForJob(propertyKey, store.namespace, name);\n\n return this.agenda.every(interval, jobName, {}, options);\n });\n\n await Promise.all(promises);\n }\n\n protected getNameForJob(propertyKey: string, namespace?: string, customName?: string): string {\n const name = customName || propertyKey;\n return namespace ? `${namespace}.${name}` : name;\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"agenda.js","sourceRoot":"","sources":["../../../src/decorators/agenda.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AACpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAM5D,MAAM,UAAU,MAAM,CAAC,OAAuB;IAC5C,OAAO,aAAa,CAClB,OAAO,EAAE,SAAS,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,EACnD,UAAU,CAAC;QACT,IAAI,EAAE,oBAAoB;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC","sourcesContent":["import {StoreMerge, useDecorators} from \"@tsed/core\";\nimport {Injectable} from \"@tsed/di\";\nimport {PROVIDER_TYPE_AGENDA} from \"../constants/constants\";\n\ninterface AgendaOptions {\n namespace?: string;\n}\n\nexport function Agenda(options?: AgendaOptions): ClassDecorator {\n return useDecorators(\n options?.namespace && StoreMerge(\"agenda\", options),\n Injectable({\n type: PROVIDER_TYPE_AGENDA\n })\n );\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/interfaces/interfaces.ts"],"names":[],"mappings":"","sourcesContent":["import {AgendaConfig} from \"agenda\";\n\ndeclare global {\n namespace TsED {\n interface Configuration {\n agenda?: {\n /**\n * Enable Agenda jobs. Default false.\n */\n enabled?: boolean;\n } & AgendaConfig;\n }\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/interfaces/interfaces.ts"],"names":[],"mappings":"","sourcesContent":["import {AgendaConfig} from \"agenda\";\n\ndeclare global {\n namespace TsED {\n interface Configuration {\n agenda?: {\n /**\n * Enable Agenda jobs. Default false.\n */\n enabled?: boolean;\n disableJobProcessing?: boolean;\n } & AgendaConfig;\n }\n }\n}\n"]}
|
|
@@ -6,6 +6,7 @@ export declare class AgendaModule implements OnDestroy, AfterListen {
|
|
|
6
6
|
protected injector: InjectorService;
|
|
7
7
|
protected agenda: AgendaService;
|
|
8
8
|
private loadAgenda;
|
|
9
|
+
private disableJobProcessing;
|
|
9
10
|
$afterListen(): Promise<any>;
|
|
10
11
|
$onDestroy(): Promise<any>;
|
|
11
12
|
protected getProviders(): Provider<any>[];
|
|
@@ -1,14 +1,3 @@
|
|
|
1
|
-
import { AgendaConfig } from "agenda";
|
|
2
|
-
declare global {
|
|
3
|
-
namespace TsED {
|
|
4
|
-
interface Configuration {
|
|
5
|
-
agenda?: {
|
|
6
|
-
/** * Enable Agenda jobs. Default false. */
|
|
7
|
-
enabled?: boolean;
|
|
8
|
-
} & AgendaConfig;
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
1
|
interface AgendaOptions {
|
|
13
2
|
namespace?: string;
|
|
14
3
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tsed/agenda",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.5.0",
|
|
4
4
|
"description": "Agenda package for Ts.ED framework",
|
|
5
5
|
"source": "./src/index.ts",
|
|
6
6
|
"main": "./lib/cjs/index.js",
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
},
|
|
25
25
|
"private": false,
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@tsed/common": "7.
|
|
28
|
-
"@tsed/core": "7.
|
|
29
|
-
"@tsed/di": "7.
|
|
27
|
+
"@tsed/common": "7.5.0",
|
|
28
|
+
"@tsed/core": "7.5.0",
|
|
29
|
+
"@tsed/di": "7.5.0",
|
|
30
30
|
"agenda": "^4.1.3"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
package/src/AgendaModule.ts
CHANGED
|
@@ -19,18 +19,26 @@ export class AgendaModule implements OnDestroy, AfterListen {
|
|
|
19
19
|
@Constant("agenda.enabled", false)
|
|
20
20
|
private loadAgenda: boolean;
|
|
21
21
|
|
|
22
|
+
@Constant("agenda.disableJobProcessing", false)
|
|
23
|
+
private disableJobProcessing: boolean;
|
|
24
|
+
|
|
22
25
|
async $afterListen(): Promise<any> {
|
|
23
26
|
if (this.loadAgenda) {
|
|
24
27
|
const providers = this.getProviders();
|
|
25
|
-
providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));
|
|
26
28
|
|
|
27
|
-
this.
|
|
29
|
+
if (!this.disableJobProcessing) {
|
|
30
|
+
this.logger.info("Agenda add definitions...");
|
|
31
|
+
providers.forEach((provider) => this.addAgendaDefinitionsForProvider(provider));
|
|
32
|
+
}
|
|
33
|
+
|
|
28
34
|
await this.agenda.start();
|
|
29
35
|
|
|
30
|
-
this.
|
|
31
|
-
|
|
36
|
+
if (!this.disableJobProcessing) {
|
|
37
|
+
this.logger.info("Agenda add scheduled jobs...");
|
|
38
|
+
await Promise.all(providers.map((provider) => this.scheduleJobsForProvider(provider)));
|
|
39
|
+
}
|
|
32
40
|
} else {
|
|
33
|
-
this.logger.info("Agenda
|
|
41
|
+
this.logger.info("Agenda disabled...");
|
|
34
42
|
}
|
|
35
43
|
}
|
|
36
44
|
|
|
@@ -39,7 +47,7 @@ export class AgendaModule implements OnDestroy, AfterListen {
|
|
|
39
47
|
await this.agenda.stop();
|
|
40
48
|
await this.agenda.close({force: true});
|
|
41
49
|
|
|
42
|
-
this.logger.info("Agenda
|
|
50
|
+
this.logger.info("Agenda stopped...");
|
|
43
51
|
}
|
|
44
52
|
}
|
|
45
53
|
|
package/src/decorators/agenda.ts
CHANGED
|
@@ -1,19 +1,7 @@
|
|
|
1
1
|
import {StoreMerge, useDecorators} from "@tsed/core";
|
|
2
2
|
import {Injectable} from "@tsed/di";
|
|
3
|
-
import {AgendaConfig} from "agenda";
|
|
4
3
|
import {PROVIDER_TYPE_AGENDA} from "../constants/constants";
|
|
5
4
|
|
|
6
|
-
declare global {
|
|
7
|
-
namespace TsED {
|
|
8
|
-
interface Configuration {
|
|
9
|
-
agenda?: {
|
|
10
|
-
/** * Enable Agenda jobs. Default false. */
|
|
11
|
-
enabled?: boolean;
|
|
12
|
-
} & AgendaConfig;
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
|
|
17
5
|
interface AgendaOptions {
|
|
18
6
|
namespace?: string;
|
|
19
7
|
}
|