Merge pull request #40 from InputActions/scripting-delay

scripting/core: add delay function

Author: taj-ny

src/libinputactions/scripting/Promise.cpp

@@ -46,11 +46,16 @@ void Promise::reject(const QString &errorMessage) const
     QThreadHelpers::runOnThread(
         QThreadHelpers::mainThread(),
         [this, errorMessage]() {
-            if (m_reject.isCallable()) {
-                m_engine->call(m_reject, {m_engine->ensureEngine().newErrorObject(QJSValue::GenericError, errorMessage)});
-            }
+            reject(m_engine->ensureEngine().newErrorObject(QJSValue::GenericError, errorMessage));
         },
         true);
 }
 
+void Promise::reject(const QJSValue &error) const
+{
+    if (m_reject.isCallable()) {
+        m_engine->call(m_reject, {error});
+    }
+}
+
 }

src/libinputactions/scripting/Promise.h

@@ -61,7 +61,11 @@ class Promise
             true);
     }
 
+    /**
+     * Thread-safe.
+     */
     void reject(const QString &errorMessage) const;
+    void reject(const QJSValue &error) const;
 
 private:
     ScriptingEngine *m_engine;

src/libinputactions/scripting/ScriptingEngine.cpp

@@ -67,7 +67,7 @@ void ScriptingEngine::initialize()
         }
     )");
 
-    m_coreModule = std::make_unique<CoreModule>(m_engine->globalObject());
+    m_coreModule = std::make_unique<CoreModule>(this);
     QJSEngine::setObjectOwnership(m_coreModule.get(), QJSEngine::CppOwnership);
     auto coreModule = m_engine->newQObject(m_coreModule.get());
     coreModule.setProperty("Point", m_engine->newQMetaObject(&PointF::staticMetaObject));

src/libinputactions/scripting/ScriptingEngine.h

@@ -64,11 +64,6 @@ class ScriptingEngine : public QObject
     QString errorToString(const QJSValue &error) const;
     void logError(const QJSValue &error) const;
 
-    /**
-     * Thread-safe.
-     */
-    void throwError(const QString &message) const;
-
     template<typename TReturn, typename... TArgs, typename TFunction>
     QJSValue newFunction(TFunction &&function)
     {

src/libinputactions/scripting/modules/core/CoreModule.cpp

@@ -20,20 +20,37 @@
 #include "Config.h"
 #include <QJSEngine>
 #include <libinputactions/input/backends/InputBackend.h>
+#include <libinputactions/scripting/Promise.h>
+#include <libinputactions/scripting/ScriptingEngine.h>
 #include <libinputactions/variables/VariableRegistry.h>
 
 namespace InputActions
 {
 
-CoreModule::CoreModule(QJSValue globalObject)
-    : m_config(std::make_unique<Config>())
-    , m_globalObject(std::move(globalObject))
+CoreModule::CoreModule(ScriptingEngine *engine)
+    : m_engine(engine)
+    , m_config(std::make_unique<Config>())
+    , m_globalObject(engine->ensureEngine().globalObject())
 {
     QJSEngine::setObjectOwnership(m_config.get(), QJSEngine::CppOwnership);
 }
 
 CoreModule::~CoreModule() = default;
 
+QJSValue CoreModule::delay(double duration)
+{
+    auto promise = g_scriptingEngine->newPromise();
+    if (duration < 1 || duration > INT32_MAX) {
+        promise.reject(m_engine->ensureEngine().newErrorObject(QJSValue::RangeError, QString("Value %1 is out of range.").arg(QString::number(duration))));
+        return promise.promise();
+    }
+
+    QTimer::singleShot(std::floor(duration), Qt::PreciseTimer, this, [promise]() {
+        promise.fulfill();
+    });
+    return promise.promise();
+}
+
 Config *CoreModule::config() const
 {
     return m_config.get();

src/libinputactions/scripting/modules/core/CoreModule.h

@@ -26,6 +26,7 @@ namespace InputActions
 
 class Config;
 class InputBackend;
+class ScriptingEngine;
 class VariableRegistry;
 
 class CoreModule : public QObject
@@ -38,15 +39,18 @@ class CoreModule : public QObject
     Q_PROPERTY(VariableRegistry *variableRegistry READ variableRegistry)
 
 public:
-    CoreModule(QJSValue globalObject);
+    CoreModule(ScriptingEngine *engine);
     ~CoreModule() override;
 
     Config *config() const;
     QJSValue globalThis() const { return m_globalObject; }
     InputBackend *input() const;
     VariableRegistry *variableRegistry() const;
 
+    Q_INVOKABLE QJSValue delay(double duration);
+
 private:
+    ScriptingEngine *m_engine;
     std::unique_ptr<Config> m_config;
     QJSValue m_globalObject;
 };