Skip to content

make DeviceService.getDeviceScreen suspend #3178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
proksh wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −6
Open

make DeviceService.getDeviceScreen suspend #3178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions maestro-studio/server/src/main/java/maestro/studio/DeviceService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import io.ktor.server.response.*
import io.ktor.server.routing.*
import io.ktor.utils.io.*
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import maestro.ElementFilter
import maestro.Filters
import maestro.Maestro
Expand Down Expand Up @@ -53,6 +55,8 @@ object DeviceService {

private var lastViewHierarchy: TreeNode? = null

private val screenMutex = Mutex()

fun routes(routing: Routing, maestro: Maestro) {
routing.post("/api/run-command") {
val request = call.parseBody<RunCommandRequest>()
Expand Down Expand Up @@ -178,11 +182,11 @@ object DeviceService {
}
}

private fun getDeviceScreen(maestro: Maestro): String {
private suspend fun getDeviceScreen(maestro: Maestro): String {
val tree: TreeNode
val screenshotFile: File
synchronized(DeviceService) {
tree = runBlocking { maestro.viewHierarchy() }.root
screenMutex.withLock {
tree = maestro.viewHierarchy().root
lastViewHierarchy = tree
screenshotFile = takeScreenshot(maestro)
savedScreenshots.add(screenshotFile)
Expand All @@ -192,7 +196,7 @@ object DeviceService {
}

@Suppress("DEPRECATION")
val deviceInfo = runBlocking { maestro.deviceInfo() }
val deviceInfo = maestro.deviceInfo()
val deviceWidth = deviceInfo.widthGrid
val deviceHeight = deviceInfo.heightGrid

Expand Down Expand Up @@ -226,12 +230,13 @@ object DeviceService {
)
}

private fun takeScreenshot(maestro: Maestro): File {
private suspend fun takeScreenshot(maestro: Maestro): File {
val name = "${UUID.randomUUID()}.png"
val screenshotFile = SCREENSHOT_DIR.resolve(name).toFile()
screenshotFile.deleteOnExit()
try {
runBlocking { maestro.takeScreenshot(screenshotFile, true) }
@Suppress("DEPRECATION")
maestro.takeScreenshot(screenshotFile, true)
} catch (ignore: Exception) {
// ignore intermittent screenshot errors
}
Expand Down
Loading