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.
Files changed (278) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/build/lib/commands/orientation.d.ts +33 -0
  3. package/build/lib/commands/orientation.d.ts.map +1 -0
  4. package/build/lib/commands/orientation.js +34 -0
  5. package/build/lib/commands/orientation.js.map +1 -0
  6. package/build/lib/commands/server/builder.d.ts +9 -0
  7. package/build/lib/commands/server/builder.d.ts.map +1 -1
  8. package/build/lib/commands/server/builder.js +23 -0
  9. package/build/lib/commands/server/builder.js.map +1 -1
  10. package/build/lib/commands/server/hints.d.ts +28 -0
  11. package/build/lib/commands/server/hints.d.ts.map +1 -0
  12. package/build/lib/commands/server/hints.js +54 -0
  13. package/build/lib/commands/server/hints.js.map +1 -0
  14. package/build/lib/commands/server/runner.d.ts +7 -0
  15. package/build/lib/commands/server/runner.d.ts.map +1 -1
  16. package/build/lib/commands/server/runner.js +43 -4
  17. package/build/lib/commands/server/runner.js.map +1 -1
  18. package/build/lib/driver.d.ts.map +1 -1
  19. package/build/lib/driver.js +13 -0
  20. package/build/lib/driver.js.map +1 -1
  21. package/build/lib/execute-method-map.d.ts +4 -0
  22. package/build/lib/execute-method-map.d.ts.map +1 -1
  23. package/espresso-server/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk +0 -0
  24. package/espresso-server/app/build.gradle.kts +91 -1
  25. package/espresso-server/app/src/androidTestShaded/AndroidManifest.xml +16 -0
  26. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.bin +0 -0
  27. package/espresso-server/buildSrc/.gradle/9.7.1/executionHistory/executionHistory.lock +0 -0
  28. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  29. package/espresso-server/buildSrc/.gradle/buildOutputCleanup/cache.properties +1 -1
  30. package/espresso-server/buildSrc/build/classes/kotlin/main/META-INF/buildSrc.kotlin_module +0 -0
  31. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitField$1$1.class +0 -0
  32. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper$visitMethod$1$1.class +0 -0
  33. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/AnnotationSkipper.class +0 -0
  34. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/MemberRef.class +0 -0
  35. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/PrefixRemapper.class +0 -0
  36. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$groupingBy$1.class +0 -0
  37. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$$inlined$sortedByDescending$1.class +0 -0
  38. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$9$1.class +0 -0
  39. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask$run$remapper$1.class +0 -0
  40. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocateClassesTask.class +0 -0
  41. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1$visitMethod$1.class +0 -0
  42. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$memberReferences$1.class +0 -0
  43. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$referencedClasses$collector$1.class +0 -0
  44. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt$shareNonPublicDependents$Declared.class +0 -0
  45. package/espresso-server/buildSrc/build/classes/kotlin/main/io/appium/espressoserver/gradle/RelocationKt.class +0 -0
  46. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab +0 -0
  47. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream +0 -0
  48. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len +0 -0
  49. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len +0 -0
  50. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at +0 -0
  51. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i +0 -0
  52. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab +0 -0
  53. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream +0 -0
  54. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len +0 -0
  55. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len +0 -0
  56. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at +0 -0
  57. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i +0 -0
  58. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab +0 -0
  59. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream +0 -0
  60. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len +0 -0
  61. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len +0 -0
  62. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at +0 -0
  63. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i +0 -0
  64. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab +0 -0
  65. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream +0 -0
  66. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len +0 -0
  67. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.len +0 -0
  68. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at +0 -0
  69. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i +0 -0
  70. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i.len +0 -0
  71. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab +0 -0
  72. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream +0 -0
  73. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len +0 -0
  74. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len +0 -0
  75. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at +0 -0
  76. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i +0 -0
  77. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab +0 -0
  78. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream +0 -0
  79. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len +0 -0
  80. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len +0 -0
  81. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at +0 -0
  82. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i +0 -0
  83. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab +0 -0
  84. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream +0 -0
  85. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len +0 -0
  86. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len +0 -0
  87. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at +0 -0
  88. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i +0 -0
  89. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab +0 -0
  90. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream +0 -0
  91. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len +0 -0
  92. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len +0 -0
  93. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at +0 -0
  94. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i +0 -0
  95. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab +0 -0
  96. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream +0 -0
  97. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len +0 -0
  98. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len +0 -0
  99. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at +0 -0
  100. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i +0 -0
  101. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i.len +0 -0
  102. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab +0 -0
  103. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream +0 -0
  104. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len +0 -0
  105. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len +0 -0
  106. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at +0 -0
  107. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i +0 -0
  108. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i.len +0 -0
  109. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab +1 -1
  110. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab +0 -0
  111. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream +0 -0
  112. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len +0 -0
  113. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len +0 -0
  114. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at +0 -0
  115. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i +0 -0
  116. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab +0 -0
  117. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream +0 -0
  118. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len +0 -0
  119. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len +0 -0
  120. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at +0 -0
  121. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i +0 -0
  122. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab +0 -0
  123. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream +0 -0
  124. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len +0 -0
  125. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len +0 -0
  126. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at +0 -0
  127. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i +0 -0
  128. package/espresso-server/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin +0 -0
  129. package/espresso-server/buildSrc/build/kotlin/compileKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin +0 -0
  130. package/espresso-server/buildSrc/build/libs/buildSrc.jar +0 -0
  131. package/espresso-server/buildSrc/build.gradle.kts +6 -0
  132. package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/RelocateClassesTask.kt +141 -0
  133. package/espresso-server/buildSrc/src/main/kotlin/io/appium/espressoserver/gradle/Relocation.kt +342 -0
  134. package/espresso-server/buildSrc/src/test/kotlin/io/appium/espressoserver/gradle/RelocationTest.kt +186 -0
  135. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/handlers/ListIdlingResources.kt +2 -1
  136. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/ShadingHelpers.kt +45 -0
  137. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/helpers/Version.kt +1 -1
  138. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/http/response/AppiumResponse.kt +3 -2
  139. package/espresso-server/library/src/main/java/io/appium/espressoserver/lib/model/HamcrestMatcher.kt +8 -5
  140. package/espresso-server/library/src/test/java/io/appium/espressoserver/test/helpers/ShadingHelpersTest.kt +37 -0
  141. package/lib/commands/orientation.ts +49 -0
  142. package/lib/commands/server/builder.ts +29 -0
  143. package/lib/commands/server/hints.ts +69 -0
  144. package/lib/commands/server/runner.ts +53 -5
  145. package/lib/driver.ts +14 -0
  146. package/node_modules/appium-adb/CHANGELOG.md +7 -0
  147. package/node_modules/appium-adb/package.json +3 -3
  148. package/node_modules/appium-android-driver/CHANGELOG.md +74 -0
  149. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts +10 -0
  150. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.d.ts.map +1 -0
  151. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js +15 -0
  152. package/node_modules/appium-android-driver/build/lib/commands/bidi/helpers.js.map +1 -0
  153. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts +9 -0
  154. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.d.ts.map +1 -0
  155. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js +37 -0
  156. package/node_modules/appium-android-driver/build/lib/commands/bidi/logcat-level.js.map +1 -0
  157. package/node_modules/appium-android-driver/build/lib/commands/device/common.d.ts.map +1 -1
  158. package/node_modules/appium-android-driver/build/lib/commands/device/common.js +2 -0
  159. package/node_modules/appium-android-driver/build/lib/commands/device/common.js.map +1 -1
  160. package/node_modules/appium-android-driver/build/lib/commands/find.js +2 -2
  161. package/node_modules/appium-android-driver/build/lib/commands/find.js.map +1 -1
  162. package/node_modules/appium-android-driver/build/lib/commands/log.d.ts +4 -0
  163. package/node_modules/appium-android-driver/build/lib/commands/log.d.ts.map +1 -1
  164. package/node_modules/appium-android-driver/build/lib/commands/log.js +7 -1
  165. package/node_modules/appium-android-driver/build/lib/commands/log.js.map +1 -1
  166. package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.d.ts +3 -0
  167. package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.d.ts.map +1 -1
  168. package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.js +4 -0
  169. package/node_modules/appium-android-driver/build/lib/commands/media-stream/constants.js.map +1 -1
  170. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts +10 -4
  171. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.d.ts.map +1 -1
  172. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js +38 -20
  173. package/node_modules/appium-android-driver/build/lib/commands/media-stream/exports.js.map +1 -1
  174. package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.d.ts +34 -2
  175. package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.d.ts.map +1 -1
  176. package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.js +89 -43
  177. package/node_modules/appium-android-driver/build/lib/commands/media-stream/stream.js.map +1 -1
  178. package/node_modules/appium-android-driver/build/lib/driver.d.ts +5 -0
  179. package/node_modules/appium-android-driver/build/lib/driver.d.ts.map +1 -1
  180. package/node_modules/appium-android-driver/build/lib/driver.js +1 -0
  181. package/node_modules/appium-android-driver/build/lib/driver.js.map +1 -1
  182. package/node_modules/appium-android-driver/build/lib/execute-method-map.d.ts +4 -0
  183. package/node_modules/appium-android-driver/build/lib/execute-method-map.d.ts.map +1 -1
  184. package/node_modules/appium-android-driver/build/lib/execute-method-map.js +5 -0
  185. package/node_modules/appium-android-driver/build/lib/execute-method-map.js.map +1 -1
  186. package/node_modules/appium-android-driver/lib/commands/bidi/helpers.ts +16 -0
  187. package/node_modules/appium-android-driver/lib/commands/bidi/logcat-level.ts +40 -0
  188. package/node_modules/appium-android-driver/lib/commands/device/common.ts +2 -0
  189. package/node_modules/appium-android-driver/lib/commands/find.ts +2 -2
  190. package/node_modules/appium-android-driver/lib/commands/log.ts +9 -1
  191. package/node_modules/appium-android-driver/lib/commands/media-stream/constants.ts +4 -0
  192. package/node_modules/appium-android-driver/lib/commands/media-stream/exports.ts +46 -21
  193. package/node_modules/appium-android-driver/lib/commands/media-stream/stream.ts +90 -43
  194. package/node_modules/appium-android-driver/lib/driver.ts +1 -0
  195. package/node_modules/appium-android-driver/lib/execute-method-map.ts +6 -0
  196. package/node_modules/appium-android-driver/package.json +6 -6
  197. package/node_modules/appium-chromedriver/CHANGELOG.md +7 -0
  198. package/node_modules/appium-chromedriver/config/mapping.json +1 -0
  199. package/node_modules/appium-chromedriver/package.json +2 -2
  200. package/node_modules/asyncbox/README.md +7 -3
  201. package/node_modules/asyncbox/build/lib/shared/errors.d.ts +18 -2
  202. package/node_modules/asyncbox/build/lib/shared/errors.d.ts.map +1 -1
  203. package/node_modules/asyncbox/build/lib/shared/errors.js +24 -8
  204. package/node_modules/asyncbox/build/lib/shared/errors.js.map +1 -1
  205. package/node_modules/asyncbox/lib/shared/errors.ts +34 -8
  206. package/node_modules/asyncbox/package.json +1 -1
  207. package/node_modules/bare-buffer/CMakeLists.txt +3 -3
  208. package/node_modules/bare-buffer/package.json +1 -1
  209. package/node_modules/bare-buffer/prebuilds/android-arm/bare-buffer.bare +0 -0
  210. package/node_modules/bare-buffer/prebuilds/android-arm64/bare-buffer.bare +0 -0
  211. package/node_modules/bare-buffer/prebuilds/android-ia32/bare-buffer.bare +0 -0
  212. package/node_modules/bare-buffer/prebuilds/android-x64/bare-buffer.bare +0 -0
  213. package/node_modules/bare-buffer/prebuilds/darwin-arm64/bare-buffer.bare +0 -0
  214. package/node_modules/bare-buffer/prebuilds/darwin-x64/bare-buffer.bare +0 -0
  215. package/node_modules/bare-buffer/prebuilds/ios-arm64/bare-buffer.bare +0 -0
  216. package/node_modules/bare-buffer/prebuilds/ios-arm64-simulator/bare-buffer.bare +0 -0
  217. package/node_modules/bare-buffer/prebuilds/ios-x64-simulator/bare-buffer.bare +0 -0
  218. package/node_modules/bare-buffer/prebuilds/linux-arm64/bare-buffer.bare +0 -0
  219. package/node_modules/bare-buffer/prebuilds/linux-x64/bare-buffer.bare +0 -0
  220. package/node_modules/bare-buffer/prebuilds/win32-arm64/bare-buffer.bare +0 -0
  221. package/node_modules/bare-buffer/prebuilds/win32-x64/bare-buffer.bare +0 -0
  222. package/node_modules/bare-fs/package.json +2 -2
  223. package/node_modules/bare-fs/prebuilds/android-arm/bare-fs.bare +0 -0
  224. package/node_modules/bare-fs/prebuilds/android-arm64/bare-fs.bare +0 -0
  225. package/node_modules/bare-fs/prebuilds/android-ia32/bare-fs.bare +0 -0
  226. package/node_modules/bare-fs/prebuilds/android-x64/bare-fs.bare +0 -0
  227. package/node_modules/bare-fs/prebuilds/darwin-arm64/bare-fs.bare +0 -0
  228. package/node_modules/bare-fs/prebuilds/darwin-x64/bare-fs.bare +0 -0
  229. package/node_modules/bare-fs/prebuilds/ios-arm64/bare-fs.bare +0 -0
  230. package/node_modules/bare-fs/prebuilds/ios-arm64-simulator/bare-fs.bare +0 -0
  231. package/node_modules/bare-fs/prebuilds/ios-x64-simulator/bare-fs.bare +0 -0
  232. package/node_modules/bare-fs/prebuilds/linux-arm64/bare-fs.bare +0 -0
  233. package/node_modules/bare-fs/prebuilds/linux-x64/bare-fs.bare +0 -0
  234. package/node_modules/bare-fs/prebuilds/win32-arm64/bare-fs.bare +0 -0
  235. package/node_modules/bare-fs/prebuilds/win32-x64/bare-fs.bare +0 -0
  236. package/node_modules/bare-url/CMakeLists.txt +5 -5
  237. package/node_modules/bare-url/package.json +1 -1
  238. package/node_modules/bare-url/prebuilds/android-arm/bare-url.bare +0 -0
  239. package/node_modules/bare-url/prebuilds/android-arm64/bare-url.bare +0 -0
  240. package/node_modules/bare-url/prebuilds/android-ia32/bare-url.bare +0 -0
  241. package/node_modules/bare-url/prebuilds/android-x64/bare-url.bare +0 -0
  242. package/node_modules/bare-url/prebuilds/darwin-arm64/bare-url.bare +0 -0
  243. package/node_modules/bare-url/prebuilds/darwin-x64/bare-url.bare +0 -0
  244. package/node_modules/bare-url/prebuilds/ios-arm64/bare-url.bare +0 -0
  245. package/node_modules/bare-url/prebuilds/ios-arm64-simulator/bare-url.bare +0 -0
  246. package/node_modules/bare-url/prebuilds/ios-x64-simulator/bare-url.bare +0 -0
  247. package/node_modules/bare-url/prebuilds/linux-arm64/bare-url.bare +0 -0
  248. package/node_modules/bare-url/prebuilds/linux-x64/bare-url.bare +0 -0
  249. package/node_modules/bare-url/prebuilds/win32-arm64/bare-url.bare +0 -0
  250. package/node_modules/bare-url/prebuilds/win32-x64/bare-url.bare +0 -0
  251. package/node_modules/ini/package.json +5 -5
  252. package/node_modules/io.appium.settings/CHANGELOG.md +21 -0
  253. package/node_modules/io.appium.settings/apks/settings_apk-debug.apk +0 -0
  254. package/node_modules/io.appium.settings/package.json +3 -3
  255. package/node_modules/plist/dist/parse-binary.d.ts.map +1 -1
  256. package/node_modules/plist/dist/parse-binary.js +37 -9
  257. package/node_modules/plist/dist/parse-binary.js.map +1 -1
  258. package/node_modules/plist/package.json +1 -1
  259. package/package.json +5 -5
  260. package/scripts/check-shaded-packages.mjs +106 -0
  261. package/scripts/lib/dependency-versions/apk-meta-inf.mjs +0 -13
  262. package/scripts/lib/dependency-versions/comparison.mjs +17 -47
  263. package/scripts/lib/dependency-versions/gradle-scan.mjs +77 -87
  264. package/scripts/lib/dependency-versions/index.mjs +1 -1
  265. package/scripts/lib/dependency-versions/report.mjs +4 -4
  266. package/scripts/lib/dependency-versions/tracked-modules.mjs +2 -42
  267. package/scripts/lib/dependency-versions/types.mjs +2 -1
  268. package/scripts/lib/dependency-versions/version-utils.mjs +124 -2
  269. package/scripts/lib/diagnose/app-input.mjs +4 -1
  270. package/scripts/lib/diagnose/checks/compile-sdk.mjs +6 -2
  271. package/scripts/lib/diagnose/checks/dependency.mjs +1 -1
  272. package/scripts/lib/diagnose/checks/index.mjs +0 -3
  273. package/scripts/lib/diagnose/checks/obfuscation.mjs +1 -1
  274. package/scripts/lib/diagnose/diagnosis.mjs +2 -7
  275. package/scripts/lib/diagnose/report.mjs +2 -2
  276. package/scripts/lib/diagnose/checks/androidx.mjs +0 -40
  277. package/scripts/lib/diagnose/checks/lifecycle-extensions.mjs +0 -23
  278. package/scripts/lib/diagnose/checks/startup-provider.mjs +0 -41
