cfsolve 0.1.2 → 0.1.3

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 (368) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/THIRD_PARTY_LICENSES/README.md +71 -254
  4. data/THIRD_PARTY_LICENSES/{derive_builder_macro-0.20.2/LICENSE-APACHE → bytecount-0.6.9/LICENSE.Apache2} +0 -1
  5. data/THIRD_PARTY_LICENSES/{darling-0.20.11/LICENSE → bytecount-0.6.9/LICENSE.MIT} +1 -3
  6. data/THIRD_PARTY_LICENSES/{ident_case-1.0.1/LICENSE → cobs-0.3.0/LICENSE-MIT} +1 -1
  7. data/THIRD_PARTY_LICENSES/cow-utils-0.1.3/LICENSE +21 -0
  8. data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → embedded-io-0.4.0}/LICENSE-MIT +1 -1
  9. data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.6.1}/LICENSE-MIT +1 -1
  10. data/THIRD_PARTY_LICENSES/{browserslist-data-0.1.4 → escape-simd-0.1.1}/LICENSE +1 -1
  11. data/THIRD_PARTY_LICENSES/escape-simd-0.1.1/NOTICE +62 -0
  12. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/LICENSE +21 -0
  13. data/THIRD_PARTY_LICENSES/{miette-7.6.0/LICENSE → json-escape-simd-3.1.3/LICENSE-APACHE} +0 -1
  14. data/THIRD_PARTY_LICENSES/json-escape-simd-3.1.3/NOTICE +62 -0
  15. data/THIRD_PARTY_LICENSES/memchr-2.8.3/UNLICENSE +24 -0
  16. data/THIRD_PARTY_LICENSES/{derive_builder_core-0.20.2 → nonmax-0.5.5}/LICENSE-APACHE +1 -2
  17. data/THIRD_PARTY_LICENSES/{dashmap-5.5.3/LICENSE → nonmax-0.5.5/LICENSE-MIT} +2 -4
  18. data/THIRD_PARTY_LICENSES/{rand-0.8.5 → num-bigint-0.5.1}/LICENSE-MIT +0 -1
  19. data/THIRD_PARTY_LICENSES/oxc-0.157.0/LICENSE +22 -0
  20. data/THIRD_PARTY_LICENSES/oxc-0.157.0/THIRD-PARTY-LICENSE +763 -0
  21. data/THIRD_PARTY_LICENSES/{browserslist-rs-0.19.0 → oxc-browserslist-5.0.1}/LICENSE +1 -0
  22. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/LICENSE +22 -0
  23. data/THIRD_PARTY_LICENSES/oxc_allocator-0.157.0/THIRD-PARTY-LICENSE +763 -0
  24. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/LICENSE +22 -0
  25. data/THIRD_PARTY_LICENSES/oxc_ast-0.157.0/THIRD-PARTY-LICENSE +763 -0
  26. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/LICENSE +22 -0
  27. data/THIRD_PARTY_LICENSES/oxc_ast_macros-0.157.0/THIRD-PARTY-LICENSE +763 -0
  28. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/LICENSE +22 -0
  29. data/THIRD_PARTY_LICENSES/oxc_ast_visit-0.157.0/THIRD-PARTY-LICENSE +763 -0
  30. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/LICENSE +22 -0
  31. data/THIRD_PARTY_LICENSES/oxc_codegen-0.157.0/THIRD-PARTY-LICENSE +763 -0
  32. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/LICENSE +22 -0
  33. data/THIRD_PARTY_LICENSES/oxc_compat-0.157.0/THIRD-PARTY-LICENSE +763 -0
  34. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/LICENSE +22 -0
  35. data/THIRD_PARTY_LICENSES/oxc_data_structures-0.157.0/THIRD-PARTY-LICENSE +763 -0
  36. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/LICENSE +22 -0
  37. data/THIRD_PARTY_LICENSES/oxc_diagnostics-0.157.0/THIRD-PARTY-LICENSE +763 -0
  38. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/LICENSE +22 -0
  39. data/THIRD_PARTY_LICENSES/oxc_ecmascript-0.157.0/THIRD-PARTY-LICENSE +763 -0
  40. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/LICENSE +22 -0
  41. data/THIRD_PARTY_LICENSES/oxc_estree-0.157.0/THIRD-PARTY-LICENSE +763 -0
  42. data/THIRD_PARTY_LICENSES/oxc_index-5.0.0/LICENSE +22 -0
  43. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/LICENSE +22 -0
  44. data/THIRD_PARTY_LICENSES/oxc_parser-0.157.0/THIRD-PARTY-LICENSE +763 -0
  45. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/LICENSE +22 -0
  46. data/THIRD_PARTY_LICENSES/oxc_regular_expression-0.157.0/THIRD-PARTY-LICENSE +763 -0
  47. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/LICENSE +22 -0
  48. data/THIRD_PARTY_LICENSES/oxc_semantic-0.157.0/THIRD-PARTY-LICENSE +763 -0
  49. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/LICENSE +22 -0
  50. data/THIRD_PARTY_LICENSES/oxc_span-0.157.0/THIRD-PARTY-LICENSE +763 -0
  51. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/LICENSE +22 -0
  52. data/THIRD_PARTY_LICENSES/oxc_str-0.157.0/THIRD-PARTY-LICENSE +763 -0
  53. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/LICENSE +22 -0
  54. data/THIRD_PARTY_LICENSES/oxc_syntax-0.157.0/THIRD-PARTY-LICENSE +763 -0
  55. data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-MIT +1 -1
  56. data/THIRD_PARTY_LICENSES/{bytes-str-0.2.7/LICENSE → self_cell-1.3.0/LICENSE-APACHE} +1 -2
  57. data/THIRD_PARTY_LICENSES/self_cell-1.3.0/LICENSE-GPLv2 +339 -0
  58. data/THIRD_PARTY_LICENSES/{darling_core-0.20.11 → smawk-0.3.3}/LICENSE +1 -1
  59. data/UPSTREAM.md +7 -5
  60. data/ext/cfsolve/Cargo.lock +534 -1727
  61. data/ext/cfsolve/Cargo.toml +4 -0
  62. data/ext/cfsolve/src/main.rs +1 -1
  63. data/lib/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  64. data/lib/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  65. data/lib/cfsolve/profiles/safari-26-ios.json +106 -152
  66. data/lib/cfsolve/version.rb +2 -2
  67. data/vendor/cfsolve/Cargo.lock +561 -1729
  68. data/vendor/cfsolve/Cargo.toml +26 -8
  69. data/vendor/cfsolve/README.md +4 -0
  70. data/vendor/cfsolve/examples/check_answers.rs +2 -2
  71. data/vendor/cfsolve/examples/compare_session.rs +1 -2
  72. data/vendor/cfsolve/examples/solver_profile.rs +84 -0
  73. data/vendor/cfsolve/examples/solver_smoke.rs +9 -8
  74. data/vendor/cfsolve/examples/stage2_snapshot.rs +2 -2
  75. data/vendor/cfsolve/examples/tls_echo.rs +3 -3
  76. data/vendor/cfsolve/examples/vm_snapshot.rs +32 -33
  77. data/vendor/cfsolve/profiles/safari-26-ios/answers.json +266 -265
  78. data/vendor/cfsolve/profiles/safari-26-ios/challenge-page-answers.json +312 -312
  79. data/vendor/cfsolve/profiles/safari-26-ios.json +106 -152
  80. data/vendor/cfsolve/src/bin/capture-proxy/main.rs +3 -2
  81. data/vendor/cfsolve/src/bin/challenge/cli.rs +8 -2
  82. data/vendor/cfsolve/src/bin/challenge/main.rs +7 -2
  83. data/vendor/cfsolve/src/capture/proxy/tests.rs +1 -1
  84. data/vendor/cfsolve/src/capture/proxy.rs +44 -13
  85. data/vendor/cfsolve/src/capture/sessions.rs +4 -3
  86. data/vendor/cfsolve/src/capture/upstream.rs +1 -1
  87. data/vendor/cfsolve/src/challenge/codec.rs +4 -2
  88. data/vendor/cfsolve/src/challenge/expression.rs +161 -117
  89. data/vendor/cfsolve/src/challenge/installed/audit.rs +11 -10
  90. data/vendor/cfsolve/src/challenge/installed.rs +13 -6
  91. data/vendor/cfsolve/src/challenge/merge.rs +120 -80
  92. data/vendor/cfsolve/src/challenge/orchestrator.rs +57 -44
  93. data/vendor/cfsolve/src/challenge/payload.rs +69 -31
  94. data/vendor/cfsolve/src/challenge/program.rs +197 -178
  95. data/vendor/cfsolve/src/challenge/reduced_timing.rs +55 -40
  96. data/vendor/cfsolve/src/challenge/source.rs +151 -96
  97. data/vendor/cfsolve/src/challenge/state.rs +180 -148
  98. data/vendor/cfsolve/src/challenge/tally.rs +64 -50
  99. data/vendor/cfsolve/src/challenge.rs +1 -0
  100. data/vendor/cfsolve/src/deobfuscate/analysis/bindings.rs +187 -185
  101. data/vendor/cfsolve/src/deobfuscate/analysis/effects.rs +42 -51
  102. data/vendor/cfsolve/src/deobfuscate/analysis/hoisting.rs +147 -228
  103. data/vendor/cfsolve/src/deobfuscate/analysis/properties.rs +250 -425
  104. data/vendor/cfsolve/src/deobfuscate/analysis/unconditional.rs +79 -0
  105. data/vendor/cfsolve/src/deobfuscate/analysis.rs +259 -41
  106. data/vendor/cfsolve/src/deobfuscate/argument_arrays.rs +70 -73
  107. data/vendor/cfsolve/src/deobfuscate/arrow_blocks.rs +91 -104
  108. data/vendor/cfsolve/src/deobfuscate/ast.rs +383 -0
  109. data/vendor/cfsolve/src/deobfuscate/bitwise.rs +44 -54
  110. data/vendor/cfsolve/src/deobfuscate/blocks.rs +36 -29
  111. data/vendor/cfsolve/src/deobfuscate/call_helpers.rs +80 -131
  112. data/vendor/cfsolve/src/deobfuscate/control_flow.rs +239 -297
  113. data/vendor/cfsolve/src/deobfuscate/copy_propagation.rs +114 -135
  114. data/vendor/cfsolve/src/deobfuscate/dead_branches.rs +62 -61
  115. data/vendor/cfsolve/src/deobfuscate/dead_properties.rs +197 -214
  116. data/vendor/cfsolve/src/deobfuscate/dispatch.rs +238 -298
  117. data/vendor/cfsolve/src/deobfuscate/encoded_strings.rs +198 -203
  118. data/vendor/cfsolve/src/deobfuscate/function_lengths.rs +32 -38
  119. data/vendor/cfsolve/src/deobfuscate/helper_objects.rs +338 -513
  120. data/vendor/cfsolve/src/deobfuscate/hygiene.rs +197 -0
  121. data/vendor/cfsolve/src/deobfuscate/int32_helpers.rs +121 -155
  122. data/vendor/cfsolve/src/deobfuscate/literals.rs +116 -67
  123. data/vendor/cfsolve/src/deobfuscate/loops.rs +43 -43
  124. data/vendor/cfsolve/src/deobfuscate/memoized_strings.rs +127 -131
  125. data/vendor/cfsolve/src/deobfuscate/merged_functions.rs +262 -220
  126. data/vendor/cfsolve/src/deobfuscate/pipeline.rs +199 -244
  127. data/vendor/cfsolve/src/deobfuscate/register_arrays.rs +353 -327
  128. data/vendor/cfsolve/src/deobfuscate/removal.rs +83 -52
  129. data/vendor/cfsolve/src/deobfuscate/simplify.rs +147 -0
  130. data/vendor/cfsolve/src/deobfuscate/state_machines.rs +88 -110
  131. data/vendor/cfsolve/src/deobfuscate/statements.rs +228 -228
  132. data/vendor/cfsolve/src/deobfuscate/static_members.rs +46 -31
  133. data/vendor/cfsolve/src/deobfuscate/testing.rs +49 -59
  134. data/vendor/cfsolve/src/deobfuscate/unused_bindings.rs +92 -102
  135. data/vendor/cfsolve/src/deobfuscate.rs +15 -11
  136. data/vendor/cfsolve/src/embedding_page/extra_params.rs +23 -18
  137. data/vendor/cfsolve/src/embedding_page/render_sample.rs +184 -147
  138. data/vendor/cfsolve/src/error.rs +40 -5
  139. data/vendor/cfsolve/src/fingerprint.rs +8 -2
  140. data/vendor/cfsolve/src/http/client.rs +7 -10
  141. data/vendor/cfsolve/src/http/requests.rs +2 -2
  142. data/vendor/cfsolve/src/js/ast.rs +479 -263
  143. data/vendor/cfsolve/src/lib.rs +1 -0
  144. data/vendor/cfsolve/src/listing/fold.rs +19 -9
  145. data/vendor/cfsolve/src/listing/query.rs +1 -47
  146. data/vendor/cfsolve/src/performance_clock.rs +20 -1
  147. data/vendor/cfsolve/src/profiling.rs +49 -0
  148. data/vendor/cfsolve/src/script.rs +35 -24
  149. data/vendor/cfsolve/src/session/challenge_page.rs +41 -21
  150. data/vendor/cfsolve/src/session/channel.rs +2 -2
  151. data/vendor/cfsolve/src/session/initial.rs +5 -5
  152. data/vendor/cfsolve/src/session/sink.rs +26 -1
  153. data/vendor/cfsolve/src/session/tests/challenge_page.rs +36 -1
  154. data/vendor/cfsolve/src/session.rs +1 -1
  155. data/vendor/cfsolve/src/solver.rs +3 -1
  156. data/vendor/cfsolve/src/stage2/analysis/audit.rs +4 -2
  157. data/vendor/cfsolve/src/stage2/analysis/envelope.rs +2 -1
  158. data/vendor/cfsolve/src/stage2/audit_globals.rs +142 -74
  159. data/vendor/cfsolve/src/stage2/benchmark.rs +62 -31
  160. data/vendor/cfsolve/src/stage2/call_stack.rs +1415 -1025
  161. data/vendor/cfsolve/src/stage2/challenge_page.rs +3 -2
  162. data/vendor/cfsolve/src/stage2/interaction/checkbox.rs +202 -150
  163. data/vendor/cfsolve/src/stage2/interaction/click.rs +2 -2
  164. data/vendor/cfsolve/src/stage2/interaction/plan.rs +5 -4
  165. data/vendor/cfsolve/src/stage2/payload/recover.rs +2 -2
  166. data/vendor/cfsolve/src/stage2/probes/clock.rs +1 -3
  167. data/vendor/cfsolve/src/stage2/probes/performance.rs +12 -8
  168. data/vendor/cfsolve/src/stage2/queries.rs +50 -0
  169. data/vendor/cfsolve/src/stage2/syntax.rs +88 -0
  170. data/vendor/cfsolve/src/stage2/trace.rs +134 -108
  171. data/vendor/cfsolve/src/stage2/vocabulary.rs +1 -11
  172. data/vendor/cfsolve/src/stage2.rs +2 -0
  173. data/vendor/cfsolve/src/vm/disassemble.rs +7 -3
  174. data/vendor/cfsolve/src/vm/dispatch.rs +93 -65
  175. data/vendor/cfsolve/src/vm/extract.rs +347 -250
  176. data/vendor/cfsolve/src/vm/interpret/access.rs +63 -48
  177. data/vendor/cfsolve/src/vm/interpret/builtin.rs +10 -10
  178. data/vendor/cfsolve/src/vm/interpret/call.rs +116 -52
  179. data/vendor/cfsolve/src/vm/interpret/compile.rs +79 -62
  180. data/vendor/cfsolve/src/vm/interpret/copies.rs +2 -2
  181. data/vendor/cfsolve/src/vm/interpret/evaluate/tests.rs +63 -42
  182. data/vendor/cfsolve/src/vm/interpret/evaluate.rs +65 -575
  183. data/vendor/cfsolve/src/vm/interpret/explore.rs +7 -10
  184. data/vendor/cfsolve/src/vm/interpret/formula.rs +131 -0
  185. data/vendor/cfsolve/src/vm/interpret/frozen.rs +3 -5
  186. data/vendor/cfsolve/src/vm/interpret/intrinsic.rs +123 -59
  187. data/vendor/cfsolve/src/vm/interpret/mix32.rs +189 -0
  188. data/vendor/cfsolve/src/vm/interpret/native_dispatch.rs +220 -0
  189. data/vendor/cfsolve/src/vm/interpret/pattern.rs +1736 -0
  190. data/vendor/cfsolve/src/vm/interpret/plan.rs +586 -338
  191. data/vendor/cfsolve/src/vm/interpret/register_helpers.rs +384 -0
  192. data/vendor/cfsolve/src/vm/interpret/run.rs +116 -45
  193. data/vendor/cfsolve/src/vm/interpret/semantics.rs +71 -46
  194. data/vendor/cfsolve/src/vm/interpret/setup.rs +80 -45
  195. data/vendor/cfsolve/src/vm/interpret/string_decoder.rs +482 -0
  196. data/vendor/cfsolve/src/vm/interpret.rs +9 -1
  197. data/vendor/cfsolve/src/vm/machine.rs +56 -49
  198. data/vendor/cfsolve/src/vm/output.rs +13 -5
  199. data/vendor/cfsolve/src/vm/packed_names.rs +11 -7
  200. data/vendor/cfsolve/src/vm/session.rs +185 -120
  201. data/vendor/cfsolve/src/vm/value.rs +22 -19
  202. data/vendor/cfsolve/src/vm.rs +2 -1
  203. data/vendor/cfsolve/vendor/btls-sys/Cargo.toml +3 -0
  204. data/vendor/cfsolve/vendor/btls-sys/build/main.rs +20 -0
  205. metadata +94 -178
  206. data/THIRD_PARTY_LICENSES/Inflector-0.11.4/LICENSE.md +0 -22
  207. data/THIRD_PARTY_LICENSES/arrayvec-0.7.6/LICENSE-MIT +0 -25
  208. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-APACHE +0 -201
  209. data/THIRD_PARTY_LICENSES/ascii-1.1.0/LICENSE-MIT +0 -22
  210. data/THIRD_PARTY_LICENSES/ast_node-5.0.0/LICENSE +0 -201
  211. data/THIRD_PARTY_LICENSES/better_scoped_tls-1.0.1/LICENSE +0 -201
  212. data/THIRD_PARTY_LICENSES/bitvec-1.0.1/LICENSE.txt +0 -21
  213. data/THIRD_PARTY_LICENSES/bstr-1.12.1/COPYING +0 -8
  214. data/THIRD_PARTY_LICENSES/bstr-1.12.1/LICENSE-MIT +0 -21
  215. data/THIRD_PARTY_LICENSES/cargo-platform-0.1.9/LICENSE-APACHE +0 -201
  216. data/THIRD_PARTY_LICENSES/cargo_metadata-0.19.2/LICENSE-MIT +0 -23
  217. data/THIRD_PARTY_LICENSES/darling_macro-0.20.11/LICENSE +0 -21
  218. data/THIRD_PARTY_LICENSES/debugid-0.8.0/LICENSE +0 -201
  219. data/THIRD_PARTY_LICENSES/derive_builder-0.20.2/LICENSE-MIT +0 -21
  220. data/THIRD_PARTY_LICENSES/derive_builder_core-0.20.2/LICENSE-MIT +0 -21
  221. data/THIRD_PARTY_LICENSES/derive_builder_macro-0.20.2/LICENSE-MIT +0 -21
  222. data/THIRD_PARTY_LICENSES/foldhash-0.1.5/LICENSE +0 -19
  223. data/THIRD_PARTY_LICENSES/from_variant-3.0.0/LICENSE +0 -201
  224. data/THIRD_PARTY_LICENSES/funty-2.0.0/LICENSE.txt +0 -21
  225. data/THIRD_PARTY_LICENSES/hashbrown-0.16.1/LICENSE-MIT +0 -25
  226. data/THIRD_PARTY_LICENSES/heck-0.5.0/LICENSE-APACHE +0 -201
  227. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-APACHE +0 -201
  228. data/THIRD_PARTY_LICENSES/hermit-abi-0.5.2/LICENSE-MIT +0 -23
  229. data/THIRD_PARTY_LICENSES/hstr-3.0.3/LICENSE +0 -202
  230. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-APACHE +0 -201
  231. data/THIRD_PARTY_LICENSES/if_chain-1.0.3/LICENSE-MIT +0 -25
  232. data/THIRD_PARTY_LICENSES/is-macro-0.3.7/LICENSE +0 -202
  233. data/THIRD_PARTY_LICENSES/itoa-1.0.17/LICENSE-MIT +0 -23
  234. data/THIRD_PARTY_LICENSES/jsonc-parser-0.26.3/LICENSE +0 -21
  235. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-APACHE +0 -201
  236. data/THIRD_PARTY_LICENSES/lazy_static-1.5.0/LICENSE-MIT +0 -25
  237. data/THIRD_PARTY_LICENSES/lru-0.16.2/LICENSE +0 -21
  238. data/THIRD_PARTY_LICENSES/memchr-2.7.6/COPYING +0 -3
  239. data/THIRD_PARTY_LICENSES/memchr-2.7.6/LICENSE-MIT +0 -21
  240. data/THIRD_PARTY_LICENSES/miette-derive-7.6.0/LICENSE +0 -229
  241. data/THIRD_PARTY_LICENSES/normpath-0.2.0/COPYRIGHT +0 -7
  242. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-MIT +0 -21
  243. data/THIRD_PARTY_LICENSES/normpath-0.2.0/LICENSE-THIRD-PARTY +0 -210
  244. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-APACHE +0 -201
  245. data/THIRD_PARTY_LICENSES/num_cpus-1.17.0/LICENSE-MIT +0 -20
  246. data/THIRD_PARTY_LICENSES/owo-colors-4.2.3/LICENSE +0 -21
  247. data/THIRD_PARTY_LICENSES/par-core-2.0.0/LICENSE +0 -202
  248. data/THIRD_PARTY_LICENSES/par-iter-2.0.0/LICENSE +0 -202
  249. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-APACHE +0 -13
  250. data/THIRD_PARTY_LICENSES/path-clean-0.1.0/LICENSE-MIT +0 -18
  251. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-APACHE +0 -13
  252. data/THIRD_PARTY_LICENSES/path-clean-1.0.1/LICENSE-MIT +0 -18
  253. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-APACHE +0 -201
  254. data/THIRD_PARTY_LICENSES/pathdiff-0.2.3/LICENSE-MIT +0 -23
  255. data/THIRD_PARTY_LICENSES/petgraph-0.7.1/LICENSE-APACHE +0 -201
  256. data/THIRD_PARTY_LICENSES/precomputed-map-0.2.0/LICENSE +0 -21
  257. data/THIRD_PARTY_LICENSES/preset_env_base-6.0.0/LICENSE +0 -201
  258. data/THIRD_PARTY_LICENSES/radium-0.7.0/LICENSE.txt +0 -21
  259. data/THIRD_PARTY_LICENSES/radix_fmt-1.0.0/LICENSE +0 -201
  260. data/THIRD_PARTY_LICENSES/rand-0.8.5/COPYRIGHT +0 -12
  261. data/THIRD_PARTY_LICENSES/rand-0.8.5/LICENSE-APACHE +0 -176
  262. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/COPYRIGHT +0 -12
  263. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-APACHE +0 -187
  264. data/THIRD_PARTY_LICENSES/rand_core-0.6.4/LICENSE-MIT +0 -26
  265. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-APACHE +0 -201
  266. data/THIRD_PARTY_LICENSES/regress-0.10.5/LICENSE-MIT +0 -21
  267. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-APACHE +0 -176
  268. data/THIRD_PARTY_LICENSES/ryu-1.0.22/LICENSE-BOOST +0 -23
  269. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-APACHE +0 -201
  270. data/THIRD_PARTY_LICENSES/scoped-tls-1.0.1/LICENSE-MIT +0 -25
  271. data/THIRD_PARTY_LICENSES/siphasher-0.3.11/COPYING +0 -7
  272. data/THIRD_PARTY_LICENSES/smallvec-1.15.1/LICENSE-APACHE +0 -201
  273. data/THIRD_PARTY_LICENSES/smartstring-1.0.1/LICENCE.md +0 -355
  274. data/THIRD_PARTY_LICENSES/st-map-0.2.4/LICENSE +0 -202
  275. data/THIRD_PARTY_LICENSES/static-map-macro-0.3.4/LICENSE +0 -202
  276. data/THIRD_PARTY_LICENSES/string_enum-1.0.2/LICENSE +0 -201
  277. data/THIRD_PARTY_LICENSES/strsim-0.11.1/LICENSE +0 -23
  278. data/THIRD_PARTY_LICENSES/swc-52.0.0/LICENSE +0 -201
  279. data/THIRD_PARTY_LICENSES/swc_allocator-4.0.1/LICENSE +0 -201
  280. data/THIRD_PARTY_LICENSES/swc_atoms-9.0.0/LICENSE +0 -201
  281. data/THIRD_PARTY_LICENSES/swc_common-18.0.1/LICENSE +0 -201
  282. data/THIRD_PARTY_LICENSES/swc_compiler_base-45.0.0/LICENSE +0 -201
  283. data/THIRD_PARTY_LICENSES/swc_config-3.1.2/LICENSE +0 -201
  284. data/THIRD_PARTY_LICENSES/swc_config_macro-1.0.1/LICENSE +0 -201
  285. data/THIRD_PARTY_LICENSES/swc_core-54.0.0/LICENSE +0 -201
  286. data/THIRD_PARTY_LICENSES/swc_ecma_ast-19.0.0/LICENSE +0 -201
  287. data/THIRD_PARTY_LICENSES/swc_ecma_codegen-21.0.0/LICENSE +0 -201
  288. data/THIRD_PARTY_LICENSES/swc_ecma_codegen_macros-2.0.2/LICENSE +0 -201
  289. data/THIRD_PARTY_LICENSES/swc_ecma_compat_bugfixes-39.0.0/LICENSE +0 -201
  290. data/THIRD_PARTY_LICENSES/swc_ecma_compat_common-30.0.0/LICENSE +0 -201
  291. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2015-39.0.0/LICENSE +0 -201
  292. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2016-35.0.0/LICENSE +0 -201
  293. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2017-35.0.0/LICENSE +0 -201
  294. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2018-36.0.0/LICENSE +0 -201
  295. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2019-35.0.0/LICENSE +0 -201
  296. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2020-37.0.0/LICENSE +0 -201
  297. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2021-35.0.0/LICENSE +0 -201
  298. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es2022-37.0.0/LICENSE +0 -201
  299. data/THIRD_PARTY_LICENSES/swc_ecma_compat_es3-26.0.0/LICENSE +0 -201
  300. data/THIRD_PARTY_LICENSES/swc_ecma_ext_transforms-25.0.0/LICENSE +0 -201
  301. data/THIRD_PARTY_LICENSES/swc_ecma_hooks-0.3.0/LICENSE +0 -201
  302. data/THIRD_PARTY_LICENSES/swc_ecma_loader-18.0.0/LICENSE +0 -201
  303. data/THIRD_PARTY_LICENSES/swc_ecma_minifier-42.0.0/LICENSE +0 -201
  304. data/THIRD_PARTY_LICENSES/swc_ecma_parser-32.0.0/LICENSE +0 -201
  305. data/THIRD_PARTY_LICENSES/swc_ecma_preset_env-45.0.0/LICENSE +0 -201
  306. data/THIRD_PARTY_LICENSES/swc_ecma_transformer-6.0.0/LICENSE +0 -201
  307. data/THIRD_PARTY_LICENSES/swc_ecma_transforms-44.0.0/LICENSE +0 -201
  308. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_base-35.0.0/LICENSE +0 -201
  309. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_classes-35.0.0/LICENSE +0 -201
  310. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_compat-40.0.0/LICENSE +0 -201
  311. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_macros-1.0.1/LICENSE +0 -201
  312. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_module-38.0.0/LICENSE +0 -201
  313. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_optimization-37.0.0/LICENSE +0 -201
  314. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_proposal-35.0.0/LICENSE +0 -201
  315. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_react-38.0.0/LICENSE +0 -201
  316. data/THIRD_PARTY_LICENSES/swc_ecma_transforms_typescript-38.0.0/LICENSE +0 -201
  317. data/THIRD_PARTY_LICENSES/swc_ecma_usage_analyzer-27.0.0/LICENSE +0 -201
  318. data/THIRD_PARTY_LICENSES/swc_ecma_utils-25.0.0/LICENSE +0 -201
  319. data/THIRD_PARTY_LICENSES/swc_ecma_visit-19.0.0/LICENSE +0 -201
  320. data/THIRD_PARTY_LICENSES/swc_eq_ignore_macros-1.0.1/LICENSE +0 -201
  321. data/THIRD_PARTY_LICENSES/swc_error_reporters-20.0.0/LICENSE +0 -201
  322. data/THIRD_PARTY_LICENSES/swc_macros_common-1.0.1/LICENSE +0 -201
  323. data/THIRD_PARTY_LICENSES/swc_node_comments-18.0.0/LICENSE +0 -201
  324. data/THIRD_PARTY_LICENSES/swc_timer-1.0.0/LICENSE +0 -201
  325. data/THIRD_PARTY_LICENSES/swc_trace_macro-2.0.2/LICENSE +0 -201
  326. data/THIRD_PARTY_LICENSES/swc_transform_common-12.0.0/LICENSE +0 -201
  327. data/THIRD_PARTY_LICENSES/swc_visit-2.0.1/LICENSE +0 -201
  328. data/THIRD_PARTY_LICENSES/tap-1.0.1/LICENSE.txt +0 -21
  329. data/THIRD_PARTY_LICENSES/tracing-0.1.44/LICENSE +0 -25
  330. data/THIRD_PARTY_LICENSES/tracing-attributes-0.1.31/LICENSE +0 -25
  331. data/THIRD_PARTY_LICENSES/tracing-core-0.1.36/LICENSE +0 -25
  332. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-APACHE +0 -201
  333. data/THIRD_PARTY_LICENSES/triomphe-0.1.15/LICENSE-MIT +0 -27
  334. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-APACHE +0 -201
  335. data/THIRD_PARTY_LICENSES/unicode-width-0.1.14/LICENSE-MIT +0 -25
  336. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-APACHE +0 -201
  337. data/THIRD_PARTY_LICENSES/uuid-1.19.0/LICENSE-MIT +0 -26
  338. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-APACHE +0 -201
  339. data/THIRD_PARTY_LICENSES/vergen-9.0.6/LICENSE-MIT +0 -25
  340. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-APACHE +0 -201
  341. data/THIRD_PARTY_LICENSES/vergen-lib-0.1.6/LICENSE-MIT +0 -25
  342. data/THIRD_PARTY_LICENSES/wyz-0.5.1/LICENSE.txt +0 -21
  343. data/vendor/cfsolve/src/deobfuscate/analysis/globals.rs +0 -33
  344. data/vendor/cfsolve/src/deobfuscate/analysis/names.rs +0 -52
  345. /data/THIRD_PARTY_LICENSES/{derive_builder-0.20.2 → cobs-0.3.0}/LICENSE-APACHE +0 -0
  346. /data/THIRD_PARTY_LICENSES/{compact_str-0.7.1 → compact_str-0.10.0}/LICENSE +0 -0
  347. /data/THIRD_PARTY_LICENSES/{ahash-0.8.12 → embedded-io-0.4.0}/LICENSE-APACHE +0 -0
  348. /data/THIRD_PARTY_LICENSES/{arrayvec-0.7.6 → embedded-io-0.6.1}/LICENSE-APACHE +0 -0
  349. /data/THIRD_PARTY_LICENSES/{normpath-0.2.0 → escape-simd-0.1.1}/LICENSE-APACHE +0 -0
  350. /data/THIRD_PARTY_LICENSES/{bstr-1.12.1 → itertools-0.15.0}/LICENSE-APACHE +0 -0
  351. /data/THIRD_PARTY_LICENSES/{petgraph-0.7.1 → itertools-0.15.0}/LICENSE-MIT +0 -0
  352. /data/THIRD_PARTY_LICENSES/{itoa-1.0.17 → itoa-1.0.19}/LICENSE-APACHE +0 -0
  353. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → itoa-1.0.19}/LICENSE-MIT +0 -0
  354. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/COPYING +0 -0
  355. /data/THIRD_PARTY_LICENSES/{globset-0.4.18 → memchr-2.8.3}/LICENSE-MIT +0 -0
  356. /data/THIRD_PARTY_LICENSES/{camino-1.2.2 → num-bigint-0.5.1}/LICENSE-APACHE +0 -0
  357. /data/THIRD_PARTY_LICENSES/{swc_sourcemap-9.3.4 → oxc_sourcemap-9.0.0}/LICENSE +0 -0
  358. /data/THIRD_PARTY_LICENSES/{phf-0.11.3 → phf-0.14.0}/LICENSE +0 -0
  359. /data/THIRD_PARTY_LICENSES/{phf_generator-0.11.3 → phf_generator-0.14.0}/LICENSE +0 -0
  360. /data/THIRD_PARTY_LICENSES/{phf_macros-0.11.3 → phf_macros-0.14.0}/LICENSE +0 -0
  361. /data/THIRD_PARTY_LICENSES/{phf_shared-0.11.3 → phf_shared-0.14.0}/LICENSE +0 -0
  362. /data/THIRD_PARTY_LICENSES/{fixedbitset-0.5.7 → postcard-1.1.3}/LICENSE-APACHE +0 -0
  363. /data/THIRD_PARTY_LICENSES/{hashbrown-0.14.5 → smallvec-1.16.5}/LICENSE-APACHE +0 -0
  364. /data/THIRD_PARTY_LICENSES/{smallvec-1.15.1 → smallvec-1.16.5}/LICENSE-MIT +0 -0
  365. /data/THIRD_PARTY_LICENSES/{unicode-width-0.1.14 → unicode-segmentation-1.13.3}/COPYRIGHT +0 -0
  366. /data/THIRD_PARTY_LICENSES/{hashbrown-0.16.1 → unicode-segmentation-1.13.3}/LICENSE-APACHE +0 -0
  367. /data/THIRD_PARTY_LICENSES/{heck-0.5.0 → unicode-segmentation-1.13.3}/LICENSE-MIT +0 -0
  368. /data/THIRD_PARTY_LICENSES/{cargo-platform-0.1.9 → zmij_ecma-1.0.23}/LICENSE-MIT +0 -0
