Queue +interval

Author: Dmitry Ovsyanko

__tests__/Queue.js

@@ -17,6 +17,17 @@ const app = new Application ({
 	logger
 })
 
+test ('bad', async () => {
+
+	expect (() => new Queue (app, {name: 'qx', cron: 1})).toThrow ('type')
+	expect (() => new Queue (app, {name: 'qx', cron: ''})).toThrow ('nvalid')
+	expect (() => new Queue (app, {name: 'qx', interval: '10'})).toThrow ('type')
+	expect (() => new Queue (app, {name: 'qx', interval: -1})).toThrow ('nvalid')
+	expect (() => new Queue (app, {name: 'qx', interval: 2147483648})).toThrow ('nvalid')
+	expect (() => new Queue (app, {name: 'qx', cron: '* * * * * *', interval: 10})).toThrow ('exclusive')
+
+})
+
 test ('maxPending', async () => {
 
 	{
@@ -178,7 +189,7 @@ test ('cron', async () => {
 
 	process.on('exit', (code) => {
 		console.log('Process beforeExit event with code: ', code);
-	  });
+	});
 
 	const u = {id: 1}, a = [u], r = []
 
@@ -210,4 +221,42 @@ test ('cron', async () => {
 	expect (a).toHaveLength (0)
 	expect (r).toStrictEqual ([u])
 
+})
+
+test ('interval', async () => {
+
+	process.on('exit', (code) => {
+		console.log('Process beforeExit event with code: ', code);
+	});
+
+	const u = {id: 1}, a = [u], r = []
+
+	class TestQueue extends Queue {
+		async peek () {return a [0] || null}
+	}
+
+	await new Promise ((ok, fail) => {
+
+		const q = new TestQueue (app, {
+			name: 'q8',
+			request: {type: 'users'},
+			interval: 10,
+			on: {
+				end:    function () {r.push (this.result)},
+				error:  function () {fail (this.error)},
+				finish: function () {a.shift ()},
+			}
+		})
+
+		q.on ('job-next', () => {
+			if (q.pending.size === 0) ok ()
+		})
+
+	})
+
+	app.emit ('finish')
+
+	expect (a).toHaveLength (0)
+	expect (r).toStrictEqual ([u])
+
 })

lib/Queue.js

@@ -7,19 +7,41 @@ class Queue extends JobSource {
 
 		if (!('maxPending' in o)) o.maxPending = 1
 
+		const {cron, interval} = o
+
+		if (cron != null) {
+
+			const t = typeof cron; if (t !== 'string') throw new Error (`Invalid cron type: '${t}' (expected 'string')`)
+
+			if (!cron) throw new Error (`Invalid cron option`)
+
+		}
+
+		if (interval != null) {
+
+			const t = typeof interval; if (t !== 'number') throw new Error (`Invalid interval type: '${t}' (expected 'number')`)
+
+			if (!Number.isSafeInteger || interval < 1 || interval > 2147483647) throw new Error (`Invalid interval value: ${interval}`)
+
+		}
+
+		if (cron && interval) throw new Error (`'cron' and 'interval' options are mutually exclusive`)
+
 		super (app, o)
 
 		this.isStopped = false
 
-		if ('cron' in o) this.cron = new Cron (o.cron, {}, () => this.check ())
+		if (cron)     this.cron     = new Cron (o.cron, {}, () => this.check ())
+
+		if (interval) this.interval = setInterval (() => this.check (), interval)
 
 		app.once ('finish', () => this.stop ())
 
 	}
 
 	stop () {
 
-		if ('cron' in this) this.cron.stop ()
+		if ('interval' in this) clearInterval (this.interval); else if ('cron' in this) this.cron.stop ()
 
         this.app.jobSources.delete (this.name)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "doix",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "description": "A general purpose sever side framework",
   "main": "index.js",
   "files": [