Merged dev into master

This commit is contained in:
Danielv123 committed 2016-12-22 16:23:59 +01:00
commit de1a51610d
8 files changed
+246 -119

No files matched your search

+23 -1
View File
@@ -48,7 +48,7 @@ There are no requirements for other mods, they can be ran in any configuration a
You can change the name and path expected in config.json if wanted. You can change the name and path expected in config.json if wanted.
3. node client.js [instancename] 3. node client.js start [instancename]
Repeat step 3 for more servers on one machine. You should be able to find its port by looking at the console output or at the slave section on master:8080 Repeat step 3 for more servers on one machine. You should be able to find its port by looking at the console output or at the slave section on master:8080
@@ -59,3 +59,25 @@ Repeat step 3 for more servers on one machine. You should be able to find its po
2. Drop it into ./factorio/mods 2. Drop it into ./factorio/mods
3. Run factorio and connect to slave as a normal MP game. 3. Run factorio and connect to slave as a normal MP game.
#Ubuntu setup
Master and all slaves:
sudo curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - && sudo apt install -y git nodejs && git clone https://github.com/Danielv123/factorioClusterio.git && cd factorioClusterio && npm install
downloads and installs nodejs, git and clusterio.
**Master**
node master.js
**Slave**
Download factorio with curl. Make sure to insert the correct version number.
Start the slave with node client.js
curl -o factorio.tar.gz -L https://www.factorio.com/get-download/0.14.21/headless/linux64 && tar -xvzf factorio.tar.gz
node client.js start [instancename]
+76 -19
View File
@@ -1,20 +1,61 @@
var fs = require('fs'); var fs = require('fs');
var needle = require("needle"); var needle = require("needle");
var child_process = require('child_process'); var child_process = require('child_process');
var path = require('path')
// require config.json // require config.json
var config = require('./config'); var config = require('./config');
// Functions
var deleteFolderRecursive = function (path) {
if (fs.existsSync(path)) {
fs.readdirSync(path).forEach(function (file, index) {
var curPath = path + "/" + file;
if (fs.lstatSync(curPath).isDirectory()) { // recurse
deleteFolderRecursive(curPath);
} else { // delete file
fs.unlinkSync(curPath);
}
});
fs.rmdirSync(path);
}
};
var instance = process.argv[2]; function getDirectories(srcpath) {
if(!instance){ return fs.readdirSync(srcpath).filter(function (file) {
console.error("Usage: node client.js [instance name]") return fs.statSync(path.join(srcpath, file)).isDirectory();
process.exit(1) });
} }
if (!fs.existsSync("./instances/")) { if (!fs.existsSync("./instances/")) {
fs.mkdirSync("instances"); fs.mkdirSync("instances");
} }
var instance = process.argv[3];
var instancedirectory = './instances/' + instance; var instancedirectory = './instances/' + instance;
if (!fs.existsSync(instancedirectory)){ var command = process.argv[2];
// handle commandline parameters
if (!command || command == "help" || command == "--help") {
console.error("Usage: ")
console.error("node client.js start [instance name]")
console.error("node client.js list")
console.error("node client.js delete [instance]")
process.exit(1)
} else if (command == "list") {
console.dir(getDirectories("./instances/"));
process.exit(1)
} else if (command == "delete") {
if (!process.argv[3]) {
console.error("Usage: node client.js delete [instance]");
process.exit(1)
} else if (typeof process.argv[3] == "string" && fs.existsSync("./instances/" + process.argv[3]) && process.argv[3] != "/" && process.argv[3] != "") {
deleteFolderRecursive("./instances/" + process.argv[3]);
console.log("Deleted instance " + process.argv[3])
process.exit(1)
} else {
console.error("Instance not found: " + process.argv[3]);
process.exit(1)
}
} else if (command == "start" && typeof instance == "string" && instance != "/" && !fs.existsSync(instancedirectory)) {
// if instance does not exist, create it
console.log("Creating instance...")
fs.mkdirSync(instancedirectory); fs.mkdirSync(instancedirectory);
fs.mkdirSync(instancedirectory + "/script-output/"); fs.mkdirSync(instancedirectory + "/script-output/");
fs.writeFileSync(instancedirectory + "/script-output/output.txt", "") fs.writeFileSync(instancedirectory + "/script-output/output.txt", "")
@@ -55,12 +96,12 @@ write-data=__PATH__executable__\\..\\..\\..\\instances\\"+instance+"\r\n\
fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4)); fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4));
var createSave = child_process.spawnSync( var createSave = child_process.spawnSync(
'./' + config.factorioDirectory + '/bin/x64/factorio.exe', './' + config.factorioDirectory + '/bin/x64/factorio', [
[
'-c', instancedirectory + '/config.ini', '-c', instancedirectory + '/config.ini',
'--create', instancedirectory + '/save.zip', '--create', instancedirectory + '/save.zip',
] ]
) )
console.log("Instance created!")
} }
var instanceconfig = require(instancedirectory + '/config'); var instanceconfig = require(instancedirectory + '/config');
@@ -74,16 +115,14 @@ process.on('SIGINT', function() {
//var serverprocess = child_process.exec(commandline) //var serverprocess = child_process.exec(commandline)
var serverprocess = child_process.spawn( var serverprocess = child_process.spawn(
'./' + config.factorioDirectory + '/bin/x64/factorio.exe', './' + config.factorioDirectory + '/bin/x64/factorio', [
[
'-c', instancedirectory + '/config.ini', '-c', instancedirectory + '/config.ini',
'--start-server', instancedirectory + '/save.zip', '--start-server', instancedirectory + '/save.zip',
'--rcon-port', instanceconfig.clientPort, '--rcon-port', instanceconfig.clientPort,
'--rcon-password', instanceconfig.clientPassword, '--rcon-password', instanceconfig.clientPassword,
'--server-settings', instancedirectory + '/server-settings.json', '--server-settings', instancedirectory + '/server-settings.json',
'--port', instanceconfig.factorioPort '--port', instanceconfig.factorioPort
], ], {
{
'stdio': ['pipe', 'pipe', 'pipe'] 'stdio': ['pipe', 'pipe', 'pipe']
} }
) )
@@ -113,7 +152,9 @@ var client = new Rcon({
// wait a few seconds to let the server finish starting before connecting rcon // wait a few seconds to let the server finish starting before connecting rcon
//TODO: catch '2.033 Info RemoteCommandProcessor.cpp:97: Starting RCON interface at port 35002' from stdout maybe? //TODO: catch '2.033 Info RemoteCommandProcessor.cpp:97: Starting RCON interface at port 35002' from stdout maybe?
setTimeout(() => { client.connect(); }, 5000); setTimeout(() => {
client.connect();
}, 5000);
client.on('authenticated', function () { client.on('authenticated', function () {
console.log('Authenticated!'); console.log('Authenticated!');
@@ -150,8 +191,8 @@ function getID() {
} }
}); });
}) })
} }
setInterval(getID, 10000)
// provide items -------------------------------------------------------------- // provide items --------------------------------------------------------------
// trigger when something happens to output.txt // trigger when something happens to output.txt
fs.watch(instancedirectory + "/script-output/output.txt", function (eventType, filename) { fs.watch(instancedirectory + "/script-output/output.txt", function (eventType, filename) {
@@ -167,7 +208,10 @@ fs.watch(instancedirectory + "/script-output/output.txt", function(eventType, fi
g[0] = g[0].replace("\u0000", ""); g[0] = g[0].replace("\u0000", "");
// console.log("exporting " + JSON.stringify(g)); // console.log("exporting " + JSON.stringify(g));
// send our entity and count to the master for him to keep track of // send our entity and count to the master for him to keep track of
needle.post(config.masterIP + ":" + config.masterPort + '/place', {name:g[0], count:g[1]}, needle.post(config.masterIP + ":" + config.masterPort + '/place', {
name: g[0],
count: g[1]
},
function (err, resp, body) { function (err, resp, body) {
// console.log(body); // console.log(body);
}); });
@@ -191,12 +235,21 @@ setInterval(function() {
items[i][0] = items[i][0].replace(",", ""); items[i][0] = items[i][0].replace(",", "");
if (preparedPackage[items[i][0]]) { if (preparedPackage[items[i][0]]) {
if (typeof Number(preparedPackage[items[i][0]].count) == "number" && typeof Number(items[i][1]) == "number") { if (typeof Number(preparedPackage[items[i][0]].count) == "number" && typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {"name":items[i][0], "count":Number(preparedPackage[items[i][0]].count) + Number(items[i][1])}; preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(preparedPackage[items[i][0]].count) + Number(items[i][1])
};
} else if (typeof Number(items[i][1]) == "number") { } else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {"name":items[i][0], "count":Number(items[i][1])}; preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(items[i][1])
};
} }
} else if (typeof Number(items[i][1]) == "number") { } else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {"name":items[i][0], "count":Number(items[i][1])}; preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(items[i][1])
};
} }
} }
})(i); })(i);
@@ -207,7 +260,9 @@ setInterval(function() {
needle.post(config.masterIP + ":" + config.masterPort + '/remove', preparedPackage[Object.keys(preparedPackage)[i]], function (err, response, body) { needle.post(config.masterIP + ":" + config.masterPort + '/remove', preparedPackage[Object.keys(preparedPackage)[i]], function (err, response, body) {
if (response && response.body && typeof response.body == "object") { if (response && response.body && typeof response.body == "object") {
// buffer confirmed orders // buffer confirmed orders
confirmedOrders[confirmedOrders.length] = {[response.body.name]: response.body.count} confirmedOrders[confirmedOrders.length] = {
[response.body.name]: response.body.count
}
} }
}); });
} }
@@ -239,7 +294,9 @@ setInterval(function() {
// send any signals the slave has been told to send // send any signals the slave has been told to send
setInterval(function () { setInterval(function () {
// Fetch combinator signals from the server // Fetch combinator signals from the server
needle.post(config.masterIP + ":" + config.masterPort + '/readSignal', {since:lastSignalCheck}, function(err, response, body){ needle.post(config.masterIP + ":" + config.masterPort + '/readSignal', {
since: lastSignalCheck
}, function (err, response, body) {
if (response && response.body && typeof response.body == "object" && response.body[0]) { if (response && response.body && typeof response.body == "object" && response.body[0]) {
// Take the new combinator frames and compress them so we can use a single command // Take the new combinator frames and compress them so we can use a single command
frameset = []; frameset = [];
View File
Whitespace-only changes.
+1 -1
View File
@@ -45,6 +45,7 @@ db.items.additem = function(object) {
} }
var slaves = {} var slaves = {}
// world ID management // world ID management
// slaves post here to tell the server they exist
app.post("/getID", function(req,res) { app.post("/getID", function(req,res) {
// request.body should be an object // request.body should be an object
// {rconPort, rconPassword, serverPort, mac, time} // {rconPort, rconPassword, serverPort, mac, time}
@@ -55,7 +56,6 @@ app.post("/getID", function(req,res) {
console.log("Slave: " + req.body.mac + " : " + req.body.serverPort) console.log("Slave: " + req.body.mac + " : " + req.body.serverPort)
} }
}); });
// endpoint for getting information about all our slaves // endpoint for getting information about all our slaves
app.get("/slaves", function(req, res) { app.get("/slaves", function(req, res) {
res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Origin", "*");
+3 -1
View File
@@ -4,7 +4,8 @@
"description": "Factorio cluster???", "description": "Factorio cluster???",
"main": "master.js", "main": "master.js",
"scripts": { "scripts": {
"test": "nodemon master.js" "test": "nodemon master.js",
"start": "echo Run node client.js [instance] to start slaves && node master.js"
}, },
"keywords": [ "keywords": [
"factorio" "factorio"
@@ -13,6 +14,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
"canvasjs": "^1.8.1",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"express": "^4.14.0", "express": "^4.14.0",
"fs": "0.0.2", "fs": "0.0.2",
+4 -4
View File
@@ -2,7 +2,7 @@
<head> <head>
<title>Clusterio</title> <title>Clusterio</title>
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/0.2.0/Chart.min.js" type="text/javascript"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/canvasjs/1.7.0/canvasjs.js" type="text/javascript"></script>
<script src="main.js"></script> <script src="main.js"></script>
</head> </head>
@@ -17,9 +17,9 @@
<div id="storage-menu" onclick="display('storage');" class="button-black menuItem"> <div id="storage-menu" onclick="display('storage');" class="button-black menuItem">
<p>Storage</p> <p>Storage</p>
</div> </div>
<div id="production-menu" onclick="display('production');" class="button-black menuItem"> <!--<div id="production-menu" onclick="display('production');" class="button-black menuItem">
<p>Production</p> <p>Production</p>
</div> </div>-->
<div id="slaves-menu" onclick="display('slaves');" class="button-black menuItem"> <div id="slaves-menu" onclick="display('slaves');" class="button-black menuItem">
<p>Slaves</p> <p>Slaves</p>
</div> </div>
@@ -36,7 +36,7 @@
<div id="legend"> <div id="legend">
</div> </div>
<canvas id="productionChart" width="400" height="150"></canvas> <div id="productionChart" style="height: 300px; width: 100%;"></div>
</div> </div>
<div id="slaves"> <div id="slaves">
<h2>Slaves</h2> <h2>Slaves</h2>
+136 -93
View File
@@ -1,9 +1,10 @@
var g = {}
contents = { contents = {
"iron-plate":100, "iron-plate":100,
"copper-plate":7312, "copper-plate":7312,
} }
// nice functions // nice functions
// hash a string to a hash
function djb2(str){ function djb2(str){
var hash = 5381; var hash = 5381;
for (var i = 0; i < str.length; i++) { for (var i = 0; i < str.length; i++) {
@@ -11,7 +12,7 @@ function djb2(str){
} }
return hash; return hash;
} }
// hash a string to a color
function hashColor(str) { function hashColor(str) {
var hash = djb2(str); var hash = djb2(str);
var r = (hash & 0xFF0000) >> 16; var r = (hash & 0xFF0000) >> 16;
@@ -19,21 +20,23 @@ function hashColor(str) {
var b = hash & 0x0000FF; var b = hash & 0x0000FF;
return "#" + ("0" + r.toString(16)).substr(-2) + ("0" + g.toString(16)).substr(-2) + ("0" + b.toString(16)).substr(-2); return "#" + ("0" + r.toString(16)).substr(-2) + ("0" + g.toString(16)).substr(-2) + ("0" + b.toString(16)).substr(-2);
} }
// exactly what you would expect it to, returns String
function capitalizeFirstLetter(string) { function capitalizeFirstLetter(string) {
return string.charAt(0).toUpperCase() + string.slice(1); return string.charAt(0).toUpperCase() + string.slice(1);
} }
// function to draw data we recieve from ajax requests // hide the HTML object passed as argument #1
function hideThis(object) { function hideThis(object) {
object.style.visibility = "hidden"; object.style.visibility = "hidden";
} }
// function to sort arrays of objects after a keys value
function sortByKey(array, key) { function sortByKey(array, key) {
return array.sort(function(a, b) { return array.sort(function(a, b) {
var x = Number(a[key]); var y = Number(b[key]); var x = Number(a[key]); var y = Number(b[key]);
return ((x < y) ? 1 : ((x > y) ? -1 : 0)); return ((x < y) ? 1 : ((x > y) ? -1 : 0));
}); });
} }
// function to draw data we recieve from ajax requests
function drawcontents(data) { function drawcontents(data) {
var data = sortByKey(data, "count"); var data = sortByKey(data, "count");
result = "<table>"; result = "<table>";
@@ -65,89 +68,127 @@ function display(page) {
} }
} }
// Function to redraw charts in case they bug out // setTimeout is used to put this processing in the back of the queue, after the HTML canvas is done
function drawcharts() { window.onload = function () {
// create chart of items in master storage display("storage")
ctx = document.querySelector("#contentGraph").getContext('2d'); // dataPoints
PieChart = new Chart(ctx); var dataPoints1 = [];
var dataPoints2 = [];
// production chart var chart = new CanvasJS.Chart("productionChart",{
// https://codepen.io/statuswoe/pen/hyldD zoomEnabled: true,
var count = 20; title: {
var data = { text: "Production"
labels : ["1","2","3","4","5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20"], },
datasets : [ toolTip: {
{ shared: true
fillColor : "rgba(220,220,220,0.5)", },
strokeColor : "rgba(220,220,220,1)", legend: {
pointColor : "rgba(220,220,220,1)", verticalAlign: "top",
pointStrokeColor : "#fff", horizontalAlign: "center",
title:"one", fontSize: 14,
data : [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] fontWeight: "bold",
fontFamily: "calibri",
fontColor: "dimGrey"
},
axisX: {
title: "Shows items in network"
},
axisY:{
prefix: '',
includeZero: true
},
data: [{
// dataSeries1
type: "line",
xValueType: "dateTime",
showInLegend: true,
name: "Company A",
dataPoints: dataPoints1
}, },
{ {
fillColor : "rgba(151,187,205,0.5)", // dataSeries2
strokeColor : "rgba(151,187,205,1)", type: "line",
pointColor : "rgba(151,187,205,1)", xValueType: "dateTime",
pointStrokeColor : "#fff", showInLegend: true,
title:"two", name: "Company B" ,
data : [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] dataPoints: dataPoints2
}],
legend:{
cursor:"pointer",
itemclick : function(e) {
if (typeof(e.dataSeries.visible) === "undefined" || e.dataSeries.visible) {
e.dataSeries.visible = false;
} }
] else {
e.dataSeries.visible = true;
} }
// this is ugly, don't judge me chart.render();
var updateData = function(oldData){ }
if(piedataOld[0]){ }
//console.log(piedata) });
var labels = oldData["labels"];
var dataSetA = oldData["datasets"][0]["data"];
var dataSetB = oldData["datasets"][1]["data"];
var updateInterval = 10000;
// initial value
var yValue1 = 640;
var yValue2 = 604;
var time = new Date;
time.setHours(9);
time.setMinutes(30);
time.setSeconds(00);
time.setMilliseconds(00);
// starting at 9.30 am
var updateChart = function (count) {
count = count || 1;
// count is number of times loop runs to generate random dataPoints.
for (var i = 0; i < count; i++) {
// add interval duration to time
time.setTime(time.getTime()+ updateInterval);
// generating random values
var deltaY1 = .5 + Math.random() *(-.5-.5);
var deltaY2 = .5 + Math.random() *(-.5-.5);
// adding random value and rounding it to two digits.
yValue1 = Math.round((yValue1 + deltaY1)*100)/100;
yValue2 = Math.round((yValue2 + deltaY2)*100)/100;
// pushing the new values
dataPoints1.push({
x: time.getTime(),
y: yValue1
});
dataPoints2.push({
x: time.getTime(),
y: yValue2
});
labels.shift();
count++;
labels.push(count.toString());
// this is where we generate new data
var newDataA = piedata[0].value - piedataOld[0].value;
var newDataB = piedata[1].value - piedataOld[1].value;
// not quite sure how this works, where is dataSetA placed in data/the graph?
dataSetA.push(newDataA);
dataSetB.push(newDataB);
dataSetA.shift();
dataSetB.shift();
}
}; };
// Not sure why the scaleOverride isn't working... // updating legend text with updated with y Value
var optionsNoAnimation = { chart.options.data[0].legendText = " Company A $" + yValue1;
animation : false, chart.options.data[1].legendText = " Company B $" + yValue2;
//Boolean - If we want to override with a hard coded scale
scaleOverride : true, chart.render();
//** Required if scaleOverride is true **
//Number - The number of steps in a hard coded scale };
scaleSteps : 20,
//Number - The value jump in the hard coded scale // generates first set of dataPoints
scaleStepWidth : 10, updateChart(3000);
//Number - The scale starting value
scaleStartValue : 0 // update chart after specified interval
setInterval(function(){updateChart()}, updateInterval);
} }
//Get the context of the canvas element we want to select
var ctx = document.getElementById("productionChart").getContext("2d");
var optionsNoAnimation = {animation : false}
productionChart = new Chart(ctx);
productionChart.Line(data, optionsNoAnimation);
setInterval(function(){
updateData(data);
productionChart.Line(data, optionsNoAnimation);
},1000);
}
// setTimeout is used to put this processing in the back of the queue, after the HTML canvas is done
setTimeout(function(){
drawcharts();
},10)
var piedata = {}; var piedata = {};
var piedataOld = {}; var piedataOld = {};
// get cluster inventory from master // get cluster inventory from master
@@ -172,40 +213,41 @@ setInterval(function() {
label: data[i].name, label: data[i].name,
} }
} }
PieChart.Pie(piedata, {
animation: false,
legend: {
display: true,
labels: {
fontColor: 'rgb(255, 99, 132)'
}
},
hover: {
mode: "label",
}
});
} }
} }
xmlhttp.open("GET", "inventory", true); xmlhttp.open("GET", "inventory", true);
xmlhttp.send(); xmlhttp.send();
}, 500) }, 500)
// get all slaves recently connected to master // get all slaves recently connected to master
Date.prototype.yyyymmdd = function() { // http://stackoverflow.com/questions/3066586/get-string-in-yyyymmdd-format-from-js-date-object Date.prototype.yyyymmdd = function(time) { // http://stackoverflow.com/questions/3066586/get-string-in-yyyymmdd-format-from-js-date-object
var mm = this.getMonth() + 1; // getMonth() is zero-based var mm = this.getMonth() + 1; // getMonth() is zero-based
var dd = this.getDate(); var dd = this.getDate();
return [this.getFullYear(), !mm[1] && '0', mm, !dd[1] && '0', dd].join(''); // padding if(mm<10)mm = "0"+mm
if(dd<10)dd = "0"+dd
console.log(this.getFullYear())
return this.getFullYear()+""+mm+""+dd+ ""; // padding
}; };
var date = new Date(); var date = new Date();
// ask master for slaves
setInterval(function() { setInterval(function() {
var xmlhttp = new XMLHttpRequest(); var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function() { xmlhttp.onreadystatechange = function() {
if(xmlhttp.readyState == 4 && xmlhttp.status == 200) { if(xmlhttp.readyState == 4 && xmlhttp.status == 200) {
var slaveData = JSON.parse(xmlhttp.responseText); var slaveData = JSON.parse(xmlhttp.responseText);
var HTML = "<p>Latest connections:</p>" var HTML = "<p>Current connections:</p>"
for(i=0;i<Object.keys(slaveData).length;i++){ for(i=0;i<Object.keys(slaveData).length;i++){
var key = Object.keys(slaveData)[i] var key = Object.keys(slaveData)[i]
// Date.getYear.getmonth.getDay // Date.getYear.getmonth.getDay
HTML += "<div class='slaveBox'><h2>ID: " + slaveData[key].unique + "</h2><p>Last seen: "+date.yyyymmdd(slaveData[key].time)+"</p><p>Port: "+slaveData[key].serverPort+"</p><p>Host: "+slaveData[key].mac+"</p></div>" if(Date.now() - slaveData[key].time < 12000) {
// Display ISO 6801 compliant date to please Zarthus
// maybe include an option to use y-ymd-ymd-y for Trangar compatibility as well
var seenDate = date.yyyymmdd(slaveData[key].time)
if(g.trangarTime == true){
var seenDate = (seenDate+"")[0]+"-"+(seenDate+"")[1]+(seenDate+"")[4]+(seenDate+"")[6]+"-"+(seenDate+"")[2]+(seenDate+"")[5]+(seenDate+"")[7]+"-"+(seenDate+"")[3]
}
HTML += "<div class='slaveBox'><h2>ID: " + slaveData[key].unique + "</h2><p>Last seen: "+seenDate+"</p><p>Port: "+slaveData[key].serverPort+"</p><p>Host: "+slaveData[key].mac+"</p></div>"
}
} }
document.querySelector("#slaves > #display").innerHTML = HTML document.querySelector("#slaves > #display").innerHTML = HTML
} }
@@ -216,6 +258,7 @@ setInterval(function() {
// image data // image data
// key is the name of the item in the database, value is the name of the image on wiki.factorio.com/images/* // key is the name of the item in the database, value is the name of the image on wiki.factorio.com/images/*
// this list has to include all entities that doesn't just follow the simple capitalize first letter convention
var imagedata = { var imagedata = {
["empty-barrel"]: "Barrel-empty", ["empty-barrel"]: "Barrel-empty",
["transport-belt"]: "Basic-transport-belt", ["transport-belt"]: "Basic-transport-belt",
+3
View File
@@ -19,6 +19,9 @@
#body > div { #body > div {
display:none; display:none;
} }
#body > #production {
display:block;
}
#contents { #contents {
width:300px; width:300px;
} }