Skip to content

Commit 0522bc4

Browse files
committed
fix: using correct deserialization type instead JsonElement for everyting except mixed arrays
1 parent 168ecea commit 0522bc4

20 files changed

+191
-242
lines changed

src/ElectronNET.API/API/ApiBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ public PropertyGetter(ApiBase apiBase, string callerName, int timeoutMs)
152152

153153
var messageName = apiBase.propertyMessageNames.GetOrAdd(callerName, s => apiBase.objectName + s.StripAsync());
154154

155-
BridgeConnector.Socket.On<JsonElement>(eventName, (result) =>
155+
BridgeConnector.Socket.On<T>(eventName, (result) =>
156156
{
157157
BridgeConnector.Socket.Off(eventName);
158158

159159
lock (this)
160160
{
161161
try
162162
{
163-
var value = result.Deserialize<T>(ElectronJson.Options);
163+
var value = result;
164164
this.tcs?.SetResult(value);
165165
}
166166
catch (Exception ex)

src/ElectronNET.API/API/App.cs

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -547,11 +547,11 @@ public async Task<string> GetPathAsync(PathName pathName, CancellationToken canc
547547
var taskCompletionSource = new TaskCompletionSource<string>();
548548
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
549549
{
550-
BridgeConnector.Socket.On<JsonElement>("appGetPathCompleted", (path) =>
550+
BridgeConnector.Socket.On<string>("appGetPathCompleted", (path) =>
551551
{
552552
BridgeConnector.Socket.Off("appGetPathCompleted");
553553

554-
taskCompletionSource.SetResult(path.GetString());
554+
taskCompletionSource.SetResult(path);
555555
});
556556

557557
BridgeConnector.Socket.Emit("appGetPath", pathName.GetDescription());
@@ -716,10 +716,10 @@ public async Task<bool> SetAsDefaultProtocolClientAsync(string protocol, string
716716
var taskCompletionSource = new TaskCompletionSource<bool>();
717717
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
718718
{
719-
BridgeConnector.Socket.On<JsonElement>("appSetAsDefaultProtocolClientCompleted", (success) =>
719+
BridgeConnector.Socket.On<bool>("appSetAsDefaultProtocolClientCompleted", (success) =>
720720
{
721721
BridgeConnector.Socket.Off("appSetAsDefaultProtocolClientCompleted");
722-
taskCompletionSource.SetResult(success.GetBoolean());
722+
taskCompletionSource.SetResult(success);
723723
});
724724

725725
BridgeConnector.Socket.Emit("appSetAsDefaultProtocolClient", protocol, path, args);
@@ -770,10 +770,10 @@ public async Task<bool> RemoveAsDefaultProtocolClientAsync(string protocol, stri
770770
var taskCompletionSource = new TaskCompletionSource<bool>();
771771
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
772772
{
773-
BridgeConnector.Socket.On<JsonElement>("appRemoveAsDefaultProtocolClientCompleted", (success) =>
773+
BridgeConnector.Socket.On<bool>("appRemoveAsDefaultProtocolClientCompleted", (success) =>
774774
{
775775
BridgeConnector.Socket.Off("appRemoveAsDefaultProtocolClientCompleted");
776-
taskCompletionSource.SetResult(success.GetBoolean());
776+
taskCompletionSource.SetResult(success);
777777
});
778778

779779
BridgeConnector.Socket.Emit("appRemoveAsDefaultProtocolClient", protocol, path, args);
@@ -842,10 +842,10 @@ public async Task<bool> IsDefaultProtocolClientAsync(string protocol, string pat
842842
var taskCompletionSource = new TaskCompletionSource<bool>();
843843
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
844844
{
845-
BridgeConnector.Socket.On<JsonElement>("appIsDefaultProtocolClientCompleted", (success) =>
845+
BridgeConnector.Socket.On<bool>("appIsDefaultProtocolClientCompleted", (success) =>
846846
{
847847
BridgeConnector.Socket.Off("appIsDefaultProtocolClientCompleted");
848-
taskCompletionSource.SetResult(success.GetBoolean());
848+
taskCompletionSource.SetResult(success);
849849
});
850850

851851
BridgeConnector.Socket.Emit("appIsDefaultProtocolClient", protocol, path, args);
@@ -870,10 +870,10 @@ public async Task<bool> SetUserTasksAsync(UserTask[] userTasks, CancellationToke
870870
var taskCompletionSource = new TaskCompletionSource<bool>();
871871
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
872872
{
873-
BridgeConnector.Socket.On<JsonElement>("appSetUserTasksCompleted", (success) =>
873+
BridgeConnector.Socket.On<bool>("appSetUserTasksCompleted", (success) =>
874874
{
875875
BridgeConnector.Socket.Off("appSetUserTasksCompleted");
876-
taskCompletionSource.SetResult(success.GetBoolean());
876+
taskCompletionSource.SetResult(success);
877877
});
878878

879879
BridgeConnector.Socket.Emit("appSetUserTasks", userTasks);
@@ -943,10 +943,10 @@ public async Task<bool> RequestSingleInstanceLockAsync(Action<string[], string>
943943
var taskCompletionSource = new TaskCompletionSource<bool>();
944944
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
945945
{
946-
BridgeConnector.Socket.On<JsonElement>("appRequestSingleInstanceLockCompleted", (success) =>
946+
BridgeConnector.Socket.On<bool>("appRequestSingleInstanceLockCompleted", (success) =>
947947
{
948948
BridgeConnector.Socket.Off("appRequestSingleInstanceLockCompleted");
949-
taskCompletionSource.SetResult(success.GetBoolean());
949+
taskCompletionSource.SetResult(success);
950950
});
951951

952952
BridgeConnector.Socket.Off("secondInstance");
@@ -1069,10 +1069,10 @@ public async Task<int> ImportCertificateAsync(ImportCertificateOptions options,
10691069
var taskCompletionSource = new TaskCompletionSource<int>();
10701070
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
10711071
{
1072-
BridgeConnector.Socket.On<JsonElement>("appImportCertificateCompleted", (result) =>
1072+
BridgeConnector.Socket.On<int>("appImportCertificateCompleted", (result) =>
10731073
{
10741074
BridgeConnector.Socket.Off("appImportCertificateCompleted");
1075-
taskCompletionSource.SetResult(result.GetInt32());
1075+
taskCompletionSource.SetResult(result);
10761076
});
10771077

10781078
BridgeConnector.Socket.Emit("appImportCertificate", options);
@@ -1125,10 +1125,10 @@ public async Task<bool> SetBadgeCountAsync(int count, CancellationToken cancella
11251125
var taskCompletionSource = new TaskCompletionSource<bool>();
11261126
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
11271127
{
1128-
BridgeConnector.Socket.On<JsonElement>("appSetBadgeCountCompleted", (success) =>
1128+
BridgeConnector.Socket.On<bool>("appSetBadgeCountCompleted", (success) =>
11291129
{
11301130
BridgeConnector.Socket.Off("appSetBadgeCountCompleted");
1131-
taskCompletionSource.SetResult(success.GetBoolean());
1131+
taskCompletionSource.SetResult(success);
11321132
});
11331133

11341134
BridgeConnector.Socket.Emit("appSetBadgeCount", count);
@@ -1185,12 +1185,9 @@ public async Task<LoginItemSettings> GetLoginItemSettingsAsync(LoginItemSettings
11851185
var taskCompletionSource = new TaskCompletionSource<LoginItemSettings>();
11861186
using (cancellationToken.Register(() => taskCompletionSource.TrySetCanceled()))
11871187
{
1188-
BridgeConnector.Socket.On<JsonElement>("appGetLoginItemSettingsCompleted", (loginItemSettings) =>
1188+
BridgeConnector.Socket.On<LoginItemSettings>("appGetLoginItemSettingsCompleted", (result) =>
11891189
{
11901190
BridgeConnector.Socket.Off("appGetLoginItemSettingsCompleted");
1191-
1192-
var result = loginItemSettings.Deserialize<LoginItemSettings>(ElectronJson.Options);
1193-
11941191
taskCompletionSource.SetResult(result);
11951192
});
11961193

@@ -1308,10 +1305,10 @@ public Task<string> UserAgentFallbackAsync
13081305
{
13091306
var taskCompletionSource = new TaskCompletionSource<string>();
13101307

1311-
BridgeConnector.Socket.On<JsonElement>("appGetUserAgentFallbackCompleted", (result) =>
1308+
BridgeConnector.Socket.On<string>("appGetUserAgentFallbackCompleted", (result) =>
13121309
{
13131310
BridgeConnector.Socket.Off("appGetUserAgentFallbackCompleted");
1314-
taskCompletionSource.SetResult(result.GetString());
1311+
taskCompletionSource.SetResult(result);
13151312
});
13161313

13171314
BridgeConnector.Socket.Emit("appGetUserAgentFallback");

0 commit comments

Comments
 (0)