telemersive-bus 0.6.6 → 0.6.8

package/lib/BusClient.js

@@ -62,7 +62,7 @@ class BusClient {
     connectServer = async () => {
         console.log("connect: attempting to connect to broker...")
         try{
-            this.connectTimeout = setTimeout(this.connectionTimeout,1000);
+            this.connectTimeout = setTimeout(this.connectionTimeout,4000);
             await this.communicator.connect();
             // if connection was successful, subscribe to room info topic
             await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomInfo('+').build(), this.onRooms, RoomInfo, 2));

package/lib/BusManager.js

@@ -286,17 +286,20 @@ class BusManager {
     onPeerLeaving = async (_topic, _message, _packet) => {
         console.log(`  <- peer '${_message.peerName}' leaving`);
         let shaPassword = sha1(_message.roomPwd).substr(0, 10)
-        if (this.rooms[_message.roomName].roomPwd === shaPassword){
-            // the actual message of this peer leaving the room is generated by the
-            // housekeeping routine 'cleanOut':
-            // we wait a moment to start with housekeeping, though.
-            // it could be, that this message was called due to a short disconnect by the
-            // peer to the broker - issuing a lastWill message by the broker.
-            // by giving it some time the housekeeping process will verify if the peer
-            // is still online or if it is really gone..
-            setTimeout(this.startHousekeeping, houseKeepingTimeOut_onPeerLeft);
-        } else {
-            console.log(`!!! >BAD PLAYER<: somebody tried to remove peer without proper credentials!!!`);
+        if(this.rooms[_message.roomName] !== undefined){
+            // make sure the leaving peer leaves a still existing room
+            if (this.rooms[_message.roomName].roomPwd === shaPassword){
+                // the actual message of this peer leaving the room is generated by the
+                // housekeeping routine 'cleanOut':
+                // we wait a moment to start with housekeeping, though.
+                // it could be, that this message was called due to a short disconnect by the
+                // peer to the broker - issuing a lastWill message by the broker.
+                // by giving it some time the housekeeping process will verify if the peer
+                // is still online or if it is really gone..
+                setTimeout(this.startHousekeeping, houseKeepingTimeOut_onPeerLeft);
+            } else {
+                console.log(`!!! >BAD PLAYER<: somebody tried to remove peer without proper credentials!!!`);
+            }
         }
     };
 

package/lib/utils/Peer.js

@@ -192,14 +192,16 @@ class Peer {
             this.updateCallback();
 
             // it is important to start the subscription after a successfull joining.
+            // important to subscribe to my room ping messages first - otherwise we can run into the problem that we miss
+            // the room alive ping while building up the peer list.
+            await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomAlive(this.roomName).build(), this.onRoomPing, RoomInfo, 0));
+
             // subscribe to all peer joined messages
             await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomPeerJoin(this.roomName, '+').build(), this.onPeerJoined, PeerInfo, 2));
 
             // subscribe to peer left messages
             await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomPeerLeft(this.roomName, '+').build(), this.onPeerLeft, PeerInfo, 2));
 
-            // subscribe to my room ping messages
-            await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomAlive(this.roomName).build(), this.onRoomPing, RoomInfo, 0));
             console.log("   <-- ... local peer subscriptions complete");
         } else {
             if(decryptedRoomUuid !== this.roomUuid){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telemersive-bus",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "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": {