[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Feb 9, 2023
Merged

[release/7.0][browser][http] Fix blocking of streaming response and abort #81092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 111 additions & 8 deletions src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
}

[Theory]
[InlineData(true, true)]
[InlineData(true, false)]
[InlineData(false, true)]
[InlineData(false, false)]
[InlineData(null, false)]
[InlineData(true, true, true)]
[InlineData(true, true, false)]
[InlineData(true, false, false)]
[InlineData(false, true, false)]
[InlineData(false, false, false)]
[InlineData(null, false, false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
{
if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
{
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
return;
}

if (enableWasmStreaming && !PlatformDetection.IsBrowser)
{
// enableWasmStreaming makes only sense on Browser platform
return;
}

var tcs = new TaskCompletionSource<bool>();
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
{
var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

// Various forms of reading
var buffer = new byte[1];
var buffer2 = new byte[2];

if (PlatformDetection.IsBrowser)
{
#if !NETFRAMEWORK
Assert.Equal('h', await responseStream.ReadByteAsync());
if(slowChunks)
{
Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
Assert.Equal((byte)'h', buffer2[0]);
tcs.SetResult(true);
}
else
{
Assert.Equal('h', await responseStream.ReadByteAsync());
}
Assert.Equal('e', await responseStream.ReadByteAsync());
Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
{
case true:
await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
if(PlatformDetection.IsBrowser && slowChunks)
{
await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
await tcs.Task;
await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
await connection.SendResponseBodyAsync("0\r\n\r\n", true);
}
else
{
await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
}
break;

case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
server => server.AcceptConnectionSendResponseAndCloseAsync());
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
public async Task ReadAsStreamAsync_StreamingCancellation()
{
var tcs = new TaskCompletionSource<bool>();
var tcs2 = new TaskCompletionSource<bool>();
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
{
var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

var cts = new CancellationTokenSource();
using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
{
using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
{
var buffer = new byte[1];
#if !NETFRAMEWORK
Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
Assert.Equal((byte)'h', buffer[0]);
var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
await tcs2.Task; // wait for the request and response header to be sent
cts.Cancel();
await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
tcs.SetResult(true);
#endif
}
}
}, async server =>
{
await server.AcceptConnectionAsync(async connection =>
{
await connection.ReadRequestDataAsync();
await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
tcs2.SetResult(true);
await tcs.Task;
});
});
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
public async Task ReadAsStreamAsync_Cancellation()
{
var tcs = new TaskCompletionSource<bool>();
var tcs2 = new TaskCompletionSource<bool>();
await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
{
var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
var cts = new CancellationTokenSource();
using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
{
var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
await tcs2.Task; // wait for the request to be sent
cts.Cancel();
await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
tcs.SetResult(true);
}
}, async server =>
{
await server.AcceptConnectionAsync(async connection =>
{
await connection.ReadRequestDataAsync();
tcs2.SetResult(true);
await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
await tcs.Task;
});
});
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down
53 changes: 25 additions & 28 deletions src/mono/wasm/runtime/http.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
res.__abort_controller.abort();
if (res.__reader) {
res.__reader.cancel();
res.__reader.cancel().catch((err) => {
if (err && err.name !== "AbortError") {
Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
}
// otherwise, it's expected
});
}
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
// the bufferPtr is pinned by the caller
const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
return wrap_as_cancelable_promise(async () => {
if (!res.__chunk && res.body) {
res.__reader = res.body.getReader();
if (!res.__reader) {
res.__reader = res.body!.getReader();
}
if (!res.__chunk) {
res.__chunk = await res.__reader.read();
res.__source_offset = 0;
}
if (res.__chunk.done) {
return 0;
}

let target_offset = 0;
let bytes_read = 0;
// loop until end of browser stream or end of C# buffer
while (res.__reader && res.__chunk && !res.__chunk.done) {
const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
if (remaining_source === 0) {
res.__chunk = await res.__reader.read();
res.__source_offset = 0;
continue;// are we done yet
}

const remaining_target = view.byteLength - target_offset;
const bytes_copied = Math.min(remaining_source, remaining_target);
const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

// copy available bytes
view.set(source_view, target_offset);
target_offset += bytes_copied;
bytes_read += bytes_copied;
res.__source_offset += bytes_copied;
const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

if (target_offset == view.byteLength) {
return bytes_read;
}
const bytes_copied = Math.min(remaining_source, view.byteLength);
const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
view.set(source_view, 0);
res.__source_offset += bytes_copied;
if (remaining_source == bytes_copied) {
res.__chunk = undefined;
}
return bytes_read;

return bytes_copied;
});
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/7.0][browser][http] Fix blocking of streaming response and abort#81092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

carlossanlop
merged 1 commit into

from

Feb 9, 2023
 Merged


[release/7.0][browser][http] Fix blocking of streaming response and abort
#81092
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


119 changes: 111 additions & 8 deletions
src/libraries/Common/tests/System/Net/Http/HttpClientHandlerTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -984,13 +984,14 @@ await connection.WriteStringAsync(
 }

 [Theory]
 [InlineData(true, true)]
 [InlineData(true, false)]
 [InlineData(false, true)]
 [InlineData(false, false)]
 [InlineData(null, false)]
 [InlineData(true, true, true)]
 [InlineData(true, true, false)]
 [InlineData(true, false, false)]
 [InlineData(false, true, false)]
 [InlineData(false, false, false)]
 [InlineData(null, false, false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming)
 public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(bool? chunked, bool enableWasmStreaming, bool slowChunks)
 {
 if (IsWinHttpHandler && UseVersion >= HttpVersion20.Value)
 {
Expand All@@ -1003,6 +1004,13 @@ public async Task ReadAsStreamAsync_HandlerProducesWellBehavedResponseStream(boo
 return;
 }

 if (enableWasmStreaming && !PlatformDetection.IsBrowser)
 {
 // enableWasmStreaming makes only sense on Browser platform
 return;
 }

 var tcs = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
Expand DownExpand Up@@ -1079,11 +1087,21 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>

 // Various forms of reading
 var buffer = new byte[1];
 var buffer2 = new byte[2];

 if (PlatformDetection.IsBrowser)
 {
#if !NETFRAMEWORK
 Assert.Equal('h', await responseStream.ReadByteAsync());
 if(slowChunks)
 {
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer2)));
 Assert.Equal((byte)'h', buffer2[0]);
 tcs.SetResult(true);
 }
 else
 {
 Assert.Equal('h', await responseStream.ReadByteAsync());
 }
 Assert.Equal('e', await responseStream.ReadByteAsync());
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'l', buffer[0]);
Expand DownExpand Up@@ -1184,7 +1202,18 @@ await server.AcceptConnectionAsync(async connection =>
 {
 case true:
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 if(PlatformDetection.IsBrowser && slowChunks)
 {
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 await connection.SendResponseBodyAsync("2\r\nel\r\n", false);
 await connection.SendResponseBodyAsync("8\r\nlo world\r\n", false);
 await connection.SendResponseBodyAsync("0\r\n\r\n", true);
 }
 else
 {
 await connection.SendResponseBodyAsync("3\r\nhel\r\n8\r\nlo world\r\n0\r\n\r\n");
 }
 break;

 case false:
Expand DownExpand Up@@ -1295,6 +1324,80 @@ await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 server => server.AcceptConnectionSendResponseAndCloseAsync());
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/65429", typeof(PlatformDetection), nameof(PlatformDetection.IsNodeJS))]
 public async Task ReadAsStreamAsync_StreamingCancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
#if !NETFRAMEWORK
 request.Options.Set(new HttpRequestOptionsKey<bool>("WebAssemblyEnableStreamingResponse"), true);
#endif

 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 using (HttpResponseMessage response = await client.SendAsync(TestAsync, request, CancellationToken.None))
 {
 using (Stream responseStream = await response.Content.ReadAsStreamAsync(TestAsync))
 {
 var buffer = new byte[1];
#if !NETFRAMEWORK
 Assert.Equal(1, await responseStream.ReadAsync(new Memory<byte>(buffer)));
 Assert.Equal((byte)'h', buffer[0]);
 var sizePromise = responseStream.ReadAsync(new Memory<byte>(buffer), cts.Token);
 await tcs2.Task; // wait for the request and response header to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await sizePromise);
 tcs.SetResult(true);
#endif
 }
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 tcs2.SetResult(true);
 await tcs.Task;
 });
 });
 }

 [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser))]
 public async Task ReadAsStreamAsync_Cancellation()
 {
 var tcs = new TaskCompletionSource<bool>();
 var tcs2 = new TaskCompletionSource<bool>();
 await LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
 {
 var request = new HttpRequestMessage(HttpMethod.Get, uri) { Version = UseVersion };
 var cts = new CancellationTokenSource();
 using (var client = new HttpMessageInvoker(CreateHttpClientHandler()))
 {
 var responsePromise = client.SendAsync(TestAsync, request, cts.Token);
 await tcs2.Task; // wait for the request to be sent
 cts.Cancel();
 await Assert.ThrowsAsync<TaskCanceledException>(async () => await responsePromise);
 tcs.SetResult(true);
 }
 }, async server =>
 {
 await server.AcceptConnectionAsync(async connection =>
 {
 await connection.ReadRequestDataAsync();
 tcs2.SetResult(true);
 await connection.SendResponseAsync(HttpStatusCode.OK, headers: new HttpHeaderData[] { new HttpHeaderData("Transfer-Encoding", "chunked") }, isFinal: false);
 await connection.SendResponseBodyAsync("1\r\nh\r\n", false);
 await tcs.Task;
 });
 });
 }

 [Fact]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/58812", TestPlatforms.Browser)]
 public async Task Dispose_DisposingHandlerCancelsActiveOperationsWithoutResponses()
