appium-espresso-driver 10.1.0 → 10.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  3. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
  4. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
  5. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  6. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  7. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  8. package/espresso-server/gradle/libs.versions.toml +2 -0
  9. package/espresso-server/library/build.gradle.kts +3 -0
  10. package/espresso-server/library/src/composeOn/java/io/appium/espressoserver/lib/helpers/ComposeNodeFinder.kt +3 -3
  11. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/exceptions/XPathLookupException.kt +10 -2
  12. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  13. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ViewFinder.kt +3 -0
  14. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/SourceDocument.kt +4 -21
  15. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/XPathQuery.kt +64 -0
  16. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/viewmatcher/WithXPath.kt +3 -3
  17. package/espresso-server/library/src/test/java/io/appium/espressoserver/test/helpers/XPathQueryTests.kt +101 -0
  18. package/espresso-server/settings.gradle.kts +4 -0
  19. package/node_modules/appium-android-driver/CHANGELOG.md +7 -0
  20. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts +1 -1
  21. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts.map +1 -1
  22. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js +8 -4
  23. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js.map +1 -1
  24. package/node_modules/appium-android-driver/build/lib/driver.d.ts +1 -0
  25. package/node_modules/appium-android-driver/build/lib/driver.d.ts.map +1 -1
  26. package/node_modules/appium-android-driver/build/lib/driver.js +1 -0
  27. package/node_modules/appium-android-driver/build/lib/driver.js.map +1 -1
  28. package/node_modules/appium-android-driver/lib/commands/media-stream/exports.ts +7 -4
  29. package/node_modules/appium-android-driver/lib/driver.ts +1 -0
  30. package/node_modules/appium-android-driver/package.json +2 -2
  31. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [10.2.0](https://github.com/appium/appium-espresso-driver/compare/v10.1.0...v10.2.0) (2026-11-15)
2
+
3
+ ### Features
4
+
5
+ * support XPath 2.0 in the xpath locator strategy ([#1254](https://github.com/appium/appium-espresso-driver/issues/1254)) ([c72c168](https://github.com/appium/appium-espresso-driver/commit/c72c168fcfc14702fc475fa46d0e38cee0a79b74))
6
+
1
7
  ## [10.1.0](https://github.com/appium/appium-espresso-driver/compare/v10.0.3...v10.1.0) (2026-11-15)
2
8
 
3
9
  ### Features
@@ -1,2 +1,2 @@
1
- #Sun Nov 15 20:58:44 UTC 2026
1
+ #Sun Nov 15 22:08:16 UTC 2026
2
2
  gradle.version=9.7.1
@@ -11,6 +11,7 @@ nanohttpd = "2.3.1"
11
11
  robolectric = "4.17"
12
12
  junit = "4.13.2"
13
13
  uiautomator = "2.4.0"
14
+ xpath2Processor = "2.0.0"
14
15
 
15
16
  [libraries]
16
17
  androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" }
@@ -33,6 +34,7 @@ kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.re
33
34
  kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
34
35
  junit = { group = "junit", name = "junit", version.ref = "junit" }
35
36
  robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
37
+ xpath2-processor = { group = "com.github.appium.appium-android", name = "xpath2-processor", version.ref = "xpath2Processor" }
36
38
 
37
39
  [plugins]
38
40
  android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -132,6 +132,9 @@ dependencies {
132
132
  api(libs.kotlin.reflect) {
133
133
  withCapabilityVersion(project, "appiumKotlin", libs.versions.kotlin.get())
134
134
  }
135
+ implementation(libs.xpath2.processor) {
136
+ because("XPath 2.0 locator support")
137
+ }
135
138
  "composeOnApi"(libs.androidx.compose.ui.test) {
136
139
  withCapabilityVersion(project, "appiumComposeVersion", libs.versions.composeUiTest.get())
137
140
  because("Android Compose support")
@@ -27,7 +27,7 @@ import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
27
27
  import io.appium.espressoserver.lib.model.Locator
28
28
  import io.appium.espressoserver.lib.model.SourceDocument
29
29
  import io.appium.espressoserver.lib.model.AttributesEnum
30
- import io.appium.espressoserver.lib.model.compileXpathExpression
30
+ import io.appium.espressoserver.lib.model.compileXpathQuery
31
31
  import io.appium.espressoserver.lib.viewmatcher.fetchIncludedAttributes
32
32
 
33
33
  /**
@@ -66,11 +66,11 @@ fun semanticsMatcherForLocator(locator: Locator): SemanticsMatcher =
66
66
 
67
67
  private fun hasXpath(locator: Locator): SemanticsMatcher {
68
68
  val xpath = locator.value!!
69
- val expression = compileXpathExpression(xpath)
69
+ val query = compileXpathQuery(xpath)
70
70
  val attributes = fetchIncludedAttributes(xpath)
71
71
  val matchingIds = SourceDocument(
72
72
  locator.elementId?.let { getSemanticsNode(it) }, attributes
73
- ).findMatchingNodeIds(expression, AttributesEnum.RESOURCE_ID.toString())
73
+ ).findMatchingNodeIds(query, AttributesEnum.RESOURCE_ID.toString())
74
74
 
75
75
  return SemanticsMatcher("Matches Xpath ${locator.value}") {
76
76
  matchingIds.contains(it.id)
@@ -19,8 +19,10 @@ package io.appium.espressoserver.lib.handlers.exceptions
19
19
  import fi.iki.elonen.NanoHTTPD
20
20
 
21
21
 
22
- class XPathLookupException(xpath: String, reason: String) :
23
- AppiumException(String.format("Could not parse XPath %s: %s", xpath, reason)) {
22
+ class XPathLookupException private constructor(message: String) : AppiumException(message) {
23
+ constructor(xpath: String, reason: String) :
24
+ this(String.format("Could not parse XPath %s: %s", xpath, reason))
25
+
24
26
  override fun error(): String {
25
27
  return "invalid selector"
26
28
  }
@@ -28,4 +30,10 @@ class XPathLookupException(xpath: String, reason: String) :
28
30
  override fun status(): NanoHTTPD.Response.Status {
29
31
  return NanoHTTPD.Response.Status.BAD_REQUEST
30
32
  }
33
+
34
+ companion object {
35
+ /** For a valid expression that has failed while being evaluated */
36
+ fun evaluationFailure(xpath: String, reason: String) =
37
+ XPathLookupException(String.format("Could not evaluate XPath %s: %s", xpath, reason))
38
+ }
31
39
  }
@@ -2,6 +2,6 @@ package io.appium.espressoserver.lib.helpers
2
2
 
3
3
  // This value is updated automatically by the NPM versioning script
4
4
  // It should be in sync with the NPM module version from package.json
5
- private const val VERSION = "10.1.0"
5
+ private const val VERSION = "10.2.0"
6
6
 
7
7
  fun getEspressoServerVersion() = VERSION
@@ -310,6 +310,9 @@ object ViewFinder {
310
310
  } catch (e: AppNotIdleException) {
311
311
  throw InvalidElementStateException(APP_NOT_IDLE_MESSAGE + getThreadDump(), e)
312
312
  } catch (e: Exception) {
313
+ // The matcher is evaluated on the main thread, which wraps the XPath errors
314
+ generateSequence<Throwable>(e) { it.cause }
315
+ .filterIsInstance<XPathLookupException>().firstOrNull()?.let { throw it }
313
316
  if (e is EspressoException) {
314
317
  return resultViews
315
318
  }
@@ -27,20 +27,16 @@ import android.widget.AdapterView
27
27
  import androidx.test.core.app.ApplicationProvider.getApplicationContext
28
28
  import io.appium.espressoserver.lib.drivers.DriverContext
29
29
  import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
30
- import io.appium.espressoserver.lib.handlers.exceptions.XPathLookupException
31
30
  import io.appium.espressoserver.lib.helpers.AndroidLogger
32
31
  import io.appium.espressoserver.lib.helpers.StringHelpers.abbreviate
33
32
  import io.appium.espressoserver.lib.helpers.XMLHelpers.toNodeName
34
33
  import io.appium.espressoserver.lib.helpers.XMLHelpers.toSafeString
35
34
  import io.appium.espressoserver.lib.helpers.extensions.withPermit
36
35
  import io.appium.espressoserver.lib.viewaction.ViewGetter
37
- import org.w3c.dom.NodeList
38
- import org.xml.sax.InputSource
39
36
  import org.xmlpull.v1.XmlSerializer
40
37
  import java.io.*
41
38
  import java.util.*
42
39
  import java.util.concurrent.Semaphore
43
- import javax.xml.xpath.*
44
40
 
45
41
  const val NON_XML_CHAR_REPLACEMENT = "?"
46
42
  const val VIEW_INDEX = "viewIndex"
@@ -49,7 +45,6 @@ val DEFAULT_VIEW_CLASS_NAME = View::javaClass.name
49
45
  const val MAX_TRAVERSAL_DEPTH = 70
50
46
  const val MAX_XML_VALUE_LENGTH = 64 * 1024
51
47
  const val XML_ENCODING = "UTF-8"
52
- val XPATH: XPath = XPathFactory.newInstance().newXPath()
53
48
 
54
49
 
55
50
  internal fun toXmlNodeName(className: String?): String {
@@ -71,13 +66,6 @@ internal fun toXmlNodeName(className: String?): String {
71
66
  return fixedName
72
67
  }
73
68
 
74
- fun compileXpathExpression(selector: String): XPathExpression =
75
- try {
76
- XPATH.compile(selector)
77
- } catch (xe: XPathExpressionException) {
78
- throw XPathLookupException(selector, xe.message!!)
79
- }
80
-
81
69
  class SourceDocument constructor(
82
70
  private val root: Any? = null,
83
71
  private val includedAttributes: Set<AttributesEnum>? = null
@@ -288,16 +276,11 @@ class SourceDocument constructor(
288
276
  }
289
277
  }, { performCleanup() })
290
278
 
291
- fun findViewsByXPath(expression: XPathExpression): List<View> =
292
- findMatchingNodeIds(expression, VIEW_INDEX).map { viewMap.get(it) }
279
+ internal fun findViewsByXPath(query: XPathQuery): List<View> =
280
+ findMatchingNodeIds(query, VIEW_INDEX).map { viewMap.get(it) }
293
281
 
294
- fun findMatchingNodeIds(expression: XPathExpression, attributeName: String): List<Int> =
282
+ internal fun findMatchingNodeIds(query: XPathQuery, attributeName: String): List<Int> =
295
283
  RESOURCES_GUARD.withPermit({
296
- toStream().use { xmlStream ->
297
- val list = expression.evaluate(InputSource(xmlStream), XPathConstants.NODESET) as NodeList
298
- (0 until list.length).map { index ->
299
- list.item(index).attributes.getNamedItem(attributeName).nodeValue.toInt()
300
- }
301
- }
284
+ toStream().use { xmlStream -> query.evaluateNodeIds(xmlStream, attributeName) }
302
285
  }, { performCleanup() })
303
286
  }
@@ -0,0 +1,64 @@
1
+ /*
2
+ * Licensed under the Apache License, Version 2.0 (the "License");
3
+ * you may not use this file except in compliance with the License.
4
+ * See the NOTICE file distributed with this work for additional
5
+ * information regarding copyright ownership.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+
17
+ package io.appium.espressoserver.lib.model
18
+
19
+ import io.appium.espressoserver.lib.handlers.exceptions.XPathLookupException
20
+ import io.appium.xpath2.DocumentLoader
21
+ import org.eclipse.wst.xml.xpath2.api.XPath2Expression
22
+ import org.eclipse.wst.xml.xpath2.processor.Engine
23
+ import org.eclipse.wst.xml.xpath2.processor.StaticError
24
+ import org.eclipse.wst.xml.xpath2.processor.util.DynamicContextBuilder
25
+ import org.eclipse.wst.xml.xpath2.processor.util.StaticContextBuilder
26
+ import org.w3c.dom.Element
27
+ import java.io.InputStream
28
+
29
+ /** A compiled XPath 2.0 expression, which is evaluated against the XML page source. */
30
+ internal class XPathQuery(
31
+ private val selector: String,
32
+ private val expression: XPath2Expression,
33
+ private val staticContext: StaticContextBuilder
34
+ ) {
35
+ /** Returns the integer values of [attributeName] of the matched element nodes. */
36
+ fun evaluateNodeIds(xml: InputStream, attributeName: String): List<Int> {
37
+ val document = DocumentLoader.parse(xml)
38
+ val result = try {
39
+ expression.evaluate(DynamicContextBuilder(staticContext), arrayOf<Any>(document))
40
+ } catch (e: Exception) {
41
+ throw XPathLookupException.evaluationFailure(selector, e.message ?: e.javaClass.simpleName)
42
+ }
43
+ return result.iterator().asSequence()
44
+ .map { it.nativeValue }
45
+ .filterIsInstance<Element>()
46
+ .filter { it.hasAttribute(attributeName) }
47
+ .map { it.getAttribute(attributeName).toInt() }
48
+ .toList()
49
+ }
50
+ }
51
+
52
+ private const val XS_NAMESPACE = "http://www.w3.org/2001/XMLSchema"
53
+ private const val FN_NAMESPACE = "http://www.w3.org/2005/xpath-functions"
54
+
55
+ internal fun compileXpathQuery(selector: String): XPathQuery {
56
+ val staticContext = StaticContextBuilder()
57
+ .withNamespace("xs", XS_NAMESPACE)
58
+ .withNamespace("fn", FN_NAMESPACE)
59
+ return try {
60
+ XPathQuery(selector, Engine().parseExpression(selector, staticContext), staticContext)
61
+ } catch (e: StaticError) {
62
+ throw XPathLookupException(selector, e.message ?: e.javaClass.simpleName)
63
+ }
64
+ }
@@ -20,7 +20,7 @@ import io.appium.espressoserver.lib.helpers.extensions.withPermit
20
20
  import io.appium.espressoserver.lib.model.SourceDocument
21
21
  import io.appium.espressoserver.lib.model.AttributesEnum
22
22
  import io.appium.espressoserver.lib.model.EspressoAttributes
23
- import io.appium.espressoserver.lib.model.compileXpathExpression
23
+ import io.appium.espressoserver.lib.model.compileXpathQuery
24
24
  import org.hamcrest.Description
25
25
  import org.hamcrest.Matcher
26
26
  import org.hamcrest.TypeSafeMatcher
@@ -40,7 +40,7 @@ fun fetchIncludedAttributes(xpath: String): Set<AttributesEnum>? {
40
40
  }
41
41
 
42
42
  fun withXPath(root: View?, xpath: String, index: Int? = null): Matcher<View> {
43
- val expression = compileXpathExpression(xpath)
43
+ val query = compileXpathQuery(xpath)
44
44
  val attributes = fetchIncludedAttributes(xpath)
45
45
  val matchedXPathViews = mutableListOf<View>()
46
46
  var didLookup = false
@@ -50,7 +50,7 @@ fun withXPath(root: View?, xpath: String, index: Int? = null): Matcher<View> {
50
50
  lookupGuard.withPermit {
51
51
  if (!didLookup) {
52
52
  matchedXPathViews.addAll(
53
- SourceDocument(root ?: item.rootView, attributes).findViewsByXPath(expression)
53
+ SourceDocument(root ?: item.rootView, attributes).findViewsByXPath(query)
54
54
  )
55
55
  didLookup = true
56
56
  }
@@ -0,0 +1,101 @@
1
+ /*
2
+ * Licensed under the Apache License, Version 2.0 (the "License");
3
+ * you may not use this file except in compliance with the License.
4
+ * See the NOTICE file distributed with this work for additional
5
+ * information regarding copyright ownership.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+
17
+ package io.appium.espressoserver.test.helpers
18
+
19
+ import io.appium.espressoserver.lib.handlers.exceptions.XPathLookupException
20
+ import io.appium.espressoserver.lib.model.compileXpathQuery
21
+ import org.junit.Test
22
+ import kotlin.test.assertContains
23
+ import kotlin.test.assertEquals
24
+ import kotlin.test.assertFailsWith
25
+
26
+ const val PAGE_SOURCE = """<hierarchy>
27
+ <android.widget.FrameLayout viewIndex="0" text="Hello">
28
+ <android.widget.TextView viewIndex="1" text="Apple" enabled="true"/>
29
+ <android.widget.Button viewIndex="2" text="banana" enabled="false"/>
30
+ </android.widget.FrameLayout>
31
+ </hierarchy>"""
32
+
33
+ fun evaluate(xpath: String): List<Int> =
34
+ compileXpathQuery(xpath).evaluateNodeIds(PAGE_SOURCE.byteInputStream(), "viewIndex")
35
+
36
+ class `XPath Query Tests` {
37
+
38
+ @Test
39
+ fun `should find elements by an XPath 1 expression`() {
40
+ assertEquals(listOf(1), evaluate("//android.widget.TextView[@text='Apple']"))
41
+ assertEquals(listOf(1, 2), evaluate("//*[@enabled and @text]"))
42
+ assertEquals(listOf(2), evaluate("//android.widget.FrameLayout/*[last()]"))
43
+ }
44
+
45
+ @Test
46
+ fun `should return no matches if nothing is found`() {
47
+ assertEquals(emptyList(), evaluate("//android.widget.Switch"))
48
+ }
49
+
50
+ @Test
51
+ fun `should report malformed expressions as invalid selector`() {
52
+ assertFailsWith<XPathLookupException> { compileXpathQuery("//*[") }
53
+ }
54
+
55
+ @Test
56
+ fun `should support XPath 2 functions`() {
57
+ assertEquals(listOf(0, 1), evaluate("//*[matches(@text, '^[A-Z]')]"))
58
+ assertEquals(listOf(2), evaluate("//*[lower-case(@text) = 'banana']"))
59
+ }
60
+
61
+ @Test
62
+ fun `should support sequences and FLWOR expressions`() {
63
+ assertEquals(listOf(1, 2), evaluate("//*[@text = ('Apple', 'banana')]"))
64
+ assertEquals(listOf(2), evaluate("for ${"$"}b in //android.widget.Button return ${"$"}b"))
65
+ }
66
+
67
+ @Test
68
+ fun `should skip non-element results`() {
69
+ assertEquals(emptyList(), evaluate("//@text"))
70
+ }
71
+
72
+ @Test
73
+ fun `should report dynamic errors as invalid selector`() {
74
+ val error = assertFailsWith<XPathLookupException> { evaluate("//*[@text + 1 = 2]") }
75
+ assertContains(error.message.orEmpty(), "Could not evaluate XPath")
76
+ }
77
+
78
+ @Test
79
+ fun `should report syntax errors as parse errors`() {
80
+ val error = assertFailsWith<XPathLookupException> { compileXpathQuery("//*[") }
81
+ assertContains(error.message.orEmpty(), "Could not parse XPath")
82
+ }
83
+
84
+ @Test
85
+ fun `should report unknown functions and unbound variables as invalid selector`() {
86
+ assertFailsWith<XPathLookupException> { compileXpathQuery("//*[unknown()]") }
87
+ assertFailsWith<XPathLookupException> { compileXpathQuery("//*[@text = ${"$"}missing]") }
88
+ }
89
+
90
+ @Test
91
+ fun `should support the standard xs and fn prefixes`() {
92
+ assertEquals(listOf(1, 2), evaluate("//*[@enabled][xs:boolean(@enabled) or true()]"))
93
+ assertEquals(listOf(0, 1), evaluate("//*[fn:matches(@text, '^[A-Z]')]"))
94
+ assertEquals(listOf(0), evaluate("//*[xs:string(@text) = 'Hello']"))
95
+ }
96
+
97
+ @Test
98
+ fun `should not load documents with fn doc`() {
99
+ assertFailsWith<XPathLookupException> { evaluate("doc('file:///etc/hosts')") }
100
+ }
101
+ }
@@ -25,6 +25,10 @@ dependencyResolutionManagement {
25
25
  repositories {
26
26
  google()
27
27
  mavenCentral()
28
+ maven {
29
+ url = uri("https://jitpack.io")
30
+ content { includeGroup("com.github.appium.appium-android") }
31
+ }
28
32
  }
29
33
  }
30
34
 
@@ -3,6 +3,13 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [15.2.2](https://github.com/appium/appium-android/compare/appium-android-driver@15.2.1...appium-android-driver@15.2.2) (2026-11-15)
7
+
8
+ ### Bug Fixes
9
+
10
+ * **driver-lib:** keep stopping an ended media stream a no-op ([#124](https://github.com/appium/appium-android/issues/124)) ([037f1c8](https://github.com/appium/appium-android/commit/037f1c8d76a58c78443b483aae7bcca85516239e))
11
+
12
+
6
13
  ## [15.2.1](https://github.com/appium/appium-android/compare/appium-android-driver@15.2.0...appium-android-driver@15.2.1) (2026-11-15)
7
14
 
8
15
  **Note:** Version bump only for package appium-android-driver
@@ -32,7 +32,7 @@ export declare function mobileStartMediaStream(this: AndroidDriver, kind: MediaK
32
32
  export declare function mobileGetMediaStreamCapabilities(this: AndroidDriver): Promise<MediaStreamCapabilities>;
33
33
  /**
34
34
  * Stops a media stream started by `mobile: startMediaStream`.
35
- * Stopping a stream that has already ended is a no-op.
35
+ * Stopping a stream that has already ended is a no-op, also after other streams were started.
36
36
  *
37
37
  * @param streamId The id returned by `mobile: startMediaStream`.
38
38
  */
@@ -1 +1 @@
1
- {"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAWnD,OAAO,KAAK,EAAC,SAAS,EAAE,uBAAuB,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAC;AAE1G,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,GACjD,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;QAC7C,gCAAgC,CAC9B,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,gCAAgC,CAAC,GAC3D,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC;QACvD,qBAAqB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;KACpH;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,SAAS,EACf,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EACvB,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,OAAO,EACf,OAAO,GAAE,MAAyB,EAClC,eAAe,GAAE,MAAkC,GAClD,OAAO,CAAC,eAAe,CAAC,CAkE1B;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAE5G;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhG;AAED,kEAAkE;AAClE,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E"}
1
+ {"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAWnD,OAAO,KAAK,EAAC,SAAS,EAAE,uBAAuB,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAC;AAE1G,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,GACjD,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;QAC7C,gCAAgC,CAC9B,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,gCAAgC,CAAC,GAC3D,UAAU,CAAC,OAAO,gCAAgC,CAAC,CAAC;QACvD,qBAAqB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;KACpH;CACF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,SAAS,EACf,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EACvB,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,OAAO,EACf,OAAO,GAAE,MAAyB,EAClC,eAAe,GAAE,MAAkC,GAClD,OAAO,CAAC,eAAe,CAAC,CAoE1B;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAE5G;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhG;AAED,kEAAkE;AAClE,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E"}
@@ -47,9 +47,11 @@ export async function mobileStartMediaStream(kind, codec, fps, bitrate, quality,
47
47
  }
48
48
  }
49
49
  const streams = (this._mediaStreams ??= new Map());
50
+ const ended = (this._endedMediaStreamIds ??= new Set());
50
51
  for (const [id, s] of streams) {
51
52
  if (s.isStopped) {
52
53
  streams.delete(id);
54
+ ended.add(id);
53
55
  }
54
56
  }
55
57
  if ([...streams.values()].some((s) => s.kind === kind)) {
@@ -66,7 +68,7 @@ export async function mobileStartMediaStream(kind, codec, fps, bitrate, quality,
66
68
  emitter: this.eventEmitter,
67
69
  hasSubscribers: () => hasSubscribers(this, MEDIA_UNITS_EVENT),
68
70
  log: this.log,
69
- // Ended streams stay registered so that a later stop call is a no-op, see mobileStopMediaStream
71
+ // Ended streams are moved to the ended ids on the next start, see mobileStopMediaStream
70
72
  onEnded: () => { },
71
73
  });
72
74
  streams.set(stream.streamId, stream);
@@ -89,16 +91,18 @@ export async function mobileGetMediaStreamCapabilities() {
89
91
  }
90
92
  /**
91
93
  * Stops a media stream started by `mobile: startMediaStream`.
92
- * Stopping a stream that has already ended is a no-op.
94
+ * Stopping a stream that has already ended is a no-op, also after other streams were started.
93
95
  *
94
96
  * @param streamId The id returned by `mobile: startMediaStream`.
95
97
  */
96
98
  export async function mobileStopMediaStream(streamId) {
97
99
  const stream = this._mediaStreams?.get(streamId);
98
- if (!stream) {
100
+ if (stream) {
101
+ await stream.stop();
102
+ }
103
+ else if (!this._endedMediaStreamIds?.has(streamId)) {
99
104
  throw new errors.InvalidArgumentError(`Unknown media stream id '${streamId}'`);
100
105
  }
101
- await stream.stop();
102
106
  }
103
107
  /** Stops all streams of the session; used on session deletion. */
104
108
  export async function stopAllMediaStreams() {
@@ -1 +1 @@
1
- {"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"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"}
@@ -867,6 +867,7 @@ declare class AndroidDriver<C extends AndroidDriverConstraints = AndroidDriverCo
867
867
  _cachedActivityArgs: StringRecord;
868
868
  _screenStreamingProps?: ScreenStreamingProps;
869
869
  _mediaStreams?: Map<string, MediaStream>;
870
+ _endedMediaStreamIds?: Set<string>;
870
871
  _screenRecordingProperties?: ScreenRecordingProperties;
871
872
  _logcatWebsocketListener?: LogcatListener;
872
873
  _bidiServerLogListener?: (...args: any[]) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
@@ -99,6 +99,7 @@ class AndroidDriver extends BaseDriver {
99
99
  _cachedActivityArgs;
100
100
  _screenStreamingProps;
101
101
  _mediaStreams;
102
+ _endedMediaStreamIds;
102
103
  _screenRecordingProperties;
103
104
  _logcatWebsocketListener;
104
105
  _bidiServerLogListener;
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
@@ -87,9 +87,11 @@ export async function mobileStartMediaStream(
87
87
  }
88
88
  }
89
89
  const streams = (this._mediaStreams ??= new Map());
90
+ const ended = (this._endedMediaStreamIds ??= new Set());
90
91
  for (const [id, s] of streams) {
91
92
  if (s.isStopped) {
92
93
  streams.delete(id);
94
+ ended.add(id);
93
95
  }
94
96
  }
95
97
  if ([...streams.values()].some((s) => s.kind === kind)) {
@@ -108,7 +110,7 @@ export async function mobileStartMediaStream(
108
110
  emitter: this.eventEmitter,
109
111
  hasSubscribers: () => hasSubscribers(this, MEDIA_UNITS_EVENT),
110
112
  log: this.log,
111
- // Ended streams stay registered so that a later stop call is a no-op, see mobileStopMediaStream
113
+ // Ended streams are moved to the ended ids on the next start, see mobileStopMediaStream
112
114
  onEnded: () => {},
113
115
  });
114
116
  streams.set(stream.streamId, stream);
@@ -132,16 +134,17 @@ export async function mobileGetMediaStreamCapabilities(this: AndroidDriver): Pro
132
134
 
133
135
  /**
134
136
  * Stops a media stream started by `mobile: startMediaStream`.
135
- * Stopping a stream that has already ended is a no-op.
137
+ * Stopping a stream that has already ended is a no-op, also after other streams were started.
136
138
  *
137
139
  * @param streamId The id returned by `mobile: startMediaStream`.
138
140
  */
139
141
  export async function mobileStopMediaStream(this: AndroidDriver, streamId: string): Promise<void> {
140
142
  const stream = this._mediaStreams?.get(streamId);
141
- if (!stream) {
143
+ if (stream) {
144
+ await stream.stop();
145
+ } else if (!this._endedMediaStreamIds?.has(streamId)) {
142
146
  throw new errors.InvalidArgumentError(`Unknown media stream id '${streamId}'`);
143
147
  }
144
- await stream.stop();
145
148
  }
146
149
 
147
150
  /** Stops all streams of the session; used on session deletion. */
@@ -266,6 +266,7 @@ class AndroidDriver<C extends AndroidDriverConstraints = AndroidDriverConstraint
266
266
  _cachedActivityArgs: StringRecord;
267
267
  _screenStreamingProps?: ScreenStreamingProps;
268
268
  _mediaStreams?: Map<string, MediaStream>;
269
+ _endedMediaStreamIds?: Set<string>;
269
270
  _screenRecordingProperties?: ScreenRecordingProperties;
270
271
  _logcatWebsocketListener?: LogcatListener;
271
272
  _bidiServerLogListener?: (...args: any[]) => void;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "15.2.1",
3
+ "version": "15.2.2",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "android",
@@ -77,5 +77,5 @@
77
77
  "node": "^22.22.2 || ^24.15.0 || >=26.0.0",
78
78
  "npm": ">=10"
79
79
  },
80
- "gitHead": "1ed74a8c70292f680afd879e20c1f4c46fb1de61"
80
+ "gitHead": "bb346d07e98f1ba3e975e2746422882f287db633"
81
81
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "10.1.0",
3
+ "version": "10.2.0",
4
4
  "description": "Espresso integration for Appium",
5
5
  "keywords": [
6
6
  "android",
@@ -55,7 +55,7 @@
55
55
  },
56
56
  "dependencies": {
57
57
  "appium-adb": "17.0.3",
58
- "appium-android-driver": "15.2.1",
58
+ "appium-android-driver": "15.2.2",
59
59
  "asyncbox": "6.6.1",
60
60
  "axios": "1.21.1",
61
61
  "commander": "15.1.0",