agenda 4.3.0 → 5.0.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/History.md +12 -3
- package/README.md +38 -9
- package/dist/agenda/create.d.ts +2 -2
- package/dist/agenda/create.d.ts.map +1 -1
- package/dist/agenda/create.js.map +1 -1
- package/dist/agenda/define.d.ts +2 -2
- package/dist/agenda/define.d.ts.map +1 -1
- package/dist/agenda/define.js.map +1 -1
- package/dist/agenda/drain.d.ts +9 -0
- package/dist/agenda/drain.d.ts.map +1 -0
- package/dist/agenda/drain.js +46 -0
- package/dist/agenda/drain.js.map +1 -0
- package/dist/agenda/every.d.ts +2 -1
- package/dist/agenda/every.d.ts.map +1 -1
- package/dist/agenda/every.js +1 -1
- package/dist/agenda/every.js.map +1 -1
- package/dist/agenda/find-and-lock-next-job.d.ts.map +1 -1
- package/dist/agenda/find-and-lock-next-job.js +3 -4
- package/dist/agenda/find-and-lock-next-job.js.map +1 -1
- package/dist/agenda/index.d.ts +2 -0
- package/dist/agenda/index.d.ts.map +1 -1
- package/dist/agenda/index.js +2 -0
- package/dist/agenda/index.js.map +1 -1
- package/dist/agenda/now.d.ts +2 -2
- package/dist/agenda/now.d.ts.map +1 -1
- package/dist/agenda/now.js.map +1 -1
- package/dist/agenda/schedule.d.ts +3 -3
- package/dist/agenda/schedule.d.ts.map +1 -1
- package/dist/agenda/schedule.js.map +1 -1
- package/dist/job/compute-next-run-at.js +2 -2
- package/dist/job/compute-next-run-at.js.map +1 -1
- package/dist/job/index.d.ts +6 -3
- package/dist/job/index.d.ts.map +1 -1
- package/dist/job/index.js.map +1 -1
- package/lib/agenda/cancel.ts +28 -0
- package/lib/agenda/close.ts +37 -0
- package/lib/agenda/create.ts +22 -0
- package/lib/agenda/database.ts +63 -0
- package/lib/agenda/db-init.ts +45 -0
- package/lib/agenda/default-concurrency.ts +19 -0
- package/lib/agenda/default-lock-lifetime.ts +17 -0
- package/lib/agenda/default-lock-limit.ts +17 -0
- package/lib/agenda/define.ts +85 -0
- package/lib/agenda/disable.ts +28 -0
- package/lib/agenda/drain.ts +30 -0
- package/lib/agenda/enable.ts +29 -0
- package/lib/agenda/every.ts +86 -0
- package/lib/agenda/find-and-lock-next-job.ts +78 -0
- package/lib/agenda/has-mongo-protocol.ts +8 -0
- package/lib/agenda/index.ts +227 -0
- package/lib/agenda/job-processing-queue.ts +99 -0
- package/lib/agenda/jobs.ts +31 -0
- package/lib/agenda/lock-limit.ts +17 -0
- package/lib/agenda/max-concurrency.ts +20 -0
- package/lib/agenda/mongo.ts +21 -0
- package/lib/agenda/name.ts +16 -0
- package/lib/agenda/now.ts +31 -0
- package/lib/agenda/process-every.ts +18 -0
- package/lib/agenda/purge.ts +19 -0
- package/lib/agenda/save-job.ts +185 -0
- package/lib/agenda/schedule.ts +79 -0
- package/lib/agenda/sort.ts +17 -0
- package/lib/agenda/start.ts +30 -0
- package/lib/agenda/stop.ts +49 -0
- package/lib/cjs.ts +5 -0
- package/lib/index.ts +11 -0
- package/lib/job/compute-next-run-at.ts +191 -0
- package/lib/job/disable.ts +11 -0
- package/lib/job/enable.ts +11 -0
- package/lib/job/fail.ts +29 -0
- package/lib/job/index.ts +221 -0
- package/lib/job/is-running.ts +29 -0
- package/lib/job/priority.ts +11 -0
- package/lib/job/remove.ts +10 -0
- package/lib/job/repeat-at.ts +12 -0
- package/lib/job/repeat-every.ts +40 -0
- package/lib/job/run.ts +125 -0
- package/lib/job/save.ts +11 -0
- package/lib/job/schedule.ts +15 -0
- package/lib/job/set-shouldsaveresult.ts +10 -0
- package/lib/job/to-json.ts +36 -0
- package/lib/job/touch.ts +11 -0
- package/lib/job/unique.ts +18 -0
- package/lib/utils/create-job.ts +13 -0
- package/lib/utils/index.ts +3 -0
- package/lib/utils/parse-priority.ts +37 -0
- package/lib/utils/process-jobs.ts +379 -0
- package/package.json +14 -12
- package/tsconfig.json +72 -0
package/History.md
CHANGED
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
# Next
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
_Contributions welcome!_ https://github.com/agenda/agenda/pulls
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
# [4.4.0](https://github.com/agenda/agenda/releases/tag/v4.4.0) / 2022-10-19
|
|
6
|
+
|
|
7
|
+
- Feat: Add `drain()` method for graceful process shutdowns ([#1488](https://github.com/agenda/agenda/pull/1488)) thanks @nmehmedrnd
|
|
8
|
+
|
|
9
|
+
# [4.3.0](https://github.com/agenda/agenda/releases/tag/v4.3.0) / 2022-05-10
|
|
10
|
+
|
|
11
|
+
- Feat: `disableAutoIndex`
|
|
12
|
+
- Feat: `shouldSaveResult`
|
|
13
|
+
|
|
14
|
+
# 4.2.1 / 2021-08-09
|
|
6
15
|
|
|
7
16
|
- fix: deprecation warning for collection.findOneAndUpdate ([#1338](https://github.com/agenda/agenda/pull/1338)) thanks @frobinsonj
|
|
8
17
|
|
|
9
|
-
|
|
18
|
+
# 4.2.0 / 2021-08-05
|
|
10
19
|
|
|
11
20
|
- Feat: Add top level disable and enable ([#1109](https://github.com/agenda/agenda/pull/1109)) thanks @pdfowler
|
|
12
21
|
- fix(history): match cron-parser pattern ([#1335](https://github.com/agenda/agenda/pull/1335)) thanks @dockleryxk
|
package/README.md
CHANGED
|
@@ -45,10 +45,6 @@ _Kudos for making the comparison chart goes to [Bull](https://www.npmjs.com/pack
|
|
|
45
45
|
|
|
46
46
|
# Installation
|
|
47
47
|
|
|
48
|
-
### Notice
|
|
49
|
-
|
|
50
|
-
In order to support new MongoDB 5.0 and mongodb node.js driver/package the next release (5.x.x) of Agenda will be major. The required node version will become >=12. The mongodb dependency version will become >=3.2.
|
|
51
|
-
|
|
52
48
|
Install via NPM
|
|
53
49
|
|
|
54
50
|
npm install agenda
|
|
@@ -67,11 +63,27 @@ For Typescript, Webpack or other module imports, use `agenda/es` entrypoint:
|
|
|
67
63
|
e.g.
|
|
68
64
|
|
|
69
65
|
```ts
|
|
70
|
-
import {
|
|
71
|
-
|
|
66
|
+
import Agenda, { Job, JobAttributesData } from 'agenda'
|
|
67
|
+
|
|
68
|
+
const mongoConnectionString = "mongodb://127.0.0.1/agenda";
|
|
69
|
+
const agenda = new Agenda({ db: { address: mongoConnectionString } });
|
|
72
70
|
|
|
73
|
-
|
|
74
|
-
|
|
71
|
+
interface CreateContact extends JobAttributesData {
|
|
72
|
+
contactDetails: Contact // app-specific type
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
agenda.define<CreateContact>('CREATE CONTACT', async (job: Job<CreateContact>) => {
|
|
76
|
+
const contactDetails = job.attrs.data.contactDetails; // type Contact
|
|
77
|
+
})
|
|
78
|
+
|
|
79
|
+
agenda.now<CreateContact>('CREATE CONTACT', {
|
|
80
|
+
contactDetails: {...} // required attr
|
|
81
|
+
})
|
|
82
|
+
|
|
83
|
+
agenda.schedule<CreateContact>('in 5 minutes', 'CREATE CONTACT', {
|
|
84
|
+
contactDetails: {...} // required attr
|
|
85
|
+
})
|
|
86
|
+
```
|
|
75
87
|
|
|
76
88
|
# Example Usage
|
|
77
89
|
|
|
@@ -611,6 +623,23 @@ process.on("SIGTERM", graceful);
|
|
|
611
623
|
process.on("SIGINT", graceful);
|
|
612
624
|
```
|
|
613
625
|
|
|
626
|
+
### drain
|
|
627
|
+
|
|
628
|
+
Stops the job queue processing and waits till all current jobs finishes.
|
|
629
|
+
|
|
630
|
+
This can be very useful for graceful shutdowns so that currently running/grabbed jobs are finished before shutting down. Here is an example of how to do a graceful
|
|
631
|
+
shutdown.
|
|
632
|
+
|
|
633
|
+
```js
|
|
634
|
+
async function graceful() {
|
|
635
|
+
await agenda.drain();
|
|
636
|
+
process.exit(0);
|
|
637
|
+
}
|
|
638
|
+
|
|
639
|
+
process.on("SIGTERM", graceful);
|
|
640
|
+
process.on("SIGINT", graceful);
|
|
641
|
+
```
|
|
642
|
+
|
|
614
643
|
### close(force)
|
|
615
644
|
|
|
616
645
|
Closes database connection. You don't normally have to do this, but it might be useful for testing purposes.
|
|
@@ -669,7 +698,7 @@ Specifies an `interval` on which the job should repeat. The job runs at the time
|
|
|
669
698
|
|
|
670
699
|
`options.endDate`: `Date` the job should not repeat after the endDate. The job can run on the end-date itself, but not after that.
|
|
671
700
|
|
|
672
|
-
`options.skipDays`: `
|
|
701
|
+
`options.skipDays`: `human readable string` ('2 days'). After each run, it will skip the duration of 'skipDays'
|
|
673
702
|
|
|
674
703
|
```js
|
|
675
704
|
job.repeatEvery("10 minutes");
|
package/dist/agenda/create.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Job } from "../job";
|
|
1
|
+
import { Job, JobAttributesData } from "../job";
|
|
2
2
|
import { Agenda } from ".";
|
|
3
3
|
/**
|
|
4
4
|
* Given a name and some data, create a new job
|
|
@@ -7,5 +7,5 @@ import { Agenda } from ".";
|
|
|
7
7
|
* @param name name of job
|
|
8
8
|
* @param data data to set for job
|
|
9
9
|
*/
|
|
10
|
-
export declare const create: (this: Agenda, name: string, data:
|
|
10
|
+
export declare const create: <T extends JobAttributesData>(this: Agenda, name: string, data: T) => Job;
|
|
11
11
|
//# sourceMappingURL=create.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../lib/agenda/create.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../lib/agenda/create.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAI3B;;;;;;GAMG;AACH,eAAO,MAAM,MAAM,sCAAgD,MAAM,QAAQ,MAAM,cAAY,GAQlG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../lib/agenda/create.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../lib/agenda/create.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAmC;AACnC,gCAAgD;AAGhD,MAAM,KAAK,GAAG,eAAc,CAAC,eAAe,CAAC,CAAC;AAE9C;;;;;;GAMG;AACI,MAAM,MAAM,GAAG,UAAqD,IAAY,EAAE,IAAO;IAC9F,KAAK,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;QACtC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ;QAClC,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,gBAAgB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;IAC5G,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9F,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AARW,QAAA,MAAM,UAQjB"}
|
package/dist/agenda/define.d.ts
CHANGED
|
@@ -31,7 +31,7 @@ export interface DefineOptions {
|
|
|
31
31
|
*/
|
|
32
32
|
shouldSaveResult?: boolean;
|
|
33
33
|
}
|
|
34
|
-
export declare type Processor = ((job: Job) => Promise<void>) | ((job: Job
|
|
34
|
+
export declare type Processor<T> = ((job: Job<T>) => Promise<void>) | ((job: Job<T>, done: () => void) => void);
|
|
35
35
|
/**
|
|
36
36
|
* Setup definition for job
|
|
37
37
|
* Method is used by consumers of lib to setup their functions
|
|
@@ -41,5 +41,5 @@ export declare type Processor = ((job: Job) => Promise<void>) | ((job: Job, done
|
|
|
41
41
|
* @param options options for job to run
|
|
42
42
|
* @param [processor] function to be called to run actual job
|
|
43
43
|
*/
|
|
44
|
-
export declare const define: (this: Agenda, name: string, options: DefineOptions | Processor
|
|
44
|
+
export declare const define: <T>(this: Agenda, name: string, options: DefineOptions | Processor<T>, processor?: Processor<T> | undefined) => void;
|
|
45
45
|
//# sourceMappingURL=define.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../lib/agenda/define.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAI7B,oBAAY,WAAW;IACrB,OAAO,KAAK;IACZ,IAAI,KAAK;IACT,MAAM,IAAI;IACV,GAAG,MAAM;IACT,MAAM,MAAM;CACb;AAED,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,oBAAY,SAAS,
|
|
1
|
+
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../lib/agenda/define.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAI7B,oBAAY,WAAW;IACrB,OAAO,KAAK;IACZ,IAAI,KAAK;IACT,MAAM,IAAI;IACV,GAAG,MAAM;IACT,MAAM,MAAM;CACb;AAED,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,oBAAY,SAAS,CAAC,CAAC,IACnB,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAChC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC,CAAC;AAE9C;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,YACX,MAAM,QACN,MAAM,kFAGX,IAuBF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../lib/agenda/define.ts"],"names":[],"mappings":";;;;;;AACA,kDAAmC;AAGnC,MAAM,KAAK,GAAG,eAAc,CAAC,eAAe,CAAC,CAAC;AAE9C,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,oDAAY,CAAA;IACZ,8CAAS,CAAA;IACT,iDAAU,CAAA;IACV,6CAAS,CAAA;IACT,mDAAY,CAAA;AACd,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAmCD;;;;;;;;GAQG;AACI,MAAM,MAAM,GAAG,UAEpB,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../lib/agenda/define.ts"],"names":[],"mappings":";;;;;;AACA,kDAAmC;AAGnC,MAAM,KAAK,GAAG,eAAc,CAAC,eAAe,CAAC,CAAC;AAE9C,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,oDAAY,CAAA;IACZ,8CAAS,CAAA;IACT,iDAAU,CAAA;IACV,6CAAS,CAAA;IACT,mDAAY,CAAA;AACd,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAmCD;;;;;;;;GAQG;AACI,MAAM,MAAM,GAAG,UAEpB,IAAY,EACZ,OAAqC,EACrC,SAAwB;IAExB,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,SAAS,GAAG,OAAuB,CAAC;QACpC,OAAO,GAAG,EAAE,CAAC;KACd;IAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG;QACxB,EAAE,EAAE,SAAS;QACb,WAAW,EACR,OAAyB,CAAC,WAAW,IAAI,IAAI,CAAC,mBAAmB;QACpE,SAAS,EAAG,OAAyB,CAAC,SAAS,IAAI,IAAI,CAAC,iBAAiB;QACzE,QAAQ,EAAG,OAAyB,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM;QACnE,YAAY,EACT,OAAyB,CAAC,YAAY,IAAI,IAAI,CAAC,oBAAoB;QACtE,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;QACT,gBAAgB,EAAG,OAAyB,CAAC,gBAAgB,IAAI,KAAK;KACvE,CAAC;IACF,KAAK,CACH,+CAA+C,EAC/C,IAAI,EACJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CACxB,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,MAAM,UA4BjB"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Agenda } from ".";
|
|
2
|
+
/**
|
|
3
|
+
* Clear the interval that processes the jobs
|
|
4
|
+
* @name Agenda#drain
|
|
5
|
+
* @function
|
|
6
|
+
* @returns resolves when all running jobs completes
|
|
7
|
+
*/
|
|
8
|
+
export declare const drain: (this: Agenda) => Promise<void>;
|
|
9
|
+
//# sourceMappingURL=drain.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drain.d.ts","sourceRoot":"","sources":["../../lib/agenda/drain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAI3B;;;;;GAKG;AACH,eAAO,MAAM,KAAK,SAAyB,MAAM,KAAG,QAAQ,IAAI,CAkB/D,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.drain = void 0;
|
|
16
|
+
const debug_1 = __importDefault(require("debug"));
|
|
17
|
+
const debug = debug_1.default("agenda:drain");
|
|
18
|
+
/**
|
|
19
|
+
* Clear the interval that processes the jobs
|
|
20
|
+
* @name Agenda#drain
|
|
21
|
+
* @function
|
|
22
|
+
* @returns resolves when all running jobs completes
|
|
23
|
+
*/
|
|
24
|
+
const drain = function () {
|
|
25
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
26
|
+
return new Promise((resolve) => {
|
|
27
|
+
debug("Agenda.drain called, clearing interval for processJobs()");
|
|
28
|
+
clearInterval(this._processInterval);
|
|
29
|
+
this._processInterval = undefined;
|
|
30
|
+
if (this._runningJobs.length === 0) {
|
|
31
|
+
resolve();
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
debug("Agenda.drain waiting for jobs to finish");
|
|
35
|
+
this.on('complete', () => {
|
|
36
|
+
// running jobs are removed after the event
|
|
37
|
+
if (this._runningJobs.length === 1) {
|
|
38
|
+
resolve();
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
exports.drain = drain;
|
|
46
|
+
//# sourceMappingURL=drain.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drain.js","sourceRoot":"","sources":["../../lib/agenda/drain.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAGnC,MAAM,KAAK,GAAG,eAAc,CAAC,cAAc,CAAC,CAAC;AAE7C;;;;;GAKG;AACI,MAAM,KAAK,GAAG;;QACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAClE,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACrC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAElC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChC,OAAO,EAAE,CAAC;aACb;iBAAM;gBACH,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBACjD,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;oBACrB,2CAA2C;oBAC3C,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;wBAChC,OAAO,EAAE,CAAC;qBACb;gBACL,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAAA,CAAC;AAlBW,QAAA,KAAK,SAkBhB"}
|
package/dist/agenda/every.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Agenda } from ".";
|
|
2
|
+
import { JobAttributesData } from "../job";
|
|
2
3
|
import { JobOptions } from "../job/repeat-every";
|
|
3
4
|
/**
|
|
4
5
|
* Creates a scheduled job with given interval and name/names of the job to run
|
|
@@ -10,5 +11,5 @@ import { JobOptions } from "../job/repeat-every";
|
|
|
10
11
|
* @param options - options to run job for
|
|
11
12
|
* @returns Job/s created. Resolves when schedule fails or passes
|
|
12
13
|
*/
|
|
13
|
-
export declare const every: (this: Agenda, interval: string, names: string | string[], data?:
|
|
14
|
+
export declare const every: <T extends JobAttributesData>(this: Agenda, interval: string, names: string | string[], data?: T | undefined, options?: JobOptions | undefined) => Promise<any>;
|
|
14
15
|
//# sourceMappingURL=every.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"every.d.ts","sourceRoot":"","sources":["../../lib/agenda/every.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"every.d.ts","sourceRoot":"","sources":["../../lib/agenda/every.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAO,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD;;;;;;;;;GASG;AACH,eAAO,MAAM,KAAK,sCACV,MAAM,YACF,MAAM,SACT,MAAM,GAAG,MAAM,EAAE,6DAGvB,QAAQ,GAAG,CA8Db,CAAC"}
|
package/dist/agenda/every.js
CHANGED
|
@@ -36,7 +36,7 @@ const every = function (interval, names, data, options) {
|
|
|
36
36
|
* @returns instance of job
|
|
37
37
|
*/
|
|
38
38
|
const createJob = (interval, name, data, options) => __awaiter(this, void 0, void 0, function* () {
|
|
39
|
-
const job = this.create(name, data);
|
|
39
|
+
const job = this.create(name, data || {});
|
|
40
40
|
job.attrs.type = "single";
|
|
41
41
|
job.repeatEvery(interval, options);
|
|
42
42
|
return job.save();
|
package/dist/agenda/every.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"every.js","sourceRoot":"","sources":["../../lib/agenda/every.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAKnC,MAAM,KAAK,GAAG,eAAc,CAAC,cAAc,CAAC,CAAC;AAE7C;;;;;;;;;GASG;AACI,MAAM,KAAK,GAAG,UAEnB,QAAgB,EAChB,KAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"every.js","sourceRoot":"","sources":["../../lib/agenda/every.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAKnC,MAAM,KAAK,GAAG,eAAc,CAAC,cAAc,CAAC,CAAC;AAE7C;;;;;;;;;GASG;AACI,MAAM,KAAK,GAAG,UAEnB,QAAgB,EAChB,KAAwB,EACxB,IAAQ,EACR,OAAoB;;QAEpB;;;;;;;WAOG;QACH,MAAM,SAAS,GAAG,CAChB,QAAgB,EAChB,IAAY,EACZ,IAAQ,EACR,OAAoB,EACN,EAAE;YAChB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;YAE1C,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACnC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;QACpB,CAAC,CAAA,CAAC;QAEF;;;;;;;WAOG;QACH,MAAM,UAAU,GAAG,CACjB,QAAgB,EAChB,KAAe,EACf,IAAQ,EACR,OAAoB,EACQ,EAAE;YAC9B,IAAI;gBACF,MAAM,IAAI,GAAwB,EAAE,CAAC;gBACrC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;gBAEzE,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAElD,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC1B;YAAC,OAAO,KAAK,EAAE;gBACd,2BAA2B;gBAC3B,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;aACnE;QACH,CAAC,CAAA,CAAC;QAEF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAE7D,OAAO,IAAI,CAAC;SACb;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAE9D,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CAAA,CAAC;AApEW,QAAA,KAAK,SAoEhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-lock-next-job.d.ts","sourceRoot":"","sources":["../../lib/agenda/find-and-lock-next-job.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"find-and-lock-next-job.d.ts","sourceRoot":"","sources":["../../lib/agenda/find-and-lock-next-job.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAK7B;;;;;;;;GAQG;AACH,eAAO,MAAM,kBAAkB,SACvB,MAAM,WACH,MAAM,cACH,GAAG,KACd,QAAQ,GAAG,GAAG,SAAS,CAwDzB,CAAC"}
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.findAndLockNextJob = void 0;
|
|
16
16
|
const debug_1 = __importDefault(require("debug"));
|
|
17
17
|
const utils_1 = require("../utils");
|
|
18
|
+
const mongodb_1 = require("mongodb");
|
|
18
19
|
const debug = debug_1.default("agenda:internal:_findAndLockNextJob");
|
|
19
20
|
/**
|
|
20
21
|
* Find and lock jobs
|
|
@@ -58,11 +59,9 @@ const findAndLockNextJob = function (jobName, definition) {
|
|
|
58
59
|
* Query used to affect what gets returned
|
|
59
60
|
* @type {{returnOriginal: boolean, sort: object}}
|
|
60
61
|
*/
|
|
61
|
-
const JOB_RETURN_QUERY = { returnDocument:
|
|
62
|
+
const JOB_RETURN_QUERY = { returnDocument: mongodb_1.ReturnDocument.AFTER, sort: this._sort };
|
|
62
63
|
// Find ONE and ONLY ONE job and set the 'lockedAt' time so that job begins to be processed
|
|
63
|
-
const result = yield this._collection.findOneAndUpdate(JOB_PROCESS_WHERE_QUERY, JOB_PROCESS_SET_QUERY,
|
|
64
|
-
// @ts-ignore
|
|
65
|
-
JOB_RETURN_QUERY);
|
|
64
|
+
const result = yield this._collection.findOneAndUpdate(JOB_PROCESS_WHERE_QUERY, JOB_PROCESS_SET_QUERY, JOB_RETURN_QUERY);
|
|
66
65
|
let job = undefined;
|
|
67
66
|
if (result.value) {
|
|
68
67
|
debug("found a job available to lock, creating a new job on Agenda with id [%s]", result.value._id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-and-lock-next-job.js","sourceRoot":"","sources":["../../lib/agenda/find-and-lock-next-job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,oCAAqC;
|
|
1
|
+
{"version":3,"file":"find-and-lock-next-job.js","sourceRoot":"","sources":["../../lib/agenda/find-and-lock-next-job.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,oCAAqC;AAGrC,qCAAyC;AAEzC,MAAM,KAAK,GAAG,eAAc,CAAC,qCAAqC,CAAC,CAAC;AAEpE;;;;;;;;GAQG;AACI,MAAM,kBAAkB,GAAG,UAEhC,OAAe,EACf,UAAe;;QAEf,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;QAC9E,KAAK,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,uBAAuB,GAAG;YAC9B,IAAI,EAAE;gBACJ;oBACE,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACxB;gBACD;oBACE,GAAG,EAAE;wBACH;4BACE,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;4BACvB,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;yBACtC;wBACD;4BACE,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;yBACjC;qBACF;iBACF;aACF;SACF,CAAC;QAEF;;;WAGG;QACH,MAAM,qBAAqB,GAAG,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC;QAE1D;;;WAGG;QACH,MAAM,gBAAgB,GAAG,EAAE,cAAc,EAAE,wBAAc,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;QAEpF,2FAA2F;QAC3F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CACpD,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,CACjB,CAAC;QAEF,IAAI,GAAG,GAAoB,SAAS,CAAC;QACrC,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,CACH,0EAA0E,EAC1E,MAAM,CAAC,KAAK,CAAC,GAAG,CACjB,CAAC;YAEF,aAAa;YACb,GAAG,GAAG,iBAAS,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;SACrC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA,CAAC;AA5DW,QAAA,kBAAkB,sBA4D7B"}
|
package/dist/agenda/index.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ import { schedule } from "./schedule";
|
|
|
28
28
|
import { sort } from "./sort";
|
|
29
29
|
import { start } from "./start";
|
|
30
30
|
import { stop } from "./stop";
|
|
31
|
+
import { drain } from './drain';
|
|
31
32
|
export interface AgendaConfig {
|
|
32
33
|
name?: string;
|
|
33
34
|
processEvery?: string;
|
|
@@ -117,6 +118,7 @@ declare class Agenda extends EventEmitter {
|
|
|
117
118
|
sort: typeof sort;
|
|
118
119
|
start: typeof start;
|
|
119
120
|
stop: typeof stop;
|
|
121
|
+
drain: typeof drain;
|
|
120
122
|
/**
|
|
121
123
|
* Constructs a new Agenda object.
|
|
122
124
|
* @param config Optional configuration to initialize the Agenda.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/agenda/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EACL,QAAQ,EACR,UAAU,EACV,EAAE,IAAI,OAAO,EACb,WAAW,EACX,kBAAkB,EACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/agenda/index.ts"],"names":[],"mappings":"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"}
|
package/dist/agenda/index.js
CHANGED
|
@@ -33,6 +33,7 @@ const schedule_1 = require("./schedule");
|
|
|
33
33
|
const sort_1 = require("./sort");
|
|
34
34
|
const start_1 = require("./start");
|
|
35
35
|
const stop_1 = require("./stop");
|
|
36
|
+
const drain_1 = require("./drain");
|
|
36
37
|
/**
|
|
37
38
|
* @class Agenda
|
|
38
39
|
* @param {Object} config - Agenda Config
|
|
@@ -123,4 +124,5 @@ Agenda.prototype.schedule = schedule_1.schedule;
|
|
|
123
124
|
Agenda.prototype.sort = sort_1.sort;
|
|
124
125
|
Agenda.prototype.start = start_1.start;
|
|
125
126
|
Agenda.prototype.stop = stop_1.stop;
|
|
127
|
+
Agenda.prototype.drain = drain_1.drain;
|
|
126
128
|
//# sourceMappingURL=index.js.map
|
package/dist/agenda/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/agenda/index.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAsC;AACtC,oEAA2C;AAS3C,qCAAkC;AAClC,mCAAgC;AAChC,qCAAkC;AAClC,yCAAsC;AACtC,uCAAmC;AACnC,+DAA2D;AAC3D,mEAA8D;AAC9D,6DAAwD;AACxD,qCAAkC;AAClC,uCAAoC;AACpC,qCAAkC;AAClC,mCAAgC;AAChC,qEAA8D;AAC9D,iEAA4D;AAC5D,iCAA8B;AAC9B,6CAAyC;AACzC,uDAAmD;AACnD,mCAAgC;AAChC,iCAA8B;AAC9B,+BAA4B;AAC5B,mDAA+C;AAC/C,mCAAgC;AAChC,yCAAqC;AACrC,yCAAsC;AACtC,iCAA8B;AAC9B,mCAAgC;AAChC,iCAA8B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/agenda/index.ts"],"names":[],"mappings":"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"}
|
package/dist/agenda/now.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Agenda } from ".";
|
|
2
|
-
import { Job } from "../job";
|
|
2
|
+
import { Job, JobAttributesData } from "../job";
|
|
3
3
|
/**
|
|
4
4
|
* Create a job for this exact moment
|
|
5
5
|
* @name Agenda#now
|
|
@@ -7,5 +7,5 @@ import { Job } from "../job";
|
|
|
7
7
|
* @param name name of job to schedule
|
|
8
8
|
* @param data data to pass to job
|
|
9
9
|
*/
|
|
10
|
-
export declare const now: (this: Agenda, name: string, data:
|
|
10
|
+
export declare const now: <T extends JobAttributesData>(this: Agenda, name: string, data: T) => Promise<Job>;
|
|
11
11
|
//# sourceMappingURL=now.d.ts.map
|
package/dist/agenda/now.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"now.d.ts","sourceRoot":"","sources":["../../lib/agenda/now.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"now.d.ts","sourceRoot":"","sources":["../../lib/agenda/now.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAIhD;;;;;;GAMG;AACH,eAAO,MAAM,GAAG,sCACR,MAAM,QACN,MAAM,cAEX,QAAQ,GAAG,CAab,CAAC"}
|
package/dist/agenda/now.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"now.js","sourceRoot":"","sources":["../../lib/agenda/now.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAInC,MAAM,KAAK,GAAG,eAAc,CAAC,YAAY,CAAC,CAAC;AAE3C;;;;;;GAMG;AACI,MAAM,GAAG,GAAG,UAEjB,IAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"now.js","sourceRoot":"","sources":["../../lib/agenda/now.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAInC,MAAM,KAAK,GAAG,eAAc,CAAC,YAAY,CAAC,CAAC;AAE3C;;;;;;GAMG;AACI,MAAM,GAAG,GAAG,UAEjB,IAAY,EACZ,IAAO;;QAEP,KAAK,CAAC,0BAA0B,EAAE,IAAI,CAAC,CAAC;QACxC,IAAI;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAEpC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACzB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAEjB,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,oDAAoD,CAAC,CAAC;YAC5D,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAAA,CAAC;AAjBW,QAAA,GAAG,OAiBd"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Agenda } from ".";
|
|
2
|
-
import { Job } from "../job";
|
|
2
|
+
import { Job, JobAttributesData } from "../job";
|
|
3
3
|
/**
|
|
4
4
|
* Schedule a job or jobs at a specific time
|
|
5
5
|
* @name Agenda#schedule
|
|
@@ -9,6 +9,6 @@ import { Job } from "../job";
|
|
|
9
9
|
* @param data data to send to job
|
|
10
10
|
* @returns job or jobs created
|
|
11
11
|
*/
|
|
12
|
-
export declare function schedule(this: Agenda, when: string | Date, names: string, data:
|
|
13
|
-
export declare function schedule(this: Agenda, when: string | Date, names: string[], data:
|
|
12
|
+
export declare function schedule<T extends JobAttributesData>(this: Agenda, when: string | Date, names: string, data: T): Promise<Job>;
|
|
13
|
+
export declare function schedule<T extends JobAttributesData>(this: Agenda, when: string | Date, names: string[], data: T): Promise<Job[]>;
|
|
14
14
|
//# sourceMappingURL=schedule.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../lib/agenda/schedule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../lib/agenda/schedule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAIhD;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAC/H,wBAAgB,QAAQ,CAAC,CAAC,SAAS,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../lib/agenda/schedule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAInC,MAAM,KAAK,GAAG,eAAc,CAAC,iBAAiB,CAAC,CAAC;AAahD,SAAgB,QAAQ,CAEtB,IAAmB,EACnB,KAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../lib/agenda/schedule.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAmC;AAInC,MAAM,KAAK,GAAG,eAAc,CAAC,iBAAiB,CAAC,CAAC;AAahD,SAAgB,QAAQ,CAEtB,IAAmB,EACnB,KAAwB,EACxB,IAAO;IAEP;;;;;;OAMG;IACH,MAAM,SAAS,GAAG,CAChB,IAAmB,EACnB,IAAY,EACZ,IAAS,EACK,EAAE;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEpC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAEhC,OAAO,GAAG,CAAC;IACb,CAAC,CAAA,CAAC;IAEF;;;;;;OAMG;IACH,MAAM,UAAU,GAAG,CACjB,IAAmB,EACnB,KAAe,EACf,IAAS,EACO,EAAE;QAClB,IAAI;YACF,MAAM,aAAa,GAAwB,EAAE,CAAC;YAC9C,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;YACrE,KAAK,CAAC,kEAAkE,CAAC,CAAC;YAC1E,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;SACnC;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CACH,2EAA2E,CAC5E,CAAC;YACF,MAAM,KAAK,CAAC;SACb;IACH,CAAC,CAAA,CAAC;IAEF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,KAAK,CAAC,mCAAmC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;KACrC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,KAAK,CAAC,+BAA+B,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACpD,OAAO,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;KACtC;IAED,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAA;AAChE,CAAC;AA7DD,4BA6DC;AAAA,CAAC"}
|
|
@@ -75,7 +75,7 @@ const computeNextRunAt = function () {
|
|
|
75
75
|
// If start date is present, check if the nextDate should be larger or equal to startDate. If not set startDate as nextDate
|
|
76
76
|
if (startDate) {
|
|
77
77
|
startDate = moment_timezone_1.default
|
|
78
|
-
.tz(moment_timezone_1.default(startDate).format("YYYY-MM-DD"), timezone)
|
|
78
|
+
.tz(moment_timezone_1.default(startDate).format("YYYY-MM-DD HH:mm"), timezone)
|
|
79
79
|
.toDate();
|
|
80
80
|
if (startDate > nextDate) {
|
|
81
81
|
cronOptions.currentDate = startDate;
|
|
@@ -93,7 +93,7 @@ const computeNextRunAt = function () {
|
|
|
93
93
|
// If endDate is less than the nextDate, set nextDate to null to stop the job from running further
|
|
94
94
|
if (endDate) {
|
|
95
95
|
const endDateDate = moment_timezone_1.default
|
|
96
|
-
.tz(moment_timezone_1.default(endDate).format("YYYY-MM-DD"), timezone)
|
|
96
|
+
.tz(moment_timezone_1.default(endDate).format("YYYY-MM-DD HH:mm"), timezone)
|
|
97
97
|
.toDate();
|
|
98
98
|
if (nextDate > endDateDate) {
|
|
99
99
|
nextDate = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-next-run-at.js","sourceRoot":"","sources":["../../lib/job/compute-next-run-at.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAsC;AACtC,oEAA2C;AAC3C,kDAAmC;AACnC,sEAAqC;AACrC,mBAAmB;AACnB,sDAA2B;AAE3B,MAAM,KAAK,GAAG,eAAc,CAAC,YAAY,CAAC,CAAC;AAE3C;;;;GAIG;AACI,MAAM,gBAAgB,GAAG;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;IAC3C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;IAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEjC,MAAM,eAAe,GAAG,CAAC,IAAU,EAAiB,EAAE;QACpD,MAAM,KAAK,GAAkB,yBAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACZ,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;SACpB;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,mBAAmB,GAAG,GAAG,EAAE;;QAC/B,KAAK,CACH,8CAA8C,EAC9C,IAAI,CAAC,KAAK,CAAC,IAAI,EACf,IAAI,CAAC,KAAK,CAAC,GAAG,EACd,QAAQ,CACT,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAC3B,IAAI,OAAO,GAAS,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC;QACpD,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAClD,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAClD,IAAI,QAAQ,EAAE;YACZ,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC;SAC3B;QAED,IAAI;YACF,IAAI,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,QAAS,EAAE,WAAW,CAAC,CAAC;YAC9D,IAAI,QAAQ,GAAgB,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YACrD,IACE,QAAQ,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE;gBACxC,QAAQ,CAAC,OAAO,EAAE,IAAI,iBAAiB,CAAC,OAAO,EAAE,EACjD;gBACA,kEAAkE;gBAClE,WAAW,CAAC,WAAW,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC7D,QAAQ,GAAG,MAAM,CAAC,eAAe,CAAC,QAAS,EAAE,WAAW,CAAC,CAAC;gBAC1D,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;aACrC;YAED,2HAA2H;YAC3H,IAAI,SAAS,EAAE;gBACb,SAAS,GAAG,yBAAM;qBACf,EAAE,CAAC,yBAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"compute-next-run-at.js","sourceRoot":"","sources":["../../lib/job/compute-next-run-at.ts"],"names":[],"mappings":"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"}
|
package/dist/job/index.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ import { touch } from "./touch";
|
|
|
16
16
|
import { setShouldSaveResult } from "./set-shouldsaveresult";
|
|
17
17
|
import { Agenda } from "../agenda";
|
|
18
18
|
import * as mongodb from "mongodb";
|
|
19
|
+
declare type Modify<T, R> = Omit<T, keyof R> & R;
|
|
19
20
|
export interface JobAttributesData {
|
|
20
21
|
[key: string]: any;
|
|
21
22
|
}
|
|
@@ -23,7 +24,7 @@ export interface JobAttributes<T extends JobAttributesData = JobAttributesData>
|
|
|
23
24
|
/**
|
|
24
25
|
* The record identity.
|
|
25
26
|
*/
|
|
26
|
-
_id
|
|
27
|
+
_id: mongodb.ObjectId;
|
|
27
28
|
agenda: Agenda;
|
|
28
29
|
/**
|
|
29
30
|
* The type of the job (single|normal).
|
|
@@ -52,7 +53,7 @@ export interface JobAttributes<T extends JobAttributesData = JobAttributesData>
|
|
|
52
53
|
/**
|
|
53
54
|
* The job details.
|
|
54
55
|
*/
|
|
55
|
-
data
|
|
56
|
+
data: T;
|
|
56
57
|
unique?: any;
|
|
57
58
|
uniqueOpts?: {
|
|
58
59
|
insertOnly: boolean;
|
|
@@ -133,7 +134,9 @@ declare class Job<T extends JobAttributesData = JobAttributesData> {
|
|
|
133
134
|
remove: typeof remove;
|
|
134
135
|
touch: typeof touch;
|
|
135
136
|
setShouldSaveResult: typeof setShouldSaveResult;
|
|
136
|
-
constructor(options: JobAttributes<T
|
|
137
|
+
constructor(options: Modify<JobAttributes<T>, {
|
|
138
|
+
_id?: mongodb.ObjectId;
|
|
139
|
+
}>);
|
|
137
140
|
}
|
|
138
141
|
export { Job };
|
|
139
142
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/job/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/job/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,iBAAiB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AACD,MAAM,WAAW,aAAa,CAC5B,CAAC,SAAS,iBAAiB,GAAG,iBAAiB;IAE/C;;OAEG;IACH,GAAG,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/job/index.ts"],"names":[],"mappings":"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"}
|
package/dist/job/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/job/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAAmC;AACnC,+DAAyD;AACzD,iDAA6C;AAC7C,2CAAuC;AACvC,uCAAoC;AACpC,qCAAkC;AAClC,qCAAkC;AAClC,yCAAsC;AACtC,yCAAsC;AACtC,iCAA8B;AAC9B,+BAA4B;AAC5B,6CAAyC;AACzC,iCAA8B;AAC9B,qCAAkC;AAClC,mCAAgC;AAChC,iEAA6D;AAC7D,oCAAyC;AAEzC,6CAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/job/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAAmC;AACnC,+DAAyD;AACzD,iDAA6C;AAC7C,2CAAuC;AACvC,uCAAoC;AACpC,qCAAkC;AAClC,qCAAkC;AAClC,yCAAsC;AACtC,yCAAsC;AACtC,iCAA8B;AAC9B,+BAA4B;AAC5B,6CAAyC;AACzC,iCAA8B;AAC9B,qCAAkC;AAClC,mCAAgC;AAChC,iEAA6D;AAC7D,oCAAyC;AAEzC,6CAA+C;AAmH/C;;;;;GAKG;AACH,MAAM,GAAG;IA4BP,YAAY,OAA8D;QACxE,MAAM,KAAuC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,EAApD,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAA2B,EAAtB,IAAI,cAAlC,+BAAoC,CAAgB,CAAC;QAE3D,uBAAuB;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,eAAe;QACf,IAAI,CAAC,QAAQ;YACX,IAAI,CAAC,QAAQ,KAAK,SAAS;gBACzB,CAAC,CAAC,oBAAW,CAAC,MAAM;gBACpB,CAAC,CAAC,qBAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEnC,8BAA8B;QAC9B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,KAAK,CAAA;QAEtD,oBAAoB;QACpB,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBACrC,mBAAmB;gBACnB,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;aACxB;SACF;QAED,4BAA4B;QAC5B,IAAI,CAAC,KAAK,mCACL,KAAK;YACR,oFAAoF;YACpF,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,EACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,IAAI,EAAE,IAAI,IAAI,MAAM,EACpB,SAAS,EAAE,SAAS,IAAI,IAAI,IAAI,EAAE,GACnC,CAAC;IACJ,CAAC;CACF;AAmBQ,kBAAG;AAjBZ,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,gBAAM,CAAC;AAC9B,GAAG,CAAC,SAAS,CAAC,gBAAgB,GAAG,sCAAgB,CAAC;AAClD,GAAG,CAAC,SAAS,CAAC,WAAW,GAAG,0BAAW,CAAC;AACxC,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,oBAAQ,CAAC;AAClC,GAAG,CAAC,SAAS,CAAC,OAAO,GAAG,iBAAO,CAAC;AAChC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,eAAM,CAAC;AAC9B,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,eAAM,CAAC;AAC9B,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,mBAAQ,CAAC;AAClC,GAAG,CAAC,SAAS,CAAC,QAAQ,GAAG,mBAAQ,CAAC;AAClC,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,WAAI,CAAC;AAC1B,GAAG,CAAC,SAAS,CAAC,GAAG,GAAG,SAAG,CAAC;AACxB,GAAG,CAAC,SAAS,CAAC,SAAS,GAAG,sBAAS,CAAC;AACpC,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,WAAI,CAAC;AAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,eAAM,CAAC;AAC9B,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,aAAK,CAAC;AAC5B,GAAG,CAAC,SAAS,CAAC,mBAAmB,GAAG,0CAAmB,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Agenda } from ".";
|
|
2
|
+
import createDebugger from "debug";
|
|
3
|
+
import { Document, Filter } from "mongodb";
|
|
4
|
+
|
|
5
|
+
const debug = createDebugger("agenda:cancel");
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Cancels any jobs matching the passed MongoDB query, and removes them from the database.
|
|
9
|
+
* @name Agenda#cancel
|
|
10
|
+
* @function
|
|
11
|
+
* @param query MongoDB query to use when cancelling
|
|
12
|
+
* @caller client code, Agenda.purge(), Job.remove()
|
|
13
|
+
*/
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
15
|
+
export const cancel = async function (
|
|
16
|
+
this: Agenda,
|
|
17
|
+
query: Filter<Document>
|
|
18
|
+
): Promise<number | undefined> {
|
|
19
|
+
debug("attempting to cancel all Agenda jobs", query);
|
|
20
|
+
try {
|
|
21
|
+
const { deletedCount } = await this._collection.deleteMany(query);
|
|
22
|
+
debug("%s jobs cancelled", deletedCount);
|
|
23
|
+
return deletedCount;
|
|
24
|
+
} catch (error) {
|
|
25
|
+
debug("error trying to delete jobs from MongoDB");
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
28
|
+
};
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { Agenda } from ".";
|
|
2
|
+
import createDebugger from "debug";
|
|
3
|
+
|
|
4
|
+
const debug = createDebugger("agenda:close");
|
|
5
|
+
|
|
6
|
+
/** Close the db and it's underlying connections
|
|
7
|
+
* Only works if agenda was instantiated without preconfigured mongoDb instance.
|
|
8
|
+
* If the mongoDb instance was supplied during instantiation or via agenda.mongo, this function will do nothing and return agenda anyway.
|
|
9
|
+
* @name Agenda#close
|
|
10
|
+
* @function
|
|
11
|
+
* @param [option] {{ force: boolean }} Force close, emitting no events
|
|
12
|
+
*
|
|
13
|
+
*
|
|
14
|
+
* @caller client code
|
|
15
|
+
*
|
|
16
|
+
* @link https://mongodb.github.io/node-mongodb-native/2.0/api/Db.html#close
|
|
17
|
+
*/
|
|
18
|
+
export const close = async function (
|
|
19
|
+
this: Agenda,
|
|
20
|
+
option?: { force: boolean }
|
|
21
|
+
): Promise<Agenda> {
|
|
22
|
+
debug("close db connection for this agenda instance");
|
|
23
|
+
const closeOptions = {
|
|
24
|
+
force: false,
|
|
25
|
+
...option,
|
|
26
|
+
};
|
|
27
|
+
try {
|
|
28
|
+
if (this._db) {
|
|
29
|
+
await this._db.close(closeOptions.force);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return this;
|
|
33
|
+
} catch (error) {
|
|
34
|
+
debug("error trying to close db connection to");
|
|
35
|
+
throw error;
|
|
36
|
+
}
|
|
37
|
+
};
|