telemersive-bus 0.6.11 → 0.6.13

package/lib/BusClient.js

@@ -132,7 +132,17 @@ class BusClient {
                 // we reconnect with the final clientID. this protects this peer from a
                 // potential BAD ACTOR spoofing as itself.
                 this.communicator.setClientID(this.peer.getClientId());
-                await this.communicator.reconnect(null);
+
+                console.log(`   <-- reconnect to broker with correct last will...`);
+                // we reconnect again and set this time the correct last will message
+                // with the room info and password
+                // this should be done before we internally join the room and subscribe to all the
+                // topics
+                await this.communicator.reconnect(
+                    new BusMsgPub(
+                        this.busTopics.peerLeaving().build(),
+                        PeerCredentials, 2, false).encode(this.peer.getCredentials()));
+                console.log(`   <-- ... reconnected.`);
 
                 // if connection was successful, subscribe to roomAccess topic
                 await this.communicator.subscribe(new BusMsgSub(this.busTopics.basePeerRoomAccess(this.peer.getClientId()).build(), this.onRoomJoined, RoomAccess, 2));
@@ -140,6 +150,7 @@ class BusClient {
                 // now we start the timeout thread
                 this.joinTimeout = setTimeout(this.joinedTimeout,5000);
 
+                console.log(`   <-- send request to create / join room...`);
                 // now we can send the room create message - knowing the manager
                 // will resend the answer to a clientID protected topic
                 await this.communicator.publish(
@@ -192,17 +203,6 @@ class BusClient {
             if(!this.peer.isJoined()){
                 console.log(`<-- access to room ${_message.roomName} accepted.`);
 
-                console.log(`   <-- reconnect to broker with correct last will...`);
-                // we reconnect again and set this time the correct last will message
-                // with the room info and password
-                // this should be done before we internally join the room and subscribe to all the
-                // topics
-                await this.communicator.reconnect(
-                    new BusMsgPub(
-                        this.busTopics.peerLeaving().build(),
-                        PeerCredentials, 2, false).encode(this.peer.getCredentials()));
-                console.log(`   <-- ... reconnected.`);
-
                 // now we can join the peer and give it its room id
                 await this.peer.join(_message.roomId, _message.roomUuid);
 

package/lib/BusManager.js

@@ -209,7 +209,7 @@ class BusManager {
 
                 // if even one joined peer replies to the room ping,
                 // the room can be removed from this list
-                if (this.roomHousekeep[_message.roomName] !== null) {
+                if (_message.roomName in this.roomHousekeep) {
                     delete this.roomHousekeep[_message.roomName];
                 }
             }

package/lib/utils/version.js

@@ -5,7 +5,7 @@ class Version {
     }
 
     getProtocolVersion = () => {
-        return '0.0.5';
+        return '0.6.12';
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telemersive-bus",
-  "version": "0.6.11",
+  "version": "0.6.13",
   "description": "MQTT based data protocol to manage unlimited peers, connected by rooms, where all peers joined to a room can exchange private data. It provides a simple chat mechanism, latency pinging, publish-subscribe mechanism (based on mqtt) and a OSC-like data stream.  ",
   "main": "index.js",
   "directories": {