appium-espresso-driver 10.2.1 → 10.4.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.
- package/CHANGELOG.md +16 -0
- package/build/lib/commands/orientation.d.ts +33 -0
- package/build/lib/commands/orientation.d.ts.map +1 -0
- package/build/lib/commands/orientation.js +34 -0
- package/build/lib/commands/orientation.js.map +1 -0
- package/build/lib/commands/server/builder.d.ts +9 -0
- package/build/lib/commands/server/builder.d.ts.map +1 -1
- package/build/lib/commands/server/builder.js +23 -0
- package/build/lib/commands/server/builder.js.map +1 -1
- package/build/lib/commands/server/hints.d.ts +28 -0
- package/build/lib/commands/server/hints.d.ts.map +1 -0
- package/build/lib/commands/server/hints.js +54 -0
- package/build/lib/commands/server/hints.js.map +1 -0
- package/build/lib/commands/server/runner.d.ts +7 -0
- package/build/lib/commands/server/runner.d.ts.map +1 -1
- package/build/lib/commands/server/runner.js +43 -4
- package/build/lib/commands/server/runner.js.map +1 -1
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +13 -0
- package/build/lib/driver.js.map +1 -1
- package/build/lib/execute-method-map.d.ts +4 -0
- package/build/lib/execute-method-map.d.ts.map +1 -1
- package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
- package/espresso-server/app/build.gradle.kts +91 -1
- package/espresso-server/app/src/androidTestShaded/AndroidManifest.xml +16 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
- package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
- package/espresso-server/buildSrc/build/classes/kotlin/main/META-INF/buildSrc.kotlin_module +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitField$1$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitMethod$1$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/MemberRef.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/PrefixRemapper.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$groupingBy$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$sortedByDescending$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$9$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$remapper$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1$visitMethod$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$referencedClasses$collector$1.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$shareNonPublicDependents$Declared.class +0 -0
- package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt.class +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab +1 -1
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
- package/espresso-server/buildSrc/build/kotlin/compileKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +0 -0
- package/espresso-server/buildSrc/build/libs/buildSrc.jar +0 -0
- package/espresso-server/buildSrc/build.gradle.kts +6 -0
- package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/RelocateClassesTask.kt +141 -0
- package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/Relocation.kt +342 -0
- package/espresso-server/buildSrc/src/test/kotlin/io/appium/espressoserver/gradle/RelocationTest.kt +186 -0
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ListIdlingResources.kt +2 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ShadingHelpers.kt +45 -0
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/http/response/AppiumResponse.kt +3 -2
- package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/HamcrestMatcher.kt +8 -5
- package/espresso-server/library/src/test/java/io/appium/espressoserver/test/helpers/ShadingHelpersTest.kt +37 -0
- package/lib/commands/orientation.ts +49 -0
- package/lib/commands/server/builder.ts +29 -0
- package/lib/commands/server/hints.ts +69 -0
- package/lib/commands/server/runner.ts +53 -5
- package/lib/driver.ts +14 -0
- package/node_modules/appium-adb/CHANGELOG.md +7 -0
- package/node_modules/appium-adb/package.json +3 -3
- package/node_modules/appium-android-driver/CHANGELOG.md +74 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts +10 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js +15 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts +9 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js +37 -0
- package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js.map +1 -0
- package/node_modules/appium-android-driver/build/lib/commands/device/common.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/device/common.js +2 -0
- package/node_modules/appium-android-driver/build/lib/commands/device/common.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/find.js +2 -2
- package/node_modules/appium-android-driver/build/lib/commands/find.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.d.ts +4 -0
- package/node_modules/appium-android-driver/build/lib/commands/log.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.js +7 -1
- package/node_modules/appium-android-driver/build/lib/commands/log.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.d.ts +3 -0
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.js +4 -0
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts +10 -4
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js +38 -20
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.d.ts +34 -2
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.js +89 -43
- package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/driver.d.ts +5 -0
- package/node_modules/appium-android-driver/build/lib/driver.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/driver.js +1 -0
- package/node_modules/appium-android-driver/build/lib/driver.js.map +1 -1
- package/node_modules/appium-android-driver/build/lib/execute-method-map.d.ts +4 -0
- package/node_modules/appium-android-driver/build/lib/execute-method-map.d.ts.map +1 -1
- package/node_modules/appium-android-driver/build/lib/execute-method-map.js +5 -0
- package/node_modules/appium-android-driver/build/lib/execute-method-map.js.map +1 -1
- package/node_modules/appium-android-driver/lib/commands/bidi/helpers.ts +16 -0
- package/node_modules/appium-android-driver/lib/commands/bidi/logcat-level.ts +40 -0
- package/node_modules/appium-android-driver/lib/commands/device/common.ts +2 -0
- package/node_modules/appium-android-driver/lib/commands/find.ts +2 -2
- package/node_modules/appium-android-driver/lib/commands/log.ts +9 -1
- package/node_modules/appium-android-driver/lib/commands/media-stream/constants.ts +4 -0
- package/node_modules/appium-android-driver/lib/commands/media-stream/exports.ts +46 -21
- package/node_modules/appium-android-driver/lib/commands/media-stream/stream.ts +90 -43
- package/node_modules/appium-android-driver/lib/driver.ts +1 -0
- package/node_modules/appium-android-driver/lib/execute-method-map.ts +6 -0
- package/node_modules/appium-android-driver/package.json +6 -6
- package/node_modules/appium-chromedriver/CHANGELOG.md +7 -0
- package/node_modules/appium-chromedriver/config/mapping.json +1 -0
- package/node_modules/appium-chromedriver/package.json +2 -2
- package/node_modules/asyncbox/README.md +7 -3
- package/node_modules/asyncbox/build/lib/shared/errors.d.ts +18 -2
- package/node_modules/asyncbox/build/lib/shared/errors.d.ts.map +1 -1
- package/node_modules/asyncbox/build/lib/shared/errors.js +24 -8
- package/node_modules/asyncbox/build/lib/shared/errors.js.map +1 -1
- package/node_modules/asyncbox/lib/shared/errors.ts +34 -8
- package/node_modules/asyncbox/package.json +1 -1
- package/node_modules/bare-buffer/CMakeLists.txt +3 -3
- package/node_modules/bare-buffer/package.json +1 -1
- package/node_modules/bare-buffer/prebuilds/android-arm/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-ia32/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/android-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/darwin-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-arm64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/ios-x64-simulator/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/linux-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-arm64/bare-buffer.bare +0 -0
- package/node_modules/bare-buffer/prebuilds/win32-x64/bare-buffer.bare +0 -0
- package/node_modules/bare-fs/package.json +2 -2
- package/node_modules/bare-fs/prebuilds/android-arm/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/android-arm64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/android-ia32/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/android-x64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/darwin-arm64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/darwin-x64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/ios-arm64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/ios-arm64-simulator/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/ios-x64-simulator/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/linux-arm64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/linux-x64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/win32-arm64/bare-fs.bare +0 -0
- package/node_modules/bare-fs/prebuilds/win32-x64/bare-fs.bare +0 -0
- package/node_modules/bare-url/CMakeLists.txt +5 -5
- package/node_modules/bare-url/package.json +1 -1
- package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
- package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
- package/node_modules/ini/package.json +5 -5
- package/node_modules/io.appium.settings/CHANGELOG.md +21 -0
- package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
- package/node_modules/io.appium.settings/package.json +3 -3
- package/node_modules/plist/dist/parse-binary.d.ts.map +1 -1
- package/node_modules/plist/dist/parse-binary.js +37 -9
- package/node_modules/plist/dist/parse-binary.js.map +1 -1
- package/node_modules/plist/package.json +1 -1
- package/package.json +5 -5
- package/scripts/check-shaded-packages.mjs +106 -0
- package/scripts/lib/dependency-versions/apk-meta-inf.mjs +0 -13
- package/scripts/lib/dependency-versions/comparison.mjs +17 -47
- package/scripts/lib/dependency-versions/gradle-scan.mjs +77 -87
- package/scripts/lib/dependency-versions/index.mjs +1 -1
- package/scripts/lib/dependency-versions/report.mjs +4 -4
- package/scripts/lib/dependency-versions/tracked-modules.mjs +2 -42
- package/scripts/lib/dependency-versions/types.mjs +2 -1
- package/scripts/lib/dependency-versions/version-utils.mjs +124 -2
- package/scripts/lib/diagnose/app-input.mjs +4 -1
- package/scripts/lib/diagnose/checks/compile-sdk.mjs +6 -2
- package/scripts/lib/diagnose/checks/dependency.mjs +1 -1
- package/scripts/lib/diagnose/checks/index.mjs +0 -3
- package/scripts/lib/diagnose/checks/obfuscation.mjs +1 -1
- package/scripts/lib/diagnose/diagnosis.mjs +2 -7
- package/scripts/lib/diagnose/report.mjs +2 -2
- package/scripts/lib/diagnose/checks/androidx.mjs +0 -40
- package/scripts/lib/diagnose/checks/lifecycle-extensions.mjs +0 -23
- package/scripts/lib/diagnose/checks/startup-provider.mjs +0 -41
|
@@ -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;
|
|
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,7 +1,7 @@
|
|
|
1
1
|
import { util } from '@appium/support';
|
|
2
2
|
import { errors, isErrorType } from 'appium/driver.js';
|
|
3
3
|
import { ConditionUnmetError } from 'asyncbox';
|
|
4
|
-
//
|
|
4
|
+
// The message covers errors of asyncbox < 6.6.0 (no `code`)
|
|
5
5
|
const LEGACY_CONDITION_UNMET_PATTERN = /Condition unmet/;
|
|
6
6
|
export async function findElOrEls(strategy, selector, mult, context = '') {
|
|
7
7
|
if (!selector) {
|
|
@@ -41,7 +41,7 @@ export async function findElOrEls(strategy, selector, mult, context = '') {
|
|
|
41
41
|
}
|
|
42
42
|
catch (e) {
|
|
43
43
|
const err = e;
|
|
44
|
-
if (err
|
|
44
|
+
if (ConditionUnmetError.is(err) || LEGACY_CONDITION_UNMET_PATTERN.test(err.message ?? '')) {
|
|
45
45
|
// only get here if we are looking for multiple elements
|
|
46
46
|
// condition was not met setting res to empty array
|
|
47
47
|
element = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAM7C,
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/commands/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAM7C,4DAA4D;AAC5D,MAAM,8BAA8B,GAAG,iBAAiB,CAAC;AAkCzD,MAAM,CAAC,KAAK,UAAU,WAAW,CAE/B,QAAgB,EAChB,QAAgB,EAChB,IAAa,EACb,OAAO,GAAG,EAAE;IAEZ,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,MAAM,CAAC,oBAAoB,CAAC,+CAA+C,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,MAAM,GAAoB;QAC9B,QAAQ;QACR,QAAQ;QACR,OAAO;QACP,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,IAAI,OAAwC,CAAC;IAC7C,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,qEAAqE;YACrE,+CAA+C;YAC/C,IAAI,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC/C,GAAG,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,mCAAmC;YACjE,CAAC;YAED,mEAAmE;YACnE,6DAA6D;YAC7D,gBAAgB;YAChB,IAAI,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAChD,+CAA+C;gBAC/C,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,8DAA8D;QAC9D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,GAAG,CAAU,CAAC;QACvB,IAAI,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,8BAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;YAC1F,wDAAwD;YACxD,mDAAmD;YACnD,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,OAAoB,CAAC;IAC9B,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;IACxC,CAAC;IACD,OAAO,OAAkB,CAAC;AAC5B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAsB,MAAuB;IACnF,KAAK,MAAM,CAAC;IACZ,MAAM,IAAI,MAAM,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -4,7 +4,9 @@ import type { AndroidDriver } from '../driver.js';
|
|
|
4
4
|
import { type LogEntry } from '../utils.js';
|
|
5
5
|
declare module '../driver.js' {
|
|
6
6
|
interface AndroidDriver<C extends AndroidDriverConstraints> {
|
|
7
|
+
/** @deprecated Subscribe to the BiDi `log.entryAdded` event instead. */
|
|
7
8
|
mobileStartLogsBroadcast(...args: Parameters<typeof mobileStartLogsBroadcast>): ReturnType<typeof mobileStartLogsBroadcast>;
|
|
9
|
+
/** @deprecated Unsubscribe from the BiDi `log.entryAdded` event instead. */
|
|
8
10
|
mobileStopLogsBroadcast(...args: Parameters<typeof mobileStopLogsBroadcast>): ReturnType<typeof mobileStopLogsBroadcast>;
|
|
9
11
|
assignBiDiLogListener<EE extends EventEmitter>(logEmitter: EE, properties: BiDiListenerProperties): [EE, LogListener];
|
|
10
12
|
}
|
|
@@ -31,6 +33,7 @@ export declare const supportedLogTypes: {
|
|
|
31
33
|
* Each connected websocket listener will receive logcat log lines
|
|
32
34
|
* as soon as they are visible to Appium.
|
|
33
35
|
*
|
|
36
|
+
* @deprecated Subscribe to the BiDi `log.entryAdded` event instead.
|
|
34
37
|
* @returns Promise that resolves when the logcat broadcasting websocket is started.
|
|
35
38
|
*/
|
|
36
39
|
export declare function mobileStartLogsBroadcast(this: AndroidDriver): Promise<void>;
|
|
@@ -38,6 +41,7 @@ export declare function mobileStartLogsBroadcast(this: AndroidDriver): Promise<v
|
|
|
38
41
|
* Stops the previously started logcat broadcasting wesocket server.
|
|
39
42
|
* This method will return immediately if no server is running.
|
|
40
43
|
*
|
|
44
|
+
* @deprecated Unsubscribe from the BiDi `log.entryAdded` event instead.
|
|
41
45
|
* @returns Promise that resolves when the logcat broadcasting websocket is stopped.
|
|
42
46
|
*/
|
|
43
47
|
export declare function mobileStopLogsBroadcast(this: AndroidDriver): Promise<void>;
|
|
@@ -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;
|
|
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,wEAAwE;QACxE,wBAAwB,CACtB,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,GACnD,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;QAC/C,4EAA4E;QAC5E,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;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DjF;AAED;;;;;;GAMG;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 = {
|
|
@@ -35,6 +36,7 @@ export const supportedLogTypes = {
|
|
|
35
36
|
* Each connected websocket listener will receive logcat log lines
|
|
36
37
|
* as soon as they are visible to Appium.
|
|
37
38
|
*
|
|
39
|
+
* @deprecated Subscribe to the BiDi `log.entryAdded` event instead.
|
|
38
40
|
* @returns Promise that resolves when the logcat broadcasting websocket is started.
|
|
39
41
|
*/
|
|
40
42
|
export async function mobileStartLogsBroadcast() {
|
|
@@ -98,6 +100,7 @@ export async function mobileStartLogsBroadcast() {
|
|
|
98
100
|
* Stops the previously started logcat broadcasting wesocket server.
|
|
99
101
|
* This method will return immediately if no server is running.
|
|
100
102
|
*
|
|
103
|
+
* @deprecated Unsubscribe from the BiDi `log.entryAdded` event instead.
|
|
101
104
|
* @returns Promise that resolves when the logcat broadcasting websocket is stopped.
|
|
102
105
|
*/
|
|
103
106
|
export async function mobileStopLogsBroadcast() {
|
|
@@ -122,6 +125,9 @@ export async function mobileStopLogsBroadcast() {
|
|
|
122
125
|
export function assignBiDiLogListener(logEmitter, properties) {
|
|
123
126
|
const { type, context = NATIVE_WIN, srcEventName = 'output', entryTransformer } = properties;
|
|
124
127
|
const listener = (logEntry) => {
|
|
128
|
+
if (!hasSubscribers(this, LOG_ENTRY_ADDED_EVENT, context)) {
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
125
131
|
const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
|
|
126
132
|
this.eventEmitter.emit(BIDI_EVENT_NAME, makeLogEntryAddedEvent(finalEntry, context, type));
|
|
127
133
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAGrC,OAAO,EAAC,0BAA0B,EAAC,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,IAAI,CAAC;AAI9C,OAAO,EAAC,uBAAuB,EAAE,WAAW,EAAE,6BAA6B,EAAgB,MAAM,aAAa,CAAC;AAC/G,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../lib/commands/log.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,9 @@ export declare const KEYFRAME_REQUEST_MIN_INTERVAL_MS = 1000;
|
|
|
9
9
|
export declare const FIRST_UNIT_TIMEOUT_MS = 5000;
|
|
10
10
|
export declare const DEFAULT_BATCH_MS = 40;
|
|
11
11
|
export declare const DEFAULT_IDLE_HEARTBEAT_MS = 1000;
|
|
12
|
+
export declare const MAX_BATCH_MS = 1000;
|
|
13
|
+
export declare const MIN_IDLE_HEARTBEAT_MS = 100;
|
|
14
|
+
export declare const MAX_IDLE_HEARTBEAT_MS = 60000;
|
|
12
15
|
export declare const AUDIO_SAMPLE_RATE = 44100;
|
|
13
16
|
export declare const AUDIO_CHANNELS = 1;
|
|
14
17
|
//# sourceMappingURL=constants.d.ts.map
|
package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,iBAAiB,6BAAiC,CAAC;AAChE,eAAO,MAAM,mBAAmB,+BAAmC,CAAC;AACpE,eAAO,MAAM,0BAA0B,qCAAyC,CAAC;AACjF,eAAO,MAAM,iBAAiB,6BAAiC,CAAC;AAChE,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D,eAAO,MAAM,aAAa,KAAK,CAAC;AAChC,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,yBAAyB,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,iBAAiB,6BAAiC,CAAC;AAChE,eAAO,MAAM,mBAAmB,+BAAmC,CAAC;AACpE,eAAO,MAAM,0BAA0B,qCAAyC,CAAC;AACjF,eAAO,MAAM,iBAAiB,6BAAiC,CAAC;AAChE,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D,eAAO,MAAM,aAAa,KAAK,CAAC;AAChC,eAAO,MAAM,gCAAgC,OAAO,CAAC;AAErD,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAC1C,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,yBAAyB,OAAO,CAAC;AAC9C,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAE5C,eAAO,MAAM,iBAAiB,QAAQ,CAAC;AACvC,eAAO,MAAM,cAAc,IAAI,CAAC"}
|
|
@@ -10,6 +10,10 @@ export const KEYFRAME_REQUEST_MIN_INTERVAL_MS = 1000;
|
|
|
10
10
|
export const FIRST_UNIT_TIMEOUT_MS = 5000;
|
|
11
11
|
export const DEFAULT_BATCH_MS = 40;
|
|
12
12
|
export const DEFAULT_IDLE_HEARTBEAT_MS = 1000;
|
|
13
|
+
export const MAX_BATCH_MS = 1000;
|
|
14
|
+
// A smaller non-zero heartbeat would let a client flood itself with repeated frames
|
|
15
|
+
export const MIN_IDLE_HEARTBEAT_MS = 100;
|
|
16
|
+
export const MAX_IDLE_HEARTBEAT_MS = 60_000;
|
|
13
17
|
// settings app defaults, reported in `started` (ADTS AAC-LC)
|
|
14
18
|
export const AUDIO_SAMPLE_RATE = 44100;
|
|
15
19
|
export const AUDIO_CHANNELS = 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,mBAAmB,QAAQ,CAAC;AAChE,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,mBAAmB,UAAU,CAAC;AACpE,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,mBAAmB,gBAAgB,CAAC;AACjF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,mBAAmB,QAAQ,CAAC;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;AAC1D,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAChC,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,CAAC;AACrD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAC9C,6DAA6D;AAC7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,mBAAmB,QAAQ,CAAC;AAChE,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,mBAAmB,UAAU,CAAC;AACpE,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,mBAAmB,gBAAgB,CAAC;AACjF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,mBAAmB,QAAQ,CAAC;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;AAC1D,MAAM,CAAC,MAAM,aAAa,GAAG,EAAE,CAAC;AAChC,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,CAAC;AACrD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC;AAC9C,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,oFAAoF;AACpF,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AACzC,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAC5C,6DAA6D;AAC7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC"}
|
|
@@ -12,6 +12,8 @@ declare module '../../driver.js' {
|
|
|
12
12
|
* Starts streaming the screen as `appium:mediaStream.*` BiDi events.
|
|
13
13
|
* Subscribe to `appium:mediaStream` before calling this. The result and the `started` event of a
|
|
14
14
|
* video stream carry the frame size (after any scaling to the encoder's limits).
|
|
15
|
+
* Only one stream of each kind runs per session. If one of the same kind is still stopping, this
|
|
16
|
+
* waits until its device session is stopped, so the two device sessions never overlap.
|
|
15
17
|
*
|
|
16
18
|
* @param kind 'video' (H.264/HEVC, optionally with AAC audio) or 'jpeg'.
|
|
17
19
|
* @param codec Video codec, 'h264' by default.
|
|
@@ -21,8 +23,8 @@ declare module '../../driver.js' {
|
|
|
21
23
|
* @param scale JPEG scale in percent, 1-100.
|
|
22
24
|
* @param resolution Video resolution as 'WxH'.
|
|
23
25
|
* @param audio Whether to add an AAC audio track (video only).
|
|
24
|
-
* @param batchMs Units batching window for video/audio. 40 by default.
|
|
25
|
-
* @param idleHeartbeatMs Re-send the last JPEG after this idle time. 1000 by default, 0 disables.
|
|
26
|
+
* @param batchMs Units batching window for video/audio, 0-1000. 40 by default, 0 disables batching.
|
|
27
|
+
* @param idleHeartbeatMs Re-send the last JPEG after this idle time. 1000 by default, 0 disables, otherwise 100-60000.
|
|
26
28
|
*/
|
|
27
29
|
export declare function mobileStartMediaStream(this: AndroidDriver, kind: MediaKind, codec?: 'h264' | 'hevc', fps?: number, bitrate?: number, quality?: number, scale?: number, resolution?: string, audio?: boolean, batchMs?: number, idleHeartbeatMs?: number): Promise<MediaStreamInfo>;
|
|
28
30
|
/**
|
|
@@ -31,12 +33,16 @@ export declare function mobileStartMediaStream(this: AndroidDriver, kind: MediaK
|
|
|
31
33
|
*/
|
|
32
34
|
export declare function mobileGetMediaStreamCapabilities(this: AndroidDriver): Promise<MediaStreamCapabilities>;
|
|
33
35
|
/**
|
|
34
|
-
* Stops a media stream started by `mobile: startMediaStream
|
|
36
|
+
* Stops a media stream started by `mobile: startMediaStream`, and resolves once its device session
|
|
37
|
+
* is stopped, also if it was already stopping.
|
|
35
38
|
* Stopping a stream that has already ended is a no-op, also after other streams were started.
|
|
36
39
|
*
|
|
37
40
|
* @param streamId The id returned by `mobile: startMediaStream`.
|
|
38
41
|
*/
|
|
39
42
|
export declare function mobileStopMediaStream(this: AndroidDriver, streamId: string): Promise<void>;
|
|
40
|
-
/**
|
|
43
|
+
/**
|
|
44
|
+
* Stops all streams of the session, also waiting for those still stopping, and rejects starts
|
|
45
|
+
* that have not registered their stream yet; used on session deletion.
|
|
46
|
+
*/
|
|
41
47
|
export declare function stopAllMediaStreams(this: AndroidDriver): Promise<void>;
|
|
42
48
|
//# sourceMappingURL=exports.d.ts.map
|
|
@@ -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;
|
|
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;AAcnD,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;;;;;;;;;;;;;;;;;GAiBG;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,CA4E1B;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAE5G;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhG;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5E"}
|
|
@@ -1,12 +1,15 @@
|
|
|
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,
|
|
5
|
+
import { DEFAULT_BATCH_MS, DEFAULT_IDLE_HEARTBEAT_MS, MAX_BATCH_MS, MAX_IDLE_HEARTBEAT_MS, MEDIA_UNITS_EVENT, MIN_API_LEVEL, MIN_IDLE_HEARTBEAT_MS, } from './constants.js';
|
|
5
6
|
import { MediaStream } from './stream.js';
|
|
6
7
|
/**
|
|
7
8
|
* Starts streaming the screen as `appium:mediaStream.*` BiDi events.
|
|
8
9
|
* Subscribe to `appium:mediaStream` before calling this. The result and the `started` event of a
|
|
9
10
|
* video stream carry the frame size (after any scaling to the encoder's limits).
|
|
11
|
+
* Only one stream of each kind runs per session. If one of the same kind is still stopping, this
|
|
12
|
+
* waits until its device session is stopped, so the two device sessions never overlap.
|
|
10
13
|
*
|
|
11
14
|
* @param kind 'video' (H.264/HEVC, optionally with AAC audio) or 'jpeg'.
|
|
12
15
|
* @param codec Video codec, 'h264' by default.
|
|
@@ -16,8 +19,8 @@ import { MediaStream } from './stream.js';
|
|
|
16
19
|
* @param scale JPEG scale in percent, 1-100.
|
|
17
20
|
* @param resolution Video resolution as 'WxH'.
|
|
18
21
|
* @param audio Whether to add an AAC audio track (video only).
|
|
19
|
-
* @param batchMs Units batching window for video/audio. 40 by default.
|
|
20
|
-
* @param idleHeartbeatMs Re-send the last JPEG after this idle time. 1000 by default, 0 disables.
|
|
22
|
+
* @param batchMs Units batching window for video/audio, 0-1000. 40 by default, 0 disables batching.
|
|
23
|
+
* @param idleHeartbeatMs Re-send the last JPEG after this idle time. 1000 by default, 0 disables, otherwise 100-60000.
|
|
21
24
|
*/
|
|
22
25
|
export async function mobileStartMediaStream(kind, codec, fps, bitrate, quality, scale, resolution, audio, batchMs = DEFAULT_BATCH_MS, idleHeartbeatMs = DEFAULT_IDLE_HEARTBEAT_MS) {
|
|
23
26
|
const opts = {
|
|
@@ -48,16 +51,19 @@ export async function mobileStartMediaStream(kind, codec, fps, bitrate, quality,
|
|
|
48
51
|
}
|
|
49
52
|
const streams = (this._mediaStreams ??= new Map());
|
|
50
53
|
const ended = (this._endedMediaStreamIds ??= new Set());
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
let stopping;
|
|
55
|
+
while ((stopping = [...streams.values()].find((s) => s.kind === kind && s.isStopped))) {
|
|
56
|
+
await stopping.stop();
|
|
57
|
+
}
|
|
58
|
+
let returned = false;
|
|
59
|
+
if (this._mediaStreamsClosed) {
|
|
60
|
+
throw new errors.NoSuchDriverError('The session was deleted while the media stream was starting');
|
|
56
61
|
}
|
|
57
62
|
if ([...streams.values()].some((s) => s.kind === kind)) {
|
|
58
63
|
throw new errors.InvalidArgumentError(`A ${kind} media stream is already running in this session`);
|
|
59
64
|
}
|
|
60
|
-
// No await between the
|
|
65
|
+
// No await between the checks above and the registration below, or concurrent starts could both
|
|
66
|
+
// pass, or a start could register a stream that session deletion no longer stops
|
|
61
67
|
const session = kind === 'video' ? this.settingsApp.makeVideoStreamSession() : this.settingsApp.makeJpegStreamSession();
|
|
62
68
|
const stream = new MediaStream(session, opts, {
|
|
63
69
|
emit: (event) => {
|
|
@@ -68,16 +74,21 @@ export async function mobileStartMediaStream(kind, codec, fps, bitrate, quality,
|
|
|
68
74
|
emitter: this.eventEmitter,
|
|
69
75
|
hasSubscribers: () => hasSubscribers(this, MEDIA_UNITS_EVENT),
|
|
70
76
|
log: this.log,
|
|
71
|
-
|
|
72
|
-
|
|
77
|
+
onEnded: (id) => {
|
|
78
|
+
streams.delete(id);
|
|
79
|
+
if (returned) {
|
|
80
|
+
ended.add(id);
|
|
81
|
+
}
|
|
82
|
+
},
|
|
73
83
|
});
|
|
74
84
|
streams.set(stream.streamId, stream);
|
|
75
85
|
try {
|
|
76
86
|
await this.settingsApp.adjustMediaProjectionServicePermissions();
|
|
77
|
-
|
|
87
|
+
const info = await stream.start();
|
|
88
|
+
returned = true;
|
|
89
|
+
return info;
|
|
78
90
|
}
|
|
79
91
|
catch (e) {
|
|
80
|
-
streams.delete(stream.streamId);
|
|
81
92
|
await stream.stop('failed to start');
|
|
82
93
|
throw e instanceof TypeError || e instanceof RangeError ? new errors.InvalidArgumentError(e.message) : e;
|
|
83
94
|
}
|
|
@@ -90,7 +101,8 @@ export async function mobileGetMediaStreamCapabilities() {
|
|
|
90
101
|
return await getCapabilities(this.adb);
|
|
91
102
|
}
|
|
92
103
|
/**
|
|
93
|
-
* Stops a media stream started by `mobile: startMediaStream
|
|
104
|
+
* Stops a media stream started by `mobile: startMediaStream`, and resolves once its device session
|
|
105
|
+
* is stopped, also if it was already stopping.
|
|
94
106
|
* Stopping a stream that has already ended is a no-op, also after other streams were started.
|
|
95
107
|
*
|
|
96
108
|
* @param streamId The id returned by `mobile: startMediaStream`.
|
|
@@ -104,13 +116,14 @@ export async function mobileStopMediaStream(streamId) {
|
|
|
104
116
|
throw new errors.InvalidArgumentError(`Unknown media stream id '${streamId}'`);
|
|
105
117
|
}
|
|
106
118
|
}
|
|
107
|
-
/**
|
|
119
|
+
/**
|
|
120
|
+
* Stops all streams of the session, also waiting for those still stopping, and rejects starts
|
|
121
|
+
* that have not registered their stream yet; used on session deletion.
|
|
122
|
+
*/
|
|
108
123
|
export async function stopAllMediaStreams() {
|
|
124
|
+
this._mediaStreamsClosed = true;
|
|
109
125
|
await Promise.all([...(this._mediaStreams?.values() ?? [])].map((s) => s.stop('session ended')));
|
|
110
126
|
}
|
|
111
|
-
function hasSubscribers(driver, method) {
|
|
112
|
-
return [method, MEDIA_STREAM_MODULE].some((e) => (driver.bidiEventSubs[e]?.length ?? 0) > 0);
|
|
113
|
-
}
|
|
114
127
|
function validateOpts({ kind, codec, bitrate, quality, scale, audio, batchMs, idleHeartbeatMs, }) {
|
|
115
128
|
if (kind !== 'video' && kind !== 'jpeg') {
|
|
116
129
|
throw new errors.InvalidArgumentError(`'kind' must be either 'video' or 'jpeg', got '${String(kind)}'`);
|
|
@@ -120,8 +133,13 @@ function validateOpts({ kind, codec, bitrate, quality, scale, audio, batchMs, id
|
|
|
120
133
|
if (offending.length) {
|
|
121
134
|
throw new errors.InvalidArgumentError(`${offending.map(([k]) => `'${k}'`).join(', ')} not supported for kind '${kind}'`);
|
|
122
135
|
}
|
|
123
|
-
if (!Number.isInteger(batchMs) || batchMs < 0 ||
|
|
124
|
-
throw new errors.InvalidArgumentError(`'batchMs'
|
|
136
|
+
if (!Number.isInteger(batchMs) || batchMs < 0 || batchMs > MAX_BATCH_MS) {
|
|
137
|
+
throw new errors.InvalidArgumentError(`'batchMs' must be an integer between 0 and ${MAX_BATCH_MS}, got '${String(batchMs)}'`);
|
|
138
|
+
}
|
|
139
|
+
if (!Number.isInteger(idleHeartbeatMs) ||
|
|
140
|
+
(idleHeartbeatMs !== 0 && (idleHeartbeatMs < MIN_IDLE_HEARTBEAT_MS || idleHeartbeatMs > MAX_IDLE_HEARTBEAT_MS))) {
|
|
141
|
+
throw new errors.InvalidArgumentError(`'idleHeartbeatMs' must be 0 or an integer between ${MIN_IDLE_HEARTBEAT_MS} and ${MAX_IDLE_HEARTBEAT_MS}, ` +
|
|
142
|
+
`got '${String(idleHeartbeatMs)}'`);
|
|
125
143
|
}
|
|
126
144
|
}
|
|
127
145
|
//# sourceMappingURL=exports.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAIxC,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,
|
|
1
|
+
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/commands/media-stream/exports.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,7 @@ export declare class MediaStream {
|
|
|
25
25
|
private videoSynced;
|
|
26
26
|
private wasSubscribed;
|
|
27
27
|
private lastKeyFrameRequestAt;
|
|
28
|
+
private keyFrameRetry?;
|
|
28
29
|
private jpegSeq;
|
|
29
30
|
private lastJpeg?;
|
|
30
31
|
private lastJpegEmitAt;
|
|
@@ -32,24 +33,54 @@ export declare class MediaStream {
|
|
|
32
33
|
private dropped;
|
|
33
34
|
private heartbeat?;
|
|
34
35
|
private pump?;
|
|
35
|
-
|
|
36
|
+
/**
|
|
37
|
+
* Settles once the device session is up or failed to start, telling whether there is a device
|
|
38
|
+
* session of ours to stop. False if another client's stream of this kind was found running, or if
|
|
39
|
+
* the options were rejected (TypeError, RangeError) before the device was touched. Any other
|
|
40
|
+
* failure may have brought the on-device service up, so it counts as ours.
|
|
41
|
+
*/
|
|
42
|
+
private deviceStart?;
|
|
36
43
|
private announced;
|
|
37
44
|
private endReason;
|
|
38
45
|
private firstUnitSeen;
|
|
39
46
|
private readonly firstUnit;
|
|
40
47
|
private stopped;
|
|
48
|
+
private finished?;
|
|
41
49
|
private get videoChain();
|
|
42
50
|
constructor(session: VideoStreamSession | JpegStreamSession, opts: StartMediaStreamOpts & {
|
|
43
51
|
batchMs: number;
|
|
44
52
|
idleHeartbeatMs: number;
|
|
45
53
|
}, deps: MediaStreamDeps);
|
|
54
|
+
/**
|
|
55
|
+
* Starts the device session and republishes its units.
|
|
56
|
+
* Throws if another client's stream of this kind runs on the device, which is left alone.
|
|
57
|
+
* If the stream is stopped while the device session is starting, this throws and the teardown
|
|
58
|
+
* stops the device session once it is up.
|
|
59
|
+
*/
|
|
46
60
|
start(): Promise<MediaStreamInfo>;
|
|
47
61
|
private waitForFirstUnit;
|
|
48
62
|
private announce;
|
|
49
63
|
get isStopped(): boolean;
|
|
50
|
-
/**
|
|
64
|
+
/**
|
|
65
|
+
* Idempotent: every call waits for the same teardown, and resolves once the device session of
|
|
66
|
+
* the stream is stopped (after its start settled, if it was still starting) and the pump has
|
|
67
|
+
* finished. Never rejects.
|
|
68
|
+
*/
|
|
51
69
|
stop(reason?: string): Promise<void>;
|
|
70
|
+
/**
|
|
71
|
+
* Marks the stream stopped and returns its single teardown.
|
|
72
|
+
* Must not await the pump: it is also called from inside the pump itself.
|
|
73
|
+
*/
|
|
52
74
|
private finish;
|
|
75
|
+
/**
|
|
76
|
+
* Waits for a device start that is still in flight (a starting device session can only be
|
|
77
|
+
* stopped once it is up), stops the device session if it is ours, emits `ended`, and calls
|
|
78
|
+
* `onEnded`. Never rejects: the stream is ended whatever its device session or a listener of
|
|
79
|
+
* `ended` does, so failures of either are logged, not passed to the callers of stop().
|
|
80
|
+
* It awaits before running any callback, so finish() has stored it by the time a callback stops
|
|
81
|
+
* the stream again, and that call gets this same teardown.
|
|
82
|
+
*/
|
|
83
|
+
private teardown;
|
|
53
84
|
private info;
|
|
54
85
|
private runPump;
|
|
55
86
|
private onAccessUnit;
|
|
@@ -59,6 +90,7 @@ export declare class MediaStream {
|
|
|
59
90
|
private checkSize;
|
|
60
91
|
private emitUnits;
|
|
61
92
|
private requestKeyFrame;
|
|
93
|
+
private cancelKeyFrameRetry;
|
|
62
94
|
private sendKeyFrameRequest;
|
|
63
95
|
private onBackpressure;
|
|
64
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/stream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAC,YAAY,EAAyB,SAAS,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAwB,iBAAiB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAiBrG,OAAO,KAAK,EAAC,eAAe,EAAa,oBAAoB,EAAW,MAAM,YAAY,CAAC;AAE3F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC;IACtB,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,GAAG,EAAE,YAAY,CAAC;IAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED;;;GAGG;AACH,qBAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../lib/commands/media-stream/stream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAC,YAAY,EAAyB,SAAS,EAAC,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAwB,iBAAiB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAiBrG,OAAO,KAAK,EAAC,eAAe,EAAa,oBAAoB,EAAW,MAAM,YAAY,CAAC;AAE3F,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IACjC,OAAO,EAAE,YAAY,CAAC;IACtB,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,GAAG,EAAE,YAAY,CAAC;IAClB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED;;;GAGG;AACH,qBAAa,WAAW;IAoCpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IArCvB,QAAQ,CAAC,QAAQ,sDAAgB;IACjC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,qBAAqB,CAAK;IAClC,OAAO,CAAC,aAAa,CAAC,CAAiB;IACvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,QAAQ,CAAC,CAAY;IAC7B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,IAAI,CAAC,CAAkC;IAC/C,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,IAAI,CAAC,CAAgB;IAC7B;;;;;OAKG;IACH,OAAO,CAAC,WAAW,CAAC,CAAmB;IACvC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkE;IAC5F,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAgB;IACjC,OAAO,KAAK,UAAU,GAErB;gBAGkB,OAAO,EAAE,kBAAkB,GAAG,iBAAiB,EAC/C,IAAI,EAAE,oBAAoB,GAAG;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAC,EACvE,IAAI,EAAE,eAAe;IAMxC;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;YA6CzB,gBAAgB;IAyB9B,OAAO,CAAC,QAAQ;IAQhB,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;OAIG;IACG,IAAI,CAAC,MAAM,SAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;OAGG;IACH,OAAO,CAAC,MAAM;IAKd;;;;;;;OAOG;YACW,QAAQ;IAsBtB,OAAO,CAAC,IAAI;YAcE,OAAO;IAmBrB,OAAO,CAAC,YAAY;IAqDpB,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,mBAAmB;YAKb,mBAAmB;IASjC,OAAO,CAAC,cAAc,CASpB;CACH"}
|