Work on better subscribtion to script messages

ksuprynowicz committed 3 years ago

Commit 274867b1 parent f3dbfc49 files · +209 −53Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 9 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+99−31

 QString ScriptManager::logException(const ScriptValue& exception) {
     auto message = formatException(exception, _enableExtendedJSExceptions.get());
-    scriptErrorMessage(message);
+    auto context = _engine->currentContext();
+    if (context) {
+        scriptErrorMessage(message, context->currentFileName(), context->currentLineNumber());
+    } else {
+        scriptErrorMessage(message, "", -1);
+    }
     return message;
 }
         });
     }
+    //Gather entity script messages for transmission when running server side.
+    if (_type == Type::ENTITY_SERVER) {
+        ;
+    }
     if (!_areMetaTypesInitialized) {
         initMetaTypes();
     }
         }
 #endif
-        scriptInfoMessage("Script Engine has stopped:" + getFilename());
+        scriptInfoMessage("Script Engine has stopped:" + getFilename(), "", -1);
     }
 }
     // Check that script has a supported file extension
     if (!hasValidScriptSuffix(_fileNameString)) {
-        scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type");
+        scriptErrorMessage("File extension of file: " + _fileNameString + " is not a currently supported script type", _fileNameString, -1);
         emit errorLoadingScript(_fileNameString);
         return;
     }
     scriptCache->getScriptContents(url.toString(), [this](const QString& url, const QString& scriptContents, bool isURL, bool success, const QString&status) {
         qCDebug(scriptengine) << "loadURL" << url << status << QThread::currentThread();
         if (!success) {
-            scriptErrorMessage("ERROR Loading file (" + status + "):" + url);
+            scriptErrorMessage("ERROR Loading file (" + status + "):" + url, url, -1);
             emit errorLoadingScript(_fileNameString);
             return;
         }
     }, reload, maxRetries);
 }
