From 55a475447afc0f2e2c38fb587faa2cc063fd02ce Mon Sep 17 00:00:00 2001
From: "Adam C. Foltzer" <acfoltzer@fastly.com>
Date: Fri, 16 Feb 2024 16:20:21 -0800
Subject: [PATCH 1/3] Add `take-headers` to get owned headers from incoming
 messages

Closes #102. See discussion in that issue for the motivation and design of this change.
---
 imports.md    | 25 +++++++++++++++++++++++++
 proxy.md      | 25 +++++++++++++++++++++++++
 wit/types.wit | 10 ++++++++++
 3 files changed, 60 insertions(+)

diff --git a/imports.md b/imports.md
index 5dff42a..bb320cc 100644
--- a/imports.md
+++ b/imports.md
@@ -971,6 +971,18 @@ the parent <a href="#incoming_request"><code>incoming-request</code></a> is drop
 <ul>
 <li><a name="method_incoming_request.headers.0"></a> own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;</li>
 </ul>
+<h4><a name="method_incoming_request.take_headers"></a><code>[method]incoming-request.take-headers: func</code></h4>
+<p>Gives the <a href="#headers"><code>headers</code></a> associated with this request as an owned resource.
+Will only return success at most once, and subsequent calls will return
+error.</p>
+<h5>Params</h5>
+<ul>
+<li><a name="method_incoming_request.take_headers.self"></a><code>self</code>: borrow&lt;<a href="#incoming_request"><a href="#incoming_request"><code>incoming-request</code></a></a>&gt;</li>
+</ul>
+<h5>Return values</h5>
+<ul>
+<li><a name="method_incoming_request.take_headers.0"></a> result&lt;own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;&gt;</li>
+</ul>
 <h4><a name="method_incoming_request.consume"></a><code>[method]incoming-request.consume: func</code></h4>
 <p>Gives the <a href="#incoming_body"><code>incoming-body</code></a> associated with this request. Will only
 return success at most once, and subsequent calls will return error.</p>
@@ -1240,6 +1252,7 @@ implementation determine how to respond with an HTTP error response.</p>
 <h4><a name="method_incoming_response.consume"></a><code>[method]incoming-response.consume: func</code></h4>
 <p>Returns the incoming body. May be called at most once. Returns error
 if called additional times.</p>
+<p>Deprecated in favor of <code>into-parts</code>.</p>
 <h5>Params</h5>
 <ul>
 <li><a name="method_incoming_response.consume.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>
@@ -1248,6 +1261,18 @@ if called additional times.</p>
 <ul>
 <li><a name="method_incoming_response.consume.0"></a> result&lt;own&lt;<a href="#incoming_body"><a href="#incoming_body"><code>incoming-body</code></a></a>&gt;&gt;</li>
 </ul>
+<h4><a name="method_incoming_response.take_headers"></a><code>[method]incoming-response.take-headers: func</code></h4>
+<p>Returns the <a href="#headers"><code>headers</code></a> associated with this response as an owned
+resource. Will only return success at most once, and subsequent calls
+will return error.</p>
+<h5>Params</h5>
+<ul>
+<li><a name="method_incoming_response.take_headers.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>
+</ul>
+<h5>Return values</h5>
+<ul>
+<li><a name="method_incoming_response.take_headers.0"></a> result&lt;own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;&gt;</li>
+</ul>
 <h4><a name="method_incoming_body.stream"></a><code>[method]incoming-body.stream: func</code></h4>
 <p>Returns the contents of the body, as a stream of bytes.</p>
 <p>Returns success on first call: the stream representing the contents
diff --git a/proxy.md b/proxy.md
index b3945ad..55a98b0 100644
--- a/proxy.md
+++ b/proxy.md
@@ -906,6 +906,18 @@ the parent <a href="#incoming_request"><code>incoming-request</code></a> is drop
 <ul>
 <li><a name="method_incoming_request.headers.0"></a> own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;</li>
 </ul>
