3 files changed, 11 insertions, 10 deletions
diff --git a/ext/websocket/01_websocket.js b/ext/websocket/01_websocket.js
index e6b0053c6..50e110444 100644
--- a/ext/websocket/01_websocket.js
+++ b/ext/websocket/01_websocket.js
@@ -467,6 +467,7 @@ class WebSocket extends EventTarget {
         default: {
           /* close */
           const code = kind;
+          const reason = code == 1005 ? "" : op_ws_get_error(rid);
           const prevState = this[_readyState];
           this[_readyState] = CLOSED;
           clearTimeout(this[_idleTimeoutTimeout]);
@@ -476,7 +477,7 @@ class WebSocket extends EventTarget {
               await op_ws_close(
                 rid,
                 code,
-                op_ws_get_error(rid),
+                reason,
               );
             } catch {
               // ignore failures
@@ -486,7 +487,7 @@ class WebSocket extends EventTarget {
           const event = new CloseEvent("close", {
             wasClean: true,
             code: code,
-            reason: op_ws_get_error(rid),
+            reason,
           });
           this.dispatchEvent(event);
           core.tryClose(rid);
diff --git a/ext/websocket/02_websocketstream.js b/ext/websocket/02_websocketstream.js
index 068fa3e1b..281025289 100644
--- a/ext/websocket/02_websocketstream.js
+++ b/ext/websocket/02_websocketstream.js
@@ -242,8 +242,8 @@ class WebSocketStream {
               },
             });
             const pull = async (controller) => {
+              // Remember that this pull method may be re-entered before it has completed
               const kind = await op_ws_next_event(this[_rid]);
-
               switch (kind) {
                 case 0:
                   /* string */
@@ -266,17 +266,18 @@ class WebSocketStream {
                   core.tryClose(this[_rid]);
                   break;
                 }
-                case 4: {
+                case 1005: {
                   /* closed */
-                  this[_closed].resolve(undefined);
+                  this[_closed].resolve({ code: 1005, reason: "" });
                   core.tryClose(this[_rid]);
                   break;
                 }
                 default: {
                   /* close */
+                  const reason = op_ws_get_error(this[_rid]);
                   this[_closed].resolve({
                     code: kind,
-                    reason: op_ws_get_error(this[_rid]),
+                    reason,
                   });
                   core.tryClose(this[_rid]);
                   break;
@@ -294,7 +295,8 @@ class WebSocketStream {
                   return pull(controller);
                 }
 
-                this[_closed].resolve(op_ws_get_error(this[_rid]));
+                const error = op_ws_get_error(this[_rid]);
+                this[_closed].reject(new Error(error));
                 core.tryClose(this[_rid]);
               }
             };
diff --git a/ext/websocket/lib.rs b/ext/websocket/lib.rs
index dd975589c..a8d18b4ad 100644
--- a/ext/websocket/lib.rs
+++ b/ext/websocket/lib.rs
@@ -591,10 +591,8 @@ pub async fn op_ws_next_event(
       Ok(val) => val,
       Err(err) => {
         // No message was received, socket closed while we waited.
-        // Try close the stream, ignoring any errors, and report closed status to JavaScript.
+        // Report closed status to JavaScript.
         if resource.closed.get() {
-          let _ = state.borrow_mut().resource_table.close(rid);
-          resource.set_error(None);
           return MessageKind::ClosedDefault as u16;
         }