Pass failing commands via studio API (#2140)

jotoh98 · web-flow · commit 138f5f2ab171 · 2025-03-10T22:32:45.000Z
fix: throw command execution exception (#1617)
diff --git a/maestro-studio/server/src/main/java/maestro/studio/DeviceService.kt b/maestro-studio/server/src/main/java/maestro/studio/DeviceService.kt
@@ -104,13 +104,15 @@ object DeviceService {
         }
     }
 
-    private fun executeCommands(maestro: Maestro, commands: List<MaestroCommand>): Throwable? {
+    private fun executeCommands(maestro: Maestro, commands: List<MaestroCommand>) {
         var failure: Throwable? = null
         val result = Orchestra(maestro, onCommandFailed = { _, _, throwable ->
             failure = throwable
             Orchestra.ErrorResolution.FAIL
         }).executeCommands(commands)
-        return if (result) null else (failure ?: RuntimeException("Command execution failed"))
+        if (failure != null) {
+            throw RuntimeException("Command execution failed")
+        }
     }
 
     private fun treeToElements(tree: TreeNode): List<UIElement> {

Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,15 @@ object DeviceService {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`- private fun executeCommands(maestro: Maestro, commands: List<MaestroCommand>): Throwable? {`
	`107`	`+ private fun executeCommands(maestro: Maestro, commands: List<MaestroCommand>) {`
`108`	`108`	`var failure: Throwable? = null`
`109`	`109`	`val result = Orchestra(maestro, onCommandFailed = { _, _, throwable ->`
`110`	`110`	`failure = throwable`
`111`	`111`	`Orchestra.ErrorResolution.FAIL`
`112`	`112`	`}).executeCommands(commands)`
`113`		`- return if (result) null else (failure ?: RuntimeException("Command execution failed"))`
	`113`	`+ if (failure != null) {`
	`114`	`+ throw RuntimeException("Command execution failed")`
	`115`	`+ }`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`private fun treeToElements(tree: TreeNode): List<UIElement> {`