appium-espresso-driver 8.0.0 → 8.2.0

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/Clear.kt

@@ -16,15 +16,13 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performTextClearance
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import androidx.test.espresso.PerformException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import androidx.test.espresso.action.ViewActions.clearText
-import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 
 class Clear : RequestHandler<AppiumParams, Unit> {
 
@@ -37,13 +35,5 @@ class Clear : RequestHandler<AppiumParams, Unit> {
         }
     }
 
-    override fun handleCompose(params: AppiumParams) {
-        try {
-            getNodeInteractionById(params.elementId).performTextClearance()
-        } catch (e: AssertionError) {
-            throw StaleElementException(params.elementId!!)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Clear", params.elementId!!, e)
-        }
-    }
+    override fun handleCompose(params: AppiumParams) = ComposeHandlerBridge.clear(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/Click.kt

@@ -16,15 +16,13 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performClick
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import androidx.test.espresso.PerformException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import androidx.test.espresso.action.ViewActions.click
-import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 
 class Click : RequestHandler<AppiumParams, Unit> {
 
@@ -37,13 +35,5 @@ class Click : RequestHandler<AppiumParams, Unit> {
         }
     }
 
-    override fun handleCompose(params: AppiumParams) {
-        try {
-            getNodeInteractionById(params.elementId).performClick()
-        } catch (e: AssertionError) {
-            throw StaleElementException(params.elementId!!)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Click", params.elementId!!, e)
-        }
-    }
+    override fun handleCompose(params: AppiumParams) = ComposeHandlerBridge.click(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/DeleteSession.kt

@@ -17,12 +17,12 @@
 package io.appium.espressoserver.lib.handlers
 
 import io.appium.espressoserver.lib.helpers.NotificationListener
-import io.appium.espressoserver.lib.http.Server
+import io.appium.espressoserver.lib.http.ServerBase
 import io.appium.espressoserver.lib.http.response.AppiumResponse
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.GlobalSession
 
-class DeleteSession(private val server: Server) : RequestHandler<AppiumParams, AppiumResponse> {
+class DeleteSession(private val server: ServerBase) : RequestHandler<AppiumParams, AppiumResponse> {
 
     override fun handleInternal(params: AppiumParams): AppiumResponse {
         NotificationListener.stop()

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ElementScreenshot.kt

@@ -16,8 +16,7 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
-import io.appium.espressoserver.lib.helpers.takeComposeNodeScreenshot
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.helpers.takeEspressoViewScreenshot
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
@@ -28,5 +27,5 @@ class ElementScreenshot : RequestHandler<AppiumParams, String> {
         takeEspressoViewScreenshot(EspressoElement.getCachedViewStateById(params.elementId).view)
 
     override fun handleCompose(params: AppiumParams): String =
-        takeComposeNodeScreenshot(getNodeInteractionById(params.elementId!!))
+        ComposeHandlerBridge.elementScreenshot(params.elementId!!)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ElementValue.kt

@@ -18,8 +18,7 @@ package io.appium.espressoserver.lib.handlers
 
 import android.widget.NumberPicker
 import android.widget.ProgressBar
-import androidx.compose.ui.test.performTextClearance
-import androidx.compose.ui.test.performTextInput
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import androidx.test.espresso.PerformException
 
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
@@ -30,7 +29,6 @@ import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.typeText
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.helpers.AndroidLogger
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 import io.appium.espressoserver.lib.viewaction.ViewTextGetter
 
 class ElementValue(private val isReplacing: Boolean) : RequestHandler<TextValueParams, Unit> {
@@ -77,15 +75,7 @@ class ElementValue(private val isReplacing: Boolean) : RequestHandler<TextValueP
     }
 
     override fun handleCompose(params: TextValueParams) {
-        val value: String = extractTextToEnter(params)
-        try {
-            if (isReplacing) {
-                getNodeInteractionById(params.elementId).performTextClearance()
-            }
-            getNodeInteractionById(params.elementId).performTextInput(value)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Clear", params.elementId!!, e)
-        }
+        ComposeHandlerBridge.elementValue(params, isReplacing)
     }
 
     private fun extractTextToEnter(params: TextValueParams) =

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/FindElement.kt

@@ -16,10 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers
 
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.handlers.exceptions.*
-import io.appium.espressoserver.lib.helpers.*
+import io.appium.espressoserver.lib.helpers.ViewFinder
 import io.appium.espressoserver.lib.model.BaseElement
-import io.appium.espressoserver.lib.model.ComposeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Locator
 import io.appium.espressoserver.lib.viewaction.ViewGetter
@@ -47,14 +47,5 @@ class FindElement : RequestHandler<Locator, BaseElement> {
         return EspressoElement(viewState)
     }
 
-    override fun handleCompose(params: Locator): BaseElement {
-        val nodeInteractions = toNodeInteractionsCollection(params)
-        if (nodeInteractions.fetchSemanticsNodes(false).isEmpty()) throw NoSuchElementException(
-            String.format(
-                "Could not find a compose element with strategy '%s' and selector '%s'",
-                params.using, params.value
-            )
-        )
-        return ComposeElement(nodeInteractions[0])
-    }
+    override fun handleCompose(params: Locator): BaseElement = ComposeHandlerBridge.findElement(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/FindElements.kt

@@ -18,9 +18,9 @@ package io.appium.espressoserver.lib.handlers
 
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidSelectorException
-import io.appium.espressoserver.lib.helpers.*
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
+import io.appium.espressoserver.lib.helpers.ViewFinder
 import io.appium.espressoserver.lib.model.BaseElement
-import io.appium.espressoserver.lib.model.ComposeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Locator
 import io.appium.espressoserver.lib.viewaction.ViewGetter
@@ -40,9 +40,5 @@ class FindElements : RequestHandler<Locator, List<BaseElement>> {
         ).map { EspressoElement(it) }
     }
 
-    override fun handleCompose(params: Locator): List<BaseElement> {
-        val nodeInteractions = toNodeInteractionsCollection(params)
-        return List(nodeInteractions.fetchSemanticsNodes(false).size)
-            { index -> ComposeElement(nodeInteractions[index]) }
-    }
+    override fun handleCompose(params: Locator): List<BaseElement> = ComposeHandlerBridge.findElements(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetAttribute.kt

@@ -19,11 +19,11 @@ package io.appium.espressoserver.lib.handlers
 import androidx.test.espresso.EspressoException
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.assertion.LayoutAssertions
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.drivers.DriverContext
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException
 import io.appium.espressoserver.lib.helpers.AndroidLogger
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.*
 import io.appium.espressoserver.lib.viewaction.ViewTextGetter
 
@@ -39,16 +39,12 @@ class GetAttribute : RequestHandler<AppiumParams, String?> {
         }
 
         return when (DriverContext.currentStrategyType) {
-            DriverContext.StrategyType.COMPOSE -> getComposeAttribute(params.elementId!!, attributeName)
+            DriverContext.StrategyType.COMPOSE ->
+                ComposeHandlerBridge.getAttribute(params.elementId!!, attributeName)
             DriverContext.StrategyType.ESPRESSO -> getEspressoAttribute(params.elementId!!, attributeName)
         }
     }
 
-
-    private fun getComposeAttribute(elementId: String, attributeName: String): String? {
-        return ComposeNodeElement(getSemanticsNode(elementId)).getAttribute(attributeName)
-    }
-
     private fun getEspressoAttribute(elementId: String, attributeName: String): String? {
         val viewElementGetter: () -> ViewElement =
             { ViewElement(EspressoElement.getCachedViewStateById(elementId).view) }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetDisplayed.kt

@@ -16,8 +16,7 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.assertIsDisplayed
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.ViewElement
@@ -27,12 +26,6 @@ class GetDisplayed : RequestHandler<AppiumParams, Boolean> {
     override fun handleEspresso(params: AppiumParams): Boolean =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId, false).view).isVisible
 
-    override fun handleCompose(params: AppiumParams): Boolean =
-        try {
-            getNodeInteractionById(params.elementId).assertIsDisplayed()
-            true
-        } catch (e: AssertionError) {
-            false
-        }
+    override fun handleCompose(params: AppiumParams): Boolean = ComposeHandlerBridge.getDisplayed(params)
 }
 

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetEnabled.kt

@@ -16,17 +16,15 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetEnabled : RequestHandler<AppiumParams, Boolean> {
 
     override fun handleEspresso(params: AppiumParams): Boolean =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).isEnabled
 
-    override fun handleCompose(params: AppiumParams): Boolean =
-        ComposeNodeElement(getSemanticsNode(params.elementId!!)).isEnabled
+    override fun handleCompose(params: AppiumParams): Boolean = ComposeHandlerBridge.getEnabled(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetLocation.kt

@@ -16,12 +16,11 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.Location
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetLocation : RequestHandler<AppiumParams, Location> {
 
@@ -30,8 +29,5 @@ class GetLocation : RequestHandler<AppiumParams, Location> {
         return Location(viewElement.bounds.left, viewElement.bounds.top)
     }
 
-    override fun handleCompose(params: AppiumParams): Location {
-        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
-        return Location(composeNodeElement.bounds.left, composeNodeElement.bounds.top)
-    }
+    override fun handleCompose(params: AppiumParams): Location = ComposeHandlerBridge.getLocation(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetName.kt

@@ -16,11 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetName : RequestHandler<AppiumParams, String?> {
 
@@ -29,8 +28,5 @@ class GetName : RequestHandler<AppiumParams, String?> {
         return ViewElement(viewState.view).contentDescription?.toString()
     }
 
-    override fun handleCompose(params: AppiumParams): String? {
-        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
-        return composeNodeElement.contentDescription?.toString()
-    }
+    override fun handleCompose(params: AppiumParams): String? = ComposeHandlerBridge.getName(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetRect.kt

@@ -16,9 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Rect
 import io.appium.espressoserver.lib.model.ViewElement
@@ -28,6 +27,5 @@ class GetRect : RequestHandler<AppiumParams, Rect> {
     override fun handleEspresso(params: AppiumParams): Rect =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).rect
 
-    override fun handleCompose(params: AppiumParams): Rect =
-        ComposeNodeElement(getSemanticsNode(params.elementId!!)).rect
+    override fun handleCompose(params: AppiumParams): Rect = ComposeHandlerBridge.getRect(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetSelected.kt

@@ -16,9 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import io.appium.espressoserver.lib.model.ViewElement
@@ -28,6 +27,5 @@ class GetSelected : RequestHandler<AppiumParams, Boolean> {
     override fun handleEspresso(params: AppiumParams): Boolean =
             ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).isSelected
 
-    override fun handleCompose(params: AppiumParams): Boolean =
-            ComposeNodeElement(getSemanticsNode(params.elementId!!)).isSelected
+    override fun handleCompose(params: AppiumParams): Boolean = ComposeHandlerBridge.getSelected(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/GetSize.kt

@@ -16,12 +16,11 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.Size
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetSize : RequestHandler<AppiumParams, Size> {
 
@@ -30,8 +29,5 @@ class GetSize : RequestHandler<AppiumParams, Size> {
         return Size(bounds.width(), bounds.height())
     }
 
-    override fun handleCompose(params: AppiumParams): Size {
-        val bounds = ComposeNodeElement(getSemanticsNode(params.elementId!!)).bounds
-        return Size(bounds.width(), bounds.height())
-    }
+    override fun handleCompose(params: AppiumParams): Size = ComposeHandlerBridge.getSize(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/Keys.kt

@@ -16,11 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performTextInput
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import androidx.test.espresso.UiController
-import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
-import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 import io.appium.espressoserver.lib.helpers.w3c.adapter.espresso.EspressoW3CActionAdapter
 import io.appium.espressoserver.lib.helpers.w3c.models.Actions.ActionsBuilder
 import io.appium.espressoserver.lib.helpers.w3c.models.InputSource.Action
@@ -80,16 +77,5 @@ class Keys : RequestHandler<TextValueParams, Unit> {
         UiControllerPerformer(runnable).run()
     }
 
-    override fun handleCompose(params: TextValueParams) {
-        try {
-            val keys = params.value ?: return
-            keys.forEach {
-                getNodeInteractionById(params.elementId).performTextInput(it)
-            }
-        } catch (e: AssertionError) {
-            throw StaleElementException(params.elementId!!)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Keys", params.elementId!!, e)
-        }
-    }
+    override fun handleCompose(params: TextValueParams) = ComposeHandlerBridge.keys(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/MobileSwipe.kt

@@ -16,16 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performGesture
-import androidx.compose.ui.test.swipeDown
-
-import androidx.compose.ui.test.swipeLeft
-import androidx.compose.ui.test.swipeRight
-import androidx.compose.ui.test.swipeUp
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import androidx.test.espresso.action.GeneralSwipeAction
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
 import io.appium.espressoserver.lib.helpers.AndroidLogger
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.MobileSwipeParams
 import io.appium.espressoserver.lib.model.MobileSwipeParams.Direction.*
@@ -68,21 +62,5 @@ class MobileSwipe : RequestHandler<MobileSwipeParams, Void?> {
         return null
     }
 
-    override fun handleCompose(params: MobileSwipeParams): Void? {
-        val nodeInteractions = getNodeInteractionById(params.elementId)
-
-        AndroidLogger.info("Performing swipe action with direction '${params.direction}'")
-        when (params.direction) {
-            UP -> nodeInteractions.performGesture { swipeUp() }
-            DOWN -> nodeInteractions.performGesture { swipeDown() }
-            LEFT -> nodeInteractions.performGesture { swipeLeft() }
-            RIGHT -> nodeInteractions.performGesture { swipeRight() }
-            else -> throw InvalidArgumentException(
-                "Unknown swipe direction '${params.direction}'. " +
-                        "Only the following values are supported: " +
-                        values().joinToString(",") { x -> x.name.lowercase() }
-            )
-        }
-        return null
-    }
+    override fun handleCompose(params: MobileSwipeParams): Void? = ComposeHandlerBridge.mobileSwipe(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/RequestHandler.kt

@@ -16,8 +16,10 @@
 
 package io.appium.espressoserver.lib.handlers
 
+import io.appium.espressoserver.lib.BuildConfig
 import io.appium.espressoserver.lib.drivers.DriverContext
 import io.appium.espressoserver.lib.drivers.DriverContext.StrategyType
+import io.appium.espressoserver.lib.handlers.exceptions.ComposeNotSupportedException
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.handlers.exceptions.NoSuchDriverException
 import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException
@@ -31,7 +33,12 @@ interface RequestHandler<in T : AppiumParams, out R> {
     @Suppress("UNCHECKED_CAST")
     fun invokeStrategy(params: AppiumParams): R =
         when (DriverContext.currentStrategyType) {
-            StrategyType.COMPOSE -> handleCompose(params as T)
+            StrategyType.COMPOSE -> {
+                if (!BuildConfig.COMPOSE_SUPPORT) {
+                    throw ComposeNotSupportedException()
+                }
+                handleCompose(params as T)
+            }
             StrategyType.ESPRESSO -> handleEspresso(params as T)
         }
 

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/Text.kt

@@ -16,9 +16,8 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
+import io.appium.espressoserver.lib.compose.ComposeHandlerBridge
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.viewaction.ViewTextGetter
 
@@ -29,6 +28,5 @@ class Text : RequestHandler<AppiumParams, String> {
         return ViewTextGetter()[viewInteraction].rawText
     }
 
-    override fun handleCompose(params: AppiumParams): String =
-        ComposeNodeElement(getSemanticsNode(params.elementId!!)).text.toString()
+    override fun handleCompose(params: AppiumParams): String = ComposeHandlerBridge.text(params)
 }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/exceptions/ComposeNotSupportedException.kt

@@ -0,0 +1,28 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.appium.espressoserver.lib.handlers.exceptions
+
+/**
+ * Thrown when this server was built with Compose omitted (e.g.
+ * `appium:espressoBuildConfig->composeSupport=false`) but a Compose-only action was requested.
+ */
+class ComposeNotSupportedException :
+    InvalidArgumentException(
+        "Jetpack Compose is not available in this Espresso server build: it was assembled with " +
+            "appium:espressoBuildConfig->composeSupport=false. " +
+            "Set appium:espressoBuildConfig->composeSupport=true and rebuild the server to use Compose.",
+    )

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/exceptions/InvalidArgumentException.kt

@@ -18,7 +18,7 @@ package io.appium.espressoserver.lib.handlers.exceptions
 
 import fi.iki.elonen.NanoHTTPD
 
-class InvalidArgumentException : AppiumException {
+open class InvalidArgumentException : AppiumException {
     constructor() : super("The arguments passed to the command are either invalid or malformed")
 
     constructor(reason: String) : super(reason) {}

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/EspressoViewsCache.kt

@@ -18,7 +18,6 @@ package io.appium.espressoserver.lib.helpers
 
 import android.util.LruCache
 import android.view.View
-import androidx.compose.ui.test.SemanticsNodeInteraction
 import androidx.test.espresso.Root
 import org.hamcrest.Matcher
 
@@ -45,19 +44,3 @@ object EspressoViewsCache {
         cache.evictAll()
     }
 }
-
-/** Compose does not have stable instances, use locator again. */
-object ComposeViewCache {
-    private val cache = LruCache<String, SemanticsNodeInteraction>(MAX_CACHE_SIZE)
-
-    fun put(id: String, composeNode: SemanticsNodeInteraction) {
-        cache.put(id, composeNode)
-    }
-
-    fun get(id: String?): SemanticsNodeInteraction? =
-        cache.get(id)
-
-    fun reset() {
-        cache.evictAll()
-    }
-}

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ScreenshotHelpers.kt

@@ -19,10 +19,6 @@ package io.appium.espressoserver.lib.helpers
 import android.graphics.Bitmap
 import android.util.Base64
 import android.view.View
-import androidx.compose.ui.graphics.asAndroidBitmap
-import androidx.compose.ui.test.SemanticsNodeInteraction
-import androidx.compose.ui.test.captureToImage
-
 import java.io.ByteArrayOutputStream
 import androidx.test.runner.screenshot.Screenshot
 import io.appium.espressoserver.lib.handlers.exceptions.ScreenCaptureException
@@ -48,12 +44,3 @@ fun takeEspressoViewScreenshot(view: View): String =
     } catch (e: RuntimeException) {
         throw ScreenCaptureException("Cannot take a screenshot of a view", e)
     }
-
-fun takeComposeNodeScreenshot(nodeInteraction: SemanticsNodeInteraction): String =
-    try {
-        encodeBitmap(
-            nodeInteraction.captureToImage().asAndroidBitmap()
-        ) { nodeInteraction.fetchSemanticsNode().toString() }
-    } catch (e: RuntimeException) {
-        throw ScreenCaptureException("Cannot take a screenshot of a node", e)
-    }

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt

@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
 
 // This value is updated automatically by the NPM versioning script
 // It should be in sync with the NPM module version from package.json
-private const val VERSION = "8.0.0"
+private const val VERSION = "8.2.0"
 
 fun getEspressoServerVersion() = VERSION

package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/http/Router.kt

@@ -32,7 +32,7 @@ import io.appium.espressoserver.lib.http.response.BaseResponse
 import io.appium.espressoserver.lib.model.*
 import io.appium.espressoserver.lib.model.web.WebAtomsParams
 
-internal class Router(server: Server) {
+internal class Router(server: ServerBase) {
     private val routeMap: RouteMap
 
     init {