wurk 1.13.0 → 1.15.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 (279) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/controllers/concerns/wurk/same_origin_guard.rb +30 -8
  4. data/app/controllers/concerns/wurk/sse_streaming.rb +36 -1
  5. data/app/controllers/wurk/api/pagination.rb +74 -55
  6. data/app/controllers/wurk/api/serializers.rb +8 -2
  7. data/app/controllers/wurk/api_controller.rb +138 -36
  8. data/app/controllers/wurk/application_controller.rb +0 -2
  9. data/app/controllers/wurk/dashboard_controller.rb +26 -3
  10. data/app/controllers/wurk/profiles_controller.rb +28 -23
  11. data/config/routes.rb +13 -7
  12. data/lib/sidekiq/cli.rb +4 -3
  13. data/lib/sidekiq/deploy.rb +2 -1
  14. data/lib/sidekiq/embedded.rb +2 -1
  15. data/lib/sidekiq/iterable_job.rb +2 -1
  16. data/lib/sidekiq/job/iterable/active_record_enumerator.rb +2 -1
  17. data/lib/sidekiq/job/iterable/csv_enumerator.rb +2 -1
  18. data/lib/sidekiq/job/iterable.rb +2 -1
  19. data/lib/sidekiq/launcher.rb +2 -1
  20. data/lib/sidekiq/manager.rb +2 -1
  21. data/lib/sidekiq/metrics/query.rb +2 -1
  22. data/lib/sidekiq/pro/web.rb +2 -1
  23. data/lib/sidekiq/scheduled.rb +2 -1
  24. data/lib/sidekiq/web.rb +2 -1
  25. data/lib/sidekiq.rb +3 -2
  26. data/lib/wurk/api/admin.rb +84 -0
  27. data/lib/wurk/api/app.rb +7 -2
  28. data/lib/wurk/api/fast.rb +4 -18
  29. data/lib/wurk/api/jobs.rb +11 -3
  30. data/lib/wurk/api/queues.rb +22 -10
  31. data/lib/wurk/api/router.rb +6 -0
  32. data/lib/wurk/api/serializers.rb +6 -7
  33. data/lib/wurk/api/swarm.rb +0 -1
  34. data/lib/wurk/api/validation.rb +17 -0
  35. data/lib/wurk/batch/callbacks.rb +9 -2
  36. data/lib/wurk/batch/server_middleware.rb +4 -0
  37. data/lib/wurk/batch/status.rb +45 -22
  38. data/lib/wurk/batch.rb +15 -4
  39. data/lib/wurk/batch_set.rb +56 -0
  40. data/lib/wurk/cli.rb +21 -21
  41. data/lib/wurk/client/buffered.rb +198 -71
  42. data/lib/wurk/client.rb +21 -1
  43. data/lib/wurk/compat/deploy.rb +7 -0
  44. data/lib/wurk/compat/encryption.rb +7 -0
  45. data/lib/wurk/compat/flow.rb +8 -0
  46. data/lib/wurk/compat/iterable_job.rb +8 -0
  47. data/lib/wurk/compat/profile_set.rb +8 -0
  48. data/lib/wurk/compat/server.rb +15 -0
  49. data/lib/wurk/compat/web.rb +20 -0
  50. data/lib/wurk/compat.rb +34 -40
  51. data/lib/wurk/configuration.rb +74 -9
  52. data/lib/wurk/cron.rb +146 -47
  53. data/lib/wurk/dead_set.rb +10 -6
  54. data/lib/wurk/embedded.rb +0 -2
  55. data/lib/wurk/engine.rb +46 -4
  56. data/lib/wurk/error_coalescer.rb +21 -1
  57. data/lib/wurk/fetcher/many_queues.rb +18 -6
  58. data/lib/wurk/fetcher/poison_pill.rb +3 -1
  59. data/lib/wurk/fetcher/reaper.rb +3 -5
  60. data/lib/wurk/fetcher/reliable.rb +64 -31
  61. data/lib/wurk/fetcher/self_reconcile.rb +0 -1
  62. data/lib/wurk/fetcher/unit_of_work.rb +16 -1
  63. data/lib/wurk/flow/status.rb +10 -4
  64. data/lib/wurk/flow_set.rb +24 -2
  65. data/lib/wurk/health.rb +6 -2
  66. data/lib/wurk/health_probe.rb +45 -7
  67. data/lib/wurk/heartbeat.rb +42 -13
  68. data/lib/wurk/import/sidekiq_cron.rb +0 -1
  69. data/lib/wurk/job_record.rb +2 -1
  70. data/lib/wurk/job_retry.rb +1 -1
  71. data/lib/wurk/job_set.rb +157 -9
  72. data/lib/wurk/launcher.rb +0 -12
  73. data/lib/wurk/lazy_loader.rb +60 -0
  74. data/lib/wurk/leader.rb +2 -0
  75. data/lib/wurk/limiter/bucket.rb +0 -2
  76. data/lib/wurk/limiter/concurrent.rb +19 -36
  77. data/lib/wurk/limiter/leaky.rb +0 -2
  78. data/lib/wurk/limiter/points.rb +0 -2
  79. data/lib/wurk/limiter/server_middleware.rb +4 -1
  80. data/lib/wurk/limiter/unlimited.rb +0 -2
  81. data/lib/wurk/limiter/window.rb +0 -2
  82. data/lib/wurk/limiter.rb +0 -7
  83. data/lib/wurk/logger.rb +44 -5
  84. data/lib/wurk/lua/fast_delete.rb +58 -0
  85. data/lib/wurk/lua/fast_delete_window.lua +46 -0
  86. data/lib/wurk/lua/limiter_concurrent_acquire.lua +10 -3
  87. data/lib/wurk/lua/limiter_concurrent_release.lua +13 -4
  88. data/lib/wurk/lua.rb +1 -41
  89. data/lib/wurk/metrics/accumulator.rb +27 -2
  90. data/lib/wurk/metrics/dashboard_series.rb +38 -18
  91. data/lib/wurk/metrics/exposition.rb +45 -0
  92. data/lib/wurk/metrics/history.rb +30 -12
  93. data/lib/wurk/metrics/pool_registry.rb +27 -0
  94. data/lib/wurk/metrics/process_counters.rb +16 -0
  95. data/lib/wurk/metrics/process_families.rb +115 -0
  96. data/lib/wurk/metrics/prometheus.rb +84 -52
  97. data/lib/wurk/metrics/query.rb +0 -2
  98. data/lib/wurk/metrics/queue_rollup.rb +33 -11
  99. data/lib/wurk/metrics/statsd.rb +4 -0
  100. data/lib/wurk/middleware/chain.rb +25 -3
  101. data/lib/wurk/middleware/expiry.rb +4 -0
  102. data/lib/wurk/middleware/interrupt_handler.rb +4 -1
  103. data/lib/wurk/middleware/status.rb +4 -0
  104. data/lib/wurk/middleware/timeout.rb +4 -0
  105. data/lib/wurk/preflight/owners.rb +0 -1
  106. data/lib/wurk/preflight/payload_sample.rb +0 -1
  107. data/lib/wurk/preflight/verify.rb +0 -2
  108. data/lib/wurk/process_set.rb +6 -1
  109. data/lib/wurk/profiler.rb +2 -1
  110. data/lib/wurk/queue.rb +33 -6
  111. data/lib/wurk/queue_consumers.rb +10 -1
  112. data/lib/wurk/rails_boot.rb +2 -2
  113. data/lib/wurk/railtie.rb +3 -4
  114. data/lib/wurk/redis_pool.rb +6 -1
  115. data/lib/wurk/scheduled.rb +7 -0
  116. data/lib/wurk/sentry/error_handler.rb +5 -0
  117. data/lib/wurk/sentry/middleware.rb +4 -0
  118. data/lib/wurk/sorted_entry.rb +16 -12
  119. data/lib/wurk/stats.rb +85 -1
  120. data/lib/wurk/swarm/child_boot.rb +6 -3
  121. data/lib/wurk/swarm/crash_watch.rb +5 -0
  122. data/lib/wurk/swarm/liveness.rb +0 -2
  123. data/lib/wurk/swarm/memory_watch.rb +110 -0
  124. data/lib/wurk/swarm/prefork.rb +54 -0
  125. data/lib/wurk/swarm/restart.rb +14 -5
  126. data/lib/wurk/swarm/restart_counters.rb +79 -0
  127. data/lib/wurk/swarm.rb +46 -47
  128. data/lib/wurk/version.rb +1 -1
  129. data/lib/wurk/web/enterprise.rb +63 -7
  130. data/lib/wurk.rb +34 -29
  131. data/vendor/assets/dashboard/assets/ArgsValue-D10BT0xi.js +1 -0
  132. data/vendor/assets/dashboard/assets/ArgsValue-D10BT0xi.js.br +0 -0
  133. data/vendor/assets/dashboard/assets/ArgsValue-D10BT0xi.js.gz +0 -0
  134. data/vendor/assets/dashboard/assets/BatchDetail-ByPRHv86.js +1 -0
  135. data/vendor/assets/dashboard/assets/BatchDetail-ByPRHv86.js.br +0 -0
  136. data/vendor/assets/dashboard/assets/BatchDetail-ByPRHv86.js.gz +0 -0
  137. data/vendor/assets/dashboard/assets/Batches-CVVOJFhz.js +1 -0
  138. data/vendor/assets/dashboard/assets/Batches-CVVOJFhz.js.br +0 -0
  139. data/vendor/assets/dashboard/assets/Batches-CVVOJFhz.js.gz +0 -0
  140. data/vendor/assets/dashboard/assets/Busy-Dp26yz1A.js +1 -0
  141. data/vendor/assets/dashboard/assets/Busy-Dp26yz1A.js.br +0 -0
  142. data/vendor/assets/dashboard/assets/Busy-Dp26yz1A.js.gz +0 -0
  143. data/vendor/assets/dashboard/assets/Cron-BiRV6eoU.js +1 -0
  144. data/vendor/assets/dashboard/assets/Cron-BiRV6eoU.js.br +0 -0
  145. data/vendor/assets/dashboard/assets/Cron-BiRV6eoU.js.gz +0 -0
  146. data/vendor/assets/dashboard/assets/Dashboard-CnpCQ8Of.js +1 -0
  147. data/vendor/assets/dashboard/assets/Dashboard-CnpCQ8Of.js.br +0 -0
  148. data/vendor/assets/dashboard/assets/Dashboard-CnpCQ8Of.js.gz +0 -0
  149. data/vendor/assets/dashboard/assets/Dead-ykYbsK8n.js +1 -0
  150. data/vendor/assets/dashboard/assets/Dead-ykYbsK8n.js.br +0 -0
  151. data/vendor/assets/dashboard/assets/Dead-ykYbsK8n.js.gz +0 -0
  152. data/vendor/assets/dashboard/assets/Extension-BUsciXhN.js +1 -0
  153. data/vendor/assets/dashboard/assets/Extension-BUsciXhN.js.br +0 -0
  154. data/vendor/assets/dashboard/assets/Extension-BUsciXhN.js.gz +0 -0
  155. data/vendor/assets/dashboard/assets/FilterBox-DBIZXNtY.js +1 -0
  156. data/vendor/assets/dashboard/assets/FilterBox-DBIZXNtY.js.br +0 -0
  157. data/vendor/assets/dashboard/assets/FilterBox-DBIZXNtY.js.gz +0 -0
  158. data/vendor/assets/dashboard/assets/FlowDetail-CIGu7pRb.js +1 -0
  159. data/vendor/assets/dashboard/assets/FlowDetail-CIGu7pRb.js.br +0 -0
  160. data/vendor/assets/dashboard/assets/FlowDetail-CIGu7pRb.js.gz +0 -0
  161. data/vendor/assets/dashboard/assets/{FlowState-yb7virqR.js → FlowState-B04ZLDe-.js} +1 -1
  162. data/vendor/assets/dashboard/assets/FlowState-B04ZLDe-.js.br +0 -0
  163. data/vendor/assets/dashboard/assets/FlowState-B04ZLDe-.js.gz +0 -0
  164. data/vendor/assets/dashboard/assets/Flows-Ce9Qoq0c.js +1 -0
  165. data/vendor/assets/dashboard/assets/Flows-Ce9Qoq0c.js.br +0 -0
  166. data/vendor/assets/dashboard/assets/Flows-Ce9Qoq0c.js.gz +0 -0
  167. data/vendor/assets/dashboard/assets/JobDetailModal-DWp0OMoV.js +2 -0
  168. data/vendor/assets/dashboard/assets/JobDetailModal-DWp0OMoV.js.br +0 -0
  169. data/vendor/assets/dashboard/assets/JobDetailModal-DWp0OMoV.js.gz +0 -0
  170. data/vendor/assets/dashboard/assets/Limiters-DiWCiVay.js +1 -0
  171. data/vendor/assets/dashboard/assets/Limiters-DiWCiVay.js.br +0 -0
  172. data/vendor/assets/dashboard/assets/Limiters-DiWCiVay.js.gz +0 -0
  173. data/vendor/assets/dashboard/assets/Metrics-DmMS2wo_.js +1 -0
  174. data/vendor/assets/dashboard/assets/Metrics-DmMS2wo_.js.br +0 -0
  175. data/vendor/assets/dashboard/assets/Metrics-DmMS2wo_.js.gz +0 -0
  176. data/vendor/assets/dashboard/assets/NotFound-CM1j8-Fv.js +1 -0
  177. data/vendor/assets/dashboard/assets/NotFound-CM1j8-Fv.js.br +0 -0
  178. data/vendor/assets/dashboard/assets/NotFound-CM1j8-Fv.js.gz +0 -0
  179. data/vendor/assets/dashboard/assets/PageHeader-BcHVxRbX.js +1 -0
  180. data/vendor/assets/dashboard/assets/PageHeader-BcHVxRbX.js.br +0 -0
  181. data/vendor/assets/dashboard/assets/PageHeader-BcHVxRbX.js.gz +0 -0
  182. data/vendor/assets/dashboard/assets/Profiles-B70MlVYQ.js +1 -0
  183. data/vendor/assets/dashboard/assets/Profiles-B70MlVYQ.js.br +0 -0
  184. data/vendor/assets/dashboard/assets/Profiles-B70MlVYQ.js.gz +0 -0
  185. data/vendor/assets/dashboard/assets/Queues-D3JZtWBv.js +1 -0
  186. data/vendor/assets/dashboard/assets/Queues-D3JZtWBv.js.br +0 -0
  187. data/vendor/assets/dashboard/assets/Queues-D3JZtWBv.js.gz +0 -0
  188. data/vendor/assets/dashboard/assets/Retries-BTWoV6so.js +1 -0
  189. data/vendor/assets/dashboard/assets/Retries-BTWoV6so.js.br +0 -0
  190. data/vendor/assets/dashboard/assets/Retries-BTWoV6so.js.gz +0 -0
  191. data/vendor/assets/dashboard/assets/Scheduled-D3PyiFqr.js +1 -0
  192. data/vendor/assets/dashboard/assets/Scheduled-D3PyiFqr.js.br +0 -0
  193. data/vendor/assets/dashboard/assets/Scheduled-D3PyiFqr.js.gz +0 -0
  194. data/vendor/assets/dashboard/assets/Search-bLwIhsaR.js +1 -0
  195. data/vendor/assets/dashboard/assets/Search-bLwIhsaR.js.br +0 -0
  196. data/vendor/assets/dashboard/assets/Search-bLwIhsaR.js.gz +0 -0
  197. data/vendor/assets/dashboard/assets/ar-CugpXGea.js +1 -0
  198. data/vendor/assets/dashboard/assets/ar-CugpXGea.js.br +0 -0
  199. data/vendor/assets/dashboard/assets/ar-CugpXGea.js.gz +0 -0
  200. data/vendor/assets/dashboard/assets/charts-DZyiygHX.js +1 -0
  201. data/vendor/assets/dashboard/assets/charts-DZyiygHX.js.br +0 -0
  202. data/vendor/assets/dashboard/assets/charts-DZyiygHX.js.gz +0 -0
  203. data/vendor/assets/dashboard/assets/de-Bl5Jn_0l.js +1 -0
  204. data/vendor/assets/dashboard/assets/de-Bl5Jn_0l.js.br +0 -0
  205. data/vendor/assets/dashboard/assets/de-Bl5Jn_0l.js.gz +0 -0
  206. data/vendor/assets/dashboard/assets/es-lqQrmjYI.js +1 -0
  207. data/vendor/assets/dashboard/assets/es-lqQrmjYI.js.br +0 -0
  208. data/vendor/assets/dashboard/assets/es-lqQrmjYI.js.gz +0 -0
  209. data/vendor/assets/dashboard/assets/fr-D70VBoh3.js +1 -0
  210. data/vendor/assets/dashboard/assets/fr-D70VBoh3.js.br +0 -0
  211. data/vendor/assets/dashboard/assets/fr-D70VBoh3.js.gz +0 -0
  212. data/vendor/assets/dashboard/assets/i18n-DdPClaCG.js +1 -0
  213. data/vendor/assets/dashboard/assets/i18n-DdPClaCG.js.br +0 -0
  214. data/vendor/assets/dashboard/assets/i18n-DdPClaCG.js.gz +0 -0
  215. data/vendor/assets/dashboard/assets/index-CtK2Dy_G.css +1 -0
  216. data/vendor/assets/dashboard/assets/index-CtK2Dy_G.css.br +0 -0
  217. data/vendor/assets/dashboard/assets/index-CtK2Dy_G.css.gz +0 -0
  218. data/vendor/assets/dashboard/assets/index-ygQ-XC-L.js +141 -0
  219. data/vendor/assets/dashboard/assets/index-ygQ-XC-L.js.br +0 -0
  220. data/vendor/assets/dashboard/assets/index-ygQ-XC-L.js.gz +0 -0
  221. data/vendor/assets/dashboard/assets/ja-BYMqnHjg.js +1 -0
  222. data/vendor/assets/dashboard/assets/ja-BYMqnHjg.js.br +0 -0
  223. data/vendor/assets/dashboard/assets/ja-BYMqnHjg.js.gz +0 -0
  224. data/vendor/assets/dashboard/assets/pt-BR-4k5M2MYH.js +1 -0
  225. data/vendor/assets/dashboard/assets/pt-BR-4k5M2MYH.js.br +0 -0
  226. data/vendor/assets/dashboard/assets/pt-BR-4k5M2MYH.js.gz +0 -0
  227. data/vendor/assets/dashboard/assets/useJobSetList-D-uafkUL.js +2 -0
  228. data/vendor/assets/dashboard/assets/useJobSetList-D-uafkUL.js.br +0 -0
  229. data/vendor/assets/dashboard/assets/useJobSetList-D-uafkUL.js.gz +0 -0
  230. data/vendor/assets/dashboard/assets/useResetPageOnEmpty-DUA0JTgs.js +1 -0
  231. data/vendor/assets/dashboard/assets/useResetPageOnEmpty-DUA0JTgs.js.br +0 -0
  232. data/vendor/assets/dashboard/assets/useResetPageOnEmpty-DUA0JTgs.js.gz +0 -0
  233. data/vendor/assets/dashboard/assets/useSort-BwoC7g__.js +1 -0
  234. data/vendor/assets/dashboard/assets/useSort-BwoC7g__.js.br +0 -0
  235. data/vendor/assets/dashboard/assets/useSort-BwoC7g__.js.gz +0 -0
  236. data/vendor/assets/dashboard/assets/{utils-CnWZzW2L.js → utils-CQj4rqng.js} +1 -1
  237. data/vendor/assets/dashboard/assets/utils-CQj4rqng.js.br +0 -0
  238. data/vendor/assets/dashboard/assets/utils-CQj4rqng.js.gz +0 -0
  239. data/vendor/assets/dashboard/assets/wurk-logo-ydeSB9B8.png +0 -0
  240. data/vendor/assets/dashboard/assets/zh-CN-B9E1MvsM.js +1 -0
  241. data/vendor/assets/dashboard/assets/zh-CN-B9E1MvsM.js.br +0 -0
  242. data/vendor/assets/dashboard/assets/zh-CN-B9E1MvsM.js.gz +0 -0
  243. data/vendor/assets/dashboard/index.html +8 -28
  244. data/vendor/assets/dashboard/wurk-manifest.json +2 -2
  245. metadata +130 -37
  246. data/vendor/assets/dashboard/assets/ArgsValue-BJol9S0s.js +0 -1
  247. data/vendor/assets/dashboard/assets/BatchDetail-D_zGQ9Sd.js +0 -1
  248. data/vendor/assets/dashboard/assets/Batches-Dt_xC660.js +0 -1
  249. data/vendor/assets/dashboard/assets/Busy-CWRthsmc.js +0 -1
  250. data/vendor/assets/dashboard/assets/Cron-qeGr2YAm.js +0 -1
  251. data/vendor/assets/dashboard/assets/Dashboard-DQWaAwPA.js +0 -1
  252. data/vendor/assets/dashboard/assets/Dead-D9gOPHtK.js +0 -1
  253. data/vendor/assets/dashboard/assets/Extension-DONXVLdA.js +0 -1
  254. data/vendor/assets/dashboard/assets/FilterBox-BbB6gXHp.js +0 -2
  255. data/vendor/assets/dashboard/assets/FlowDetail-CrmnVRp0.js +0 -1
  256. data/vendor/assets/dashboard/assets/Flows-g4GC8KmE.js +0 -1
  257. data/vendor/assets/dashboard/assets/JobDetailModal-C86k_1wj.js +0 -2
  258. data/vendor/assets/dashboard/assets/Limiters-zyO-iMlK.js +0 -1
  259. data/vendor/assets/dashboard/assets/Metrics-Ckq5fNBv.js +0 -1
  260. data/vendor/assets/dashboard/assets/NotFound-C8NnyjlY.js +0 -1
  261. data/vendor/assets/dashboard/assets/PageHeader-vWeBbSPF.js +0 -1
  262. data/vendor/assets/dashboard/assets/Profiles-DRl-FXPA.js +0 -1
  263. data/vendor/assets/dashboard/assets/Queues-DkXWrihA.js +0 -1
  264. data/vendor/assets/dashboard/assets/Retries-CmlojYIy.js +0 -1
  265. data/vendor/assets/dashboard/assets/Scheduled-Cbbpp3xw.js +0 -1
  266. data/vendor/assets/dashboard/assets/Search-LaEpj2fM.js +0 -1
  267. data/vendor/assets/dashboard/assets/charts-D_PQLoyc.js +0 -1
  268. data/vendor/assets/dashboard/assets/fa-brands-400-Bs6tcqqs.woff2 +0 -0
  269. data/vendor/assets/dashboard/assets/fa-regular-400-DRN8N0d1.woff2 +0 -0
  270. data/vendor/assets/dashboard/assets/fa-solid-900-IAB4Droh.woff2 +0 -0
  271. data/vendor/assets/dashboard/assets/fa-v4compatibility-CErXDOsT.woff2 +0 -0
  272. data/vendor/assets/dashboard/assets/i18n-CBewVzQ_.js +0 -1
  273. data/vendor/assets/dashboard/assets/index--xvvNlYx.css +0 -1
  274. data/vendor/assets/dashboard/assets/index-FBKGtysy.js +0 -141
  275. data/vendor/assets/dashboard/assets/useResetPageOnEmpty-BiwhHqgh.js +0 -1
  276. data/vendor/assets/dashboard/assets/useSort-jBYVwXvg.js +0 -1
  277. data/vendor/assets/dashboard/assets/wurk-logo-Vy3xW4K0.png +0 -0
  278. data/vendor/assets/dashboard/og-image.png +0 -0
  279. data/vendor/assets/dashboard/wurk-logo.webp +0 -0
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'wurk/web'
4
-
5
3
  module Wurk
