appium-espresso-driver 9.3.9 → 9.3.10

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 (46) 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/library/src/main/java/io/appium/espressoserver/lib/handlers/WebAtoms.kt +6 -6
  9. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  10. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/GetClipboardParams.kt +1 -1
  11. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/KeyEventParams.kt +16 -4
  12. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/MobileBackdoorMethod.kt +9 -1
  13. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/MobileBackdoorParams.kt +8 -5
  14. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/MotionEventParams.kt +25 -4
  15. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/MoveToParams.kt +10 -3
  16. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/MultiTouchActionsParams.kt +8 -2
  17. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/ScrollToPageParams.kt +5 -1
  18. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/SetClipboardParams.kt +1 -1
  19. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/SettingsParams.kt +9 -1
  20. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/ToastLookupParams.kt +12 -3
  21. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/ViewFlashParams.kt +14 -5
  22. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/web/WebAtomsParams.kt +13 -4
  23. package/espresso-server/library/src/test/java/io/appium/espressoserver/test/model/GsonDefaultValueTest.kt +119 -0
  24. package/node_modules/appium-adb/CHANGELOG.md +14 -0
  25. package/node_modules/appium-adb/build/lib/tools/aab-utils.js +1 -1
  26. package/node_modules/appium-adb/build/lib/tools/aab-utils.js.map +1 -1
  27. package/node_modules/appium-adb/build/lib/tools/apks-utils.js +1 -1
  28. package/node_modules/appium-adb/build/lib/tools/apks-utils.js.map +1 -1
  29. package/node_modules/appium-adb/build/lib/tools/lockmgmt.d.ts +8 -0
  30. package/node_modules/appium-adb/build/lib/tools/lockmgmt.d.ts.map +1 -1
  31. package/node_modules/appium-adb/build/lib/tools/lockmgmt.js +15 -14
  32. package/node_modules/appium-adb/build/lib/tools/lockmgmt.js.map +1 -1
  33. package/node_modules/appium-adb/lib/tools/aab-utils.ts +1 -1
  34. package/node_modules/appium-adb/lib/tools/apks-utils.ts +1 -1
  35. package/node_modules/appium-adb/lib/tools/lockmgmt.ts +16 -17
  36. package/node_modules/appium-adb/package.json +4 -6
  37. package/node_modules/appium-chromedriver/CHANGELOG.md +22 -0
  38. package/node_modules/appium-chromedriver/config/mapping.json +1 -0
  39. package/node_modules/appium-chromedriver/package.json +4 -4
  40. package/node_modules/io.appium.settings/CHANGELOG.md +15 -0
  41. package/node_modules/io.appium.settings/README.md +8 -7
  42. package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
  43. package/node_modules/io.appium.settings/package.json +4 -4
  44. package/node_modules/xpath/package.json +1 -1
  45. package/node_modules/xpath/xpath.d.ts +59 -0
  46. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## [9.3.10](https://github.com/appium/appium-espresso-driver/compare/v9.3.9...v9.3.10) (2026-10-28)
