chore: zomboid smart deployment

Author: MarcStdt

.github/workflows/release.yml

@@ -124,7 +124,7 @@ jobs:
           druid registry push ./scrolls/lgsm/sdtdserver -p main=26900/udp -p main2=26902/udp -p maintcp=26900 -i artifacts.druid.gg/druid-team/druidd-lgsm:sdtd -m --min-disk 20Gi --min-ram 2Gi --min-cpu 0.5
           druid registry push ./scrolls/lgsm/gmodserver -p query=27005/udp -p main=/udp -p sourcetv=27020/udp -p steam=27015 -i artifacts.druid.gg/druid-team/druidd-lgsm:gmod -m --min-disk 8Gi --min-ram 512Mi --min-cpu 0.25 --smart
           druid registry push ./scrolls/lgsm/cs2server -p main=/udp -p rcon=27015 -i artifacts.druid.gg/druid-team/druidd-lgsm:cs2 -m --min-disk 38Gi --min-ram 1Gi --min-cpu 0.5 --smart
-          druid registry push ./scrolls/lgsm/pzserver -p main=/udp -p main2=/udp  -i artifacts.druid.gg/druid-team/druidd-lgsm:pz -m --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25
+          druid registry push ./scrolls/lgsm/pzserver -p main=/udp -p main2=/udp  -i artifacts.druid.gg/druid-team/druidd-lgsm:pz -m --min-disk 3Gi --min-ram 512Mi --min-cpu 0.25 --smart
 
           druid registry push ./scrolls/lgsm/terrariaserver -p todo=8211/udp -i artifacts.druid.gg/druid-team/druidd-lgsm:terraria -m
           druid registry push ./scrolls/lgsm/csgoserver -p query=27005/udp -p main=27015/udp -p sourcetv=27020/udp -p steam=27015 -i artifacts.druid.gg/druid-team/druidd-lgsm:csgo -m --smart

scrolls/lgsm/.build/scroll.yaml.tmpl

@@ -39,6 +39,10 @@ ports:
       - name: StartOnUnknownPacket
         value: "{{ .Vars.lua_query_start_on_unknown_packet }}"
 {{- end }}
+{{- if .Vars.lua_steam_app_id }}
+      - name: SteamAppId
+        value: "{{ .Vars.lua_steam_app_id }}"
+{{- end }}
 {{- end }}
 {{- if .Vars.main_port_protocol }}
   - name: main

scrolls/lgsm/.build/vars.json

@@ -81,6 +81,7 @@
     "lua_query_map": "server idle",
     "lua_query_servername": "Druid Gameserver (idle) - Start server by joining",
     "lua_query_port": "main",
-    "lua_query_start_on_unknown_packet": "yes"
+    "lua_query_start_on_unknown_packet": "yes",
+    "lua_steam_app_id": "108600"
   }
 }

scrolls/lgsm/.build/versions/pzserver/packet_handler/query.lua

@@ -10,6 +10,15 @@ function string.tohex(str)
     end))
 end
 
+function pack_uint64_le(n)
+    local bytes = {}
+    for i = 1, 8 do
+        bytes[i] = string.char(n % 256)
+        n = math.floor(n / 256)
+    end
+    return table.concat(bytes)
+end
+
 function handle(ctx, data)
 
     -- prtocol begins with FFFFFFFF and the packedid
@@ -137,6 +146,14 @@ function handle(ctx, data)
         versionPrefix = get_var("GameVersionPrefix")
         serverPort = get_port("main")
 
+
+        edfGameIdStr = get_var("SteamAppId")
+        edfGameId = nil
+        if edfGameIdStr ~= nil then
+            edfGameId = tonumber(edfGameIdStr)
+        end
+
+
         -- EDF & 0x80: Port
         -- EDF & 0x10: SteamID
         -- EDF & 0x20 Keywords
@@ -149,7 +166,6 @@ function handle(ctx, data)
         edfKeywords = get_var("GameKeywords") or ",OWNINGID:90202064633057281,OWNINGNAME:90202064633057281,NUMOPENPUBCONN:50,P2PADDR:90202064633057281,P2PPORT:" ..
                 serverPort .. ",LEGACY_i:0"
 
-        edfGameId = "a00f000000000000"
 
         serverinfopacket = ServeInfoPacket:new()
         serverinfopacket.name = name
@@ -226,6 +242,10 @@ function Packet:appendByte(data)
     self.bytes = self.bytes .. string.char(data)
 end
 
+function Packet:appendRawBytes(data)
+    self.bytes = self.bytes .. data
+end
+
 function Packet:appendShort(num)
     self.bytes = self.bytes .. string.fromhex(number_to_little_endian_short(num))
 end
@@ -318,7 +338,8 @@ function ServeInfoPacket:GetRawPacket()
         p:appendString(self.edfKeywords)
     end
     if self.edfGameId ~= nil then
-        p:appendHex(self.edfGameId)
+        local bytes = pack_uint64_le(self.edfGameId)
+        p:appendRawBytes(bytes)
     end
 
 

scrolls/lgsm/pzserver/packet_handler/query.lua

@@ -10,6 +10,15 @@ function string.tohex(str)
     end))
 end
 
+function pack_uint64_le(n)
+    local bytes = {}
+    for i = 1, 8 do
+        bytes[i] = string.char(n % 256)
+        n = math.floor(n / 256)
+    end
+    return table.concat(bytes)
+end
+
 function handle(ctx, data)
 
     -- prtocol begins with FFFFFFFF and the packedid
@@ -137,6 +146,14 @@ function handle(ctx, data)
         versionPrefix = get_var("GameVersionPrefix")
         serverPort = get_port("main")
 
+
+        edfGameIdStr = get_var("SteamAppId")
+        edfGameId = nil
+        if edfGameIdStr ~= nil then
+            edfGameId = tonumber(edfGameIdStr)
+        end
+
+
         -- EDF & 0x80: Port
         -- EDF & 0x10: SteamID
         -- EDF & 0x20 Keywords
@@ -149,7 +166,6 @@ function handle(ctx, data)
         edfKeywords = get_var("GameKeywords") or ",OWNINGID:90202064633057281,OWNINGNAME:90202064633057281,NUMOPENPUBCONN:50,P2PADDR:90202064633057281,P2PPORT:" ..
                 serverPort .. ",LEGACY_i:0"
 
-        edfGameId = "a00f000000000000"
 
         serverinfopacket = ServeInfoPacket:new()
         serverinfopacket.name = name
@@ -226,6 +242,10 @@ function Packet:appendByte(data)
     self.bytes = self.bytes .. string.char(data)
 end
 
+function Packet:appendRawBytes(data)
+    self.bytes = self.bytes .. data
+end
+
 function Packet:appendShort(num)
     self.bytes = self.bytes .. string.fromhex(number_to_little_endian_short(num))
 end
@@ -318,7 +338,8 @@ function ServeInfoPacket:GetRawPacket()
         p:appendString(self.edfKeywords)
     end
     if self.edfGameId ~= nil then
-        p:appendHex(self.edfGameId)
+        local bytes = pack_uint64_le(self.edfGameId)
+        p:appendRawBytes(bytes)
     end
 
 

scrolls/lgsm/pzserver/scroll.yaml

@@ -23,6 +23,8 @@ ports:
         value: "Druid Gameserver (idle) - Start server by joining"
       - name: StartOnUnknownPacket
         value: "yes"
+      - name: SteamAppId
+        value: "108600"
 init: "console"
 commands:
   console: