lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

packet size improvements

Browse source 
- change structure resource packets
- make more booleans default to false
- use encode_string - massive decrease in packet size!!
This commit is contained in:
Adam 2022-07-17 23:54:53 +02:00
parent 523f6d5914
commit 085776d42b
14 changed files with 131 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/events-mod/src/generated/lua/main/emitting/PacketEmitter.lua
View file

@ -15,7 +15,8 @@ function KafkatorioPacketEmitter.prototype.emitKeyedPacket(self, data)
end
function KafkatorioPacketEmitter.emitPacket(self, packet)
local data = game.table_to_json(packet)
localised_print("KafkatorioPacket: " .. data)
local encoded = game.encode_string(data)
print("KafkatorioPacket encoded::: " .. tostring(encoded))
end
local PacketEmitter = __TS__New(____exports.KafkatorioPacketEmitter)
____exports.default = PacketEmitter

7
modules/events-mod/src/generated/lua/main/events/converters.lua
View file

@ -42,13 +42,6 @@ do
end
return masks
end
function Converters.convertResourceEntity(entity)
if entity.type ~= "resource" then
return nil
else
return {amount = entity.amount, initialAmount = entity.initial_amount}
end
end
local function convertEntityStatus(status)
if status == nil then
return nil

23
modules/events-mod/src/generated/lua/main/events/handlers/EntityUpdateHandler.lua
View file

@ -142,16 +142,23 @@ function EntityUpdatesHandler.throttleResourcesUpdate(self, eventName, eventTick
local ____data_events_eventName_17 = data.events[eventName]
____data_events_eventName_17[#____data_events_eventName_17 + 1] = eventTick
for ____, entity in ipairs(resourceEntities) do
local resourceUpdate = Converters.convertResourceEntity(entity)
if resourceUpdate ~= nil then
if data.resourcesXY == nil then
data.resourcesXY = {}
if data.amounts == nil then
data.amounts = {}
end
local ____data_amounts_18, ____tostring_result_19 = data.amounts, tostring(entity.position.x)
if ____data_amounts_18[____tostring_result_19] == nil then
____data_amounts_18[____tostring_result_19] = {}
end
data.amounts[tostring(entity.position.x)][tostring(entity.position.y)] = entity.amount
if entity.initial_amount ~= nil then
if data.initialAmounts == nil then
data.initialAmounts = {}
end
local ____data_resourcesXY_18, ____tostring_result_19 = data.resourcesXY, tostring(entity.position.x)
if ____data_resourcesXY_18[____tostring_result_19] == nil then
____data_resourcesXY_18[____tostring_result_19] = {}
local ____data_initialAmounts_20, ____tostring_result_21 = data.initialAmounts, tostring(entity.position.x)
if ____data_initialAmounts_20[____tostring_result_21] == nil then
____data_initialAmounts_20[____tostring_result_21] = {}
end
data.resourcesXY[tostring(entity.position.x)][tostring(entity.position.y)] = resourceUpdate
data.initialAmounts[tostring(entity.position.x)][tostring(entity.position.y)] = entity.initial_amount
end
end
end

28
modules/events-mod/src/main/typescript/generated/kafkatorio-schema.ts
View file

@ -40,8 +40,8 @@ export namespace KafkatorioPacketData {
type: KafkatorioPacketData.Type.ConfigurationUpdate;
factorioData: ConfigurationUpdateGameData;
allMods: ConfigurationUpdateModData[];
modStartupSettingsChange: boolean;
migrationApplied: boolean;
modStartupSettingsChange?: boolean;
migrationApplied?: boolean;
}
export interface ConsoleChatUpdate {
@ -94,7 +94,8 @@ export namespace KafkatorioPacketData {
type: KafkatorioPacketData.Type.MapChunkResourceUpdate;
key: MapChunkResourceUpdateKey;
events?: { [key: EventName]: Tick[] } | null;
resourcesXY: FactorioEntityUpdateResourceDictionary;
amounts?: FactorioEntityUpdateResourceAmountDictionary;
initialAmounts?: FactorioEntityUpdateResourceAmountDictionary;
}
export interface MapChunkTileUpdate {
@ -132,7 +133,7 @@ export namespace KafkatorioPacketData {
bannedReason?: string | null;
kickedReason?: string | null;
disconnectReason?: string | null;
isRemoved?: boolean | null;
isRemoved?: boolean;
}
export interface Error {
@ -171,7 +172,7 @@ export interface MapChunkEntityUpdateKey {
chunkPosition: MapChunkPosition;
}
export type FactorioEntityUpdateEntityDictionary = { [key: string]: { [key: string]: FactorioEntityUpdateEntity } };
export type FactorioEntityUpdateEntityDictionary = { [key: string]: { [key: string]: FactorioEntityUpdateElementStandard } };
export interface MapChunkResourceUpdateKey {
protoId: PrototypeId;
@ -179,7 +180,7 @@ export interface MapChunkResourceUpdateKey {
chunkPosition: MapChunkPosition;
}
export type FactorioEntityUpdateResourceDictionary = { [key: string]: { [key: string]: FactorioEntityUpdateResource } };
export type FactorioEntityUpdateResourceAmountDictionary = { [key: string]: { [key: string]: UInt } };
export interface MapChunkTileUpdateKey {
chunkPosition: MapChunkPosition;
@ -251,7 +252,7 @@ export namespace FactorioPrototype {
layer: UInt;
collisionMasks: string[];
order: string;
canBeMined: boolean;
canBeMined?: boolean;
}
}
@ -274,7 +275,7 @@ export interface EntityItemGroup {
}
export interface EntityMiningProperties {
canBeMined: boolean;
canBeMined?: boolean;
products: MinedProduct[] | null;
}
@ -293,21 +294,16 @@ export enum ChunkSize {
export type PrototypeKey = Int & { __PrototypeKey__: void };
export interface FactorioEntityUpdateEntity {
export interface FactorioEntityUpdateElementStandard {
status?: FactorioEntityStatus | null;
unitNumber?: UnitNumber | null;
graphicsVariation?: UByte | null;
health?: Float | null;
isActive?: boolean | null;
isRotatable?: boolean | null;
isActive?: boolean;
isRotatable?: boolean;
lastUser?: UInt | null;
}
export interface FactorioEntityUpdateResource {
amount: UInt;
initialAmount?: UInt | null;
}
export type MinedProduct =
| MinedProduct.MinedProductFluid
| MinedProduct.MinedProductItem;

6
modules/events-mod/src/main/typescript/main/emitting/PacketEmitter.ts
View file

@ -26,8 +26,10 @@ export class KafkatorioPacketEmitter {
/** Emit a serialised KafkatorioPacket */
private static emitPacket<T extends KafkatorioPacket>(packet: T) {
let data = game.table_to_json(packet)
localised_print(`KafkatorioPacket: ${data}`)
const data = game.table_to_json(packet)
// print(`KafkatorioPacket::: ${data}`)
const encoded = game.encode_string(data)
print(`KafkatorioPacket encoded::: ${encoded}`)
// rcon.print(`KafkatorioPacket: ${data}`)
}

15
modules/events-mod/src/main/typescript/main/events/converters.ts
View file

@ -5,7 +5,6 @@ import {
EntityMiningProperties,
EventName,
FactorioEntityStatus,
FactorioEntityUpdateResource,
KafkatorioPacketData,
MapBoundingBox,
MapChunkPosition,
@ -76,20 +75,6 @@ export namespace Converters {
}
export function convertResourceEntity(
entity: LuaEntity
): FactorioEntityUpdateResource | null {
if (entity.type != "resource") {
return null
} else {
return {
amount: entity.amount,
initialAmount: entity.initial_amount,
}
}
}
function convertEntityStatus(
status: defines.entity_status | undefined
): FactorioEntityStatus | null {

20
modules/events-mod/src/main/typescript/main/events/handlers/EntityUpdateHandler.ts
View file

@ -1,6 +1,6 @@
import {
EventName,
FactorioEntityUpdateEntity,
FactorioEntityUpdateElementStandard,
KafkatorioPacketData,
MapChunkPosition,
PrototypeId,
@ -94,7 +94,7 @@ export class EntityUpdatesHandler {
chunkPosition: Converters.mapPositionToChunkPosition(entity.position)
}
const entityUpdate: FactorioEntityUpdateEntity = {
const entityUpdate: FactorioEntityUpdateElementStandard = {
unitNumber: entity.unit_number,
graphicsVariation: entity.graphics_variation,
health: entity.health,
@ -140,7 +140,7 @@ export class EntityUpdatesHandler {
for (const [protoId, resourceEntities] of pairs(entitiesByProtoId)) {
// create an update for each prototype ID
// create a MapChunkResourceUpdate for each prototype ID
const entityUpdateKey: KafkatorioPacketData.MapChunkResourceUpdate["key"] = {
protoId: protoId,
@ -158,18 +158,20 @@ export class EntityUpdatesHandler {
data.events[eventName].push(eventTick)
for (const entity of resourceEntities) {
const resourceUpdate = Converters.convertResourceEntity(entity)
if (resourceUpdate != null) {
data.resourcesXY ??= {}
data.resourcesXY[`${entity.position.x}`] ??= {}
data.resourcesXY[`${entity.position.x}`][`${entity.position.y}`] = resourceUpdate
data.amounts ??= {}
data.amounts[`${entity.position.x}`] ??= {}
data.amounts[`${entity.position.x}`][`${entity.position.y}`] = entity.amount
if (entity.initial_amount != null) {
data.initialAmounts ??= {}
data.initialAmounts[`${entity.position.x}`] ??= {}
data.initialAmounts[`${entity.position.x}`][`${entity.position.y}`] = entity.initial_amount
}
}
}
)
}
}