@@ -3,15 +3,21 @@
3
3
  use std::collections::{BTreeMap, BTreeSet};
4
4
 
5
5
  use anyhow::Result;
6
+ use oxc::ast::AstKind;
7
+ use oxc::ast::ast::{
8
+ Directive, Expression, MemberExpression, MethodDefinition, ObjectProperty, PropertyDefinition,
9
+ PropertyKind, UpdateExpression,
10
+ };
11
+ use oxc::ast_visit::{Visit, walk};
12
+ use oxc::syntax::scope::ScopeFlags;
6
13
  use serde::{Deserialize, Serialize};
7
- use swc_core::ecma::ast::{AssignExpr, AssignTarget, Expr, Lit, MemberExpr, SimpleAssignTarget};
8
- use swc_core::ecma::visit::{Visit, VisitWith};
9
14
  use url::Url;
10
15
 
16
+ use super::syntax::assigned_member;
11
17
  use super::vocabulary;
12
18
  use crate::challenge::installed::Installed;
13
19
  use crate::challenge::program::PreparedSession;
14
- use crate::js::ast;
20
+ use crate::js::ast::{self, Binding, Script};
15
21
  use crate::script::Source;
16
22
 
17
23
  /// A bag of syntax and browser API features. Local variable names, statement order, numeric
