Fix websocket close event data

Fixes: emscripten-core#22499
sbc100 · Sep 5, 2024 · ac5bde6 · ac5bde6
1 parent 4c71fa1
commit ac5bde6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/library_websocket.js b/src/library_websocket.js
@@ -217,7 +217,7 @@ var LibraryWebSocket = {
 #endif
       var eventPtr = WS.getSocketEvent(socketId);
       {{{ makeSetValue('eventPtr', C_STRUCTS.EmscriptenWebSocketCloseEvent.wasClean, 'e.wasClean', 'i8') }}},
-      {{{ makeSetValue('eventPtr', C_STRUCTS.EmscriptenWebSocketCloseEvent.wasClean, 'e.code', 'i16') }}},
+      {{{ makeSetValue('eventPtr', C_STRUCTS.EmscriptenWebSocketCloseEvent.code, 'e.code', 'i16') }}},
       stringToUTF8(e.reason, eventPtr + {{{ C_STRUCTS.EmscriptenWebSocketCloseEvent.reason }}}, 512);
       {{{ makeDynCall('iipp', 'callbackFunc') }}}(0/*TODO*/, eventPtr, userData);
     }

diff --git a/test/websocket/test_websocket_send.c b/test/websocket/test_websocket_send.c
@@ -21,6 +21,18 @@ EM_BOOL WebSocketOpen(int eventType, const EmscriptenWebSocketOpenEvent *e, void
 
 EM_BOOL WebSocketClose(int eventType, const EmscriptenWebSocketCloseEvent *e, void *userData) {
   printf("close(socket=%d, eventType=%d, wasClean=%d, code=%d, reason=%s, userData=%p)\n", e->socket, eventType, e->wasClean, e->code, e->reason, userData);
+  assert(e->wasClean == 1);
+  assert(e->code == 1005 /* No Status Rcvd */);
+  emscripten_websocket_delete(e->socket);
+  if (e->socket == sock1) {
+    sock1 = 0;
+  } else if (e->socket == sock2) {
+    sock2 = 0;
+  }
+  // Once both sockets have been closed we are done.
+  if (!sock1 && !sock2) {
+    emscripten_force_exit(0);
+  }
   return 0;
 }
 
@@ -49,17 +61,6 @@ EM_BOOL WebSocketMessage(int eventType, const EmscriptenWebSocketMessageEvent *e
   }
   printf("\n");
   emscripten_websocket_close(e->socket, 0, 0);
-  emscripten_websocket_delete(e->socket);
-  if (e->socket == sock1) {
-    sock1 = 0;
-  } else {
-    sock2 = 0;
-  }
-  // Once both sockets are closed we are done.
-  if (!sock1 && !sock2) {
-    emscripten_force_exit(0);
-  }
-
   return 0;
 }