chore: update to handle offsets

Author: lukepolo

.github/workflows/build.yaml

@@ -43,5 +43,5 @@ jobs:
         with:
           package-name: gamedata-validator
           package-type: container
-          min-versions-to-keep: 8
+          min-versions-to-keep: 4
           ignore-versions: '^buildcache-*'

README.md

@@ -19,11 +19,12 @@ format:
   at image build time.
 
 Each entry is one of:
-- `signatures` — a `linux` byte pattern, scanned against the binary; healthy = exactly one match.
-- `vtable` — a `binary` + `class` + `linux` vfunc index; healthy = the index still fits inside that
-  class's vtable (catches CS2 updates that shrink/shift a vtable). Class names are resolved by RTTI.
-
-`offsets`-only entries (e.g. in upstream CCS gamedata) are skipped — there's nothing to scan.
+- `signatures` — a `linux` byte pattern, scanned against the binary; healthy = found (at least one
+  match, matching the official checker). A missing signature (0 matches) is broken.
+- `offsets` — standard CCS `offsets` (`windows`/`linux` vfunc index). When the entry also carries our
+  `library` + `class` extension, the `linux` index is bound-checked against that RTTI class's vtable
+  size (catches CS2 updates that shrink/shift a vtable). Bare `offsets` with no `class` (e.g. in
+  upstream CCS gamedata) can't be validated and are skipped.
 
 ## Result
 

gamedata/fivestack.gamedata.json

@@ -7,17 +7,17 @@
     }
   },
   "FiveStack_NetworkServerService_GetIGameServer": {
-    "vtable": {
-      "binary": "engine2",
-      "class": "CNetworkServerService",
+    "library": "engine2",
+    "class": "CNetworkServerService",
+    "offsets": {
       "windows": 23,
       "linux": 24
     }
   },
   "FiveStack_NetworkGameServer_GetAddonName": {
-    "vtable": {
-      "binary": "engine2",
-      "class": "CNetworkGameServerBase",
+    "library": "engine2",
+    "class": "CNetworkGameServerBase",
+    "offsets": {
       "windows": 26,
       "linux": 26
     }

main.py

@@ -14,7 +14,7 @@
 
 def load_entries(file_path):
     signatures = {}
-    vtables = {}
+    offsets = {}
     with open(file_path) as f:
         for name, entry in commentjson.load(f).items():
             if not isinstance(entry, dict):
@@ -27,32 +27,30 @@ def load_entries(file_path):
                     signatures[name] = {"lib": lib, "linux": sig["linux"]}
                 continue
 
-            vt = entry.get("vtable")
-            if vt and vt.get("binary") and vt.get("class") and vt.get("linux") is not None:
-                vtables[name] = {
-                    "binary": vt["binary"],
-                    "class": vt["class"],
-                    "offset": vt["linux"],
-                }
-    return signatures, vtables
+            off = entry.get("offsets")
+            lib = entry.get("library") or entry.get("lib")
+            cls = entry.get("class")
+            if off and lib and cls and off.get("linux") is not None:
+                offsets[name] = {"lib": lib, "class": cls, "offset": off["linux"]}
+    return signatures, offsets
 
 
-def check_vtable(set_name, name, vt):
+def check_offset(set_name, name, off):
     result = {
         "set": set_name,
         "signature": name,
         "kind": "vtable",
-        "class": vt["class"],
-        "offset": vt["offset"],
+        "class": off["class"],
+        "offset": off["offset"],
         "count": None,
         "ok": False,
     }
     try:
-        result["count"] = s2binlib.get_vfunc_count(vt["binary"], vt["class"])
+        result["count"] = s2binlib.get_vfunc_count(off["lib"], off["class"])
     except Exception as error:
         result["error"] = str(error)
         return result
-    result["ok"] = 0 <= vt["offset"] < result["count"]
+    result["ok"] = 0 <= off["offset"] < result["count"]
     return result
 
 
@@ -71,7 +69,7 @@ def main():
         if not path.exists(file_path):
             print(f"[skip] missing {file_path}", flush=True)
             continue
-        signatures, vtables = load_entries(file_path)
+        signatures, offsets = load_entries(file_path)
         for name, sig in signatures.items():
             _, count = s2binlib.pattern_scan(sig["lib"], sig["linux"])
             results.append(
@@ -80,11 +78,11 @@ def main():
                     "signature": name,
                     "kind": "signature",
                     "count": count,
-                    "ok": count == 1,
+                    "ok": count >= 1,
                 }
             )
-        for name, vt in vtables.items():
-            results.append(check_vtable(set_name, name, vt))
+        for name, off in offsets.items():
+            results.append(check_offset(set_name, name, off))
 
     broken = [r for r in results if not r["ok"]]
     result = {