+<h4><a name="method_incoming_request.take_headers"></a><code>[method]incoming-request.take-headers: func</code></h4>
+<p>Gives the <a href="#headers"><code>headers</code></a> associated with this request as an owned resource.
+Will only return success at most once, and subsequent calls will return
+error.</p>
+<h5>Params</h5>
+<ul>
+<li><a name="method_incoming_request.take_headers.self"></a><code>self</code>: borrow&lt;<a href="#incoming_request"><a href="#incoming_request"><code>incoming-request</code></a></a>&gt;</li>
+</ul>
+<h5>Return values</h5>
+<ul>
+<li><a name="method_incoming_request.take_headers.0"></a> result&lt;own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;&gt;</li>
+</ul>
 <h4><a name="method_incoming_request.consume"></a><code>[method]incoming-request.consume: func</code></h4>
 <p>Gives the <a href="#incoming_body"><code>incoming-body</code></a> associated with this request. Will only
 return success at most once, and subsequent calls will return error.</p>
@@ -1175,6 +1187,7 @@ implementation determine how to respond with an HTTP error response.</p>
 <h4><a name="method_incoming_response.consume"></a><code>[method]incoming-response.consume: func</code></h4>
 <p>Returns the incoming body. May be called at most once. Returns error
 if called additional times.</p>
+<p>Deprecated in favor of <code>into-parts</code>.</p>
 <h5>Params</h5>
 <ul>
 <li><a name="method_incoming_response.consume.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>
@@ -1183,6 +1196,18 @@ if called additional times.</p>
 <ul>
 <li><a name="method_incoming_response.consume.0"></a> result&lt;own&lt;<a href="#incoming_body"><a href="#incoming_body"><code>incoming-body</code></a></a>&gt;&gt;</li>
 </ul>
+<h4><a name="method_incoming_response.take_headers"></a><code>[method]incoming-response.take-headers: func</code></h4>
+<p>Returns the <a href="#headers"><code>headers</code></a> associated with this response as an owned
+resource. Will only return success at most once, and subsequent calls
+will return error.</p>
+<h5>Params</h5>
+<ul>
+<li><a name="method_incoming_response.take_headers.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>
+</ul>
+<h5>Return values</h5>
+<ul>
+<li><a name="method_incoming_response.take_headers.0"></a> result&lt;own&lt;<a href="#headers"><a href="#headers"><code>headers</code></a></a>&gt;&gt;</li>
+</ul>
 <h4><a name="method_incoming_body.stream"></a><code>[method]incoming-body.stream: func</code></h4>
 <p>Returns the contents of the body, as a stream of bytes.</p>
 <p>Returns success on first call: the stream representing the contents