-void ScriptManager::scriptErrorMessage(const QString& message) {
+void ScriptManager::scriptErrorMessage(const QString& message, const QString& fileName, int lineNumber) {
     qCCritical(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit errorMessage(message, getFilename());
     if (!currentEntityIdentifier.isInvalidID()) {
-        // TODO: add line number and proper file name
+        emit errorEntityMessage(message, fileName, lineNumber, currentEntityIdentifier);
-        //if (engine() && engine()->currentContext() && engine()->currentContext()->)
-        emit errorEntityMessage(message, getFilename(), currentEntityIdentifier);
     }
 }
-void ScriptManager::scriptWarningMessage(const QString& message) {
+void ScriptManager::scriptWarningMessage(const QString& message, const QString& fileName, int lineNumber) {
     qCWarning(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit warningMessage(message, getFilename());
     if (!currentEntityIdentifier.isInvalidID()) {
-        // TODO: add line number and proper file name
+        emit warningEntityMessage(message, fileName, lineNumber, currentEntityIdentifier);
-        emit warningEntityMessage(message, getFilename(), currentEntityIdentifier);
     }
 }
-void ScriptManager::scriptInfoMessage(const QString& message) {
+void ScriptManager::scriptInfoMessage(const QString& message, const QString& fileName, int lineNumber) {
     qCInfo(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit infoMessage(message, getFilename());
     if (!currentEntityIdentifier.isInvalidID()) {
-        // TODO: add line number and proper file name
+        emit infoEntityMessage(message, fileName, lineNumber, currentEntityIdentifier);
-        emit infoEntityMessage(message, getFilename(), currentEntityIdentifier);
     }
 }
-void ScriptManager::scriptPrintedMessage(const QString& message) {
+void ScriptManager::scriptPrintedMessage(const QString& message, const QString& fileName, int lineNumber) {
     qCDebug(scriptengine, "[%s] %s", qUtf8Printable(getFilename()), qUtf8Printable(message));
     emit printedMessage(message, getFilename());
     if (!currentEntityIdentifier.isInvalidID()) {
-        // TODO: add line number and proper file name
+        emit printedEntityMessage(message, fileName, lineNumber, currentEntityIdentifier);
-        emit printedEntityMessage(message, getFilename(), currentEntityIdentifier);
     }
 }
         return; // bail early - avoid setting state in init(), as evaluate() will bail too
     }
-    scriptInfoMessage("Script Engine starting:" + getFilename());
+    scriptInfoMessage("Script Engine starting:" + getFilename(), getFilename(), -1);
     if (!_isInitialized) {
         init();
             _engine->clearExceptions();
         }
     }
-    scriptInfoMessage("Script Engine stopping:" + getFilename());
+    scriptInfoMessage("Script Engine stopping:" + getFilename(), getFilename(), -1);
     stopAllTimers(); // make sure all our timers are stopped if the script is ending
     emit scriptEnding();
 void ScriptManager::timerFired() {
     if (isStopped()) {
-        scriptWarningMessage("Script.timerFired() while shutting down is ignored... parent script:" + getFilename());
+        scriptWarningMessage("Script.timerFired() while shutting down is ignored... parent script:" + getFilename(), getFilename(), -1);
         return; // bail early
     }
 QTimer* ScriptManager::setInterval(const ScriptValue& function, int intervalMS) {
     if (isStopped()) {
-        scriptWarningMessage("Script.setInterval() while shutting down is ignored... parent script:" + getFilename());
+        int lineNumber = -1;
+        QString fileName = getFilename();
+        auto context = _engine->currentContext();
+        if (context) {
+            lineNumber = context->currentLineNumber();
+            fileName = context->currentFileName();
+        }
+        scriptWarningMessage("Script.setInterval() while shutting down is ignored... parent script:" + getFilename(), fileName, lineNumber);
         return NULL; // bail early
     }
 QTimer* ScriptManager::setTimeout(const ScriptValue& function, int timeoutMS) {
     if (isStopped()) {
-        scriptWarningMessage("Script.setTimeout() while shutting down is ignored... parent script:" + getFilename());
+        int lineNumber = -1;
+        QString fileName = getFilename();
+        auto context = _engine->currentContext();
+        if (context) {
+            lineNumber = context->currentLineNumber();
+            fileName = context->currentFileName();
+        }
+        scriptWarningMessage("Script.setTimeout() while shutting down is ignored... parent script:" + getFilename(), fileName, lineNumber);
         return NULL; // bail early
     }
         return;
     }
     if (isStopped()) {
+        int lineNumber = -1;
+        QString fileName = getFilename();
+        auto context = _engine->currentContext();
+        if (context) {
+            lineNumber = context->currentLineNumber();
+            fileName = context->currentFileName();
+        }
         scriptWarningMessage("Script.include() while shutting down is ignored... includeFiles:"
-                + includeFiles.join(",") + "parent script:" + getFilename());
+                + includeFiles.join(",") + "parent script:" + getFilename(), fileName, lineNumber);
         return; // bail early
     }
     QList<QUrl> urls;
             thisURL = expandScriptUrl(QUrl::fromLocalFile(expandScriptPath(file)));
             QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
             if (!defaultScriptsLoc.isParentOf(thisURL)) {
+                int lineNumber = -1;
+                QString fileName = getFilename();
+                auto context = _engine->currentContext();
+                if (context) {
+                    lineNumber = context->currentLineNumber();
+                    fileName = context->currentFileName();
+                }
                 //V8TODO this probably needs to be done per context, otherwise file cannot be included again in a module
-                scriptWarningMessage("Script.include() -- skipping" + file + "-- outside of standard libraries");
+                scriptWarningMessage("Script.include() -- skipping" + file + "-- outside of standard libraries", fileName, lineNumber);
                 continue;
             }
             isStandardLibrary = true;
         bool disallowOutsideFiles = thisURL.isLocalFile() && !isStandardLibrary && !currentSandboxURL.isLocalFile();
         if (disallowOutsideFiles && !PathUtils::isDescendantOf(thisURL, currentSandboxURL)) {
+            int lineNumber = -1;
+            QString fileName = currentSandboxURL.toString();
+            auto context = _engine->currentContext();
+            if (context) {
+                lineNumber = context->currentLineNumber();
+                fileName = context->currentFileName();
+            }
             scriptWarningMessage("Script.include() ignoring file path" + thisURL.toString()
-                                + "outside of original entity script" + currentSandboxURL.toString());
+                                + "outside of original entity script" + currentSandboxURL.toString(), fileName, lineNumber);
         } else {
             // We could also check here for CORS, but we don't yet.
             // It turns out that QUrl.resolve will not change hosts and copy authority, so we don't need to check that here.
         for (QUrl url : urls) {
             QString contents = data[url];
             if (contents.isNull()) {
-                scriptErrorMessage("Error loading file (" + status[url] +"): " + url.toString());
+                int lineNumber = -1;
+                QString fileName = url.toString();
+                auto context = _engine->currentContext();
+                if (context) {
+                    lineNumber = context->currentLineNumber();
+                    fileName = context->currentFileName();
+                }
+                scriptErrorMessage("Error loading file (" + status[url] +"): " + url.toString(), fileName, lineNumber);
             } else {
                 std::lock_guard<std::recursive_mutex> lock(_lock);
                 if (!_includedURLs.contains(url)) {
                         _engine->clearExceptions();
                     }
                 } else {
-                    scriptPrintedMessage("Script.include() skipping evaluation of previously included url:" + url.toString());
+                    int lineNumber = -1;
+                    QString fileName = url.toString();
+                    auto context = _engine->currentContext();
+                    if (context) {
+                        lineNumber = context->currentLineNumber();
+                        fileName = context->currentFileName();
+                    }
+                    scriptPrintedMessage("Script.include() skipping evaluation of previously included url:" + url.toString(), fileName, lineNumber);
                 }
             }
         }
 void ScriptManager::include(const QString& includeFile, const ScriptValue& callback) {
     if (isStopped()) {
+        int lineNumber = -1;
+        QString fileName = currentSandboxURL.toString();
+        auto context = _engine->currentContext();
+        if (context) {
+            lineNumber = context->currentLineNumber();
+            fileName = context->currentFileName();
+        }
         scriptWarningMessage("Script.include() while shutting down is ignored...  includeFile:"
-                    + includeFile + "parent script:" + getFilename());
+                    + includeFile + "parent script:" + getFilename(), fileName, lineNumber);
         return; // bail early
     }
     if (!_engine->IS_THREADSAFE_INVOCATION(__FUNCTION__)) {
         return;
     }
+    int lineNumber = -1;
+    QString fileName = getFilename();
+    auto context = _engine->currentContext();
+    if (context) {
+        lineNumber = context->currentLineNumber();
+        fileName = context->currentFileName();
+    }
     if (isStopped()) {
         scriptWarningMessage("Script.load() while shutting down is ignored... loadFile:"
-                + loadFile + "parent script:" + getFilename());
+                + loadFile + "parent script:" + getFilename(), fileName, lineNumber);
         return; // bail early
     }
     if (!currentEntityIdentifier.isInvalidID()) {
         scriptWarningMessage("Script.load() from entity script is ignored...  loadFile:"
-                + loadFile + "parent script:" + getFilename() + "entity: " + currentEntityIdentifier.toString());
+                + loadFile + "parent script:" + getFilename() + "entity: " + currentEntityIdentifier.toString(), fileName, lineNumber);
         return; // bail early
     }
         QString filePath = QUrl(details.scriptText).toLocalFile();
         auto lastModified = QFileInfo(filePath).lastModified().toMSecsSinceEpoch();
         if (lastModified > details.lastModified) {
-            scriptInfoMessage("Reloading modified script " + details.scriptText);
+            scriptInfoMessage("Reloading modified script " + details.scriptText, filePath, -1);
             loadEntityScript(entityID, details.scriptText, true);
         }
     }