telemersive-bus 0.5.3 → 0.6.0

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}");
+            }
         }
     }
 
@@ -574,6 +577,17 @@ class BusManager {
                     console.error(`      ...: ${err}. Interrupting process of starting up one2manyBi script on port ${_roomId * 1000 + i * 10 + 0}.`);
                 }
             }
+            // Stage Control Many to many proxy
+            try{
+                await this.addSwitchBoardProxy(_roomName,_roomId * 1000 + 902, _roomId * 1000 + 902, 'many2manyBi', "UDP proxy for Open Stage Control");
+            } catch(err){
+                console.error(`      ...: ${err}. Interrupting process of starting up many2manyBi script on port ${_roomId * 1000 + 902}.`);
+            }
+            try{
+                await this.addSwitchBoardProxy(_roomName,_roomId * 1000 + 900, _roomId * 1000 + 902, 'OpenStageControl', "Open Stage Control instance");
+            } catch(err){
+                console.error(`      ...: ${err}. Interrupting process of starting up many2manyBi script on port ${_roomId * 1000 + 902}.`);
+            }
             console.log(`        <- started all ports for room ${_roomName}`);
         } else {
             console.log(`        ...started no ports for room ${_roomName}: no switchboard url/port defined`);
@@ -608,6 +622,16 @@ class BusManager {
                     console.error(`      ...: ${err}. Interrupting process of stopping one2manyBi script on port ${_roomId * 1000 + i * 10 + 0}.`);
                 }
             }
+            try{
+                await this.deleteSwitchBoardProxy(_roomId * 1000 + 902);
+            } catch(err){
+                console.error(`      ...: ${err}. Interrupting process of stopping many2manyBi script on port ${_roomId * 1000 + 902}.`);
+            }
+            try{
+                await this.deleteSwitchBoardProxy(_roomId * 1000 + 900);
+            } catch(err){
+                console.error(`      ...: ${err}. Interrupting process of stopping open stage control instance on port ${_roomId * 1000 + 900}.`);
+            }
             console.log(`        <- stopped all ports for room ${_roomName}`);
         }else {
             console.log(`        ...stopped no ports for room ${_roomName}: no switchboard url/port defined`);

package/package.json

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