Copilot commented on code in PR #3930: URL: https://github.com/apache/thrift/pull/3930#discussion_r4098806038
########## lib/netstd/Thrift/Transport/Client/THttpPerCallTransport.cs: ########## @@ -0,0 +1,183 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace Thrift.Transport.Client +{ + /// <summary> + /// Implementation of a per-call transport for THttpTransport. + /// Each call to the server will create a new HTTP request and response. + /// </summary> + internal class THttpPerCallTransport : TEndpointTransport + { + private readonly THttpTransport _parent; + private readonly MemoryStream _request = new MemoryStream(); + + private HttpResponseMessage _response; + private Stream _responseStream; + private CancellationTokenSource _responseReadTimeout; + private bool _sent; + private bool _disposed; + + public THttpPerCallTransport(THttpTransport parent) : base(parent.Configuration) + { + this._parent = parent; + } + + public override bool IsOpen => !_disposed; + + public override Task WriteAsync( + byte[] buffer, + int offset, + int length, + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + return _request.WriteAsync( + buffer, + offset, + length, + cancellationToken); + } + + public override async Task FlushAsync( + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + _request.Position = 0; + var response = await _parent.SendAsync(_request, cancellationToken); + + var responseReadTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + if (_parent.ConnectTimeout > 0) + { + responseReadTimeout.CancelAfter(_parent.ConnectTimeout); + } + + Stream responseStream; + try + { +#if NET5_0_OR_GREATER + responseStream = await response.Content.ReadAsStreamAsync(cancellationToken); +#else + responseStream = await response.Content.ReadAsStreamAsync(); +#endif + } Review Comment: The parent transport explicitly rewinds seekable response streams before exposing them, but the per-call path omits that step. A handler/content implementation that returns a seekable stream with a non-zero position will make the protocol start reading from the wrong offset, so this path should apply the same `CanSeek`/`Seek(0, Begin)` normalization before storing the stream. ########## lib/netstd/Thrift/Transport/Client/THttpPerCallTransport.cs: ########## @@ -0,0 +1,183 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace Thrift.Transport.Client +{ + /// <summary> + /// Implementation of a per-call transport for THttpTransport. + /// Each call to the server will create a new HTTP request and response. + /// </summary> + internal class THttpPerCallTransport : TEndpointTransport + { + private readonly THttpTransport _parent; + private readonly MemoryStream _request = new MemoryStream(); + + private HttpResponseMessage _response; + private Stream _responseStream; + private CancellationTokenSource _responseReadTimeout; + private bool _sent; + private bool _disposed; + + public THttpPerCallTransport(THttpTransport parent) : base(parent.Configuration) + { + this._parent = parent; + } + + public override bool IsOpen => !_disposed; + + public override Task WriteAsync( + byte[] buffer, + int offset, + int length, + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + return _request.WriteAsync( + buffer, + offset, + length, + cancellationToken); + } + + public override async Task FlushAsync( + CancellationToken cancellationToken) + { + if (_sent) + { + throw new InvalidOperationException("The request has already been sent."); + } + + _request.Position = 0; + var response = await _parent.SendAsync(_request, cancellationToken); + + var responseReadTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + if (_parent.ConnectTimeout > 0) + { + responseReadTimeout.CancelAfter(_parent.ConnectTimeout); + } + + Stream responseStream; + try + { +#if NET5_0_OR_GREATER + responseStream = await response.Content.ReadAsStreamAsync(cancellationToken); +#else + responseStream = await response.Content.ReadAsStreamAsync(); +#endif + } + catch + { + response.Dispose(); + responseReadTimeout.Dispose(); + throw; Review Comment: Exceptions raised while acquiring the response stream escape as raw `IOException`/`OperationCanceledException` (the new test currently codifies this), whereas `THttpTransport.FlushAsync` translates the same transport-stage failures to `TTransportException`. Consumers switching to the per-call provider therefore receive a different error contract for the same HTTP operation; map these exceptions consistently after disposing the response and timeout source. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
