telemersive-bus 0.6.3 → 0.6.4

package/lib/BusClient.js

@@ -65,9 +65,9 @@ class BusClient {
             this.connectTimeout = setTimeout(this.connectionTimeout,1000);
             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, 0));
+            await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomInfo('+').build(), this.onRooms, RoomInfo, 2));
             // if connection was successful, subscribe to room delete topic
-            await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomDelete().build(), this.onRoomDelete, RoomInfo, 0));
+            await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomDelete().build(), this.onRoomDelete, RoomInfo, 2));
             //console.log(`...subscribe to. ${this.busTopics.basePeerRoomAccess(this.peerId).build()}`);
             this.bubbleUpCallback('bus', [ 'broker', 'connected', 1]);
             console.log("...successfully connected.");
@@ -135,7 +135,7 @@ class BusClient {
                 await this.communicator.reconnect(null);
 
                 // if connection was successful, subscribe to roomAccess topic
-                await this.communicator.subscribe(new BusMsgSub(this.busTopics.basePeerRoomAccess(this.peer.getClientId()).build(), this.onRoomJoined, RoomAccess, 0));
+                await this.communicator.subscribe(new BusMsgSub(this.busTopics.basePeerRoomAccess(this.peer.getClientId()).build(), this.onRoomJoined, RoomAccess, 2));
 
                 // now we start the timeout thread
                 this.joinTimeout = setTimeout(this.joinedTimeout,5000);

package/lib/BusManager.js

@@ -186,7 +186,10 @@ class BusManager {
      * return messages from peers on room ping requests
      */
     onRoomAlive = async (_topic, _message, _packet) => {
-        console.log(`        -> room '${_message.roomName}' alive with peer '${_message.peerName}'`);
+        let accessGrant;
+        let reason = "unknown";
+        console.log(`        -> room '${_message.roomName}' alive ping from peer '${_message.peerName}'`);
+
         // if we receive this message, it means this peer is alive and we can remove it
         // from our housekeeping lists
         if (_message.peerId in this.peerHousekeep) {
@@ -200,39 +203,36 @@ class BusManager {
                 // now we resend the access message
                 // we need to do this in case the manager has crashed and restarted...
                 // send access message
-                await this.publishRoomAccess(
-                    true,
-                    _message.peerId,
-                    _message.clientId,
-                    _message.peerName,
-                    _message.roomName,
-                    this.rooms[_message.roomName].roomId,
-                    this.rooms[_message.roomName].roomUUID,
-                    _message.roomPwd,
-                    "confirmation");
+                accessGrant = true;
+                reason = "confirmation";
+                delete this.peerHousekeep[_message.peerId];
+
+                // if even one joined peer replies to the room ping,
+                // the room can be removed from this list
+                if (this.roomHousekeep[_message.roomName] !== null) {
+                    delete this.roomHousekeep[_message.roomName];
+                }
             }
-            delete this.peerHousekeep[_message.peerId];
         } else {
             // this peer seems to be still alive and thinks it is joined.
             // we need to relieve it from its misery and allow it to leave
             // gracefully..
+            accessGrant = false;
+            reason = "not joined anymore";
             console.log(`            -> peer '${_message.peerName}' not joined anymore - reject from room`);
-            await this.publishRoomAccess(
-                false,
-                _message.peerId,
-                _message.clientId,
-                _message.peerName,
-                _message.roomName,
-                this.rooms[_message.roomName].roomId,
-                this.rooms[_message.roomName].roomUUID,
-                _message.roomPwd,
-                "not joined anymore");
-        }
-        // if even one peer replies to the room ping,
-        // the room can be removed from this list
-        if (this.roomHousekeep[_message.roomName] !== null) {
-            delete this.roomHousekeep[_message.roomName];
         }
+
+        await this.publishRoomAccess(
+            accessGrant,
+            _message.peerId,
+            _message.clientId,
+            _message.peerName,
+            _message.roomName,
+            this.rooms[_message.roomName].roomId,
+            this.rooms[_message.roomName].roomUUID,
+            _message.roomPwd,
+            reason);
+
     };
 
     /**
@@ -286,21 +286,18 @@ class BusManager {
     onPeerLeaving = async (_topic, _message, _packet) => {
         console.log(`  <- peer '${_message.peerName}' leaving`);
         let shaPassword = sha1(_message.roomPwd).substr(0, 10)
-        if (this.rooms.hasOwnProperty(_message.roomName)){
-            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].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!!!`);
         }
-
     };
 
     /*********************************************************************
@@ -334,7 +331,10 @@ class BusManager {
                 console.log(`  -> peer '${_message.peerName}' creating new room '${_message.roomName}' for app version: '${_message.appVersion}'`);
                 reason = "no room of this name exists";
                 await this.publishNewRoom(_message.roomName, shaPassword, _message.appVersion);
+                // and we wait a moment to start with housekeeping again
+                setTimeout(this.startHousekeeping, houseKeepingTimeOut_onPeerJoined);
             } else {
+                //room exists: checked if the doubled hashed roomPwd is equal
                 if (this.rooms[_message.roomName].roomPwd !== shaPassword) {
                     console.log(`  -> peer '${_message.peerName}' declined access to room: ${_message.roomName} | invalid password`);
                     accessGrant = false;
@@ -344,7 +344,6 @@ class BusManager {
                     accessGrant = false;
                     reason = `app version incompatible: required version is '${this.rooms[_message.roomName].appVersion}', yours is '${_message.appVersion}'`;
                 } else {
-                    //room exists: checked if the doubled hashed roomPwd is equal
                     accessGrant = true;
                     console.log(`  -> peer '${_message.peerName}' joining room '${_message.roomName}'`);
                     // if there is a housekeeping process in progress,

package/lib/utils/Peer.js

@@ -193,10 +193,10 @@ class Peer {
 
             // it is important to start the subscription after a successfull joining.
             // subscribe to all peer joined messages
-            await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomPeerJoin(this.roomName, '+').build(), this.onPeerJoined, PeerInfo, 0));
+            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, 0));
+            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));

package/package.json

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