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

#647 correct to ElectronNET.API Process member for versions field

Browse Source
This commit is contained in:
Todd Schavey
2022-01-02 23:11:01 -05:00
parent ba82b9a600
commit 592148116b
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ElectronNET.API/BridgeConnector.cs
View File

@@ -90,7 +90,22 @@ namespace ElectronNET.API
BridgeConnector.Socket.On(eventCompletedString, (value) =>
{
BridgeConnector.Socket.Off(eventCompletedString);
taskCompletionSource.SetResult( ((JObject)value).ToObject<T>() );
if (value == null)
{
Console.WriteLine($"ERROR: BridgeConnector (event: '{eventString}') returned null. Socket loop hang.");
taskCompletionSource.SetCanceled();
return;
}
try
{
taskCompletionSource.SetResult( ((JObject)value).ToObject<T>() );
}
catch (Exception e)
{
Console.WriteLine($"ERROR: BridgeConnector (event: '{eventString}') exception: {e.Message}. Socket loop hung.");
}
});
BridgeConnector.Socket.Emit(eventString);
@@ -110,7 +125,21 @@ namespace ElectronNET.API
BridgeConnector.Socket.On(eventCompletedString, (value) =>
{
BridgeConnector.Socket.Off(eventCompletedString);
taskCompletionSource.SetResult( ((JArray)value).ToObject<T>() );
if (value == null)
{
Console.WriteLine($"ERROR: BridgeConnector (event: '{eventString}') returned null. Socket loop hang.");
taskCompletionSource.SetCanceled();
return;
}
try
{
taskCompletionSource.SetResult( ((JArray)value).ToObject<T>() );
}
catch (Exception e)
{
Console.WriteLine($"ERROR: BridgeConnector (event: '{eventString}') exception: {e.Message}. Socket loop hung.");
}
});
BridgeConnector.Socket.Emit(eventString);

4
ElectronNET.API/Entities/Versions.cs → ElectronNET.API/Entities/ProcessVersions.cs
View File

@@ -3,7 +3,7 @@ namespace ElectronNET.API
/// <summary>
///
/// </summary>
public class Versions
public class ProcessVersions
{
/// <summary>
/// Gets or sets a value representing Chrome's version string.
@@ -13,6 +13,6 @@ namespace ElectronNET.API
/// <summary>
/// Gets or sets a value representing Electron's version string.
/// </summary>
public bool Electron { get; set; }
public string Electron { get; set; }
}
}

4
ElectronNET.API/Process.cs
View File

@@ -82,11 +82,11 @@ namespace ElectronNET.API
/// <summary>
///
/// </summary>
public Task<Versions> VersionsAsync
public Task<ProcessVersions> VersionsAsync
{
get
{
return BridgeConnector.GetValueOverSocketAsync<Versions>(
return BridgeConnector.GetObjectOverSocketAsync<ProcessVersions>(
"process-versions", "process-versions-Completed");
}
}