summaryrefslogtreecommitdiff
path: root/ext/http/01_http.js
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-01-22 22:35:39 +0100
committerGitHub <noreply@github.com>2024-01-22 21:35:39 +0000
commit71551c80a1c7ea2cc75cf82c5871212559709789 (patch)
tree6d5e458e54ea6598d78d6b4d7177006a9048deb6 /ext/http/01_http.js
parent69d5f136badfd7cfa9b979ff2fee7caf397098ca (diff)
feat(unstable): remove Deno.upgradeHttp API (#21856)
Closes https://github.com/denoland/deno/issues/21828. This API is a huge footgun. And given that "Deno.serveHttp" is a deprecated API that is discouraged to use (use "Deno.serve()" instead); it makes no sense to keep this API around. This is a step towards fully migrating to Hyper 1.
Diffstat (limited to 'ext/http/01_http.js')
-rw-r--r--ext/http/01_http.js40
1 files changed, 1 insertions, 39 deletions
diff --git a/ext/http/01_http.js b/ext/http/01_http.js
index 92f1fd03e..6e8e9a0b3 100644
--- a/ext/http/01_http.js
+++ b/ext/http/01_http.js
@@ -9,7 +9,6 @@ const {
op_http_accept,
op_http_headers,
op_http_shutdown,
- op_http_upgrade,
op_http_upgrade_websocket,
op_http_websocket_accept_header,
op_http_write,
@@ -20,7 +19,6 @@ const {
ArrayPrototypeIncludes,
ArrayPrototypeMap,
ArrayPrototypePush,
- Error,
ObjectPrototypeIsPrototypeOf,
SafeSet,
SafeSetIterator,
@@ -67,10 +65,7 @@ import {
SERVER,
WebSocket,
} from "ext:deno_websocket/01_websocket.js";
-import { TcpConn, UnixConn } from "ext:deno_net/01_net.js";
-import { TlsConn } from "ext:deno_net/02_tls.js";
import {
- Deferred,
getReadableStreamResourceBacking,
readableStreamClose,
readableStreamForRid,
@@ -80,7 +75,6 @@ import { serve } from "ext:deno_http/00_serve.js";
import { SymbolDispose } from "ext:deno_web/00_infra.js";
const connErrorSymbol = Symbol("connError");
-const _deferred = Symbol("upgradeHttpDeferred");
/** @type {(self: HttpConn, rid: number) => boolean} */
let deleteManagedResource;
@@ -174,9 +168,6 @@ class HttpConn {
const respondWith = createRespondWith(
this,
streamRid,
- request,
- this.#remoteAddr,
- this.#localAddr,
abortController,
);
@@ -219,9 +210,6 @@ class HttpConn {
function createRespondWith(
httpConn,
streamRid,
- request,
- remoteAddr,
- localAddr,
abortController,
) {
return async function respondWith(resp) {
@@ -379,22 +367,6 @@ function createRespondWith(
}
}
- const deferred = request[_deferred];
- if (deferred) {
- const res = await op_http_upgrade(streamRid);
- let conn;
- if (res.connType === "tcp") {
- conn = new TcpConn(res.connRid, remoteAddr, localAddr);
- } else if (res.connType === "tls") {
- conn = new TlsConn(res.connRid, remoteAddr, localAddr);
- } else if (res.connType === "unix") {
- conn = new UnixConn(res.connRid, remoteAddr, localAddr);
- } else {
- throw new Error("unreachable");
- }
-
- deferred.resolve([conn, res.readBuf]);
- }
const ws = resp[_ws];
if (ws) {
const wsRid = await op_http_upgrade_websocket(
@@ -502,16 +474,6 @@ function upgradeWebSocket(request, options = {}) {
return { response, socket };
}
-function upgradeHttp(req) {
- const inner = toInnerRequest(req);
- if (inner._wantsUpgrade) {
- return inner._wantsUpgrade("upgradeHttp", arguments);
- }
-
- req[_deferred] = new Deferred();
- return req[_deferred].promise;
-}
-
const spaceCharCode = StringPrototypeCharCodeAt(" ", 0);
const tabCharCode = StringPrototypeCharCodeAt("\t", 0);
const commaCharCode = StringPrototypeCharCodeAt(",", 0);
@@ -589,4 +551,4 @@ function buildCaseInsensitiveCommaValueFinder(checkText) {
internals.buildCaseInsensitiveCommaValueFinder =
buildCaseInsensitiveCommaValueFinder;
-export { _ws, HttpConn, serve, upgradeHttp, upgradeWebSocket };
+export { _ws, HttpConn, serve, upgradeWebSocket };