Allow empty data field in custom ping msg

rexxars · Dec 5, 2018 · 042ce32 · 042ce32
1 parent df6981c
commit 042ce32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/sse-channel.js b/lib/sse-channel.js
@@ -349,7 +349,7 @@ function parseMessage(msg, jsonEncode) {
     }
 
     var data = msg.data || '';
-    if (jsonEncode) {
+    if (jsonEncode && msg.data !== null && typeof msg.data !== 'undefined') {
         data = JSON.stringify(data);
     }
 

diff --git a/test/sse-channel.test.js b/test/sse-channel.test.js
@@ -437,17 +437,17 @@ describe('sse-channel', function() {
     it('sends custom automatic ping', function(done) {
         var interval = 25;
         var message = {
-            data: '',
+            data: null,
             event: 'KEEP-ALIVE',
-            id: 'id'
+            id: 1
         };
         initServer({ pingInterval: interval, keepAliveMessage: message });
 
         var opts = url.parse(host + path);
         opts.headers = { Accept: 'text/event-stream' };
 
         var initialMessage = ':ok\n\n';
-        var parsedKeepAliveMessage = 'event: KEEP-ALIVE\nid: id\ndata: ""\n\n\n';
+        var parsedKeepAliveMessage = 'event: KEEP-ALIVE\nid: 1\ndata: \n\n\n';
 
         var req = http.request(opts, function(res) {
             var buf = '';