telemersive-bus 0.6.10 → 0.6.12

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

@@ -222,14 +222,28 @@ class BusManager {
             console.log(`            -> peer '${_message.peerName}' not joined anymore - reject from room`);
         }
 
+        let room_ID = -1;
+        let room_UUID = -1;
+
+        // we also check if the room is still existing..
+        if (this.rooms[_message.roomName] !== undefined){
+            // we only set the id and UUID if the room still exists.
+            room_ID = this.rooms[_message.roomName].roomId;
+            room_UUID = this.rooms[_message.roomName].roomUUID;
+        } else {
+            accessGrant = false;
+            reason = "room doesn't exist anymore";
+            console.log(`            -> peer '${_message.peerName}' reject from non existing room '${_message.roomName}'`);
+        }
+
         await this.publishRoomAccess(
             accessGrant,
             _message.peerId,
             _message.clientId,
             _message.peerName,
             _message.roomName,
-            this.rooms[_message.roomName].roomId,
-            this.rooms[_message.roomName].roomUUID,
+            room_ID,
+            room_UUID,
             _message.roomPwd,
             reason);
 
@@ -539,9 +553,6 @@ class BusManager {
         if (this.rooms.hasOwnProperty(_roomName)) {
             console.log(`       <- remove room '${_roomName}' with id '${this.rooms[_roomName].roomId}' `);
             try {
-                // stop the ports
-                await this.stopServerSidePortScripts(_roomName, this.rooms[_roomName].roomId);
-
                 // stop the and cleanup the room chat
                 if (this.chatManagers.hasOwnProperty(_roomName)) {
                     // stop the chatManager and delete it for this rom
@@ -567,7 +578,8 @@ class BusManager {
                 // and by now all retained messages in this room have been cleaned up
                 await this.communicator.unsubscribe(this.busTopics.baseRoomSubTopics(_roomName).build());
 
-                delete this.rooms[_roomName];
+                // stop the ports and delete room for good
+                await this.stopServerSidePortScripts(_roomName, this.rooms[_roomName].roomId);
             } catch (e) {
                 console.log(`      <! exception while removing room '${_roomName}': '${e.message}' `);
             }
@@ -681,6 +693,8 @@ class BusManager {
                 console.error(`      ...: ${err}. Interrupting process of stopping open stage control instance on port ${_roomId * 1000 + 900}.`);
             }
             console.log(`        <- stopped all ports for room ${_roomName}`);
+            delete this.rooms[_roomName];
+            console.log(`        <- removed room ${_roomName}`);
         }else {
             console.log(`        ...stopped no ports for room ${_roomName}: no switchboard url/port defined`);
         }

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