Steve Jobs 4.2.0 - es6, codebase improvements, minor enhancements

Author: msavin

.DS_Store

@@ -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: "4.0.0",
+	version: "4.2.0",
 	documentation: "README.md",
 	git:     "https://github.com/msavin/SteveJobs.git",
 });

package/.DS_Store

@@ -3,7 +3,7 @@ import { Utilities } from './imports/utilities'
 import { Operator } from './imports/operator'
 import './imports/startup'
 
-var Jobs = {}
+const Jobs = {}
 
 // Configure the package (optional)
 
@@ -54,8 +54,8 @@ Jobs.register = function (jobs) {
 Jobs.run = function () {
 	check(arguments[0], String)
 
-	var lastArg = arguments[arguments.length - 1];
-	var remote = typeof lastArg === "object" && lastArg.remote ;
+	const lastArg = arguments[arguments.length - 1];
+	const remote = typeof lastArg === "object" && lastArg.remote;
 
 	if (Utilities.registry.data[arguments[0]] || remote) {
 		return Actions.add.apply(null, arguments);
@@ -111,7 +111,7 @@ Jobs.execute = function (jobId, callback, force) {
 	check(force, Match.Optional(Boolean))
 
 	// 1. Get the job
-	var doc = Utilities.collection.findOne({ 
+	const doc = Utilities.collection.findOne({ 
 		_id: jobId,
 		state: {
 			$nin: ["success", "cancelled"]
@@ -204,7 +204,7 @@ Meteor.startup(function () {
 
 // Internals for debugging
 
-var JobsInternal = {
+const JobsInternal = {
 	Actions: Actions,
 	Utilities: Utilities,
 	Operator: Operator

package/package.js

@@ -1,17 +1,17 @@
 import { Utilities } from "../../utilities"
 
-var add = function () {
+const add = function () {
 	// 0. Prepare variables
-	var error, result, blockAdd;
+	let error, result, blockAdd;
 
 	// 1. Process arguments + prepare the data
-	var input = Utilities.helpers.processJobArguments(arguments);
+	const input = Utilities.helpers.processJobArguments(arguments);
 
 	// 2 - check if job needs to blocked from being added
 
 		// 2-1. check if the job is singular
 		if (input.config && input.config.singular) {
-			var doc = Utilities.collection.findOne({
+			const doc = Utilities.collection.findOne({
 				name: input.name,
 				arguments: input.arguments,
 				state: {
@@ -24,7 +24,7 @@ var add = function () {
 
 		// 2-2. check if job is unique
 		if (input.config && input.config.unique) {
-			var doc = Utilities.collection.findOne({
+			const doc = Utilities.collection.findOne({
 				name: input.name,
 				arguments: input.arguments
 			})
@@ -35,20 +35,22 @@ var add = function () {
 		// 2-3. Cancel the job if a block condition is met
 		if (blockAdd) {
 			error = true;
+
 			if (input.config && typeof input.config.callback === "function") {
 				return input.config.callback(error, result);
 			}
+
 			return result;
 		}
 
 	// 3. Generate job document
-	var jobDoc = Utilities.helpers.generateJobDoc(input);
+	const jobDoc = Utilities.helpers.generateJobDoc(input);
 
 	// 4. Insert the job document into the database OR update it
-	var jobId;
+	let jobId;
 
 	if (input.config && input.config.override) { 
-		var doc = Utilities.collection.findOne({
+		const doc = Utilities.collection.findOne({
 			name: input.name,
 			arguments: input.arguments,
 			state: {
@@ -57,8 +59,7 @@ var add = function () {
 		})
 
 		if (doc) {
-			console.log(doc)
-			var initDate = jobDoc.due || new Date;
+			const initDate = jobDoc.due || new Date;
 
 			jobId = Utilities.collection.update(doc._id, {
 				$set: {

package/server/api.js

@@ -1,12 +1,13 @@
 import { Utilities } from "../../utilities"
 
-var cancel = function (job, callback) {
-	var error,
-		result,
-		jobDoc = Utilities.helpers.getJob(job, {
-			allow: ["pending", "failure"],
-			message: "Unable to cancel job - not found or is resolved: "
-		})
+const cancel = function (job, callback) {
+	let error;
+	let result;
+
+	const jobDoc = Utilities.helpers.getJob(job, {
+		allow: ["pending", "failure"],
+		message: "Unable to cancel job - not found or is resolved: "
+	})
 
 	if (typeof jobDoc === "object") {
 		result = Utilities.collection.update(jobDoc._id, {

package/server/imports/.DS_Store

@@ -1,11 +1,11 @@
 import { Utilities } from "../../utilities"
 
-var clear = function (state, name, callback) {
+const clear = function (state, name, callback) {
 	if (typeof state === "string" && state !== "*")  {
 		state = [state]
 	}
 
-	var action = {
+	let action = {
 		state: {
 			$in: state || ["cancelled", "success"]
 		}
@@ -27,7 +27,7 @@ var clear = function (state, name, callback) {
 		}
 	}
 
-	var result = Utilities.collection.remove(action)
+	const result = Utilities.collection.remove(action)
 
 	if (callback) {
 		callback(undefined, result);

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

@@ -1,15 +1,17 @@
 import { Utilities } from "../../utilities"
 import { process } from "./process.js"
 
-var execute = async function (job, callback) {
-	var jobDoc = Utilities.helpers.getJob(job, {
+const execute = async function (job, callback) {
+	const jobDoc = Utilities.helpers.getJob(job, {
 		allow: ["pending", "failure"],
 		message: "Job is not valid or not found, or is already resolved:"
 	});
 
+	console.log(`Jobs.execute`, jobDoc.name, jobDoc._id, jobDoc.due)
+
 	if (typeof jobDoc === "object") {
-		if (typeof Utilities.registry.data[jobDoc.name]) {
-			var result = await process(jobDoc, callback);
+		if (typeof Utilities.registry.data[jobDoc.name]) {			
+			const result = await process(jobDoc, callback);
 			return result;
 		} else {
 			Utilities.logger("Jobs: Job not found in registry: " + jobDoc.name);

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

@@ -2,57 +2,55 @@ import { Utilities } from "../../utilities"
 import { toolbelt } from "./toolbelt.js"
 import { reschedule } from "../reschedule/"
 
-
-var process = async function (doc, callback) {
+const process = async function (doc, callback) {
 	// Goals: 
 	// 1- Execute the job
 	// 2- Update the document in database
 	// 3- Capture the result (if any)
 
-	var Toolbelt = new toolbelt(doc);
-	var jobFunc = Utilities.registry.data[doc.name];
-	var isAsync = jobFunc.constructor.name === "AsyncFunction";
+	const Toolbelt = new toolbelt(doc);
+	const jobFunc = Utilities.registry.data[doc.name];
+	const isAsync = jobFunc.constructor.name === "AsyncFunction";
 
 	if (isAsync) {
-		jobResult = await jobFunc.apply(Toolbelt, doc.arguments).catch(function (error) {
-			var failure = Toolbelt.failure(error);
-			
-			Utilities.logger("Job failed to run due to code error: " + doc.name)
-			console.log(error);
-
-			if (typeof callback === "function") {
-				return callback(true, undefined);
-			}
-		}).then(function (jobResult) {
-			var resolution = Toolbelt.checkForResolution(jobResult);
-
-			if (typeof callback === "function") {
-				return callback(undefined, jobResult);
-			} else {
-				return jobResult;
-			}
-		});
-
+		await jobFunc.apply(Toolbelt, doc.arguments)
+			.catch(function (error) {
+				const failure = Toolbelt.failure(error);
+				
+				Utilities.logger(`Job failed to run due to code error: ${doc.name}`)
+				console.log(error);
+
+				if (typeof callback === "function") {
+					return callback(error, undefined);
+				}
+			})
+			.then(function (jobResult) {
+				const resolution = Toolbelt.checkForResolution(jobResult);
+
+				if (typeof callback === "function") {
+					return callback(undefined, jobResult);
+				} else {
+					return jobResult;
+				}
+			});
 	} else {
 		try {
 			const jobResult = jobFunc.apply(Toolbelt, doc.arguments);
-			var resolution = Toolbelt.checkForResolution(jobResult);
+			const resolution = Toolbelt.checkForResolution(jobResult);
 
 			if (typeof callback === "function") {
 				return callback(undefined, jobResult);
 			} else {
 				return jobResult;
 			}
-		}
-
-		catch (e) {		
-			var failure = Toolbelt.failure(e.stack);
+		} catch (error) {		
+			const failure = Toolbelt.failure(error.stack);
 
-			Utilities.logger("Job failed to run due to code error: " + doc.name)
-			console.log(e);
+			Utilities.logger(`Job failed to run due to code error: ${doc.name}`)
+			console.log(error);
 
 			if (typeof callback === "function") {
-				return callback(true, undefined);
+				return callback(error, undefined);
 			}
 		}
 	}