Fix logger, netmessage callback

managed/src/SwiftlyS2.Core/Misc/SwiftlyLogger.cs

@@ -52,7 +52,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
     var id = $"[{eventId.ToString()}]";
     var color = GetLogLevelColor(logLevel);
 
-    AnsiConsole.MarkupLineInterpolated($"[lightsteelblue1 bold]{_contextName}[/] [lightsteelblue]|[/] [grey42]{timestamp}[/] [lightsteelblue]|[/] [{color}]{level}[/] [lightsteelblue]|[/] [lightsteelblue]{_categoryName}{id}[/][default]");
+    AnsiConsole.MarkupLineInterpolated($"[lightsteelblue1 bold]{_contextName}[/] [lightsteelblue]|[/] [grey42]{timestamp}[/] [lightsteelblue]|[/] [{color}]{level}[/] [lightsteelblue]|[/] [lightsteelblue]{_categoryName}{id}[/]");
 
     string? message = formatter != null ? formatter(state, exception) : state?.ToString();
     if (!string.IsNullOrEmpty(message))

managed/src/SwiftlyS2.Core/Modules/NetMessages/NetMessageHookCallback.cs

@@ -7,15 +7,16 @@
 using SwiftlyS2.Shared.ProtobufDefinitions;
 using SwiftlyS2.Shared.Profiler;
 using System.Diagnostics.CodeAnalysis;
+using SwiftlyS2.Shared.Misc;
 
 namespace SwiftlyS2.Core.NetMessages;
 
 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-internal delegate bool NetMessageClientHookCallbackDelegate(int playerId, int msgId, nint pMessage);
+internal delegate HookResult NetMessageClientHookCallbackDelegate(int playerId, int msgId, nint pMessage);
 
 
 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-internal delegate bool NetMessageServerHookCallbackDelegate(nint pPlayerMask, int msgId, nint pMessage);
+internal delegate HookResult NetMessageServerHookCallbackDelegate(nint pPlayerMask, int msgId, nint pMessage);
 
 internal abstract class NetMessageHookCallback : IDisposable {
 
@@ -53,16 +54,16 @@ public NetMessageClientHookCallback(INetMessageService.ClientNetMessageHandler<T
     _unmanagedCallback = (playerId, msgId, pMessage) => {
       try
       {
-        if (msgId != T.MessageId) return true;
+        if (msgId != T.MessageId) return HookResult.Continue;
         var category = "NetMessageClientHookCallback::" + typeof(T).Name;
         Profiler.StartRecording(category);
         var msg = T.Wrap(pMessage, false);
-        _callback(msg, playerId);
+        var result = _callback(msg, playerId);
         Profiler.StopRecording(category);
-        return true;
+        return result;
       } catch (Exception e) {
         _logger.LogError(e, "Error in net message client hook callback for {MessageType}", typeof(T).Name);
-        return false;
+        return HookResult.Continue;
       }
     };
     _unmanagedCallbackPtr = Marshal.GetFunctionPointerForDelegate(_unmanagedCallback);
@@ -93,19 +94,19 @@ public NetMessageServerHookCallback(INetMessageService.ServerNetMessageHandler<T
     _unmanagedCallback = (pPlayerMask, msgId, pMessage) => {
       try
       {
-        if (msgId != T.MessageId) return true;
+        if (msgId != T.MessageId) return HookResult.Continue;
         var category = "NetMessageServerHookCallback::" + typeof(T).Name;
         Profiler.StartRecording(category);
         var msg = T.Wrap(pMessage, false);
         var mask = pPlayerMask.Read<ulong>();
         msg.Recipients.RecipientsMask = mask;
-        _callback(msg);
+        var result = _callback(msg);
         pPlayerMask.Write(msg.Recipients.ToMask());
         Profiler.StopRecording(category);
-        return true;
+        return result;
       } catch (Exception e) {
         _logger.LogError(e, "Error in net message server hook callback for {MessageType}", typeof(T).Name);
-        return false;
+        return HookResult.Continue;
       }
     };
     _unmanagedCallbackPtr = Marshal.GetFunctionPointerForDelegate(_unmanagedCallback);

src/scripting/network/netmessages.cpp

@@ -139,7 +139,7 @@ bool Bridge_NetMessages_HasField(void* pmsg, const char* fieldName)
     google::protobuf::Message* msg = (google::protobuf::Message*)pmsg;
     GETCHECK_FIELD(false);
     CHECK_FIELD_NOT_REPEATED(false);
-    
+
     return msg->GetReflection()->HasField(*msg, field);
 }
 
@@ -897,7 +897,7 @@ uint64_t Bridge_NetMessages_AddNetMessageServerHook(void* callback_ptr)
     auto netmessages = g_ifaceService.FetchInterface<INetMessages>(NETMESSAGES_INTERFACE_VERSION);
 
     return netmessages->AddServerMessageSendCallback([callback_ptr](uint64_t* clients, int messageid, void* msg) {
-        return ((bool(*)(uint64_t*, int, void*))callback_ptr)(clients, messageid, msg);
+        return ((int(*)(uint64_t*, int, void*))callback_ptr)(clients, messageid, msg);
     });
 }
 
@@ -912,7 +912,7 @@ uint64_t Bridge_NetMessages_AddNetMessageClientHook(void* callback_ptr)
     auto netmessages = g_ifaceService.FetchInterface<INetMessages>(NETMESSAGES_INTERFACE_VERSION);
 
     return netmessages->AddClientMessageSendCallback([callback_ptr](int playerid, int messageid, void* msg) {
-        return ((bool(*)(int, int, void*))callback_ptr)(playerid, messageid, msg);
+        return ((int(*)(int, int, void*))callback_ptr)(playerid, messageid, msg);
     });
 }