Merge branch 'master' into remoteMap

config.json.dist

@@ -47,6 +47,7 @@
 		"entriesPerSecond": 0.01666666667
 	},
 	"logItemTransfers": false,
+	"disableFairItemDistribution": false,
 	"uploadModsToMaster": true,
 	"msBetweenCommands": 10,
 	"allowRemoteCommandExecution": true,

master.js

@@ -566,6 +566,27 @@ app.post("/api/remove", authenticate.middleware, function(req, res) {
 			console.log('failure could not find ' + object.name);
 		}
 		res.send({name:object.name, count:0});
+	} else if(config.disableFairItemDistribution){
+		let numberToRemove = Math.min(Math.abs(Number(object.count)),Number(item));
+		db.items.removeItem({count: numberToRemove, name: object.name});
+		res.send({count: numberToRemove, name: object.name});
+		
+		// track statistics and do graphing things
+		prometheusImportGauge.labels(object.instanceID, object.name).inc(Number(numberToRemove) || 0);
+		let sentItemStatistics = sentItemStatisticsBySlaveID[object.instanceID];
+		if(sentItemStatistics === undefined){
+			sentItemStatistics = new averagedTimeSeries({
+				maxEntries: config.itemStats.maxEntries,
+				entriesPerSecond: config.itemStats.entriesPerSecond,
+				mergeMode: "add",
+			}, console.log);
+		}
+		sentItemStatistics.add({
+			key:object.name,
+			value:numberToRemove,
+		});
+		//console.log(sentItemStatistics.data)
+		sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics;
 	} else {
 		const originalCount = Number(object.count) || 0;
 		object.count /= ((_doleDivisionFactor[object.name]||0)+doleDivisionRetardation)/doleDivisionRetardation;

sharedPlugins/clusterioMod/index.js

@@ -185,11 +185,6 @@ module.exports = class remoteCommands {
 				for(let i=0;i<confirmedOrders.length;i++)
 				{
 					cmd+='["'+confirmedOrders[i].name+'"]='+confirmedOrders[i].count+',';
-					if(cmd.length>320) // Factorio max packet size is 508
-					{
-						that.messageInterface("/silent-command remote.call('clusterio', 'runcode', '"+cmd.slice(0, -1)+"}"+ " for k, item in pairs(t) do GiveItemsToStorage(k, item) end')");
-						cmd="local t={";
-					}
 				}
 				if (!(cmd==="local t={")){
 					that.messageInterface("/silent-command remote.call('clusterio', 'runcode', '"+cmd.slice(0, -1)+"}"+ " for k, item in pairs(t) do GiveItemsToStorage(k, item) end')");
@@ -222,12 +217,6 @@ module.exports = class remoteCommands {
 						for (let key in inventoryFrame)
 						{
 							cmd+='["'+key+'"]='+inventoryFrame[key]+",";
-							if(first && cmd.length>300 || !first && cmd.length > 320) // Factorio max packet size is 508
-							{
-									that.messageInterface("/silent-command remote.call('clusterio', 'runcode', '"+(first ? 'global.ticksSinceMasterPinged=0 ':'')+cmd.slice(0, -1)+"}"+ " for name,count in pairs(s) do global.invdata[name]=count end')");
-									cmd="local s={";
-									first = false;
-							}
 						}
 						if (!(cmd==="local s={")){
 							that.messageInterface("/silent-command remote.call('clusterio', 'runcode', '"+(first ? 'global.ticksSinceMasterPinged=0 ':'')+cmd.slice(0, -1)+"}"+ " for name,count in pairs(s) do global.invdata[name]=count end')");