Merge remote-tracking branch 'hifi/master'

domain-server/src/DomainServer.cpp

@@ -37,6 +37,8 @@
 
 int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
+const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.io";
+
 DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
     _shutdownEventListener(this),
@@ -52,7 +54,8 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _webAuthenticationStateSet(),
     _cookieSessionHash(),
     _automaticNetworkingSetting(),
-    _settingsManager()
+    _settingsManager(),
+    _iceServerSocket(ICE_SERVER_DEFAULT_HOSTNAME, ICE_SERVER_DEFAULT_PORT)
 {
     LogUtils::init();
 
@@ -346,6 +349,9 @@ void DomainServer::setupAutomaticNetworking() {
     QTimer* dynamicIPTimer = new QTimer(this);
     connect(dynamicIPTimer, &QTimer::timeout, this, &DomainServer::requestCurrentPublicSocketViaSTUN);
     
+    _automaticNetworkingSetting =
+        _settingsManager.valueOrDefaultValueForKeyPath(METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH).toString();
+    
     if (_automaticNetworkingSetting == FULL_AUTOMATIC_NETWORKING_VALUE) {
         dynamicIPTimer->start(STUN_REFLEXIVE_KEEPALIVE_INTERVAL_MSECS);
         
@@ -354,9 +360,17 @@ void DomainServer::setupAutomaticNetworking() {
         connect(iceHeartbeatTimer, &QTimer::timeout, this, &DomainServer::performICEUpdates);
         iceHeartbeatTimer->start(ICE_HEARBEAT_INTERVAL_MSECS);
         
-        // call our sendHeartbeaToIceServer immediately anytime a local or public socket changes
+        // call our sendHeartbeatToIceServer immediately anytime a local or public socket changes
         connect(nodeList, &LimitedNodeList::localSockAddrChanged, this, &DomainServer::sendHeartbeatToIceServer);
         connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::sendHeartbeatToIceServer);
+        
+        // attempt to update our public socket now, this will send a heartbeat once we get public socket
+        requestCurrentPublicSocketViaSTUN();
+        
+        // in case the STUN lookup is still happening we should re-request a public socket once we get that address
+        connect(&nodeList->getSTUNSockAddr(), &HifiSockAddr::lookupCompleted,
+                this, &DomainServer::requestCurrentPublicSocketViaSTUN);
+        
     }
     
     if (!didSetupAccountManagerWithAccessToken()) {
@@ -366,9 +380,6 @@ void DomainServer::setupAutomaticNetworking() {
         return;
     }
     
-    _automaticNetworkingSetting =
-        _settingsManager.valueOrDefaultValueForKeyPath(METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH).toString();
-    
     if (_automaticNetworkingSetting == IP_ONLY_AUTOMATIC_NETWORKING_VALUE ||
         _automaticNetworkingSetting == FULL_AUTOMATIC_NETWORKING_VALUE) {
         
@@ -383,14 +394,13 @@ void DomainServer::setupAutomaticNetworking() {
                 
                 // send public socket changes to the data server so nodes can find us at our new IP
                 connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::performIPAddressUpdate);
+                
+                // attempt to update our sockets now
+                requestCurrentPublicSocketViaSTUN();
             } else {
                 // send our heartbeat to data server so it knows what our network settings are
                 sendHeartbeatToDataServer();
             }
-            
-            // attempt to update our sockets now
-            requestCurrentPublicSocketViaSTUN();
-            
         } else {
             qDebug() << "Cannot enable domain-server automatic networking without a domain ID."
             << "Please add an ID to your config file or via the web interface.";
@@ -1167,8 +1177,7 @@ void DomainServer::performICEUpdates() {
 }
 
 void DomainServer::sendHeartbeatToIceServer() {
-    static HifiSockAddr ICE_SERVER_SOCK_ADDR = HifiSockAddr("ice.highfidelity.io", ICE_SERVER_DEFAULT_PORT);
+    LimitedNodeList::getInstance()->sendHeartbeatToIceServer(_iceServerSocket);
-    LimitedNodeList::getInstance()->sendHeartbeatToIceServer(ICE_SERVER_SOCK_ADDR);
 }
 
 void DomainServer::sendICEPingPackets() {

domain-server/src/DomainServer.h

@@ -154,6 +154,8 @@ private:
     QString _automaticNetworkingSetting;
     
     DomainServerSettingsManager _settingsManager;
+    
+    HifiSockAddr _iceServerSocket;
 };
 
 

interface/src/Application.cpp

@@ -4042,20 +4042,20 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser
     return scriptEngine;
 }
 
-void Application::handleScriptEngineLoaded(const QUrl& scriptURL) {
+void Application::handleScriptEngineLoaded(const QString& scriptFilename) {
     ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(sender());
     
-    _scriptEnginesHash.insertMulti(scriptURL.toString(), scriptEngine);
+    _scriptEnginesHash.insertMulti(scriptFilename, scriptEngine);
     _runningScriptsWidget->setRunningScripts(getRunningScripts());
-    UserActivityLogger::getInstance().loadedScript(scriptURL.toString());
+    UserActivityLogger::getInstance().loadedScript(scriptFilename);
     
     // register our application services and set it off on its own thread
     registerScriptEngineWithApplicationServices(scriptEngine);
 }
 
-void Application::handleScriptLoadError(const QUrl& scriptURL) {
+void Application::handleScriptLoadError(const QString& scriptFilename) {
     qDebug() << "Application::loadScript(), script failed to load...";
-    QMessageBox::warning(getWindow(), "Error Loading Script", scriptURL.toString() + " failed to load.");
+    QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load.");
 }
 
 void Application::scriptFinished(const QString& scriptName) {

interface/src/Application.h

@@ -394,8 +394,8 @@ private slots:
     void idle();
     void aboutToQuit();
     
-    void handleScriptEngineLoaded(const QUrl& scriptURL);
+    void handleScriptEngineLoaded(const QString& scriptFilename);
-    void handleScriptLoadError(const QUrl& scriptURL);
+    void handleScriptLoadError(const QString& scriptFilename);
 
     void connectedToDomain(const QString& hostname);
 

libraries/networking/src/HifiSockAddr.cpp

@@ -86,6 +86,7 @@ bool HifiSockAddr::operator==(const HifiSockAddr& rhsSockAddr) const {
 void HifiSockAddr::handleLookupResult(const QHostInfo& hostInfo) {
     if (hostInfo.error() != QHostInfo::NoError) {
         qDebug() << "Lookup failed for" << hostInfo.lookupId() << ":" << hostInfo.errorString();
+        emit lookupFailed();
     }
     
     foreach(const QHostAddress& address, hostInfo.addresses()) {
@@ -94,6 +95,7 @@ void HifiSockAddr::handleLookupResult(const QHostInfo& hostInfo) {
             _address = address;
             qDebug() << "QHostInfo lookup result for"
                 << hostInfo.hostName() << "with lookup ID" << hostInfo.lookupId() << "is" << address.toString();
+            emit lookupCompleted();
             break;
         }
     }

libraries/networking/src/HifiSockAddr.h

@@ -54,6 +54,9 @@ public:
     friend QDataStream& operator>>(QDataStream& dataStream, HifiSockAddr& sockAddr);
 private slots:
     void handleLookupResult(const QHostInfo& hostInfo);
+signals:
+    void lookupCompleted();
+    void lookupFailed();
 private:
     QHostAddress _address;
     quint16 _port;

libraries/networking/src/LimitedNodeList.h

@@ -105,6 +105,7 @@ public:
                                            const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket);
     
     const HifiSockAddr& getLocalSockAddr() const { return _localSockAddr; }
+    const HifiSockAddr& getSTUNSockAddr() const { return _stunSockAddr; }
 
     void processNodeData(const HifiSockAddr& senderSockAddr, const QByteArray& packet);
     void processKillNode(const QByteArray& datagram);

libraries/script-engine/src/ScriptEngine.cpp

@@ -156,31 +156,30 @@ void ScriptEngine::loadURL(const QUrl& scriptURL) {
     if (_isRunning) {
         return;
     }
-    
+
-    QString scriptURLString = scriptURL.toString();
+    _fileNameString = scriptURL.toString();
-    _fileNameString = scriptURLString;
     
     QUrl url(scriptURL);
     
     // if the scheme length is one or lower, maybe they typed in a file, let's try
     const int WINDOWS_DRIVE_LETTER_SIZE = 1;
     if (url.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {
-        url = QUrl::fromLocalFile(scriptURLString);
+        url = QUrl::fromLocalFile(_fileNameString);
     }
     
     // ok, let's see if it's valid... and if so, load it
     if (url.isValid()) {
         if (url.scheme() == "file") {
-            QString fileName = url.toLocalFile();
+            _fileNameString = url.toLocalFile();
-            QFile scriptFile(fileName);
+            QFile scriptFile(_fileNameString);
             if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
-                qDebug() << "Loading file:" << fileName;
+                qDebug() << "ScriptEngine loading file:" << _fileNameString;
                 QTextStream in(&scriptFile);
                 _scriptContents = in.readAll();
-                emit scriptLoaded(url);
+                emit scriptLoaded(_fileNameString);
             } else {
-                qDebug() << "ERROR Loading file:" << fileName;
+                qDebug() << "ERROR Loading file:" << _fileNameString;
-                emit errorLoadingScript(url);
+                emit errorLoadingScript(_fileNameString);
             }
         } else {
             QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
@@ -195,10 +194,10 @@ void ScriptEngine::handleScriptDownload() {
     
     if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
         _scriptContents = reply->readAll();
-        emit scriptLoaded(reply->url());
+        emit scriptLoaded(_fileNameString);
     } else {
         qDebug() << "ERROR Loading file:" << reply->url().toString();
-        emit errorLoadingScript(reply->url());
+        emit errorLoadingScript(_fileNameString);
     }
 }
 

libraries/script-engine/src/ScriptEngine.h

@@ -107,8 +107,8 @@ public slots:
     void nodeKilled(SharedNodePointer node);
 
 signals:
-    void scriptLoaded(const QUrl& scriptURL);
+    void scriptLoaded(const QString& scriptFilename);
-    void errorLoadingScript(const QUrl& scriptURL);
+    void errorLoadingScript(const QString& scriptFilename);
     void update(float deltaTime);
     void scriptEnding();
     void finished(const QString& fileNameString);