Merge pull request #10846 from sethalves/fix-server-scripts-more

make ResourceManager be owned by DependencyManager

assignment-client/src/Agent.cpp

@@ -62,7 +62,7 @@ Agent::Agent(ReceivedMessage& message) :
     _entityEditSender.setPacketsPerSecond(DEFAULT_ENTITY_PPS_PER_SCRIPT);
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
-    ResourceManager::init();
+    DependencyManager::set<ResourceManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -199,7 +199,7 @@ void Agent::requestScript() {
         return;
     }
 
-    auto request = ResourceManager::createResourceRequest(this, scriptURL);
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(this, scriptURL);
 
     if (!request) {
         qWarning() << "Could not create ResourceRequest for Agent script at" << scriptURL.toString();
@@ -779,7 +779,7 @@ void Agent::aboutToFinish() {
     // our entity tree is going to go away so tell that to the EntityScriptingInterface
     DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);
 
-    ResourceManager::cleanup();
+    DependencyManager::get<ResourceManager>()->cleanup();
 
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();

assignment-client/src/entities/EntityServer.cpp

@@ -31,7 +31,7 @@ EntityServer::EntityServer(ReceivedMessage& message) :
     OctreeServer(message),
     _entitySimulation(NULL)
 {
-    ResourceManager::init();
+    DependencyManager::set<ResourceManager>();
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<ScriptCache>();
 

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -54,7 +54,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
 
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
-    ResourceManager::init();
+    DependencyManager::set<ResourceManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -67,7 +67,6 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::set<ScriptCache>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT);
 
-
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
                                             this, "handleOctreePacket");
@@ -493,7 +492,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, bool
         if (entity && (reload || notRunning || details.scriptText != entity->getServerScripts())) {
             QString scriptUrl = entity->getServerScripts();
             if (!scriptUrl.isEmpty()) {
-                scriptUrl = ResourceManager::normalizeURL(scriptUrl);
+                scriptUrl = DependencyManager::get<ResourceManager>()->normalizeURL(scriptUrl);
                 qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID;
                 _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload);
             }
@@ -551,7 +550,7 @@ void EntityScriptServer::aboutToFinish() {
     // our entity tree is going to go away so tell that to the EntityScriptingInterface
     DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);
 
-    ResourceManager::cleanup();
+    DependencyManager::get<ResourceManager>()->cleanup();
 
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();

interface/src/Application.cpp

@@ -582,6 +582,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<LocationBookmarks>();
     DependencyManager::set<Snapshot>();
     DependencyManager::set<CloseEventSender>();
+    DependencyManager::set<ResourceManager>();
 
     return previousSessionCrashed;
 }
@@ -776,7 +777,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(this, &Application::activeDisplayPluginChanged,
         reinterpret_cast<scripting::Audio*>(audioScriptingInterface.data()), &scripting::Audio::onContextChanged);
 
-    ResourceManager::init();
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -1881,7 +1881,7 @@ Application::~Application() {
     DependencyManager::destroy<SoundCache>();
     DependencyManager::destroy<OctreeStatsProvider>();
 
-    ResourceManager::cleanup();
+    DependencyManager::get<ResourceManager>()->cleanup();
 
     // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
@@ -5941,7 +5941,7 @@ void Application::addAssetToWorldFromURL(QString url) {
 
     addAssetToWorldInfo(filename, "Downloading model file " + filename + ".");
 
-    auto request = ResourceManager::createResourceRequest(nullptr, QUrl(url));
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, QUrl(url));
     connect(request, &ResourceRequest::finished, this, &Application::addAssetToWorldFromURLRequestFinished);
     request->send();
 }

interface/src/assets/ATPAssetMigrator.cpp

