From 0d08254a07eae90591dda4c8aa3b90f777877ef8 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Sun, 20 Sep 2020 23:37:29 -0400 Subject: [PATCH] Some updates to URLs in C++ --- interface/src/Application.cpp | 4 ++-- interface/src/avatar/MyAvatar.cpp | 2 +- libraries/networking/src/ExternalResource.h | 16 +++++++++++----- libraries/networking/src/LimitedNodeList.h | 2 +- libraries/networking/src/NetworkingConstants.h | 14 ++++++++------ 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ee92f03541..88db77b314 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7703,7 +7703,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { QUrl scriptURL { scriptFilenameOrURL }; - if (scriptURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) { + if (scriptURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) { int startIndex = shortName.lastIndexOf('/') + 1; int endIndex = shortName.lastIndexOf('?'); shortName = shortName.mid(startIndex, endIndex - startIndex); @@ -7826,7 +7826,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { const int MAX_CHARACTERS_PER_LINE = 90; if (DependencyManager::get()->getThisNodeCanReplaceContent()) { QUrl originURL { url }; - if (originURL.host().endsWith(NetworkingConstants::MARKETPLACE_CDN_HOSTNAME)) { + if (originURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) { // Create a confirmation dialog when this call is made static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. " "If you want to save what you have now, create a backup before proceeding. For more information about backing up " diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index dfa3bfb21f..a30d7adb18 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -83,7 +83,7 @@ const int SCRIPTED_MOTOR_AVATAR_FRAME = 1; const int SCRIPTED_MOTOR_WORLD_FRAME = 2; const int SCRIPTED_MOTOR_SIMPLE_MODE = 0; const int SCRIPTED_MOTOR_DYNAMIC_MODE = 1; -const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::PUBLIC_BUCKET_CDN_URL + "sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; +const QString& DEFAULT_AVATAR_COLLISION_SOUND_URL = NetworkingConstants::HF_PUBLIC_CDN_URL + "sounds/Collisions-otherorganic/Body_Hits_Impact.wav"; const float MyAvatar::ZOOM_MIN = 0.5f; const float MyAvatar::ZOOM_MAX = 25.0f; diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index 63eba59d9a..4f410e8015 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -18,6 +18,8 @@ #include +#include "NetworkingConstants.h" + /** * Flexible management for external resources * @@ -59,7 +61,9 @@ public: HF_Marketplace, /** Vircadia assets */ - Assets + Assets, + Public, + Content }; Q_ENUM(Bucket) @@ -148,10 +152,12 @@ private: std::mutex _bucketMutex; QMap _bucketBases{ - { Bucket::HF_Public, QUrl("https://public.vircadia.com") }, - { Bucket::HF_Content, QUrl("https://content.vircadia.com") }, - { Bucket::Assets, QUrl("https://assets.vircadia.com") }, - { Bucket::HF_Marketplace, QUrl("https://mpassets.vircadia.com") }, + { Bucket::HF_Public, NetworkingConstants::HF_PUBLIC_CDN_URL }, + { Bucket::HF_Content, NetworkingConstants::HF_CONTENT_CDN_URL }, + { Bucket::HF_Marketplace, NetworkingConstants::HF_MPASSETS_CDN_URL }, + { Bucket::Assets, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL }, + { Bucket::Public, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL }, + { Bucket::Content, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL } }; }; diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 1f43428b4c..59d18fe047 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -57,7 +57,7 @@ static const size_t DEFAULT_MAX_CONNECTION_RATE { std::numeric_limits::m const char DEFAULT_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost"; -const char STUN_SERVER_HOSTNAME = NetworkingConstants::STUN_SERVER_DEFAULT_HOSTNAME.toUtf8().constData(); +const char STUN_SERVER_HOSTNAME[] = "stun1.l.google.com"; const unsigned short STUN_SERVER_PORT = NetworkingConstants::STUN_SERVER_DEFAULT_PORT; const QString DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY = "domain-server.local-port"; diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 64b19419b0..2d5511e30e 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -31,8 +31,8 @@ namespace NetworkingConstants { const QUrl METAVERSE_SERVER_URL_STAGING { "https://metaverse.vircadia.com/live" }; // Web Engine requests to this parent domain have an account authorization header added - const QString AUTH_HOSTNAME_BASE = "highfidelity.com"; - const QStringList IS_AUTHABLE_HOSTNAME = { "highfidelity.com", "highfidelity.io" }; + const QString AUTH_HOSTNAME_BASE = "vircadia.com"; + const QStringList IS_AUTHABLE_HOSTNAME = { "vircadia.com", "vircadia.io" }; // Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers. const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)"; @@ -44,8 +44,12 @@ namespace NetworkingConstants { const QUrl BUILDS_XML_URL("https://highfidelity.com/builds.xml"); const QUrl MASTER_BUILDS_XML_URL("https://highfidelity.com/dev-builds.xml"); - const QString CONTENT_CDN_URL = "https://content.highfidelity.com/"; - const QString PUBLIC_BUCKET_CDN_URL = "https://hifi-public.s3.amazonaws.com/"; + // CDN URLs + const QString HF_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1"; + const QString HF_MPASSETS_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1"; + const QString HF_PUBLIC_CDN_URL = "https://cdn-1.vircadia.com/eu-c-1"; + const QString HF_MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; + const QString VIRCADIA_CONTENT_CDN_URL = "https://cdn-1.vircadia.com/us-c-1"; #if USE_STABLE_GLOBAL_SERVICES const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com"; @@ -59,8 +63,6 @@ namespace NetworkingConstants { const unsigned short STUN_SERVER_DEFAULT_PORT = 19302; #endif - const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com"; - const QUrl HELP_DOCS_URL { "https://docs.vircadia.dev" }; const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" }; const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };