appium-espresso-driver 10.2.1 → 10.3.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 (199) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/commands/server/builder.d.ts +9 -0
  3. package/build/lib/commands/server/builder.d.ts.map +1 -1
  4. package/build/lib/commands/server/builder.js +23 -0
  5. package/build/lib/commands/server/builder.js.map +1 -1
  6. package/build/lib/commands/server/hints.d.ts +28 -0
  7. package/build/lib/commands/server/hints.d.ts.map +1 -0
  8. package/build/lib/commands/server/hints.js +54 -0
  9. package/build/lib/commands/server/hints.js.map +1 -0
  10. package/build/lib/commands/server/runner.d.ts +7 -0
  11. package/build/lib/commands/server/runner.d.ts.map +1 -1
  12. package/build/lib/commands/server/runner.js +43 -4
  13. package/build/lib/commands/server/runner.js.map +1 -1
  14. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  15. package/espresso-server/app/build.gradle.kts +91 -1
  16. package/espresso-server/app/src/androidTestShaded/AndroidManifest.xml +16 -0
  17. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
  18. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
  19. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  20. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  21. package/espresso-server/buildSrc/build/classes/kotlin/main/META-INF/buildSrc.kotlin_module +0 -0
  22. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitField$1$1.class +0 -0
  23. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitMethod$1$1.class +0 -0
  24. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper.class +0 -0
  25. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/MemberRef.class +0 -0
  26. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/PrefixRemapper.class +0 -0
  27. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$groupingBy$1.class +0 -0
  28. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$sortedByDescending$1.class +0 -0
  29. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$9$1.class +0 -0
  30. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$remapper$1.class +0 -0
  31. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask.class +0 -0
  32. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1$visitMethod$1.class +0 -0
  33. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1.class +0 -0
  34. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$referencedClasses$collector$1.class +0 -0
  35. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$shareNonPublicDependents$Declared.class +0 -0
  36. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt.class +0 -0
  37. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab +0 -0
  38. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream +0 -0
  39. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len +0 -0
  40. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len +0 -0
  41. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at +0 -0
  42. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i +0 -0
  43. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab +0 -0
  44. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream +0 -0
  45. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len +0 -0
  46. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len +0 -0
  47. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at +0 -0
  48. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i +0 -0
  49. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab +0 -0
  50. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream +0 -0
  51. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len +0 -0
  52. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len +0 -0
  53. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at +0 -0
  54. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i +0 -0
  55. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab +0 -0
  56. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream +0 -0
  57. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len +0 -0
  58. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.len +0 -0
  59. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at +0 -0
  60. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i +0 -0
  61. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i.len +0 -0
  62. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab +0 -0
  63. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream +0 -0
  64. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len +0 -0
  65. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len +0 -0
  66. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at +0 -0
  67. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i +0 -0
  68. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab +0 -0
  69. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream +0 -0
  70. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len +0 -0
  71. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len +0 -0
  72. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at +0 -0
  73. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i +0 -0
  74. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab +0 -0
  75. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream +0 -0
  76. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len +0 -0
  77. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len +0 -0
  78. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at +0 -0
  79. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i +0 -0
  80. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab +0 -0
  81. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream +0 -0
  82. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len +0 -0
  83. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len +0 -0
  84. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at +0 -0
  85. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i +0 -0
  86. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab +0 -0
  87. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream +0 -0
  88. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len +0 -0
  89. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len +0 -0
  90. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at +0 -0
  91. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i +0 -0
  92. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len +0 -0
  93. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab +0 -0
  94. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream +0 -0
  95. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len +0 -0
  96. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len +0 -0
  97. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at +0 -0
  98. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i +0 -0
  99. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len +0 -0
  100. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab +1 -1
  101. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab +0 -0
  102. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream +0 -0
  103. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len +0 -0
  104. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len +0 -0
  105. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at +0 -0
  106. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i +0 -0
  107. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab +0 -0
  108. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream +0 -0
  109. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len +0 -0
  110. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len +0 -0
  111. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at +0 -0
  112. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i +0 -0
  113. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab +0 -0
  114. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream +0 -0
  115. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len +0 -0
  116. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len +0 -0
  117. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at +0 -0
  118. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i +0 -0
  119. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  120. package/espresso-server/buildSrc/build/kotlin/compileKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +0 -0
  121. package/espresso-server/buildSrc/build/libs/buildSrc.jar +0 -0
  122. package/espresso-server/buildSrc/build.gradle.kts +6 -0
  123. package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/RelocateClassesTask.kt +141 -0
  124. package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/Relocation.kt +342 -0
  125. package/espresso-server/buildSrc/src/test/kotlin/io/appium/espressoserver/gradle/RelocationTest.kt +186 -0
  126. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ListIdlingResources.kt +2 -1
  127. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ShadingHelpers.kt +45 -0
  128. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  129. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/http/response/AppiumResponse.kt +3 -2
  130. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/HamcrestMatcher.kt +8 -5
  131. package/espresso-server/library/src/test/java/io/appium/espressoserver/test/helpers/ShadingHelpersTest.kt +37 -0
  132. package/lib/commands/server/builder.ts +29 -0
  133. package/lib/commands/server/hints.ts +69 -0
  134. package/lib/commands/server/runner.ts +53 -5
  135. package/node_modules/appium-adb/CHANGELOG.md +7 -0
  136. package/node_modules/appium-adb/package.json +3 -3
  137. package/node_modules/appium-android-driver/CHANGELOG.md +23 -0
  138. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts +10 -0
  139. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts.map +1 -0
  140. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js +15 -0
  141. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js.map +1 -0
  142. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts +9 -0
  143. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts.map +1 -0
  144. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js +37 -0
  145. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js.map +1 -0
  146. package/node_modules/appium-android-driver/build/lib/commands/device/common.d.ts.map +1 -1
  147. package/node_modules/appium-android-driver/build/lib/commands/device/common.js +2 -0
  148. package/node_modules/appium-android-driver/build/lib/commands/device/common.js.map +1 -1
  149. package/node_modules/appium-android-driver/build/lib/commands/log.d.ts.map +1 -1
  150. package/node_modules/appium-android-driver/build/lib/commands/log.js +5 -1
  151. package/node_modules/appium-android-driver/build/lib/commands/log.js.map +1 -1
  152. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts.map +1 -1
  153. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js +2 -4
  154. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js.map +1 -1
  155. package/node_modules/appium-android-driver/lib/commands/bidi/helpers.ts +16 -0
  156. package/node_modules/appium-android-driver/lib/commands/bidi/logcat-level.ts +40 -0
  157. package/node_modules/appium-android-driver/lib/commands/device/common.ts +2 -0
  158. package/node_modules/appium-android-driver/lib/commands/log.ts +5 -1
  159. package/node_modules/appium-android-driver/lib/commands/media-stream/exports.ts +2 -11
  160. package/node_modules/appium-android-driver/package.json +5 -5
  161. package/node_modules/appium-chromedriver/CHANGELOG.md +7 -0
  162. package/node_modules/appium-chromedriver/config/mapping.json +1 -0
  163. package/node_modules/appium-chromedriver/package.json +2 -2
  164. package/node_modules/bare-buffer/CMakeLists.txt +3 -3
  165. package/node_modules/bare-buffer/package.json +1 -1
  166. package/node_modules/bare-buffer/prebuilds/android-arm/bare-buffer.bare +0 -0
  167. package/node_modules/bare-buffer/prebuilds/android-arm64/bare-buffer.bare +0 -0
  168. package/node_modules/bare-buffer/prebuilds/android-ia32/bare-buffer.bare +0 -0
  169. package/node_modules/bare-buffer/prebuilds/android-x64/bare-buffer.bare +0 -0
  170. package/node_modules/bare-buffer/prebuilds/darwin-arm64/bare-buffer.bare +0 -0
  171. package/node_modules/bare-buffer/prebuilds/darwin-x64/bare-buffer.bare +0 -0
  172. package/node_modules/bare-buffer/prebuilds/ios-arm64/bare-buffer.bare +0 -0
  173. package/node_modules/bare-buffer/prebuilds/ios-arm64-simulator/bare-buffer.bare +0 -0
  174. package/node_modules/bare-buffer/prebuilds/ios-x64-simulator/bare-buffer.bare +0 -0
  175. package/node_modules/bare-buffer/prebuilds/linux-arm64/bare-buffer.bare +0 -0
  176. package/node_modules/bare-buffer/prebuilds/linux-x64/bare-buffer.bare +0 -0
  177. package/node_modules/bare-buffer/prebuilds/win32-arm64/bare-buffer.bare +0 -0
  178. package/node_modules/bare-buffer/prebuilds/win32-x64/bare-buffer.bare +0 -0
  179. package/node_modules/bare-url/CMakeLists.txt +5 -5
  180. package/node_modules/bare-url/package.json +1 -1
  181. package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
  182. package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
  183. package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
  184. package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
  185. package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
  186. package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
  187. package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
  188. package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
  189. package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
  190. package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
  191. package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
  192. package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
  193. package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
  194. package/node_modules/ini/package.json +5 -5
  195. package/node_modules/io.appium.settings/CHANGELOG.md +7 -0
  196. package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
  197. package/node_modules/io.appium.settings/package.json +3 -3
  198. package/package.json +4 -4
  199. package/scripts/check-shaded-packages.mjs +106 -0