@@ -106,7 +106,8 @@ void ATPAssetMigrator::loadEntityServerFile() {
 
                                     jsonValue = entityObject;
                                 } else if (wantsToMigrateResource(migrationURL)) {
-                                    auto request = ResourceManager::createResourceRequest(this, migrationURL);
+                                    auto request =
+                                        DependencyManager::get<ResourceManager>()->createResourceRequest(this, migrationURL);
 
                                     if (request) {
                                         qCDebug(asset_migrator) << "Requesting" << migrationURL << "for ATP asset migration";

interface/src/main.cpp

@@ -118,7 +118,7 @@ int main(int argc, const char* argv[]) {
             // tell everyone to use the right cache location
             //
             // this handles data8 and prepared
-            ResourceManager::setCacheDir(cacheDir);
+            DependencyManager::get<ResourceManager>()->setCacheDir(cacheDir);
 
             // this does the ktx_cache
             PathUtils::getAppLocalDataPath(cacheDir);

interface/src/scripting/TestScriptingInterface.cpp

@@ -62,7 +62,7 @@ bool TestScriptingInterface::loadTestScene(QString scene) {
     static const QString TEST_SCRIPTS_ROOT = TEST_ROOT + "scripts/";
     static const QString TEST_SCENES_ROOT = TEST_ROOT + "scenes/";
     return DependencyManager::get<OffscreenUi>()->returnFromUiThread([scene]()->QVariant {
-        ResourceManager::setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");
+        DependencyManager::get<ResourceManager>()->setUrlPrefixOverride("atp:/", TEST_BINARY_ROOT + scene + ".atp/");
         auto tree = qApp->getEntities()->getTree();
         auto treeIsClient = tree->getIsClient();
         // Force the tree to accept the load regardless of permissions

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -853,7 +853,7 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, bool
             entity->scriptHasUnloaded();
         }
         if (shouldLoad) {
-            scriptUrl = ResourceManager::normalizeURL(scriptUrl);
+            scriptUrl = DependencyManager::get<ResourceManager>()->normalizeURL(scriptUrl);
             _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload);
             entity->scriptHasPreloaded();
         }

libraries/entities/src/EntityEditFilters.cpp

@@ -132,7 +132,7 @@ void EntityEditFilters::addFilter(EntityItemID entityID, QString filterURL) {
     _filterDataMap.insert(entityID, filterData);
     _lock.unlock();
    
-    auto scriptRequest = ResourceManager::createResourceRequest(this, scriptURL);
+    auto scriptRequest = DependencyManager::get<ResourceManager>()->createResourceRequest(this, scriptURL);
     if (!scriptRequest) {
         qWarning() << "Could not create ResourceRequest for Entity Edit filter script at" << scriptURL.toString();
         scriptRequestFinished(entityID);

libraries/fbx/src/OBJReader.cpp

@@ -202,7 +202,7 @@ bool OBJReader::isValidTexture(const QByteArray &filename) {
     }
     QUrl candidateUrl = _url.resolved(QUrl(filename));
 
-    return ResourceManager::resourceExists(candidateUrl);
+    return DependencyManager::get<ResourceManager>()->resourceExists(candidateUrl);
 }
 
 void OBJReader::parseMaterialLibrary(QIODevice* device) {
@@ -267,7 +267,7 @@ void OBJReader::parseMaterialLibrary(QIODevice* device) {
 }
 
 std::tuple<bool, QByteArray> requestData(QUrl& url) {
-    auto request = ResourceManager::createResourceRequest(nullptr, url);
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, url);
 
     if (!request) {
         return std::make_tuple(false, QByteArray());

libraries/model-networking/src/model-networking/TextureCache.cpp

@@ -384,7 +384,7 @@ void NetworkTexture::makeRequest() {
         // Add a fragment to the base url so we can identify the section of the ktx being requested when debugging
         // The actual requested url is _activeUrl and will not contain the fragment
         _url.setFragment("head");
-        _ktxHeaderRequest = ResourceManager::createResourceRequest(this, _activeUrl);
+        _ktxHeaderRequest = DependencyManager::get<ResourceManager>()->createResourceRequest(this, _activeUrl);
 
         if (!_ktxHeaderRequest) {
             qCDebug(networking).noquote() << "Failed to get request for" << _url.toDisplayString();
@@ -454,7 +454,7 @@ void NetworkTexture::startMipRangeRequest(uint16_t low, uint16_t high) {
 
     bool isHighMipRequest = low == NULL_MIP_LEVEL && high == NULL_MIP_LEVEL;
 
-    _ktxMipRequest = ResourceManager::createResourceRequest(this, _activeUrl);
+    _ktxMipRequest = DependencyManager::get<ResourceManager>()->createResourceRequest(this, _activeUrl);
 
     if (!_ktxMipRequest) {
         qCWarning(networking).noquote() << "Failed to get request for" << _url.toDisplayString();

libraries/networking/src/AtpReply.cpp

@@ -13,7 +13,7 @@
 #include "AtpReply.h"
 
 AtpReply::AtpReply(const QUrl& url, QObject* parent) :
-        _resourceRequest(ResourceManager::createResourceRequest(parent, url)) {
+    _resourceRequest(DependencyManager::get<ResourceManager>()->createResourceRequest(parent, url)) {
     setOperation(QNetworkAccessManager::GetOperation);
 
     connect(_resourceRequest, &AssetResourceRequest::progress, this, &AtpReply::downloadProgress);

libraries/networking/src/ResourceCache.cpp

@@ -672,7 +672,7 @@ void Resource::makeRequest() {
 
     PROFILE_ASYNC_BEGIN(resource, "Resource:" + getType(), QString::number(_requestID), { { "url", _url.toString() }, { "activeURL", _activeUrl.toString() } });
 
-    _request = ResourceManager::createResourceRequest(this, _activeUrl);
+    _request = DependencyManager::get<ResourceManager>()->createResourceRequest(this, _activeUrl);
 
     if (!_request) {
         qCDebug(networking).noquote() << "Failed to get request for" << _url.toDisplayString();

libraries/networking/src/ResourceManager.cpp

@@ -24,10 +24,16 @@
 #include "NetworkAccessManager.h"
 #include "NetworkLogging.h"
 
-QThread ResourceManager::_thread;
+
-ResourceManager::PrefixMap ResourceManager::_prefixMap;
+ResourceManager::ResourceManager() {
-QMutex ResourceManager::_prefixMapLock;
+    _thread.setObjectName("Resource Manager Thread");
-QString ResourceManager::_cacheDir;
+
+    auto assetClient = DependencyManager::set<AssetClient>(_cacheDir);
+    assetClient->moveToThread(&_thread);
+    QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init);
+
+    _thread.start();
+}
 
 void ResourceManager::setUrlPrefixOverride(const QString& prefix, const QString& replacement) {
     QMutexLocker locker(&_prefixMapLock);
@@ -75,16 +81,6 @@ QUrl ResourceManager::normalizeURL(const QUrl& originalUrl) {
     return url;
 }
 
-void ResourceManager::init() {
-    _thread.setObjectName("Resource Manager Thread");
-
-    auto assetClient = DependencyManager::set<AssetClient>(_cacheDir);
-    assetClient->moveToThread(&_thread);
-    QObject::connect(&_thread, &QThread::started, assetClient.data(), &AssetClient::init);
-
-    _thread.start();
-}
-
 void ResourceManager::cleanup() {
     // cleanup the AssetClient thread
     DependencyManager::destroy<AssetClient>();

libraries/networking/src/ResourceManager.h

@@ -14,7 +14,11 @@
 
 #include <functional>
 
+#include <QObject>
 #include <QtCore/QMutex>
+#include <QThread>
+
+#include <DependencyManager.h>
 
 #include "ResourceRequest.h"
 
@@ -24,34 +28,38 @@ const QString URL_SCHEME_HTTPS = "https";
 const QString URL_SCHEME_FTP = "ftp";
 const QString URL_SCHEME_ATP = "atp";
 
-class ResourceManager {
+class ResourceManager: public QObject, public Dependency {
+    Q_OBJECT
+    SINGLETON_DEPENDENCY
+
 public:
+    ResourceManager();
 
-    static void setUrlPrefixOverride(const QString& prefix, const QString& replacement);
+    void setUrlPrefixOverride(const QString& prefix, const QString& replacement);
-    static QString normalizeURL(const QString& urlString);
+    QString normalizeURL(const QString& urlString);
-    static QUrl normalizeURL(const QUrl& url);
+    QUrl normalizeURL(const QUrl& url);
 
-    static ResourceRequest* createResourceRequest(QObject* parent, const QUrl& url);
+    ResourceRequest* createResourceRequest(QObject* parent, const QUrl& url);
 
-    static void init();
+    void init();
-    static void cleanup();
+    void cleanup();
 
     // Blocking call to check if a resource exists. This function uses a QEventLoop internally
     // to return to the calling thread so that events can still be processed.
-    static bool resourceExists(const QUrl& url);
+    bool resourceExists(const QUrl& url);
 
     // adjust where we persist the cache
-    static void setCacheDir(const QString& cacheDir);
+    void setCacheDir(const QString& cacheDir);
 
 private:
-    static QThread _thread;
+    QThread _thread;
 
     using PrefixMap = std::map<QString, QString>;
 
-    static PrefixMap _prefixMap;
+    PrefixMap _prefixMap;
-    static QMutex _prefixMapLock;
+    QMutex _prefixMapLock;
 
-    static QString _cacheDir;
+    QString _cacheDir;
 };
 
 #endif

libraries/networking/src/ResourceScriptingInterface.cpp

@@ -11,5 +11,5 @@
 #include "ResourceManager.h"
 
 void ResourceScriptingInterface::overrideUrlPrefix(const QString& prefix, const QString& replacement) {
-    ResourceManager::setUrlPrefixOverride(prefix, replacement);
+    DependencyManager::get<ResourceManager>()->setUrlPrefixOverride(prefix, replacement);
 }

libraries/octree/src/Octree.cpp

@@ -1668,7 +1668,8 @@ bool Octree::readJSONFromGzippedFile(QString qFileName) {
 }
 
 bool Octree::readFromURL(const QString& urlString) {
-    auto request = std::unique_ptr<ResourceRequest>(ResourceManager::createResourceRequest(this, urlString));
+    auto request =
+        std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, urlString));
 
     if (!request) {
         return false;

libraries/procedural/src/procedural/Procedural.cpp

@@ -103,7 +103,7 @@ bool Procedural::parseVersion(const QJsonValue& version) {
 }
 
 bool Procedural::parseShader(const QUrl& shaderPath) {
-    auto shaderUrl = ResourceManager::normalizeURL(shaderPath);
+    auto shaderUrl = DependencyManager::get<ResourceManager>()->normalizeURL(shaderPath);
 
     if (!shaderUrl.isValid()) {
         if (!shaderUrl.isEmpty()) {

libraries/script-engine/src/FileScriptingInterface.cpp

@@ -85,7 +85,7 @@ QString FileScriptingInterface::convertUrlToPath(QUrl url) {
 // this function is not in use
 void FileScriptingInterface::downloadZip(QString path, const QString link) {
     QUrl url = QUrl(link);
-    auto request = ResourceManager::createResourceRequest(nullptr, url);
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, url);
     connect(request, &ResourceRequest::finished, this, [this, path]{
         unzipFile(path, ""); // so intellisense isn't mad
     });

libraries/script-engine/src/ScriptCache.cpp

@@ -57,7 +57,7 @@ void ScriptCache::clearATPScriptsFromCache() {
 }
 
 void ScriptCache::deleteScript(const QUrl& unnormalizedURL) {
-    QUrl url = ResourceManager::normalizeURL(unnormalizedURL);
+    QUrl url = DependencyManager::get<ResourceManager>()->normalizeURL(unnormalizedURL);
     Lock lock(_containerLock);
     if (_scriptCache.contains(url)) {
         qCDebug(scriptengine) << "Delete script from cache:" << url.toString();
@@ -70,7 +70,7 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable
     qCDebug(scriptengine) << "ScriptCache::getScriptContents() on thread [" << QThread::currentThread() << "] expected thread [" << thread() << "]";
     #endif
     QUrl unnormalizedURL(scriptOrURL);
-    QUrl url = ResourceManager::normalizeURL(unnormalizedURL);
+    QUrl url = DependencyManager::get<ResourceManager>()->normalizeURL(unnormalizedURL);
 
     // attempt to determine if this is a URL to a script, or if this is actually a script itself (which is valid in the
     // entityScript use case)
@@ -109,7 +109,7 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable
             #ifdef THREAD_DEBUGGING
             qCDebug(scriptengine) << "about to call: ResourceManager::createResourceRequest(this, url); on thread [" << QThread::currentThread() << "] expected thread [" << thread() << "]";
             #endif
-            auto request = ResourceManager::createResourceRequest(nullptr, url);
+            auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, url);
             Q_ASSERT(request);
             request->setCacheEnabled(!forceDownload);
             connect(request, &ResourceRequest::finished, this, [=]{ scriptContentAvailable(maxRetries); });
@@ -166,7 +166,7 @@ void ScriptCache::scriptContentAvailable(int maxRetries) {
                         qCDebug(scriptengine) << QString("Retrying script request [%1 / %2]: %3")
                             .arg(attempt).arg(maxRetries).arg(url.toString());
 
-                        auto request = ResourceManager::createResourceRequest(nullptr, url);
+                        auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, url);
                         Q_ASSERT(request);
 
                         // We've already made a request, so the cache must be disabled or it wasn't there, so enabling

libraries/script-engine/src/ScriptEngine.cpp

@@ -1762,7 +1762,7 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
     QList<QUrl> urls;
 
     for (QString includeFile : includeFiles) {
-        QString file = ResourceManager::normalizeURL(includeFile);
+        QString file = DependencyManager::get<ResourceManager>()->normalizeURL(includeFile);
         QUrl thisURL;
         bool isStandardLibrary = false;
         if (file.startsWith("/~/")) {

tests/render-perf/src/main.cpp

@@ -520,7 +520,7 @@ public:
             _entitySimulation = simpleSimulation;
         }
 
-        ResourceManager::init();
+        DependencyManager::set<ResourceManager>();
 
         setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
         _size = QSize(800, 600);
@@ -575,7 +575,7 @@ public:
         DependencyManager::destroy<ModelCache>();
         DependencyManager::destroy<GeometryCache>();
         DependencyManager::destroy<ScriptCache>();
-        ResourceManager::cleanup();
+        DependencyManager::get<ResourceManager>()->cleanup();
         // remove the NodeList from the DependencyManager
         DependencyManager::destroy<NodeList>();
     }
@@ -998,7 +998,7 @@ private:
         QFileInfo atpPathInfo(atpPath);
         if (atpPathInfo.exists()) {
             QString atpUrl = QUrl::fromLocalFile(atpPath).toString();
-            ResourceManager::setUrlPrefixOverride("atp:/", atpUrl + "/");
+            DependencyManager::get<ResourceManager>()->setUrlPrefixOverride("atp:/", atpUrl + "/");
         }
         _octree->clear();
         _octree->getTree()->readFromURL(fileName);

tests/render-texture-load/src/main.cpp

@@ -329,7 +329,7 @@ public:
         installEventFilter(this);
         QThreadPool::globalInstance()->setMaxThreadCount(2);
         QThread::currentThread()->setPriority(QThread::HighestPriority);
-        ResourceManager::init();
+        DependencyManager::set<ResourceManager>();
         setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
         _size = QSize(800, 600);
         _renderThread._size = _size;
@@ -369,7 +369,7 @@ public:
         DependencyManager::destroy<TextureCache>();
         DependencyManager::destroy<ModelCache>();
         DependencyManager::destroy<GeometryCache>();
-        ResourceManager::cleanup();
+        DependencyManager::get<ResourceManager>()->cleanup();
     }
 
 protected: