async migration

Author: harryadel

package/package.js renamed to package.js

@@ -12,3 +12,15 @@ Package.onUse(function(api) {
 	api.mainModule("server/api.js", "server");
 	api.export(["Jobs", "JobsInternal"]);
 });
+
+Package.onTest(function (api) {
+	api.use('tinytest');
+	api.use(['ecmascript', 'msavin:sjobs'], ['server']);
+	api.use(["mongo", "random", "check"], "server");
+
+	api.addFiles([
+		// "tests/basic.js",
+		// "tests/internals.js",
+		"tests/replication.js"
+	])
+});  

package/.DS_Store

@@ -135,31 +135,31 @@ Jobs.cancel = function (jobId) {
 
 // Start or stop the queue - intended for debugging and/or single server deployments
 
-Jobs.start = function (name) {
+Jobs.start = async function (name) {
 	check(name, Match.OneOf(undefined, String, [String]))
-	Operator.manager.start(name);
+	return await Operator.manager.start(name);
 }
 
-Jobs.stop = function (name) {
+Jobs.stop = async function (name) {
 	check(name, Match.OneOf(undefined, String, [String]))
-	Operator.manager.stop(name);
+	return await Operator.manager.stop(name);
 }
 
 // Get info on a job
 
-Jobs.get = function (jobId) {
+Jobs.get = async function (jobId) {
 	check(jobId, String);
-	return Actions.get(jobId);
+	return await Actions.get(jobId);
 }
 
 // Run a job ahead of time
 
-Jobs.execute = function (jobId, callback, force) {
+Jobs.execute = async function (jobId, callback, force) {
 	check(jobId, String)
 	check(force, Match.Optional(Boolean))
 
 	// 1. Get the job
-	const doc = Utilities.collection.findOne({
+	const doc = await Utilities.collection.findOneAsync({
 		_id: jobId,
 		state: {
 			$nin: ["success", "cancelled"]
@@ -197,7 +197,7 @@ Jobs.execute = function (jobId, callback, force) {
 
 // Reschedule a job
 
-Jobs.reschedule = function (jobId, config) {
+Jobs.reschedule = async function (jobId, config) {
 	check(jobId, String)
 	if (config) check(config, {
 		date: Match.Maybe(Date),
@@ -207,12 +207,12 @@ Jobs.reschedule = function (jobId, config) {
 		callback: Match.Maybe(Function)
 	})
 
-	return Actions.reschedule(jobId, config);
+	return await Actions.reschedule(jobId, config);
 }
 
 // Replicate a job to run it again later
 
-Jobs.replicate = function (jobId, config) {
+Jobs.replicate = async function (jobId, config) {
 	check(jobId, String)
 	if (config) check(config, {
 		date: Match.Maybe(Date),
@@ -222,26 +222,26 @@ Jobs.replicate = function (jobId, config) {
 		priority: Match.Maybe(Number),
 	})
 
-	return Actions.replicate(jobId, config);
+	return await Actions.replicate(jobId, config);
 }
 
 // Clear resolved jobs - or all of them
 
-Jobs.clear = function (state, name, callback) {
+Jobs.clear = async function (state, name, callback) {
 	check(state, Match.OneOf(undefined, String, [String]))
 	check(name, Match.Optional(String))
 	check(callback, Match.Optional(Function))
 
-	return Actions.clear(state, name, callback);
+	return await Actions.clear(state, name, callback);
 }
 
 // Remove the job
 
-Jobs.remove = function (jobId, callback) {
+Jobs.remove = async function (jobId, callback) {
 	check(jobId, String)
 	check(callback, Match.Maybe(Function))
 
-	return Actions.remove(jobId, callback);
+	return await Actions.remove(jobId, callback);
 }
 
 // Expose the MongoDB collection

package/README.md

@@ -49,7 +49,7 @@ const add = async function () {
 	// 4. Insert the job document into the database OR update it
 	let jobId;
 
-	if (input.config && input.config.override) {
+	if (input.config && input.config.override) { 
 		const doc = await Utilities.collection.findOneAsync({
 			name: input.name,
 			arguments: input.arguments,
@@ -79,10 +79,10 @@ const add = async function () {
 			});
 
 		} else {
-			jobId = await Utilities.collection.insertAsync(jobDoc);
+			jobId = await Utilities.collection.insertAsync(jobDoc);	
 		}
 	} else {
-		jobId = await Utilities.collection.insertAsync(jobDoc);
+		jobId = await Utilities.collection.insertAsync(jobDoc);	
 	}
 
 	// 5. Simulate the document (this might save us a database request in some places)

package/server/README.md renamed to server/README.md

@@ -28,7 +28,7 @@ const clear = async function (state, name, callback) {
 	}
 
 	const result = await Utilities.collection.removeAsync(action)
-
+	
 	if (callback) {
 		callback(undefined, result);
 	}