telemersive-bus 0.6.17 → 0.6.19

package/lib/BusManager.js

@@ -16,6 +16,11 @@ const houseKeepingTimeOut = 1500;
 const houseKeepingTimeOut_onRepeat = 1500;
 const houseKeepingTimeOut_onPeerLeft= 1000;
 const houseKeepingTimeOut_onPeerJoined = 5000;
+// time to wait after sending DELETE requests to the switchboard before the room entry is
+// removed from this.rooms. proxy processes need a moment to fully exit and release their
+// OS ports — without this delay a room restart races against a still-dying proxy and fails
+// to bind the same port.
+const proxyShutdownSettleTime = 3000;
 const ROOM_ID_MIN = 11;
 const ROOM_ID_MAX = 50;
 
@@ -753,6 +758,9 @@ 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}`);
+            // wait for proxy processes to fully exit and release OS ports before allowing
+            // the room to be recreated. without this, a restart races against dying proxies.
+            await new Promise(resolve => setTimeout(resolve, proxyShutdownSettleTime));
             delete this.rooms[_roomName];
             console.log(`        <- removed room ${_roomName}`);
         }else {
@@ -771,9 +779,11 @@ class BusManager {
             });
             //let reply = JSON.parse(res["text"]);
         } catch (err) {
-            //console.error(err);
-            let reply = JSON.parse(err.response["text"]);
-            throw new Error(reply["msg"]);
+            if (err.response?.text) {
+                let reply = JSON.parse(err.response["text"]);
+                throw new Error(reply["msg"]);
+            }
+            throw err;
         }
     }
 
@@ -786,8 +796,11 @@ class BusManager {
             });
             //let reply = JSON.parse(res["text"]);
         } catch (err) {
-            let reply = JSON.parse(err.response["text"]);
-            throw new Error(reply["msg"]);
+            if (err.response?.text) {
+                let reply = JSON.parse(err.response["text"]);
+                throw new Error(reply["msg"]);
+            }
+            throw err;
         }
     }
 

package/lib/utils/Peer.js

@@ -1,4 +1,4 @@
-const publicIp = require('public-ip');
+const publicIp = require('./getPublicIp');
 const internalIp = require('internal-ip');
 const getInternalIP = require("get-internal-ip");
 const sha1 = require("sha1");

package/lib/utils/getPublicIp.js

@@ -0,0 +1,43 @@
+const https = require('https');
+
+const SERVICES = [
+    'https://api.ipify.org',
+    'https://ipv4.icanhazip.com',
+    'https://api.seeip.org',
+];
+
+const IPV4_RE = /^(?:\d{1,3}\.){3}\d{1,3}$/;
+
+function fetchText(url, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const req = https.get(url, (res) => {
+            if (res.statusCode !== 200) {
+                res.resume();
+                reject(new Error(`HTTP ${res.statusCode} from ${url}`));
+                return;
+            }
+            let data = '';
+            res.setEncoding('utf8');
+            res.on('data', (chunk) => { data += chunk; });
+            res.on('end', () => resolve(data.trim()));
+        });
+        req.setTimeout(timeoutMs, () => req.destroy(new Error(`timeout ${url}`)));
+        req.on('error', reject);
+    });
+}
+
+async function v4({ timeout = 5000 } = {}) {
+    let lastErr;
+    for (const url of SERVICES) {
+        try {
+            const ip = await fetchText(url, timeout);
+            if (IPV4_RE.test(ip)) return ip;
+            lastErr = new Error(`invalid IPv4 from ${url}: ${ip}`);
+        } catch (err) {
+            lastErr = err;
+        }
+    }
+    throw lastErr || new Error('public IP lookup failed');
+}
+
+module.exports = { v4 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telemersive-bus",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "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": {
@@ -9,14 +9,13 @@
   "dependencies": {
     "async-mqtt": "^2.6.1",
     "crypto-js": "^4.0.0",
+    "get-internal-ip": "^3.0.0",
     "internal-ip": "^6.2.0",
     "mqtt": "^5.3.5",
     "protobufjs": "^7.5.5",
-    "public-ip": "^4.0.2",
     "sha1": "^1.1.1",
     "short-uuid": "^4.1.0",
-    "superagent": "^6.1.0",
-    "get-internal-ip": "^3.0.0"
+    "superagent": "^6.1.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"