monkey/Monkey.js

@@ -75,17 +75,19 @@ class Monkey {
 
 	// Install a Monkeydo manifest
 	async loadManifest(manifest) {
+		return await new Promise((resolve,reject) => {
 			if(typeof manifest !== "object") {
 				try {
 					manifest = JSON.parse(manifest);
 				}
 				catch {
-				Promise.reject("Failed to load manifest");
+					reject("Failed to load manifest");
 				}
 			}
 			this.tasks.manifest = manifest.tasks;
 			this.flags[0] = 1; // Manifest loaded: true
-		return true;
+			resolve();
+		});
 	}
 }
 

monkey/MonkeyMaster.mjs

@@ -48,12 +48,14 @@ export default class MonkeyMaster {
 		this.comlink = await new Monkey();
 
 		// Wait for comlink to spin up
-		if(!this.comlink) Promise.reject("Failed to establish Comlink with worker");
+		return await new Promise((resolve,reject) => {
+			if(!this.comlink) reject("Failed to establish Comlink with worker");
 
 			this.ready = true;
 			// Send queued flags when worker is ready
 			this.queue.sendAllFlags();
-		return true;
+			resolve();
+		});
 	}
 
 	// Return a flag array index by name
@@ -102,6 +104,7 @@ export default class MonkeyMaster {
 	// Load a Monkeydo manifest by URL or JSON string
 	async loadManifest(manifest) {
 		if(!this.ready) await this.init();
+		return await new Promise((resolve,reject) => {
 			let load = null;
 			// Attempt load string as URL and fetch manifest
 			try {
@@ -113,9 +116,9 @@ export default class MonkeyMaster {
 			catch {
 				load = this.comlink.loadManifest(manifest);
 			}
-
+			load.then(() => resolve())
-		load.then(() => Promise.resolve())
+			.catch(() => reject("Failed to load manifest"));
-		.catch(() => Promise.reject("Failed to load manifest"));
+		});
 	}
 
 	async stop() {