@@ -0,0 +1,141 @@
1
+ package io.appium.espressoserver.gradle
2
+
3
+ import org.gradle.api.DefaultTask
4
+ import org.gradle.api.file.ConfigurableFileCollection
5
+ import org.gradle.api.file.Directory
6
+ import org.gradle.api.file.DirectoryProperty
7
+ import org.gradle.api.file.RegularFile
8
+ import org.gradle.api.file.RegularFileProperty
9
+ import org.gradle.api.provider.ListProperty
10
+ import org.gradle.api.provider.Property
11
+ import org.gradle.api.tasks.Classpath
12
+ import org.gradle.api.tasks.Input
13
+ import org.gradle.api.tasks.OutputDirectory
14
+ import org.gradle.api.tasks.OutputFile
15
+ import org.gradle.api.tasks.TaskAction
16
+ import org.objectweb.asm.ClassReader
17
+ import org.objectweb.asm.ClassWriter
18
+ import org.objectweb.asm.commons.ClassRemapper
19
+ import java.util.jar.JarEntry
20
+ import java.util.jar.JarFile
21
+ import java.util.jar.JarOutputStream
22
+
23
+ /**
24
+ * Moves the bundled classes under [prefix] so they stop shadowing the AUT's copies (the server and the AUT
25
+ * share one class loader). Kept and shared classes keep their names, see [keep] and [shared].
26
+ *
27
+ * `META-INF/services` files of relocated interfaces are rewritten into [servicesDir], and the originals
28
+ * are listed in [excludedResources] (see [removeJarEntries]).
29
+ */
30
+ abstract class RelocateClassesTask : DefaultTask() {
31
+ // A pattern ending with a slash is a package prefix, otherwise it is a class with its inner classes
32
+ private fun matches(name: String, pattern: String) =
33
+ if (pattern.endsWith("/")) name.startsWith(pattern) else name == pattern || name.startsWith("$pattern$")
34
+
35
+
36
+ @get:Classpath abstract val allJars: ListProperty<RegularFile>
37
+ @get:Classpath abstract val allDirectories: ListProperty<Directory>
38
+
39
+ /** Jars of the user declared dependencies: they and what they reference stay unrelocated. */
40
+ @get:Classpath abstract val userJars: ConfigurableFileCollection
41
+
42
+ /** Internal name prefix of the relocated classes, e.g. `io/appium/espressoserver/shaded/` */
43
+ @get:Input abstract val prefix: Property<String>
44
+
45
+ /** Internal name patterns that must keep their names (the platform or the manifest refer to them). */
46
+ @get:Input abstract val keep: ListProperty<String>
47
+
48
+ /** Internal name patterns shared with the AUT. Their reference closure is shared too. */
49
+ @get:Input abstract val shared: ListProperty<String>
50
+
51
+ /** Internal name patterns excluded from [shared]. */
52
+ @get:Input abstract val sharedExclude: ListProperty<String>
53
+
54
+ @get:OutputFile abstract val output: RegularFileProperty
55
+
56
+ /** Java resources with the relocated service files (the root of `META-INF/services/...`). */
57
+ @get:OutputDirectory abstract val servicesDir: DirectoryProperty
58
+
59
+ /** Resource paths of the original service files that were rewritten, one per line. */
60
+ @get:OutputFile abstract val excludedResources: RegularFileProperty
61
+
62
+ @TaskAction
63
+ fun run() {
64
+ val jars = allJars.get().map { it.asFile }
65
+ val dirs = allDirectories.get().map { it.asFile }
66
+ val classes = readClasses(jars, dirs)
67
+ val services = readServices(jars, dirs)
68
+ val keeps = keep.get()
69
+ val isKept = { n: String -> keeps.any { matches(n, it) } }
70
+
71
+ val closure = HashSet<String>()
72
+ val roots = classes.keys.filter { n ->
73
+ shared.get().any { matches(n, it) } && sharedExclude.get().none { matches(n, it) }
74
+ }
75
+ logger.info("Shared roots: $roots")
76
+ growClosure(classes, closure, roots)
77
+ // The AUT creates the views that the server's actions cast and measure (ViewPager, DrawerLayout, ...)
78
+ val views = viewTypes(classes)
79
+ logger.lifecycle("Shared view types: ${views.size}")
80
+ growClosure(classes, closure, views.filterNot(isKept))
81
+ userJars.files.filter { it.name.endsWith(".jar") }.forEach { jar ->
82
+ val before = closure.size
83
+ growClosure(classes, closure, JarFile(jar).use { j ->
84
+ j.entries().asSequence().map { it.name }
85
+ .filter { it.endsWith(".class") && !it.startsWith("META-INF/") }
86
+ .map { it.removeSuffix(".class") }.toList()
87
+ })
88
+ logger.lifecycle("User dependency ${jar.name} adds ${closure.size - before} shared classes")
89
+ }
90
+ // A service file keeps its name when its interface does, so its providers must keep theirs too
91
+ do {
92
+ val before = closure.size
93
+ services.forEach { (iface, providers) ->
94
+ val internal = iface.replace('.', '/')
95
+ if (internal !in classes || internal in closure || isKept(internal)) {
96
+ logger.info("Service $iface keeps its name, sharing its providers")
97
+ growClosure(classes, closure, providers.map { it.replace('.', '/') }.filterNot(isKept))
98
+ }
99
+ }
100
+ } while (closure.size != before)
101
+ // A relocated class cannot extend or use a package-private class that stays shared: other package
102
+ shareNonPublicDependents(classes, closure, isKept)
103
+ logger.lifecycle("Shared with the AUT: ${closure.size} classes")
104
+ logger.info(
105
+ "Shared packages: " + closure.groupingBy { it.split('/').take(2).joinToString("/") }.eachCount()
106
+ .entries.sortedByDescending { it.value }.joinToString { "${it.key}=${it.value}" },
107
+ )
108
+
109
+ val pfx = prefix.get()
110
+ val moved = classes.keys.filterTo(HashSet()) { n -> n != "module-info" && n !in closure && !isKept(n) }
111
+ logger.lifecycle("Relocating ${moved.size} of ${classes.size} classes to $pfx")
112
+
113
+ val suspicious = sortedSetOf<String>()
114
+ val remapper = PrefixRemapper(moved, pfx, classes.keys, suspicious::add)
115
+ output.get().asFile.outputStream().buffered().let(::JarOutputStream).use { jos ->
116
+ classes.forEach { (name, bytes) ->
117
+ val cw = ClassWriter(0)
118
+ ClassReader(bytes).accept(ClassRemapper(cw, remapper), 0)
119
+ jos.putNextEntry(JarEntry(remapper.map(name) + ".class"))
120
+ jos.write(cw.toByteArray())
121
+ jos.closeEntry()
122
+ }
123
+ }
124
+ if (suspicious.isNotEmpty()) {
125
+ logger.lifecycle(
126
+ "Class names in string constants that are not bundled (reflection may not follow " +
127
+ "the relocation): ${suspicious.joinToString()}",
128
+ )
129
+ }
130
+
131
+ val outDir = servicesDir.get().asFile.also { it.deleteRecursively() }
132
+ val rewritten = services.filterKeys { it.replace('.', '/') in moved }
133
+ rewritten.forEach { (iface, providers) ->
134
+ val file = outDir.resolve(SERVICES_DIR + remapper.mapDotted(iface))
135
+ file.parentFile.mkdirs()
136
+ file.writeText(providers.joinToString("\n", postfix = "\n", transform = remapper::mapDotted))
137
+ }
138
+ excludedResources.get().asFile.writeText(rewritten.keys.joinToString("\n") { SERVICES_DIR + it })
139
+ logger.lifecycle("Relocated service files: ${rewritten.keys.joinToString()}")
140
+ }
141
+ }
@@ -0,0 +1,342 @@
1
+ package io.appium.espressoserver.gradle
2
+
3
+ import org.objectweb.asm.AnnotationVisitor
4
+ import org.objectweb.asm.ClassReader
5
+ import org.objectweb.asm.ClassVisitor
6
+ import org.objectweb.asm.ClassWriter
7
+ import org.objectweb.asm.FieldVisitor
8
+ import org.objectweb.asm.Handle
9
+ import org.objectweb.asm.Label
10
+ import org.objectweb.asm.MethodVisitor
11
+ import org.objectweb.asm.Opcodes
12
+ import org.objectweb.asm.TypePath
13
+ import org.objectweb.asm.commons.ClassRemapper
14
+ import org.objectweb.asm.commons.Remapper
15
+ import org.objectweb.asm.tree.ClassNode
16
+ import java.io.File
17
+ import java.nio.file.Files
18
+ import java.nio.file.StandardCopyOption
19
+ import java.util.jar.JarEntry
20
+ import java.util.jar.JarFile
21
+ import java.util.jar.JarOutputStream
22
+
23
+ internal const val SERVICES_DIR = "META-INF/services/"
24
+ private val CLASS_NAME = Regex("[a-z][a-z0-9_]*(\\.[a-z][a-z0-9_]*)+\\.[A-Z][A-Za-z0-9_$]*")
25
+
26
+ /** Reads every `.class` of the given jars and directories into a map keyed by internal name. First one wins. */
27
+ internal fun readClasses(jars: Collection<File>, dirs: Collection<File>): Map<String, ByteArray> {
28
+ val classes = LinkedHashMap<String, ByteArray>()
29
+ jars.forEach { f ->
30
+ JarFile(f).use { jar ->
31
+ jar.entries().asSequence()
32
+ .filter { it.name.endsWith(".class") && !it.name.startsWith("META-INF/") }
33
+ .forEach { classes.putIfAbsent(it.name.removeSuffix(".class"), jar.getInputStream(it).readBytes()) }
34
+ }
35
+ }
36
+ dirs.forEach { d ->
37
+ d.walkTopDown().filter { it.isFile && it.name.endsWith(".class") }.forEach {
38
+ classes.putIfAbsent(it.relativeTo(d).invariantSeparatorsPath.removeSuffix(".class"), it.readBytes())
39
+ }
40
+ }
41
+ return classes
42
+ }
43
+
44
+ /** `META-INF/services` files of the given jars and directories: interface name to its provider class names. */
45
+ internal fun readServices(jars: Collection<File>, dirs: Collection<File>): Map<String, Set<String>> {
46
+ val services = LinkedHashMap<String, LinkedHashSet<String>>()
47
+ fun add(name: String, content: ByteArray) {
48
+ content.toString(Charsets.UTF_8).lineSequence()
49
+ .map { it.substringBefore('#').trim() }
50
+ .filter { it.isNotEmpty() }
51
+ .toCollection(services.getOrPut(name.removePrefix(SERVICES_DIR)) { LinkedHashSet() })
52
+ }
53
+ jars.forEach { f ->
54
+ JarFile(f).use { jar ->
55
+ jar.entries().asSequence()
56
+ .filter { it.name.startsWith(SERVICES_DIR) && !it.isDirectory }
57
+ .forEach { add(it.name, jar.getInputStream(it).readBytes()) }
58
+ }
59
+ }
60
+ dirs.forEach { d ->
61
+ d.resolve(SERVICES_DIR).takeIf { it.isDirectory }?.listFiles()?.filter { it.isFile }?.forEach {
62
+ add(SERVICES_DIR + it.name, it.readBytes())
63
+ }
64
+ }
65
+ return services
66
+ }
67
+
68
+ /** Bundled classes that extend a platform view (`android.view.*`, `android.widget.*`), directly or indirectly. */
69
+ internal fun viewTypes(classes: Map<String, ByteArray>): List<String> {
70
+ val superNames = classes.mapValues { (_, bytes) -> ClassReader(bytes).superName }
71
+ fun isView(name: String): Boolean {
72
+ var current = superNames[name]
73
+ while (current != null) {
74
+ if (current.startsWith("android/view/") || current.startsWith("android/widget/")) {
75
+ return true
76
+ }
77
+ current = superNames[current]
78
+ }
79
+ return false
80
+ }
81
+ return classes.keys.filter(::isView)
82
+ }
83
+
84
+ /**
85
+ * Internal names of the classes [bytes] links against (signatures, code, constants).
86
+ * Annotations are skipped: a missing annotation class is ignored at runtime, and following them
87
+ * (e.g. `kotlin.Metadata`) would pull a whole library into the shared set.
88
+ */
89
+ internal fun referencedClasses(bytes: ByteArray, onRef: (String) -> Unit) {
90
+ val collector = object : Remapper() {
91
+ override fun map(internalName: String): String {
92
+ onRef(internalName)
93
+ return internalName
94
+ }
95
+ }
96
+ ClassReader(bytes).accept(AnnotationSkipper(ClassRemapper(ClassWriter(0), collector)), 0)
97
+ }
98
+
99
+ private class AnnotationSkipper(cv: ClassVisitor) : ClassVisitor(Opcodes.ASM9, cv) {
100
+ override fun visitAnnotation(descriptor: String?, visible: Boolean): AnnotationVisitor? = null
101
+ override fun visitTypeAnnotation(
102
+ typeRef: Int, typePath: TypePath?, descriptor: String?, visible: Boolean,
103
+ ): AnnotationVisitor? = null
104
+
105
+ override fun visitField(
106
+ access: Int, name: String?, descriptor: String?, signature: String?, value: Any?,
107
+ ): FieldVisitor? = super.visitField(access, name, descriptor, signature, value)?.let { fv ->
108
+ object : FieldVisitor(Opcodes.ASM9, fv) {
109
+ override fun visitAnnotation(descriptor: String?, visible: Boolean): AnnotationVisitor? = null
110
+ override fun visitTypeAnnotation(
111
+ typeRef: Int, typePath: TypePath?, descriptor: String?, visible: Boolean,
112
+ ): AnnotationVisitor? = null
113
+ }
114
+ }
115
+
116
+ override fun visitMethod(
117
+ access: Int, name: String?, descriptor: String?, signature: String?, exceptions: Array<out String>?,
118
+ ): MethodVisitor? = super.visitMethod(access, name, descriptor, signature, exceptions)?.let { mv ->
119
+ object : MethodVisitor(Opcodes.ASM9, mv) {
120
+ override fun visitAnnotation(descriptor: String?, visible: Boolean): AnnotationVisitor? = null
121
+ override fun visitAnnotationDefault(): AnnotationVisitor? = null
122
+ override fun visitParameterAnnotation(
123
+ parameter: Int, descriptor: String?, visible: Boolean,
124
+ ): AnnotationVisitor? = null
125
+
126
+ override fun visitTypeAnnotation(
127
+ typeRef: Int, typePath: TypePath?, descriptor: String?, visible: Boolean,
128
+ ): AnnotationVisitor? = null
129
+
130
+ override fun visitInsnAnnotation(
131
+ typeRef: Int, typePath: TypePath?, descriptor: String?, visible: Boolean,
132
+ ): AnnotationVisitor? = null
133
+
134
+ override fun visitTryCatchAnnotation(
135
+ typeRef: Int, typePath: TypePath?, descriptor: String?, visible: Boolean,
136
+ ): AnnotationVisitor? = null
137
+
138
+ override fun visitLocalVariableAnnotation(
139
+ typeRef: Int, typePath: TypePath?, start: Array<out Label>?, end: Array<out Label>?,
140
+ index: IntArray?, descriptor: String?, visible: Boolean,
141
+ ): AnnotationVisitor? = null
142
+ }
143
+ }
144
+ }
145
+
146
+ /**
147
+ * Grows [closure] with every class reachable from [roots] through references.
148
+ * A shared class shadows the AUT's copy, so whatever it references must stay shared too.
149
+ */
150
+ internal fun growClosure(classes: Map<String, ByteArray>, closure: MutableSet<String>, roots: Collection<String>) {
151
+ val queue = ArrayDeque<String>()
152
+ roots.filter { it in classes && closure.add(it) }.forEach(queue::add)
153
+ while (queue.isNotEmpty()) {
154
+ referencedClasses(classes.getValue(queue.removeFirst())) { ref ->
155
+ if (ref in classes && closure.add(ref)) {
156
+ queue.add(ref)
157
+ }
158
+ }
159
+ }
160
+ }
161
+
162
+ /**
163
+ * A member that code calls or reads. [staticOrSuper] accesses (static members, `super` calls and `super(...)`)
164
+ * are allowed for subclasses from another package; instance accesses are not, unless the receiver is `this`.
165
+ */
166
+ internal data class MemberRef(val owner: String, val name: String, val desc: String, val staticOrSuper: Boolean)
167
+
168
+ /** Members that the code of [bytes] calls or reads, including method handles. */
169
+ internal fun memberReferences(bytes: ByteArray, onRef: (MemberRef) -> Unit) {
170
+ val staticInsns = setOf(Opcodes.INVOKESTATIC, Opcodes.GETSTATIC, Opcodes.PUTSTATIC)
171
+ val staticHandles = setOf(Opcodes.H_INVOKESTATIC, Opcodes.H_GETSTATIC, Opcodes.H_PUTSTATIC, Opcodes.H_INVOKESPECIAL)
172
+ ClassReader(bytes).accept(
173
+ object : ClassVisitor(Opcodes.ASM9) {
174
+ private var superName: String? = null
175
+
176
+ override fun visit(
177
+ version: Int, access: Int, name: String?, signature: String?, superName: String?,
178
+ interfaces: Array<out String>?,
179
+ ) {
180
+ this.superName = superName
181
+ }
182
+
183
+ override fun visitMethod(
184
+ access: Int, name: String?, descriptor: String?, signature: String?, exceptions: Array<out String>?,
185
+ ): MethodVisitor = object : MethodVisitor(Opcodes.ASM9) {
186
+ private val instantiated = HashSet<String>()
187
+ private val isConstructor = name == "<init>"
188
+
189
+ override fun visitTypeInsn(opcode: Int, type: String) {
190
+ if (opcode == Opcodes.NEW) {
191
+ instantiated.add(type)
192
+ }
193
+ }
194
+
195
+ override fun visitMethodInsn(
196
+ opcode: Int, owner: String, name: String, descriptor: String, isInterface: Boolean,
197
+ ) {
198
+ val staticOrSuper = when {
199
+ opcode in staticInsns -> true
200
+ opcode != Opcodes.INVOKESPECIAL -> false
201
+ // `super(...)` is told from `new Base(...)` by the owner and the absence of NEW
202
+ name == "<init>" -> isConstructor && owner == superName && owner !in instantiated
203
+ else -> true
204
+ }
205
+ onRef(MemberRef(owner, name, descriptor, staticOrSuper))
206
+ }
207
+
208
+ override fun visitFieldInsn(opcode: Int, owner: String, name: String, descriptor: String) =
209
+ onRef(MemberRef(owner, name, descriptor, opcode in staticInsns))
210
+
211
+ override fun visitInvokeDynamicInsn(name: String, descriptor: String, handle: Handle, vararg args: Any) {
212
+ (listOf(handle) + args).filterIsInstance<Handle>()
213
+ .forEach { onRef(MemberRef(it.owner, it.name, it.desc, it.tag in staticHandles)) }
214
+ }
215
+ }
216
+ },
217
+ ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES,
218
+ )
219
+ }
220
+
221
+ /**
222
+ * A relocated class lives in another package than the shared ones, so it cannot use a shared class that is
223
+ * not public (e.g. extend a package-private base class), nor its package-private members, nor its protected ones
224
+ * except for static access of a subclass (an instance receiver cannot be proven to be the subclass).
225
+ * Shares such classes, together with what they reference.
226
+ */
227
+ internal fun shareNonPublicDependents(
228
+ classes: Map<String, ByteArray>,
229
+ closure: MutableSet<String>,
230
+ isKept: (String) -> Boolean,
231
+ ) {
232
+ val references = HashMap<String, Set<String>>()
233
+ val members = HashMap<String, Set<MemberRef>>()
234
+ val readers = HashMap<String, ClassReader>()
235
+ fun reader(name: String) = readers.getOrPut(name) { ClassReader(classes.getValue(name)) }
236
+ val isPublic = { name: String -> reader(name).access and Opcodes.ACC_PUBLIC != 0 }
237
+ // Members visible through the class, with the class that declares them and their access flags
238
+ class Declared(val owner: String, val access: Int)
239
+ val declaredMembers = HashMap<String, Map<String, Declared>>()
240
+ fun membersOf(owner: String): Map<String, Declared> = declaredMembers.getOrPut(owner) {
241
+ val result = HashMap<String, Declared>()
242
+ var current: String? = owner
243
+ while (current != null && current in classes) {
244
+ val node = ClassNode().also { reader(current!!).accept(it, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG) }
245
+ (node.methods.map { Triple(it.name, it.desc, it.access) } + node.fields.map { Triple(it.name, it.desc, it.access) })
246
+ .forEach { (name, desc, access) -> result.putIfAbsent(name + desc, Declared(current!!, access)) }
247
+ current = node.superName
248
+ }
249
+ result
250
+ }
251
+ fun isSubclass(name: String, owner: String): Boolean {
252
+ var current: String? = name
253
+ while (current != null && current in classes) {
254
+ if (current == owner) {
255
+ return true
256
+ }
257
+ current = reader(current).superName
258
+ }
259
+ return current == owner
260
+ }
261
+ var changed = true
262
+ while (changed) {
263
+ changed = false
264
+ val nonPublic = closure.filterNotTo(HashSet(), isPublic)
265
+ classes.keys.filter { it !in closure && !isKept(it) }.forEach { name ->
266
+ val refs = references.getOrPut(name) {
267
+ HashSet<String>().also { set -> referencedClasses(classes.getValue(name)) { set.add(it) } }
268
+ }
269
+ val memberRefs = members.getOrPut(name) {
270
+ HashSet<MemberRef>().also { set -> memberReferences(classes.getValue(name)) { set.add(it) } }
271
+ }
272
+ // The symbolic owner may be a subclass of the class that declares the member
273
+ val usesRestrictedMember = memberRefs.any { (owner, memberName, desc, staticOrSuper) ->
274
+ val declared = membersOf(owner)[memberName + desc]
275
+ when {
276
+ declared == null || declared.owner !in closure -> false
277
+ declared.access and (Opcodes.ACC_PUBLIC or Opcodes.ACC_PRIVATE) != 0 -> false
278
+ declared.access and Opcodes.ACC_PROTECTED == 0 -> true
279
+ // Protected: a subclass may use it statically or on `this`
280
+ else -> !isSubclass(name, declared.owner) || !(staticOrSuper || isSubclass(owner, name))
281
+ }
282
+ }
283
+ if (usesRestrictedMember || refs.any { it in nonPublic }) {
284
+ growClosure(classes, closure, listOf(name))
285
+ changed = true
286
+ }
287
+ }
288
+ }
289
+ }
290
+
291
+ /** Moves the classes in [moved] under [prefix] (both slash-separated), including names in string constants. */
292
+ internal class PrefixRemapper(
293
+ private val moved: Set<String>,
294
+ private val prefix: String,
295
+ private val bundled: Set<String> = emptySet(),
296
+ private val onSuspicious: (String) -> Unit = {},
297
+ ) : Remapper() {
298
+ private val movedPackages: Set<String> by lazy { moved.map { it.substringBeforeLast('/', "") }.toSet() }
299
+
300
+ override fun map(internalName: String): String = if (internalName in moved) prefix + internalName else internalName
301
+
302
+ override fun mapValue(value: Any?): Any? {
303
+ if (value is String) {
304
+ // Class names in constants: reflection by name, Kotlin metadata (d2), descriptors
305
+ val slashed = value.replace('.', '/')
306
+ if (slashed in moved) {
307
+ return if (value.contains('/')) prefix + value else (prefix + slashed).replace('/', '.')
308
+ }
309
+ if (value.startsWith("L") && value.endsWith(";") && value.substring(1, value.length - 1) in moved) {
310
+ return "L$prefix${value.substring(1)}"
311
+ }
312
+ // Looks like a class of a relocated package that is not bundled: reflection we cannot follow
313
+ if (CLASS_NAME.matches(value) && slashed !in bundled && slashed.substringBeforeLast('/') in movedPackages) {
314
+ onSuspicious(value)
315
+ }
316
+ }
317
+ return super.mapValue(value)
318
+ }
319
+
320
+ /** Relocated name of a class or service interface/provider given in dotted form. */
321
+ fun mapDotted(name: String): String = map(name.replace('.', '/')).replace('/', '.')
322
+ }
323
+
324
+ /** Rewrites [jar] without the entries named in [names]. */
325
+ fun removeJarEntries(jar: File, names: Set<String>) {
326
+ if (names.isEmpty()) {
327
+ return
328
+ }
329
+ val tmp = File(jar.parentFile, "${jar.name}.tmp")
330
+ JarFile(jar).use { src ->
331
+ JarOutputStream(tmp.outputStream().buffered()).use { dst ->
332
+ src.entries().asSequence().filter { it.name !in names }.forEach { e ->
333
+ dst.putNextEntry(JarEntry(e.name).also { it.time = e.time })
334
+ if (!e.isDirectory) {
335
+ src.getInputStream(e).copyTo(dst)
336
+ }
337
+ dst.closeEntry()
338
+ }
339
+ }
340
+ }
341
+ Files.move(tmp.toPath(), jar.toPath(), StandardCopyOption.REPLACE_EXISTING)
342
+ }
@@ -0,0 +1,186 @@
1
+ package io.appium.espressoserver.gradle
2
+
3
+ import org.junit.Assert.assertEquals
4
+ import org.junit.Test
5
+ import org.objectweb.asm.ClassWriter
6
+ import org.objectweb.asm.Opcodes
7
+
8
+ class RelocationTest {
9
+ private fun clazz(
10
+ name: String,
11
+ superName: String = "java/lang/Object",
12
+ access: Int = Opcodes.ACC_PUBLIC,
13
+ members: ClassWriter.() -> Unit = {},
14
+ ): ByteArray = ClassWriter(0).apply {
15
+ visit(Opcodes.V17, access, name, null, superName, null)
16
+ members()
17
+ visitEnd()
18
+ }.toByteArray()
19
+
20
+ private fun ClassWriter.staticMethod(name: String, access: Int, body: org.objectweb.asm.MethodVisitor.() -> Unit = {}) {
21
+ visitMethod(access or Opcodes.ACC_STATIC, name, "()V", null, null).apply {
22
+ visitCode()
23
+ body()
24
+ visitInsn(Opcodes.RETURN)
25
+ visitMaxs(0, 0)
26
+ visitEnd()
27
+ }
28
+ }
29
+
30
+ private fun share(classes: Map<String, ByteArray>, roots: List<String>): Set<String> {
31
+ val closure = HashSet<String>()
32
+ growClosure(classes, closure, roots)
33
+ shareNonPublicDependents(classes, closure) { false }
34
+ return closure
35
+ }
36
+
37
+ @Test
38
+ fun sharesCallersOfPackagePrivateMembersOfPublicSharedClass() {
39
+ val classes = mapOf(
40
+ "sample/Widget" to clazz("sample/Widget", "android/view/View") {
41
+ staticMethod("touch", 0)
42
+ },
43
+ "sample/Peer" to clazz("sample/Peer") {
44
+ staticMethod("call", Opcodes.ACC_PUBLIC) {
45
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Widget", "touch", "()V", false)
46
+ }
47
+ },
48
+ "sample/Other" to clazz("sample/Other") {
49
+ staticMethod("call", Opcodes.ACC_PUBLIC) {
50
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Widget", "publicOne", "()V", false)
51
+ }
52
+ },
53
+ )
54
+ assertEquals(setOf("sample/Widget", "sample/Peer"), share(classes, viewTypes(classes)))
55
+ }
56
+
57
+ @Test
58
+ fun keepsCallersOfPublicMembersRelocated() {
59
+ val classes = mapOf(
60
+ "sample/Widget" to clazz("sample/Widget", "android/view/View") {
61
+ staticMethod("touch", Opcodes.ACC_PUBLIC)
62
+ },
63
+ "sample/Peer" to clazz("sample/Peer") {
64
+ staticMethod("call", Opcodes.ACC_PUBLIC) {
65
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Widget", "touch", "()V", false)
66
+ }
67
+ },
68
+ )
69
+ assertEquals(setOf("sample/Widget"), share(classes, viewTypes(classes)))
70
+ }
71
+
72
+ @Test
73
+ fun allowsSubclassesToUseProtectedMembers() {
74
+ val classes = mapOf(
75
+ "sample/Widget" to clazz("sample/Widget", "android/view/View") {
76
+ staticMethod("touch", Opcodes.ACC_PROTECTED)
77
+ },
78
+ "sample/Sub" to clazz("sample/Sub", "sample/Widget") {
79
+ staticMethod("call", Opcodes.ACC_PUBLIC) {
80
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Widget", "touch", "()V", false)
81
+ }
82
+ },
83
+ "sample/Peer" to clazz("sample/Peer") {
84
+ staticMethod("call", Opcodes.ACC_PUBLIC) {
85
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Widget", "touch", "()V", false)
86
+ }
87
+ },
88
+ )
89
+ assertEquals(setOf("sample/Widget", "sample/Peer"), share(classes, listOf("sample/Widget")))
90
+ }
91
+
92
+ @Test
93
+ fun sharesSubclassesCallingProtectedInstanceMembersOnOtherReceivers() {
94
+ val classes = mapOf(
95
+ "sample/Base" to clazz("sample/Base") {
96
+ visitMethod(Opcodes.ACC_PROTECTED, "touch", "()V", null, null).apply {
97
+ visitCode()
98
+ visitInsn(Opcodes.RETURN)
99
+ visitMaxs(0, 0)
100
+ visitEnd()
101
+ }
102
+ },
103
+ "sample/Sub" to clazz("sample/Sub", "sample/Base") {
104
+ visitMethod(Opcodes.ACC_PUBLIC or Opcodes.ACC_STATIC, "call", "(Lsample/Base;)V", null, null).apply {
105
+ visitCode()
106
+ visitVarInsn(Opcodes.ALOAD, 0)
107
+ visitMethodInsn(Opcodes.INVOKEVIRTUAL, "sample/Base", "touch", "()V", false)
108
+ visitInsn(Opcodes.RETURN)
109
+ visitMaxs(1, 1)
110
+ visitEnd()
111
+ }
112
+ },
113
+ )
114
+ assertEquals(setOf("sample/Base", "sample/Sub"), share(classes, listOf("sample/Base")))
115
+ }
116
+
117
+ private fun ClassWriter.constructor(access: Int, body: org.objectweb.asm.MethodVisitor.() -> Unit) {
118
+ visitMethod(access, "<init>", "()V", null, null).apply {
119
+ visitCode()
120
+ body()
121
+ visitInsn(Opcodes.RETURN)
122
+ visitMaxs(2, 1)
123
+ visitEnd()
124
+ }
125
+ }
126
+
127
+ private fun baseWithProtectedConstructor() = clazz("sample/Base") {
128
+ constructor(Opcodes.ACC_PROTECTED) {
129
+ visitVarInsn(Opcodes.ALOAD, 0)
130
+ visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false)
131
+ }
132
+ }
133
+
134
+ @Test
135
+ fun sharesSubclassesThatConstructSeparateInstancesWithProtectedConstructors() {
136
+ val classes = mapOf(
137
+ "sample/Base" to baseWithProtectedConstructor(),
138
+ "sample/Sub" to clazz("sample/Sub", "sample/Base") {
139
+ staticMethod("run", Opcodes.ACC_PUBLIC) {
140
+ visitTypeInsn(Opcodes.NEW, "sample/Base")
141
+ visitInsn(Opcodes.DUP)
142
+ visitMethodInsn(Opcodes.INVOKESPECIAL, "sample/Base", "<init>", "()V", false)
143
+ visitInsn(Opcodes.POP)
144
+ }
145
+ },
146
+ )
147
+ assertEquals(setOf("sample/Base", "sample/Sub"), share(classes, listOf("sample/Base")))
148
+ }
149
+
150
+ @Test
151
+ fun keepsSubclassesCallingSuperConstructorRelocated() {
152
+ val classes = mapOf(
153
+ "sample/Base" to baseWithProtectedConstructor(),
154
+ "sample/Sub" to clazz("sample/Sub", "sample/Base") {
155
+ constructor(Opcodes.ACC_PUBLIC) {
156
+ visitVarInsn(Opcodes.ALOAD, 0)
157
+ visitMethodInsn(Opcodes.INVOKESPECIAL, "sample/Base", "<init>", "()V", false)
158
+ }
159
+ },
160
+ )
161
+ assertEquals(setOf("sample/Base"), share(classes, listOf("sample/Base")))
162
+ }
163
+
164
+ @Test
165
+ fun resolvesInheritedMembersReferencedThroughSubclass() {
166
+ val classes = mapOf(
167
+ "sample/Base" to clazz("sample/Base") { staticMethod("touch", 0) },
168
+ "sample/Sub" to clazz("sample/Sub", "sample/Base") {
169
+ staticMethod("run", Opcodes.ACC_PUBLIC) {
170
+ visitMethodInsn(Opcodes.INVOKESTATIC, "sample/Sub", "touch", "()V", false)
171
+ }
172
+ },
173
+ )
174
+ assertEquals(setOf("sample/Base", "sample/Sub"), share(classes, listOf("sample/Base")))
175
+ }
176
+
177
+ @Test
178
+ fun sharesDependentsOfNonPublicSharedClasses() {
179
+ val classes = mapOf(
180
+ "sample/Base" to clazz("sample/Base", access = 0),
181
+ "sample/Unrelated" to clazz("sample/Unrelated"),
182
+ "sample/Child" to clazz("sample/Child", "sample/Base"),
183
+ )
184
+ assertEquals(setOf("sample/Base", "sample/Child"), share(classes, listOf("sample/Base")))
185
+ }
186
+ }