Skip to content
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

fix(ext/node): handle 'upgrade' responses #19412

Merged
merged 20 commits into from
Jun 13, 2023
+298 −19
Merged

fix(ext/node): handle 'upgrade' responses #19412

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
77e15b0
fix(ext/node): handle 'upgrade' responses
bartlomieju Jun 7, 2023
6fc27a2
Revert "refactor(core): use JoinSet instead of FuturesUnordered (#193…
bartlomieju Jun 7, 2023
b1de5dc
Merge branch 'main' into ext_node_http_upgrade
bartlomieju Jun 9, 2023
1f2b3c5
fill properties, throw on connect
bartlomieju Jun 9, 2023
126ed38
perform the actual upgrade
bartlomieju Jun 9, 2023
e7f1338
it's working, but addresses are faked out
bartlomieju Jun 10, 2023
f88b720
revert unrelated changes
bartlomieju Jun 10, 2023
ccbe367
remove console.logs
bartlomieju Jun 10, 2023
b5dd4c6
debug
bartlomieju Jun 10, 2023
2f463aa
Merge branch 'main' into ext_node_http_upgrade
bartlomieju Jun 12, 2023
f752756
deduplicate code
bartlomieju Jun 12, 2023
fbf1f34
update ops to call
bartlomieju Jun 12, 2023
3f03a54
add some debug files
bartlomieju Jun 12, 2023
d7b69d2
use better remote addr
bartlomieju Jun 13, 2023
e300a85
remove debug files
bartlomieju Jun 13, 2023
a4c480c
Remove debug log
bartlomieju Jun 13, 2023
545d115
add test
bartlomieju Jun 13, 2023
cddece8
fix the test
bartlomieju Jun 13, 2023
d2897cb
lint
bartlomieju Jun 13, 2023
6221008
Merge branch 'main' into ext_node_http_upgrade
bartlomieju Jun 13, 2023
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
24 changes: 21 additions & 3 deletions ext/node/polyfills/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { Agent, globalAgent } from "ext:deno_node/_http_agent.mjs";
import { urlToHttpOptions } from "ext:deno_node/internal/url.ts";
import { kEmptyObject } from "ext:deno_node/internal/util.mjs";
import { constants, TCP } from "ext:deno_node/internal_binding/tcp_wrap.ts";
import { notImplemented } from "ext:deno_node/_utils.ts";
import { notImplemented, warnNotImplemented } from "ext:deno_node/_utils.ts";
import {
connResetException,
ERR_HTTP_HEADERS_SENT,
Expand Down Expand Up @@ -504,7 +504,7 @@ class ClientRequest extends OutgoingMessage {
}

if (options!.createConnection) {
notImplemented("ClientRequest.options.createConnection");
warnNotImplemented("ClientRequest.options.createConnection");
}

if (options!.lookup) {
Expand Down Expand Up @@ -567,6 +567,7 @@ class ClientRequest extends OutgoingMessage {
this.method === "POST" || this.method === "PATCH" ||
this.method === "PUT",
);
console.log("this._req", this._req);
this._bodyWriteRid = this._req.requestBodyRid;
}

Expand Down Expand Up @@ -631,6 +632,16 @@ class ClientRequest extends OutgoingMessage {
incoming.statusCode = res.status;
incoming.statusMessage = res.statusText;

console.log("res.headers", res.headers, incoming.rawHeaders);

for (const [key, value] of res.headers) {
console.log("key", key, value);
if (key.toLowerCase() === "upgrade") {
bartlomieju marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't use primordials in Node code, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct

incoming.upgrade = true;
break;
}
}

incoming._addHeaderLines(
res.headers,
Object.entries(res.headers).flat().length,
Expand All @@ -641,7 +652,14 @@ class ClientRequest extends OutgoingMessage {
core.tryClose(this._req.cancelHandleRid);
}

this.emit("response", incoming);
console.log("incoming", incoming.headers);
if (incoming.upgrade) {
// TODO(bartlomieju): throw on connect request
// handle actual upgrade
this.emit("upgrade", incoming, new FakeSocket(), []);
} else {
this.emit("response", incoming);
}
} catch (err) {
if (this._req.cancelHandleRid !== null) {
core.tryClose(this._req.cancelHandleRid);
Expand Down