Skip to content

⚡ Bolt: Optimize server lookups in Lua API #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mleem97 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡ Bolt: Optimize server lookups in Lua API #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
216 changes: 169 additions & 47 deletions src/Compatibility/DataCenterModLoader/GameAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,23 +1390,60 @@ private ulong FindHandleByStableId(string targetId)
{
try
{
foreach (var srv in UnityEngine.Resources.FindObjectsOfTypeAll<Server>())
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
try
foreach (var kvp in nm.servers)
{
if (srv.gameObject.scene.name == null) continue;
if ((srv.ServerID ?? "") == targetId) return (ulong)srv.Pointer.ToInt64();
try
{
var srv = kvp.Value;
if (srv != null && srv.gameObject.scene.name != null)
{
if ((srv.ServerID ?? "") == targetId) return (ulong)srv.Pointer.ToInt64();
}
}
catch { }
}
catch { }
}
foreach (var sw in UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>())
else
{
try
foreach (var srv in UnityEngine.Resources.FindObjectsOfTypeAll<Server>())
{
if (sw.gameObject.scene.name == null) continue;
if ((sw.switchId ?? "") == targetId) return (ulong)sw.Pointer.ToInt64();
try
{
if (srv.gameObject.scene.name == null) continue;
if ((srv.ServerID ?? "") == targetId) return (ulong)srv.Pointer.ToInt64();
}
catch { }
}
}
if (nm != null && nm.switches != null)
{
foreach (var kvp in nm.switches)
{
try
{
var sw = kvp.Value;
if (sw != null && sw.gameObject.scene.name != null)
{
if ((sw.switchId ?? "") == targetId) return (ulong)sw.Pointer.ToInt64();
}
}
catch { }
}
}
else
{
foreach (var sw in UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>())
{
try
{
if (sw.gameObject.scene.name == null) continue;
if ((sw.switchId ?? "") == targetId) return (ulong)sw.Pointer.ToInt64();
}
catch { }
}
catch { }
}
foreach (var pp in UnityEngine.Resources.FindObjectsOfTypeAll<PatchPanel>())
{
Expand Down Expand Up @@ -2331,33 +2368,71 @@ uint ObjFindByTypeImpl(byte typeId, IntPtr outHandles, uint max)
{
case 0: // Server
{
var all = UnityEngine.Resources.FindObjectsOfTypeAll<Server>();
foreach (var srv in all)
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
try
foreach (var kvp in nm.servers)
{
try
{
var srv = kvp.Value;
if (srv == null || srv.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), srv.Pointer.ToInt64());
count++;
}
catch { }
}
}
else
{
var all = UnityEngine.Resources.FindObjectsOfTypeAll<Server>();
foreach (var srv in all)
{
if (srv.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), srv.Pointer.ToInt64());
count++;
try
{
if (srv.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), srv.Pointer.ToInt64());
count++;
}
catch { }
}
catch { }
}
break;
}
case 4: // NetworkSwitch
{
var all = UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>();
foreach (var sw in all)
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.switches != null)
{
try
foreach (var kvp in nm.switches)
{
if (sw.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), sw.Pointer.ToInt64());
count++;
try
{
var sw = kvp.Value;
if (sw == null || sw.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), sw.Pointer.ToInt64());
count++;
}
catch { }
}
}
else
{
var all = UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>();
foreach (var sw in all)
{
try
{
if (sw.gameObject.scene.name == null) continue;
if (count >= max) break;
Marshal.WriteInt64(outHandles, (int)(count * 8), sw.Pointer.ToInt64());
count++;
}
catch { }
}
catch { }
}
break;
}
Expand Down Expand Up @@ -2596,21 +2671,45 @@ ulong ObjFindByIdImpl(byte typeId, ushort fieldId, IntPtr id, uint idLen)
{
case 0: // Server
{
foreach (var srv in UnityEngine.Resources.FindObjectsOfTypeAll<Server>())
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
try
foreach (var kvp in nm.servers)
{
if (srv.gameObject.scene.name == null) continue;
string val = fieldId switch
try
{
0 => srv.ServerID ?? "",
2 => srv.rackPositionUID.ToString(),
3 => srv.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)srv.Pointer.ToInt64();
var srv = kvp.Value;
if (srv == null || srv.gameObject.scene.name == null) continue;
string val = fieldId switch
{
0 => srv.ServerID ?? "",
2 => srv.rackPositionUID.ToString(),
3 => srv.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)srv.Pointer.ToInt64();
}
catch { }
}
}
else
{
foreach (var srv in UnityEngine.Resources.FindObjectsOfTypeAll<Server>())
{
try
{
if (srv.gameObject.scene.name == null) continue;
string val = fieldId switch
{
0 => srv.ServerID ?? "",
2 => srv.rackPositionUID.ToString(),
3 => srv.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)srv.Pointer.ToInt64();
}
catch { }
}
catch { }
}
// Lookup failed — dump all known servers so we can see if ID mismatch
try
Expand All @@ -2636,20 +2735,43 @@ ulong ObjFindByIdImpl(byte typeId, ushort fieldId, IntPtr id, uint idLen)
}
case 4: // NetworkSwitch
{
foreach (var sw in UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>())
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.switches != null)
{
try
foreach (var kvp in nm.switches)
{
if (sw.gameObject.scene.name == null) continue;
string val = fieldId switch
try
{
1 => sw.switchId ?? "",
3 => sw.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)sw.Pointer.ToInt64();
var sw = kvp.Value;
if (sw == null || sw.gameObject.scene.name == null) continue;
string val = fieldId switch
{
1 => sw.switchId ?? "",
3 => sw.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)sw.Pointer.ToInt64();
}
catch { }
}
}
else
{
foreach (var sw in UnityEngine.Resources.FindObjectsOfTypeAll<NetworkSwitch>())
{
try
{
if (sw.gameObject.scene.name == null) continue;
string val = fieldId switch
{
1 => sw.switchId ?? "",
3 => sw.gameObject.name ?? "",
_ => ""
};
if (val == targetId) return (ulong)sw.Pointer.ToInt64();
}
catch { }
}
catch { }
}
try
{
Expand Down
44 changes: 32 additions & 12 deletions src/GameLayer/Patches/Networking/CablePositionsPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,40 @@

__result = Interlocked.Increment(ref _nextCableId);

HookIntegration.Emit("greg.CABLE.Created",
new gregCore.Core.Models.EventPayload
{
HookName = "greg.CABLE.Created",
OccurredAtUtc = DateTime.UtcNow,
Data = new System.Collections.Generic.Dictionary<string, object>
{
{ "CableId", __result },
{ "Source", "PrefixBypass" }
}
});
try { EmitCreate(__result); } catch { }

Check warning on line 38 in src/GameLayer/Patches/Networking/CablePositionsPatch.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/GameLayer/Patches/Networking/CablePositionsPatch.cs#L38 

Handle the exception or explain in a comment why it can be ignored.

return false;
}
catch (Exception ex)
{
MelonLogger.Error($"[CablePatch] CreateNewCable failed: {ex.Message}");
try { LogError(ex); } catch { }

Check warning on line 44 in src/GameLayer/Patches/Networking/CablePositionsPatch.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/GameLayer/Patches/Networking/CablePositionsPatch.cs#L44 

Handle the exception or explain in a comment why it can be ignored.
__result = Environment.TickCount & 0x7FFFFFFF;
return false;
}
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void EmitCreate(int id)
{
HookIntegration.Emit("greg.CABLE.Created",
new gregCore.Core.Models.EventPayload
{
HookName = "greg.CABLE.Created",
OccurredAtUtc = DateTime.UtcNow,
Data = new System.Collections.Generic.Dictionary<string, object>
{
{ "CableId", id },
{ "Source", "PrefixBypass" }
}
});
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void LogError(Exception ex)
{
MelonLogger.Error($"[CablePatch] CreateNewCable failed: {ex.Message}");
}

public static void SetBaseId(int baseId)
{
int current;
Expand All @@ -67,8 +79,16 @@
}
while (Interlocked.CompareExchange(ref _nextCableId, baseId + 1, current) != current);

try { LogBaseIdSync(baseId); } catch { }

Check warning on line 82 in src/GameLayer/Patches/Networking/CablePositionsPatch.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

src/GameLayer/Patches/Networking/CablePositionsPatch.cs#L82 

Handle the exception or explain in a comment why it can be ignored.
}

