summaryrefslogtreecommitdiff
path: root/std/ws/mod.ts
diff options
context:
space:
mode:
Diffstat (limited to 'std/ws/mod.ts')
-rw-r--r--std/ws/mod.ts17
1 files changed, 7 insertions, 10 deletions
diff --git a/std/ws/mod.ts b/std/ws/mod.ts
index 4d3f79f74..e2151a53e 100644
--- a/std/ws/mod.ts
+++ b/std/ws/mod.ts
@@ -1,5 +1,4 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-
import { decode, encode } from "../encoding/utf8.ts";
import { hasOwnProperty } from "../_util/has_own_property.ts";
import { BufReader, BufWriter } from "../io/bufio.ts";
@@ -10,8 +9,6 @@ import { TextProtoReader } from "../textproto/mod.ts";
import { Deferred, deferred } from "../async/deferred.ts";
import { assert } from "../_util/assert.ts";
import { concat } from "../bytes/mod.ts";
-import Conn = Deno.Conn;
-import Writer = Deno.Writer;
export enum OpCode {
Continue = 0x0,
@@ -66,7 +63,7 @@ export interface WebSocketFrame {
}
export interface WebSocket extends AsyncIterable<WebSocketEvent> {
- readonly conn: Conn;
+ readonly conn: Deno.Conn;
readonly isClosed: boolean;
[Symbol.asyncIterator](): AsyncIterableIterator<WebSocketEvent>;
@@ -108,7 +105,7 @@ export function unmask(payload: Uint8Array, mask?: Uint8Array): void {
/** Write websocket frame to given writer */
export async function writeFrame(
frame: WebSocketFrame,
- writer: Writer
+ writer: Deno.Writer
): Promise<void> {
const payloadLength = frame.payload.byteLength;
let header: Uint8Array;
@@ -200,7 +197,7 @@ function createMask(): Uint8Array {
}
class WebSocketImpl implements WebSocket {
- readonly conn: Conn;
+ readonly conn: Deno.Conn;
private readonly mask?: Uint8Array;
private readonly bufReader: BufReader;
private readonly bufWriter: BufWriter;
@@ -215,7 +212,7 @@ class WebSocketImpl implements WebSocket {
bufWriter,
mask,
}: {
- conn: Conn;
+ conn: Deno.Conn;
bufReader?: BufReader;
bufWriter?: BufWriter;
mask?: Uint8Array;
@@ -418,7 +415,7 @@ export function createSecAccept(nonce: string): string {
/** Upgrade given TCP connection into websocket connection */
export async function acceptWebSocket(req: {
- conn: Conn;
+ conn: Deno.Conn;
bufWriter: BufWriter;
bufReader: BufReader;
headers: Headers;
@@ -526,7 +523,7 @@ export async function connectWebSocket(
): Promise<WebSocket> {
const url = new URL(endpoint);
const { hostname } = url;
- let conn: Conn;
+ let conn: Deno.Conn;
if (url.protocol === "http:" || url.protocol === "ws:") {
const port = parseInt(url.port || "80");
conn = await Deno.connect({ hostname, port });
@@ -553,7 +550,7 @@ export async function connectWebSocket(
}
export function createWebSocket(params: {
- conn: Conn;
+ conn: Deno.Conn;
bufWriter?: BufWriter;
bufReader?: BufReader;
mask?: Uint8Array;