Merge pull request #84 from speckleworks/Dim/dev/client-ws-fixes

waits for login flow to be finalised before it loads url streams
speckleworks · Nov 26, 2018 · a2b7caa · a2b7caa
2 parents 0df0ce7 + c4f907a
commit a2b7caa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -218,10 +218,11 @@ export default {
 
     this.viewerSettings = this.$store.getters.viewerSettings
 
-    this.$store.state.initStreams.forEach( streamId => {
-      this.addReceiver( streamId )
+    bus.$on( 'login-flow-finalised', ( ) => {
+      this.$store.state.initStreams.forEach( streamId => {
+        this.addReceiver( streamId )
+      } )
     } )
-
     bus.$on( 'snackbar-update', this.snackbarUpdate )
     bus.$on( 'stream-load-progress', message => {
       this.progressMessage = message

diff --git a/src/components/SidebarMenu.vue b/src/components/SidebarMenu.vue
@@ -116,6 +116,7 @@ export default {
         this.$store.commit( 'SET_USER', { account } )
         this.showLogin = false
       }
+      bus.$emit( 'login-flow-finalised' )
     },
     getStreams( ) {
       var jwtToken = localStorage.getItem( 'token' )

diff --git a/src/receiver/ClientReceiver.js b/src/receiver/ClientReceiver.js
@@ -41,6 +41,7 @@ export default class SpeckleReceiver extends EventEmitter {
     axios.delete( `${this.baseUrl}/clients/${this.clientId}` )
       .then( response => {
         this.clientId = null
+        clearInterval( this.wsConnectionChecker )
         this.ws.close( )
       } )
       .catch( err => {
@@ -58,7 +59,9 @@ export default class SpeckleReceiver extends EventEmitter {
     }
 
     this.ws.onmessage = message => {
-      if ( message.data === 'ping' ) return this.ws.send( 'alive' )
+      if ( message.data === 'ping' ) {
+        return this.ws.send( 'alive' )
+      }
       let parsedMessage = JSON.parse( message.data )
       switch ( parsedMessage.args.eventType ) {
         case 'update-global':