refactor(op_crates/websocket): use Serialize for return values (#10220)

1 files changed, 43 insertions, 62 deletions

diff --git a/op_crates/websocket/01_websocket.js b/op_crates/websocket/01_websocket.js
index 17ba601a2..a37cd01cc 100644
--- a/op_crates/websocket/01_websocket.js
+++ b/op_crates/websocket/01_websocket.js
@@ -312,74 +312,55 @@
           this.#rid,
         );
 
-        switch (message.kind) {
-          case "string": {
-            const event = new MessageEvent("message", {
-              data: message.data,
-              origin: this.#url,
-            });
-            event.target = this;
-            this.dispatchEvent(event);
-
-            break;
-          }
-
-          case "binary": {
-            let data;
-
-            if (this.binaryType === "blob") {
-              data = new Blob([new Uint8Array(message.data)]);
-            } else {
-              data = new Uint8Array(message.data).buffer;
-            }
-
-            const event = new MessageEvent("message", {
-              data,
-              origin: this.#url,
-            });
-            event.target = this;
-            this.dispatchEvent(event);
-
-            break;
-          }
-
-          case "ping":
-            core.opAsync("op_ws_send", {
-              rid: this.#rid,
-              kind: "pong",
-            });
-
-            break;
-
-          case "close": {
-            this.#readyState = CLOSED;
-
-            const event = new CloseEvent("close", {
-              wasClean: true,
-              code: message.data.code,
-              reason: message.data.reason,
-            });
-            event.target = this;
-            this.dispatchEvent(event);
-            tryClose(this.#rid);
+        if ("string" in message) {
+          const event = new MessageEvent("message", {
+            data: message.string,
+            origin: this.#url,
+          });
+          event.target = this;
+          this.dispatchEvent(event);
+        } else if ("binary" in message) {
+          let data;
 
-            break;
+          if (this.binaryType === "blob") {
+            data = new Blob([new Uint8Array(message.binary)]);
+          } else {
+            data = new Uint8Array(message.binary).buffer;
           }
 
-          case "error": {
-            this.#readyState = CLOSED;
+          const event = new MessageEvent("message", {
+            data,
+            origin: this.#url,
+          });
+          event.target = this;
+          this.dispatchEvent(event);
+        } else if ("ping" in message) {
+          core.opAsync("op_ws_send", {
+            rid: this.#rid,
+            kind: "pong",
+          });
+        } else if ("close" in message) {
+          this.#readyState = CLOSED;
 
-            const errorEv = new ErrorEvent("error");
-            errorEv.target = this;
-            this.dispatchEvent(errorEv);
+          const event = new CloseEvent("close", {
+            wasClean: true,
+            code: message.close.code,
+            reason: message.close.reason,
+          });
+          event.target = this;
+          this.dispatchEvent(event);
+          tryClose(this.#rid);
+        } else if ("error" in message) {
+          this.#readyState = CLOSED;
 
-            const closeEv = new CloseEvent("close");
-            closeEv.target = this;
-            this.dispatchEvent(closeEv);
-            tryClose(this.#rid);
+          const errorEv = new ErrorEvent("error");
+          errorEv.target = this;
+          this.dispatchEvent(errorEv);
 
-            break;
-          }
+          const closeEv = new CloseEvent("close");
+          closeEv.target = this;
+          this.dispatchEvent(closeEv);
+          tryClose(this.#rid);
         }
       }
     }