Skip to content

Commit 5a52bb1

Browse files
fixes after review
1 parent f4bffbb commit 5a52bb1

File tree

7 files changed

+15
-30
lines changed

7 files changed

+15
-30
lines changed

src/IpcSample.ConsoleClient/Client.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private static async Task RunTestsAsync(CancellationToken cancellationToken)
6767
new ComplexNumber{ I = 0.2f, J = 0.1f },
6868
new ComplexNumber{ I = 0.3f, J = 0.5f },
6969
], cancellationToken);
70-
Console.WriteLine($"[TEST 2] sum of 2 complex number is: {result3}", cancellationToken);
70+
Console.WriteLine($"[TEST 2] sum of 2 complex number is: {result3}");
7171

7272
// test 4: call IPC service method without parameter or return
7373
await systemClient.FireAndForgetWithCt(cancellationToken);

src/UiPath.CoreIpc.Extensions.Abstractions/UiPath.CoreIpc.Extensions.Abstractions.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
<TargetFrameworks>net6.0;net461;net6.0-windows</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<LangVersion>preview</LangVersion>
7+
<LangVersion>latest</LangVersion>
88
<ImplicitUsings>true</ImplicitUsings>
99
<Nullable>enable</Nullable>
10-
<EnablePreviewFeatures>true</EnablePreviewFeatures>
1110
<AssemblyName>UiPath.Ipc.Extensions.Abstractions</AssemblyName>
1211
<RootNamespace>UiPath.Ipc.Extensions.Abstractions</RootNamespace>
1312
</PropertyGroup>

src/UiPath.CoreIpc.Extensions.BidirectionalHttp/UiPath.CoreIpc.Extensions.BidirectionalHttp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net6.0;net461;net6.0-windows</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<LangVersion>preview</LangVersion>
7+
<LangVersion>latest</LangVersion>
88
<AssemblyName>UiPath.Ipc.Extensions.BidirectionalHttp</AssemblyName>
99
<RootNamespace>UiPath.Ipc.Extensions.BidirectionalHttp</RootNamespace>
1010
</PropertyGroup>

src/UiPath.CoreIpc/Config/IpcClient.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@ private ServiceClient GetServiceClient(Type proxyType)
2323
}
2424
public TProxy GetProxy<TProxy>() where TProxy : class => GetServiceClient(typeof(TProxy)).GetProxy<TProxy>();
2525

26-
internal ILogger? GetLogger(string name)
27-
{
28-
if (Logger is not null)
29-
{
30-
return Logger;
31-
}
32-
33-
if (ServiceProvider?.GetService<ILoggerFactory>() is not { } loggerFactory)
34-
{
35-
return null;
36-
}
37-
38-
return loggerFactory.CreateLogger(name);
39-
}
40-
4126
internal RouterConfig CreateCallbackRouterConfig()
4227
=> RouterConfig.From(
4328
Callbacks.OrDefault(),

src/UiPath.CoreIpc/Connection.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public Connection(Stream network, string debugName, ILogger? logger, int maxMess
4545

4646
public override string ToString() => DebugName;
4747
public string NewRequestId() => Interlocked.Increment(ref _requestCounter).ToString();
48-
internal Task Listen() => _receiveLoop.Value;
48+
public Task Listen() => _receiveLoop.Value;
4949

50-
internal event Func<Request, ValueTask>? RequestReceived;
51-
internal event Action<string>? CancellationReceived;
50+
public event Func<Request, ValueTask>? RequestReceived;
51+
public event Action<string>? CancellationReceived;
5252
public event EventHandler<EventArgs>? Closed;
5353
#if !NET461
5454
[AsyncMethodBuilder(typeof(PoolingAsyncValueTaskMethodBuilder<>))]
5555
#endif
56-
internal async ValueTask<Response> RemoteCall(Request request, CancellationToken token)
56+
public async ValueTask<Response> RemoteCall(Request request, CancellationToken token)
5757
{
5858
var requestCompletion = Rent();
5959
var requestId = request.Id;
@@ -98,7 +98,7 @@ internal async ValueTask<Response> RemoteCall(Request request, CancellationToken
9898
requestCompletion.Return();
9999
}
100100
}
101-
internal ValueTask Send(Request request, CancellationToken token)
101+
public ValueTask Send(Request request, CancellationToken token)
102102
{
103103
Logger?.LogInformation("Connection.Send...");
104104
var uploadStream = request.UploadStream;
@@ -107,7 +107,7 @@ internal ValueTask Send(Request request, CancellationToken token)
107107
SendMessage(MessageType.Request, requestBytes, token) :
108108
SendStream(MessageType.UploadRequest, requestBytes, uploadStream, token);
109109
}
110-
void CancelRequest(string requestId)
110+
private void CancelRequest(string requestId)
111111
{
112112
CancelServerCall(requestId).LogException(Logger, this);
113113
if (_requests.TryRemove(requestId, out var requestCompletion))
@@ -118,7 +118,7 @@ void CancelRequest(string requestId)
118118
Task CancelServerCall(string requestId) =>
119119
SendMessage(MessageType.CancellationRequest, SerializeToStream(new CancellationRequest(requestId)), default).AsTask();
120120
}
121-
internal ValueTask Send(Response response, CancellationToken cancellationToken)
121+
public ValueTask Send(Response response, CancellationToken cancellationToken)
122122
{
123123
var responseBytes = SerializeToStream(response);
124124
return response.DownloadStream == null ?
@@ -162,7 +162,8 @@ private async ValueTask SendStream(MessageType messageType, Stream data, Stream
162162
private async ValueTask SendMessage(MessageType messageType, MemoryStream data, CancellationToken cancellationToken)
163163
{
164164
Logger?.LogInformation("Connection.SendMessage: Awaiting the acquiring of the sendLock");
165-
await _sendLock.WaitAsync(cancellationToken);
165+
await _sendLock.WaitAsync(cancellationToken); /// ---------
166+
166167
try
167168
{
168169
Logger?.LogInformation($"Connection.SendMessage: sendLock was successfully aquired. Pushing the bytes onto the network. ByteCount: {data.Length}");

src/UiPath.CoreIpc/Server/Server.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static Server()
2727
private readonly TimeSpan _requestTimeout;
2828

2929
private ILogger? Logger => _connection.Logger;
30-
private bool LogEnabled => Logger.Enabled();
30+
private bool LogEnabled => _connection.LogEnabled;
3131
public string DebugName => _connection.DebugName;
3232

3333
public Server(Router router, TimeSpan requestTimeout, Connection connection, IClient? client = null)

src/UiPath.CoreIpc/Wire/IpcJsonSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ private void Serialize(object? obj, TextWriter streamWriter, JsonSerializer seri
2929
serializer.Serialize(writer, obj);
3030
writer.Flush();
3131
}
32-
public char[] Rent(int minimumLength) => ArrayPool<char>.Shared.Rent(minimumLength);
33-
public void Return(char[]? array)
32+
char[] IArrayPool<char>.Rent(int minimumLength) => ArrayPool<char>.Shared.Rent(minimumLength);
33+
void IArrayPool<char>.Return(char[]? array)
3434
{
3535
if (array is null)
3636
{

0 commit comments

Comments
 (0)