diff --git a/wit/types.wit b/wit/types.wit
index 755ac6a..f546c57 100644
--- a/wit/types.wit
+++ b/wit/types.wit
@@ -242,6 +242,11 @@ interface types {
     /// `incoming-request` before all children are dropped will trap.
     headers: func() -> headers;
 
+    /// Gives the `headers` associated with this request as an owned resource.
+    /// Will only return success at most once, and subsequent calls will return
+    /// error.
+    take-headers: func() -> result<headers>;
+
     /// Gives the `incoming-body` associated with this request. Will only
     /// return success at most once, and subsequent calls will return error.
     consume: func() -> result<incoming-body>;
@@ -392,6 +397,11 @@ interface types {
     /// Returns the incoming body. May be called at most once. Returns error
     /// if called additional times.
     consume: func() -> result<incoming-body>;
+
+    /// Returns the `headers` associated with this response as an owned
+    /// resource. Will only return success at most once, and subsequent calls
+    /// will return error.
+    take-headers: func() -> result<headers>;
   }
 
   /// Represents an incoming HTTP Request or Response's Body.

From 4cddc8a921b79edfe9840270af58e381e820f55c Mon Sep 17 00:00:00 2001
From: "Adam C. Foltzer" <acfoltzer@fastly.com>
Date: Wed, 21 Feb 2024 10:55:47 -0800
Subject: [PATCH 2/3] update md

---
 imports.md | 1 -
 proxy.md   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/imports.md b/imports.md
index bb320cc..6137770 100644
--- a/imports.md
+++ b/imports.md
@@ -1252,7 +1252,6 @@ implementation determine how to respond with an HTTP error response.</p>
 <h4><a name="method_incoming_response.consume"></a><code>[method]incoming-response.consume: func</code></h4>
 <p>Returns the incoming body. May be called at most once. Returns error
 if called additional times.</p>
-<p>Deprecated in favor of <code>into-parts</code>.</p>
 <h5>Params</h5>
 <ul>
 <li><a name="method_incoming_response.consume.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>
diff --git a/proxy.md b/proxy.md
index 55a98b0..22aa1ce 100644
--- a/proxy.md
+++ b/proxy.md
@@ -1187,7 +1187,6 @@ implementation determine how to respond with an HTTP error response.</p>
 <h4><a name="method_incoming_response.consume"></a><code>[method]incoming-response.consume: func</code></h4>
 <p>Returns the incoming body. May be called at most once. Returns error
 if called additional times.</p>
-<p>Deprecated in favor of <code>into-parts</code>.</p>
 <h5>Params</h5>
 <ul>
 <li><a name="method_incoming_response.consume.self"></a><code>self</code>: borrow&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;</li>

From 07f146eb64a60cb80acee4f0236ccb2082c5ab25 Mon Sep 17 00:00:00 2001
From: "Adam C. Foltzer" <acfoltzer@fastly.com>
Date: Thu, 22 Feb 2024 18:45:21 -0800
Subject: [PATCH 3/3] bump package version to 0.2.1-draft

---
 imports.md    |  8 ++++----
 proxy.md      | 12 ++++++------
 wit/proxy.wit |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/imports.md b/imports.md
index 6137770..85ec2d0 100644
--- a/imports.md
+++ b/imports.md
@@ -12,8 +12,8 @@ It is intended to be <code>include</code>d in other worlds.</p>
 <li>interface <a href="#wasi:cli_stderr_0.2.0"><code>wasi:cli/stderr@0.2.0</code></a></li>
 <li>interface <a href="#wasi:cli_stdin_0.2.0"><code>wasi:cli/stdin@0.2.0</code></a></li>
 <li>interface <a href="#wasi:clocks_monotonic_clock_0.2.0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
-<li>interface <a href="#wasi:http_types_0.2.0"><code>wasi:http/types@0.2.0</code></a></li>
-<li>interface <a href="#wasi:http_outgoing_handler_0.2.0"><code>wasi:http/outgoing-handler@0.2.0</code></a></li>
+<li>interface <a href="#wasi:http_types_0.2.1_draft"><code>wasi:http/types@0.2.1-draft</code></a></li>
+<li>interface <a href="#wasi:http_outgoing_handler_0.2.1_draft"><code>wasi:http/outgoing-handler@0.2.1-draft</code></a></li>
 <li>interface <a href="#wasi:clocks_wall_clock_0.2.0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
 </ul>
 </li>
@@ -561,7 +561,7 @@ occured.</p>
 <ul>
 <li><a name="subscribe_duration.0"></a> own&lt;<a href="#pollable"><a href="#pollable"><code>pollable</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:http_types_0.2.0"></a>Import interface wasi:http/types@0.2.0</h2>
+<h2><a name="wasi:http_types_0.2.1_draft"></a>Import interface wasi:http/types@0.2.1-draft</h2>
 <p>This interface defines all of the types and methods for implementing
 HTTP Requests and Responses, both incoming and outgoing, as well as
 their headers, trailers, and bodies.</p>
@@ -1471,7 +1471,7 @@ but those will be reported by the <a href="#incoming_body"><code>incoming-body</
 <ul>
 <li><a name="method_future_incoming_response.get.0"></a> option&lt;result&lt;result&lt;own&lt;<a href="#incoming_response"><a href="#incoming_response"><code>incoming-response</code></a></a>&gt;, <a href="#error_code"><a href="#error_code"><code>error-code</code></a></a>&gt;&gt;&gt;</li>
 </ul>
-<h2><a name="wasi:http_outgoing_handler_0.2.0"></a>Import interface wasi:http/outgoing-handler@0.2.0</h2>
+<h2><a name="wasi:http_outgoing_handler_0.2.1_draft"></a>Import interface wasi:http/outgoing-handler@0.2.1-draft</h2>
 <p>This interface defines a handler of outgoing HTTP Requests. It should be
 imported by components which wish to make HTTP Requests.</p>
 <hr />
diff --git a/proxy.md b/proxy.md
index 22aa1ce..1f20830 100644
--- a/proxy.md
+++ b/proxy.md
@@ -10,18 +10,18 @@ outgoing HTTP requests.</p>
 <li>interface <a href="#wasi:clocks_monotonic_clock_0.2.0"><code>wasi:clocks/monotonic-clock@0.2.0</code></a></li>
 <li>interface <a href="#wasi:io_error_0.2.0"><code>wasi:io/error@0.2.0</code></a></li>
 <li>interface <a href="#wasi:io_streams_0.2.0"><code>wasi:io/streams@0.2.0</code></a></li>
-<li>interface <a href="#wasi:http_types_0.2.0"><code>wasi:http/types@0.2.0</code></a></li>
+<li>interface <a href="#wasi:http_types_0.2.1_draft"><code>wasi:http/types@0.2.1-draft</code></a></li>
 <li>interface <a href="#wasi:random_random_0.2.0"><code>wasi:random/random@0.2.0</code></a></li>
 <li>interface <a href="#wasi:cli_stdout_0.2.0"><code>wasi:cli/stdout@0.2.0</code></a></li>
 <li>interface <a href="#wasi:cli_stderr_0.2.0"><code>wasi:cli/stderr@0.2.0</code></a></li>
 <li>interface <a href="#wasi:cli_stdin_0.2.0"><code>wasi:cli/stdin@0.2.0</code></a></li>
-<li>interface <a href="#wasi:http_outgoing_handler_0.2.0"><code>wasi:http/outgoing-handler@0.2.0</code></a></li>
+<li>interface <a href="#wasi:http_outgoing_handler_0.2.1_draft"><code>wasi:http/outgoing-handler@0.2.1-draft</code></a></li>
 <li>interface <a href="#wasi:clocks_wall_clock_0.2.0"><code>wasi:clocks/wall-clock@0.2.0</code></a></li>
 </ul>
 </li>
 <li>Exports:
 <ul>
-<li>interface <a href="#wasi:http_incoming_handler_0.2.0"><code>wasi:http/incoming-handler@0.2.0</code></a></li>
+<li>interface <a href="#wasi:http_incoming_handler_0.2.1_draft"><code>wasi:http/incoming-handler@0.2.1-draft</code></a></li>
 </ul>
 </li>
 </ul>
@@ -496,7 +496,7 @@ is ready for reading, before performing the <code>splice</code>.</p>
 <ul>
 <li><a name="method_output_stream.blocking_splice.0"></a> result&lt;<code>u64</code>, <a href="#stream_error"><a href="#stream_error"><code>stream-error</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:http_types_0.2.0"></a>Import interface wasi:http/types@0.2.0</h2>
+<h2><a name="wasi:http_types_0.2.1_draft"></a>Import interface wasi:http/types@0.2.1-draft</h2>
 <p>This interface defines all of the types and methods for implementing
 HTTP Requests and Responses, both incoming and outgoing, as well as
 their headers, trailers, and bodies.</p>
@@ -1478,7 +1478,7 @@ represented as a <code>u64</code>.</p>
 <ul>
 <li><a name="get_stdin.0"></a> own&lt;<a href="#input_stream"><a href="#input_stream"><code>input-stream</code></a></a>&gt;</li>
 </ul>
-<h2><a name="wasi:http_outgoing_handler_0.2.0"></a>Import interface wasi:http/outgoing-handler@0.2.0</h2>
+<h2><a name="wasi:http_outgoing_handler_0.2.1_draft"></a>Import interface wasi:http/outgoing-handler@0.2.1-draft</h2>
 <p>This interface defines a handler of outgoing HTTP Requests. It should be
 imported by components which wish to make HTTP Requests.</p>
 <hr />
@@ -1556,7 +1556,7 @@ also known as <a href="https://en.wikipedia.org/wiki/Unix_time">Unix Time</a>.</
 <ul>
 <li><a name="resolution.0"></a> <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
-<h2><a name="wasi:http_incoming_handler_0.2.0"></a>Export interface wasi:http/incoming-handler@0.2.0</h2>
+<h2><a name="wasi:http_incoming_handler_0.2.1_draft"></a>Export interface wasi:http/incoming-handler@0.2.1-draft</h2>
 <hr />
 <h3>Types</h3>
 <h4><a name="incoming_request"></a><code>type incoming-request</code></h4>
diff --git a/wit/proxy.wit b/wit/proxy.wit
index 26a975e..052ceb1 100644
--- a/wit/proxy.wit
+++ b/wit/proxy.wit
@@ -1,4 +1,4 @@
-package wasi:http@0.2.0;
+package wasi:http@0.2.1-draft;
 
 /// The `wasi:http/imports` world imports all the APIs for HTTP proxies.
 /// It is intended to be `include`d in other worlds.