maybe

.gitignore

@@ -29,3 +29,6 @@ node_modules
 # Debug log from npm
 npm-debug.log
 .c9
+
+# keys
+secrets.js

doapi.js

@@ -0,0 +1,51 @@
+var request = require('request');
+
+
+api = function(key){
+	if(!key){
+		key = require('./secrets.js').doAPI;
+	}
+	this.url = 'https://digitalocean.com/v2/';
+	this.headers = {
+		'Content-Type': 'application/json',
+		'Authorization': 'Bearer '+key
+	}
+
+	this.byTag: function(tag, callback){
+		var options = {
+			url: this.url+'droplets?tag_name='+tag,
+			headers: this.headers
+		}
+		return request.get(options, function(error, response, body){
+			return callback(body, response, error);
+		})
+	};
+
+	this.setTag: function(id, tag, callback){
+		return request.post(url+)
+	};
+}
+
+api = {
+}
+
+
+
+
+
+
+
+var httpOptions = {
+		url:'http://' + ip + ':15000',
+		body: JSON.stringify({
+			code: req.body.code
+		})
+	};
+
+	return request.post(httpOptions, function(error, response, body){
+		body = JSON.parse(body);
+		body['ip'] = ip.replace('10.0.', '');
+		return res.json(body);
+	});
+
+module.exports = api;

lxc.js

@@ -1,9 +1,10 @@
 'use strict';
 var exec = require('child_process').exec;
 
-function sysExec(command, callback){
+function sysExec(command, callback, ip){
+	ip = ip || '104.236.77.157';
 	command = new Buffer(command).toString('base64')
-	command = 'ssh virt@104.236.77.157 "echo ' + command + '|base64 --decode|bash"';
+	command = 'ssh virt@'+ ip + ' "echo ' + command + '|base64 --decode|bash"';
 	// command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command;
 
 	return exec(command, (function(callback){
@@ -39,6 +40,7 @@ var lxcORM = function(){
 };
 
 var lxc = {
+	exec: sysExec,
 	create: function(name, template, config, callback){
 		return sysExec('lxc-create -n '+name+' -t '+template, callback);
 	},

routes/api.js

@@ -7,52 +7,48 @@ var request = require('request');
 var lxc = require('../lxc');
 
 var timeoutEvents = {};
-var ip2name = {};
+var label2container = {};
 var availContainers = [];
 var usedContainers = [];
-
+var workers = { 
-var exec = require('child_process').exec;
+	clworker0: {
-
+		ip: '104.236.77.157',
-function sysExec(command, callback){
+		name: 'clworker0'
-	command = new Buffer(command).toString('base64')
+	}
-	command = 'ssh virt@104.236.77.157 "echo ' + command + '|base64 --decode|bash"';
-	// command = 'unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; ' + command;
-
-	return exec(command, (function(callback){
-		return function(err,data,stderr){
-			if(callback){
-				return callback(data, err, stderr);
-			}
-		}
-	})(callback));
 };
 
-var getFreeMem = function(callback){
+var getFreeMem = function(ip, callback){
 
-	return sysExec("python3 -c \"a=`head /proc/meminfo | grep MemAvail | grep -Po '\d+'`;t=`head /proc/meminfo | grep MemTotal | grep -Po '\d+'`;print(round(((t-a) / t)*100, 2))\"", callback);
+	return lxc.sysExec(
+		"python3 -c \"a=`head /proc/meminfo|grep MemAvail|grep -Po '\d+'`;t=`head /proc/meminfo|grep MemTotal|grep -Po '\d+'`;print(round(((t-a)/t)*100, 2))\"",
+		ip,
+		callback
+	);
 };
 
-
+var lxcTimeout = function(container, time){
-var lxcTimeout = function(ip, time){
-	var name = ip2name[ip];
-	console.log(name)
 	time = time || 900000; // 15 minutes
 	var keys = Object.keys(timeoutEvents)
-	if(keys.indexOf(name) !== -1){
+
-		clearTimeout(timeoutEvents[name])
+	if(keys.indexOf(container.label) !== -1){
+		clearTimeout(timeoutEvents[container.label])
 	}
-	timeoutEvents[name] = setTimeout(function(){
+
-		lxc.stop(name);
+	return timeoutEvents[container.label] = setTimeout(function(){
-		startAll();
+		lxc.stop(name, container);
+		return startAll(container.worker);
 	}, time);
 }
 
 
-var runner = function(req, res, ip){
+var runner = function(req, res, container){
-	lxcTimeout(ip);
+	lxcTimeout(container);
 
 	var httpOptions = {
-		url:'http://' + ip + ':15000',
+		url: 'http://' + container.worker.ip,
+		headers: {
+			host: container.name
+		},
 		body: JSON.stringify({
 			code: req.body.code
 		})
@@ -60,15 +56,41 @@ var runner = function(req, res, ip){
 
 	return request.post(httpOptions, function(error, response, body){
 		body = JSON.parse(body);
-		body['ip'] = ip.replace('10.0.', '');
+		body['ip'] = container.label;
 		return res.json(body);
 	});
 };
 
+var startWorkers = function(clworker, stopPercent){
+	stopPercent = stopPercent || 81;
+	getFreeMem(function(usedMemPercent, clworker){
+		if(usedMemPercent < 81 ){
+			var name = 'crunner-'+(Math.random()*100).toString().replace('.','');
+			return lxc.startEphemeral(name, 'crunner0', clworker, function(data){
+				availContainers.push({
+					ip: data.ip,
+					name: name,
+					worker: worker,
+					label: worker.name+':'+name;
+				});
+				return startWorkers(clworker);
+			});
+		}else{
+			console.log('using', usedMemPercent, 'percent memory, stopping container creation!', availContainers.length, 'created');
+		}
+	});
+};
+
+startWorkers(worker.clworker0);
+
 router.get('/start/:name', function(req, res, next){
 	return lxc.start(req.params.name, function(data){
 		if(!data){
-			return res.json({status: 500, name: req.params.name, message: data});
+			return res.json({
+				status: 500,
+				name: req.params.name,
+				message: data
+			});
 		}else{
 			res.json({});
 		}
@@ -132,43 +154,18 @@ router.post('/run/:ip?', function doRun(req, res, next){
 
 	return lxc.list(function(data){
 		if(!req.params.ip) data = [];
-		var ip = '10.0.'+ req.params.ip;
+		var container = label2container[req.params.ip] || null;
-		var found = false;
 
-		for(var idx=data.length; idx--;){
-			if( data[idx]['ipv4'] === ip ){
-				found = true;
-				break;
-			}
-		}
 
-		if(found){
+		if(container){
-			return runner(req, res, ip)
+			return runner(req, res, container);
 		}else{
-			return runner(req, res, availContainers.pop());
+			container = availContainers.splice(0,1);
+			label2container[container.worker.name+':'+container.name] = container;
+			return runner(req, res, container);
 		}
 	});
 
 });
 
-// freeMem: 97700 totalmem 513818624 usedMem: 0
-// freeMem: 420,472 totalmem 513,818,624 usedMem: 100
-var startAll = function(){
-	getFreeMem(function(usedMemPercent){
-
-		if(usedMemPercent < 81 ){
-			var name = 'crunner-'+(Math.random()*100).toString().replace('.','');
-			return lxc.startEphemeral(name, 'crunner0', function(data){
-				ip2name[data.ip] = name;
-				availContainers.push(data.ip);
-				return startAll();
-			});
-		}else{
-			console.log('using', usedMemPercent, 'percent memory, stopping container creation!', availContainers.length, 'created');
-		}
-	});
-}
-
-startAll();
-
 module.exports = router;