Allow pubsub to publish falsy message

refs #228
SkygearIO · Aug 17, 2017 · 2ca9626 · 2ca9626
2 parents 3e94222 + 6d21022
commit 2ca9626
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/example/pubsub.html b/example/pubsub.html
@@ -82,14 +82,15 @@ <h4>Publish Message</h4>
     function publishMessage () {
       var _channel = document.getElementById("publish-channel").value;
       var _data = document.getElementById("publish-data").value;
-      skygear.pubsub.publish(_channel, _data);
+      skygear.pubsub.publish(_channel, JSON.parse(_data));
     }
 
     function subscribeChannel() {
       var _channel = document.getElementById("subscribe-channel").value;
       var _data = document.getElementById("subscribe-data");
       skygear.pubsub.on(_channel, function(data) {
-        _data.value += 'Channel "' + _channel + '": ' + data + '\n';
+        var stringifyData = JSON.stringify(data);
+        _data.value += 'Channel "' + _channel + '": ' + stringifyData + '\n';
       });
     }
 

diff --git a/packages/skygear-core/lib/pubsub.js b/packages/skygear-core/lib/pubsub.js
@@ -165,8 +165,9 @@ export class Pubsub {
       throw new Error('Missing channel to publish');
     }
 
-    if (!data) {
-      throw new Error('Missing data to publish');
+    const dataType = typeof data;
+    if (dataType !== 'object' || data === null || _.isArray(data)) {
+      throw new Error('Data must be object');
     }
 
     let publishData = {

diff --git a/packages/skygear-core/test/pubsub.js b/packages/skygear-core/test/pubsub.js
@@ -78,10 +78,12 @@ describe('Pubsub', function () {
       expect(JSON.parse(data)).to.deep.equal({
         action: 'pub',
         channel: 'CHANNEL',
-        data: 'DATA'
+        data: {
+          content: 'DATA'
+        }
       });
     });
-    pubsub.publish('CHANNEL', 'DATA');
+    pubsub.publish('CHANNEL', {content: 'DATA'});
     expect(ws.send).to.be.calledOnce();
   });
 
@@ -164,12 +166,14 @@ describe('Pubsub', function () {
 
   it('resend queued messages on open when no websocket', function () {
     pubsub._setWebSocket(null);
-    pubsub.publish('CHANNEL', 'MESSAGE');
+    pubsub.publish('CHANNEL', {content: 'MESSAGE'});
     ws.send = sinon.spy(function (data) {
       expect(JSON.parse(data)).to.deep.equal({
         action: 'pub',
         channel: 'CHANNEL',
-        data: 'MESSAGE'
+        data: {
+          content: 'MESSAGE'
+        }
       });
     });
     pubsub._setWebSocket(ws);
@@ -180,14 +184,16 @@ describe('Pubsub', function () {
   it('resend queued messages on open after disconnected', function () {
     ws.readyState = 2;
     ws.send = sinon.spy();
-    pubsub.publish('CHANNEL', 'MESSAGE');
+    pubsub.publish('CHANNEL', {content: 'MESSAGE'});
     expect(ws.send).not.to.be.called();
     ws.readyState = 1;
     ws.send = sinon.spy(function (data) {
       expect(JSON.parse(data)).to.deep.equal({
         action: 'pub',
         channel: 'CHANNEL',
-        data: 'MESSAGE'
+        data: {
+          content: 'MESSAGE'
+        }
       });
     });
     ws.onopen();