starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-04-26 08:00:58 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

fix ipc data serialization

Browse Source
This commit is contained in:
theolivenbaum
2021-09-02 16:45:03 +02:00
parent 5f4b1628e5
commit 4fae2aeef2
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ElectronNET.API/IpcMain.cs
View File

@@ -173,34 +173,28 @@ namespace ElectronNET.API
/// <param name="data">Arguments data.</param>
public void Send(BrowserWindow browserWindow, string channel, params object[] data)
{
List<JObject> jobjects = new List<JObject>();
List<JArray> jarrays = new List<JArray>();
List<object> objects = new List<object>();
var objectsWithCorrectSerialization = new List<object>();
objectsWithCorrectSerialization.Add(browserWindow.Id);
objectsWithCorrectSerialization.Add(channel);
foreach (var parameterObject in data)
{
if(parameterObject.GetType().IsArray || parameterObject.GetType().IsGenericType && parameterObject is IEnumerable)
{
jarrays.Add(JArray.FromObject(parameterObject, _jsonSerializer));
objectsWithCorrectSerialization.Add(JArray.FromObject(parameterObject, _jsonSerializer));
}
else if(parameterObject.GetType().IsClass && !parameterObject.GetType().IsPrimitive && !(parameterObject is string))
{
jobjects.Add(JObject.FromObject(parameterObject, _jsonSerializer));
objectsWithCorrectSerialization.Add(JObject.FromObject(parameterObject, _jsonSerializer));
}
else if(parameterObject.GetType().IsPrimitive || (parameterObject is string))
{
objects.Add(parameterObject);
objectsWithCorrectSerialization.Add(parameterObject);
}
}
if(jobjects.Count > 0 || jarrays.Count > 0)
{
BridgeConnector.Emit("sendToIpcRenderer", browserWindow.Id, channel, jarrays.ToArray(), jobjects.ToArray(), objects.ToArray());
}
else
{
BridgeConnector.Emit("sendToIpcRenderer", browserWindow.Id, channel, data);
}
BridgeConnector.Emit("sendToIpcRenderer", objectsWithCorrectSerialization.ToArray());
}
/// <summary>

1
ElectronNET.Host/api/ipc.js
View File

@@ -40,6 +40,7 @@ module.exports = (socket) => {
});
socket.on('sendToIpcRenderer', (browserWindowId, channel, ...data) => {
const window = electron_1.BrowserWindow.fromId(browserWindowId);
console.log(data);
if (window) {
window.webContents.send(channel, ...data);
}