p3-http: finish `wasi:http@0.3` implementation #11636

rvolosatovs · 2025-09-08T09:20:41Z

Follow-up to #11440, refs #11632

This makes all the existing p3 test cases pass

rvolosatovs · 2025-09-08T17:56:15Z

@alexcrichton this is ready for review. I'll address the rest along with the spawned task tracking in yet another follow-up tomorrow (or push here if it's not merged by that time yet)

crates/test-programs/src/bin/p3_http_outbound_request_content_length.rs

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

This is something we've been doing in wasip3, but I forgot to port this over Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

Most importantly this avoids a race condition between `content-length` error observed by `GuestBody` and hyper I/O driver Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* refactor(p3-http): use trappable errors Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * feat(p3-http): implement `content-length` handling Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): remove a few resource utilities Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * remove unused test import Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): close stream handles on drop Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * test(p3-http): stream responses back This is something we've been doing in wasip3, but I forgot to port this over Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add missing docs, internalize more, simplify Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): extract `Body::consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): clean-up `content-length` error reporting Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): drop elided lifetime Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): avoid guest body deadlock hazard Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): add more docs, clean-up Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add more docs Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): rework result future handling Most importantly this avoids a race condition between `content-length` error observed by `GuestBody` and hyper I/O driver Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * add new imports after rebase Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * clean-up `poll_consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * assert content-length `handle` results Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * relax `content_length` test `handle` assert Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> --------- Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

* support non-async `{stream,future}.cancel-{read,write}` (#11625) * support non-async `{stream,future}.cancel-{read,write}` During my earlier stream API refactoring, I had forgotten to support or test synchronous cancellation; this commit does both. In the process, I realized the future API ought to be updated to support blocking cancellation just like the stream API, so I made that change as well. This also adds `{Source,Destination}::reborrow` functions, allowing instances of those types to be reborrowed, such that they may be passed as parameters but also used again. Note that I had to move some functions from `impl ConcurrentState` to `impl Instance` in order to access the store and suspend the current fiber when synchronously cancelling. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * reduce code duplication Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com> * support and test synchronous `{stream,future}.cancel-{read,write}` (#11645) * support and test synchronous `{stream,future}.cancel-{read,write}` Previously, we only supported async calls to those intrinsics; now we support blocking, synchronous calls as well. Signed-off-by: Joel Dice <joel.dice@fermyon.com> * update future-read.wast test Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com> * p3-http: finish `wasi:http@0.3` implementation (#11636) * refactor(p3-http): use trappable errors Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * feat(p3-http): implement `content-length` handling Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): remove a few resource utilities Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * remove unused test import Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): close stream handles on drop Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * test(p3-http): stream responses back This is something we've been doing in wasip3, but I forgot to port this over Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add missing docs, internalize more, simplify Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): extract `Body::consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): clean-up `content-length` error reporting Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): drop elided lifetime Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): avoid guest body deadlock hazard Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): add more docs, clean-up Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add more docs Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): rework result future handling Most importantly this avoids a race condition between `content-length` error observed by `GuestBody` and hyper I/O driver Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * add new imports after rebase Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * clean-up `poll_consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * assert content-length `handle` results Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * relax `content_length` test `handle` assert Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> --------- Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * p3-http: implementation follow-up (#11649) * p3: refactor future producers/consumers Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * p3-http: tie lifetime of the spawned task to the bodies Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * p3-http: improve docs Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> --------- Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * Ignore a wasip3 http test temporarily (#11657) Filed #11656 to track the eventual resolution. * don't delete sync-lowered subtasks unless they've exited (#11655) Previously, we were unconditionally deleting the callee subtask once it returned a value to a sync-lowered call, but that's only appropriate if the subtask has exited. Otherwise, it needs to keep running and only be deleted once it actually exits. Thanks to Luke for the `sync-streams.wast` test that uncovered this, which I've copied from the `component-model` repo. This also makes a couple of debug logging tweaks that proved useful while investigating the above issue. Signed-off-by: Joel Dice <joel.dice@fermyon.com> --------- Signed-off-by: Joel Dice <joel.dice@fermyon.com> Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> Co-authored-by: Joel Dice <joel.dice@fermyon.com> Co-authored-by: Roman Volosatovs <rvolosatovs@users.noreply.github.com>

* refactor(p3-http): use trappable errors Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * feat(p3-http): implement `content-length` handling Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): remove a few resource utilities Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * remove unused test import Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): close stream handles on drop Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * test(p3-http): stream responses back This is something we've been doing in wasip3, but I forgot to port this over Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add missing docs, internalize more, simplify Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): extract `Body::consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): clean-up `content-length` error reporting Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): drop elided lifetime Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): avoid guest body deadlock hazard Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * refactor(p3-http): add more docs, clean-up Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * doc(p3-http): add more docs Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * fix(p3-http): rework result future handling Most importantly this avoids a race condition between `content-length` error observed by `GuestBody` and hyper I/O driver Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * add new imports after rebase Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * clean-up `poll_consume` Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * assert content-length `handle` results Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> * relax `content_length` test `handle` assert Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net> --------- Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs requested a review from a team as a code owner September 8, 2025 09:20