@@ -0,0 +1,37 @@
1
+ package io.appium.espressoserver.test.helpers
2
+
3
+ import io.appium.espressoserver.lib.helpers.forNameApp
4
+ import io.appium.espressoserver.lib.helpers.forNameShaded
5
+ import io.appium.espressoserver.lib.helpers.stripShadedPrefix
6
+ import org.junit.Test
7
+ import kotlin.test.assertEquals
8
+ import kotlin.test.assertFailsWith
9
+
10
+ class `ShadingHelpers Test` {
11
+
12
+ @Test
13
+ fun `'forNameShaded' falls back to the original name`() {
14
+ assertEquals(String::class.java, forNameShaded("java.lang.String"))
15
+ }
16
+
17
+ @Test
18
+ fun `'forNameShaded' throws for unknown classes`() {
19
+ assertFailsWith<ClassNotFoundException> { forNameShaded("no.such.Clazz") }
20
+ }
21
+
22
+ @Test
23
+ fun `'forNameApp' prefers the original name`() {
24
+ assertEquals(String::class.java, forNameApp("java.lang.String"))
25
+ assertFailsWith<ClassNotFoundException> { forNameApp("no.such.Clazz") }
26
+ }
27
+
28
+ @Test
29
+ fun `'stripShadedPrefix' removes the relocation prefix everywhere`() {
30
+ assertEquals(
31
+ "NoActivityResumedException: androidx.test.espresso.Foo and org.hamcrest.Matchers",
32
+ ("NoActivityResumedException: io.appium.espressoserver.shaded.androidx.test.espresso.Foo " +
33
+ "and io.appium.espressoserver.shaded.org.hamcrest.Matchers").stripShadedPrefix(),
34
+ )
35
+ assertEquals("io.appium.espressoserver.lib.Foo", "io.appium.espressoserver.lib.Foo".stripShadedPrefix())
36
+ }
37
+ }
@@ -50,6 +50,12 @@ export interface EspressoBuildConfiguration {
50
50
  * Defaults to true when omitted.
51
51
  */
52
52
  composeSupport?: boolean;
53
+ /**
54
+ * When false, the classes bundled with the Espresso server are not moved to a private package,
55
+ * so they shadow the same classes of the application under test.
56
+ * Defaults to true when omitted.
57
+ */
58
+ shadeServer?: boolean;
53
59
  additionalAppDependencies?: string[];
54
60
  additionalAndroidTestDependencies?: string[];
55
61
  }
