From 42afbed053aa0e103cb54a61a6fcea0086794ef2 Mon Sep 17 00:00:00 2001
From: Nayeem Rahman <nayeemrmn99@gmail.com>
Date: Wed, 28 Jul 2021 12:13:14 +0100
Subject: [PATCH] BREAKING(unstable): Rename Deno.WebSocketUpgrade::websocket
 to socket (#11542)

---
 cli/tests/unit/http_test.ts                 | 10 +++++-----
 extensions/http/01_http.js                  |  8 ++++----
 extensions/http/lib.deno_http.unstable.d.ts | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cli/tests/unit/http_test.ts b/cli/tests/unit/http_test.ts
index c8ec0d594b..3232d3f27d 100644
--- a/cli/tests/unit/http_test.ts
+++ b/cli/tests/unit/http_test.ts
@@ -641,12 +641,12 @@ unitTest({ perms: { net: true } }, async function httpServerWebSocket() {
       const { request, respondWith } = (await httpConn.nextRequest())!;
       const {
         response,
-        websocket,
+        socket,
       } = Deno.upgradeWebSocket(request);
-      websocket.onerror = () => fail();
-      websocket.onmessage = (m) => {
-        websocket.send(m.data);
-        websocket.close();
+      socket.onerror = () => fail();
+      socket.onmessage = (m) => {
+        socket.send(m.data);
+        socket.close();
       };
       await respondWith(response);
       break;
diff --git a/extensions/http/01_http.js b/extensions/http/01_http.js
index 2b0d8cd2c6..b245383d8f 100644
--- a/extensions/http/01_http.js
+++ b/extensions/http/01_http.js
@@ -368,11 +368,11 @@
 
     const response = fromInnerResponse(r, "immutable");
 
-    const websocket = webidl.createBranded(WebSocket);
-    setEventTargetData(websocket);
-    response[_ws] = websocket;
+    const socket = webidl.createBranded(WebSocket);
+    setEventTargetData(socket);
+    response[_ws] = socket;
 
-    return { response, websocket };
+    return { response, socket };
   }
 
   window.__bootstrap.http = {
diff --git a/extensions/http/lib.deno_http.unstable.d.ts b/extensions/http/lib.deno_http.unstable.d.ts
index 30ffe121e2..d15da0da6f 100644
--- a/extensions/http/lib.deno_http.unstable.d.ts
+++ b/extensions/http/lib.deno_http.unstable.d.ts
@@ -18,7 +18,7 @@ declare namespace Deno {
 
   export interface WebSocketUpgrade {
     response: Response;
-    websocket: WebSocket;
+    socket: WebSocket;
   }
 
   export interface UpgradeWebSocketOptions {
@@ -38,16 +38,16 @@ declare namespace Deno {
    * const httpConn = Deno.serveHttp(conn);
    * const e = await httpConn.nextRequest();
    * if (e) {
-   *   const { websocket, response } = Deno.upgradeWebSocket(e.request);
-   *   websocket.onopen = () => {
-   *     websocket.send("Hello World!");
+   *   const { socket, response } = Deno.upgradeWebSocket(e.request);
+   *   socket.onopen = () => {
+   *     socket.send("Hello World!");
    *   };
-   *   websocket.onmessage = (e) => {
+   *   socket.onmessage = (e) => {
    *     console.log(e.data);
-   *     websocket.close();
+   *     socket.close();
    *   };
-   *   websocket.onclose = () => console.log("WebSocket has been closed.");
-   *   websocket.onerror = (e) => console.error("WebSocket error:", e.message);
+   *   socket.onclose = () => console.log("WebSocket has been closed.");
+   *   socket.onerror = (e) => console.error("WebSocket error:", e.message);
    *   e.respondWith(response);
    * }
    * ```