From 8f82750f2ac93060a6663fd494b0d89ace648f85 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Sun, 5 Mar 2023 17:27:37 +0100
Subject: [PATCH] Initial implementation of raiseException and test

---
 .../script-engine/src/v8/ScriptEngineV8.cpp   | 52 +++++++++++--------
 tests/script-engine/src/ScriptEngineTests.cpp | 29 +++++++++++
 tests/script-engine/src/ScriptEngineTests.h   |  1 +
 3 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/libraries/script-engine/src/v8/ScriptEngineV8.cpp b/libraries/script-engine/src/v8/ScriptEngineV8.cpp
index d33f52496e..fde22908cb 100644
--- a/libraries/script-engine/src/v8/ScriptEngineV8.cpp
+++ b/libraries/script-engine/src/v8/ScriptEngineV8.cpp
@@ -172,28 +172,8 @@ ScriptValue ScriptEngineV8::checkScriptSyntax(ScriptProgramPointer program) {
     return undefinedValue();
 }*/
 
-bool ScriptEngineV8::raiseException(const V8ScriptValue& exception) {
-    if (!IS_THREADSAFE_INVOCATION(thread(), __FUNCTION__)) {
-        return false;
-    }
-    //V8TODO
-    // _v8Isolate->ThrowException(makeError(exception).get());
 
 
-    /*if (QScriptEngine::currentContext()) {
-        // we have an active context / JS stack frame so throw the exception per usual
-        QScriptEngine::currentContext()->throwValue(makeError(exception));
-        return true;
-    } else if (_scriptManager) {
-        // we are within a pure C++ stack frame (ie: being called directly by other C++ code)
-        // in this case no context information is available so just emit the exception for reporting
-        V8ScriptValue thrown = makeError(exception);
-        emit _scriptManager->unhandledException(ScriptValue(new ScriptValueV8Wrapper(this, std::move(thrown))));
-    }*/
-    //emit _scriptManager->unhandledException(ScriptValue(new ScriptValueV8Wrapper(this, std::move(thrown))));
-    return false;
-}
-
 // Lambda
 /*ScriptValue ScriptEngineV8::newLambdaFunction(std::function<V8ScriptValue(V8ScriptContext*, ScriptEngineV8*)> operation,
                                                  const V8ScriptValue& data,
@@ -1548,7 +1528,7 @@ std::shared_ptr<ScriptException> ScriptEngineV8::uncaughtException() const {
 }
 
 bool ScriptEngineV8::raiseException(const QString& error, const QString &reason) {
-    return raiseException(ScriptValue(), reason);
+    return raiseException(newValue(error), reason);
 }
 
 bool ScriptEngineV8::raiseException(const ScriptValue& exception, const QString &reason) {
@@ -1561,10 +1541,38 @@ bool ScriptEngineV8::raiseException(const ScriptValue& exception, const QString
   //  emit
     //return raiseException(qException);
 
-    qCCritical(scriptengine) << "Raise exception for reason" << reason << "NOT IMPLEMENTED!";
+//    qCCritical(scriptengine) << "Raise exception for reason" << reason << "NOT IMPLEMENTED!";
+//    return false;
+
+    return raiseException(ScriptValueV8Wrapper::fullUnwrap(this, exception));
+}
+
+
+
+bool ScriptEngineV8::raiseException(const V8ScriptValue& exception) {
+    if (!IS_THREADSAFE_INVOCATION(thread(), __FUNCTION__)) {
+        return false;
+    }
+
+
+    _v8Isolate->ThrowException(exception.constGet());
+
+
+    /*if (QScriptEngine::currentContext()) {
+        // we have an active context / JS stack frame so throw the exception per usual
+        QScriptEngine::currentContext()->throwValue(makeError(exception));
+        return true;
+    } else if (_scriptManager) {
+        // we are within a pure C++ stack frame (ie: being called directly by other C++ code)
+        // in this case no context information is available so just emit the exception for reporting
+        V8ScriptValue thrown = makeError(exception);
+        emit _scriptManager->unhandledException(ScriptValue(new ScriptValueV8Wrapper(this, std::move(thrown))));
+    }*/
+    //emit _scriptManager->unhandledException(ScriptValue(new ScriptValueV8Wrapper(this, std::move(thrown))));
     return false;
 }
 
+
 ScriptValue ScriptEngineV8::create(int type, const void* ptr) {
     v8::Locker locker(_v8Isolate);
     v8::Isolate::Scope isolateScope(_v8Isolate);
diff --git a/tests/script-engine/src/ScriptEngineTests.cpp b/tests/script-engine/src/ScriptEngineTests.cpp
index 3efc763e5e..825f6f4658 100644
--- a/tests/script-engine/src/ScriptEngineTests.cpp
+++ b/tests/script-engine/src/ScriptEngineTests.cpp
@@ -218,6 +218,35 @@ void ScriptEngineTests::testRaiseException() {
     QVERIFY(ex && ex->errorMessage.contains("Exception test"));
 }
 
+void ScriptEngineTests::testRaiseExceptionAndCatch() {
+    QString script =
+        "try {"
+        "    testClass.doRaiseTest();"
+        "} catch (err) {"
+        "    if (err === \"Exception test!\") {"
+        "        print(\"Caught!\");"
+        "    }"
+        "}"
+        "Script.stop(true);"
+        ;
+
+    QString printed;
+    auto sm = makeManager(script, "testRaiseCatch.js");
+
+    connect(sm.get(), &ScriptManager::printedMessage, [&printed](const QString& message, const QString& engineName){
+        printed.append(message);
+    });
+
+
+    sm->engine()->registerGlobalObject("testClass", new TestClass(sm->engine()));
+
+    sm->run();
+    auto ex = sm->getUncaughtException();
+
+    QVERIFY(!ex);
+    QVERIFY(printed == "Caught!");
+}
+
 
 void ScriptEngineTests::scriptTest() {
     return;
diff --git a/tests/script-engine/src/ScriptEngineTests.h b/tests/script-engine/src/ScriptEngineTests.h
index 52e568efe1..b02a6846fa 100644
--- a/tests/script-engine/src/ScriptEngineTests.h
+++ b/tests/script-engine/src/ScriptEngineTests.h
@@ -62,6 +62,7 @@ private slots:
     void testRegisterClass();
     void testInvokeNonInvokable();
     void testRaiseException();
+    void testRaiseExceptionAndCatch();
 
 
 private: