summaryrefslogtreecommitdiff
path: root/std/ws
diff options
context:
space:
mode:
Diffstat (limited to 'std/ws')
-rw-r--r--std/ws/README.md8
-rw-r--r--std/ws/example_client.ts4
-rw-r--r--std/ws/example_server.ts4
-rw-r--r--std/ws/mod.ts28
-rw-r--r--std/ws/sha1.ts2
-rw-r--r--std/ws/test.ts46
6 files changed, 46 insertions, 46 deletions
diff --git a/std/ws/README.md b/std/ws/README.md
index a8101f9f0..2379d9f96 100644
--- a/std/ws/README.md
+++ b/std/ws/README.md
@@ -12,7 +12,7 @@ import {
acceptWebSocket,
isWebSocketCloseEvent,
isWebSocketPingEvent,
- WebSocket
+ WebSocket,
} from "https://deno.land/std/ws/mod.ts";
/** websocket echo server */
@@ -24,7 +24,7 @@ for await (const req of serve(`:${port}`)) {
conn,
headers,
bufReader: req.r,
- bufWriter: req.w
+ bufWriter: req.w,
})
.then(
async (sock: WebSocket): Promise<void> => {
@@ -73,7 +73,7 @@ import {
connectWebSocket,
isWebSocketCloseEvent,
isWebSocketPingEvent,
- isWebSocketPongEvent
+ isWebSocketPongEvent,
} from "https://deno.land/std/ws/mod.ts";
import { encode } from "https://deno.land/std/strings/mod.ts";
import { BufReader } from "https://deno.land/std/io/bufio.ts";
@@ -84,7 +84,7 @@ const endpoint = Deno.args[0] || "ws://127.0.0.1:8080";
/** simple websocket cli */
const sock = await connectWebSocket(endpoint);
console.log(green("ws connected! (type 'close' to quit)"));
-(async function(): Promise<void> {
+(async function (): Promise<void> {
for await (const msg of sock.receive()) {
if (typeof msg === "string") {
console.log(yellow("< " + msg));
diff --git a/std/ws/example_client.ts b/std/ws/example_client.ts
index 664073210..e6653362d 100644
--- a/std/ws/example_client.ts
+++ b/std/ws/example_client.ts
@@ -2,7 +2,7 @@ import {
connectWebSocket,
isWebSocketCloseEvent,
isWebSocketPingEvent,
- isWebSocketPongEvent
+ isWebSocketPongEvent,
} from "../ws/mod.ts";
import { encode } from "../strings/mod.ts";
import { BufReader } from "../io/bufio.ts";
@@ -13,7 +13,7 @@ const endpoint = Deno.args[0] || "ws://127.0.0.1:8080";
/** simple websocket cli */
const sock = await connectWebSocket(endpoint);
console.log(green("ws connected! (type 'close' to quit)"));
-(async function(): Promise<void> {
+(async function (): Promise<void> {
for await (const msg of sock.receive()) {
if (typeof msg === "string") {
console.log(yellow("< " + msg));
diff --git a/std/ws/example_server.ts b/std/ws/example_server.ts
index 03adc0a49..048198326 100644
--- a/std/ws/example_server.ts
+++ b/std/ws/example_server.ts
@@ -4,7 +4,7 @@ import {
acceptWebSocket,
isWebSocketCloseEvent,
isWebSocketPingEvent,
- WebSocket
+ WebSocket,
} from "./mod.ts";
/** websocket echo server */
@@ -16,7 +16,7 @@ for await (const req of serve(`:${port}`)) {
conn,
headers,
bufReader: req.r,
- bufWriter: req.w
+ bufWriter: req.w,
})
.then(
async (sock: WebSocket): Promise<void> => {
diff --git a/std/ws/mod.ts b/std/ws/mod.ts
index 6101260e9..a9b8cb675 100644
--- a/std/ws/mod.ts
+++ b/std/ws/mod.ts
@@ -19,7 +19,7 @@ export enum OpCode {
BinaryFrame = 0x2,
Close = 0x8,
Ping = 0x9,
- Pong = 0xa
+ Pong = 0xa,
}
export type WebSocketEvent =
@@ -125,13 +125,13 @@ export async function writeFrame(
0x80 | frame.opcode,
hasMask | 0b01111110,
payloadLength >>> 8,
- payloadLength & 0x00ff
+ payloadLength & 0x00ff,
]);
} else {
header = new Uint8Array([
0x80 | frame.opcode,
hasMask | 0b01111111,
- ...sliceLongToBytes(payloadLength)
+ ...sliceLongToBytes(payloadLength),
]);
}
if (frame.mask) {
@@ -186,7 +186,7 @@ export async function readFrame(buf: BufReader): Promise<WebSocketFrame> {
isLastFrame,
opcode,
mask,
- payload
+ payload,
};
}
@@ -209,7 +209,7 @@ class WebSocketImpl implements WebSocket {
conn,
bufReader,
bufWriter,
- mask
+ mask,
}: {
conn: Conn;
bufReader?: BufReader;
@@ -271,7 +271,7 @@ class WebSocketImpl implements WebSocket {
await this.enqueue({
opcode: OpCode.Pong,
payload: frame.payload,
- isLastFrame: true
+ isLastFrame: true,
});
yield ["ping", frame.payload] as WebSocketPingEvent;
break;
@@ -290,7 +290,7 @@ class WebSocketImpl implements WebSocket {
const { d, frame } = entry;
writeFrame(frame, this.bufWriter)
.then(() => d.resolve())
- .catch(e => d.reject(e))
+ .catch((e) => d.reject(e))
.finally(() => {
this.sendQueue.shift();
this.dequeue();
@@ -318,7 +318,7 @@ class WebSocketImpl implements WebSocket {
isLastFrame,
opcode,
payload,
- mask: this.mask
+ mask: this.mask,
};
return this.enqueue(frame);
}
@@ -329,7 +329,7 @@ class WebSocketImpl implements WebSocket {
isLastFrame: true,
opcode: OpCode.Ping,
mask: this.mask,
- payload
+ payload,
};
return this.enqueue(frame);
}
@@ -355,7 +355,7 @@ class WebSocketImpl implements WebSocket {
isLastFrame: true,
opcode: OpCode.Close,
mask: this.mask,
- payload
+ payload,
});
} catch (e) {
throw e;
@@ -378,7 +378,7 @@ class WebSocketImpl implements WebSocket {
this._isClosed = true;
const rest = this.sendQueue;
this.sendQueue = [];
- rest.forEach(e =>
+ rest.forEach((e) =>
e.d.reject(
new Deno.errors.ConnectionReset("Socket has already been closed")
)
@@ -431,8 +431,8 @@ export async function acceptWebSocket(req: {
headers: new Headers({
Upgrade: "websocket",
Connection: "Upgrade",
- "Sec-WebSocket-Accept": secAccept
- })
+ "Sec-WebSocket-Accept": secAccept,
+ }),
});
return sock;
}
@@ -543,7 +543,7 @@ export async function connectWebSocket(
conn,
bufWriter,
bufReader,
- mask: createMask()
+ mask: createMask(),
});
}
diff --git a/std/ws/sha1.ts b/std/ws/sha1.ts
index dc8ba680c..fc86881f8 100644
--- a/std/ws/sha1.ts
+++ b/std/ws/sha1.ts
@@ -358,7 +358,7 @@ export class Sha1 {
(h4 >> 24) & 0xff,
(h4 >> 16) & 0xff,
(h4 >> 8) & 0xff,
- h4 & 0xff
+ h4 & 0xff,
];
}
diff --git a/std/ws/test.ts b/std/ws/test.ts
index f1efa8e40..583750bb1 100644
--- a/std/ws/test.ts
+++ b/std/ws/test.ts
@@ -14,7 +14,7 @@ import {
readFrame,
unmask,
writeFrame,
- createWebSocket
+ createWebSocket,
} from "./mod.ts";
import { encode, decode } from "../strings/mod.ts";
import Writer = Deno.Writer;
@@ -50,7 +50,7 @@ test("[ws] read masked text frame", async () => {
0x9f,
0x4d,
0x51,
- 0x58
+ 0x58,
])
)
);
@@ -136,8 +136,8 @@ test("[ws] acceptable", () => {
const ret = acceptable({
headers: new Headers({
upgrade: "websocket",
- "sec-websocket-key": "aaa"
- })
+ "sec-websocket-key": "aaa",
+ }),
});
assertEquals(ret, true);
@@ -148,12 +148,12 @@ test("[ws] acceptable", () => {
["host", "127.0.0.1:9229"],
[
"sec-websocket-extensions",
- "permessage-deflate; client_max_window_bits"
+ "permessage-deflate; client_max_window_bits",
],
["sec-websocket-key", "dGhlIHNhbXBsZSBub25jZQ=="],
["sec-websocket-version", "13"],
- ["upgrade", "WebSocket"]
- ])
+ ["upgrade", "WebSocket"],
+ ]),
})
);
});
@@ -161,25 +161,25 @@ test("[ws] acceptable", () => {
test("[ws] acceptable should return false when headers invalid", () => {
assertEquals(
acceptable({
- headers: new Headers({ "sec-websocket-key": "aaa" })
+ headers: new Headers({ "sec-websocket-key": "aaa" }),
}),
false
);
assertEquals(
acceptable({
- headers: new Headers({ upgrade: "websocket" })
+ headers: new Headers({ upgrade: "websocket" }),
}),
false
);
assertEquals(
acceptable({
- headers: new Headers({ upgrade: "invalid", "sec-websocket-key": "aaa" })
+ headers: new Headers({ upgrade: "invalid", "sec-websocket-key": "aaa" }),
}),
false
);
assertEquals(
acceptable({
- headers: new Headers({ upgrade: "websocket", "sec-websocket-ky": "" })
+ headers: new Headers({ upgrade: "websocket", "sec-websocket-ky": "" }),
}),
false
);
@@ -205,7 +205,7 @@ test("[ws] write and read masked frame", async () => {
isLastFrame: true,
mask,
opcode: OpCode.TextFrame,
- payload: encode(msg)
+ payload: encode(msg),
},
buf
);
@@ -282,19 +282,19 @@ function dummyConn(r: Reader, w: Writer): Conn {
write: (x): Promise<number> => w.write(x),
close: (): void => {},
localAddr: { transport: "tcp", hostname: "0.0.0.0", port: 0 },
- remoteAddr: { transport: "tcp", hostname: "0.0.0.0", port: 0 }
+ remoteAddr: { transport: "tcp", hostname: "0.0.0.0", port: 0 },
};
}
function delayedWriter(ms: number, dest: Writer): Writer {
return {
write(p: Uint8Array): Promise<number> {
- return new Promise<number>(resolve => {
+ return new Promise<number>((resolve) => {
setTimeout(async (): Promise<void> => {
resolve(await dest.write(p));
}, ms);
});
- }
+ },
};
}
test({
@@ -308,7 +308,7 @@ test({
sock.send("first"),
sock.send("second"),
sock.ping(),
- sock.send(new Uint8Array([3]))
+ sock.send(new Uint8Array([3])),
]);
const bufr = new BufReader(buf);
const first = await readFrame(bufr);
@@ -322,7 +322,7 @@ test({
assertEquals(ping.opcode, OpCode.Ping);
assertEquals(third.opcode, OpCode.BinaryFrame);
assertEquals(bytes.equal(third.payload, new Uint8Array([3])), true);
- }
+ },
});
test("[ws] createSecKeyHasCorrectLength", () => {
@@ -337,7 +337,7 @@ test("[ws] WebSocket should throw `Deno.errors.ConnectionReset` when peer closed
const eofReader: Deno.Reader = {
read(_: Uint8Array): Promise<number | Deno.EOF> {
return Promise.resolve(Deno.EOF);
- }
+ },
};
const conn = dummyConn(eofReader, buf);
const sock = createWebSocket({ conn });
@@ -355,7 +355,7 @@ test("[ws] WebSocket shouldn't throw `Deno.errors.UnexpectedEof` on recive()", a
const eofReader: Deno.Reader = {
read(_: Uint8Array): Promise<number | Deno.EOF> {
return Promise.resolve(Deno.EOF);
- }
+ },
};
const conn = dummyConn(eofReader, buf);
const sock = createWebSocket({ conn });
@@ -373,10 +373,10 @@ test({
let timer: number | undefined;
const lazyWriter: Deno.Writer = {
write(_: Uint8Array): Promise<number> {
- return new Promise(resolve => {
+ return new Promise((resolve) => {
timer = setTimeout(() => resolve(0), 1000);
});
- }
+ },
};
const conn = dummyConn(buf, lazyWriter);
const sock = createWebSocket({ conn });
@@ -384,7 +384,7 @@ test({
const p = Promise.all([
sock.send("hello").catch(onError),
sock.send(new Uint8Array([1, 2])).catch(onError),
- sock.ping().catch(onError)
+ sock.ping().catch(onError),
]);
sock.closeForce();
assertEquals(sock.isClosed, true);
@@ -396,5 +396,5 @@ test({
// Wait for another event loop turn for `timeout` op promise
// to resolve, otherwise we'll get "op leak".
await delay(10);
- }
+ },
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-31 07:16:43 +0000