@pixlcore/xyrun 1.0.1 → 1.0.3

package/README.md

@@ -8,7 +8,7 @@ To use xyRun in a xyOps Event Plugin, make sure you set the Plugin's `runner` pr
 
 ## Features
 
-- Handles monitoring procesess, network connections, CPU and memory usage of remote jobs, and passing those metrics back to xyOps.
+- Handles monitoring processes, network connections, CPU and memory usage of remote jobs, and passing those metrics back to xyOps.
 - Handles input files by creating a temporary directory for you job and pre-downloading all files from the xyOps master server.
 - Handles output files by intercepting the `files` message and uploading them directly to the xyOps master server.
 
@@ -53,6 +53,12 @@ Then wrap your remote command with a `xyrun` prefix:
 ssh user@target xyrun node /path/to/your-script.js
 ```
 
+# Script Mode
+
+When no sub-command is specified on the CLI, xyRun will look inside the job JSON data (passed in via STDIN) for a parameter named `script`.  If this is found, it is quickly written out to a temp file, made executable (775), and that is what it launches.  It is assumed that the provided `script` will contain a proper [Shebang](https://en.wikipedia.org/wiki/Shebang_%28Unix%29) line.
+
+This allows xyRun to act as a "Remote Shell Plugin" for certain xyOps jobs that require it.
+
 # Development
 
 You can install the source code by using [Git](https://en.wikipedia.org/wiki/Git) ([Node.js](https://nodejs.org/) is also required):

package/main.js

@@ -16,6 +16,8 @@ const pkg = require('./package.json');
 const noop = function() {};
 const async = Tools.async;
 
+process.title = "xyRun";
+
 const app = {
 	
 	activeJobs: {},
@@ -129,8 +131,26 @@ const app = {
 		var child = null;
 		var worker = {};
 		
+		// setup environment for child
 		var child_args = process.argv.slice(2);
 		var child_cmd = child_args.shift();
+		var child_opts = {
+			env: Object.assign( {}, process.env )
+		};
+		
+		if (!child_cmd && job.params && job.params.script) {
+			// no direct command specified, but user wants a "script" executed from the job params
+			var script_file = Path.join( job.cwd, 'xyops-script-temp-' + job.id + '.sh' );
+			child_cmd = Path.resolve(script_file);
+			child_args = [];
+			
+			// quickly write out script file and make it executable
+			Tools.mkdirpSync( job.cwd, { mode: 0o777 } );
+			fs.writeFileSync( script_file, job.params.script.replace(/\r\n/g, "\n"), { mode: 0o775 } );
+			
+			// set the cwd to the job cwd, as it's a more controlled environment
+			child_opts.cwd = job.cwd;
+		}
 		
 		if (!child_cmd) {
 			// no command!
@@ -155,11 +175,6 @@ const app = {
 		
 		console.log( "Running command: " + child_cmd, child_args );
 		
-		// setup environment for child
-		var child_opts = {
-			env: Object.assign( {}, process.env )
-		};
-		
 		// get uid / gid info for child env vars
 		if (!this.platform.windows) {
 			child_opts.uid = job.uid || process.getuid();
@@ -335,7 +350,7 @@ const app = {
 			if (job.kill === 'none') {
 				// kill none, just unref and finish
 				worker.child.unref();
-				this.shutdown();
+				this.finishJob();
 				return;
 			}
 			
@@ -436,9 +451,6 @@ const app = {
 				
 				if (!file.path) return; // sanity
 				
-				// prepend job cwd if path is not absolute
-				if (!Path.isAbsolute(file.path)) file.path = Path.join(job.cwd, file.path);
-				
 				if (file.filename) {
 					// if user specified a custom filename, then do not perform a glob
 					to_upload.push(file);
@@ -463,9 +475,18 @@ const app = {
 		// upload all job files (from user) if applicable
 		var self = this;
 		var final_files = [];
-		var server_id = job.server;
+		
 		if (!job.files || !job.files.length || !Tools.isaArray(job.files)) return callback();
 		
+		if (!job.base_url) {
+			console.error("Error: Cannot upload files: Missing 'base_url' property in job data.");
+			return callback();
+		}
+		if (!job.auth_token) {
+			console.error("Error: Cannot upload files: Missing 'auth_token' property in job data.");
+			return callback();
+		}
+		
 		async.eachSeries( job.files,
 			function(file, callback) {
 				var filename = Path.basename(file.filename || file.path).replace(/[^\w\-\+\.\,\s\(\)\[\]\{\}\'\"\!\&\^\%\$\#\@\*\?\~]+/g, '_');
@@ -503,7 +524,7 @@ const app = {
 						filename: filename, 
 						path: json.key, 
 						size: json.size, 
-						server: server_id, 
+						server: job.server, 
 						job: job.id 
 					});
 					
@@ -567,8 +588,8 @@ const app = {
 						return;
 					}
 					
-					// update job data
-					console.log( JSON.stringify({ xy: 1, procs: job.procs, conns: job.conns, cpu: job.cpu, mem: job.mem }) );
+					// update job data with stats in tow
+					console.log( JSON.stringify({ xy: 1, rpid: process.pid, procs: job.procs, conns: job.conns, cpu: job.cpu, mem: job.mem }) );
 					
 					self.jobTickInProgress = false;
 				}
@@ -579,20 +600,21 @@ const app = {
 	measureJobResources(job, pids) {
 		// scan process list for all processes that are descendents of job pid
 		delete job.procs;
+		var root_pid = process.pid;
 		
-		if (pids[ job.pid ]) {
+		if (pids[ root_pid ]) {
 			// add all procs into job
 			job.procs = {};
-			job.procs[ job.pid ] = pids[ job.pid ];
+			job.procs[ root_pid ] = pids[ root_pid ];
 			
-			var info = pids[ job.pid ];
+			var info = pids[ root_pid ];
 			var cpu = info.cpu;
 			var mem = info.memRss;
 			
 			// also consider children of the child (up to 100 generations deep)
 			var levels = 0;
 			var family = {};
-			family[ job.pid ] = 1;
+			family[ root_pid ] = 1;
 			
 			while (Tools.numKeys(family) && (++levels <= 100)) {
 				for (var fpid in family) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pixlcore/xyrun",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "Remote job runner script for xyOps.",
 	"author": "Joseph Huckaby <jhuckaby@pixlcore.com>",
 	"homepage": "https://github.com/pixlcore/xyrun",