From cfc7309c96f9ac3867a77145673853163c600258 Mon Sep 17 00:00:00 2001
From: Kalila L <somnilibertas@gmail.com>
Date: Fri, 20 Nov 2020 03:19:19 -0500
Subject: [PATCH] Send address and port with each metaverse heartbeat.

---
 .../resources/describe-settings.json          | 17 +++++++++
 domain-server/resources/web/js/shared.js      |  7 ++--
 domain-server/src/DomainServer.cpp            | 36 ++++++++++++++++---
 domain-server/src/DomainServer.h              |  4 +--
 4 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 42b15adefe..2cef93ad53 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -2013,6 +2013,23 @@
         }
       ]
     },
+    {
+      "name": "domain_server",
+      "label": "Setup Domain Server",
+      "restart": false,
+      "hidden": true,
+      "settings": [
+        {
+          "name": "network_address",
+          "default": ""
+        },
+        {
+          "name": "port",
+          "type": "int",
+          "default": 0
+        }
+      ]
+    },
     {
       "name": "installed_content",
       "label": "Installed Content",
diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index bffd512890..542771c60e 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -129,9 +129,10 @@ function getCurrentDomainIDType() {
     return DOMAIN_ID_TYPE_UNKNOWN;
   }
   if (DomainInfo !== null) {
-    if (DomainInfo.name !== undefined) {
-      return DOMAIN_ID_TYPE_TEMP;
-    }
+    // Disabled because detecting as temp domain... and we're not even using temp domains right now.
+    // if (DomainInfo.name !== undefined) {
+    //   return DOMAIN_ID_TYPE_TEMP;
+    // }
     return DOMAIN_ID_TYPE_FULL;
   }
   return DOMAIN_ID_TYPE_UNKNOWN;
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index f26dc4ac27..80458e7ad0 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1507,10 +1507,23 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) {
 const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking";
 
 void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) {
-    sendHeartbeatToMetaverse(newPublicSockAddr.getAddress().toString());
+    static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address";
+    static const QString PUBLIC_SOCKET_PORT_KEY = "port";
+    const QString& publicSocketAddress = newPublicSockAddr.getAddress().toString();
+    const int publicSocketPort = newPublicSockAddr.getPort();
+
+    sendHeartbeatToMetaverse(publicSocketAddress, publicSocketPort);
+
+    QString newSettingsJSON = QString("{\"domain_server\": { \"%1\": \"%2\", \"%3\": %4}}")
+            .arg(PUBLIC_SOCKET_ADDRESS_KEY)
+            .arg(publicSocketAddress)
+            .arg(PUBLIC_SOCKET_PORT_KEY)
+            .arg(publicSocketPort);
+    auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8());
+    _settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings);
 }
 
-void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
+void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress, const int port) {
     // Setup the domain object to send to the data server
     QJsonObject domainObject;
 
@@ -1520,10 +1533,23 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
     static const QString PROTOCOL_VERSION_KEY = "protocol";
     domainObject[PROTOCOL_VERSION_KEY] = protocolVersionsSignatureBase64();
 
-    // add networking
+    static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address";
+    static const QString PUBLIC_SOCKET_PORT_KEY = "port";
+
+    static const QString NETWORK_ADDRESS_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_ADDRESS_KEY;
+    const QString networkAddressFromSettings = _settingsManager.valueForKeyPath(NETWORK_ADDRESS_SETTINGS_KEY).toString();
     if (!networkAddress.isEmpty()) {
-        static const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address";
-        domainObject[PUBLIC_NETWORK_ADDRESS_KEY] = networkAddress;
+        domainObject[PUBLIC_SOCKET_ADDRESS_KEY] = networkAddress;
+    } else if (!networkAddressFromSettings.isEmpty()) {
+        domainObject[PUBLIC_SOCKET_ADDRESS_KEY] = networkAddressFromSettings;
+    }
+
+    static const QString PORT_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_PORT_KEY;
+    const int portFromSettings = _settingsManager.valueForKeyPath(PORT_SETTINGS_KEY).toInt();
+    if (port != NULL) {
+        domainObject[PUBLIC_SOCKET_PORT_KEY] = port;
+    } else if (portFromSettings != NULL) {
+        domainObject[PUBLIC_SOCKET_PORT_KEY] = portFromSettings;
     }
 
     static const QString AUTOMATIC_NETWORKING_KEY = "automatic_networking";
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 7a09141db6..69c99e5cf4 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -113,7 +113,7 @@ private slots:
     void sendPendingTransactionsToServer();
 
     void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr);
-    void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString()); }
+    void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString(), int()); }
     void sendHeartbeatToIceServer();
     void nodePingMonitor();
 
@@ -176,7 +176,7 @@ private:
     void setupAutomaticNetworking();
     void setupICEHeartbeatForFullNetworking();
     void setupHeartbeatToMetaverse();
-    void sendHeartbeatToMetaverse(const QString& networkAddress);
+    void sendHeartbeatToMetaverse(const QString& networkAddress, const int port);
 
     void randomizeICEServerAddress(bool shouldTriggerHostLookup);