feat: Add version as a top level field

protocols/armagetron.js

@@ -22,8 +22,11 @@ export default class armagetron extends Core {
     state.raw.versionmin = this.readUInt(reader)
     state.raw.versionmax = this.readUInt(reader)
     state.raw.version = this.readString(reader)
+    state.version = state.raw.version
     state.maxplayers = this.readUInt(reader)
 
+    delete state.raw.version
+
     const players = this.readString(reader)
     const list = players.split('\n')
     for (const name of list) {

protocols/asa.js

@@ -9,4 +9,9 @@ export default class asa extends Epic {
     this.clientSecret = 'PP5UGxysEieNfSrEicaD1N2Bb3TdXuD7xHYcsdUHZ7s'
     this.deploymentId = 'ad9a8feffb3b4b2ca315546f038c3ae2'
   }
+
+  async run(state) {
+    await super.run(state)
+    state.version = state.raw.attributes.BUILDID_s + '.' + state.raw.attributes.MINORBUILDID_s
+  }
 }

protocols/ase.js

@@ -15,10 +15,13 @@ export default class ase extends Core {
     state.raw.gametype = this.readString(reader)
     state.map = this.readString(reader)
     state.raw.version = this.readString(reader)
+    state.version = state.raw.version
     state.password = this.readString(reader) === '1'
     state.numplayers = parseInt(this.readString(reader))
     state.maxplayers = parseInt(this.readString(reader))
 
+    delete state.raw.version
+
     while (!reader.done()) {
       const key = this.readString(reader)
       if (!key) break

protocols/assettocorsa.js

@@ -22,6 +22,7 @@ export default class assettocorsa extends Core {
     state.gamePort = serverInfo.port
     state.raw.carInfo = carInfo.Cars
     state.raw.serverInfo = serverInfo
+    state.version = state.raw.serverInfo.poweredBy
 
     for (const car of carInfo.Cars) {
       if (car.IsConnected) {

protocols/battlefield.js

@@ -67,6 +67,9 @@ export default class battlefield extends Core {
         const data = await this.query(socket, ['version'])
         data.shift()
         state.raw.version = data.shift()
+        state.version = state.raw.version
+
+        delete state.raw.version
       }
 
       {

protocols/doom3.js

@@ -24,6 +24,7 @@ export default class doom3 extends Core {
     let reader = this.reader(body)
     const protoVersion = reader.uint(4)
     state.raw.protocolVersion = (protoVersion >> 16) + '.' + (protoVersion & 0xffff)
+    state.version = state.raw.protocolVersion
 
     // some doom implementations send us a packet size here, some don't (etqw does this)
     // we can tell if this is a packet size, because the third and fourth byte will be 0 (no packets are that massive)

protocols/eco.js

@@ -17,5 +17,6 @@ export default class eco extends Core {
     state.gamePort = serverInfo.GamePort
     state.players = serverInfo.OnlinePlayersNames?.map(name => ({ name, raw: {} })) || []
     state.raw = serverInfo
+    state.version = state.raw.Version
   }
 }

protocols/factorio.js

@@ -19,5 +19,6 @@ export default class factorio extends Core {
     state.players = players.map(player => ({ name: player, raw: {} }))
 
     state.raw = serverInfo
+    state.version = state.raw.application_version.game_version + '.' + state.raw.application_version.build_version
   }
 }

protocols/farmingsimulator.js

@@ -49,6 +49,9 @@ export default class farmingsimulator extends Core {
     })
 
     state.raw.version = serverInfo.attr('version')
+    state.version = state.raw.version
+
+    delete state.raw.version
 
     // TODO: Add state.raw
   }

protocols/ffow.js

@@ -23,6 +23,7 @@ export default class ffow extends valve {
     state.raw.gamemode = reader.string()
     state.raw.description = reader.string()
     state.raw.version = reader.string()
+    state.version = state.raw.version
     state.gamePort = reader.uint(2)
     state.numplayers = reader.uint(1)
     state.maxplayers = reader.uint(1)
@@ -34,5 +35,7 @@ export default class ffow extends valve {
     state.raw.round = reader.uint(1)
     state.raw.maxrounds = reader.uint(1)
     state.raw.timeleft = reader.uint(2)
+
+    delete state.raw.version
   }
 }

protocols/gamespy1.js

@@ -113,6 +113,7 @@ export default class gamespy1 extends Core {
     }
 
     state.numplayers = state.players.length
+    state.version = state.raw.gamever
   }
 
   async sendPacket (type) {

protocols/gamespy3.js

@@ -112,6 +112,7 @@ export default class gamespy3 extends Core {
     if (state.raw.password === '1') state.password = true
     if ('maxplayers' in state.raw) state.maxplayers = parseInt(state.raw.maxplayers)
     if ('hostport' in state.raw) state.gamePort = parseInt(state.raw.hostport)
+    if ('gamever' in state.raw) state.version = state.raw.gamever
 
     if ('' in state.raw.playerTeamInfo) {
       for (const playerInfo of state.raw.playerTeamInfo['']) {

protocols/geneshift.js

@@ -42,5 +42,8 @@ export default class geneshift extends Core {
     state.raw.mercs = !!parseInt(found[17])
     // fields[18] is unknown? listen server?
     state.raw.version = found[19]
+    state.version = state.raw.version
+
+    delete state.raw.version
   }
 }

protocols/mafia2mp.js

@@ -21,6 +21,7 @@ export default class mafia2mp extends Core {
     state.numplayers = parseInt(this.readString(reader))
     state.maxplayers = parseInt(this.readString(reader))
     state.raw.gamemode = this.readString(reader)
+    state.version = state.raw.gamemode
     state.password = !!reader.uint(1)
     state.gamePort = this.options.port - 1
 

protocols/minecraft.js

@@ -78,6 +78,7 @@ export default class minecraft extends Core {
       if (vanillaState.maxplayers) state.maxplayers = vanillaState.maxplayers
       if (vanillaState.players.length) state.players = vanillaState.players
       if (vanillaState.ping) this.registerRtt(vanillaState.ping)
+      if (vanillaState.raw.version) state.version = vanillaState.raw.version.name
     }
     if (gamespyState) {
       if (gamespyState.name) state.name = gamespyState.name
@@ -93,6 +94,7 @@ export default class minecraft extends Core {
       if (bedrockState.maxplayers) state.maxplayers = bedrockState.maxplayers
       if (bedrockState.map) state.map = bedrockState.map
       if (bedrockState.ping) this.registerRtt(bedrockState.ping)
+      if (bedrockState.raw.mcVersion) state.version = bedrockState.raw.mcVersion
     }
     // remove dupe spaces from name
     state.name = state.name.replace(/\s+/g, ' ')

protocols/mumbleping.js

@@ -16,6 +16,7 @@ export default class mumbleping extends Core {
     state.raw.versionMajor = reader.uint(1)
     state.raw.versionMinor = reader.uint(1)
     state.raw.versionPatch = reader.uint(1)
+    state.version = state.raw.versionMajor + '.' + state.raw.versionMinor + '.' + state.raw.versionPatch
     reader.skip(8)
     state.numplayers = reader.uint(4)
     state.maxplayers = reader.uint(4)

protocols/openttd.js

@@ -26,6 +26,9 @@ export default class openttd extends Core {
 
       state.name = reader.string()
       state.raw.version = reader.string()
+      state.version = state.raw.version
+
+      delete state.raw.version
 
       state.raw.language = this.decode(
         reader.uint(1),

protocols/palworld.js

@@ -15,5 +15,6 @@ export default class palworld extends Epic {
     await super.run(state)
     state.name = state.raw.attributes.NAME_s
     state.numplayers = state.raw.attributes.PLAYERS_l
+    state.version = state.raw.attributes.VERSION_S
   }
 }

protocols/rfactor.js

@@ -11,6 +11,7 @@ export default class rfactor extends Core {
     state.raw.ip = reader.part(4)
     state.raw.size = reader.uint(2)
     state.raw.version = reader.uint(2)
+    state.version = state.raw.version
     state.raw.versionRaceCast = reader.uint(2)
     state.gamePort = reader.uint(2)
     state.raw.queryPort = reader.uint(2)
@@ -36,6 +37,8 @@ export default class rfactor extends Core {
     reader.skip(3)
     state.raw.vehicles = reader.string()
 
+    delete state.raw.version
+
     state.password = !!(state.raw.packedSpecial & 2)
     state.raw.raceCast = !!(state.raw.packedSpecial & 4)
     state.raw.fixedSetups = !!(state.raw.packedSpecial & 16)

protocols/samp.js

@@ -16,6 +16,9 @@ export default class samp extends Core {
       if (this.isVcmp) {
         const consumed = reader.part(12)
         state.raw.version = this.reader(consumed).string()
+        state.version = state.raw.version
+
+        delete state.raw.version
       }
       state.password = !!reader.uint(1)
       state.numplayers = reader.uint(2)

protocols/savage2.js

@@ -16,7 +16,10 @@ export default class savage2 extends Core {
     state.raw.minplayers = reader.uint(1)
     state.raw.gametype = reader.string()
     state.raw.version = reader.string()
+    state.version = state.raw.version
     state.raw.minlevel = reader.uint(1)
+
+    delete state.raw.version
   }
 
   stripColorCodes (str) {

protocols/starmade.js

@@ -57,7 +57,12 @@ export default class starmade extends Core {
     this.logger.debug('Received raw data array', data)
 
     if (typeof data[0] === 'number') state.raw.infoVersion = data[0]
-    if (typeof data[1] === 'number') state.raw.version = data[1]
+    if (typeof data[1] === 'number') {
+      state.raw.version = data[1]
+      state.version = state.raw.version
+
+      delete state.raw.version
+    }
     if (typeof data[2] === 'string') state.name = data[2]
     if (typeof data[3] === 'string') state.raw.description = data[3]
     if (typeof data[4] === 'number') state.raw.startTime = data[4]

protocols/teamspeak3.js

@@ -17,6 +17,7 @@ export default class teamspeak3 extends Core {
         if ('virtualserver_name' in state.raw) state.name = state.raw.virtualserver_name
         if ('virtualserver_maxclients' in state.raw) state.maxplayers = state.raw.virtualserver_maxclients
         if ('virtualserver_clientsonline' in state.raw) state.numplayers = state.raw.virtualserver_clientsonline
+        if ('virtualserver_version' in state.raw) state.version = state.raw.virtualserver_version
       }
 
       {

protocols/theisleevrima.js

@@ -14,5 +14,6 @@ export default class theisleevrima extends Epic {
     await super.run(state)
     state.name = state.raw.attributes.SERVERNAME_s
     state.map = state.raw.attributes.MAP_NAME_s
+    state.version = state.raw.attributes.SERVER_VERSION_s
   }
 }

protocols/tribes1.js

@@ -36,8 +36,11 @@ export default class tribes1 extends Core {
     state.raw.gametype = this.readString(reader)
     const isStarsiege2009 = state.raw.gametype === 'Starsiege'
     state.raw.version = this.readString(reader)
+    state.version = state.raw.version
     state.name = this.readString(reader)
 
+    delete state.raw.version
+
     if (isStarsiege2009) {
       state.password = !!reader.uint(1)
       state.raw.dedicated = !!reader.uint(1)

protocols/valve.js

@@ -95,6 +95,10 @@ export default class valve extends Core {
         state.raw.shipduration = reader.uint(1)
       }
       state.raw.version = reader.string()
+      state.version = state.raw.version
+
+      delete state.raw.version
+
       const extraFlag = reader.uint(1)
       if (extraFlag & 0x80) state.gamePort = reader.uint(2)
       if (extraFlag & 0x10) state.raw.steamid = reader.uint(8).toString()