6
4
  class ApplicationController < ::ActionController::Base
7
5
  protect_from_forgery with: :exception
@@ -4,7 +4,6 @@ require 'erb'
4
4
  require 'json'
5
5
  require 'net/http'
6
6
  require 'uri'
7
- require 'wurk/web'
8
7
 
9
8
  module Wurk
10
9
  # Serves the SPA shell. Everything else is JSON from ApiController.
@@ -39,6 +38,12 @@ module Wurk
39
38
  # pre-paint script reads it, and that script runs before the stylesheet so
40
39
  # a host default never flashes the other palette.
41
40
  HEAD_OPEN = '<head>'
41
+ # The built shell's asset URLs: Vite builds with a relative `base`
42
+ # (frontend/vite.config.ts) so the bundle's own chunk and font URLs resolve
43
+ # against wherever it is served from; only the shell needs an absolute
44
+ # prefix, because it is served from the page URL, not the asset mount.
45
+ RELATIVE_ASSET_URL = %r{(["'])\./}
46
+ SCRIPT_OPEN = '<script'
42
47
 
43
48
  def index
44
49
  render layout: false, html: decorate_shell(spa_html).html_safe
@@ -47,7 +52,18 @@ module Wurk
47
52
  private
48
53
 
49
54
  def decorate_shell(html)
50
- inject_theme_default(inject_locale_hint(inject_head(html)))
55
+ stamp_csp_nonce(inject_theme_default(inject_locale_hint(inject_head(html))))
56
+ end
57
+
58
+ # A host policy with a nonce generator (`script-src 'self' 'nonce-…'`)
59
+ # refuses every inline script without the request's nonce, and the shell
60
+ # cannot run without its injected mount base. Every <script> gets it, the
61
+ # external module included, so a `'strict-dynamic'` policy loads it too.
62
+ def stamp_csp_nonce(html)
63
+ nonce = request.content_security_policy_nonce
64
+ return html unless nonce
65
+
66
+ html.gsub(SCRIPT_OPEN) { %(#{SCRIPT_OPEN} nonce="#{::ERB::Util.html_escape(nonce)}") }
51
67
  end
52
68
 
53
69
  def spa_html
@@ -144,7 +160,14 @@ module Wurk
144
160
  raise "Wurk dashboard: precompiled SPA index.html missing at #{path}. " \
145
161
  'Run `bin/rake frontend:build`.'
146
162
  end
147
- path.read
163
+ path.read.gsub(RELATIVE_ASSET_URL) { "#{::Regexp.last_match(1)}#{asset_base}/" }
164
+ end
165
+
166
+ # AssetMount sits in the host's stack, so its URL carries the host's own
167
+ # prefix (RAILS_RELATIVE_URL_ROOT, or a proxy's SCRIPT_NAME), not the
168
+ # engine mount: `/app/wurk` serves its assets from `/app/wurk-assets`.
169
+ def asset_base
170
+ "#{request.get_header('ORIGINAL_SCRIPT_NAME').to_s.chomp('/')}#{::Wurk::Engine::AssetMount::PREFIX}"
148
171
  end
149
172
  end
150
173
  end
@@ -6,16 +6,21 @@ require 'uri'
6
6
  module Wurk
7
7
  # Profiles pane non-JSON endpoints (spec §25.4):
8
8
  #
9
- # GET /profiles/:key/data → the stored gzipped gecko JSON, streamed with a
9
+ # GET /profiles/:key/data → the stored gzipped gecko JSON, streamed with a
10
10
  # gzip Content-Encoding (Firefox profiler pulls
11
11
  # this when given a `from-url` source).
12
- # GET /profiles/:key → upload the profile to the Firefox profiler
12
+ # POST /profiles/:key → upload the profile to the Firefox profiler
13
13
  # store and 302 to its public view URL.
14
+ # GET /profiles/:key → 302 to an upload already made (by either UI),
15
+ # 405 when there is none yet.
16
+ #
17
+ # Sidekiq uploads on the GET. Sending job data to a third party is a side
18
+ # effect, so here only a POST does it: SameOriginGuard covers it like every
19
+ # other mutation, and read-only mode refuses it (#101 W5).
14
20
  #
15
21
  # `:key` is "<token>-<jid>". The JSON list lives at /api/profiles.
16
22
  class ProfilesController < ApplicationController
17
- # CSRF protection is for state-changing form posts; these are GET reads.
18
- skip_forgery_protection
23
+ include SameOriginGuard
19
24
 
20
25
  def data
21
26
  blob = profile_blob(params[:key])
@@ -26,36 +31,36 @@ module Wurk
26
31
  end
27
32
 
28
33
  def show
29
- # GET-shaped for Sidekiq parity, but uploading the profile to the public
30
- # Firefox profiler store is a side effect — read-only deploys (e.g. the
31
- # public demo) must not let any visitor exfiltrate profiling data.
32
34
  return head(:forbidden) if ::Wurk::Web.config.read_only?
33
- return head(:forbidden) unless navigated_from_dashboard?
34
35
 
36
+ sid = cached_sid(params[:key])
37
+ return redirect_to_profile(sid) if sid
38
+ return head(:not_found) unless profile_exists?(params[:key])
39
+
40
+ response.headers['Allow'] = 'POST'
41
+ head :method_not_allowed
42
+ end
43
+
44
+ # Read-only mode 403s this POST in Wurk::Web::Authorization, before it
45
+ # gets here.
46
+ def upload
35
47
  sid = profile_sid(params[:key])
36
48
  return head(:not_found) if sid == :missing
37
49
  return head(:bad_gateway) unless sid
38
50
 
39
- redirect_to(format(::Wurk::Web.config.profile_view_url, sid), allow_other_host: true)
51
+ redirect_to_profile(sid)
40
52
  end
41
53
 
42
54
  private
43
55
 
44
- # The upload is a side effect behind a GET, so a cross-site `<img src>`
45
- # could trigger it with the operator's session. Allow the dashboard's own
46
- # link (same-origin) and a typed URL or bookmark (`none`). A browser too
47
- # old to send Sec-Fetch-Site still sends a Referer, which must then be
48
- # this host.
49
- def navigated_from_dashboard?
50
- site = request.headers['Sec-Fetch-Site']
51
- return %w[same-origin none].include?(site) if site
52
-
53
- referer = URI.parse(request.referer.to_s)
54
- referer.host == request.host && referer.port == request.port
55
- rescue URI::InvalidURIError
56
- false
56
+ def redirect_to_profile(sid)
57
+ redirect_to(format(::Wurk::Web.config.profile_view_url, sid), allow_other_host: true)
57
58
  end
58
59
 
60
+ def profile_exists?(key) = ::Wurk.redis { |c| c.call('EXISTS', key) }.positive?
61
+
62
+ def cached_sid(key) = ::Wurk.redis { |c| c.call('HGET', key, 'sid') }
63
+
59
64
  def profile_blob(key)
60
65
  ::Wurk::ProfileRecord.data_for(key)
61
66
  end
@@ -64,7 +69,7 @@ module Wurk
64
69
  # upload exactly as Sidekiq's Web UI does, so either UI reuses the other's
65
70
  # upload. :missing when the profile is gone, nil when the upload failed.
66
71
  def profile_sid(key)
67
- sid = ::Wurk.redis { |c| c.call('HGET', key, 'sid') }
72
+ sid = cached_sid(key)
68
73
  return sid if sid
69
74
 
70
75
  blob = profile_blob(key)
data/config/routes.rb CHANGED
@@ -43,19 +43,23 @@ Wurk::Engine.routes.draw do
43
43
  # Listings answer `{ total, page, count, max_page, entries }`; `page` is
44
44
  # the page actually served (clamped to `max_page`), and a `?substr=`
45
45
  # listing adds `filtered_total` + `filtered_total_exact` (false: lower
46
- # bound).
46
+ # bound). Listing rows leave out `error_backtrace`; `GET <set>/:key`
47
+ # answers one entry with it, or 404 `{ error: 'unknown job' }`.
47
48
  get 'retries', to: 'api#retries'
48
49
  post 'retries', to: 'api#retries_bulk', as: :api_retries_bulk
49
50
  post 'retries/all/:cmd', to: 'api#retries_all', as: :api_retries_all
50
51
  post 'retries/:key', to: 'api#retry_job', as: :api_retry_job, constraints: { key: %r{[^/]+} }
52
+ get 'retries/:key', to: 'api#retry_entry', as: :api_retry_entry, constraints: { key: %r{[^/]+} }
51
53
  get 'scheduled', to: 'api#scheduled'
52
54
  post 'scheduled', to: 'api#scheduled_bulk', as: :api_scheduled_bulk
53
55
  post 'scheduled/all/:cmd', to: 'api#scheduled_all', as: :api_scheduled_all
54
56
  post 'scheduled/:key', to: 'api#scheduled_job', as: :api_scheduled_job, constraints: { key: %r{[^/]+} }
57
+ get 'scheduled/:key', to: 'api#scheduled_entry', as: :api_scheduled_entry, constraints: { key: %r{[^/]+} }
55
58
  get 'dead', to: 'api#dead'
56
59
  post 'dead', to: 'api#dead_bulk', as: :api_dead_bulk
57
60
  post 'dead/all/:cmd', to: 'api#dead_all', as: :api_dead_all
58
61
  post 'dead/:key', to: 'api#dead_job', as: :api_dead_job, constraints: { key: %r{[^/]+} }
62
+ get 'dead/:key', to: 'api#dead_entry', as: :api_dead_entry, constraints: { key: %r{[^/]+} }
59
63
  get 'processes', to: 'api#processes'
60
64
  get 'workers', to: 'api#workers'
61
65
  # Wurk uses split POST /api/busy/quiet and /api/busy/stop requests, not free
@@ -122,12 +126,14 @@ Wurk::Engine.routes.draw do
122
126
  mount Wurk::API => Wurk::API::ENGINE_MOUNT, constraints: ->(request) { Wurk::API.serves?(request.path_info) }
123
127
 
124
128
  # Profiles (v8.0+) — not under /api: `:key/data` streams the gzipped gecko
125
- # blob with a gzip Content-Encoding, and `:key` POST-uploads the profile to
126
- # the Firefox profiler then 302s to its public view. `:key` is "<token>-<jid>".
127
- # The `/data` route is declared first so it wins over the bare `:key` match.
128
- # Spec: docs/target/sidekiq-free.md §25.4.
129
- get 'profiles/:key/data', to: 'profiles#data', as: :profile_data, constraints: { key: %r{[^/]+} }
130
- get 'profiles/:key', to: 'profiles#show', as: :profile, constraints: { key: %r{[^/]+} }
129
+ # blob with a gzip Content-Encoding; `POST :key` uploads the profile to the
130
+ # Firefox profiler then 302s to its public view, and `GET :key` only follows
131
+ # an upload already made (Sidekiq uploads on the GET; #101 W5). `:key` is
132
+ # "<token>-<jid>". The `/data` route is declared first so it wins over the
133
+ # bare `:key` match. Spec: docs/target/sidekiq-free.md §25.4.
134
+ get 'profiles/:key/data', to: 'profiles#data', as: :profile_data, constraints: { key: %r{[^/]+} }
135
+ get 'profiles/:key', to: 'profiles#show', as: :profile, constraints: { key: %r{[^/]+} }
136
+ post 'profiles/:key', to: 'profiles#upload', as: :profile_upload, constraints: { key: %r{[^/]+} }
131
137
 
132
138
  # Third-party Web extensions (#187): server-rendered route + assets. The SPA's
133
139
  # Extension page fetches `ext/:name/<subpath>` and embeds the returned HTML;
data/lib/sidekiq/cli.rb CHANGED
@@ -2,8 +2,9 @@
2
2
 
3
3
  # Drop-in require path (see lib/sidekiq.rb). In Sidekiq, `Sidekiq.server?`
4
4
  # is literally "has sidekiq/cli been required" — apps and ecosystem test
5
- # helpers require this file to make `configure_server` blocks run. Wurk
6
- # always loads its CLI class internally, so the passthrough carries the
7
- # *semantic*: requiring it declares this process a server.
5
+ # helpers require this file to make `configure_server` blocks run, so the
6
+ # passthrough carries that *semantic* as well as the CLI class: requiring it
7
+ # declares this process a server.
8
8
  require 'wurk'
9
+ Sidekiq.const_get(:CLI)
9
10
  Wurk.enter_server_mode
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Deploy)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Embedded)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:IterableJob)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:IterableJob)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:IterableJob)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:IterableJob)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Launcher)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Manager)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Wurk::Metrics.const_get(:Query)
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # Drop-in require path (sidekiq-pro.md §10): Sidekiq::Pro::Web is the same
4
- # dashboard as Sidekiq::Web, which Wurk loads whole.
4
+ # dashboard as Sidekiq::Web.
5
5
  require 'wurk'
6
+ Sidekiq::Pro.const_get(:Web)
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Scheduled)
data/lib/sidekiq/web.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # Drop-in require path (see lib/sidekiq.rb). Wurk loads this surface whole.
3
+ # Drop-in require path (see lib/sidekiq.rb): loads the lazy surface it names.
4
4
  require 'wurk'
5
+ Sidekiq.const_get(:Web)
5
6
 
6
7
  # Extension renderer dependencies, deferred on the worker path (web/extension.rb).
7
8
  # Loaded here for a helper called outside a request, as unique-jobs' specs do.
data/lib/sidekiq.rb CHANGED
@@ -4,8 +4,9 @@
4
4
  # Sidekiq::* alias layer (lib/wurk/compat.rb), so code and third-party gems
5
5
  # written against Sidekiq load Wurk without changing a single require. The
6
6
  # sibling files under lib/sidekiq/ cover the documented `require "sidekiq/…"`
7
- # sub-paths the ecosystem uses; all are one-line passthroughs because Wurk
8
- # loads its full surface (web included) from the single "wurk" entrypoint.
7
+ # sub-paths the ecosystem uses. "wurk" loads the client tier and autoloads the
8
+ # rest (Wurk::LazyLoader); a sub-path whose surface is lazy loads it, so
9
+ # `require "sidekiq/web"` defines Sidekiq::Web as it does upstream.
9
10
  #
10
11
  # Bundler-level substitution (a gem's `add_dependency "sidekiq"`) is handled
11
12
  # by the companion shim gem in ecosystem/sidekiq-shim/.
@@ -0,0 +1,84 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative 'idempotency'
4
+ require_relative 'jobs'
5
+ require_relative 'page'
6
+ require_relative 'problem'
7
+ require_relative 'response'
8
+ require_relative 'validation'
9
+
10
+ module Wurk
11
+ module API
12
+ # The operator actions the dashboard already offers, for a client that has
13
+ # no screen: put one retrying or dead job back on its queue, empty a queue.
14
+ #
15
+ # Each goes through the object the dashboard's action calls —
16
+ # SortedEntry#retry, Queue#clear — so the two surfaces cannot disagree about
17
+ # what "retry" does to `retry_count` or what "clear" removes.
18
+ #
19
+ # Neither is safe to send twice blind. A second retry after a lost reply
20
+ # finds nothing and reads as a 404 the job did not earn, and a second clear
21
+ # empties whatever was enqueued in between. So every route here takes
22
+ # `Idempotency-Key` exactly as the produce plane does.
23
+ module Admin
24
+ module_function
25
+
26
+ TABLE = [
27
+ [:post, '/retries/:jid/retry', :admin, :retry_retrying],
28
+ [:post, '/dead/:jid/retry', :admin, :retry_dead],
29
+ [:post, '/queues/:name/clear', :admin, :clear]
30
+ ].freeze
31
+
32
+ def draw(router)
33
+ TABLE.each do |verb, pattern, scope, handler|
34
+ router.public_send(verb, pattern, scope: scope) do |request|
35
+ claimed(request) { public_send(handler, request) }
36
+ end
37
+ end
38
+ end
39
+
40
+ def retry_retrying(request) = retry_entry(request, ::Wurk::RetrySet.new)
41
+ def retry_dead(request) = retry_entry(request, ::Wurk::DeadSet.new)
42
+
43
+ # A job the poller promoted, or another client retried, between the
44
+ # lookup and the removal is not retried twice: SortedEntry#retry answers
45
+ # nil when its ZREM finds nothing, and that is the same 404 a jid that
46
+ # was never there gets.
47
+ def retry_entry(request, set)
48
+ jid = Validation.jid!(request.path_params[:jid].to_s)
49
+ score = Validation.score!(Page.query!(request))
50
+ entry = Jobs.find_entry(set, jid, score)
51
+ return job_not_found(request, set, jid) unless entry&.retry
52
+
53
+ Response.json(200, jid: jid, set: set.name, queue: entry.queue)
54
+ end
55
+
56
+ def clear(request)
57
+ queue = ::Wurk::Queue.new(Validation.queue_name!(request.path_params[:name]))
58
+ queue.clear
59
+ Response.json(200, name: queue.name, cleared: true)
60
+ end
61
+
62
+ # The body cap and the shape of the key are checked before the claim, the
63
+ # rest inside it, in the order Jobs#produce uses and for its reason: a
64
+ # refusal releases the key, a success is what a resend replays.
65
+ def claimed(request, &action)
66
+ config = request.config
67
+ raw = Validation.body!(request, config.api_max_body_bytes)
68
+ Idempotency.around(request, raw, config) { Jobs.rejectable(request, &action) }
69
+ rescue Validation::Invalid => e
70
+ Problem.from(e, instance: request.path)
71
+ end
72
+
73
+ def job_not_found(request, set, jid)
74
+ Problem.render(
75
+ Problem::JOB_NOT_FOUND,
76
+ status: 404,
77
+ detail: "No job in #{set.name} has jid #{jid}.",
78
+ instance: request.path,
79
+ jid: jid
80
+ )
81
+ end
82
+ end
83
+ end
84
+ end
data/lib/wurk/api/app.rb CHANGED
@@ -3,6 +3,7 @@
3
3
  require 'rack'
