Run execution on default thread, allow destroying of scripting engine

Waboodoo · Dec 29, 2024 · aa6ff8f · aa6ff8f
1 parent 8de5ae9
commit aa6ff8f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/...ortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/execute/Execution.kt b/...ortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/execute/Execution.kt
@@ -91,6 +91,7 @@ import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
@@ -172,13 +173,15 @@ class Execution(
             }
             logException(e)
         } finally {
+            scriptExecutor.destroy()
             tryOrLog {
                 cacheFilesCleanupStarter()
                 historyCleanUpStarter()
                 executionSchedulerStarter()
             }
         }
     }
+        .flowOn(Dispatchers.Default)
         .onEach { status ->
             if (status is ExecutionStatus.WithResult) {
                 sessionMonitor.onResult(status.result)

diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/scripting/ScriptExecutor.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/scripting/ScriptExecutor.kt
@@ -43,8 +43,10 @@ constructor(
             .also {
                 registerActionAliases(it, actionFactory.getAliases())
                 registerAbort(it)
+                destroyer = it::destroy
             }
     }
+    private var destroyer: (() -> Unit)? = null
 
     private val cleanupHandler = CleanupHandler()
 
@@ -262,6 +264,10 @@ constructor(
         )
     }
 
+    fun destroy() {
+        destroyer?.invoke()
+    }
+
     companion object {
 
         private const val NO_RESULT = "[[[no result]]]"

diff --git a/HTTPShortcuts/scripting/src/main/kotlin/ch/rmy/android/scripting/ScriptingEngine.kt b/HTTPShortcuts/scripting/src/main/kotlin/ch/rmy/android/scripting/ScriptingEngine.kt
@@ -14,4 +14,6 @@ interface ScriptingEngine {
     fun registerListOfObjects(name: String, list: List<JsObject>)
 
     fun buildJsObject(builder: JsObjectBuilder.() -> Unit): JsObject
+
+    fun destroy()
 }
diff --git a/...cripting/src/main/kotlin/ch/rmy/android/scripting/liquidcore/LiquidCoreScriptingEngine.kt b/...cripting/src/main/kotlin/ch/rmy/android/scripting/liquidcore/LiquidCoreScriptingEngine.kt
@@ -82,6 +82,10 @@ internal class LiquidCoreScriptingEngine : ScriptingEngine {
     internal fun JsObject.toJSObject(): JSObject =
         (this as LiquidCoreJsObject).toJSObject()
 
+    override fun destroy() {
+        // nothing to do, LiquidCore doesn't have a shutdown function
+    }
+
     companion object {
         private const val READ_ONLY =
             JSContext.JSPropertyAttributeReadOnly or JSContext.JSPropertyAttributeDontDelete