@@ -72,6 +78,7 @@ export class ServerBuilder {
72
78
  private readonly additionalAppDependencies: string[] = [];
73
79
  private readonly additionalAndroidTestDependencies: string[] = [];
74
80
  private readonly composeSupport: boolean;
81
+ private readonly shadeServer: boolean;
75
82
 
76
83
  constructor(log: AppiumLogger, args: ServerBuilderOptions) {
77
84
  this.log = log;
@@ -80,6 +87,7 @@ export class ServerBuilder {
80
87
 
81
88
  const buildConfiguration = args.buildConfiguration || {};
82
89
  this.composeSupport = buildConfiguration.composeSupport !== false;
90
+ this.shadeServer = buildConfiguration.shadeServer !== false;
83
91
 
84
92
  const versionConfiguration = buildConfiguration.toolsVersions || {};
85
93
  this.serverVersions = {} as Partial<Record<(typeof VERSION_KEYS)[number], string>>;
@@ -148,11 +156,32 @@ export class ServerBuilder {
148
156
  args.push(composeArg);
149
157
  }
150
158
  }
159
+ if (!this.shadeServer) {
160
+ const shadeArg = buildProperty('appiumShadeServer', 'false');
161
+ if (shadeArg) {
162
+ args.push(shadeArg);
163
+ }
164
+ } else {
165
+ // The classes of these dependencies are not relocated, so they keep working as they do without shading
166
+ const sharedArg = buildProperty('appiumSharedDependencies', this.getSharedDependencyCoordinates().join(','));
167
+ if (sharedArg) {
168
+ args.push(sharedArg);
169
+ }
170
+ }
151
171
  args.push('app:assembleAndroidTest');
152
172
 
153
173
  return {cmd, args};
154
174
  }
155
175
 
176
+ /** `group:module` of the user declared dependencies, without versions */
177
+ private getSharedDependencyCoordinates(): string[] {
178
+ const coordinates = DEPENDENCY_PROP_NAMES.flatMap((propName) => this[propName])
179
+ .map((dep) => dep.trim().match(/^([\w.-]+):([\w.-]+)/))
180
+ .filter((match): match is RegExpMatchArray => match !== null)
181
+ .map((match) => `${match[1]}:${match[2]}`);
182
+ return [...new Set(coordinates)];
183
+ }
184
+
156
185
  private async setGradleWrapperVersion(version: string): Promise<void> {
157
186
  const propertiesPath = path.resolve(this.serverPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');
158
187
  const originalProperties = await fs.readFile(propertiesPath, 'utf8');
@@ -0,0 +1,69 @@
1
+ const DOCS_URL = 'https://appium.github.io/appium-espresso-driver/latest/troubleshooting/class-conflicts/';
2
+ const REPORT = 'Please report this as a bug, and attach the logcat crash buffer and your espressoBuildConfig';
3
+ const SHADE_OFF = '"appium:espressoBuildConfig": {"shadeServer": false}';
4
+
5
+ export interface Hint {
6
+ /** Matches the failure text (instrumentation output, logcat crash buffer, server error) */
7
+ pattern: RegExp;
8
+ /** Anchor of the row that documents the pattern in docs/troubleshooting/class-conflicts.md */
9
+ anchor: string;
10
+ hint: string;
11
+ }
12
+
13
+ /**
14
+ * Only the patterns that have been reproduced are listed here. Every one of them must have
15
+ * a row with the same anchor in the class conflicts troubleshooting page.
16
+ */
17
+ export const HINTS: readonly Hint[] = [
18
+ {
19
+ pattern: /IllegalAccessError.*io\.appium\.espressoserver\.shaded/s,
20
+ anchor: 'illegal-access-shaded',
21
+ hint: `The server relocation has failed. ${REPORT}. As a workaround try ${SHADE_OFF}`,
22
+ },
23
+ {
24
+ pattern: /Exception handler was not found via a ServiceLoader/,
25
+ anchor: 'service-loader',
26
+ hint: `A service file of the server was not relocated. ${REPORT}. As a workaround try ${SHADE_OFF}`,
27
+ },
28
+ {
29
+ pattern: /StartupException.*ClassCastException.*Initializer|ViewTreeLifecycleOwner not found/s,
30
+ anchor: 'startup-initializer',
31
+ hint: `The classes shared with the application under test are not consistent. ${REPORT}. As a workaround try ${SHADE_OFF}`,
32
+ },
33
+ {
34
+ pattern: /(NoSuchMethodError|NoClassDefFoundError)[^\n]*androidx[./]compose/,
35
+ anchor: 'compose-version',
36
+ hint:
37
+ 'The Jetpack Compose version of the application under test differs from the one of the Espresso server. ' +
38
+ 'Set "toolsVersions": {"composeVersion": "<version of the app>"} in the espressoBuildConfig capability. ' +
39
+ 'If the app has no Compose, set "composeSupport": false instead',
40
+ },
41
+ ];
42
+
43
+ /**
44
+ * Finds the hints that apply to the given failure text.
45
+ *
46
+ * @param text - Failure text, e.g. the lines of an instrumentation crash.
47
+ * @returns Hint texts with the link to the docs, without duplicates.
48
+ */
49
+ export function findHints(text: string): string[] {
50
+ return [
51
+ ...new Set(
52
+ HINTS.filter(({pattern}) => pattern.test(text)).map(
53
+ ({hint, anchor}) => `Hint: ${hint} (see ${DOCS_URL}#${anchor})`,
54
+ ),
55
+ ),
56
+ ];
57
+ }
58
+
59
+ /**
60
+ * Appends the matching hints to an error message.
61
+ *
62
+ * @param message - The original message.
63
+ * @param text - Failure text to look the hints for in.
64
+ * @returns The message, extended with the hints if there are any.
65
+ */
66
+ export function withHints(message: string, text: string): string {
67
+ const hints = findHints(text);
68
+ return hints.length ? `${message}\n${hints.join('\n')}` : message;
69
+ }
@@ -13,6 +13,9 @@ import * as semver from 'semver';
13
13
  import {getPackageInfoSync, getPackageInfo, isPlainObject} from '../../utils/index.js';
14
14
  import {ServerBuilder, buildServerSigningConfig, type ServerSigningConfig} from './builder.js';
15
15
  import {ESPRESSO_SERVER_LAUNCH_TIMEOUT_MS, TARGET_PACKAGE_CONTAINER, TEST_APK_PKG} from './constants.js';
16
+ import {findHints, withHints} from './hints.js';
17
+
18
+ const MAX_OUTPUT_LINES = 500;
16
19
 
17
20
  export interface EspressoRunnerOptions {
18
21
  adb: ADB;
@@ -162,6 +165,36 @@ export class EspressoRunner {
162
165
  return previousAppPackage !== this.appPackage;
163
166
  }
164
167
 
168
+ /** Current device time in the format of `logcat -T`, or undefined if it cannot be read. */
169
+ private async getDeviceLogTime(): Promise<string | undefined> {
170
+ try {
171
+ return (await this.adb.shell(['date', '+%m-%d %H:%M:%S.000'])).trim() || undefined;
172
+ } catch (e: any) {
173
+ this.log.debug(`Cannot read the device time: ${e.message}`);
174
+ return undefined;
175
+ }
176
+ }
177
+
178
+ /**
179
+ * Appends the hints for the known failures to the message. The cause is looked for in the instrumentation
180
+ * output first and in the crash buffer of the device (since the given device time) after that.
181
+ */
182
+ private async withFailureHints(message: string, outputLines: string[], since?: string): Promise<string> {
183
+ let failureText = outputLines.join('\n');
184
+ if (since && findHints(failureText).length === 0) {
185
+ try {
186
+ failureText += '\n' + (await this.adb.adbExec(['logcat', '-d', '-b', 'crash', '-T', since]));
187
+ } catch (e: any) {
188
+ this.log.debug(`Cannot read the crash buffer to look for hints: ${e.message}`);
189
+ }
190
+ }
191
+ const result = withHints(message, failureText);
192
+ if (result !== message) {
193
+ this.log.warn(result.slice(message.length + 1));
194
+ }
195
+ return result;
196
+ }
197
+
165
198
  /**
166
199
  * Installs Espresso server apk on to the device or emulator.
167
200
  * Each adb command uses default timeout by them.
@@ -302,6 +335,9 @@ export class EspressoRunner {
302
335
  this.log.info(`Starting Espresso Server v${manifestPayload.version} with cmd: adb ${cmd.join(' ')}`);
303
336
 
304
337
  let hasSocketError = false;
338
+ const outputLines: string[] = [];
339
+ // Crashes that happened before this moment are not related to the launch
340
+ const launchTime = await this.getDeviceLogTime();
305
341
  // start the instrumentation process
306
342
  this.jwproxy.instrumentationState = {
307
343
  exited: false,
@@ -320,6 +356,10 @@ export class EspressoRunner {
320
356
  }
321
357
 
322
358
  this.log.debug(`[Instrumentation] ${line.trim()}`);
359
+ outputLines.push(line);
360
+ if (outputLines.length > MAX_OUTPUT_LINES) {
361
+ outputLines.shift();
362
+ }
323
363
  // A 'SocketException' indicates that we couldn't connect to the Espresso server,
324
364
  // because the INTERNET permission is not set
325
365
  if (line.toLowerCase().includes('java.net.socketexception')) {
@@ -343,8 +383,12 @@ export class EspressoRunner {
343
383
  );
344
384
  } else if (this.jwproxy.instrumentationState.exited) {
345
385
  throw this.log.errorWithException(
346
- `Espresso server process has been unexpectedly terminated. ` +
347
- `Check the Appium server log and the logcat output for more details`,
386
+ await this.withFailureHints(
387
+ `Espresso server process has been unexpectedly terminated. ` +
388
+ `Check the Appium server log and the logcat output for more details`,
389
+ outputLines,
390
+ launchTime,
391
+ ),
348
392
  );
349
393
  }
350
394
  let serverStatus: ServerStatus;
@@ -363,9 +407,13 @@ export class EspressoRunner {
363
407
  } catch (e: any) {
364
408
  if (/Condition unmet/.test(e.message)) {
365
409
  throw this.log.errorWithException(
366
- `Timed out waiting for Espresso server to be ` +
367
- `online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
368
- `customized using 'espressoServerLaunchTimeout' capability`,
410
+ await this.withFailureHints(
411
+ `Timed out waiting for Espresso server to be ` +
412
+ `online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
413
+ `customized using 'espressoServerLaunchTimeout' capability`,
414
+ outputLines,
415
+ launchTime,
416
+ ),
369
417
  );
370
418
  }
371
419
  throw e;
@@ -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
+ ## [17.0.4](https://github.com/appium/appium-android/compare/appium-adb@17.0.3...appium-adb@17.0.4) (2026-11-17)
7
+
8
+ ### Miscellaneous Chores
9
+
10
+ * **adb:** update dependency ini to v7 ([#125](https://github.com/appium/appium-android/issues/125)) ([60df469](https://github.com/appium/appium-android/commit/60df469a5bebbd1110374ebfdacbfbe5207719d1))
11
+
12
+
6
13
  ## [17.0.3](https://github.com/appium/appium-android/compare/appium-adb@17.0.2...appium-adb@17.0.3) (2026-11-14)
7
14
 
8
15
  ### Miscellaneous Chores
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-adb",
3
- "version": "17.0.3",
3
+ "version": "17.0.4",
4
4
  "description": "Android Debug Bridge interface",
5
5
  "homepage": "https://appium.io",
6
6
  "bugs": {
@@ -46,7 +46,7 @@
46
46
  "dependencies": {
47
47
  "@appium/support": "^8.0.0-beta.7",
48
48
  "asyncbox": "^7.0.0",
49
- "ini": "^6.0.0",
49
+ "ini": "^7.0.0",
50
50
  "lru-cache": "^11.1.0",
51
51
  "semver": "^7.0.0",
52
52
  "teen_process": "^5.0.0"
@@ -64,5 +64,5 @@
64
64
  "node": "^22.22.2 || ^24.15.0 || >=26.0.0",
65
65
  "npm": ">=10"
66
66
  },
67
- "gitHead": "63cd0c757b1a2c7ca5ff05e9000ec86ed470f3b4"
67
+ "gitHead": "d3c3bdc927cdf82b47f8ae8ff2516ed525a74b73"
68
68
  }
@@ -3,6 +3,29 @@
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.3.0](https://github.com/appium/appium-android/compare/appium-android-driver@15.2.4...appium-android-driver@15.3.0) (2026-11-18)
7
+
8
+ ### Features
9
+
10
+ * **driver-lib:** derive BiDi syslog level and gate log events on subscribers ([#127](https://github.com/appium/appium-android/issues/127)) ([b4fa1f9](https://github.com/appium/appium-android/commit/b4fa1f9946292d9d82aec18cbbf8dfd84850ded7))
11
+
12
+
13
+ ## [15.2.4](https://github.com/appium/appium-android/compare/appium-android-driver@15.2.3...appium-android-driver@15.2.4) (2026-11-18)
14
+
15
+ **Note:** Version bump only for package appium-android-driver
16
+
17
+
18
+
19
+
20
+
21
+ ## [15.2.3](https://github.com/appium/appium-android/compare/appium-android-driver@15.2.2...appium-android-driver@15.2.3) (2026-11-17)
22
+
23
+ **Note:** Version bump only for package appium-android-driver
24
+
25
+
26
+
27
+
28
+
6
29
  ## [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
30
 
8
31
  ### Bug Fixes
@@ -0,0 +1,10 @@
1
+ import type { AndroidDriver } from '../../driver.js';
2
+ /**
3
+ * Checks whether any BiDi client is subscribed to the event or to its whole module.
4
+ *
5
+ * @param driver - The driver instance
6
+ * @param method - Fully qualified event name, e.g. `log.entryAdded`
7
+ * @param context - If set, only subscriptions that cover this context (or all contexts) count
8
+ */
9
+ export declare function hasSubscribers(driver: AndroidDriver, method: string, context?: string): boolean;
10
+ //# sourceMappingURL=helpers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAM/F"}
@@ -0,0 +1,15 @@
1
+ /**
2
+ * Checks whether any BiDi client is subscribed to the event or to its whole module.
3
+ *
4
+ * @param driver - The driver instance
5
+ * @param method - Fully qualified event name, e.g. `log.entryAdded`
6
+ * @param context - If set, only subscriptions that cover this context (or all contexts) count
7
+ */
8
+ export function hasSubscribers(driver, method, context) {
9
+ const moduleName = method.split('.')[0];
10
+ return [method, moduleName].some((e) => {
11
+ const contexts = driver.bidiEventSubs[e];
12
+ return Boolean(contexts?.length) && (context === undefined || contexts.includes('') || contexts.includes(context));
13
+ });
14
+ }
15
+ //# sourceMappingURL=helpers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/helpers.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,MAAqB,EAAE,MAAc,EAAE,OAAgB;IACpF,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACrH,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,9 @@
1
+ import type { LogEntry } from 'appium-adb';
2
+ /**
3
+ * Builds a transformer that sets the entry level from the logcat priority of the line.
4
+ * Lines without a recognizable priority are returned unchanged.
5
+ *
6
+ * @param format - The `logcat -v` format the capture was started with
7
+ */
8
+ export declare function makeLogcatLevelTransformer(format?: string): (entry: LogEntry) => LogEntry;
9
+ //# sourceMappingURL=logcat-level.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logcat-level.d.ts","sourceRoot":"","sources":["../../../../lib/commands/bidi/logcat-level.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AA2BzC;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,KAAK,EAAE,QAAQ,KAAK,QAAQ,CAMzF"}
@@ -0,0 +1,37 @@
1
+ import { toLogRecord } from '../../utils.js';
2
+ const DEFAULT_FORMAT = 'threadtime';
3
+ // Same list as in appium-adb; an unknown format falls back to the default there
4
+ const KNOWN_FORMATS = ['brief', 'process', 'tag', 'thread', 'raw', 'time', 'threadtime', 'long'];
5
+ const TIME = String.raw `\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}`;
6
+ // Capture group 1 is the priority letter. `raw` and `long` carry no per-line priority.
7
+ // `brief` and `tag` match only the leading `X/`, as logcat truncates long tags and drops the suffix.
8
+ const PRIORITY_PATTERNS = {
9
+ brief: /^([VDIWEF])\//,
10
+ process: /^([VDIWEF])\(\s*\d+\)/,
11
+ tag: /^([VDIWEF])\//,
12
+ thread: /^([VDIWEF])\(\s*\d+:\s*\d+\)/,
13
+ time: new RegExp(String.raw `^${TIME}\s+([VDIWEF])/`),
14
+ threadtime: new RegExp(String.raw `^${TIME}\s+\d+\s+\d+\s+([VDIWEF])\s`),
15
+ };
16
+ const LEVELS = {
17
+ V: 'DEBUG',
18
+ D: 'DEBUG',
19
+ I: 'INFO',
20
+ W: 'WARN',
21
+ E: 'ERROR',
22
+ F: 'ERROR',
23
+ };
24
+ /**
25
+ * Builds a transformer that sets the entry level from the logcat priority of the line.
26
+ * Lines without a recognizable priority are returned unchanged.
27
+ *
28
+ * @param format - The `logcat -v` format the capture was started with
29
+ */
30
+ export function makeLogcatLevelTransformer(format) {
31
+ const pattern = PRIORITY_PATTERNS[format && KNOWN_FORMATS.includes(format) ? format : DEFAULT_FORMAT];
32
+ return (entry) => {
33
+ const priority = pattern?.exec(entry.message)?.[1];
34
+ return priority ? toLogRecord(entry.timestamp, entry.message, LEVELS[priority]) : entry;
35
+ };
36
+ }
37
+ //# sourceMappingURL=logcat-level.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"logcat-level.js","sourceRoot":"","sources":["../../../../lib/commands/bidi/logcat-level.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,MAAM,cAAc,GAAG,YAAY,CAAC;AACpC,gFAAgF;AAChF,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;AACjG,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAA,sCAAsC,CAAC;AAC9D,uFAAuF;AACvF,qGAAqG;AACrG,MAAM,iBAAiB,GAAqC;IAC1D,KAAK,EAAE,eAAe;IACtB,OAAO,EAAE,uBAAuB;IAChC,GAAG,EAAE,eAAe;IACpB,MAAM,EAAE,8BAA8B;IACtC,IAAI,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,IAAI,gBAAgB,CAAC;IACpD,UAAU,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,IAAI,6BAA6B,CAAC;CACxE,CAAC;AACF,MAAM,MAAM,GAAqC;IAC/C,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,OAAO;CACX,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,0BAA0B,CAAC,MAAe;IACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;IACtG,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,QAAQ,GAAG,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,OAAO,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1F,CAAC,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAKpC,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAKnD,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAG9D,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,qBAAqB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;QACnH,SAAS,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC;QAC/E,aAAa,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;QAC3F,UAAU,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;KACnF;CACF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAyGvF;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAQjE;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAyC3F;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAsHnE"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../lib/commands/device/common.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAKpC,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAMnD,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAG9D,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,qBAAqB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,GAAG,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC;QACnH,SAAS,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC;QAC/E,aAAa,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;QAC3F,UAAU,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;KACnF;CACF;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAyGvF;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAQjE;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAyC3F;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuHnE"}
@@ -3,6 +3,7 @@ import { retryInterval } from 'asyncbox';
3
3
  import { SETTINGS_HELPER_ID } from 'io.appium.settings';
4
4
  import * as semver from 'semver';
5
5
  import { GET_SERVER_LOGS_FEATURE, nativeLogEntryToSeleniumEntry } from '../../utils.js';
6
+ import { makeLogcatLevelTransformer } from '../bidi/logcat-level.js';
6
7
  import { setMockLocationApp } from '../geolocation.js';
7
8
  import { hideKeyboardCompletely, initUnicodeKeyboard } from '../keyboard.js';
8
9
  import { adjustTimeZone } from '../time.js';
@@ -221,6 +222,7 @@ export async function initDevice() {
221
222
  if (this.adb.logcat) {
222
223
  this.assignBiDiLogListener(this.adb.logcat, {
223
224
  type: 'syslog',
225
+ entryTransformer: makeLogcatLevelTransformer(logcatFormat),
224
226
  });
225
227
  }
226
228
  };
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../lib/commands/device/common.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAS9C,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAChD,OAAO,EAAsE,KAAK,QAAQ,EAAC,MAAM,aAAa,CAAC;AAK/G,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,wBAAwB,CACtB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GACnD,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;QAC/C,uBAAuB,CACrB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAClD,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;QAC9C,qBAAqB,CAAC,EAAE,SAAS,YAAY,EAC3C,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,sBAAsB,GACjC,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;KACtB;CACF;AAED,eAAO,MAAM,iBAAiB;;;gCAGX,aAAa;;;;gCAIP,aAAa;;;;gCAQnB,aAAa;;CAKtB,CAAC;AAEX;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DjF;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,SAAS,YAAY,EAC3D,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,sBAAsB,GACjC,CAAC,EAAE,EAAE,WAAW,CAAC,CAQnB;AAeD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC;CAC9C;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,GAAG,CAAC"}
1
+ {"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAS9C,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAChE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAChD,OAAO,EAAsE,KAAK,QAAQ,EAAC,MAAM,aAAa,CAAC;AAM/G,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAU,aAAa,CAAC,CAAC,SAAS,wBAAwB;QACxD,wBAAwB,CACtB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GACnD,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;QAC/C,uBAAuB,CACrB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,uBAAuB,CAAC,GAClD,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC;QAC9C,qBAAqB,CAAC,EAAE,SAAS,YAAY,EAC3C,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,sBAAsB,GACjC,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;KACtB;CACF;AAED,eAAO,MAAM,iBAAiB;;;gCAGX,aAAa;;;;gCAIP,aAAa;;;;gCAQnB,aAAa;;CAKtB,CAAC;AAEX;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DjF;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhF;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,SAAS,YAAY,EAC3D,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,sBAAsB,GACjC,CAAC,EAAE,EAAE,WAAW,CAAC,CAWnB;AAeD,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC;CAC9C;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,GAAG,CAAC"}
@@ -3,7 +3,8 @@ import { util } from '@appium/support';
3
3
  import { DEFAULT_WS_PATHNAME_PREFIX } from 'appium/driver.js';
4
4
  import { WebSocket, WebSocketServer } from 'ws';
5
5
  import { GET_SERVER_LOGS_FEATURE, toLogRecord, nativeLogEntryToSeleniumEntry } from '../utils.js';
6
- import { BIDI_EVENT_NAME } from './bidi/constants.js';
6
+ import { BIDI_EVENT_NAME, LOG_ENTRY_ADDED_EVENT } from './bidi/constants.js';
7
+ import { hasSubscribers } from './bidi/helpers.js';
7
8
  import { makeLogEntryAddedEvent } from './bidi/models.js';
8
9
  import { NATIVE_WIN } from './context/helpers.js';
9
10
  export const supportedLogTypes = {
@@ -122,6 +123,9 @@ export async function mobileStopLogsBroadcast() {
122
123
  export function assignBiDiLogListener(logEmitter, properties) {
123
124
  const { type, context = NATIVE_WIN, srcEventName = 'output', entryTransformer } = properties;
124
125
  const listener = (logEntry) => {
126
+ if (!hasSubscribers(this, LOG_ENTRY_ADDED_EVENT, context)) {
127
+ return;
128
+ }
125
129
  const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
126
130
  this.eventEmitter.emit(BIDI_EVENT_NAME, makeLogEntryAddedEvent(finalEntry, context, type));
127
131
  };
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"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"}
@@ -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,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"}
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;AAMnD,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"}
@@ -1,7 +1,8 @@
1
1
  import { errors } from 'appium/driver.js';
2
2
  import { BIDI_EVENT_NAME } from '../bidi/constants.js';
3
+ import { hasSubscribers } from '../bidi/helpers.js';
3
4
  import { getCapabilities, queryVideoEncoders } from './capabilities.js';
4
- import { DEFAULT_BATCH_MS, DEFAULT_IDLE_HEARTBEAT_MS, MEDIA_STREAM_MODULE, MEDIA_UNITS_EVENT, MIN_API_LEVEL, } from './constants.js';
5
+ import { DEFAULT_BATCH_MS, DEFAULT_IDLE_HEARTBEAT_MS, MEDIA_UNITS_EVENT, MIN_API_LEVEL } from './constants.js';
5
6
  import { MediaStream } from './stream.js';
6
7
  /**
7
8
  * Starts streaming the screen as `appium:mediaStream.*` BiDi events.
@@ -108,9 +109,6 @@ export async function mobileStopMediaStream(streamId) {
108
109
  export async function stopAllMediaStreams() {
109
110
  await Promise.all([...(this._mediaStreams?.values() ?? [])].map((s) => s.stop('session ended')));
110
111
  }
111
- function hasSubscribers(driver, method) {
112
- return [method, MEDIA_STREAM_MODULE].some((e) => (driver.bidiEventSubs[e]?.length ?? 0) > 0);
113
- }
114
112
  function validateOpts({ kind, codec, bitrate, quality, scale, audio, batchMs, idleHeartbeatMs, }) {
115
113
  if (kind !== 'video' && kind !== 'jpeg') {
116
114
  throw new errors.InvalidArgumentError(`'kind' must be either 'video' or 'jpeg', got '${String(kind)}'`);
@@ -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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"}
@@ -0,0 +1,16 @@
1
+ import type {AndroidDriver} from '../../driver.js';
2
+
3
+ /**
4
+ * Checks whether any BiDi client is subscribed to the event or to its whole module.
5
+ *
6
+ * @param driver - The driver instance
7
+ * @param method - Fully qualified event name, e.g. `log.entryAdded`
8
+ * @param context - If set, only subscriptions that cover this context (or all contexts) count
9
+ */
10
+ export function hasSubscribers(driver: AndroidDriver, method: string, context?: string): boolean {
11
+ const moduleName = method.split('.')[0];
12
+ return [method, moduleName].some((e) => {
13
+ const contexts = driver.bidiEventSubs[e];
14
+ return Boolean(contexts?.length) && (context === undefined || contexts.includes('') || contexts.includes(context));
15
+ });
16
+ }