4
4
  require_relative '../api'
5
5
  require_relative '../version'
6
+ require_relative 'admin'
6
7
  require_relative 'auth'
7
8
  require_relative 'flows'
8
9
  require_relative 'jobs'
@@ -36,6 +37,10 @@ module Wurk
36
37
  draw(@router)
37
38
  end
38
39
 
40
+ # Every route this app answers, for test/unit/api_openapi_parity_test.rb
41
+ # to hold docs/api/openapi.yaml to.
42
+ def routes = @router.routes
43
+
39
44
  def call(env)
40
45
  request = Request.new(env)
41
46
  # Stamped once, before anything reads it, so every handler sees the
@@ -52,14 +57,14 @@ module Wurk
52
57
  @config || ::Wurk.configuration
53
58
  end
54
59
 
55
- # One table per plane, each owning its own routes and handlers. Queues,
56
- # Flows and Swarm join Jobs here.
60
+ # One table per plane, each owning its own routes and handlers.
57
61
  def draw(router)
58
62
  router.get('/', scope: Auth::ANY) { |request| root(request) }
59
63
  Jobs.draw(router)
60
64
  Queues.draw(router)
61
65
  Flows.draw(router)
62
66
  Swarm.draw(router)
67
+ Admin.draw(router)
63
68
  end
