aperx/factorio-clusterio
1
0 Fork 0
mirror of https://github.com/clusterio/clusterio.git synced 2026-11-13 07:04:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Report instance name when asking for items

Browse Source
This commit is contained in:
Danielv123 committed 2017-04-06 20:57:15 +02:00
1 parent e18bc13abe
commit 2e4eb9332d
2 files changed
+18 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client.js
+9 -2
View File
@@ -521,17 +521,24 @@ function instanceManagement() {
items[i][0] = items[i][0].replace("\u0000", "");
items[i][0] = items[i][0].replace(",", "");
if (preparedPackage[items[i][0]]) {
// if we have buffered some already, sum the new items
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])
"count": Number(preparedPackage[items[i][0]].count) + Number(items[i][1]),
"instanceName":instance,
"instanceID":instanceconfig.unique,
};
// else just add em in without summing
} else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {
"name": items[i][0],
"count": Number(items[i][1])
"count": Number(items[i][1]),
"instanceName":instance,
"instanceID":instanceconfig.unique,
};
}
// this condition will NEVER be triggered but we know how that goes
} else if (typeof Number(items[i][1]) == "number") {
preparedPackage[items[i][0]] = {
"name": items[i][0],
master.js
+9 -3
View File
@@ -142,15 +142,21 @@ app.post("/api/remove", function(req, res) {
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
// save items we get
var object = req.body;
if(!object.instanceName) {
object.instanceName = "unknown"
}
if(!object.instanceID) {
object.instanceID = "unknown"
}
db.items.findOne({name:object.name}, function (err, doc) {
// console.dir(doc);
if (err) {
console.log('failure');
console.log('failure count not find ' + object.name);
} else {
if (doc) {
// Update existing items if item name already exists
if(Number(doc.count) > Number(object.count)) {
console.log("removed: " + object.name + " " + object.count + " . " + doc.count);
console.log("removed: " + object.name + " " + object.count + " . " + doc.count + " and sent to " + object.instanceID + " | " + object.instanceName);
objectUpdate = {
"name": object.name,
"count": Number(doc.count) - Number(object.count),
@@ -160,7 +166,7 @@ app.post("/api/remove", function(req, res) {
// res.send("successier");
res.send(object);
} else {
console.log('failure');
console.log('failure out of ' + object.name + " | " + object.count + " from " + object.instanceID + " ("+object.instanceName+")");
}
} else {
console.log('failure ' + object.name);