appium-espresso-driver 9.3.5 → 9.3.7

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 (620) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/build/lib/driver.d.ts +1 -1
  3. package/build/lib/driver.d.ts.map +1 -1
  4. package/build/lib/driver.js +27 -4
  5. package/build/lib/driver.js.map +1 -1
  6. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  7. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
  8. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
  9. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  10. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  11. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  12. package/espresso-server/gradle/libs.versions.toml +1 -1
  13. package/espresso-server/gradle.properties +1 -1
  14. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  15. package/lib/driver.ts +28 -4
  16. package/node_modules/@appium/base-driver/build/lib/basedriver/commands/bidi.js +6 -3
  17. package/node_modules/@appium/base-driver/build/lib/basedriver/commands/bidi.js.map +1 -1
  18. package/node_modules/@appium/base-driver/build/lib/basedriver/commands/timeout.js +1 -1
  19. package/node_modules/@appium/base-driver/build/lib/basedriver/commands/timeout.js.map +1 -1
  20. package/node_modules/@appium/base-driver/build/lib/basedriver/helpers.d.ts.map +1 -1
  21. package/node_modules/@appium/base-driver/build/lib/basedriver/helpers.js +40 -3
  22. package/node_modules/@appium/base-driver/build/lib/basedriver/helpers.js.map +1 -1
  23. package/node_modules/@appium/base-driver/lib/basedriver/commands/bidi.ts +6 -3
  24. package/node_modules/@appium/base-driver/lib/basedriver/commands/timeout.ts +1 -1
  25. package/node_modules/@appium/base-driver/lib/basedriver/helpers.ts +41 -3
  26. package/node_modules/@appium/base-driver/package.json +9 -9
  27. package/node_modules/@appium/base-driver/tsconfig.json +1 -1
  28. package/node_modules/@appium/logger/CHANGELOG.md +8 -0
  29. package/node_modules/@appium/logger/package.json +3 -3
  30. package/node_modules/@appium/support/build/lib/fs.d.ts.map +1 -1
  31. package/node_modules/@appium/support/build/lib/fs.js +7 -0
  32. package/node_modules/@appium/support/build/lib/fs.js.map +1 -1
  33. package/node_modules/@appium/support/build/lib/index.d.ts.map +1 -1
  34. package/node_modules/@appium/support/build/lib/net.d.ts.map +1 -1
  35. package/node_modules/@appium/support/build/lib/net.js +6 -2
  36. package/node_modules/@appium/support/build/lib/net.js.map +1 -1
  37. package/node_modules/@appium/support/build/lib/util.d.ts.map +1 -1
  38. package/node_modules/@appium/support/build/lib/util.js +10 -4
  39. package/node_modules/@appium/support/build/lib/util.js.map +1 -1
  40. package/node_modules/@appium/support/build/lib/zip.d.ts.map +1 -1
  41. package/node_modules/@appium/support/build/lib/zip.js +2 -7
  42. package/node_modules/@appium/support/build/lib/zip.js.map +1 -1
  43. package/node_modules/@appium/support/lib/fs.ts +8 -1
  44. package/node_modules/@appium/support/lib/net.ts +7 -2
  45. package/node_modules/@appium/support/lib/util.ts +9 -3
  46. package/node_modules/@appium/support/lib/zip.ts +3 -9
  47. package/node_modules/@appium/support/package.json +9 -9
  48. package/node_modules/@appium/types/package.json +4 -4
  49. package/node_modules/@img/sharp-libvips-linux-x64/README.md +1 -1
  50. package/node_modules/@img/sharp-libvips-linux-x64/lib/glib-2.0/include/glibconfig.h +2 -2
  51. package/node_modules/@img/sharp-libvips-linux-x64/lib/{libvips-cpp.so.8.18.6 → libvips-cpp.so.8.18.7} +0 -0
  52. package/node_modules/@img/sharp-libvips-linux-x64/package.json +2 -2
  53. package/node_modules/@img/sharp-libvips-linux-x64/versions.json +11 -11
  54. package/node_modules/@img/sharp-linux-x64/index.cjs +1 -1
  55. package/node_modules/@img/sharp-linux-x64/lib/sharp-linux-x64-0.35.5.node +0 -0
  56. package/node_modules/@img/sharp-linux-x64/package.json +2 -2
  57. package/node_modules/appium-adb/CHANGELOG.md +37 -0
  58. package/node_modules/appium-adb/README.md +1 -1
  59. package/node_modules/appium-adb/build/lib/tools/aab-utils.js +34 -34
  60. package/node_modules/appium-adb/build/lib/tools/aab-utils.js.map +1 -1
  61. package/node_modules/appium-adb/build/lib/tools/android-manifest.js +1 -1
  62. package/node_modules/appium-adb/build/lib/tools/android-manifest.js.map +1 -1
  63. package/node_modules/appium-adb/build/lib/tools/apk-signing.d.ts.map +1 -1
  64. package/node_modules/appium-adb/build/lib/tools/apk-signing.js +21 -9
  65. package/node_modules/appium-adb/build/lib/tools/apk-signing.js.map +1 -1
  66. package/node_modules/appium-adb/build/lib/tools/apks-utils.d.ts.map +1 -1
  67. package/node_modules/appium-adb/build/lib/tools/apks-utils.js +6 -5
  68. package/node_modules/appium-adb/build/lib/tools/apks-utils.js.map +1 -1
  69. package/node_modules/appium-adb/build/lib/tools/app-commands.d.ts.map +1 -1
  70. package/node_modules/appium-adb/build/lib/tools/app-commands.js +63 -62
  71. package/node_modules/appium-adb/build/lib/tools/app-commands.js.map +1 -1
  72. package/node_modules/appium-adb/build/lib/tools/device-settings.js +1 -1
  73. package/node_modules/appium-adb/build/lib/tools/device-settings.js.map +1 -1
  74. package/node_modules/appium-adb/build/lib/tools/lockmgmt.d.ts.map +1 -1
  75. package/node_modules/appium-adb/build/lib/tools/lockmgmt.js +3 -9
  76. package/node_modules/appium-adb/build/lib/tools/lockmgmt.js.map +1 -1
  77. package/node_modules/appium-adb/build/lib/tools/system-calls.d.ts.map +1 -1
  78. package/node_modules/appium-adb/build/lib/tools/system-calls.js +7 -6
  79. package/node_modules/appium-adb/build/lib/tools/system-calls.js.map +1 -1
  80. package/node_modules/appium-adb/build/lib/tools/types.d.ts +4 -0
  81. package/node_modules/appium-adb/build/lib/tools/types.d.ts.map +1 -1
  82. package/node_modules/appium-adb/build/lib/utils/helpers/index.d.ts +1 -0
  83. package/node_modules/appium-adb/build/lib/utils/helpers/index.d.ts.map +1 -1
  84. package/node_modules/appium-adb/build/lib/utils/helpers/index.js +1 -0
  85. package/node_modules/appium-adb/build/lib/utils/helpers/index.js.map +1 -1
  86. package/node_modules/appium-adb/build/lib/utils/helpers/redact.d.ts +19 -0
  87. package/node_modules/appium-adb/build/lib/utils/helpers/redact.d.ts.map +1 -0
  88. package/node_modules/appium-adb/build/lib/utils/helpers/redact.js +57 -0
  89. package/node_modules/appium-adb/build/lib/utils/helpers/redact.js.map +1 -0
  90. package/node_modules/appium-adb/build/lib/utils/index.d.ts +2 -0
  91. package/node_modules/appium-adb/build/lib/utils/index.d.ts.map +1 -1
  92. package/node_modules/appium-adb/build/lib/utils/index.js +2 -0
  93. package/node_modules/appium-adb/build/lib/utils/index.js.map +1 -1
  94. package/node_modules/appium-adb/lib/tools/aab-utils.ts +35 -35
  95. package/node_modules/appium-adb/lib/tools/android-manifest.ts +1 -1
  96. package/node_modules/appium-adb/lib/tools/apk-signing.ts +26 -9
  97. package/node_modules/appium-adb/lib/tools/apks-utils.ts +13 -5
  98. package/node_modules/appium-adb/lib/tools/app-commands.ts +59 -68
  99. package/node_modules/appium-adb/lib/tools/device-settings.ts +1 -1
  100. package/node_modules/appium-adb/lib/tools/lockmgmt.ts +3 -8
  101. package/node_modules/appium-adb/lib/tools/system-calls.ts +15 -6
  102. package/node_modules/appium-adb/lib/tools/types.ts +4 -0
  103. package/node_modules/appium-adb/lib/utils/helpers/index.ts +1 -0
  104. package/node_modules/appium-adb/lib/utils/helpers/redact.ts +59 -0
  105. package/node_modules/appium-adb/lib/utils/index.ts +2 -0
  106. package/node_modules/appium-adb/package.json +10 -13
  107. package/node_modules/appium-android-driver/CHANGELOG.md +25 -0
  108. package/node_modules/appium-android-driver/build/lib/commands/context/exports.js +1 -1
  109. package/node_modules/appium-android-driver/build/lib/commands/context/exports.js.map +1 -1
  110. package/node_modules/appium-android-driver/build/lib/commands/file-actions.d.ts.map +1 -1
  111. package/node_modules/appium-android-driver/build/lib/commands/file-actions.js +55 -35
  112. package/node_modules/appium-android-driver/build/lib/commands/file-actions.js.map +1 -1
  113. package/node_modules/appium-android-driver/build/lib/commands/log.js +2 -2
  114. package/node_modules/appium-android-driver/build/lib/commands/log.js.map +1 -1
  115. package/node_modules/appium-android-driver/lib/commands/context/exports.ts +1 -1
  116. package/node_modules/appium-android-driver/lib/commands/file-actions.ts +58 -39
  117. package/node_modules/appium-android-driver/lib/commands/log.ts +2 -2
  118. package/node_modules/appium-android-driver/package.json +1 -1
  119. package/node_modules/appium-chromedriver/CHANGELOG.md +54 -0
  120. package/node_modules/appium-chromedriver/README.md +2 -4
  121. package/node_modules/appium-chromedriver/config/mapping.json +6 -1
  122. package/node_modules/appium-chromedriver/package.json +10 -13
  123. package/node_modules/bare-fs/binding.c +52 -23
  124. package/node_modules/bare-fs/index.d.ts +12 -10
  125. package/node_modules/bare-fs/index.js +43 -10
  126. package/node_modules/bare-fs/package.json +2 -1
  127. package/node_modules/bare-fs/prebuilds/android-arm/bare-fs.bare +0 -0
  128. package/node_modules/bare-fs/prebuilds/android-arm64/bare-fs.bare +0 -0
  129. package/node_modules/bare-fs/prebuilds/android-ia32/bare-fs.bare +0 -0
  130. package/node_modules/bare-fs/prebuilds/android-x64/bare-fs.bare +0 -0
  131. package/node_modules/bare-fs/prebuilds/darwin-arm64/bare-fs.bare +0 -0
  132. package/node_modules/bare-fs/prebuilds/darwin-x64/bare-fs.bare +0 -0
  133. package/node_modules/bare-fs/prebuilds/ios-arm64/bare-fs.bare +0 -0
  134. package/node_modules/bare-fs/prebuilds/ios-arm64-simulator/bare-fs.bare +0 -0
  135. package/node_modules/bare-fs/prebuilds/ios-x64-simulator/bare-fs.bare +0 -0
  136. package/node_modules/bare-fs/prebuilds/linux-arm64/bare-fs.bare +0 -0
  137. package/node_modules/bare-fs/prebuilds/linux-x64/bare-fs.bare +0 -0
  138. package/node_modules/bare-fs/prebuilds/win32-arm64/bare-fs.bare +0 -0
  139. package/node_modules/bare-fs/prebuilds/win32-x64/bare-fs.bare +0 -0
  140. package/node_modules/bare-url/README.md +4 -0
  141. package/node_modules/bare-url/index.d.ts +3 -0
  142. package/node_modules/bare-url/index.js +42 -18
  143. package/node_modules/bare-url/lib/errors.js +4 -0
  144. package/node_modules/bare-url/package.json +1 -1
  145. package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
  146. package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
  147. package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
  148. package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
  149. package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
  150. package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
  151. package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
  152. package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
  153. package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
  154. package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
  155. package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
  156. package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
  157. package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
  158. package/node_modules/bplist-creator/README.md +26 -6
  159. package/node_modules/bplist-creator/dist/index.cjs +508 -0
  160. package/node_modules/bplist-creator/dist/index.cjs.map +7 -0
  161. package/node_modules/bplist-creator/dist/index.d.cts +12 -0
  162. package/node_modules/bplist-creator/dist/index.d.ts +12 -0
  163. package/node_modules/bplist-creator/dist/index.mjs +472 -0
  164. package/node_modules/bplist-creator/dist/index.mjs.map +7 -0
  165. package/node_modules/bplist-creator/package.json +43 -9
  166. package/node_modules/bplist-parser/README.md +37 -3
  167. package/node_modules/bplist-parser/dist/index.cjs +385 -0
  168. package/node_modules/bplist-parser/dist/index.cjs.map +7 -0
  169. package/node_modules/bplist-parser/dist/index.d.cts +13 -0
  170. package/node_modules/bplist-parser/dist/index.d.ts +13 -0
  171. package/node_modules/bplist-parser/{bplistParser.js → dist/index.mjs} +141 -171
  172. package/node_modules/bplist-parser/dist/index.mjs.map +7 -0
  173. package/node_modules/bplist-parser/package.json +39 -12
  174. package/node_modules/follow-redirects/index.js +10 -1
  175. package/node_modules/follow-redirects/package.json +1 -1
  176. package/node_modules/io.appium.settings/CHANGELOG.md +65 -0
  177. package/node_modules/io.appium.settings/README.md +126 -0
  178. package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
  179. package/node_modules/io.appium.settings/build/lib/client.d.ts +4 -0
  180. package/node_modules/io.appium.settings/build/lib/client.d.ts.map +1 -1
  181. package/node_modules/io.appium.settings/build/lib/client.js +4 -0
  182. package/node_modules/io.appium.settings/build/lib/client.js.map +1 -1
  183. package/node_modules/io.appium.settings/build/lib/commands/clipboard.d.ts.map +1 -1
  184. package/node_modules/io.appium.settings/build/lib/commands/clipboard.js +1 -1
  185. package/node_modules/io.appium.settings/build/lib/commands/clipboard.js.map +1 -1
  186. package/node_modules/io.appium.settings/build/lib/commands/jpeg-stream.d.ts +55 -0
  187. package/node_modules/io.appium.settings/build/lib/commands/jpeg-stream.d.ts.map +1 -0
  188. package/node_modules/io.appium.settings/build/lib/commands/jpeg-stream.js +156 -0
  189. package/node_modules/io.appium.settings/build/lib/commands/jpeg-stream.js.map +1 -0
  190. package/node_modules/io.appium.settings/build/lib/commands/media-projection.d.ts.map +1 -1
  191. package/node_modules/io.appium.settings/build/lib/commands/media-projection.js.map +1 -1
  192. package/node_modules/io.appium.settings/build/lib/commands/media.js +1 -1
  193. package/node_modules/io.appium.settings/build/lib/commands/media.js.map +1 -1
  194. package/node_modules/io.appium.settings/build/lib/commands/network.js +1 -1
  195. package/node_modules/io.appium.settings/build/lib/commands/network.js.map +1 -1
  196. package/node_modules/io.appium.settings/build/lib/commands/types.d.ts +65 -0
  197. package/node_modules/io.appium.settings/build/lib/commands/types.d.ts.map +1 -1
  198. package/node_modules/io.appium.settings/build/lib/commands/video-stream.d.ts +56 -0
  199. package/node_modules/io.appium.settings/build/lib/commands/video-stream.d.ts.map +1 -0
  200. package/node_modules/io.appium.settings/build/lib/commands/video-stream.js +166 -0
  201. package/node_modules/io.appium.settings/build/lib/commands/video-stream.js.map +1 -0
  202. package/node_modules/io.appium.settings/build/lib/constants.d.ts +7 -0
  203. package/node_modules/io.appium.settings/build/lib/constants.d.ts.map +1 -1
  204. package/node_modules/io.appium.settings/build/lib/constants.js +7 -0
  205. package/node_modules/io.appium.settings/build/lib/constants.js.map +1 -1
  206. package/node_modules/io.appium.settings/build/lib/index.js +1 -1
  207. package/node_modules/io.appium.settings/build/lib/index.js.map +1 -1
  208. package/node_modules/io.appium.settings/build/lib/{utils.d.ts → utils/apk-path.d.ts} +1 -1
  209. package/node_modules/io.appium.settings/build/lib/utils/apk-path.d.ts.map +1 -0
  210. package/node_modules/io.appium.settings/build/lib/{utils.js → utils/apk-path.js} +1 -1
  211. package/node_modules/io.appium.settings/build/lib/utils/apk-path.js.map +1 -0
  212. package/node_modules/io.appium.settings/build/lib/utils/index.d.ts +5 -0
  213. package/node_modules/io.appium.settings/build/lib/utils/index.d.ts.map +1 -0
  214. package/node_modules/io.appium.settings/build/lib/utils/index.js +4 -0
  215. package/node_modules/io.appium.settings/build/lib/utils/index.js.map +1 -0
  216. package/node_modules/io.appium.settings/build/lib/utils/streaming-protocol.d.ts +47 -0
  217. package/node_modules/io.appium.settings/build/lib/utils/streaming-protocol.d.ts.map +1 -0
  218. package/node_modules/io.appium.settings/build/lib/utils/streaming-protocol.js +67 -0
  219. package/node_modules/io.appium.settings/build/lib/utils/streaming-protocol.js.map +1 -0
  220. package/node_modules/io.appium.settings/build/lib/utils/streaming-transport.d.ts +142 -0
  221. package/node_modules/io.appium.settings/build/lib/utils/streaming-transport.d.ts.map +1 -0
  222. package/node_modules/io.appium.settings/build/lib/utils/streaming-transport.js +416 -0
  223. package/node_modules/io.appium.settings/build/lib/utils/streaming-transport.js.map +1 -0
  224. package/node_modules/io.appium.settings/lib/client.ts +5 -0
  225. package/node_modules/io.appium.settings/lib/commands/clipboard.ts +1 -0
  226. package/node_modules/io.appium.settings/lib/commands/jpeg-stream.ts +175 -0
  227. package/node_modules/io.appium.settings/lib/commands/media-projection.ts +1 -5
  228. package/node_modules/io.appium.settings/lib/commands/media.ts +1 -1
  229. package/node_modules/io.appium.settings/lib/commands/network.ts +1 -1
  230. package/node_modules/io.appium.settings/lib/commands/types.ts +70 -0
  231. package/node_modules/io.appium.settings/lib/commands/video-stream.ts +185 -0
  232. package/node_modules/io.appium.settings/lib/constants.ts +10 -0
  233. package/node_modules/io.appium.settings/lib/index.ts +1 -1
  234. package/node_modules/io.appium.settings/lib/utils/index.ts +4 -0
  235. package/node_modules/io.appium.settings/lib/utils/streaming-protocol.ts +93 -0
  236. package/node_modules/io.appium.settings/lib/utils/streaming-transport.ts +450 -0
  237. package/node_modules/io.appium.settings/package.json +17 -20
  238. package/node_modules/lru-cache/dist/commonjs/react-native/diagnostics-channel-react-native.d.ts.map +1 -0
  239. package/node_modules/lru-cache/dist/commonjs/react-native/diagnostics-channel-react-native.js.map +1 -0
  240. package/node_modules/lru-cache/dist/commonjs/react-native/diagnostics-channel.d.ts +5 -0
  241. package/node_modules/lru-cache/dist/commonjs/react-native/diagnostics-channel.js +7 -0
  242. package/node_modules/lru-cache/dist/commonjs/react-native/index.d.ts +1400 -0
  243. package/node_modules/lru-cache/dist/commonjs/react-native/index.d.ts.map +1 -0
  244. package/node_modules/lru-cache/dist/commonjs/react-native/index.js +1733 -0
  245. package/node_modules/lru-cache/dist/commonjs/react-native/index.js.map +1 -0
  246. package/node_modules/lru-cache/dist/commonjs/react-native/perf.d.ts +12 -0
  247. package/node_modules/lru-cache/dist/commonjs/react-native/perf.d.ts.map +1 -0
  248. package/node_modules/lru-cache/dist/commonjs/react-native/perf.js +10 -0
  249. package/node_modules/lru-cache/dist/commonjs/react-native/perf.js.map +1 -0
  250. package/node_modules/lru-cache/dist/esm/react-native/diagnostics-channel-react-native.d.ts.map +1 -0
  251. package/node_modules/lru-cache/dist/esm/react-native/diagnostics-channel-react-native.js.map +1 -0
  252. package/node_modules/lru-cache/dist/esm/react-native/diagnostics-channel.d.ts +5 -0
  253. package/node_modules/lru-cache/dist/esm/react-native/diagnostics-channel.js +4 -0
  254. package/node_modules/lru-cache/dist/esm/react-native/index.d.ts +1400 -0
  255. package/node_modules/lru-cache/dist/esm/react-native/index.d.ts.map +1 -0
  256. package/node_modules/lru-cache/dist/esm/react-native/index.js +1729 -0
  257. package/node_modules/lru-cache/dist/esm/react-native/index.js.map +1 -0
  258. package/node_modules/lru-cache/dist/esm/react-native/perf.d.ts +12 -0
  259. package/node_modules/lru-cache/dist/esm/react-native/perf.d.ts.map +1 -0
  260. package/node_modules/lru-cache/dist/esm/react-native/perf.js +7 -0
  261. package/node_modules/lru-cache/dist/esm/react-native/perf.js.map +1 -0
  262. package/node_modules/lru-cache/package.json +27 -1
  263. package/node_modules/morgan/README.md +49 -10
  264. package/node_modules/morgan/index.js +24 -6
  265. package/node_modules/morgan/package.json +6 -6
  266. package/node_modules/qs/.github/THREAT_MODEL.md +4 -2
  267. package/node_modules/qs/CHANGELOG.md +38 -14
  268. package/node_modules/qs/README.md +31 -3
  269. package/node_modules/qs/dist/qs.js +20 -20
  270. package/node_modules/qs/lib/parse.js +94 -4
  271. package/node_modules/qs/lib/stringify.js +4 -4
  272. package/node_modules/qs/lib/utils.js +130 -6
  273. package/node_modules/qs/package.json +4 -4
  274. package/node_modules/qs/test/parse.js +174 -0
  275. package/node_modules/qs/test/stringify.js +263 -33
  276. package/node_modules/qs/test/utils.js +184 -0
  277. package/node_modules/readable-stream/lib/internal/shims/process.js +19 -0
  278. package/node_modules/readable-stream/lib/internal/streams/destroy.js +1 -1
  279. package/node_modules/readable-stream/lib/internal/streams/duplexify.js +1 -1
  280. package/node_modules/readable-stream/lib/internal/streams/end-of-stream.js +1 -1
  281. package/node_modules/readable-stream/lib/internal/streams/from.js +1 -1
  282. package/node_modules/readable-stream/lib/internal/streams/legacy.js +6 -1
  283. package/node_modules/readable-stream/lib/internal/streams/pipeline.js +1 -1
  284. package/node_modules/readable-stream/lib/internal/streams/readable.js +1 -1
  285. package/node_modules/readable-stream/lib/internal/streams/writable.js +1 -1
  286. package/node_modules/readable-stream/package.json +3 -2
  287. package/node_modules/sharp/dist/index.d.cts +2 -2
  288. package/node_modules/sharp/dist/index.d.mts +3 -3
  289. package/node_modules/sharp/dist/is.cjs +8 -2
  290. package/node_modules/sharp/dist/is.mjs +8 -2
  291. package/node_modules/sharp/dist/operation.cjs +2 -2
  292. package/node_modules/sharp/dist/operation.mjs +2 -2
  293. package/node_modules/sharp/dist/output.cjs +1 -0
  294. package/node_modules/sharp/dist/output.mjs +1 -0
  295. package/node_modules/sharp/dist/resize.cjs +14 -14
  296. package/node_modules/sharp/dist/resize.mjs +14 -14
  297. package/node_modules/sharp/dist/sharp.cjs +3 -3
  298. package/node_modules/sharp/dist/sharp.mjs +3 -3
  299. package/node_modules/sharp/lib/index.d.ts +2 -2
  300. package/node_modules/sharp/package.json +35 -35
  301. package/node_modules/sharp/src/binding.gyp +1 -1
  302. package/node_modules/sharp/src/common.cc +4 -4
  303. package/node_modules/sharp/src/common.h +2 -2
  304. package/node_modules/sharp/src/pipeline.cc +31 -6
  305. package/node_modules/sharp/src/utilities.cc +1 -1
  306. package/node_modules/stream-buffers/.codeclimate.yml +12 -0
  307. package/node_modules/stream-buffers/.eslintignore +1 -0
  308. package/node_modules/stream-buffers/.eslintrc +25 -0
  309. package/node_modules/stream-buffers/.github/workflows/codeql-analysis.yml +71 -0
  310. package/node_modules/stream-buffers/.github/workflows/node.js.yml +31 -0
  311. package/node_modules/stream-buffers/.mailmap +1 -0
  312. package/node_modules/stream-buffers/.nvmrc +1 -0
  313. package/node_modules/stream-buffers/README.md +65 -65
  314. package/node_modules/stream-buffers/lib/constants.js +8 -6
  315. package/node_modules/stream-buffers/lib/readable_streambuffer.js +114 -136
  316. package/node_modules/stream-buffers/lib/streambuffer.js +5 -3
  317. package/node_modules/stream-buffers/lib/writable_streambuffer.js +72 -97
  318. package/node_modules/stream-buffers/package.json +7 -5
  319. package/node_modules/tar-stream/package.json +7 -7
  320. package/node_modules/type-fest/index.d.ts +7 -7
  321. package/node_modules/type-fest/package.json +2 -1
  322. package/node_modules/type-fest/readme.md +7 -16
  323. package/node_modules/type-fest/source/all-extend.d.ts +9 -7
  324. package/node_modules/type-fest/source/array-reverse.d.ts +13 -12
  325. package/node_modules/type-fest/source/array-tail.d.ts +3 -3
  326. package/node_modules/type-fest/source/delimiter-case.d.ts +1 -1
  327. package/node_modules/type-fest/source/get.d.ts +1 -1
  328. package/node_modules/type-fest/source/int-closed-range.d.ts +4 -1
  329. package/node_modules/type-fest/source/int-range.d.ts +56 -9
  330. package/node_modules/type-fest/source/internal/array.d.ts +14 -13
  331. package/node_modules/type-fest/source/internal/numeric.d.ts +0 -38
  332. package/node_modules/type-fest/source/internal/object.d.ts +30 -1
  333. package/node_modules/type-fest/source/is-boolean-literal.d.ts +39 -0
  334. package/node_modules/type-fest/source/is-literal.d.ts +43 -269
  335. package/node_modules/type-fest/source/is-numeric-literal.d.ts +50 -0
  336. package/node_modules/type-fest/source/is-string-literal.d.ts +72 -0
  337. package/node_modules/type-fest/source/is-symbol-literal.d.ts +39 -0
  338. package/node_modules/type-fest/source/is-tuple.d.ts +3 -3
  339. package/node_modules/type-fest/source/jsonify.d.ts +1 -5
  340. package/node_modules/type-fest/source/merge-deep.d.ts +3 -3
  341. package/node_modules/type-fest/source/remove-prefix.d.ts +1 -1
  342. package/node_modules/type-fest/source/remove-suffix.d.ts +1 -1
  343. package/node_modules/type-fest/source/rename-keys.d.ts +163 -0
  344. package/node_modules/type-fest/source/set-required.d.ts +10 -9
  345. package/node_modules/type-fest/source/shared-union-fields-deep.d.ts +6 -4
  346. package/node_modules/type-fest/source/some-extend.d.ts +9 -7
  347. package/node_modules/type-fest/source/split-on-rest-element.d.ts +14 -13
  348. package/node_modules/type-fest/source/split.d.ts +22 -11
  349. package/node_modules/type-fest/source/string-repeat.d.ts +1 -1
  350. package/node_modules/type-fest/source/string-to-array.d.ts +1 -1
  351. package/node_modules/type-fest/source/tsconfig-json.d.ts +1 -1
  352. package/node_modules/type-fest/source/typed-array.d.ts +6 -0
  353. package/node_modules/type-fest/source/union-max.d.ts +56 -0
  354. package/node_modules/type-fest/source/writable.d.ts +2 -2
  355. package/node_modules/xpath/LICENSE +22 -22
  356. package/node_modules/xpath/package.json +43 -43
  357. package/node_modules/xpath/xpath.d.ts +51 -51
  358. package/node_modules/xpath/xpath.js +17 -2
  359. package/package.json +4 -4
  360. package/node_modules/@appium/base-driver/node_modules/asyncbox/LICENSE +0 -203
  361. package/node_modules/@appium/base-driver/node_modules/asyncbox/README.md +0 -215
  362. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/asyncbox.d.ts +0 -103
  363. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/asyncbox.d.ts.map +0 -1
  364. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/asyncbox.js +0 -301
  365. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/asyncbox.js.map +0 -1
  366. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/types.d.ts +0 -84
  367. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/types.d.ts.map +0 -1
  368. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/types.js +0 -3
  369. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/lib/types.js.map +0 -1
  370. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/cjs/package.json +0 -3
  371. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/asyncbox.d.ts +0 -103
  372. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/asyncbox.d.ts.map +0 -1
  373. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/asyncbox.js +0 -288
  374. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/asyncbox.js.map +0 -1
  375. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/types.d.ts +0 -84
  376. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/types.d.ts.map +0 -1
  377. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/types.js +0 -2
  378. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/lib/types.js.map +0 -1
  379. package/node_modules/@appium/base-driver/node_modules/asyncbox/build/esm/package.json +0 -3
  380. package/node_modules/@appium/base-driver/node_modules/asyncbox/lib/asyncbox.ts +0 -365
  381. package/node_modules/@appium/base-driver/node_modules/asyncbox/lib/types.ts +0 -88
  382. package/node_modules/@appium/base-driver/node_modules/asyncbox/package.json +0 -74
  383. package/node_modules/@appium/base-driver/node_modules/axios/CHANGELOG.md +0 -1872
  384. package/node_modules/@appium/base-driver/node_modules/axios/LICENSE +0 -7
  385. package/node_modules/@appium/base-driver/node_modules/axios/MIGRATION_GUIDE.md +0 -877
  386. package/node_modules/@appium/base-driver/node_modules/axios/README.md +0 -2623
  387. package/node_modules/@appium/base-driver/node_modules/axios/dist/axios.js +0 -5509
  388. package/node_modules/@appium/base-driver/node_modules/axios/dist/axios.min.js +0 -5
  389. package/node_modules/@appium/base-driver/node_modules/axios/dist/axios.min.js.map +0 -1
  390. package/node_modules/@appium/base-driver/node_modules/axios/dist/browser/axios.cjs +0 -5469
  391. package/node_modules/@appium/base-driver/node_modules/axios/dist/esm/axios.js +0 -5490
  392. package/node_modules/@appium/base-driver/node_modules/axios/dist/esm/axios.min.js +0 -3
  393. package/node_modules/@appium/base-driver/node_modules/axios/dist/esm/axios.min.js.map +0 -1
  394. package/node_modules/@appium/base-driver/node_modules/axios/dist/node/axios.cjs +0 -6356
  395. package/node_modules/@appium/base-driver/node_modules/axios/index.d.cts +0 -762
  396. package/node_modules/@appium/base-driver/node_modules/axios/index.d.ts +0 -783
  397. package/node_modules/@appium/base-driver/node_modules/axios/index.js +0 -45
  398. package/node_modules/@appium/base-driver/node_modules/axios/lib/adapters/README.md +0 -36
  399. package/node_modules/@appium/base-driver/node_modules/axios/lib/adapters/adapters.js +0 -132
  400. package/node_modules/@appium/base-driver/node_modules/axios/lib/adapters/fetch.js +0 -643
  401. package/node_modules/@appium/base-driver/node_modules/axios/lib/adapters/http.js +0 -1406
  402. package/node_modules/@appium/base-driver/node_modules/axios/lib/adapters/xhr.js +0 -228
  403. package/node_modules/@appium/base-driver/node_modules/axios/lib/axios.js +0 -89
  404. package/node_modules/@appium/base-driver/node_modules/axios/lib/cancel/CancelToken.js +0 -135
  405. package/node_modules/@appium/base-driver/node_modules/axios/lib/cancel/CanceledError.js +0 -22
  406. package/node_modules/@appium/base-driver/node_modules/axios/lib/cancel/isCancel.js +0 -5
  407. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/Axios.js +0 -301
  408. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/AxiosError.js +0 -219
  409. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/AxiosHeaders.js +0 -474
  410. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/InterceptorManager.js +0 -72
  411. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/README.md +0 -8
  412. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/buildFullPath.js +0 -88
  413. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/dispatchRequest.js +0 -89
  414. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/mergeConfig.js +0 -174
  415. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/setFormDataHeaders.js +0 -27
  416. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/settle.js +0 -27
  417. package/node_modules/@appium/base-driver/node_modules/axios/lib/core/transformData.js +0 -28
  418. package/node_modules/@appium/base-driver/node_modules/axios/lib/defaults/index.js +0 -177
  419. package/node_modules/@appium/base-driver/node_modules/axios/lib/defaults/transitional.js +0 -10
  420. package/node_modules/@appium/base-driver/node_modules/axios/lib/env/README.md +0 -3
  421. package/node_modules/@appium/base-driver/node_modules/axios/lib/env/classes/FormData.js +0 -2
  422. package/node_modules/@appium/base-driver/node_modules/axios/lib/env/data.js +0 -1
  423. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/AxiosTransformStream.js +0 -156
  424. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/AxiosURLSearchParams.js +0 -59
  425. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/Http2Sessions.js +0 -119
  426. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/HttpStatusCode.js +0 -78
  427. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/README.md +0 -7
  428. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/ZlibHeaderTransformStream.js +0 -29
  429. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/bind.js +0 -14
  430. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/buildURL.js +0 -69
  431. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/callbackify.js +0 -18
  432. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/combineURLs.js +0 -23
  433. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/composeSignals.js +0 -68
  434. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/cookies.js +0 -64
  435. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/deprecatedMethod.js +0 -31
  436. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/estimateDataURLDecodedBytes.js +0 -166
  437. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/formDataToJSON.js +0 -125
  438. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/formDataToStream.js +0 -119
  439. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/fromDataURI.js +0 -68
  440. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/isAbsoluteURL.js +0 -19
  441. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/isAxiosError.js +0 -14
  442. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/isURLSameOrigin.js +0 -16
  443. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/null.js +0 -2
  444. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/parseHeaders.js +0 -71
  445. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/parseProtocol.js +0 -6
  446. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/progressEventReducer.js +0 -54
  447. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/readBlob.js +0 -15
  448. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/resolveConfig.js +0 -105
  449. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/sanitizeHeaderValue.js +0 -60
  450. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/shouldBypassProxy.js +0 -329
  451. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/speedometer.js +0 -55
  452. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/spread.js +0 -28
  453. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/throttle.js +0 -44
  454. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/toFormData.js +0 -286
  455. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/toURLEncodedForm.js +0 -19
  456. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/trackStream.js +0 -89
  457. package/node_modules/@appium/base-driver/node_modules/axios/lib/helpers/validator.js +0 -112
  458. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/browser/classes/Blob.js +0 -3
  459. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/browser/classes/FormData.js +0 -3
  460. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/browser/classes/URLSearchParams.js +0 -4
  461. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/browser/index.js +0 -13
  462. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/common/utils.js +0 -52
  463. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/index.js +0 -7
  464. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/node/classes/Buffer.js +0 -11
  465. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/node/classes/FormData.js +0 -3
  466. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/node/classes/URLSearchParams.js +0 -4
  467. package/node_modules/@appium/base-driver/node_modules/axios/lib/platform/node/index.js +0 -37
  468. package/node_modules/@appium/base-driver/node_modules/axios/lib/utils.js +0 -1029
  469. package/node_modules/@appium/base-driver/node_modules/axios/package.json +0 -203
  470. package/node_modules/@appium/support/node_modules/asyncbox/LICENSE +0 -203
  471. package/node_modules/@appium/support/node_modules/asyncbox/README.md +0 -215
  472. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/asyncbox.d.ts +0 -103
  473. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/asyncbox.d.ts.map +0 -1
  474. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/asyncbox.js +0 -301
  475. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/asyncbox.js.map +0 -1
  476. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/types.d.ts +0 -84
  477. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/types.d.ts.map +0 -1
  478. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/types.js +0 -3
  479. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/lib/types.js.map +0 -1
  480. package/node_modules/@appium/support/node_modules/asyncbox/build/cjs/package.json +0 -3
  481. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/asyncbox.d.ts +0 -103
  482. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/asyncbox.d.ts.map +0 -1
  483. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/asyncbox.js +0 -288
  484. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/asyncbox.js.map +0 -1
  485. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/types.d.ts +0 -84
  486. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/types.d.ts.map +0 -1
  487. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/types.js +0 -2
  488. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/lib/types.js.map +0 -1
  489. package/node_modules/@appium/support/node_modules/asyncbox/build/esm/package.json +0 -3
  490. package/node_modules/@appium/support/node_modules/asyncbox/lib/asyncbox.ts +0 -365
  491. package/node_modules/@appium/support/node_modules/asyncbox/lib/types.ts +0 -88
  492. package/node_modules/@appium/support/node_modules/asyncbox/package.json +0 -74
  493. package/node_modules/@appium/support/node_modules/axios/CHANGELOG.md +0 -1872
  494. package/node_modules/@appium/support/node_modules/axios/LICENSE +0 -7
  495. package/node_modules/@appium/support/node_modules/axios/MIGRATION_GUIDE.md +0 -877
  496. package/node_modules/@appium/support/node_modules/axios/README.md +0 -2623
  497. package/node_modules/@appium/support/node_modules/axios/dist/axios.js +0 -5509
  498. package/node_modules/@appium/support/node_modules/axios/dist/axios.min.js +0 -5
  499. package/node_modules/@appium/support/node_modules/axios/dist/axios.min.js.map +0 -1
  500. package/node_modules/@appium/support/node_modules/axios/dist/browser/axios.cjs +0 -5469
  501. package/node_modules/@appium/support/node_modules/axios/dist/esm/axios.js +0 -5490
  502. package/node_modules/@appium/support/node_modules/axios/dist/esm/axios.min.js +0 -3
  503. package/node_modules/@appium/support/node_modules/axios/dist/esm/axios.min.js.map +0 -1
  504. package/node_modules/@appium/support/node_modules/axios/dist/node/axios.cjs +0 -6356
  505. package/node_modules/@appium/support/node_modules/axios/index.d.cts +0 -762
  506. package/node_modules/@appium/support/node_modules/axios/index.d.ts +0 -783
  507. package/node_modules/@appium/support/node_modules/axios/index.js +0 -45
  508. package/node_modules/@appium/support/node_modules/axios/lib/adapters/README.md +0 -36
  509. package/node_modules/@appium/support/node_modules/axios/lib/adapters/adapters.js +0 -132
  510. package/node_modules/@appium/support/node_modules/axios/lib/adapters/fetch.js +0 -643
  511. package/node_modules/@appium/support/node_modules/axios/lib/adapters/http.js +0 -1406
  512. package/node_modules/@appium/support/node_modules/axios/lib/adapters/xhr.js +0 -228
  513. package/node_modules/@appium/support/node_modules/axios/lib/axios.js +0 -89
  514. package/node_modules/@appium/support/node_modules/axios/lib/cancel/CancelToken.js +0 -135
  515. package/node_modules/@appium/support/node_modules/axios/lib/cancel/CanceledError.js +0 -22
  516. package/node_modules/@appium/support/node_modules/axios/lib/cancel/isCancel.js +0 -5
  517. package/node_modules/@appium/support/node_modules/axios/lib/core/Axios.js +0 -301
  518. package/node_modules/@appium/support/node_modules/axios/lib/core/AxiosError.js +0 -219
  519. package/node_modules/@appium/support/node_modules/axios/lib/core/AxiosHeaders.js +0 -474
  520. package/node_modules/@appium/support/node_modules/axios/lib/core/InterceptorManager.js +0 -72
  521. package/node_modules/@appium/support/node_modules/axios/lib/core/README.md +0 -8
  522. package/node_modules/@appium/support/node_modules/axios/lib/core/buildFullPath.js +0 -88
  523. package/node_modules/@appium/support/node_modules/axios/lib/core/dispatchRequest.js +0 -89
  524. package/node_modules/@appium/support/node_modules/axios/lib/core/mergeConfig.js +0 -174
  525. package/node_modules/@appium/support/node_modules/axios/lib/core/setFormDataHeaders.js +0 -27
  526. package/node_modules/@appium/support/node_modules/axios/lib/core/settle.js +0 -27
  527. package/node_modules/@appium/support/node_modules/axios/lib/core/transformData.js +0 -28
  528. package/node_modules/@appium/support/node_modules/axios/lib/defaults/index.js +0 -177
  529. package/node_modules/@appium/support/node_modules/axios/lib/defaults/transitional.js +0 -10
  530. package/node_modules/@appium/support/node_modules/axios/lib/env/README.md +0 -3
  531. package/node_modules/@appium/support/node_modules/axios/lib/env/classes/FormData.js +0 -2
  532. package/node_modules/@appium/support/node_modules/axios/lib/env/data.js +0 -1
  533. package/node_modules/@appium/support/node_modules/axios/lib/helpers/AxiosTransformStream.js +0 -156
  534. package/node_modules/@appium/support/node_modules/axios/lib/helpers/AxiosURLSearchParams.js +0 -59
  535. package/node_modules/@appium/support/node_modules/axios/lib/helpers/Http2Sessions.js +0 -119
  536. package/node_modules/@appium/support/node_modules/axios/lib/helpers/HttpStatusCode.js +0 -78
  537. package/node_modules/@appium/support/node_modules/axios/lib/helpers/README.md +0 -7
  538. package/node_modules/@appium/support/node_modules/axios/lib/helpers/ZlibHeaderTransformStream.js +0 -29
  539. package/node_modules/@appium/support/node_modules/axios/lib/helpers/bind.js +0 -14
  540. package/node_modules/@appium/support/node_modules/axios/lib/helpers/buildURL.js +0 -69
  541. package/node_modules/@appium/support/node_modules/axios/lib/helpers/callbackify.js +0 -18
  542. package/node_modules/@appium/support/node_modules/axios/lib/helpers/combineURLs.js +0 -23
  543. package/node_modules/@appium/support/node_modules/axios/lib/helpers/composeSignals.js +0 -68
  544. package/node_modules/@appium/support/node_modules/axios/lib/helpers/cookies.js +0 -64
  545. package/node_modules/@appium/support/node_modules/axios/lib/helpers/deprecatedMethod.js +0 -31
  546. package/node_modules/@appium/support/node_modules/axios/lib/helpers/estimateDataURLDecodedBytes.js +0 -166
  547. package/node_modules/@appium/support/node_modules/axios/lib/helpers/formDataToJSON.js +0 -125
  548. package/node_modules/@appium/support/node_modules/axios/lib/helpers/formDataToStream.js +0 -119
  549. package/node_modules/@appium/support/node_modules/axios/lib/helpers/fromDataURI.js +0 -68
  550. package/node_modules/@appium/support/node_modules/axios/lib/helpers/isAbsoluteURL.js +0 -19
  551. package/node_modules/@appium/support/node_modules/axios/lib/helpers/isAxiosError.js +0 -14
  552. package/node_modules/@appium/support/node_modules/axios/lib/helpers/isURLSameOrigin.js +0 -16
  553. package/node_modules/@appium/support/node_modules/axios/lib/helpers/null.js +0 -2
  554. package/node_modules/@appium/support/node_modules/axios/lib/helpers/parseHeaders.js +0 -71
  555. package/node_modules/@appium/support/node_modules/axios/lib/helpers/parseProtocol.js +0 -6
  556. package/node_modules/@appium/support/node_modules/axios/lib/helpers/progressEventReducer.js +0 -54
  557. package/node_modules/@appium/support/node_modules/axios/lib/helpers/readBlob.js +0 -15
  558. package/node_modules/@appium/support/node_modules/axios/lib/helpers/resolveConfig.js +0 -105
  559. package/node_modules/@appium/support/node_modules/axios/lib/helpers/sanitizeHeaderValue.js +0 -60
  560. package/node_modules/@appium/support/node_modules/axios/lib/helpers/shouldBypassProxy.js +0 -329
  561. package/node_modules/@appium/support/node_modules/axios/lib/helpers/speedometer.js +0 -55
  562. package/node_modules/@appium/support/node_modules/axios/lib/helpers/spread.js +0 -28
  563. package/node_modules/@appium/support/node_modules/axios/lib/helpers/throttle.js +0 -44
  564. package/node_modules/@appium/support/node_modules/axios/lib/helpers/toFormData.js +0 -286
  565. package/node_modules/@appium/support/node_modules/axios/lib/helpers/toURLEncodedForm.js +0 -19
  566. package/node_modules/@appium/support/node_modules/axios/lib/helpers/trackStream.js +0 -89
  567. package/node_modules/@appium/support/node_modules/axios/lib/helpers/validator.js +0 -112
  568. package/node_modules/@appium/support/node_modules/axios/lib/platform/browser/classes/Blob.js +0 -3
  569. package/node_modules/@appium/support/node_modules/axios/lib/platform/browser/classes/FormData.js +0 -3
  570. package/node_modules/@appium/support/node_modules/axios/lib/platform/browser/classes/URLSearchParams.js +0 -4
  571. package/node_modules/@appium/support/node_modules/axios/lib/platform/browser/index.js +0 -13
  572. package/node_modules/@appium/support/node_modules/axios/lib/platform/common/utils.js +0 -52
  573. package/node_modules/@appium/support/node_modules/axios/lib/platform/index.js +0 -7
  574. package/node_modules/@appium/support/node_modules/axios/lib/platform/node/classes/Buffer.js +0 -11
  575. package/node_modules/@appium/support/node_modules/axios/lib/platform/node/classes/FormData.js +0 -3
  576. package/node_modules/@appium/support/node_modules/axios/lib/platform/node/classes/URLSearchParams.js +0 -4
  577. package/node_modules/@appium/support/node_modules/axios/lib/platform/node/index.js +0 -37
  578. package/node_modules/@appium/support/node_modules/axios/lib/utils.js +0 -1029
  579. package/node_modules/@appium/support/node_modules/axios/package.json +0 -203
  580. package/node_modules/@img/sharp-linux-x64/lib/sharp-linux-x64-0.35.4.node +0 -0
  581. package/node_modules/big-integer/BigInteger.d.ts +0 -2393
  582. package/node_modules/big-integer/BigInteger.js +0 -1453
  583. package/node_modules/big-integer/BigInteger.min.js +0 -1
  584. package/node_modules/big-integer/LICENSE +0 -24
  585. package/node_modules/big-integer/README.md +0 -589
  586. package/node_modules/big-integer/bower.json +0 -29
  587. package/node_modules/big-integer/package.json +0 -48
  588. package/node_modules/big-integer/tsconfig.json +0 -24
  589. package/node_modules/bplist-creator/bplistCreator.d.ts +0 -8
  590. package/node_modules/bplist-creator/bplistCreator.js +0 -460
  591. package/node_modules/bplist-creator/test/airplay.bplist +0 -0
  592. package/node_modules/bplist-creator/test/binaryData.bplist +0 -0
  593. package/node_modules/bplist-creator/test/creatorTest.js +0 -211
  594. package/node_modules/bplist-creator/test/iTunes-small.bplist +0 -0
  595. package/node_modules/bplist-creator/test/integers.bplist +0 -0
  596. package/node_modules/bplist-creator/test/sample1.bplist +0 -0
  597. package/node_modules/bplist-creator/test/sample2.bplist +0 -0
  598. package/node_modules/bplist-creator/test/uid.bplist +0 -0
  599. package/node_modules/bplist-creator/test/utf16.bplist +0 -0
  600. package/node_modules/bplist-parser/.editorconfig +0 -12
  601. package/node_modules/bplist-parser/.eslintignore +0 -1
  602. package/node_modules/bplist-parser/.eslintrc.js +0 -296
  603. package/node_modules/bplist-parser/bplistParser.d.ts +0 -8
  604. package/node_modules/io.appium.settings/build/lib/utils.d.ts.map +0 -1
  605. package/node_modules/io.appium.settings/build/lib/utils.js.map +0 -1
  606. package/node_modules/stream-buffers/.travis.yml +0 -28
  607. package/node_modules/stream-buffers/coverage/coverage.json +0 -1
  608. package/node_modules/stream-buffers/coverage/lcov-report/base.css +0 -182
  609. package/node_modules/stream-buffers/coverage/lcov-report/index.html +0 -73
  610. package/node_modules/stream-buffers/coverage/lcov-report/lib/constants.js.html +0 -63
  611. package/node_modules/stream-buffers/coverage/lcov-report/lib/index.html +0 -112
  612. package/node_modules/stream-buffers/coverage/lcov-report/lib/readable_streambuffer.js.html +0 -453
  613. package/node_modules/stream-buffers/coverage/lcov-report/lib/streambuffer.js.html +0 -54
  614. package/node_modules/stream-buffers/coverage/lcov-report/lib/writable_streambuffer.js.html +0 -336
  615. package/node_modules/stream-buffers/coverage/lcov-report/prettify.css +0 -1
  616. package/node_modules/stream-buffers/coverage/lcov-report/prettify.js +0 -1
  617. package/node_modules/stream-buffers/coverage/lcov-report/sort-arrow-sprite.png +0 -0
  618. package/node_modules/stream-buffers/coverage/lcov-report/sorter.js +0 -156
  619. package/node_modules/stream-buffers/coverage/lcov.info +0 -305
  620. /package/node_modules/io.appium.settings/lib/{utils.ts → utils/apk-path.ts} +0 -0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## [9.3.7](https://github.com/appium/appium-espresso-driver/compare/v9.3.6...v9.3.7) (2026-10-18)
