foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-27 09:39:08 -05:00
Code Issues Packages 1 Wiki Activity

revert PR #5002 (#5141)

Browse source
This commit is contained in:
Andrey Trebler 2020-05-08 16:32:09 +02:00 committed by GitHub
parent f9f10229a4
commit c42ad381ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
std/ws/mod.ts
View file

@ -10,10 +10,8 @@ import { TextProtoReader } from "../textproto/mod.ts";
import { Deferred, deferred } from "../util/async.ts";
import { assert } from "../testing/asserts.ts";
import { concat } from "../bytes/mod.ts";
import { copyBytes } from "../io/util.ts";
import Conn = Deno.Conn;
import Writer = Deno.Writer;
import Reader = Deno.Reader;
export enum OpCode {
Continue = 0x0,
@ -67,10 +65,7 @@ export interface WebSocketFrame {
payload: Uint8Array;
}
export interface WebSocket
extends Reader,
Writer,
AsyncIterable<WebSocketEvent> {
export interface WebSocket extends AsyncIterable<WebSocketEvent> {
readonly conn: Conn;
readonly isClosed: boolean;
@ -332,26 +327,6 @@ class WebSocketImpl implements WebSocket {
return this.enqueue(frame);
}
async write(p: Uint8Array): Promise<number> {
await this.send(p);
return p.byteLength;
}
async read(p: Uint8Array): Promise<number | null> {
for await (const ev of this) {
if (ev instanceof Uint8Array) {
return copyBytes(ev, p);
}
if (typeof ev === "string") {
return copyBytes(encode(ev), p);
}
}
return null;
}
ping(data: WebSocketMessage = ""): Promise<void> {
const payload = typeof data === "string" ? encode(data) : data;
const frame = {

120
std/ws/test.ts
View file

@ -404,126 +404,6 @@ test({
},
});
test("[ws] WebSocket should implement Writer", async () => {
const buf = new Buffer();
const conn = dummyConn(buf, buf);
const sock = createWebSocket({ conn });
const [write0, write1, write2] = await Promise.all([
sock.write(new Uint8Array([1, 2, 3])),
sock.write(new Uint8Array([])),
sock.write(new Uint8Array([0])),
]);
assertEquals(write0, 3);
assertEquals(write1, 0);
assertEquals(write2, 1);
});
test("[ws] WebSocket should implement Reader", async () => {
const hello = new Uint8Array([0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
const bufHello = new Buffer(hello);
const conn = dummyConn(bufHello, new Buffer());
const sock = createWebSocket({ conn });
const p = new Uint8Array(100);
const read = await sock.read(p);
const readLast = await sock.read(p);
const helloLength = "Hello".length;
assertEquals(read, helloLength);
assertEquals(decode(new Buffer(p.subarray(0, helloLength)).bytes()), "Hello");
assertEquals(readLast, null);
});
test("[ws] WebSocket Reader should ignore non-message frames", async () => {
const pong = new Uint8Array([
0x8a,
0x85,
0x37,
0xfa,
0x21,
0x3d,
0x7f,
0x9f,
0x4d,
0x51,
0x58,
]);
const pingHello = new Uint8Array([0x89, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
const hello = new Uint8Array([0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
const close = new Uint8Array([0x88, 0x02, 0x03, 0xe8]);
const dataPayloadLength = 0x100;
const dataArr = [0x82, 0x7e, 0x01, 0x00];
for (let i = 0; i < dataPayloadLength; i++) {
dataArr.push(i);
}
const data = new Uint8Array(dataArr);
enum Frames {
ping,
text,
pong,
data,
close,
end,
}
let frame = Frames.ping;
const reader: Reader = {
read(p: Uint8Array): Promise<number | null> {
if (frame === Frames.ping) {
frame = Frames.text;
p.set(pingHello);
return Promise.resolve(pingHello.byteLength);
}
if (frame === Frames.text) {
frame = Frames.pong;
p.set(hello);
return Promise.resolve(hello.byteLength);
}
if (frame === Frames.pong) {
frame = Frames.data;
p.set(pong);
return Promise.resolve(pong.byteLength);
}
if (frame === Frames.data) {
frame = Frames.close;
p.set(data);
return Promise.resolve(data.byteLength);
}
if (frame === Frames.close) {
frame = Frames.end;
p.set(close);
return Promise.resolve(close.byteLength);
}
return Promise.resolve(null);
},
};
const conn = dummyConn(reader, new Buffer());
const sock = createWebSocket({ conn });
const p = await Deno.readAll(sock);
const helloLength = "Hello".length;
assertEquals(p.byteLength, helloLength + dataPayloadLength);
assertEquals(decode(new Buffer(p.subarray(0, helloLength)).bytes()), "Hello");
assertEquals(p.subarray(helloLength), data.subarray(4));
});
test("[ws] WebSocket should act as asyncIterator", async () => {
const pingHello = new Uint8Array([0x89, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
const hello = new Uint8Array([0x81, 0x05, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);