4.0 beta

Author: msavin

package/package.js

@@ -1,7 +1,7 @@
 Package.describe({
 	name:    "msavin:sjobs",
 	summary: "The simple jobs queue that just works [synced, schedule, tasks, background, later, worker, cron]",
-	version: "3.2.0",
+	version: "4.0.0",
 	documentation: "README.md",
 	git:     "https://github.com/msavin/SteveJobs.git",
 });
@@ -11,4 +11,4 @@ Package.onUse(function(api) {
 	api.use(["mongo", "random", "ecmascript", "check"], "server");
 	api.mainModule("server/api.js", "server");
 	api.export(["Jobs", "JobsInternal"]);
-});
+});

package/server/api.js

@@ -54,14 +54,30 @@ Jobs.register = function (jobs) {
 Jobs.run = function () {
 	check(arguments[0], String)
 
-	if (Utilities.registry.data[arguments[0]]) {
+	var lastArg = arguments[arguments.length - 1];
+	var remote = typeof lastArg === "object" && lastArg.remote ;
+
+	if (Utilities.registry.data[arguments[0]] || remote) {
 		return Actions.add.apply(null, arguments);
 	} else {
 		Utilities.logger("invalid job name: " + arguments[0] || "not specified");
 		return false;
 	}
 }
 
+// Update / manage a job even though it has not run
+
+Jobs.manage = function () {
+	check(arguments[0], String)
+
+	if (Utilities.registry.data[arguments[0]]) {
+		return Actions.manage.apply(null, arguments);
+	} else {
+		Utilities.logger("invalid job name: " + arguments[0] || "not specified");
+		return false;
+	}
+}
+
 // Cancel a job without removing it from MongoDB
 
 Jobs.cancel = function (jobId) {

package/server/imports/actions/add/index.js

@@ -1,12 +1,11 @@
 import { Utilities } from "../../utilities"
-import { processArguments } from "./processArguments.js"
 
 var add = function () {
 	// 0. Prepare variables
 	var error, result, blockAdd;
 
 	// 1. Process arguments + prepare the data
-	var input = processArguments(arguments);
+	var input = Utilities.helpers.processJobArguments(arguments);
 
 	// 2 - check if job needs to blocked from being added
 
@@ -27,7 +26,7 @@ var add = function () {
 		if (input.config && input.config.unique) {
 			var doc = Utilities.collection.findOne({
 				name: input.name,
-				arguments: input.arguments,
+				arguments: input.arguments
 			})
 
 
@@ -99,4 +98,4 @@ var add = function () {
 	return result;
 }
 
-export { add }
+export { add }

package/server/imports/actions/execute/toolbelt.js

@@ -34,6 +34,7 @@ var toolbelt = function (jobDoc) {
 		check(key, String)
 		var docId = this.document._id
 
+
 		if (getLatestFromDatabase) {
 			// Get the latest doc
 			doc = Utilities.collection.findOne(docId);
@@ -47,6 +48,86 @@ var toolbelt = function (jobDoc) {
 		return this.document.data[key] || null;
 	}
 
+	this.push = function (key, value) {
+		check(key, String)
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$push: {
+				["data." + key]: value
+			}
+		})
+
+
+	}
+
+	this.pull = function (key, value) {
+		check(key, String)
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$pull: {
+				["data." + key]: value
+			}
+		})
+	}
+
+	this.pullAll = function (key, value) {
+		check(key, String)
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$pullAll: {
+				["data." + key]: value
+			}
+		})
+	}
+
+	this.inc = function (key, value) {
+		check(key, String)
+		check(value, Number)
+		value = value || 1
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$inc: {
+				["data." + key]: value
+			}
+		})
+	}
+
+	this.dec = function (key, value) {
+		check(key, String)
+		check(value, Number)
+		value = value || 1
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$dec: {
+				["data." + key]: value
+			}
+		})
+	}
+
+	this.addToSet = function (key, value) {
+		check(key, String)
+		check(value, Number)
+		value = value || 1
+
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$addToSet: {
+				["data." + key]: value
+			}
+		})
+	}
+
 	this.success = function (result) {
 		var docId = this.document._id;
 
@@ -126,6 +207,22 @@ var toolbelt = function (jobDoc) {
 		return removeDoc;
 	}
 
+	this.clearHistory = function () {
+		var docId = this.document._id;
+
+		var update = Utilities.collection.update(docId, {
+			$set: {
+				history: [{
+					date: new Date(),
+					state: "cleared",
+					serverId: Utilities.config.getServerId()
+				}]
+			}
+		})
+
+		return update;
+	}
+
 	this.checkForResolution = function () {
 		var docId = this.document._id;
 		var queueName = this.document.name;

package/server/imports/actions/index.js

@@ -3,6 +3,7 @@ import { get } from './get'
 import { clear } from './clear'
 import { cancel } from './cancel'
 import { execute } from './execute'
+import { manage } from './manage'
 import { remove } from './remove'
 import { replicate } from './replicate'
 import { reschedule } from './reschedule'
@@ -13,6 +14,7 @@ var Actions = {
 	clear: clear,
 	cancel: cancel,
 	execute: execute,
+	manage: manage,
 	remove: remove,
 	replicate: replicate,
 	reschedule: reschedule

package/server/imports/actions/manage/index.js

@@ -0,0 +1,23 @@
+import { Utilities } from "../../utilities"
+import { process } from "./process.js"
+
+var manage = function () {
+	// First, process the arguments
+	var input = Utilities.helpers.processJobArguments(arguments);
+
+	// Second, find an active job
+	var jobDoc = Utilities.collection.findOne({
+		name: input.name,
+		arguments: input.arguments,
+		state: {
+			$in: ["pending", "failure"]
+		}
+	})
+
+	// Third, run the described callback
+	if (typeof input.callback === "function") {
+		process(jobDoc, input.callback);
+	}
+}
+
+export { manage }

package/server/imports/actions/manage/process.js

@@ -0,0 +1,17 @@
+import { Utilities } from "../../utilities"
+import { toolbelt } from "./toolbelt.js"
+
+var process = function (doc, callback) {
+	var Toolbelt = new toolbelt(doc);
+	
+	try {
+		var jobResult = callback.apply(Toolbelt, [doc]);
+	}
+
+	catch (e) {		
+		Utilities.logger("Jobs.manage to run due to code error: " + doc.name)
+		console.log(e);
+	}
+}
+
+export { process }