From 9ae08f8f0afc0eedbe138cf13e337f49d0a5745c Mon Sep 17 00:00:00 2001 From: Jayshankar Date: Sat, 16 Nov 2024 00:25:48 +0530 Subject: [PATCH 1/2] Updated depreciated custom event code --- reconnecting-websocket.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/reconnecting-websocket.js b/reconnecting-websocket.js index 0cd4332..b421203 100644 --- a/reconnecting-websocket.js +++ b/reconnecting-websocket.js @@ -200,9 +200,7 @@ * @param args Object an optional object that the event will use */ function generateEvent(s, args) { - var evt = document.createEvent("CustomEvent"); - evt.initCustomEvent(s, false, false, args); - return evt; + return new CustomEvent(s, { detail: args }); }; this.open = function (reconnectAttempt) { @@ -277,9 +275,17 @@ if (self.debug || ReconnectingWebSocket.debugAll) { console.debug('ReconnectingWebSocket', 'onmessage', self.url, event.data); } - var e = generateEvent('message'); - e.data = event.data; - eventTarget.dispatchEvent(e); + + try { + + var e = generateEvent('message'); + e.data = JSON.parse(event.data) + eventTarget.dispatchEvent(e); + + } catch (e) { + console.warn('ReconnectingWebSocket', 'onmessage', 'invalid json in message' , event.data); + } + }; ws.onerror = function(event) { if (self.debug || ReconnectingWebSocket.debugAll) { From ec142ea3bca71b9072fbea15259d383297340fd1 Mon Sep 17 00:00:00 2001 From: Jayshankar Date: Sat, 16 Nov 2024 00:36:26 +0530 Subject: [PATCH 2/2] update depreciated CustomEvent function --- reconnecting-websocket.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/reconnecting-websocket.js b/reconnecting-websocket.js index b421203..94daa89 100644 --- a/reconnecting-websocket.js +++ b/reconnecting-websocket.js @@ -201,7 +201,7 @@ */ function generateEvent(s, args) { return new CustomEvent(s, { detail: args }); - }; + } this.open = function (reconnectAttempt) { ws = new WebSocket(self.url, protocols || []); @@ -275,17 +275,9 @@ if (self.debug || ReconnectingWebSocket.debugAll) { console.debug('ReconnectingWebSocket', 'onmessage', self.url, event.data); } - - try { - - var e = generateEvent('message'); - e.data = JSON.parse(event.data) - eventTarget.dispatchEvent(e); - - } catch (e) { - console.warn('ReconnectingWebSocket', 'onmessage', 'invalid json in message' , event.data); - } - + var e = generateEvent('message'); + e.data = event.data; + eventTarget.dispatchEvent(e); }; ws.onerror = function(event) { if (self.debug || ReconnectingWebSocket.debugAll) {