telemersive-bus 0.5.2 → 0.5.4

package/lib/BusClient.js

@@ -137,6 +137,9 @@ class BusClient {
                 // 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));
 
+                // now we start the timeout thread
+                this.joinTimeout = setTimeout(this.joinedTimeout,5000);
+
                 // now we can send the room create message - knowing the manager
                 // will resend the answer to a clientID protected topic
                 await this.communicator.publish(
@@ -144,7 +147,6 @@ class BusClient {
                         this.busTopics.roomCreate().build(),
                         PeerCredentials, 1, false).encode(this.peer.getCredentials()));
 
-                this.joinTimeout = setTimeout(this.joinedTimeout,5000);
             } else {
                 this.bubbleUpCallback('bus', [ 'error', 'peer', 'cannot join unless connected']);
             }
@@ -161,7 +163,7 @@ class BusClient {
 
     joinedTimeout = () => {
         console.error(">>> room join timeout. manager not answering");
-        //this.bubbleUpCallback('bus', [ 'peer', 'joined', 0]);
+        this.bubbleUpCallback('bus', [ 'peer', 'joined', 0]);
         this.bubbleUpCallback('bus', [ 'error', 'peer', 'timeout: manager is not answering']);
     }
 

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 = 100;
+const houseKeepingTimeOut = 500;
 const ROOM_ID_MIN = 11;
 const ROOM_ID_MAX = 50;
 
@@ -490,36 +490,39 @@ class BusManager {
         // make sure the room really exists.
         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
+                    await this.chatManagers[_roomName].disconnect();
+                    delete this.chatManagers[_roomName];
+                }
 
-            // 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
-                await this.chatManagers[_roomName].disconnect();
-                delete this.chatManagers[_roomName];
-            }
-
-            // then we subscribe to all retained messages of this room
-            await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomSubTopics(_roomName).build(), this.onAllRoomTopics, null, 0));
+                // then we subscribe to all retained messages of this room
+                await this.communicator.subscribe(new BusMsgSub(this.busTopics.baseRoomSubTopics(_roomName).build(), this.onAllRoomTopics, null, 0));
 
-            // send delete room message to all listening peers
-            await this.communicator.publish(new BusMsgPub(this.busTopics.roomDelete(_roomName).build(), RoomInfo, 2, false).encode(
-                {
-                    timestamp: Math.round(new Date().getTime() / 1000),
-                    roomId: this.rooms[_roomName].roomId,
-                    roomName: _roomName
-                }
-            ));
+                // send delete room message to all listening peers
+                await this.communicator.publish(new BusMsgPub(this.busTopics.roomDelete(_roomName).build(), RoomInfo, 2, false).encode(
+                    {
+                        timestamp: Math.round(new Date().getTime() / 1000),
+                        roomId: this.rooms[_roomName].roomId,
+                        roomName: _roomName
+                    }
+                ));
 
-            // clear retained info message
-            await this.communicator.clearRetain(this.busTopics.baseRoomInfo(_roomName).build());
+                // clear retained info message
+                await this.communicator.clearRetain(this.busTopics.baseRoomInfo(_roomName).build());
 
-            // and by now all retained messages in this room have been cleaned up
-            await this.communicator.unsubscribe(this.busTopics.baseRoomSubTopics(_roomName).build());
+                // 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];
+                delete this.rooms[_roomName];
+            } catch (e) {
+                console.log("      <! exception while removing room '${_roomName}': ${e.message}");
+            }
         }
     }
 

package/package.json

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