64
69
 
65
70
  # Authentication runs before the version gate and before routing, so an
data/lib/wurk/api/fast.rb CHANGED
@@ -4,8 +4,8 @@ require_relative '../lua'
4
4
 
5
5
  module Wurk
6
6
  module API
7
- # Pro parity (§11): Lua-backed O(1)-round-trip replacements for the
8
- # ruby-side LRANGE loops in Queue. Mixed into the existing data API class
7
+ # Pro parity (§11): Lua-backed replacements for the ruby-side LRANGE loops
8
+ # in Queue, one round trip per Lua::FastDelete::WINDOW entries. Mixed into the existing data API class
9
9
  # so the surface is `Sidekiq::Queue#delete_job(jid)` — wire-compat with Pro
10
10
  # consumer code that drops in on a one-line require swap.
11
11
  #
@@ -20,14 +20,7 @@ module Wurk
20
20
  def delete_job(jid)
21
21
  raise ArgumentError, 'jid required' if jid.nil? || jid.to_s.empty?
22
22
 
23
- Wurk.redis do |conn|
24
- Wurk::Lua::Loader.eval_cached(
25
- conn,
26
- :fast_delete_job,
27
- keys: [Keys.queue(name)],
28
- argv: [jid.to_s]
29
- )
30
- end
23
+ Wurk.redis { |conn| Wurk::Lua::FastDelete.delete_job(conn, Keys.queue(name), jid.to_s) }
31
24
  end
