Fixed 2 way web socket connection

Author: Praseetha-KR

engage/routers.py

@@ -1,7 +1,7 @@
 from swampdragon import route_handler
 from swampdragon.route_handler import ModelRouter
 from swampdragon.permissions import LoginRequired
-from swampdragon.pusub_providers.data_publisher import publish_data
+from swampdragon.pubsub_providers.data_publisher import publish_data
 from django.contrib.auth import get_user_model
 
 from .serializers import UserMessageSerializer
@@ -13,7 +13,7 @@ class UserMessageRouter(ModelRouter):
     model = UserMessage
     route_name = 'user-message'
     permission_classes = [LoginRequired()]
-    valid_verbs = ['subscribe']
+    valid_verbs = ['subscribe', 'create', 'unsubscribe']
 
     def get_subscription_channels(self, **kwargs):
         # ret = [('user-message-' + user.pk) for user in get_user_model().objects.all()]
@@ -33,9 +33,9 @@ def create(self, **kwargs):
             user=self.connection.user,
             direction='from'
         )
-        publish_data('user-message-' + self.connection.user.pk, {
+        publish_data('user-message-%s' % self.connection.user.pk, {
             'text': msg.text,
-            'created_at': msg.created_at,
+            'created_at': str(msg.created_at),
             'direction': 'from'
         })
         self.send('done')
@@ -63,14 +63,13 @@ def create(self, **kwargs):
             user=user,
             direction='to'
         )
-        publish_data('user-message-' + user.pk, {
+        publish_data('user-message-%s' % user.pk, {
             'text': msg.text,
-            'created_at': msg.created_at,
+            'created_at': str(msg.created_at),
             'direction': 'from'
         })
 
         self.send('done')
 
-print UserMessageRouter, AdminMessageRouter
 route_handler.register(UserMessageRouter)
 route_handler.register(AdminMessageRouter)

engage/serializers.py

@@ -4,5 +4,5 @@
 class UserMessageSerializer(ModelSerializer):
     class Meta:
         model = 'engage.UserMessage'
-        publish_fields = ('text', 'created_at', 'direction')
+        publish_fields = ('text', 'direction')
         update_fields = ('text', )

engage/templates/chatboxadmin.html

@@ -148,6 +148,16 @@
 
                 // });
 
+                swampdragon.onChannelMessage(function(channels, message) {
+                    if(channels[0] === ('user-message-' + getUser())){
+                        msgbox.push(
+                            message.data.text,
+                            '11: 30 PM',
+                            message.data.direction
+                        );
+                    }
+                });
+
                 swampdragon.ready(function() {
                     console.log('Started connection ' + new Date());
                 });
@@ -157,6 +167,8 @@
                 });
 
                 window.setUser = function(id, username) {
+                    swampdragon.unsubscribe('user-message', ('user-message-' + userid));
+                    swampdragon.subscribe('user-message', ('user-message-' + id));
                     userid = id;
                     if (userid){
                         mbox.classList.remove('closed');
@@ -176,7 +188,6 @@
                 window.enterHandler = function (e, input) {
                     if (e.keyCode === 13 && input.value) {
                         sendMessage(input.value);
-                        msgbox.push(input.value, new Date(), 'to');
                         input.value = '';
                     }
                 };

engage/templates/chatboxclient.html

@@ -40,12 +40,12 @@
                 border-radius: 0.5em;
                 border: 1px solid #efefef;
             }
-            #django-engage .to {
+            #django-engage .from {
                 float: right;
                 background: white;
                 margin-left: 4em;
             }
-            #django-engage .from {
+            #django-engage .to {
                 float: left;
                 background: #eee;
                 margin-right: 4em;
@@ -150,13 +150,16 @@
                     mbox.classList.toggle('opened');
                 });
 
-                // swampdragon.onChannelMessage(function(channels, message) {
-                //     console.log('channel ', channels, message);
-                // });
+                swampdragon.onChannelMessage(function(channels, message) {
+                    msgbox.push(
+                        message.data.text,
+                        '11: 30 PM',
+                        message.data.direction
+                    );
+                });
                 swampdragon.ready(function() {
                     console.log('Started connection ' + new Date());
-                    //swampdragon.subscribe('usermessage','usermessage{{request.user.pk}}');
-
+                    swampdragon.subscribe('user-message','user-message-{{request.user.pk}}');
                 });
                 swampdragon.open(function() {
                     console.log('{{ request.user.username }} connected');
@@ -170,7 +173,6 @@
                 window.enterHandler = function (e, input) {
                     if (e.keyCode === 13 && input.value) {
                         sendMessage(input.value);
-                        msgbox.push(input.value, new Date(), 'to');
                         input.value = '';
                     }
                 };