starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-02-13 21:24:00 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

IpcMain: Properly handle Ipc message params (always 2-elem array)

Browse Source
This commit is contained in:
softworkz
2025-11-17 13:56:48 +01:00
parent b89c08ee96
commit be518a7a10
1 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/ElectronNET.API/API/IpcMain.cs
View File

@@ -63,25 +63,23 @@ namespace ElectronNET.API
BridgeConnector.Socket.Off(channel);
BridgeConnector.Socket.On<JsonElement>(channel, (args) =>
{
List<object> objectArray = FormatArguments(args);
if (objectArray.Count == 1)
{
listener(objectArray.First());
}
else
{
listener(objectArray);
}
var arg = FormatArguments(args);
listener(arg);
});
}
private static List<object> FormatArguments(JsonElement args)
private static object FormatArguments(JsonElement args)
{
var objectArray = args.Deserialize<object[]>(BoxedObjectSerializationOptions).ToList();
var objectArray = args.Deserialize<object[]>(ElectronJson.Options).ToList();
objectArray.RemoveAll(item => item is null);
return objectArray;
Debug.Assert(objectArray.Count <= 2);
if (objectArray.Count == 2)
{
return objectArray[1];
}
return null;
}
/// <summary>
@@ -98,18 +96,8 @@ namespace ElectronNET.API
BridgeConnector.Socket.Emit("registerSyncIpcMainChannel", channel);
BridgeConnector.Socket.On<JsonElement>(channel, (args) =>
{
List<object> objectArray = FormatArguments(args);
object parameter;
if (objectArray.Count == 1)
{
parameter = objectArray.First();
}
else
{
parameter = objectArray;
}
var result = listener(parameter);
var arg = FormatArguments(args);
var result = listener(arg);
BridgeConnector.Socket.Emit(channel + "Sync", result);
});
}
@@ -125,16 +113,8 @@ namespace ElectronNET.API
BridgeConnector.Socket.Emit("registerOnceIpcMainChannel", channel);
BridgeConnector.Socket.Once<JsonElement>(channel, (args) =>
{
List<object> objectArray = FormatArguments(args);
if (objectArray.Count == 1)
{
listener(objectArray.First());
}
else
{
listener(objectArray);
}
var arg = FormatArguments(args);
listener(arg);
});
}