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

Author: softworkz

src/ElectronNET.API/API/IpcMain.cs

@@ -63,25 +63,23 @@ public async Task On(string channel, Action<object> listener)
             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,9 @@ public void OnSync(string channel, Func<object, object> listener)
             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);
+                listener(arg);
+                var result = listener(arg);
                 BridgeConnector.Socket.Emit(channel + "Sync", result);
             });
         }
@@ -125,16 +114,8 @@ public void Once(string channel, Action<object> listener)
             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);
             });
         }