32
25
 
33
26
  # @param klass [Class, String, Symbol]
@@ -36,14 +29,7 @@ module Wurk
36
29
  klass_name = klass.is_a?(Class) ? klass.name : klass.to_s
37
30
  raise ArgumentError, 'class name required' if klass_name.empty?
38
31
 
39
- Wurk.redis do |conn|
40
- Wurk::Lua::Loader.eval_cached(
41
- conn,
42
- :fast_delete_by_class,
43
- keys: [Keys.queue(name)],
44
- argv: [klass_name]
45
- )
46
- end.to_i
32
+ Wurk.redis { |conn| Wurk::Lua::FastDelete.delete_by_class(conn, Keys.queue(name), klass_name) }
47
33
  end
48
34
  end
49
35
  end
data/lib/wurk/api/jobs.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require_relative 'idempotency'
4
+ require_relative 'page'
4
5
  require_relative 'problem'
5
6
  require_relative 'response'
6
7
  require_relative 'validation'
@@ -123,7 +124,8 @@ module Wurk
123
124
  # action against a different set.
124
125
  def destroy(request)
125
126
  jid = Validation.jid!(request.path_params[:jid].to_s)
126
- set = cancellable_sets.find { |candidate| remove(candidate, jid) }
127
+ score = Validation.score!(Page.query!(request))
128
+ set = cancellable_sets.find { |candidate| remove(candidate, jid, score) }
127
129
  return job_not_found(request, jid) unless set
128
130
 
129
131
  Response.json(200, jid: jid, set: set.name)
@@ -142,11 +144,17 @@ module Wurk
142
144
  # them to disagree. A job promoted out of the set between the two steps
143
145
  # removes nothing and reads as "already gone", the honest answer to a
144
146
  # cancel that lost the race.