Expand Down

53 changes: 25 additions & 28 deletions
src/mono/wasm/runtime/http.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { Module } from "./imports";
import { MemoryViewType, Span } from "./marshal";
import { mono_assert } from "./types";
import { VoidPtr } from "./types/emscripten";
Expand All@@ -21,7 +22,12 @@ export function http_wasm_abort_request(abort_controller: AbortController): void
export function http_wasm_abort_response(res: ResponseExtension): void {
 res.__abort_controller.abort();
 if (res.__reader) {
 res.__reader.cancel();
 res.__reader.cancel().catch((err) => {
 if (err && err.name !== "AbortError") {
 Module.printErr("MONO_WASM: Error in http_wasm_abort_response: " + err);
 }
 // otherwise, it's expected
 });
 }
}

Expand DownExpand Up@@ -100,42 +106,33 @@ export function http_wasm_get_response_bytes(res: ResponseExtension, view: Span)
 return bytes_read;
}

export async function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
export function http_wasm_get_streamed_response_bytes(res: ResponseExtension, bufferPtr: VoidPtr, bufferLength: number): Promise<number> {
 // the bufferPtr is pinned by the caller
 const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
 return wrap_as_cancelable_promise(async () => {
 if (!res.__chunk && res.body) {
 res.__reader = res.body.getReader();
 if (!res.__reader) {
 res.__reader = res.body!.getReader();
 }
 if (!res.__chunk) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 }
 if (res.__chunk.done) {
 return 0;
 }

 let target_offset = 0;
 let bytes_read = 0;
 // loop until end of browser stream or end of C# buffer
 while (res.__reader && res.__chunk && !res.__chunk.done) {
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 if (remaining_source === 0) {
 res.__chunk = await res.__reader.read();
 res.__source_offset = 0;
 continue;// are we done yet
 }

 const remaining_target = view.byteLength - target_offset;
 const bytes_copied = Math.min(remaining_source, remaining_target);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);

 // copy available bytes
 view.set(source_view, target_offset);
 target_offset += bytes_copied;
 bytes_read += bytes_copied;
 res.__source_offset += bytes_copied;
 const remaining_source = res.__chunk.value.byteLength - res.__source_offset;
 mono_assert(remaining_source > 0, "expected remaining_source to be greater than 0");

 if (target_offset == view.byteLength) {
 return bytes_read;
 }
 const bytes_copied = Math.min(remaining_source, view.byteLength);
 const source_view = res.__chunk.value.subarray(res.__source_offset, res.__source_offset + bytes_copied);
 view.set(source_view, 0);
 res.__source_offset += bytes_copied;
 if (remaining_source == bytes_copied) {
 res.__chunk = undefined;
 }
 return bytes_read;

 return bytes_copied;
 });
}

Expand Down