2
+
3
+ ### Bug Fixes
4
+
5
+ * preserve Kotlin default values during Gson deserialization ([#1235](https://github.com/appium/appium-espresso-driver/issues/1235)) ([b781a12](https://github.com/appium/appium-espresso-driver/commit/b781a12c3883d70ff1ed85e42fa9db053ea4933f))
6
+
1
7
  ## [9.3.9](https://github.com/appium/appium-espresso-driver/compare/v9.3.8...v9.3.9) (2026-10-28)
2
8
 
3
9
  ### Bug Fixes
@@ -1,2 +1,2 @@
1
- #Wed Oct 28 06:02:45 UTC 2026
1
+ #Wed Oct 28 09:12:15 UTC 2026
2
2
  gradle.version=9.7.1
@@ -38,12 +38,12 @@ class WebAtoms : RequestHandler<WebAtomsParams, Any?> {
38
38
  // TODO: Add a 'waitForDocument' feature to wait for HTML DOCUMENT to be ready
39
39
 
40
40
  // Initialize onWebView with web view matcher (if webviewEl provided)
41
- params.webviewEl.let { webviewEl ->
42
- AndroidLogger.info("Initializing webView interaction on webview with the element")
43
- val viewState = EspressoElement.getCachedViewStateById(webviewEl)
44
- val matcher = withView(viewState.view)
45
- webViewInteraction = onWebView(matcher)
46
- }
41
+ val webviewEl = params.webviewEl
42
+ ?: throw InvalidArgumentException("'webviewEl' must be provided")
43
+ AndroidLogger.info("Initializing webView interaction on webview with the element")
44
+ val viewState = EspressoElement.getCachedViewStateById(webviewEl)
45
+ val matcher = withView(viewState.view)
46
+ webViewInteraction = onWebView(matcher)
47
47
 
48
48
  // Set forceJavascript enabled if provided
49
49
  if (params.forceJavascriptEnabled) {
@@ -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 = "9.3.9"
5
+ private const val VERSION = "9.3.10"
6
6
 
7
7
  fun getEspressoServerVersion() = VERSION
@@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName
20
20
 
21
21
  data class GetClipboardParams(
22
22
  @SerializedName("contentType")
23
- private val _contentType: String?
23
+ private val _contentType: String? = null
24
24
  ) : AppiumParams() {
25
25
  val contentType : ClipboardDataType
26
26
  get() = _contentType?.toClipboardDataType() ?: ClipboardDataType.PLAINTEXT
@@ -16,8 +16,20 @@
16
16
 
17
17
  package io.appium.espressoserver.lib.model
18
18
 
19
+ import com.google.gson.annotations.SerializedName
20
+
19
21
  data class KeyEventParams(
20
- val keycode: Int = 0,
21
- val metastate: Int = 0,
22
- val flags: Int = 0
23
- ) : AppiumParams()
22
+ @SerializedName("keycode")
23
+ private val _keycode: Int? = null,
24
+ @SerializedName("metastate")
25
+ private val _metastate: Int? = null,
26
+ @SerializedName("flags")
27
+ private val _flags: Int? = null
28
+ ) : AppiumParams() {
29
+ val keycode: Int
30
+ get() = _keycode ?: 0
31
+ val metastate: Int
32
+ get() = _metastate ?: 0
33
+ val flags: Int
34
+ get() = _flags ?: 0
35
+ }
@@ -1,11 +1,19 @@
1
1
  package io.appium.espressoserver.lib.model
2
2
 
3
+ import com.google.gson.annotations.SerializedName
3
4
  import io.appium.espressoserver.lib.helpers.BackdoorUtils
4
5
 
5
6
  data class MobileBackdoorMethod (
6
7
  var name: String? = null,
7
- var args: List<BackdoorMethodArg> = emptyList()
8
+ @SerializedName("args")
9
+ private var _args: List<BackdoorMethodArg>? = null
8
10
  ) {
11
+ var args: List<BackdoorMethodArg>
12
+ get() = _args ?: emptyList()
13
+ set(value) {
14
+ _args = value
15
+ }
16
+
9
17
  val argumentTypes: Array<Class<*>?>
10
18
  get() {
11
19
  return args.indices.map {
@@ -12,9 +12,12 @@ enum class InvocationTarget {
12
12
  }
13
13
 
14
14
  data class MobileBackdoorParams(
15
- val target: InvocationTarget? = null,
16
- var targetElement: String? = null,
17
- val methods: List<MobileBackdoorMethod> = emptyList()
18
-
19
- ) : AppiumParams()
15
+ val target: InvocationTarget? = null,
16
+ var targetElement: String? = null,
17
+ @SerializedName("methods")
18
+ private val _methods: List<MobileBackdoorMethod>? = null
19
+ ) : AppiumParams() {
20
+ val methods: List<MobileBackdoorMethod>
21
+ get() = _methods ?: emptyList()
22
+ }
20
23
 
@@ -23,14 +23,35 @@ fun Int.toAndroidButtonState(): Int {
23
23
 
24
24
  data class MotionEventParams(
25
25
  @SerializedName("element", alternate = [W3C_ELEMENT_KEY])
26
- val targetElement: String?,
27
- var x: Long = 0,
28
- var y: Long = 0,
29
- var button: Int = MOUSE_LEFT
26
+ val targetElement: String? = null,
27
+ @SerializedName("x")
28
+ private var _x: Long? = null,
29
+ @SerializedName("y")
30
+ private var _y: Long? = null,
31
+ @SerializedName("button")
32
+ private var _button: Int? = null
30
33
  ) : AppiumParams() {
31
34
 
32
35
  constructor(x: Long, y: Long) : this(null, x, y)
33
36
 
37
+ var x: Long
38
+ get() = _x ?: 0L
39
+ set(value) {
40
+ _x = value
41
+ }
42
+
43
+ var y: Long
44
+ get() = _y ?: 0L
45
+ set(value) {
46
+ _y = value
47
+ }
48
+
49
+ var button: Int
50
+ get() = _button ?: MOUSE_LEFT
51
+ set(value) {
52
+ _button = value
53
+ }
54
+
34
55
  val androidButtonState: Int
35
56
  @Throws(InvalidArgumentException::class)
36
57
  get() = this.button.toAndroidButtonState()
@@ -21,6 +21,13 @@ import com.google.gson.annotations.SerializedName
21
21
  data class MoveToParams(
22
22
  @SerializedName("element", alternate = [W3C_ELEMENT_KEY])
23
23
  val elementToMoveTo: String? = null,
24
- val xOffset: Int = 0,
25
- val yOffset: Int = 0
26
- ) : AppiumParams()
24
+ @SerializedName("xOffset")
25
+ private val _xOffset: Int? = null,
26
+ @SerializedName("yOffset")
27
+ private val _yOffset: Int? = null
28
+ ) : AppiumParams() {
29
+ val xOffset: Int
30
+ get() = _xOffset ?: 0
31
+ val yOffset: Int
32
+ get() = _yOffset ?: 0
33
+ }
@@ -1,5 +1,11 @@
1
1
  package io.appium.espressoserver.lib.model
2
2
 
3
+ import com.google.gson.annotations.SerializedName
4
+
3
5
  data class MultiTouchActionsParams(
4
- val actions: List<List<TouchAction>> = emptyList()
5
- ) : AppiumParams()
6
+ @SerializedName("actions")
7
+ private val _actions: List<List<TouchAction>>? = null
8
+ ) : AppiumParams() {
9
+ val actions: List<List<TouchAction>>
10
+ get() = _actions ?: emptyList()
11
+ }
@@ -21,8 +21,12 @@ import com.google.gson.annotations.SerializedName
21
21
  data class ScrollToPageParams(
22
22
  var scrollTo: ScrollTo? = null,
23
23
  var scrollToPage: Int? = null,
24
- val smoothScroll: Boolean = false
24
+ @SerializedName("smoothScroll")
25
+ private val _smoothScroll: Boolean? = null
25
26
  ) : AppiumParams() {
27
+ val smoothScroll: Boolean
28
+ get() = _smoothScroll ?: false
29
+
26
30
  enum class ScrollTo {
27
31
  @SerializedName("first")
28
32
  FIRST,
@@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName
20
20
 
21
21
  data class SetClipboardParams(
22
22
  @SerializedName("contentType")
23
- private val _contentType: String?,
23
+ private val _contentType: String? = null,
24
24
  val content: String? = null,
25
25
  val label: String? = null
26
26
  ) : AppiumParams() {
@@ -16,4 +16,12 @@
16
16
 
17
17
  package io.appium.espressoserver.lib.model
18
18
 
19
- data class SettingsParams(val settings: Map<String, Any?> = emptyMap()) : AppiumParams()
19
+ import com.google.gson.annotations.SerializedName
20
+
21
+ data class SettingsParams(
22
+ @SerializedName("settings")
23
+ private val _settings: Map<String, Any?>? = null
24
+ ) : AppiumParams() {
25
+ val settings: Map<String, Any?>
26
+ get() = _settings ?: emptyMap()
27
+ }
@@ -16,7 +16,16 @@
16
16
 
17
17
  package io.appium.espressoserver.lib.model
18
18
 
19
+ import com.google.gson.annotations.SerializedName
20
+
19
21
  data class ToastLookupParams(
20
- val text: String = "",
21
- val isRegexp: Boolean = false
22
- ) : AppiumParams()
22
+ @SerializedName("text")
23
+ private val _text: String? = null,
24
+ @SerializedName("isRegexp")
25
+ private val _isRegexp: Boolean? = null
26
+ ) : AppiumParams() {
27
+ val text: String
28
+ get() = _text ?: ""
29
+ val isRegexp: Boolean
30
+ get() = _isRegexp ?: false
31
+ }
@@ -1,9 +1,18 @@
1
1
  package io.appium.espressoserver.lib.model
2
2
 
3
- val DURATION_MILLIS = 30
4
- val REPEAT_COUNT = 15
3
+ import com.google.gson.annotations.SerializedName
4
+
5
+ const val DURATION_MILLIS = 30
6
+ const val REPEAT_COUNT = 15
5
7
 
6
8
  data class ViewFlashParams(
7
- val durationMillis: Int = DURATION_MILLIS,
8
- val repeatCount: Int = REPEAT_COUNT
9
- ) : AppiumParams()
9
+ @SerializedName("durationMillis")
10
+ private val _durationMillis: Int? = null,
11
+ @SerializedName("repeatCount")
12
+ private val _repeatCount: Int? = null
13
+ ) : AppiumParams() {
14
+ val durationMillis: Int
15
+ get() = _durationMillis ?: DURATION_MILLIS
16
+ val repeatCount: Int
17
+ get() = _repeatCount ?: REPEAT_COUNT
18
+ }
@@ -1,9 +1,18 @@
1
1
  package io.appium.espressoserver.lib.model.web
2
2
 
3
+ import com.google.gson.annotations.SerializedName
3
4
  import io.appium.espressoserver.lib.model.AppiumParams
4
5
 
5
6
  data class WebAtomsParams(
6
- val webviewEl: String,
7
- val forceJavascriptEnabled: Boolean,
8
- val methodChain: List<WebAtomsMethod> = emptyList()
9
- ) : AppiumParams()
7
+ val webviewEl: String? = null,
8
+ @SerializedName("forceJavascriptEnabled")
9
+ private val _forceJavascriptEnabled: Boolean? = null,
10
+ @SerializedName("methodChain")
11
+ private val _methodChain: List<WebAtomsMethod>? = null
12
+ ) : AppiumParams() {
13
+ val forceJavascriptEnabled: Boolean
14
+ get() = _forceJavascriptEnabled ?: false
15
+
16
+ val methodChain: List<WebAtomsMethod>
17
+ get() = _methodChain ?: emptyList()
18
+ }
@@ -0,0 +1,119 @@
1
+ package io.appium.espressoserver.test.model
2
+
3
+ import com.google.gson.Gson
4
+ import io.appium.espressoserver.lib.model.ClipboardDataType
5
+ import io.appium.espressoserver.lib.model.DURATION_MILLIS
6
+ import io.appium.espressoserver.lib.model.GetClipboardParams
7
+ import io.appium.espressoserver.lib.model.KeyEventParams
8
+ import io.appium.espressoserver.lib.model.MOUSE_LEFT
9
+ import io.appium.espressoserver.lib.model.MobileBackdoorMethod
10
+ import io.appium.espressoserver.lib.model.MobileBackdoorParams
11
+ import io.appium.espressoserver.lib.model.MotionEventParams
12
+ import io.appium.espressoserver.lib.model.MoveToParams
13
+ import io.appium.espressoserver.lib.model.MultiTouchActionsParams
14
+ import io.appium.espressoserver.lib.model.REPEAT_COUNT
15
+ import io.appium.espressoserver.lib.model.ScrollToPageParams
16
+ import io.appium.espressoserver.lib.model.SetClipboardParams
17
+ import io.appium.espressoserver.lib.model.SettingsParams
18
+ import io.appium.espressoserver.lib.model.ToastLookupParams
19
+ import io.appium.espressoserver.lib.model.ViewFlashParams
20
+ import io.appium.espressoserver.lib.model.web.WebAtomsParams
21
+ import org.junit.Test
22
+ import kotlin.test.assertEquals
23
+ import kotlin.test.assertNull
24
+ import kotlin.test.assertTrue
25
+
26
+ class GsonDefaultValueTest {
27
+ private val gson = Gson()
28
+
29
+ @Test
30
+ fun `should use default values for GetClipboardParams and SetClipboardParams`() {
31
+ val getClipboard = gson.fromJson("{}", GetClipboardParams::class.java)
32
+ assertEquals(ClipboardDataType.PLAINTEXT, getClipboard.contentType)
33
+
34
+ val setClipboard = gson.fromJson("""{"content": "abc", "contentType": null}""", SetClipboardParams::class.java)
35
+ assertEquals(ClipboardDataType.PLAINTEXT, setClipboard.contentType)
36
+ assertEquals("abc", setClipboard.content)
37
+ }
38
+
39
+ @Test
40
+ fun `should use default values for ViewFlashParams when omitted or null`() {
41
+ val emptyParams = gson.fromJson("{}", ViewFlashParams::class.java)
42
+ assertEquals(DURATION_MILLIS, emptyParams.durationMillis)
43
+ assertEquals(REPEAT_COUNT, emptyParams.repeatCount)
44
+
45
+ val nullParams = gson.fromJson("""{"durationMillis": null, "repeatCount": null}""", ViewFlashParams::class.java)
46
+ assertEquals(DURATION_MILLIS, nullParams.durationMillis)
47
+ assertEquals(REPEAT_COUNT, nullParams.repeatCount)
48
+ }
49
+
50
+ @Test
51
+ fun `should use default values for ToastLookupParams when omitted or null`() {
52
+ val emptyParams = gson.fromJson("{}", ToastLookupParams::class.java)
53
+ assertEquals("", emptyParams.text)
54
+ assertEquals(false, emptyParams.isRegexp)
55
+
56
+ val nullParams = gson.fromJson("""{"text": null, "isRegexp": null}""", ToastLookupParams::class.java)
57
+ assertEquals("", nullParams.text)
58
+ assertEquals(false, nullParams.isRegexp)
59
+ }
60
+
61
+ @Test
62
+ fun `should use default values for ScrollToPageParams when omitted or null`() {
63
+ val emptyParams = gson.fromJson("{}", ScrollToPageParams::class.java)
64
+ assertEquals(false, emptyParams.smoothScroll)
65
+
66
+ val nullParams = gson.fromJson("""{"smoothScroll": null}""", ScrollToPageParams::class.java)
67
+ assertEquals(false, nullParams.smoothScroll)
68
+ }
69
+
70
+ @Test
71
+ fun `should use default values for MotionEventParams when omitted or null`() {
72
+ val emptyParams = gson.fromJson("{}", MotionEventParams::class.java)
73
+ assertEquals(0L, emptyParams.x)
74
+ assertEquals(0L, emptyParams.y)
75
+ assertEquals(MOUSE_LEFT, emptyParams.button)
76
+
77
+ val nullParams = gson.fromJson("""{"x": null, "y": null, "button": null}""", MotionEventParams::class.java)
78
+ assertEquals(0L, nullParams.x)
79
+ assertEquals(0L, nullParams.y)
80
+ assertEquals(MOUSE_LEFT, nullParams.button)
81
+ }
82
+
83
+ @Test
84
+ fun `should use default values for MoveToParams and KeyEventParams`() {
85
+ val moveTo = gson.fromJson("""{"xOffset": null, "yOffset": null}""", MoveToParams::class.java)
86
+ assertEquals(0, moveTo.xOffset)
87
+ assertEquals(0, moveTo.yOffset)
88
+
89
+ val keyEvent = gson.fromJson("""{"keycode": null, "metastate": null, "flags": null}""", KeyEventParams::class.java)
90
+ assertEquals(0, keyEvent.keycode)
91
+ assertEquals(0, keyEvent.metastate)
92
+ assertEquals(0, keyEvent.flags)
93
+ }
94
+
95
+ @Test
96
+ fun `should use default collections when omitted or null`() {
97
+ val backdoorMethod = gson.fromJson("""{"name": "test", "args": null}""", MobileBackdoorMethod::class.java)
98
+ assertTrue(backdoorMethod.args.isEmpty())
99
+
100
+ val backdoorParams = gson.fromJson("""{"target": "activity", "methods": null}""", MobileBackdoorParams::class.java)
101
+ assertTrue(backdoorParams.methods.isEmpty())
102
+
103
+ val multiTouchParams = gson.fromJson("""{"actions": null}""", MultiTouchActionsParams::class.java)
104
+ assertTrue(multiTouchParams.actions.isEmpty())
105
+
106
+ val settingsParams = gson.fromJson("""{"settings": null}""", SettingsParams::class.java)
107
+ assertTrue(settingsParams.settings.isEmpty())
108
+
109
+ val webAtomsParams = gson.fromJson("""{"webviewEl": "abc", "forceJavascriptEnabled": true}""", WebAtomsParams::class.java)
110
+ assertEquals("abc", webAtomsParams.webviewEl)
111
+ assertEquals(true, webAtomsParams.forceJavascriptEnabled)
112
+ assertTrue(webAtomsParams.methodChain.isEmpty())
113
+
114
+ val emptyWebAtomsParams = gson.fromJson("{}", WebAtomsParams::class.java)
115
+ assertNull(emptyWebAtomsParams.webviewEl)
116
+ assertEquals(false, emptyWebAtomsParams.forceJavascriptEnabled)
117
+ assertTrue(emptyWebAtomsParams.methodChain.isEmpty())
118
+ }
119
+ }
@@ -3,6 +3,20 @@
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
+ ## [16.1.2](https://github.com/appium/appium-android/compare/appium-adb@16.1.1...appium-adb@16.1.2) (2026-10-28)
7
+
8
+ ### Bug Fixes
9
+
10
+ * **adb:** check all displays for mScreenOnFully in dumpsys window ([#58](https://github.com/appium/appium-android/issues/58)) ([eb46956](https://github.com/appium/appium-android/commit/eb46956794348ceb8d12dacc220fc375e982223b))
11
+
12
+
13
+ ## [16.1.1](https://github.com/appium/appium-android/compare/appium-adb@16.1.0...appium-adb@16.1.1) (2026-10-23)
14
+
15
+ ### Bug Fixes
16
+
17
+ * **adb:** use AsyncLock from asyncbox instead of async-lock ([#45](https://github.com/appium/appium-android/issues/45)) ([fe41904](https://github.com/appium/appium-android/commit/fe4190403e1bc3f66a2ead346caf7eb16002626b))
18
+
19
+
6
20
  ## 16.1.0 (2026-10-02)
7
21
 
8
22
  ### Features
@@ -1,7 +1,7 @@
1
1
  import crypto from 'node:crypto';
2
2
  import path from 'node:path';
3
3
  import { fs, tempDir, util } from '@appium/support';
4
- import AsyncLock from 'async-lock';
4
+ import { AsyncLock } from 'asyncbox';
5
5
  import { LRUCache } from 'lru-cache';
6
6
  import { log } from '../logger.js';
7
7
  import { unzipFile } from '../utils/index.js';
@@ -1 +1 @@
1
- {"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"aab-utils.js","sourceRoot":"","sources":["../../../lib/tools/aab-utils.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import path from 'node:path';
2
2
  import { fs, tempDir, util } from '@appium/support';
3
- import AsyncLock from 'async-lock';
3
+ import { AsyncLock } from 'asyncbox';
4
4
  import { LRUCache } from 'lru-cache';
5
5
  import { exec } from 'teen_process';
6
6
  import { log } from '../logger.js';
@@ -1 +1 @@
1
- {"version":3,"file":"apks-utils.js","sourceRoot":"","sources":["../../../lib/tools/apks-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apks-utils.js","sourceRoot":"","sources":["../../../lib/tools/apks-utils.ts"],"names":[],"mappings":"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"}
@@ -102,4 +102,12 @@ export declare function isShowingLockscreen(dumpsys: string): boolean;
102
102
  * @return True if lock screen is showing.
103
103
  */
104
104
  export declare function isScreenStateOff(dumpsys: string): boolean;
105
+ /**
106
+ * Checks mScreenOnFully in dumpsys output to determine if screen is showing.
107
+ * Default is true.
108
+ *
109
+ * @param dumpsys - The output of dumpsys window command.
110
+ * @return True if screen is showing.
111
+ */
112
+ export declare function isScreenOnFully(dumpsys: string): boolean;
105
113
  //# sourceMappingURL=lockmgmt.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"lockmgmt.d.ts","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAUnC;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAM3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAuBxG;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBpG;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAoB/D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAYhE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB9D;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1D;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAM5D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD"}
1
+ {"version":3,"file":"lockmgmt.d.ts","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAUnC;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAM3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAuBxG;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBpG;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAoB/D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,GAAG,EACT,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAYhE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB9D;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1D;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBnD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAM5D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAOxD"}
@@ -248,6 +248,21 @@ export function isShowingLockscreen(dumpsys) {
248
248
  export function isScreenStateOff(dumpsys) {
249
249
  return /\s+screenState=SCREEN_STATE_OFF/i.test(dumpsys);
250
250
  }
251
+ /**
252
+ * Checks mScreenOnFully in dumpsys output to determine if screen is showing.
253
+ * Default is true.
254
+ *
255
+ * @param dumpsys - The output of dumpsys window command.
256
+ * @return True if screen is showing.
257
+ */
258
+ export function isScreenOnFully(dumpsys) {
259
+ const matches = dumpsys.match(/mScreenOnFully=\w+/gi);
260
+ if (!matches) {
261
+ // if information is missing we assume screen is fully on
262
+ return true;
263
+ }
264
+ return matches.some((m) => m.split('=')[1]?.toLowerCase() === 'true');
265
+ }
251
266
  // #region Private functions
252
267
  /**
253
268
  * @param verb
@@ -283,20 +298,6 @@ async function swipeUp(windowDumpsys) {
283
298
  const y1 = displayHeight / 5;
284
299
  await this.shell(['input', 'touchscreen', 'swipe', ...[x0, y0, x1, y1].map((c) => `${Math.trunc(c)}`)]);
285
300
  }
286
- /**
287
- * Checks mScreenOnFully in dumpsys output to determine if screen is showing
288
- * Default is true.
289
- * Note: this key
290
- *
291
- * @param dumpsys
292
- * @returns
293
- */
294
- function isScreenOnFully(dumpsys) {
295
- const m = /mScreenOnFully=\w+/gi.exec(dumpsys);
296
- return (!m || // if information is missing we assume screen is fully on
297
- (m && m.length > 0 && m[0].split('=')[1] === 'true') ||
298
- false);
299
- }
300
301
  /**
301
302
  * Checks mCurrentFocus in dumpsys output to determine if Keyguard is activated
302
303
  *
@@ -1 +1 @@
1
- {"version":3,"file":"lockmgmt.js","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lockmgmt.js","sourceRoot":"","sources":["../../../lib/tools/lockmgmt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,KAAK,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAGjD,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AAEjC,MAAM,wCAAwC,GAAG,mCAAmC,CAAC;AACrF,MAAM,8BAA8B,GAAG,cAAc,CAAC;AACtD,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AACvE,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,MAAM,cAAc,GAAG,GAAG,CAAC,CAAC,0BAA0B;AACtD,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,IAAI,OAAO,IAAI,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;QACzD,IAAI,CAAC,0BAA0B,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACnE,GAAG,CAAC,KAAK,CAAC,wCAAwC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,CAAC;IAC9G,CAAC;IACD,OAAO,IAAI,CAAC,0BAAqC,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAY,aAA4B,IAAI;IACpF,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;YAC5E,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;SAC3C,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,wCAAwC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5G,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,8CAA8C;YAC5C,mBACG,CAAgD,CAAC,MAAM;gBACvD,CAAgD,CAAC,MAAM;gBACvD,CAAW,CAAC,OACf,EAAE,EACJ,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAY,aAA4B,IAAI;IACnF,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE;YAC3E,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtG,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,uCAAuC;YACrC,mBACG,CAAgD,CAAC,MAAM;gBACvD,CAAgD,CAAC,MAAM;gBACvD,CAAW,CAAC,OACf,EAAE,EACJ,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;YACtE,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;SAC3C,CAAC,CAAC;QACH,IACE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;YACxB,CAAC,8BAA8B,EAAE,wCAAwC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACpF,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAChC,EACD,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,2DAA4D,CAAW,CAAC,OAAO,EAAE,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;IACjH,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAErC,cAAsB,EACtB,UAAkB,EAClB,gBAA+B,IAAI;IAEnC,IAAI,CAAC,+BAA+B,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CACb,gCAAgC,cAAc,gBAAgB;YAC5D,sDAAsD,+BAA+B,EAAE,CAC1F,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,cAAc,EAAE,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC7E,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;YAC7C,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,0BAA0B,cAAc,sBAAsB;YAC5D,mBACG,CAAgD,CAAC,MAAM;gBACvD,CAAgD,CAAC,MAAM;gBACvD,CAAW,CAAC,OACf,EAAE,EACJ,EAAC,KAAK,EAAE,CAAC,EAAC,CACX,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KACjC,CAAC,CAAC;IACH,OAAO,CACL,mBAAmB,CAAC,YAAY,CAAC;QACjC,wBAAwB,CAAC,YAAY,CAAC;QACtC,CAAC,eAAe,CAAC,YAAY,CAAC;QAC9B,cAAc,CAAC,WAAW,CAAC;QAC3B,gBAAgB,CAAC,YAAY,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,GAAG,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IACzD,uEAAuE;IACvE,4CAA4C;IAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAEzB,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC;QACpC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAChD,IAAI,MAAM,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QAC9B,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACvC,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAC3D,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACnC,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI;IACxB,IAAI,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAChC,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACtD,OAAO;IACT,CAAC;IACD,GAAG,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;IAC9D,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAExB,MAAM,SAAS,GAAG,IAAI,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE;YAC9D,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,+CAA+C,SAAS,YAAY,CAAC,CAAC;IACxF,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,OAAO,CACL,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxF,iGAAiG;QACjG,CAAC,4CAA4C,EAAE,0BAA0B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CACzG,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,kCAAkC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACtD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,yDAAyD;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC;AACxE,CAAC;AAED,4BAA4B;AAE5B;;;;GAIG;AACH,SAAS,YAAY,CAAC,IAAY,EAAE,gBAA+B,IAAI,EAAE,GAAG,IAAc;IACxF,MAAM,GAAG,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACnC,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,aAAa,EAAE,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,OAAO,CAAY,aAAqB;IACrD,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/D,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACvD,MAAM,EAAE,GAAG,YAAY,GAAG,CAAC,CAAC;IAC5B,MAAM,EAAE,GAAG,CAAC,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,MAAM,EAAE,GAAG,aAAa,GAAG,CAAC,CAAC;IAC7B,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC1G,CAAC;AAED;;;;;GAKG;AACH,SAAS,wBAAwB,CAAC,OAAe;IAC/C,MAAM,CAAC,GAAG,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAe;IACrC,+DAA+D;IAC/D,uDAAuD;IACvD,OAAO,oCAAoC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC5D,CAAC;AAED,aAAa"}
@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
2
2
  import path from 'node:path';
3
3
 
4
4
  import {fs, tempDir, util} from '@appium/support';
5
- import AsyncLock from 'async-lock';
5
+ import {AsyncLock} from 'asyncbox';
6
6
  import {LRUCache} from 'lru-cache';
7
7
 
8
8
  import type {ADB} from '../adb.js';
@@ -1,7 +1,7 @@
1
1
  import path from 'node:path';
2
2
 
3
3
  import {fs, tempDir, util} from '@appium/support';
4
- import AsyncLock from 'async-lock';
4
+ import {AsyncLock} from 'asyncbox';
5
5
  import {LRUCache} from 'lru-cache';
6
6
  import {exec} from 'teen_process';
7
7
 
@@ -292,6 +292,22 @@ export function isScreenStateOff(dumpsys: string): boolean {
292
292
  return /\s+screenState=SCREEN_STATE_OFF/i.test(dumpsys);
293
293
  }
294
294
 
295
+ /**
296
+ * Checks mScreenOnFully in dumpsys output to determine if screen is showing.
297
+ * Default is true.
298
+ *
299
+ * @param dumpsys - The output of dumpsys window command.
300
+ * @return True if screen is showing.
301
+ */
302
+ export function isScreenOnFully(dumpsys: string): boolean {
303
+ const matches = dumpsys.match(/mScreenOnFully=\w+/gi);
304
+ if (!matches) {
305
+ // if information is missing we assume screen is fully on
306
+ return true;
307
+ }
308
+ return matches.some((m) => m.split('=')[1]?.toLowerCase() === 'true');
309
+ }
310
+
295
311
  // #region Private functions
296
312
 
297
313
  /**
@@ -330,23 +346,6 @@ async function swipeUp(this: ADB, windowDumpsys: string): Promise<void> {
330
346
  await this.shell(['input', 'touchscreen', 'swipe', ...[x0, y0, x1, y1].map((c) => `${Math.trunc(c)}`)]);
331
347
  }
332
348
 
333
- /**
334
- * Checks mScreenOnFully in dumpsys output to determine if screen is showing
335
- * Default is true.
336
- * Note: this key
337
- *
338
- * @param dumpsys
339
- * @returns
340
- */
341
- function isScreenOnFully(dumpsys: string): boolean {
342
- const m = /mScreenOnFully=\w+/gi.exec(dumpsys);
343
- return (
344
- !m || // if information is missing we assume screen is fully on
345
- (m && m.length > 0 && m[0].split('=')[1] === 'true') ||
346
- false
347
- );
348
- }
349
-
350
349
  /**
351
350
  * Checks mCurrentFocus in dumpsys output to determine if Keyguard is activated
352
351
  *
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-adb",
3
- "version": "16.1.0",
3
+ "version": "16.1.2",
4
4
  "description": "Android Debug Bridge interface",
5
5
  "homepage": "https://appium.io",
6
6
  "bugs": {
@@ -45,8 +45,7 @@
45
45
  },
46
46
  "dependencies": {
47
47
  "@appium/support": "^7.2.6",
48
- "async-lock": "^1.0.0",
49
- "asyncbox": "^6.4.3",
48
+ "asyncbox": "^6.5.0",
50
49
  "ini": "^6.0.0",
51
50
  "lru-cache": "^11.1.0",
52
51
  "semver": "^7.0.0",
@@ -55,9 +54,8 @@
55
54
  "devDependencies": {
56
55
  "@appium/tsconfig": "^1.2.0",
57
56
  "@appium/types": "^1.0.0-rc.1",
58
- "@types/async-lock": "^1.4.0",
59
57
  "@types/ini": "^4.1.0",
60
- "@types/node": "^26.0.0",
58
+ "@types/node": "^26.6.5",
61
59
  "@types/semver": "^7.5.0",
62
60
  "@types/sinon": "^22.0.0",
63
61
  "sinon": "^22.0.0"
@@ -66,5 +64,5 @@
66
64
  "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
67
65
  "npm": ">=10"
68
66
  },
69
- "gitHead": "37091b4bc7fc9b9c9c59ad2c4945f3b7a994abfd"
67
+ "gitHead": "dd7fac6576be570d54de8ff2874b88426b4446dd"
70
68
  }
@@ -3,6 +3,28 @@
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
+ ## [9.1.9](https://github.com/appium/appium-android/compare/appium-chromedriver@9.1.8...appium-chromedriver@9.1.9) (2026-10-28)
7
+
8
+ **Note:** Version bump only for package appium-chromedriver
9
+
10
+
11
+
12
+
13
+
14
+ ## [9.1.8](https://github.com/appium/appium-android/compare/appium-chromedriver@9.1.7...appium-chromedriver@9.1.8) (2026-10-28)
15
+
16
+ ### Miscellaneous Chores
17
+
18
+ * **chromedriver:** ChromeDriver Bump to v156.0.8078.73 ([#57](https://github.com/appium/appium-android/issues/57)) ([229c7dd](https://github.com/appium/appium-android/commit/229c7ddb99bca6663d068d3c104ecaef21dd967a))
19
+
20
+
21
+ ## [9.1.7](https://github.com/appium/appium-android/compare/appium-chromedriver@9.1.6...appium-chromedriver@9.1.7) (2026-10-23)
22
+
23
+ ### Bug Fixes
24
+
25
+ * **adb:** use AsyncLock from asyncbox instead of async-lock ([#45](https://github.com/appium/appium-android/issues/45)) ([fe41904](https://github.com/appium/appium-android/commit/fe4190403e1bc3f66a2ead346caf7eb16002626b))
26
+
27
+
6
28
  ## [9.1.6](https://github.com/appium/appium-android/compare/appium-chromedriver@9.1.5...appium-chromedriver@9.1.6) (2026-10-23)
7
29
 
8
30
  ### Bug Fixes
@@ -1,4 +1,5 @@
1
1
  {
2
+ "156.0.8078.73": "156.0.8078.73",
2
3
  "156.0.8078.47": "156.0.8078.47",
3
4
  "155.0.8059.84": "155.0.8059.84",
4
5
  "155.0.8059.79": "155.0.8059.79",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-chromedriver",
3
- "version": "9.1.6",
3
+ "version": "9.1.9",
4
4
  "description": "Node.js wrapper around chromedriver.",
5
5
  "keywords": [
6
6
  "android",
@@ -49,8 +49,8 @@
49
49
  "@appium/base-driver": "^10.8.0",
50
50
  "@appium/support": "^7.2.6",
51
51
  "@xmldom/xmldom": "^0.x",
52
- "appium-adb": "^16.0.4",
53
- "asyncbox": "^6.4.3",
52
+ "appium-adb": "^16.1.2",
53
+ "asyncbox": "^6.5.0",
54
54
  "axios": "^1.20.0",
55
55
  "compare-versions": "^6.0.0",
56
56
  "semver": "^7.0.0",
@@ -69,5 +69,5 @@
69
69
  "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
70
70
  "npm": ">=10"
71
71
  },
72
- "gitHead": "3e911805e42b4f39d63bbc5130ee6227375d7d51"
72
+ "gitHead": "dd7fac6576be570d54de8ff2874b88426b4446dd"
73
73
  }
@@ -3,6 +3,21 @@
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
+ ## [8.4.5](https://github.com/appium/appium-android/compare/io.appium.settings@8.4.4...io.appium.settings@8.4.5) (2026-10-28)
7
+
8
+ **Note:** Version bump only for package io.appium.settings
9
+
10
+
11
+
12
+
13
+
14
+ ## [8.4.4](https://github.com/appium/appium-android/compare/io.appium.settings@8.4.3...io.appium.settings@8.4.4) (2026-10-23)
15
+
16
+ ### Bug Fixes
17
+
18
+ * **adb:** use AsyncLock from asyncbox instead of async-lock ([#45](https://github.com/appium/appium-android/issues/45)) ([fe41904](https://github.com/appium/appium-android/commit/fe4190403e1bc3f66a2ead346caf7eb16002626b))
19
+
20
+
6
21
  ## [8.4.3](https://github.com/appium/appium-android/compare/io.appium.settings@8.4.2...io.appium.settings@8.4.3) (2026-10-23)
7
22
 
8
23
  ### Miscellaneous Chores
@@ -40,7 +40,7 @@ You may also consider using the latest [Android Studio](https://developer.androi
40
40
  ### Enable access to non-SDK interfaces
41
41
 
42
42
  [Restrictions on non-SDK interfaces](https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces#test-for-non-sdk) could affect some functionalities.
43
- Changing of the system locale in API Level 34 or later demonstrates the above restriction. Please [enable access to non-SDK interfaces](https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces#how_can_i_enable_access_to_non-sdk_interfaces) via `adb`. [This issue comment](https://github.com/appium/io.appium.settings/issues/180#issuecomment-2156279885) is adb logcat output when the non-SDK interfaces are enabled, or disabled (system default). Please try out a device reboot if the same logcat continues even after setting the hidden api policy.
43
+ Changing of the system locale in API Level 34 or later demonstrates the above restriction. Please [enable access to non-SDK interfaces](https://developer.android.com/guide/app-compatibility/restrictions-non-sdk-interfaces#how_can_i_enable_access_to_non-sdk_interfaces) via `adb`. [This issue comment](https://github.com/appium/io.appium.settings/issues/180#issuecomment-2156279885) is adb logcat output when the non-SDK interfaces are enabled, or disabled (system default). If `io.appium.settings` was already running before the hidden API policy was updated, restart the app process (`adb shell am force-stop io.appium.settings && adb shell am start -n io.appium.settings/.Settings -a android.intent.action.MAIN -c android.intent.category.LAUNCHER`) or reboot the device so the updated policy takes effect.
44
44
 
45
45
  ## Building
46
46
 
@@ -72,7 +72,7 @@ $ adb uninstall io.appium.settings
72
72
 
73
73
  ## Using the JavaScript wrapper
74
74
 
75
- This module exports the [SettingsApp](./lib/client.js) class, which allows you to automate the below interactions with JavaScript.
75
+ This module exports the [SettingsApp](./lib/client.ts) class, which allows you to automate the below interactions with JavaScript.
76
76
  The wrapper expects you to also have the [appium-adb](https://github.com/appium/appium-adb) module listed
77
77
  in your dependencies. The actual version of the appium-adb module must satisfy the same semver requirement this module
78
78
  has in its [devDependencies](./package.json).
@@ -104,7 +104,7 @@ main();
104
104
  ```
105
105
 
106
106
  The module also exports various constants containing its service and action names, that could be useful in your
107
- scripts. Check [constants.js](./lib/constants.js) for more details.
107
+ scripts. Check [constants.ts](./lib/constants.ts) for more details.
108
108
 
109
109
  ## Changing of system settings
110
110
 
@@ -291,8 +291,9 @@ $ adb shell am broadcast -a io.appium.settings.notifications
291
291
  The notifications listener service is running in the background and collects
292
292
  all the active and newly created notifications into the internal buffer with maximum
293
293
  size of `100`. The collected data (e.g. the properties and texts of each notification)
294
- is returned as JSON-formatted string. An error description string is returned instead if the
295
- notifications list cannot be retrieved.
294
+ is returned as JSON-formatted string (with `result=-1`, which corresponds to Android's
295
+ `Activity.RESULT_OK` on ordered broadcasts). An error description string is returned with
296
+ `result=0` (`Activity.RESULT_CANCELED`) if the notifications list cannot be retrieved.
296
297
  The example of the resulting data:
297
298
  ```json
298
299
  {
@@ -434,7 +435,7 @@ either a sequence of JPEG frames or an H.264/HEVC video (with an optional interl
434
435
  audio track), instead of writing a file. This is a **raw local-socket protocol**, not an
435
436
  HTTP/MJPEG server: the app opens a local abstract socket on-device, and the consumer is
436
437
  expected to `adb forward` it to a host TCP port and parse the (simple, length-prefixed)
437
- frame protocol itself. The [SettingsApp](./lib/client.js) wrapper (`makeJpegStreamSession()` /
438
+ frame protocol itself. The [SettingsApp](./lib/client.ts) wrapper (`makeJpegStreamSession()` /
438
439
  `makeVideoStreamSession()`) already does this for you and is the recommended way to consume
439
440
  either stream; talking to the socket directly is only needed for other languages/tools.
440
441
 
@@ -562,7 +563,7 @@ Voila!
562
563
 
563
564
  ## Caveats
564
565
 
565
- There are certain system services which cannot be accessed through an application. Two ones central here are `airplane_mode` and `gps`.
566
+ There are certain system services which cannot be accessed through an application. Two ones central here are `airplane_mode` and `gps`. Wi-Fi hotspot (tethering) is also not managed by Appium Settings; on supported Android versions it can be invoked via `adb shell cmd wifi start-softap`.
566
567
 
567
568
 
568
569
  ## License
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "io.appium.settings",
3
- "version": "8.4.3",
3
+ "version": "8.4.5",
4
4
  "description": "App for dealing with Android settings",
5
5
  "keywords": [
6
6
  "android",
@@ -51,7 +51,7 @@
51
51
  },
52
52
  "dependencies": {
53
53
  "@appium/logger": "^2.0.0-rc.1",
54
- "asyncbox": "^6.0.1",
54
+ "asyncbox": "^6.5.0",
55
55
  "semver": "^7.5.4",
56
56
  "teen_process": "^4.0.4"
57
57
  },
@@ -60,12 +60,12 @@
60
60
  "@appium/types": "^1.0.0-rc.1",
61
61
  "@types/node": "^26.6.5",
62
62
  "@types/sinon": "^22.0.0",
63
- "appium-adb": "^16.1.0",
63
+ "appium-adb": "^16.1.2",
64
64
  "sinon": "^22.0.0"
65
65
  },
66
66
  "engines": {
67
67
  "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
68
68
  "npm": ">=10"
69
69
  },
70
- "gitHead": "77e64eda1af76125099ad68fa6381238ce5ee120"
70
+ "gitHead": "dd7fac6576be570d54de8ff2874b88426b4446dd"
71
71
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xpath",
3
- "version": "0.0.35",
3
+ "version": "0.0.36",
4
4
  "description": "DOM 3 XPath implemention and helper for node.js and the web",
5
5
  "engines": {
6
6
  "node": ">=0.6.0"
@@ -49,3 +49,62 @@ export function isComment(value: SelectedValue): value is Comment;
49
49
  export function isDocumentNode(value: SelectedValue): value is Document;
50
50
  export function isDocumentTypeNode(value: SelectedValue): value is DocumentType;
51
51
  export function isDocumentFragment(value: SelectedValue): value is DocumentFragment;
52
+
53
+ export function parse(expression: string): XPathEvaluator;
54
+
55
+ export interface XPathEvaluator {
56
+ evaluate(options?: XPathEvaluateOptions): XPathResult;
57
+ evaluateBoolean(options?: XPathEvaluateOptions): boolean;
58
+ evaluateNumber(options?: XPathEvaluateOptions): number;
59
+ evaluateString(options?: XPathEvaluateOptions): string;
60
+ evaluateNodeSet(options?: XPathEvaluateOptions): XPathNodeSet;
61
+ select(options?: XPathEvaluateOptions): Node[];
62
+ select1(options?: XPathEvaluateOptions): Node | undefined;
63
+ }
64
+
65
+ export interface XPathEvaluateOptions {
66
+ node?: Node;
67
+ namespaces?: XPathNamespaceResolver;
68
+ variables?: XPathVariableResolver;
69
+ functions?: Record<string, XPathFunction> | XPathFunctionResolver;
70
+ position?: number;
71
+ size?: number;
72
+ allowAnyNamespaceForNoPrefix?: boolean;
73
+ isHtml?: boolean;
74
+ }
75
+
76
+ export type XPathNamespaceResolver = Record<string, string> | XPathNamespaceBasicResolver | {
77
+ getNamespace: XPathNamespaceBasicResolver
78
+ };
79
+ export type XPathNamespaceBasicResolver = (prefix: string, node: Node) => string | null | undefined;
80
+
81
+ export type XPathVariableResolver = Record<string, XPathValue> | XPathVariableBasicResolver | {
82
+ getVariable: XPathVariableBasicResolver
83
+ };
84
+ export type XPathVariableBasicResolver = (name: string, namespace: string | null) => XPathValue;
85
+
86
+ export type XPathFunctionResolver = XPathFunctionBasicResolver | {
87
+ getFunction: XPathFunctionBasicResolver
88
+ };
89
+ export type XPathFunctionBasicResolver = (name: string, namespace: string | null) => XPathFunction | null | undefined;
90
+
91
+ export type XPathFunction = (context: XPathFunctionContext, ...args: XPathResult[]) => XPathValue;
92
+
93
+ export interface XPathFunctionContext {
94
+ contextNode: Node;
95
+ }
96
+
97
+ /** Values that variables and custom functions may produce; nodes and arrays of nodes become node sets. */
98
+ export type XPathValue = string | number | boolean | Node | Node[] | XPathResult | null | undefined;
99
+
100
+ export interface XPathResult {
101
+ booleanValue(): boolean;
102
+ numberValue(): number;
103
+ stringValue(): string;
104
+ }
105
+
106
+ export interface XPathNodeSet extends XPathResult {
107
+ readonly size: number;
108
+ first(): Node | null;
109
+ toArray(): Node[];
110
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-espresso-driver",
3
- "version": "9.3.9",
3
+ "version": "9.3.10",
4
4
  "description": "Espresso integration for Appium",
5
5
  "keywords": [
6
6
  "android",
@@ -54,12 +54,12 @@
54
54
  "./package.json": "./package.json"
55
55
  },
56
56
  "dependencies": {
57
- "appium-adb": "16.1.0",
57
+ "appium-adb": "16.1.2",
58
58
  "appium-android-driver": "14.2.5",
59
59
  "asyncbox": "6.5.0",
60
60
  "axios": "1.21.0",
61
61
  "commander": "14.0.3",
62
- "io.appium.settings": "8.4.3",
62
+ "io.appium.settings": "8.4.5",
63
63
  "portscanner": "2.2.0",
64
64
  "semver": "7.8.5",
65
65
  "teen_process": "4.2.1"