Skip to content

Commit

Permalink
perf(http): avoid flattening http headers (denoland#19384)
Browse files Browse the repository at this point in the history
  • Loading branch information
marvinhagemeister committed Jun 6, 2023
1 parent 5aca8b9 commit 1c3d213
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
3 changes: 1 addition & 2 deletions ext/http/00_serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
import { listen, TcpConn } from "ext:deno_net/01_net.js";
import { listenTls } from "ext:deno_net/02_tls.js";
const {
ArrayPrototypeFlat,
ArrayPrototypePush,
ObjectPrototypeIsPrototypeOf,
PromisePrototypeCatch,
Expand Down Expand Up @@ -559,7 +558,7 @@ function mapToCallback(context, callback, onError) {
if (headers.length == 1) {
op_http_set_response_header(req, headers[0][0], headers[0][1]);
} else {
op_http_set_response_headers(req, ArrayPrototypeFlat(headers));
op_http_set_response_headers(req, headers);
}
}

Expand Down
33 changes: 25 additions & 8 deletions ext/http/http_next.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use deno_core::error::AnyError;
use deno_core::futures::TryFutureExt;
use deno_core::op;
use deno_core::serde_v8;
use deno_core::serde_v8::from_v8;
use deno_core::task::spawn;
use deno_core::task::JoinHandle;
use deno_core::v8;
Expand Down Expand Up @@ -384,17 +385,33 @@ pub fn op_http_set_response_header(slab_id: SlabId, name: &str, value: &str) {
resp_headers.append(name, value);
}

#[op]
pub fn op_http_set_response_headers(slab_id: SlabId, headers: Vec<ByteString>) {
#[op(v8)]
fn op_http_set_response_headers(
scope: &mut v8::HandleScope,
slab_id: SlabId,
headers: serde_v8::Value,
) {
let mut http = slab_get(slab_id);
// TODO(mmastrac): Invalid headers should be handled?
let resp_headers = http.response().headers_mut();
resp_headers.reserve(headers.len());
for header in headers.chunks_exact(2) {
// These are valid latin-1 strings
let name = HeaderName::from_bytes(&header[0]).unwrap();
let value = HeaderValue::from_bytes(&header[1]).unwrap();
resp_headers.append(name, value);

let arr = v8::Local::<v8::Array>::try_from(headers.v8_value).unwrap();

let len = arr.length();
let header_len = len * 2;
resp_headers.reserve(header_len.try_into().unwrap());

for i in 0..len {
let item = arr.get_index(scope, i).unwrap();
let pair = v8::Local::<v8::Array>::try_from(item).unwrap();
let name = pair.get_index(scope, 0).unwrap();
let value = pair.get_index(scope, 1).unwrap();

let v8_name: ByteString = from_v8(scope, name).unwrap();
let v8_value: ByteString = from_v8(scope, value).unwrap();
let header_name = HeaderName::from_bytes(&v8_name).unwrap();
let header_value = HeaderValue::from_bytes(&v8_value).unwrap();
resp_headers.append(header_name, header_value);
}
}

Expand Down

0 comments on commit 1c3d213

Please sign in to comment.