mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-12 07:04:52 +09:00
Semicolons for consistency
This commit is contained in:
1 parent
85d7246bca
commit
efbc4fbb87
1 file changed
+26
-26
@@ -5,9 +5,9 @@ const masterModFolder = "./database/masterMods/"
|
||||
const mkdirp = require("mkdirp");
|
||||
mkdirp.sync("./database");
|
||||
mkdirp.sync(masterModFolder);
|
||||
const path = require("path")
|
||||
const fs = require("fs")
|
||||
var nedb = require("nedb")
|
||||
const path = require("path");
|
||||
const fs = require("fs");
|
||||
var nedb = require("nedb");
|
||||
// require config.json
|
||||
var config = require('./config');
|
||||
|
||||
@@ -47,7 +47,7 @@ db.signals = new Datastore({ filename: 'database/signals.db', autoload: true, in
|
||||
db.signals.ensureIndex({ fieldName: 'time', expireAfterSeconds: 3600 }, function (err) {});
|
||||
|
||||
// production chart database
|
||||
db.flows = new Datastore({ filename: "database/flows.db", autoload: true})
|
||||
db.flows = new Datastore({ filename: "database/flows.db", autoload: true});
|
||||
db.flows.ensureIndex({ fieldName: "slaveID", expireAfterSeconds: 2592000}); // expire after 30 days
|
||||
// db.slaves = new Datastore({ filename: 'database/slaves.db', autoload: true, inMemoryOnly: false});
|
||||
|
||||
@@ -64,7 +64,7 @@ db.items.additem = function(object) {
|
||||
db.items.insert(object);
|
||||
console.log('Item created!');
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
var slaves = {}
|
||||
// world ID management
|
||||
@@ -82,7 +82,7 @@ app.post("/api/getID", function(req,res) {
|
||||
// mod management
|
||||
// should handle uploading and checking if mods are uploaded
|
||||
app.post("/api/checkMod", function(req,res) {
|
||||
let files = fs.readdirSync(masterModFolder)
|
||||
let files = fs.readdirSync(masterModFolder);
|
||||
let found = false;
|
||||
files.forEach(file => {
|
||||
if(file == req.body.modName) {
|
||||
@@ -91,24 +91,24 @@ app.post("/api/checkMod", function(req,res) {
|
||||
});
|
||||
if(!found) {
|
||||
// we don't have mod, plz send
|
||||
res.send(req.body.modName)
|
||||
res.send(req.body.modName);
|
||||
} else {
|
||||
res.send("found")
|
||||
res.send("found");
|
||||
}
|
||||
res.end()
|
||||
res.end();
|
||||
});
|
||||
app.post("/api/uploadMod", function(req,res) {
|
||||
if (!req.files) {
|
||||
res.send('No files were uploaded.');
|
||||
return;
|
||||
} else {
|
||||
console.log(req.files.file)
|
||||
console.log(req.files.file);
|
||||
req.files.file.mv('./database/masterMods/'+req.files.file.name, function(err) {
|
||||
if (err) {
|
||||
res.status(500).send(err);
|
||||
} else {
|
||||
res.send('File uploaded!');
|
||||
console.log("Uploaded mod: " + req.files.file.name)
|
||||
console.log("Uploaded mod: " + req.files.file.name);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -122,7 +122,7 @@ app.get("/api/slaves", function(req, res) {
|
||||
for(key in copyOfSlaves) {
|
||||
copyOfSlaves[key].rconPassword = "hidden";
|
||||
}
|
||||
res.send(copyOfSlaves)
|
||||
res.send(copyOfSlaves);
|
||||
});
|
||||
|
||||
// endpoint to send items to
|
||||
@@ -131,7 +131,7 @@ app.post("/api/place", function(req, res) {
|
||||
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
|
||||
console.log("added: " + req.body.name + " " + req.body.count);
|
||||
// save items we get
|
||||
db.items.additem(req.body)
|
||||
db.items.additem(req.body);
|
||||
// Attempt confirming
|
||||
res.end("success");
|
||||
});
|
||||
@@ -172,14 +172,14 @@ app.post("/api/remove", function(req, res) {
|
||||
console.log('failure ' + object.name);
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
// circuit stuff
|
||||
app.post("/api/setSignal", function(req,res) {
|
||||
if(typeof req.body == "object" && req.body.time){
|
||||
db.signals.insert(req.body);
|
||||
// console.log("signal set")
|
||||
// console.log("signal set");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -190,7 +190,7 @@ app.post("/api/readSignal", function(req,res) {
|
||||
db.signals.find({time:{$gte: req.body.since}}, function (err, docs) {
|
||||
// $gte means greater than or equal to, meaning we only get entries newer than the timestamp
|
||||
res.send(docs);
|
||||
// console.log(docs)
|
||||
// console.log(docs);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -215,18 +215,18 @@ app.post("/api/logStats", function(req,res) {
|
||||
timestamp: req.body.timestamp,
|
||||
data: req.body.data,
|
||||
});
|
||||
console.log("inserted: " + req.body.slaveID + " | " + req.body.timestamp)
|
||||
console.log("inserted: " + req.body.slaveID + " | " + req.body.timestamp);
|
||||
} else {
|
||||
console.log("error invalid timestamp " + req.body.timestamp);
|
||||
res.send(failure)
|
||||
res.send(failure);
|
||||
}
|
||||
} else {
|
||||
res.send("failure")
|
||||
res.send("failure");
|
||||
}
|
||||
})
|
||||
});
|
||||
// {slaveID: string, fromTime: Date, toTime, Date}
|
||||
app.post("/api/getStats", function(req,res) {
|
||||
console.log(req.body)
|
||||
console.log(req.body);
|
||||
if(typeof req.body == "object" && req.body.slaveID) {
|
||||
// if not specified, get stats for last 24 hours
|
||||
if(!req.body.fromTime) {
|
||||
@@ -235,18 +235,18 @@ app.post("/api/getStats", function(req,res) {
|
||||
if(!req.body.toTime) {
|
||||
req.body.toTime = Date.now();
|
||||
}
|
||||
console.log("Looking... " + JSON.stringify(req.body))
|
||||
console.log("Looking... " + JSON.stringify(req.body));
|
||||
db.flows.find({
|
||||
slaveID: req.body.slaveID,
|
||||
}, function(err, docs) {
|
||||
let entries = docs.filter(function (el) {
|
||||
return el.timestamp <= req.body.toTime && el.timestamp >= req.body.fromTime;
|
||||
});
|
||||
// console.log(entries)
|
||||
res.send(entries)
|
||||
})
|
||||
// console.log(entries);
|
||||
res.send(entries);
|
||||
});
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
// endpoint for getting the chartjs library
|
||||
app.get("/chart.js", function(req, res) {
|
||||
|
||||
Reference in new issue
Block a user