145
- def remove(set, jid)
146
- entry = set.find_job(jid)
147
+ def remove(set, jid, score)
148
+ entry = find_entry(set, jid, score)
147
149
  entry ? entry.delete : false
148
150
  end
149
151
 
152
+ # Without a score this is JobSet#find_job's ZSCAN, which walks the whole
153
+ # set on a miss; with one it is a single ZRANGEBYSCORE.
154
+ def find_entry(set, jid, score)
155
+ score ? set.fetch(score, jid).first : set.find_job(jid)
156
+ end
157
+
150
158
  # Validation decided which problem this is; rendering it is all that is
151
159
  # left, so a new rejection never needs a new arm here.
152
160
  def problem(request, error) = Problem.from(error, instance: request.path)
@@ -39,6 +39,7 @@ module Wurk
39
39
  [:get, '/retries', :read, :retries],
40
40
  [:get, '/scheduled', :read, :scheduled],
41
41
  [:get, '/dead', :read, :dead],
42
+ [:get, '/batches', :read, :batches],
42
43
  [:get, '/batches/:bid', :read, :batch],
43
44
  [:post, '/queues/:name/pause', :admin, :pause],
44
45
  [:post, '/queues/:name/unpause', :admin, :unpause]
@@ -58,14 +59,14 @@ module Wurk
58
59
  end
59
60
 
60
61
  def stats(_request)
61
- Response.json(200, Serializers.stats(::Wurk::Stats.new))
62
+ Response.json(200, Serializers.stats(::Wurk::Stats::Snapshot.new))
62
63
  end
63
64
 
64
- # Stats#queue_summaries rather than Queue.all: one pipeline instead of an
65
+ # A Stats snapshot rather than Queue.all: two pipelines instead of an
65
66
  # LLEN round trip per queue, and it comes back in the size-descending
66
67
  # order every other Wurk surface lists queues in.
67
68
  def index(_request)
68
- Response.json(200, queues: ::Wurk::Stats.new.queue_summaries.map { |q| Serializers.queue_summary(q) })
69
+ Response.json(200, queues: ::Wurk::Stats::Snapshot.new.queue_summaries.map { |q| Serializers.queue_summary(q) })
69
70
  end
70
71
 
71
72
  # No 404 for a name nothing was ever enqueued under. A queue is not an
@@ -75,9 +76,10 @@ module Wurk
75
76
  # its first job is a legitimate pre-deploy move for the same reason.
76
77
  def show(request)
77
78
  window = Page.window!(request)
78
- queue = ::Wurk::Queue.new(Validation.queue_name!(request.path_params[:name]))
79
- jobs = Page.slice(queue, window) { |record| Serializers.job_record(record) }
80
- Response.json(200, Serializers.queue_gauges(queue).merge(page: window.page, count: window.count, jobs: jobs))
79
+ name = Validation.queue_name!(request.path_params[:name])
80
+ snapshot = ::Wurk::Queue.new(name).snapshot(window.offset, window.count)
81
+ jobs = snapshot.records.map { |record| Serializers.job_record(record) }
82
+ Response.json(200, Serializers.queue_gauges(name, snapshot).merge(**window.to_h, jobs: jobs))
81
83
  end
82
84
 
83
85
  def retries(request) = sorted_set(request, ::Wurk::RetrySet.new)
@@ -95,15 +97,25 @@ module Wurk
95
97
  Response.json(200, name: queue.name, paused: paused)
96
98
  end
97
99
 
98
- # `total` is read before the page is walked, so it describes the set the
99
- # page was taken from rather than the one left after a poller drained it.
100
+ # `total` and the page are one pipelined read, so the total describes the
101
+ # set the page was taken from rather than the one left after a poller
102
+ # drained it.
100
103
  def sorted_set(request, set)
101
104
  window = Page.window!(request)
102
- total = set.size
103
- jobs = Page.slice(set, window) { |entry| Serializers.sorted_entry(entry) }
105
+ total, entries = set.snapshot(window.offset, window.count)
106
+ jobs = entries.map { |entry| Serializers.sorted_entry(entry) }
104
107
  Response.json(200, name: set.name, total: total, page: window.page, count: window.count, jobs: jobs)
105
108
  end
106
109
 
110
+ # Newest first, each row Batch::Status#summary: the failed and dead jid
111
+ # sets counted rather than listed, so a page of 200 batches with 10k
112
+ # failures each is not two million jids. `/batches/:bid` carries them.
113
+ def batches(request)
114
+ window = Page.window!(request)
115
+ total, rows = ::Wurk::BatchSet.new.snapshot(window.offset, window.count)
116
+ Response.json(200, total: total, page: window.page, count: window.count, batches: rows)
117
+ end
118
+
107
119
  def batch(request)
108
120
  bid = Validation.bid!(request.path_params[:bid])
109
121
  status = ::Wurk::Batch::Status.new(bid)
@@ -31,6 +31,12 @@ module Wurk
31
31
  @routes = []
32
32
  end
33
33
 
34
+ # Pattern strings rebuilt from segments, so '/jobs/:jid' reads back as
35
+ # it was drawn.
36
+ def routes
37
+ @routes.map { |route| [route.verb, "/#{route.segments.join('/')}", route.scope] }
38
+ end
39
+
34
40
  def get(pattern, scope:, &handler) = add('GET', pattern, scope, handler)
35
41
  def post(pattern, scope:, &handler) = add('POST', pattern, scope, handler)
36
42
  def delete(pattern, scope:, &handler) = add('DELETE', pattern, scope, handler)
@@ -152,13 +152,12 @@ module Wurk
152
152
  { name: summary.name, size: summary.size, latency: summary.latency, paused: summary.paused? }
153
153
  end
154
154
 
155
- # The same four gauges read off a Wurk::Queue instead of a pipelined
156
- # Stats::QueueSummary — three round trips rather than a share of one,
157
- # which is what asking about a single queue costs. Same field names on
158
- # purpose: a client that read a queue out of the listing and then fetched
159
- # it should not have to reshape anything.
160
- def queue_gauges(queue)
161
- { name: queue.name, size: queue.size, latency: queue.latency, paused: queue.paused? }
155
+ # The same four gauges read off a Wurk::Queue::Snapshot instead of a
156
+ # Stats::QueueSummary. Same field names on purpose: a client that read a
157
+ # queue out of the listing and then fetched it should not have to
158
+ # reshape anything.
159
+ def queue_gauges(name, gauges)
160
+ { name: name, size: gauges.size, latency: gauges.latency, paused: gauges.paused? }
162
161
  end
163
162
 
164
163
  # `class` and `args` are the *display* view, the same one the dashboard
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative '../web/enterprise'
4
3
  require_relative 'page'
5
4
  require_relative 'problem'
6
5
  require_relative 'response'