telemersive-bus 0.6.7 → 0.6.9

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

@@ -12,7 +12,7 @@ const {RoomAccess, RoomInfo, PeerCredentials, PeerInfo} = require('./protos/BusM
 
 /* time the housekeeping thread waits until it continues with the next step
  */
-const houseKeepingTimeOut = 500;
+const houseKeepingTimeOut = 1500;
 const houseKeepingTimeOut_onRepeat = 1500;
 const houseKeepingTimeOut_onPeerLeft= 1000;
 const houseKeepingTimeOut_onPeerJoined = 5000;
@@ -164,7 +164,7 @@ class BusManager {
 
             for (const key of keys) {
                 // send ping message
-                console.log(`        -> room '${key}' with id '${this.rooms[key].roomId}'...`);
+                console.log(`        -> room '${key}' with id '${this.rooms[key].roomId}' pings joined peers ...`);
                 await this.communicator.publish(new BusMsgPub(this.busTopics.baseRoomAlive(key).build(), RoomInfo, 1, false).encode(
                     {
                         "timestamp": Math.round(new Date().getTime() / 1000),
@@ -240,7 +240,6 @@ class BusManager {
      */
     cleanOut = async () => {
         if(this.houseKeepingInProgress) {
-            this.houseKeepingInProgress = false;
             console.log(`      -> housekeeping -> cleaning out ...`);
             const cleanupAndLeave = async (currentPeer) => {
                 console.log(`       <- remove peer '${currentPeer.peerName}' from room '${currentPeer.roomName}' `);
@@ -278,6 +277,9 @@ class BusManager {
         await this.communicator.unsubscribe(this.busTopics.baseRoomAlivePing("+").build());
         // cleanup the communicator
         this.communicator.clearAutoGeneratedSubscriptions();
+        // set this flag to false at the end to make sure a new houskeeping cycle can only be started once
+        // all topics are unsubscribed - otherwise it won't gather the joined peers inside the room.
+        this.houseKeepingInProgress = false;
     }
 
     /**
@@ -547,7 +549,7 @@ class BusManager {
 
                 delete this.rooms[_roomName];
             } catch (e) {
-                console.log("      <! exception while removing room '${_roomName}': ${e.message}");
+                console.log(`      <! exception while removing room '${_roomName}': '${e.message}' `);
             }
         }
     }

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.7",
+  "version": "0.6.9",
   "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": {