rvolosatovs enabled auto-merge September 8, 2025 09:20

rvolosatovs requested a review from a team as a code owner September 8, 2025 11:16

rvolosatovs requested review from alexcrichton and removed request for a team September 8, 2025 11:16

rvolosatovs changed the title ~~refactor(p3-http): use trappable errors~~ p3-http: wasi:http@0.3 implementation part 2 Sep 8, 2025

rvolosatovs force-pushed the refactor/wasip3-http-trappable branch 2 times, most recently from ee60e0f to ba6d2ad Compare September 8, 2025 11:58

rvolosatovs changed the title ~~p3-http: wasi:http@0.3 implementation part 2~~ p3-http: finish wasi:http@0.3 implementation Sep 8, 2025

rvolosatovs added this to Ship WASIp3 Sep 8, 2025

rvolosatovs moved this to In review in Ship WASIp3 Sep 8, 2025

rvolosatovs mentioned this pull request Sep 8, 2025

feat(p3): implement wasi:http #11440

Merged

alexcrichton approved these changes Sep 8, 2025

View reviewed changes

crates/test-programs/src/bin/p3_http_outbound_request_content_length.rs Outdated Show resolved Hide resolved

rvolosatovs added this pull request to the merge queue Sep 8, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 8, 2025

rvolosatovs added 14 commits September 9, 2025 08:42

refactor(p3-http): use trappable errors

03fb2a1

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

feat(p3-http): implement content-length handling

fb3e458

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

refactor(p3-http): remove a few resource utilities

17b7785

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

remove unused test import

512fb5b

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

fix(p3-http): close stream handles on drop

9fb57de

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

test(p3-http): stream responses back

19eff9e

This is something we've been doing in wasip3, but I forgot to port this over Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

doc(p3-http): add missing docs, internalize more, simplify

8711b3e

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

refactor(p3-http): extract Body::consume

c6fdf31

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

refactor(p3-http): clean-up content-length error reporting

d033f4b

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

refactor(p3-http): drop elided lifetime

aeb1cb2

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

fix(p3-http): avoid guest body deadlock hazard

fff5b2d

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

refactor(p3-http): add more docs, clean-up

44433bd

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

doc(p3-http): add more docs

d084567

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

fix(p3-http): rework result future handling

f645278

Most importantly this avoids a race condition between `content-length` error observed by `GuestBody` and hyper I/O driver Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs added 2 commits September 9, 2025 08:49

add new imports after rebase

ef54b6d

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

clean-up poll_consume

4ef40a8

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs force-pushed the refactor/wasip3-http-trappable branch from ded256d to 4ef40a8 Compare September 9, 2025 06:51

assert content-length handle results

7a8d78b

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs enabled auto-merge September 9, 2025 06:59

rvolosatovs added this pull request to the merge queue Sep 9, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 9, 2025

relax content_length test handle assert

d3663c5

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>

rvolosatovs enabled auto-merge September 9, 2025 07:44

rvolosatovs added this pull request to the merge queue Sep 9, 2025

Merged via the queue into bytecodealliance:main with commit f3d7256 Sep 9, 2025
44 checks passed

rvolosatovs deleted the refactor/wasip3-http-trappable branch September 9, 2025 08:20

github-project-automation bot moved this from In review to Done in Ship WASIp3 Sep 9, 2025

rvolosatovs mentioned this pull request Sep 9, 2025

p3-http: implementation follow-up #11649

Merged

rvolosatovs self-assigned this Sep 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

p3-http: finish `wasi:http@0.3` implementation #11636

p3-http: finish `wasi:http@0.3` implementation #11636

Uh oh!

rvolosatovs commented Sep 8, 2025 •

edited

Loading

Uh oh!

rvolosatovs commented Sep 8, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

p3-http: finish wasi:http@0.3 implementation #11636

p3-http: finish wasi:http@0.3 implementation #11636

Uh oh!

Conversation

rvolosatovs commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rvolosatovs commented Sep 8, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

p3-http: finish `wasi:http@0.3` implementation #11636

p3-http: finish `wasi:http@0.3` implementation #11636

rvolosatovs commented Sep 8, 2025 •

edited

Loading