summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/fetch/22_body.js49
-rw-r--r--ext/fetch/26_fetch.js2
-rw-r--r--ext/http/01_http.js16
-rw-r--r--ext/http/lib.rs13
-rw-r--r--serde_v8/src/magic/string_or_buffer.rs6
5 files changed, 61 insertions, 25 deletions
diff --git a/ext/fetch/22_body.js b/ext/fetch/22_body.js
index fcbce43e3..4291643c0 100644
--- a/ext/fetch/22_body.js
+++ b/ext/fetch/22_body.js
@@ -35,15 +35,31 @@
Uint8Array,
} = window.__bootstrap.primordials;
+ /**
+ * @param {Uint8Array | string} chunk
+ * @returns {Uint8Array}
+ */
+ function chunkToU8(chunk) {
+ return typeof chunk === "string" ? core.encode(chunk) : chunk;
+ }
+
+ /**
+ * @param {Uint8Array | string} chunk
+ * @returns {string}
+ */
+ function chunkToString(chunk) {
+ return typeof chunk === "string" ? chunk : core.decode(chunk);
+ }
+
class InnerBody {
/**
- * @param {ReadableStream<Uint8Array> | { body: Uint8Array, consumed: boolean }} stream
+ * @param {ReadableStream<Uint8Array> | { body: Uint8Array | string, consumed: boolean }} stream
*/
constructor(stream) {
- /** @type {ReadableStream<Uint8Array> | { body: Uint8Array, consumed: boolean }} */
+ /** @type {ReadableStream<Uint8Array> | { body: Uint8Array | string, consumed: boolean }} */
this.streamOrStatic = stream ??
{ body: new Uint8Array(), consumed: false };
- /** @type {null | Uint8Array | Blob | FormData} */
+ /** @type {null | Uint8Array | string | Blob | FormData} */
this.source = null;
/** @type {null | number} */
this.length = null;
@@ -58,7 +74,7 @@
} else {
this.streamOrStatic = new ReadableStream({
start(controller) {
- controller.enqueue(body);
+ controller.enqueue(chunkToU8(body));
controller.close();
},
});
@@ -271,14 +287,14 @@
/**
* https://fetch.spec.whatwg.org/#concept-body-package-data
- * @param {Uint8Array} bytes
+ * @param {Uint8Array | string} bytes
* @param {"ArrayBuffer" | "Blob" | "FormData" | "JSON" | "text"} type
* @param {MimeType | null} [mimeType]
*/
function packageData(bytes, type, mimeType) {
switch (type) {
case "ArrayBuffer":
- return bytes.buffer;
+ return chunkToU8(bytes).buffer;
case "Blob":
return new Blob([bytes], {
type: mimeType !== null ? mimesniff.serializeMimeType(mimeType) : "",
@@ -293,9 +309,10 @@
"Missing boundary parameter in mime type of multipart formdata.",
);
}
- return parseFormData(bytes, boundary);
+ return parseFormData(chunkToU8(bytes), boundary);
} else if (essence === "application/x-www-form-urlencoded") {
- const entries = parseUrlEncoded(bytes);
+ // TODO(@AaronO): pass as-is with StringOrBuffer in op-layer
+ const entries = parseUrlEncoded(chunkToU8(bytes));
return formDataFromEntries(
ArrayPrototypeMap(
entries,
@@ -308,9 +325,9 @@
throw new TypeError("Missing content type");
}
case "JSON":
- return JSONParse(core.decode(bytes));
+ return JSONParse(chunkToString(bytes));
case "text":
- return core.decode(bytes);
+ return chunkToString(bytes);
}
}
@@ -319,7 +336,7 @@
* @returns {{body: InnerBody, contentType: string | null}}
*/
function extractBody(object) {
- /** @type {ReadableStream<Uint8Array> | { body: Uint8Array, consumed: boolean }} */
+ /** @type {ReadableStream<Uint8Array> | { body: Uint8Array | string, consumed: boolean }} */
let stream;
let source = null;
let length = null;
@@ -353,10 +370,10 @@
contentType = res.type;
} else if (object instanceof URLSearchParams) {
// TODO(@satyarohith): not sure what primordial here.
- source = core.encode(object.toString());
+ source = object.toString();
contentType = "application/x-www-form-urlencoded;charset=UTF-8";
} else if (typeof object === "string") {
- source = core.encode(object);
+ source = object;
contentType = "text/plain;charset=UTF-8";
} else if (object instanceof ReadableStream) {
stream = object;
@@ -367,6 +384,12 @@
if (source instanceof Uint8Array) {
stream = { body: source, consumed: false };
length = source.byteLength;
+ } else if (typeof source === "string") {
+ // WARNING: this deviates from spec (expects length to be set)
+ // https://fetch.spec.whatwg.org/#bodyinit > 7.
+ // no observable side-effect for users so far, but could change
+ stream = { body: source, consumed: false };
+ length = null; // NOTE: string length != byte length
}
const body = new InnerBody(stream);
body.source = source;
diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js
index fcfa75318..b9e2b1e6b 100644
--- a/ext/fetch/26_fetch.js
+++ b/ext/fetch/26_fetch.js
@@ -214,6 +214,8 @@
} else {
req.body.streamOrStatic.consumed = true;
reqBody = req.body.streamOrStatic.body;
+ // TODO(@AaronO): plumb support for StringOrBuffer all the way
+ reqBody = typeof reqBody === "string" ? core.encode(reqBody) : reqBody;
}
}
diff --git a/ext/http/01_http.js b/ext/http/01_http.js
index 4e6b8fc00..9ce6997c6 100644
--- a/ext/http/01_http.js
+++ b/ext/http/01_http.js
@@ -199,11 +199,17 @@
SetPrototypeDelete(httpConn.managedResources, responseSenderRid);
let responseBodyRid;
try {
- responseBodyRid = await core.opAsync("op_http_response", [
- responseSenderRid,
- innerResp.status ?? 200,
- innerResp.headerList,
- ], respBody instanceof Uint8Array ? respBody : null);
+ responseBodyRid = await core.opAsync(
+ "op_http_response",
+ [
+ responseSenderRid,
+ innerResp.status ?? 200,
+ innerResp.headerList,
+ ],
+ (respBody instanceof Uint8Array || typeof respBody === "string")
+ ? respBody
+ : null,
+ );
} catch (error) {
const connError = httpConn[connErrorSymbol];
if (error instanceof BadResource && connError != null) {
diff --git a/ext/http/lib.rs b/ext/http/lib.rs
index f040ce104..ffca4fa2f 100644
--- a/ext/http/lib.rs
+++ b/ext/http/lib.rs
@@ -19,6 +19,7 @@ use deno_core::OpState;
use deno_core::RcRef;
use deno_core::Resource;
use deno_core::ResourceId;
+use deno_core::StringOrBuffer;
use deno_core::ZeroCopyBuf;
use hyper::body::HttpBody;
use hyper::header::CONNECTION;
@@ -400,7 +401,7 @@ struct RespondArgs(
async fn op_http_response(
state: Rc<RefCell<OpState>>,
args: RespondArgs,
- data: Option<ZeroCopyBuf>,
+ data: Option<StringOrBuffer>,
) -> Result<Option<ResourceId>, AnyError> {
let RespondArgs(rid, status, headers) = args;
@@ -426,15 +427,13 @@ async fn op_http_response(
builder = builder.header(key.as_ref(), value.as_ref());
}
- let res;
- let maybe_response_body_rid = if let Some(d) = data {
+ let (maybe_response_body_rid, res) = if let Some(d) = data {
// If a body is passed, we use it, and don't return a body for streaming.
- res = builder.body(Vec::from(&*d).into())?;
- None
+ (None, builder.body(d.into_bytes().into())?)
} else {
// If no body is passed, we return a writer for streaming the body.
let (sender, body) = Body::channel();
- res = builder.body(body)?;
+ let res = builder.body(body)?;
let response_body_rid =
state.borrow_mut().resource_table.add(ResponseBodyResource {
@@ -442,7 +441,7 @@ async fn op_http_response(
conn_rid,
});
- Some(response_body_rid)
+ (Some(response_body_rid), res)
};
// oneshot::Sender::send(v) returns |v| on error, not an error object.
diff --git a/serde_v8/src/magic/string_or_buffer.rs b/serde_v8/src/magic/string_or_buffer.rs
index 88a6344c4..4518fe082 100644
--- a/serde_v8/src/magic/string_or_buffer.rs
+++ b/serde_v8/src/magic/string_or_buffer.rs
@@ -10,6 +10,12 @@ impl Deref for StringOrBuffer {
}
}
+impl StringOrBuffer {
+ pub fn into_bytes(self) -> Vec<u8> {
+ self.0
+ }
+}
+
impl<'de> serde::Deserialize<'de> for StringOrBuffer {
fn deserialize<D>(deserializer: D) -> Result<StringOrBuffer, D::Error>
where
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 08:11:13 +0000