1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-24 08:09:08 -05:00

refactor: make acceptWebSocket independent from ServerRequest (denoland/deno_std#178)

Original: 88ddd5677d
This commit is contained in:
Yusuke Sakurai 2019-02-11 08:45:24 +09:00 committed by Ryan Dahl
parent 52e047138a
commit ed20bda6ec
4 changed files with 119 additions and 79 deletions

View file

@ -1,5 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { listen, Conn, toAsyncIterator, Reader, copy } from "deno";
import { listen, Conn, toAsyncIterator, Reader, Writer, copy } from "deno";
import { BufReader, BufState, BufWriter } from "../io/bufio.ts";
import { TextProtoReader } from "../textproto/mod.ts";
import { STATUS_TEXT } from "./http_status.ts";
@ -40,6 +40,7 @@ interface ServeEnv {
function serveConn(env: ServeEnv, conn: Conn, bufr?: BufReader) {
readRequest(conn, bufr).then(maybeHandleReq.bind(null, env, conn));
}
function maybeHandleReq(env: ServeEnv, conn: Conn, maybeReq: any) {
const [req, _err] = maybeReq;
if (_err) {
@ -210,31 +211,25 @@ export class ServerRequest {
return readAllIterator(this.bodyStream());
}
private async _streamBody(body: Reader, bodyLength: number) {
const n = await copy(this.w, body);
assert(n == bodyLength);
}
private async _streamChunkedBody(body: Reader) {
const encoder = new TextEncoder();
for await (const chunk of toAsyncIterator(body)) {
const start = encoder.encode(`${chunk.byteLength.toString(16)}\r\n`);
const end = encoder.encode("\r\n");
await this.w.write(start);
await this.w.write(chunk);
await this.w.write(end);
}
const endChunk = encoder.encode("0\r\n\r\n");
await this.w.write(endChunk);
}
async respond(r: Response): Promise<void> {
return writeResponse(this.w, r);
}
}
function bufWriter(w: Writer): BufWriter {
if (w instanceof BufWriter) {
return w;
} else {
return new BufWriter(w);
}
}
export async function writeResponse(w: Writer, r: Response): Promise<void> {
const protoMajor = 1;
const protoMinor = 1;
const statusCode = r.status || 200;
const statusText = STATUS_TEXT.get(statusCode);
const writer = bufWriter(w);
if (!statusText) {
throw Error("bad status code");
}
@ -251,27 +246,40 @@ export class ServerRequest {
out += "\r\n";
const header = new TextEncoder().encode(out);
let n = await this.w.write(header);
let n = await writer.write(header);
assert(header.byteLength == n);
if (r.body) {
if (r.body instanceof Uint8Array) {
n = await this.w.write(r.body);
n = await writer.write(r.body);
assert(r.body.byteLength == n);
} else {
if (r.headers.has("content-length")) {
await this._streamBody(
r.body,
parseInt(r.headers.get("content-length"))
);
const bodyLength = parseInt(r.headers.get("content-length"));
const n = await copy(writer, r.body);
assert(n == bodyLength);
} else {
await this._streamChunkedBody(r.body);
await writeChunkedBody(writer, r.body);
}
}
}
await writer.flush();
}
await this.w.flush();
async function writeChunkedBody(w: Writer, r: Reader) {
const writer = bufWriter(w);
const encoder = new TextEncoder();
for await (const chunk of toAsyncIterator(r)) {
const start = encoder.encode(`${chunk.byteLength.toString(16)}\r\n`);
const end = encoder.encode("\r\n");
await writer.write(start);
await writer.write(chunk);
await writer.write(end);
}
const endChunk = encoder.encode("0\r\n\r\n");
await writer.write(endChunk);
}
async function readRequest(

View file

@ -6,14 +6,9 @@
// https://github.com/golang/go/blob/master/src/net/http/responsewrite_test.go
import { Buffer } from "deno";
import { test, assert, assertEqual } from "../testing/mod.ts";
import {
listenAndServe,
ServerRequest,
setContentLength,
Response
} from "./server.ts";
import { BufWriter, BufReader } from "../io/bufio.ts";
import { assertEqual, test } from "../testing/mod.ts";
import { Response, ServerRequest } from "./server.ts";
import { BufReader, BufWriter } from "../io/bufio.ts";
interface ResponseTest {
response: Response;

View file

@ -1,9 +1,9 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { Buffer, Writer, Conn } from "deno";
import { ServerRequest } from "../http/server.ts";
import { BufReader, BufWriter } from "../io/bufio.ts";
import { readLong, readShort, sliceLongToBytes } from "../io/ioutil.ts";
import { Sha1 } from "./sha1.ts";
import { writeResponse } from "../http/server.ts";
export enum OpCode {
Continue = 0x0,
@ -71,6 +71,7 @@ export type WebSocket = {
class WebSocketImpl implements WebSocket {
encoder = new TextEncoder();
constructor(private conn: Conn, private mask?: Uint8Array) {}
async *receive(): AsyncIterableIterator<WebSocketEvent> {
@ -278,19 +279,24 @@ export function unmask(payload: Uint8Array, mask?: Uint8Array) {
}
}
export function acceptable(req: ServerRequest): boolean {
export function acceptable(req: { headers: Headers }): boolean {
return (
req.headers.get("upgrade") === "websocket" &&
req.headers.has("sec-websocket-key")
req.headers.has("sec-websocket-key") &&
req.headers.get("sec-websocket-key").length > 0
);
}
export async function acceptWebSocket(req: ServerRequest): Promise<WebSocket> {
export async function acceptWebSocket(req: {
conn: Conn;
headers: Headers;
}): Promise<WebSocket> {
const { conn, headers } = req;
if (acceptable(req)) {
const sock = new WebSocketImpl(req.conn);
const secKey = req.headers.get("sec-websocket-key");
const sock = new WebSocketImpl(conn);
const secKey = headers.get("sec-websocket-key");
const secAccept = createSecAccept(secKey);
await req.respond({
await writeResponse(conn, {
status: 101,
headers: new Headers({
Upgrade: "websocket",

View file

@ -3,9 +3,14 @@ import "./sha1_test.ts";
import { Buffer } from "deno";
import { BufReader } from "../io/bufio.ts";
import { test, assert, assertEqual } from "../testing/mod.ts";
import { createSecAccept, OpCode, readFrame, unmask } from "./mod.ts";
import { serve } from "../http/server.ts";
import { assert, assertEqual, test } from "../testing/mod.ts";
import {
acceptable,
createSecAccept,
OpCode,
readFrame,
unmask
} from "./mod.ts";
test(async function testReadUnmaskedTextFrame() {
// unmasked single text frame with payload "Hello"
@ -129,3 +134,29 @@ test(async function testCreateSecAccept() {
const d = createSecAccept(nonce);
assertEqual(d, "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
});
test(function testAcceptable() {
const ret = acceptable({
headers: new Headers({
upgrade: "websocket",
"sec-websocket-key": "aaa"
})
});
assertEqual(ret, true);
});
const invalidHeaders = [
{ "sec-websocket-key": "aaa" },
{ upgrade: "websocket" },
{ upgrade: "invalid", "sec-websocket-key": "aaa" },
{ upgrade: "websocket", "sec-websocket-ky": "" }
];
test(function testAcceptableInvalid() {
for (const pat of invalidHeaders) {
const ret = acceptable({
headers: new Headers(pat)
});
assertEqual(ret, false);
}
});