[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void LogBaseIdSync(int baseId)
{
MelonLogger.Msg($"[CablePatch] Cable ID counter set to {baseId + 1}");
}

public static int PeekNextId() => _nextCableId;


}
26 changes: 23 additions & 3 deletions src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,32 @@ public static void Register(Table greg, Script script, string modId)
{
var serverTable = new Table(script);

// Helper for O(1) performance lookup via NetworkMap
System.Collections.Generic.IEnumerable<Il2Cpp.Server> GetServers()
{
try
{
var nm = Il2Cpp.NetworkMap.instance;
if (nm != null && nm.servers != null)
{
var list = new System.Collections.Generic.List<Il2Cpp.Server>();
foreach (var kvp in nm.servers)
{
if (kvp.Value != null) list.Add(kvp.Value);
}
return list;
}
}
catch { }
return UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>() ?? new Il2Cpp.Server[0];
}

// greg.server.get_all() → table of server info
serverTable["get_all"] = (Func<Table>)(() =>
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var servers = GetServers();
var result = new Table(script);
int i = 1;
foreach (var s in servers)
Expand Down Expand Up @@ -80,7 +100,7 @@ public static void Register(Table greg, Script script, string modId)
{
try
{
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var servers = GetServers();
foreach (var s in servers)
{
try
Expand All @@ -104,7 +124,7 @@ public static void Register(Table greg, Script script, string modId)
try
{
int repaired = 0;
var servers = UnityEngine.Object.FindObjectsOfType<Il2Cpp.Server>();
var servers = GetServers();
foreach (var s in servers)
{
try
Expand Down
Loading