2
+
3
+ ### Bug Fixes
4
+
5
+ * point test apps and docs to the appium-android monorepo ([#1231](https://github.com/appium/appium-espresso-driver/issues/1231)) ([8070a99](https://github.com/appium/appium-espresso-driver/commit/8070a990e319dfb53c7abf8ee5452cdd60bca38a))
6
+
7
+ ## [9.3.6](https://github.com/appium/appium-espresso-driver/compare/v9.3.5...v9.3.6) (2026-09-21)
8
+
9
+ ### Bug Fixes
10
+
11
+ * use correct locatorStrategies ([#1227](https://github.com/appium/appium-espresso-driver/issues/1227)) ([4f66f0c](https://github.com/appium/appium-espresso-driver/commit/4f66f0cdc1c107cd6d025c8262bbf78037bc052e))
12
+
1
13
  ## [9.3.5](https://github.com/appium/appium-espresso-driver/compare/v9.3.4...v9.3.5) (2026-09-21)
2
14
 
3
15
  ### Miscellaneous Chores
@@ -486,7 +486,7 @@ export declare class EspressoDriver extends AndroidDriver<EspressoConstraints> i
486
486
  setWindowAnimationState(isEnabled: boolean): Promise<void>;
487
487
  initWebview(): Promise<void>;
488
488
  addDeviceInfoToCaps(): Promise<void>;
489
- onSettingsUpdate(): Promise<void>;
489
+ onSettingsUpdate(key: string, value: any): Promise<void>;
490
490
  proxyActive(sessionId?: string | null): boolean;
491
491
  canProxy(sessionId?: string | null): boolean;
492
492
  getProxyAvoidList(sessionId?: string | null): RouteMatcher[];
@@ -1 +1 @@
1
- {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
@@ -109,6 +109,25 @@ const CHROME_NO_PROXY = [
109
109
  // For Selenium v4 (W3C does not have this route)
110
110
  ['POST', new RegExp('^/session/[^/]+/se/log')],
111
111
  ];
112
+ const LOCATOR_STRATEGIES_ESPRESSO_CONTEXT = [
113
+ 'id',
114
+ 'class name',
115
+ 'accessibility id',
116
+ 'text',
117
+ '-android viewtag',
118
+ 'tag name',
119
+ '-android datamatcher',
120
+ '-android viewmatcher',
121
+ 'xpath',
122
+ ];
123
+ const LOCATOR_STRATEGIES_COMPOSE_CONTEXT = [
124
+ 'accessibility id',
125
+ 'text',
126
+ '-android viewtag',
127
+ 'tag name',
128
+ 'link text',
129
+ 'xpath',
130
+ ];
112
131
  export class EspressoDriver extends AndroidDriver {
113
132
  static newMethodMap = newMethodMap;
114
133
  static executeMethodMap = executeMethodMap;
@@ -165,7 +184,7 @@ export class EspressoDriver extends AndroidDriver {
165
184
  delete opts.shell;
166
185
  }
167
186
  super(opts, shouldValidateCaps);
168
- this.locatorStrategies = ['id', 'class name', 'accessibility id'];
187
+ this.locatorStrategies = LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
169
188
  this.desiredCapConstraints = ESPRESSO_CONSTRAINTS;
170
189
  this.jwpProxyAvoid = NO_PROXY;
171
190
  this._originalIme = null;
@@ -357,9 +376,13 @@ export class EspressoDriver extends AndroidDriver {
357
376
  this.caps.deviceModel = model;
358
377
  this.caps.deviceManufacturer = manufacturer;
359
378
  }
360
- async onSettingsUpdate() {
361
- // intentionally do nothing here, since commands.updateSettings proxies
362
- // settings to the espresso server already
379
+ async onSettingsUpdate(key, value) {
380
+ if (key === 'driver') {
381
+ this.locatorStrategies =
382
+ String(value).toLowerCase() === 'compose'
383
+ ? LOCATOR_STRATEGIES_COMPOSE_CONTEXT
384
+ : LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
385
+ }
363
386
  }
364
387
  proxyActive(sessionId) {
365
388
  void sessionId;
@@ -1 +1 @@
1
- {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,cAAc,MAAM,2BAA2B,CAAC;AAC5D,OAAO,KAAK,iBAAiB,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,WAAW,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,mBAAmB,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,QAAQ,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,YAAY,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAC,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,8EAA8E;AAC9E,+EAA+E;AAC/E,8FAA8F;AAC9F,mFAAmF;AACnF,MAAM,QAAQ,GAAmB;IAC/B,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACxC,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,qCAAqC,CAAC,CAAC;IAC1D,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACtD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,gDAAgD,CAAC,CAAC;IACrE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACpE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACpE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,iDAAiD,CAAC,CAAC;IACtE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IAChE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IAChE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,mCAAmC,CAAC,CAAC;IACxD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACtD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IACzD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC1C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;IACxD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,mCAAmC,CAAC,CAAC;IACzD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;IACxD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4CAA4C,CAAC,CAAC;IAClE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yCAAyC,CAAC,CAAC;IAC/D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0CAA0C,CAAC,CAAC;IAChE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACnE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,sCAAsC,CAAC,CAAC;IAC5D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACvD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+CAA+C,CAAC,CAAC;IACrE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8CAA8C,CAAC,CAAC;IACpE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IACrD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IAC1D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,mBAAmB;IACnB,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,eAAe;IACf,iDAAiD;IACjD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACnD,iDAAiD;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;CAC/C,CAAC;AAEF,kFAAkF;AAClF,MAAM,eAAe,GAAmB;IACtC,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,oCAAoC,CAAC,CAAC;IACzD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAClD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qCAAqC,CAAC,CAAC;IAC3D,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,+BAA+B,CAAC,CAAC;IAErD,qEAAqE;IACrE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IAEpD,mBAAmB;IACnB,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAE3C,eAAe;IACf,iDAAiD;IACjD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACnD,iDAAiD;IACjD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,OAAO,cACX,SAAQ,aAAkC;IAG1C,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,MAAM,CAAC,gBAAgB,GAAG,gBAAoE,CAAC;IAE/F,YAAY,CAAgB;IAE5B,QAAQ,CAAkB;IAE1B,mBAAmB,CAAW;IAErB,IAAI,CAAqB;IAEzB,IAAI,CAAqB;IAEzB,qBAAqB,CAAsB;IAEpD,cAAc,GAAG,WAAW,CAAC,cAAiD,CAAC;IAE/E,aAAa,GAAG,iBAAiB,CAAC,aAAa,CAAC;IAChD,mBAAmB,GAAG,iBAAiB,CAAC,mBAAsE,CAAC;IAE/G,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;IAC5C,wBAAwB,GAAG,WAAW,CAAC,wBAAqE,CAAC;IAE7G,yBAAyB,GAAG,WAAW,CAAC,yBAAuE,CAAC;IAChH,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IACtC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;IAChD,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAC1C,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAC1C,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;IAChD,kBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;IACpD,kBAAkB,GAAG,WAAW,CAAC,kBAAkB,CAAC;IACpD,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;IAClD,qBAAqB,GAAG,WAAW,CAAC,qBAAqB,CAAC;IAE1D,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;IACzC,mBAAmB,GAAG,QAAQ,CAAC,mBAAmB,CAAC;IACnD,oBAAoB,GAAG,QAAQ,CAAC,oBAAoB,CAAC;IACrD,iBAAiB,GAAG,QAAQ,CAAC,iBAAuD,CAAC;IACrF,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;IACzC,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IAC/C,2BAA2B,GAAG,QAAQ,CAAC,2BAA2B,CAAC;IACnE,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;IACzC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;IAEnC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;IAC1C,kBAAkB,GAAG,aAAa,CAAC,YAAY,CAAC;IAChD,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAEtD,kBAAkB,GAAG,YAAY,CAAC,kBAAoE,CAAC;IACvG,iBAAiB,GAAG,YAAY,CAAC,iBAAkE,CAAC;IAEpG,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;IAC7C,iBAAiB,GAAG,cAAc,CAAC,iBAAiB,CAAC;IAErD,6BAA6B,GAAG,mBAAmB,CAAC,6BAA6B,CAAC;IAClF,+BAA+B,GAAG,mBAAmB,CAAC,+BAA+B,CAAC;IACtF,yBAAyB,GAAG,mBAAmB,CAAC,yBAAyB,CAAC;IAC1E,qBAAqB,GAAG,mBAAmB,CAAC,qBAAqB,CAAC;IAElE,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC;IAC/C,kBAAkB,GAAG,UAAU,CAAC,UAAU,CAAC;IAE3C,QAAQ,GAAG,cAAc,CAAC,QAAQ,CAAC;IACnC,kBAAkB,GAAG,cAAc,CAAC,kBAAkB,CAAC;IACvD,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;IAEjC,YAAY,OAAoB,EAAiB,EAAE,kBAAkB,GAAG,IAAI;QAC1E,0CAA0C;QAC1C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,OAAQ,IAA0B,CAAC,KAAK,CAAC;QAC3C,CAAC;QAED,KAAK,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAClE,IAAI,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;QAC9B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,IAAI,CAAC,IAAI,GAAG,EAAwB,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,IAA0B,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzE,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,WAAW;QACb,OAAO,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEQ,KAAK,CAAC,aAAa,CAC1B,QAA+B,EAC/B,QAAgC,EAChC,QAAgC,EAChC,UAAyB;QAEzB,IAAI,CAAC;YACH,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CACtE,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAoD,CAAC;YAEtD,MAAM,aAAa,GAAG;gBACpB,QAAQ,EAAE,OAAO;gBACjB,iBAAiB,EAAE,KAAK;gBACxB,eAAe,EAAE,IAAI;gBACrB,iBAAiB,EAAE,IAAI;gBACvB,eAAe,EAAE,KAAK;gBACtB,wBAAwB,EAAE,IAAI;gBAC9B,sBAAsB,EAAE,KAAK;gBAC7B,QAAQ,EAAE,EAAE;gBACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC;aACtC,CAAC;YAEF,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE5C,MAAM,WAAW,GAAG;gBAClB,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,gBAAgB;gBACzB,qBAAqB,EAAE,KAAK;aAC7B,CAAC;YACF,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEtD,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;oBAC1D,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wFAAwF;wBACtF,kCAAkC,CACrC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,qEAAqE;wBACnE,qDAAqD,CACxD,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,UAAU;gBAClB,IAAI,CAAC,IAAI,CAAC,UAAU;oBACpB,CAAC,MAAM,iBAAiB,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9F,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,gBAAgB,CAAC;YAC1D,mCAAmC;YACnC,MAAM,EAAC,IAAI,EAAE,MAAM,EAAC,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,IAAqD,CAAC,MAAM,GAAG,MAAM,CAAC;YAC5E,uEAAuE;YACvE,eAAe;YACf,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAElC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClB,0DAA0D;gBAC1D,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC7D,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;oBACjD,mBAAmB,EAAE,cAAc,CAAC,oBAAoB;iBACzD,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC5B,mEAAmE;gBACnE,6DAA6D;gBAC7D,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,uDAAuD,IAAI,CAAC,IAAI,CAAC,UAAU,yBAAyB,CACrG,CAAC;gBACF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAoB,CAAC,CAAC,EAAE,CAAC;oBACrE,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAC/B,+BAA+B,IAAI,CAAC,IAAI,CAAC,UAAU,2BAA2B,CAC/E,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,KAAK,CAAC,OAAO;gBACX,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS;oBAClD,mEAAmE;oBACnE,qDAAqD,CAAC;YACxD,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBAClD,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,IAAI,MAAM,CAAC,sBAAsB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAc,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAEQ,KAAK,CAAC,aAAa;QAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE5C,MAAM,wBAAwB,GAAG;YAC/B,KAAK,IAAI,EAAE;gBACT,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC;oBACnD,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACnC,CAAC;YACH,CAAC;YACD,KAAK,IAAI,EAAE;gBACT,IAAI,MAAM,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC;oBACzD,MAAM,IAAI,CAAC,kCAAkC,EAAE,CAAC;gBAClD,CAAC;YACH,CAAC;YACD,KAAK,IAAI,EAAE;gBACT,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC;oBAC9C,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBACzC,CAAC;YACH,CAAC;SACF,CAAC;QAEF,MAAM,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,CAAC,GAAG,CACf,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACpC,CAAC,KAAK,IAAI,EAAE;gBACV,IAAI,CAAC;oBACH,MAAM,IAAI,EAAE,CAAC;gBACf,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC,CAAC,EAAE,CACL,CACF,CAAC;YACF,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC7B,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACjD,CAAC;gBAAC,OAAO,GAAY,EAAE,CAAC;oBACtB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACjE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,OAAO,EAAE,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;YACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,MAAM,OAAO,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC3D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACnF,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;gBACnF,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAoB,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBACzC,YAAY;gBACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC;QAC5B,MAAM,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,uBAAuB,CAAC,SAAkB;QAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACrD,MAAM,sBAAsB,GAAG,CAAC,SAAS,IAAI,aAAa,CAAC;QAC3D,MAAM,qBAAqB,GAAG,SAAS,IAAI,CAAC,aAAa,CAAC;QAE1D,IAAI,sBAAsB,EAAE,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,mHAAmH,CACpH,CAAC;YACF,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAClC,CAAC;aAAM,IAAI,qBAAqB,EAAE,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAC;YACnG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,QAAQ,kBAAkB,OAAO,IAAI,CAAC,CAAC;QACpF,MAAM,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,MAAM,EAAC,UAAU,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAC,GACvF,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,mBAAmB,GAAG,cAAc,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,uEAAuE;QACvE,0CAA0C;IAC5C,CAAC;IAEQ,WAAW,CAAC,SAAyB;QAC5C,KAAK,SAAS,CAAC;QACf,wDAAwD;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,QAAQ,CAAC,SAAyB;QACzC,KAAK,SAAS,CAAC;QACf,6CAA6C;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,iBAAiB,CAAC,SAAyB;QAClD,KAAK,SAAS,CAAC;QACf,uFAAuF;QACvF,6FAA6F;QAC7F,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC;QAC5E,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;QAClG,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;;AAGH,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- #Mon Sep 21 12:04:44 UTC 2026
1
+ #Sun Oct 18 10:12:53 UTC 2026
2
2
  gradle.version=9.7.1
@@ -3,7 +3,7 @@ androidGradlePlugin = "9.4.1"
3
3
  kotlin = "2.4.20"
4
4
  androidxTest = "1.7.0"
5
5
  annotation = "1.10.0"
6
- composeUiTest = "1.11.4"
6
+ composeUiTest = "1.12.1"
7
7
  gson = "2.14.0"
8
8
  espresso = "3.7.0"
9
9
  nanohttpd = "2.3.1"
@@ -25,7 +25,7 @@ org.gradle.caching=true
25
25
  # https://youtrack.jetbrains.com/issue/KT-46708
26
26
  kotlin.stdlib.default.dependency=false
27
27
 
28
- appiumCompileSdk=35
28
+ appiumCompileSdk=37
29
29
  appiumMinSdk=26
30
30
  appiumTargetSdk=34
31
31
  appiumBuildTools=36.0.0
@@ -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.5"
5
+ private const val VERSION = "9.3.7"
6
6
 
7
7
  fun getEspressoServerVersion() = VERSION
package/lib/driver.ts CHANGED
@@ -129,6 +129,26 @@ const CHROME_NO_PROXY: RouteMatcher[] = [
129
129
  ['POST', new RegExp('^/session/[^/]+/se/log')],
130
130
  ];
131
131
 
132
+ const LOCATOR_STRATEGIES_ESPRESSO_CONTEXT = [
133
+ 'id',
134
+ 'class name',
135
+ 'accessibility id',
136
+ 'text',
137
+ '-android viewtag',
138
+ 'tag name',
139
+ '-android datamatcher',
140
+ '-android viewmatcher',
141
+ 'xpath',
142
+ ];
143
+ const LOCATOR_STRATEGIES_COMPOSE_CONTEXT = [
144
+ 'accessibility id',
145
+ 'text',
146
+ '-android viewtag',
147
+ 'tag name',
148
+ 'link text',
149
+ 'xpath',
150
+ ];
151
+
132
152
  export class EspressoDriver
133
153
  extends AndroidDriver<EspressoConstraints>
134
154
  implements ExternalDriver<EspressoConstraints, string, StringRecord>
@@ -207,7 +227,7 @@ export class EspressoDriver
207
227
  }
208
228
 
209
229
  super(opts, shouldValidateCaps);
210
- this.locatorStrategies = ['id', 'class name', 'accessibility id'];
230
+ this.locatorStrategies = LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
211
231
  this.desiredCapConstraints = ESPRESSO_CONSTRAINTS;
212
232
  this.jwpProxyAvoid = NO_PROXY;
213
233
  this._originalIme = null;
@@ -439,9 +459,13 @@ export class EspressoDriver
439
459
  this.caps.deviceManufacturer = manufacturer;
440
460
  }
441
461
 
442
- async onSettingsUpdate() {
443
- // intentionally do nothing here, since commands.updateSettings proxies
444
- // settings to the espresso server already
462
+ async onSettingsUpdate(key: string, value: any) {
463
+ if (key === 'driver') {
464
+ this.locatorStrategies =
465
+ String(value).toLowerCase() === 'compose'
466
+ ? LOCATOR_STRATEGIES_COMPOSE_CONTEXT
467
+ : LOCATOR_STRATEGIES_ESPRESSO_CONTEXT;
468
+ }
445
469
  }
446
470
 
447
471
  override proxyActive(sessionId?: string | null) {
@@ -5,14 +5,17 @@ const mixin_1 = require("./mixin");
5
5
  const BidiCommands = {
6
6
  async bidiSubscribe(events, contexts = ['']) {
7
7
  for (const event of events) {
8
- this.bidiEventSubs[event] = contexts;
8
+ // a later subscribe for the same event must keep existing contexts; the spec appends subscriptions
9
+ const existing = this.bidiEventSubs[event] ?? [];
10
+ this.bidiEventSubs[event] = support_1.util.uniq([...existing, ...contexts]);
9
11
  }
10
12
  },
11
13
  async bidiUnsubscribe(events, contexts = ['']) {
12
14
  for (const event of events) {
13
- if (this.bidiEventSubs[event]) {
14
- this.bidiEventSubs[event] = this.bidiEventSubs[event].filter((c) => !contexts.includes(c));
15
+ if (!this.bidiEventSubs[event]) {
16
+ continue;
15
17
  }
18
+ this.bidiEventSubs[event] = this.bidiEventSubs[event].filter((c) => !contexts.includes(c));
16
19
  if (this.bidiEventSubs[event].length === 0) {
17
20
  delete this.bidiEventSubs[event];
18
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"bidi.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/bidi.ts"],"names":[],"mappings":";;AAAA,6CAAqC;AAIrC,mCAA8B;AAO9B,MAAM,YAAY,GAAkB;IAClC,KAAK,CAAC,aAAa,CAA6C,MAAgB,EAAE,WAAqB,CAAC,EAAE,CAAC;QACzG,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QACvC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAA6C,MAAgB,EAAE,WAAqB,CAAC,EAAE,CAAC;QAC3G,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7F,CAAC;YACD,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,GAA4B,cAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAC,GAAG,MAAM,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,OAAO;YACL,GAAG,IAAI;YACP,KAAK,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,KAAiB,CAAC,CAAC,CAAC,IAAI;YACvD,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,OAAkB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,8BAA8B;SAC/G,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,YAAY,CAAC,CAAC"}
1
+ {"version":3,"file":"bidi.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/bidi.ts"],"names":[],"mappings":";;AAAA,6CAAqC;AAIrC,mCAA8B;AAO9B,MAAM,YAAY,GAAkB;IAClC,KAAK,CAAC,aAAa,CAA6C,MAAgB,EAAE,WAAqB,CAAC,EAAE,CAAC;QACzG,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,mGAAmG;YACnG,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACjD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,cAAI,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAA6C,MAAgB,EAAE,WAAqB,CAAC,EAAE,CAAC;QAC3G,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/B,SAAS;YACX,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,IAAI,GAA4B,cAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAC,GAAG,MAAM,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpF,OAAO;YACL,GAAG,IAAI;YACP,KAAK,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,KAAiB,CAAC,CAAC,CAAC,IAAI;YACvD,OAAO,EAAE,SAAS,IAAI,IAAI,CAAC,CAAC,CAAE,IAAI,CAAC,OAAkB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,8BAA8B;SAC/G,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,YAAY,CAAC,CAAC"}
@@ -101,7 +101,7 @@ const TimeoutCommands = {
101
101
  parseTimeoutArgument(ms) {
102
102
  const duration = parseInt(String(ms), 10);
103
103
  if (Number.isNaN(duration) || duration < MIN_TIMEOUT) {
104
- throw new protocol_1.errors.UnknownError(`Invalid timeout value '${ms}'`);
104
+ throw new protocol_1.errors.InvalidArgumentError(`Invalid timeout value '${ms}'`);
105
105
  }
106
106
  return duration;
107
107
  },
@@ -1 +1 @@
1
- {"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"timeout.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/timeout.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,mBAAmB,EAAiD,MAAM,eAAe,CAAC;AAUtH,eAAO,MAAM,cAAc,QAA0B,CAAC;AAgEtD;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,GAAG,MAAM,EAAE,GAAG,mBAA+C,GAC3E,OAAO,CAAC,MAAM,CAAC,CA4LjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,CAuBjF;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAqBpE;AAED;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAM9F;;;;;;;;AA0MD,wBAM0B"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,mBAAmB,EAAiD,MAAM,eAAe,CAAC;AAUtH,eAAO,MAAM,cAAc,QAA0B,CAAC;AAuEtD;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,GAAG,MAAM,EAAE,GAAG,mBAA+C,GAC3E,OAAO,CAAC,MAAM,CAAC,CA4LjB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC,CAuBjF;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAqBpE;AAED;;;;;;GAMG;AAEH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAM9F;;;;;;;;AAyOD,wBAM0B"}
@@ -9,6 +9,7 @@ exports.isPackageOrBundle = isPackageOrBundle;
9
9
  exports.duplicateKeys = duplicateKeys;
10
10
  exports.parseCapsArray = parseCapsArray;
11
11
  exports.generateDriverLogPrefix = generateDriverLogPrefix;
12
+ exports.filenameFromContentDisposition = filenameFromContentDisposition;
12
13
  const node_fs_1 = __importDefault(require("node:fs"));
13
14
  const node_path_1 = __importDefault(require("node:path"));
14
15
  const support_1 = require("@appium/support");
@@ -41,6 +42,13 @@ const APPLICATIONS_CACHE_GUARD = new async_lock_1.default();
41
42
  const SANITIZE_REPLACEMENT = '-';
42
43
  const DEFAULT_BASENAME = 'appium-app';
43
44
  const APP_DOWNLOAD_TIMEOUT_MS = 120 * 1000;
45
+ // RFC 5987: filename*=UTF-8''percent-encoded-name (language tag is optional)
46
+ const FILENAME_STAR_PATTERN = /(?:^|;)\s*filename\*\s*=\s*([^';\s]+)'[^']*'([^;]+)/i;
47
+ const QUOTED_FILENAME_PATTERN = /(?:^|;)\s*filename\s*=\s*"((?:\\.|[^"\\])*)"/i;
48
+ // unquoted token; stops at ';' so later parameters are not swallowed
49
+ const UNQUOTED_FILENAME_PATTERN = /(?:^|;)\s*filename\s*=\s*([^;\s]+)/i;
50
+ const SURROUNDING_QUOTES_PATTERN = /^["']|["']$/g;
51
+ const ESCAPED_CHAR_PATTERN = /\\(.)/g;
44
52
  process.on('exit', () => {
45
53
  if (APPLICATIONS_CACHE.size === 0) {
46
54
  return;
@@ -440,6 +448,35 @@ async function fetchApp(srcStream, dstPath) {
440
448
  }
441
449
  return dstPath;
442
450
  }
451
+ /**
452
+ * Picks a download filename from a Content-Disposition header.
453
+ * Prefers RFC 5987 `filename*` over `filename`, and accepts both quoted and unquoted `filename`.
454
+ * @internal
455
+ */
456
+ function filenameFromContentDisposition(header) {
457
+ const encoded = FILENAME_STAR_PATTERN.exec(header);
458
+ if (encoded?.[2]) {
459
+ try {
460
+ const value = decodeURIComponent(encoded[2].trim().replace(SURROUNDING_QUOTES_PATTERN, ''));
461
+ if (value) {
462
+ return value;
463
+ }
464
+ }
465
+ catch {
466
+ // invalid percent-encoding; fall through to filename=
467
+ }
468
+ }
469
+ // an empty quoted value is still the filename parameter, so it must not fall through to the
470
+ // token branch below, which would otherwise capture the quote characters themselves
471
+ const quoted = QUOTED_FILENAME_PATTERN.exec(header);
472
+ if (quoted) {
473
+ return quoted[1].replace(ESCAPED_CHAR_PATTERN, '$1') || undefined;
474
+ }
475
+ const unquoted = UNQUOTED_FILENAME_PATTERN.exec(header);
476
+ if (unquoted?.[1]) {
477
+ return unquoted[1];
478
+ }
479
+ }
443
480
  function determineFilename(headers, pathname, supportedAppExtensions) {
444
481
  const basename = support_1.fs.sanitizeName(node_path_1.default.basename(decodeURIComponent(pathname ?? '')), {
445
482
  replacement: SANITIZE_REPLACEMENT,
@@ -447,9 +484,9 @@ function determineFilename(headers, pathname, supportedAppExtensions) {
447
484
  const extname = node_path_1.default.extname(basename);
448
485
  if (headers['content-disposition'] && /^attachment/i.test(String(headers['content-disposition']))) {
449
486
  logger_1.log.debug(`Content-Disposition: ${headers['content-disposition']}`);
450
- const match = /filename="([^"]+)/i.exec(String(headers['content-disposition']));
451
- if (match) {
452
- return support_1.fs.sanitizeName(match[1], { replacement: SANITIZE_REPLACEMENT });
487
+ const fromHeader = filenameFromContentDisposition(String(headers['content-disposition']));
488
+ if (fromHeader) {
489
+ return support_1.fs.sanitizeName(fromHeader, { replacement: SANITIZE_REPLACEMENT });
453
490
  }
454
491
  }
455
492
  // assign the default file name and the extension if none has been detected
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/basedriver/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../lib/basedriver/helpers.ts"],"names":[],"mappings":"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"}
@@ -12,15 +12,18 @@ declare module '../driver' {
12
12
  const BidiCommands: IBidiCommands = {
13
13
  async bidiSubscribe<C extends Constraints>(this: BaseDriver<C>, events: string[], contexts: string[] = ['']) {
14
14
  for (const event of events) {
15
- this.bidiEventSubs[event] = contexts;
15
+ // a later subscribe for the same event must keep existing contexts; the spec appends subscriptions
16
+ const existing = this.bidiEventSubs[event] ?? [];
17
+ this.bidiEventSubs[event] = util.uniq([...existing, ...contexts]);
16
18
  }
17
19
  },
18
20
 
19
21
  async bidiUnsubscribe<C extends Constraints>(this: BaseDriver<C>, events: string[], contexts: string[] = ['']) {
20
22
  for (const event of events) {
21
- if (this.bidiEventSubs[event]) {
22
- this.bidiEventSubs[event] = this.bidiEventSubs[event].filter((c) => !contexts.includes(c));
23
+ if (!this.bidiEventSubs[event]) {
24
+ continue;
23
25
  }
26
+ this.bidiEventSubs[event] = this.bidiEventSubs[event].filter((c) => !contexts.includes(c));
24
27
  if (this.bidiEventSubs[event].length === 0) {
25
28
  delete this.bidiEventSubs[event];
26
29
  }
@@ -127,7 +127,7 @@ const TimeoutCommands: ITimeoutCommands = {
127
127
  parseTimeoutArgument<C extends Constraints>(this: BaseDriver<C>, ms: number | string) {
128
128
  const duration = parseInt(String(ms), 10);
129
129
  if (Number.isNaN(duration) || duration < MIN_TIMEOUT) {
130
- throw new errors.UnknownError(`Invalid timeout value '${ms}'`);
130
+ throw new errors.InvalidArgumentError(`Invalid timeout value '${ms}'`);
131
131
  }
132
132
  return duration;
133
133
  },
@@ -38,6 +38,13 @@ const APPLICATIONS_CACHE_GUARD = new AsyncLock();
38
38
  const SANITIZE_REPLACEMENT = '-';
39
39
  const DEFAULT_BASENAME = 'appium-app';
40
40
  const APP_DOWNLOAD_TIMEOUT_MS = 120 * 1000;
41
+ // RFC 5987: filename*=UTF-8''percent-encoded-name (language tag is optional)
42
+ const FILENAME_STAR_PATTERN = /(?:^|;)\s*filename\*\s*=\s*([^';\s]+)'[^']*'([^;]+)/i;
43
+ const QUOTED_FILENAME_PATTERN = /(?:^|;)\s*filename\s*=\s*"((?:\\.|[^"\\])*)"/i;
44
+ // unquoted token; stops at ';' so later parameters are not swallowed
45
+ const UNQUOTED_FILENAME_PATTERN = /(?:^|;)\s*filename\s*=\s*([^;\s]+)/i;
46
+ const SURROUNDING_QUOTES_PATTERN = /^["']|["']$/g;
47
+ const ESCAPED_CHAR_PATTERN = /\\(.)/g;
41
48
 
42
49
  process.on('exit', () => {
43
50
  if (APPLICATIONS_CACHE.size === 0) {
@@ -485,6 +492,37 @@ async function fetchApp(srcStream: Readable, dstPath: string): Promise<string> {
485
492
  return dstPath;
486
493
  }
487
494
 
495
+ /**
496
+ * Picks a download filename from a Content-Disposition header.
497
+ * Prefers RFC 5987 `filename*` over `filename`, and accepts both quoted and unquoted `filename`.
498
+ * @internal
499
+ */
500
+ export function filenameFromContentDisposition(header: string): string | undefined {
501
+ const encoded = FILENAME_STAR_PATTERN.exec(header);
502
+ if (encoded?.[2]) {
503
+ try {
504
+ const value = decodeURIComponent(encoded[2].trim().replace(SURROUNDING_QUOTES_PATTERN, ''));
505
+ if (value) {
506
+ return value;
507
+ }
508
+ } catch {
509
+ // invalid percent-encoding; fall through to filename=
510
+ }
511
+ }
512
+
513
+ // an empty quoted value is still the filename parameter, so it must not fall through to the
514
+ // token branch below, which would otherwise capture the quote characters themselves
515
+ const quoted = QUOTED_FILENAME_PATTERN.exec(header);
516
+ if (quoted) {
517
+ return quoted[1].replace(ESCAPED_CHAR_PATTERN, '$1') || undefined;
518
+ }
519
+
520
+ const unquoted = UNQUOTED_FILENAME_PATTERN.exec(header);
521
+ if (unquoted?.[1]) {
522
+ return unquoted[1];
523
+ }
524
+ }
525
+
488
526
  function determineFilename(
489
527
  headers: AxiosResponseHeaders | RawAxiosRequestHeaders,
490
528
  pathname: string,
@@ -496,9 +534,9 @@ function determineFilename(
496
534
  const extname = path.extname(basename);
497
535
  if (headers['content-disposition'] && /^attachment/i.test(String(headers['content-disposition']))) {
498
536
  logger.debug(`Content-Disposition: ${headers['content-disposition']}`);
499
- const match = /filename="([^"]+)/i.exec(String(headers['content-disposition']));
500
- if (match) {
501
- return fs.sanitizeName(match[1], {replacement: SANITIZE_REPLACEMENT});
537
+ const fromHeader = filenameFromContentDisposition(String(headers['content-disposition']));
538
+ if (fromHeader) {
539
+ return fs.sanitizeName(fromHeader, {replacement: SANITIZE_REPLACEMENT});
502
540
  }
503
541
  }
504
542