@@ -66,14 +72,34 @@ impl Globals {
66
72
 
67
73
  /// Signatures of the hex-named globals the iframe script assigns on `window` or an alias.
68
74
  pub(crate) fn recover(source: &Source) -> Self {
69
- let mut aliases = Aliases(BTreeSet::from(["window".to_owned()]));
70
- source.parsed().script.visit_with(&mut aliases);
71
- let mut definitions = Definitions {
72
- aliases: aliases.0,
73
- globals: Self::default(),
74
- };
75
- source.parsed().script.visit_with(&mut definitions);
76
- definitions.globals
75
+ let script = source.script();
76
+ let aliases = aliases(script);
77
+ let mut globals = Self::default();
78
+ for node in script.nodes.iter() {
79
+ let AstKind::AssignmentExpression(assignment) = node.kind() else {
80
+ continue;
81
+ };
82
+ if let Some(member) = assigned_member(&assignment.left)
83
+ && let Expression::Identifier(alias) = member.object().without_parentheses()
84
+ && aliases.contains(&script.binding(alias))
85
+ && let Some(name) = ast::member_str(member)
86
+ && vocabulary::is_hex_name(name)
87
+ {
88
+ let signature = globals.0.entry(name.to_owned()).or_default();
89
+ if signature.kind.is_empty() {
90
+ signature.kind = match assignment.right.without_parentheses() {
91
+ Expression::FunctionExpression(_)
92
+ | Expression::ArrowFunctionExpression(_) => "function",
93
+ Expression::ObjectExpression(_) => "object",
94
+ Expression::ArrayExpression(_) => "array",
95
+ _ => "value",
96
+ }
97
+ .into();
98
+ }
99
+ signature.visit_expression(&assignment.right);
100
+ }
101
+ }
102
+ globals
77
103
  }
78
104
 
79
105
  /// Accepts only a unique best candidate in both directions. Ambiguous definitions are
@@ -120,12 +146,8 @@ impl Signature {
120
146
  }
121
147
  let mut intersection = 0;
122
148
  let mut union = 0;
123
- for key in self
124
- .features
125
- .keys()
126
- .chain(other.features.keys())
127
- .collect::<BTreeSet<_>>()
128
- {
149
+ let keys: BTreeSet<&String> = self.features.keys().chain(other.features.keys()).collect();
150
+ for key in keys {
129
151
  let a = self.features.get(key).copied().unwrap_or_default();
130
152
  let b = other.features.get(key).copied().unwrap_or_default();
131
153
  intersection += a.min(b);
@@ -153,91 +175,137 @@ impl Signature {
153
175
  fn feature(&mut self, feature: String) {
154
176
  *self.features.entry(feature).or_default() += 1;
155
177
  }
156
- }
157
-
158
- struct Aliases(BTreeSet<String>);
159
178
 
160
- impl Visit for Aliases {
161
- fn visit_member_expr(&mut self, member: &MemberExpr) {
162
- if ast::member_str(&member.prop) == Some("_cf_chl_opt")
163
- && let Expr::Ident(alias) = member.obj.unwrap_parens()
179
+ /// Counts a string literal's features, as [`Visit::visit_expression`] does for an expression.
180
+ fn literal(&mut self, text: Option<&str>) {
181
+ if let Some(text) = text
182
+ && !vocabulary::is_hex_name(text)
183
+ && text.len() <= 64
184
+ && text
185
+ .chars()
186
+ .all(|character| character.is_ascii_alphabetic() || " ._-/".contains(character))
164
187
  {
165
- self.0.insert(alias.sym.to_string());
188
+ self.feature(format!("string:{text}"));
166
189
  }
167
- member.visit_children_with(self);
168
190
  }
169
191
  }
170
192
 
171
- struct Definitions {
172
- aliases: BTreeSet<String>,
173
- globals: Globals,
174
- }
175
-
176
- impl Visit for Definitions {
177
- fn visit_assign_expr(&mut self, assignment: &AssignExpr) {
178
- if let AssignTarget::Simple(SimpleAssignTarget::Member(member)) = &assignment.left
179
- && let Expr::Ident(alias) = member.obj.unwrap_parens()
180
- && self.aliases.contains(alias.sym.as_ref())
181
- && let Some(name) = ast::member_str(&member.prop)
182
- && vocabulary::is_hex_name(name)
183
- {
184
- let signature = self.globals.0.entry(name.to_owned()).or_default();
185
- if signature.kind.is_empty() {
186
- signature.kind = match assignment.right.unwrap_parens() {
187
- Expr::Fn(_) | Expr::Arrow(_) => "function",
188
- Expr::Object(_) => "object",
189
- Expr::Array(_) => "array",
190
- _ => "value",
191
- }
192
- .into();
193
+ /// The global `window` and the bindings whose `_cf_chl_opt` property the script reads.
194
+ fn aliases(script: Script<'_>) -> BTreeSet<Binding<'_>> {
195
+ struct Aliases<'a> {
196
+ script: Script<'a>,
197
+ found: BTreeSet<Binding<'a>>,
198
+ }
199
+ impl<'a> Visit<'a> for Aliases<'a> {
200
+ fn visit_member_expression(&mut self, member: &MemberExpression<'a>) {
201
+ if ast::member_str(member) == Some("_cf_chl_opt")
202
+ && let Expression::Identifier(alias) = member.object().without_parentheses()
203
+ {
204
+ self.found.insert(self.script.binding(alias));
193
205
  }
194
- assignment.right.visit_with(signature);
206
+ walk::walk_member_expression(self, member);
195
207
  }
196
- assignment.visit_children_with(self);
197
208
  }
209
+ let mut aliases = Aliases {
210
+ script,
211
+ found: BTreeSet::from([Binding::Global("window")]),
212
+ };
213
+ aliases.visit_program(script.program);
214
+ aliases.found
198
215
  }
199
216
 
200
- impl Visit for Signature {
201
- fn visit_expr(&mut self, expression: &Expr) {
217
+ /// Counts the syntax and API features of a definition. Features count expressions, so property
218
+ /// keys, shorthand values, and object methods and accessors, which are not written as
219
+ /// expressions, add none; directives count as the string expressions they are written as.
220
+ impl<'a> Visit<'a> for Signature {
221
+ fn visit_expression(&mut self, expression: &Expression<'a>) {
202
222
  let feature = match expression {
203
- Expr::Bin(value) => format!("binary:{:?}", value.op),
204
- Expr::Unary(value) => format!("unary:{:?}", value.op),
205
- Expr::Call(_) => "call".into(),
206
- Expr::New(_) => "new".into(),
207
- Expr::Cond(_) => "conditional".into(),
208
- Expr::Fn(_) | Expr::Arrow(_) => "function".into(),
209
- Expr::Array(_) => "array".into(),
210
- Expr::Object(_) => "object".into(),
211
- Expr::Assign(value) => format!("assign:{:?}", value.op),
212
- Expr::Lit(Lit::Bool(value)) => format!("bool:{}", value.value),
223
+ // `super` is not an expression; see `visit_member_expression`.
224
+ Expression::Super(_) => return,
225
+ Expression::BinaryExpression(value) => format!("binary:{:?}", value.operator.as_str()),
226
+ Expression::LogicalExpression(value) => format!("binary:{:?}", value.operator.as_str()),
227
+ Expression::UnaryExpression(value) => format!("unary:{:?}", value.operator.as_str()),
228
+ Expression::CallExpression(_) | Expression::ImportExpression(_) => "call".into(),
229
+ Expression::NewExpression(_) => "new".into(),
230
+ Expression::ConditionalExpression(_) => "conditional".into(),
231
+ Expression::FunctionExpression(_) | Expression::ArrowFunctionExpression(_) => {
232
+ "function".into()
233
+ }
234
+ Expression::ArrayExpression(_) => "array".into(),
235
+ Expression::ObjectExpression(_) => "object".into(),
236
+ Expression::AssignmentExpression(value) => {
237
+ format!("assign:{:?}", value.operator.as_str())
238
+ }
239
+ Expression::BooleanLiteral(value) => format!("bool:{}", value.value),
213
240
  _ => "expression".into(),
214
241
  };
215
242
  self.feature(feature);
216
- if let Some(text) = ast::static_str(expression)
217
- && !vocabulary::is_hex_name(text)
218
- && text.len() <= 64
219
- && text
220
- .chars()
221
- .all(|character| character.is_ascii_alphabetic() || " ._-/".contains(character))
222
- {
223
- self.feature(format!("string:{text}"));
243
+ self.literal(ast::static_str(expression));
244
+ walk::walk_expression(self, expression);
245
+ }
246
+
247
+ fn visit_directive(&mut self, directive: &Directive<'a>) {
248
+ self.feature("expression".into());
249
+ self.literal(directive.expression.value.as_str());
250
+ }
251
+
252
+ fn visit_object_property(&mut self, property: &ObjectProperty<'a>) {
253
+ if property.computed {
254
+ self.visit_property_key(&property.key);
255
+ }
256
+ match &property.value {
257
+ Expression::FunctionExpression(function)
258
+ if property.method || property.kind != PropertyKind::Init =>
259
+ {
260
+ walk::walk_function(self, function, ScopeFlags::Function);
261
+ }
262
+ _ if property.shorthand => {}
263
+ value => self.visit_expression(value),
264
+ }
265
+ }
266
+
267
+ fn visit_method_definition(&mut self, method: &MethodDefinition<'a>) {
268
+ if method.computed {
269
+ self.visit_property_key(&method.key);
270
+ }
271
+ self.visit_function(&method.value, ScopeFlags::Function);
272
+ }
273
+
274
+ fn visit_property_definition(&mut self, property: &PropertyDefinition<'a>) {
275
+ if property.computed {
276
+ self.visit_property_key(&property.key);
277
+ }
278
+ if let Some(value) = &property.value {
279
+ self.visit_expression(value);
224
280
  }
225
- expression.visit_children_with(self);
226
281
  }
227
282
 
228
- fn visit_member_expr(&mut self, member: &MemberExpr) {
283
+ /// Counts the operand of an update, which is written as an expression.
284
+ fn visit_update_expression(&mut self, update: &UpdateExpression<'a>) {
285
+ self.feature("expression".into());
286
+ walk::walk_update_expression(self, update);
287
+ }
288
+
289
+ fn visit_member_expression(&mut self, member: &MemberExpression<'a>) {
229
290
  let randomized = |name: &str| {
230
291
  vocabulary::is_hex_name(name)
231
292
  || name.strip_prefix("_0x").is_some_and(|suffix| {
232
293
  !suffix.is_empty() && suffix.bytes().all(|byte| byte.is_ascii_hexdigit())
233
294
  })
234
295
  };
235
- if let Some(name) = ast::member_str(&member.prop)
296
+ // A `super` property read is not a member expression.
297
+ if matches!(member.object(), Expression::Super(_)) {
298
+ if let MemberExpression::ComputedMemberExpression(member) = member {
299
+ self.visit_expression(&member.expression);
300
+ }
301
+ return;
302
+ }
303
+ if let Some(name) = ast::member_str(member)
236
304
  && !randomized(name)
237
305
  {
238
306
  self.feature(format!("property:{name}"));
239
307
  }
240
- member.visit_children_with(self);
308
+ walk::walk_member_expression(self, member);
241
309
  }
242
310
  }
243
311
 
@@ -7,11 +7,14 @@ use std::time::Duration;
7
7
  use anyhow::{Context, Result};
8
8
  use base64::Engine as _;
9
9
  use base64::engine::general_purpose::STANDARD;
10
+ use oxc::ast::ast::{CallExpression, Expression, MemberExpression, VariableDeclarator};
11
+ use oxc::ast_visit::{Visit, walk};
12
+ use oxc::str::Ident;
10
13
  use serde::{Deserialize, Serialize};
11
- use swc_core::ecma::ast::{CallExpr, Callee, MemberExpr, MemberProp, VarDeclarator};
12
- use swc_core::ecma::visit::{Visit, VisitWith};
13
14
 
14
- use crate::js::{self, JsObject, ast, json};
15
+ use super::syntax::{is_optional_call, member};
16
+ use crate::js::ast::{self, Binding, ParsedScript, Script};
17
+ use crate::js::{self, JsObject, json};
15
18
  use crate::performance_clock::{PerformanceClock, Resolution};
16
19
  use crate::stage2::analysis::recognize::ProbeView;
17
20
  use crate::stage2::worker_timing::Samples;
@@ -167,16 +170,16 @@ pub(crate) fn recognize(probe: &ProbeView<'_>) -> Option<Fields> {
167
170
  let parsed = strings
168
171
  .iter()
169
172
  .filter(|text| text.contains("WebAssembly.instantiate"))
170
- .find_map(|source| ast::parse_javascript("benchmark worker", source).ok())?;
171
- let mut worker = Worker::default();
172
- parsed.script.visit_with(&mut worker);
173
+ .find_map(|source| ParsedScript::parse("benchmark worker", source).ok())?;
174
+ let mut worker = Worker::new(parsed.script());
175
+ worker.visit_program(parsed.script().program);
173
176
  // Only the kernels the recorded speeds measure are supported. Field names are recovered
174
177
  // separately and may change without changing the binary.
175
178
  if functions_digest(&worker.module?)? != KERNELS {
176
179
  return None;
177
180
  }
178
181
  let [samples, compilation, total]: [String; 3] = worker.outputs.try_into().ok()?;
179
- let [warmup, _, _, rounds]: [String; 4] = worker.plan.try_into().ok()?;
182
+ let [warmup, _, _, rounds]: [String; 4] = worker.plan_fields.try_into().ok()?;
180
183
  let number = |name: &str| {
181
184
  strings.iter().find_map(|text| {
182
185
  text.strip_prefix(&format!("{name}:"))?
@@ -279,48 +282,76 @@ fn leb128(bytes: &[u8]) -> Option<(usize, &[u8])> {
279
282
  None
280
283
  }
281
284
 
282
- #[derive(Default)]
283
- struct Worker {
285
+ /// The worker's WebAssembly module, the fields of its `plan` object in order of use, and the
286
+ /// keys of the record it posts.
287
+ struct Worker<'a> {
288
+ script: Script<'a>,
289
+ /// The `plan` object the worker source declares.
290
+ plan: Binding<'a>,
284
291
  module: Option<Vec<u8>>,
285
292
  outputs: Vec<String>,
286
- plan: Vec<String>,
293
+ plan_fields: Vec<String>,
287
294
  }
288
295
 
289
- impl Visit for Worker {
290
- fn visit_var_declarator(&mut self, declaration: &VarDeclarator) {
291
- if let Some(value) = declaration.init.as_deref().and_then(ast::static_str)
296
+ impl<'a> Worker<'a> {
297
+ fn new(script: Script<'a>) -> Self {
298
+ let plan = match script.scoping.get_root_binding(Ident::from("plan")) {
299
+ Some(symbol) => Binding::Symbol(symbol),
300
+ None => Binding::Global("plan"),
301
+ };
302
+ Self {
303
+ script,
304
+ plan,
305
+ module: None,
306
+ outputs: Vec::new(),
307
+ plan_fields: Vec::new(),
308
+ }
309
+ }
310
+ }
311
+
312
+ impl<'a> Visit<'a> for Worker<'a> {
313
+ fn visit_variable_declarator(&mut self, declaration: &VariableDeclarator<'a>) {
314
+ if let Some(value) = declaration.init.as_ref().and_then(ast::static_str)
292
315
  && let Ok(bytes) = STANDARD.decode(value)
293
316
  && bytes.starts_with(b"\0asm")
294
317
  {
295
318
  self.module = Some(bytes);
296
319
  }
297
- declaration.visit_children_with(self);
320
+ walk::walk_variable_declarator(self, declaration);
298
321
  }
299
- fn visit_member_expr(&mut self, member: &MemberExpr) {
300
- if member.obj.as_ident().is_some_and(|name| name.sym == "plan")
301
- && let MemberProp::Ident(name) = &member.prop
302
- && !self.plan.contains(&name.sym.to_string())
322
+ fn visit_member_expression(&mut self, member: &MemberExpression<'a>) {
323
+ if let MemberExpression::StaticMemberExpression(field) = member
324
+ && let Expression::Identifier(object) = &field.object
325
+ && self.script.binding(object) == self.plan
326
+ && !self
327
+ .plan_fields
328
+ .iter()
329
+ .any(|name| name == field.property.name.as_str())
303
330
  {
304
- self.plan.push(name.sym.to_string());
331
+ self.plan_fields.push(field.property.name.to_string());
305
332
  }
306
- member.visit_children_with(self);
333
+ walk::walk_member_expression(self, member);
307
334
  }
308
- fn visit_call_expr(&mut self, call: &CallExpr) {
309
- if let Callee::Expr(callee) = &call.callee
310
- && let Some(member) = callee.as_member()
311
- && let MemberProp::Ident(name) = &member.prop
312
- && name.sym == "postMessage"
313
- && let Some(argument) = call.args.first()
314
- && let Some(object) = argument.expr.as_object()
335
+ fn visit_call_expression(&mut self, call: &CallExpression<'a>) {
336
+ if !is_optional_call(call)
337
+ && let Some(MemberExpression::StaticMemberExpression(callee)) = member(&call.callee)
338
+ && callee.property.name == "postMessage"
339
+ && let Some(argument) = call.arguments.first()
340
+ && let Expression::ObjectExpression(object) = ast::argument_expression(argument)
315
341
  {
316
- let objects = ast::key_values(object).filter_map(|property| property.value.as_object());
317
- for data in objects {
342
+ let data = ast::key_values(object).filter_map(|property| match &property.value {
343
+ Expression::ObjectExpression(data) => Some(data),
344
+ _ => None,
345
+ });
346
+ if let Some(data) = data.last() {
318
347
  self.outputs = ast::key_values(data)
319
- .filter_map(|property| ast::key_str(&property.key).map(str::to_owned))
348
+ .filter_map(|property| {
349
+ ast::key_str(&property.key, property.computed).map(str::to_owned)
350
+ })
320
351
  .collect();
321
352
  }
322
353
  }
323
- call.visit_children_with(self);
354
+ walk::walk_call_expression(self, call);
324
355
  }
325
356
  }
326
357