fix emscripten_websocket_deinitialize()

Author: strandfield

src/lib/libwebsocket.js

@@ -409,21 +409,19 @@ var LibraryWebSocket = {
   emscripten_websocket_is_supported__proxy: 'sync',
   emscripten_websocket_is_supported: () => typeof WebSocket != 'undefined',
 
-  emscripten_websocket_deinitialize__deps: ['$WS'],
+  emscripten_websocket_deinitialize__deps: ['$webSockets', 'emscripten_websocket_delete'],
   emscripten_websocket_deinitialize__proxy: 'sync',
-  emscripten_websocket_deinitialize__deps: ['emscripten_websocket_delete'],
   emscripten_websocket_deinitialize: () => {
 #if WEBSOCKET_DEBUG
     dbg('emscripten_websocket_deinitialize()');
 #endif
-    for (var i in WS.sockets) {
-      var socket = WS.sockets[i];
-      if (socket) {
+    for (var i in webSockets.allocated) {
+      if (webSockets.has(i)) {
+        var socket = webSockets.get(i);
         socket.close();
         _emscripten_websocket_delete(i);
       }
     }
-    WS.sockets = [];
   }
 }
 

test/websocket/test_websocket_send.c

@@ -84,8 +84,6 @@ bool WebSocketMessage(int eventType, const EmscriptenWebSocketMessageEvent *e, v
     // It is no longer possible to query their state.
     unsigned short ready_state;
     EMSCRIPTEN_RESULT result = emscripten_websocket_get_ready_state(e->socket, &ready_state);
-    // Note: the following assert() currently fails because
-    // emscripten_websocket_deinitialize() is broken.
     assert(result == EMSCRIPTEN_RESULT_INVALID_TARGET);
     (void)ready_state;
     sock1 = sock2 = 0;