telemersive-bus 0.6.13 → 0.6.14

package/lib/BusManager.js

@@ -31,6 +31,7 @@ class BusManager {
         this.peerHousekeep = {};
         this.roomHousekeep = {};
         this.houseKeepingInProgress = false;
+        this.housekeepingId = 0;
         this.chatManagers = {};
         this.switchBoardURI = null;
     }
@@ -122,6 +123,10 @@ class BusManager {
         // we dont want to start another housekeeping process until the previous one has finished
         if(!this.houseKeepingInProgress){
             this.houseKeepingInProgress = true;
+            // each cycle gets a unique id so stale timers from an interrupted cycle can detect
+            // they no longer own the housekeeping state and bail out.
+            this.housekeepingId += 1;
+            const myId = this.housekeepingId;
             console.log(`  -> starting housekeeping -> gather all peers ...`);
             this.peerHousekeep = {};
             this.roomHousekeep = Object.assign({}, this.rooms); // clone the current room list
@@ -130,7 +135,7 @@ class BusManager {
             await this.communicator.subscribe(new BusMsgSub(this.busTopics.roomPeerJoin('+', '+').build(), this.onAllPeers, PeerInfo, 0));
 
             // now we have to wait a moment
-            setTimeout(this.pingAllPeersAlive, houseKeepingTimeOut);
+            setTimeout(() => this.pingAllPeersAlive(myId), houseKeepingTimeOut);
         } else {
             // if there is already a housekeeping going on,
             // we wait for some time to finish it and try again.
@@ -154,7 +159,11 @@ class BusManager {
     /**
      * ping all peers that are subscribed to each individual rooms
      */
-    pingAllPeersAlive = async () => {
+    pingAllPeersAlive = async (myId) => {
+        // if a newer cycle has started, this callback belongs to an interrupted cycle — drop it.
+        if (myId !== this.housekeepingId) {
+            return;
+        }
         if(this.houseKeepingInProgress) {
             console.log(`      -> housekeeping -> pinging all rooms ...`);
             const keys = Object.keys(this.rooms);
@@ -174,11 +183,11 @@ class BusManager {
                 ));
             }
             // now we have to wait a moment
-            setTimeout(this.cleanOut, houseKeepingTimeOut);
+            setTimeout(() => this.cleanOut(myId), houseKeepingTimeOut);
         } else {
             // this means the housekeeping got interrupted and
             //  needs to finish as fast as possible to cleaning up all subscriptions.
-            setTimeout(this.cleanOut, 0);
+            setTimeout(() => this.cleanOut(myId), 0);
         }
     }
 
@@ -252,7 +261,11 @@ class BusManager {
     /**
      * cleanout dead peers and rooms
      */
-    cleanOut = async () => {
+    cleanOut = async (myId) => {
+        // if a newer cycle has started, this callback belongs to an interrupted cycle — drop it.
+        if (myId !== this.housekeepingId) {
+            return;
+        }
         if(this.houseKeepingInProgress) {
             console.log(`      -> housekeeping -> cleaning out ...`);
             // flag the room as being in the process to be removed
@@ -511,7 +524,7 @@ class BusManager {
         // Generate short UUID as peerId
         let roomUUID = this.translator.new(); // mhvXdrZT4jP5T8vBxuvm75
 
-        if(roomID === null)
+        if(roomID === null || roomID === undefined)
             roomID = this.findUnusedRoomId();
         this.rooms[_roomName] = {
             roomName: _roomName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telemersive-bus",
-  "version": "0.6.13",
+  "version": "0.6.14",
   "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": {
@@ -11,7 +11,7 @@
     "crypto-js": "^4.0.0",
     "internal-ip": "^6.2.0",
     "mqtt": "^5.3.5",
-    "protobufjs": "^6.10.2",
+    "protobufjs": "^7.5.5",
     "public-ip": "^4.0.2",
     "sha1": "^1.1.1",
     "short-uuid": "^4.1.0",