@browserless.io/browserless 2.31.1 → 2.32.0-beta-1

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 (432) hide show
  1. package/build/routes/chrome/http/content.post.body.json +8 -8
  2. package/build/routes/chrome/http/pdf.post.body.json +8 -8
  3. package/build/routes/chrome/http/scrape.post.body.json +8 -8
  4. package/build/routes/chrome/http/screenshot.post.body.json +8 -8
  5. package/build/routes/chromium/http/content.post.body.json +8 -8
  6. package/build/routes/chromium/http/pdf.post.body.json +8 -8
  7. package/build/routes/chromium/http/scrape.post.body.json +8 -8
  8. package/build/routes/chromium/http/screenshot.post.body.json +8 -8
  9. package/build/routes/edge/http/content.post.body.json +8 -8
  10. package/build/routes/edge/http/pdf.post.body.json +8 -8
  11. package/build/routes/edge/http/scrape.post.body.json +8 -8
  12. package/build/routes/edge/http/screenshot.post.body.json +8 -8
  13. package/build/routes/management/tests/management.spec.js +14 -0
  14. package/build/server.js +4 -5
  15. package/build/shared/utils/enjoi-resolver.d.ts +77 -0
  16. package/build/shared/utils/enjoi-resolver.js +399 -0
  17. package/docker/base/Dockerfile +2 -2
  18. package/extensions/ublocklite/README.md +4 -2
  19. package/extensions/ublocklite/_locales/ar/messages.json +34 -10
  20. package/extensions/ublocklite/_locales/az/messages.json +26 -2
  21. package/extensions/ublocklite/_locales/be/messages.json +26 -2
  22. package/extensions/ublocklite/_locales/bg/messages.json +26 -2
  23. package/extensions/ublocklite/_locales/bn/messages.json +26 -2
  24. package/extensions/ublocklite/_locales/br_FR/messages.json +26 -2
  25. package/extensions/ublocklite/_locales/bs/messages.json +26 -2
  26. package/extensions/ublocklite/_locales/ca/messages.json +26 -2
  27. package/extensions/ublocklite/_locales/cs/messages.json +26 -2
  28. package/extensions/ublocklite/_locales/cv/messages.json +26 -2
  29. package/extensions/ublocklite/_locales/cy/messages.json +37 -13
  30. package/extensions/ublocklite/_locales/da/messages.json +26 -2
  31. package/extensions/ublocklite/_locales/de/messages.json +26 -2
  32. package/extensions/ublocklite/_locales/el/messages.json +29 -5
  33. package/extensions/ublocklite/_locales/en/messages.json +26 -2
  34. package/extensions/ublocklite/_locales/en_GB/messages.json +26 -2
  35. package/extensions/ublocklite/_locales/eo/messages.json +26 -2
  36. package/extensions/ublocklite/_locales/es/messages.json +26 -2
  37. package/extensions/ublocklite/_locales/et/messages.json +26 -2
  38. package/extensions/ublocklite/_locales/eu/messages.json +26 -2
  39. package/extensions/ublocklite/_locales/fa/messages.json +26 -2
  40. package/extensions/ublocklite/_locales/fi/messages.json +26 -2
  41. package/extensions/ublocklite/_locales/fil/messages.json +68 -44
  42. package/extensions/ublocklite/_locales/fr/messages.json +26 -2
  43. package/extensions/ublocklite/_locales/fy/messages.json +26 -2
  44. package/extensions/ublocklite/_locales/gl/messages.json +27 -3
  45. package/extensions/ublocklite/_locales/gu/messages.json +26 -2
  46. package/extensions/ublocklite/_locales/he/messages.json +26 -2
  47. package/extensions/ublocklite/_locales/hi/messages.json +26 -2
  48. package/extensions/ublocklite/_locales/hr/messages.json +26 -2
  49. package/extensions/ublocklite/_locales/hu/messages.json +26 -2
  50. package/extensions/ublocklite/_locales/hy/messages.json +26 -2
  51. package/extensions/ublocklite/_locales/id/messages.json +37 -13
  52. package/extensions/ublocklite/_locales/it/messages.json +26 -2
  53. package/extensions/ublocklite/_locales/ja/messages.json +26 -2
  54. package/extensions/ublocklite/_locales/ka/messages.json +26 -2
  55. package/extensions/ublocklite/_locales/kk/messages.json +26 -2
  56. package/extensions/ublocklite/_locales/kn/messages.json +26 -2
  57. package/extensions/ublocklite/_locales/ko/messages.json +26 -2
  58. package/extensions/ublocklite/_locales/lt/messages.json +26 -2
  59. package/extensions/ublocklite/_locales/lv/messages.json +26 -2
  60. package/extensions/ublocklite/_locales/mk/messages.json +26 -2
  61. package/extensions/ublocklite/_locales/ml/messages.json +26 -2
  62. package/extensions/ublocklite/_locales/mr/messages.json +26 -2
  63. package/extensions/ublocklite/_locales/ms/messages.json +26 -2
  64. package/extensions/ublocklite/_locales/nb/messages.json +26 -2
  65. package/extensions/ublocklite/_locales/nl/messages.json +26 -2
  66. package/extensions/ublocklite/_locales/oc/messages.json +26 -2
  67. package/extensions/ublocklite/_locales/pa/messages.json +26 -2
  68. package/extensions/ublocklite/_locales/pl/messages.json +26 -2
  69. package/extensions/ublocklite/_locales/pt_BR/messages.json +26 -2
  70. package/extensions/ublocklite/_locales/pt_PT/messages.json +29 -5
  71. package/extensions/ublocklite/_locales/ro/messages.json +26 -2
  72. package/extensions/ublocklite/_locales/ru/messages.json +26 -2
  73. package/extensions/ublocklite/_locales/si/messages.json +26 -2
  74. package/extensions/ublocklite/_locales/sk/messages.json +26 -2
  75. package/extensions/ublocklite/_locales/sl/messages.json +26 -2
  76. package/extensions/ublocklite/_locales/so/messages.json +26 -2
  77. package/extensions/ublocklite/_locales/sq/messages.json +26 -2
  78. package/extensions/ublocklite/_locales/sr/messages.json +26 -2
  79. package/extensions/ublocklite/_locales/sv/messages.json +26 -2
  80. package/extensions/ublocklite/_locales/sw/messages.json +26 -2
  81. package/extensions/ublocklite/_locales/ta/messages.json +26 -2
  82. package/extensions/ublocklite/_locales/te/messages.json +26 -2
  83. package/extensions/ublocklite/_locales/th/messages.json +26 -2
  84. package/extensions/ublocklite/_locales/tr/messages.json +26 -2
  85. package/extensions/ublocklite/_locales/uk/messages.json +26 -2
  86. package/extensions/ublocklite/_locales/ur/messages.json +26 -2
  87. package/extensions/ublocklite/_locales/vi/messages.json +33 -9
  88. package/extensions/ublocklite/_locales/zh_CN/messages.json +33 -9
  89. package/extensions/ublocklite/_locales/zh_TW/messages.json +26 -2
  90. package/extensions/ublocklite/css/develop.css +59 -25
  91. package/extensions/ublocklite/css/line-hor-dashed.png +0 -0
  92. package/extensions/ublocklite/dashboard.html +25 -16
  93. package/extensions/ublocklite/js/admin.js +7 -8
  94. package/extensions/ublocklite/js/background.js +38 -19
  95. package/extensions/ublocklite/js/dashboard.js +3 -3
  96. package/extensions/ublocklite/js/develop.js +533 -798
  97. package/extensions/ublocklite/js/dnr-editor.js +180 -0
  98. package/extensions/ublocklite/js/dnr-parser.js +30 -10
  99. package/extensions/ublocklite/js/i18n.js +5 -0
  100. package/extensions/ublocklite/js/mode-editor.js +87 -0
  101. package/extensions/ublocklite/js/mode-manager.js +11 -48
  102. package/extensions/ublocklite/js/mode-parser.js +211 -0
  103. package/extensions/ublocklite/js/ro-dnr-editor.js +95 -0
  104. package/extensions/ublocklite/js/ruleset-manager.js +42 -16
  105. package/extensions/ublocklite/js/rw-dnr-editor.js +391 -0
  106. package/extensions/ublocklite/js/settings.js +7 -71
  107. package/extensions/ublocklite/lib/codemirror/cm6.bundle.ubol.min.js +1 -1
  108. package/extensions/ublocklite/lib/codemirror/codemirror.LICENSE +21 -0
  109. package/extensions/ublocklite/manifest.json +1 -1
  110. package/extensions/ublocklite/rulesets/generic-details.json +3 -24
  111. package/extensions/ublocklite/rulesets/main/adguard-mobile.json +7 -18
  112. package/extensions/ublocklite/rulesets/main/annoyances-cookies.json +12 -6
  113. package/extensions/ublocklite/rulesets/main/annoyances-others.json +4 -2
  114. package/extensions/ublocklite/rulesets/main/annoyances-overlays.json +2 -1
  115. package/extensions/ublocklite/rulesets/main/annoyances-social.json +4 -2
  116. package/extensions/ublocklite/rulesets/main/block-lan.json +6 -0
  117. package/extensions/ublocklite/rulesets/main/chn-0.json +26 -64
  118. package/extensions/ublocklite/rulesets/main/cze-0.json +2 -1
  119. package/extensions/ublocklite/rulesets/main/deu-0.json +3 -1
  120. package/extensions/ublocklite/rulesets/main/dpollock-0.json +2 -0
  121. package/extensions/ublocklite/rulesets/main/easylist.json +23 -9
  122. package/extensions/ublocklite/rulesets/main/easyprivacy.json +40 -11
  123. package/extensions/ublocklite/rulesets/main/fin-0.json +11 -2
  124. package/extensions/ublocklite/rulesets/main/fra-0.json +22 -41
  125. package/extensions/ublocklite/rulesets/main/grc-0.json +1 -1
  126. package/extensions/ublocklite/rulesets/main/hun-0.json +9 -2
  127. package/extensions/ublocklite/rulesets/main/idn-0.json +8 -38
  128. package/extensions/ublocklite/rulesets/main/ind-0.json +35 -6
  129. package/extensions/ublocklite/rulesets/main/irn-0.json +1 -0
  130. package/extensions/ublocklite/rulesets/main/isr-0.json +11 -1
  131. package/extensions/ublocklite/rulesets/main/ita-0.json +1 -1
  132. package/extensions/ublocklite/rulesets/main/jpn-1.json +24 -18
  133. package/extensions/ublocklite/rulesets/main/kor-1.json +6 -4
  134. package/extensions/ublocklite/rulesets/main/nld-0.json +3 -2
  135. package/extensions/ublocklite/rulesets/main/nor-0.json +8 -2
  136. package/extensions/ublocklite/rulesets/main/pgl.json +10 -7
  137. package/extensions/ublocklite/rulesets/main/pol-0.json +5 -0
  138. package/extensions/ublocklite/rulesets/main/rus-0.json +30 -28
  139. package/extensions/ublocklite/rulesets/main/spa-1.json +18 -61
  140. package/extensions/ublocklite/rulesets/main/stevenblack-hosts.json +7223 -999
  141. package/extensions/ublocklite/rulesets/main/swe-1.json +40 -28
  142. package/extensions/ublocklite/rulesets/main/tur-0.json +17 -38
  143. package/extensions/ublocklite/rulesets/main/ublock-badware.json +28 -63
  144. package/extensions/ublocklite/rulesets/main/ublock-filters.json +173 -28
  145. package/extensions/ublocklite/rulesets/main/ukr-0.json +8 -26
  146. package/extensions/ublocklite/rulesets/main/urlhaus-full.json +339 -766
  147. package/extensions/ublocklite/rulesets/main/vie-1.json +33 -30
  148. package/extensions/ublocklite/rulesets/modify-headers/chn-0.json +4 -1
  149. package/extensions/ublocklite/rulesets/modify-headers/fra-0.json +0 -3
  150. package/extensions/ublocklite/rulesets/modify-headers/rus-0.json +2 -1
  151. package/extensions/ublocklite/rulesets/modify-headers/ublock-filters.json +1 -1
  152. package/extensions/ublocklite/rulesets/redirect/adguard-mobile.json +1 -1
  153. package/extensions/ublocklite/rulesets/redirect/annoyances-overlays.json +1 -0
  154. package/extensions/ublocklite/rulesets/redirect/spa-1.json +3 -4
  155. package/extensions/ublocklite/rulesets/redirect/swe-1.json +2 -1
  156. package/extensions/ublocklite/rulesets/redirect/tur-0.json +1 -1
  157. package/extensions/ublocklite/rulesets/redirect/ublock-filters.json +15 -5
  158. package/extensions/ublocklite/rulesets/redirect/vie-1.json +2 -2
  159. package/extensions/ublocklite/rulesets/regex/adguard-mobile.json +13 -0
  160. package/extensions/ublocklite/rulesets/regex/chn-0.json +2 -3
  161. package/extensions/ublocklite/rulesets/regex/jpn-1.json +1 -1
  162. package/extensions/ublocklite/rulesets/regex/kor-1.json +1 -0
  163. package/extensions/ublocklite/rulesets/regex/nor-0.json +10 -0
  164. package/extensions/ublocklite/rulesets/regex/spa-0.json +0 -1
  165. package/extensions/ublocklite/rulesets/regex/spa-1.json +0 -13
  166. package/extensions/ublocklite/rulesets/regex/ublock-badware.json +5 -6
  167. package/extensions/ublocklite/rulesets/regex/ublock-filters.json +14 -6
  168. package/extensions/ublocklite/rulesets/regex/ukr-0.json +2 -2
  169. package/extensions/ublocklite/rulesets/removeparam/adguard-spyware-url.json +10 -5
  170. package/extensions/ublocklite/rulesets/removeparam/rus-0.json +1 -1
  171. package/extensions/ublocklite/rulesets/removeparam/rus-1.json +3 -2
  172. package/extensions/ublocklite/rulesets/ruleset-details.json +246 -246
  173. package/extensions/ublocklite/rulesets/scripting/declarative/adguard-mobile.js +3 -3
  174. package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-cookies.js +1 -1
  175. package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-others.js +3 -3
  176. package/extensions/ublocklite/rulesets/scripting/declarative/annoyances-overlays.js +1 -1
  177. package/extensions/ublocklite/rulesets/scripting/declarative/chn-0.js +3 -3
  178. package/extensions/ublocklite/rulesets/scripting/declarative/easylist.js +3 -3
  179. package/extensions/ublocklite/rulesets/scripting/declarative/fin-0.js +3 -3
  180. package/extensions/ublocklite/rulesets/scripting/declarative/fra-0.js +3 -3
  181. package/extensions/ublocklite/rulesets/scripting/declarative/idn-0.js +3 -3
  182. package/extensions/ublocklite/rulesets/scripting/declarative/jpn-1.js +3 -3
  183. package/extensions/ublocklite/rulesets/scripting/declarative/kor-1.js +3 -3
  184. package/extensions/ublocklite/rulesets/scripting/declarative/rus-0.js +3 -3
  185. package/extensions/ublocklite/rulesets/scripting/declarative/spa-1.js +3 -3
  186. package/extensions/ublocklite/rulesets/scripting/declarative/swe-1.js +3 -3
  187. package/extensions/ublocklite/rulesets/scripting/declarative/tur-0.js +3 -3
  188. package/extensions/ublocklite/rulesets/scripting/declarative/ublock-filters.js +3 -3
  189. package/extensions/ublocklite/rulesets/scripting/declarative/ukr-0.js +3 -3
  190. package/extensions/ublocklite/rulesets/scripting/declarative/vie-1.js +1 -1
  191. package/extensions/ublocklite/rulesets/scripting/generic/annoyances-cookies.js +3 -3
  192. package/extensions/ublocklite/rulesets/scripting/generic/annoyances-social.js +3 -3
  193. package/extensions/ublocklite/rulesets/scripting/generic/chn-0.js +3 -3
  194. package/extensions/ublocklite/rulesets/scripting/generic/easylist.js +3 -3
  195. package/extensions/ublocklite/rulesets/scripting/generic/fin-0.js +2 -2
  196. package/extensions/ublocklite/rulesets/scripting/generic/fra-0.js +2 -2
  197. package/extensions/ublocklite/rulesets/scripting/generic/hrv-0.js +1 -1
  198. package/extensions/ublocklite/rulesets/scripting/generic/idn-0.js +2 -2
  199. package/extensions/ublocklite/rulesets/scripting/generic/ind-0.js +2 -2
  200. package/extensions/ublocklite/rulesets/scripting/generic/jpn-1.js +3 -3
  201. package/extensions/ublocklite/rulesets/scripting/generic/nor-0.js +1 -1
  202. package/extensions/ublocklite/rulesets/scripting/generic/rus-0.js +2 -2
  203. package/extensions/ublocklite/rulesets/scripting/generic/spa-1.js +2 -2
  204. package/extensions/ublocklite/rulesets/scripting/generic/tur-0.js +2 -2
  205. package/extensions/ublocklite/rulesets/scripting/generic/ublock-filters.js +3 -3
  206. package/extensions/ublocklite/rulesets/scripting/generic/ukr-0.js +3 -3
  207. package/extensions/ublocklite/rulesets/scripting/generichigh/annoyances-cookies.css +0 -1
  208. package/extensions/ublocklite/rulesets/scripting/generichigh/annoyances-social.css +0 -1
  209. package/extensions/ublocklite/rulesets/scripting/generichigh/chn-0.css +0 -4
  210. package/extensions/ublocklite/rulesets/scripting/generichigh/cze-0.css +0 -1
  211. package/extensions/ublocklite/rulesets/scripting/generichigh/easylist.css +5 -9
  212. package/extensions/ublocklite/rulesets/scripting/generichigh/idn-0.css +11 -0
  213. package/extensions/ublocklite/rulesets/scripting/generichigh/kor-1.css +0 -2
  214. package/extensions/ublocklite/rulesets/scripting/procedural/adguard-mobile.js +3 -3
  215. package/extensions/ublocklite/rulesets/scripting/procedural/annoyances-cookies.js +1 -1
  216. package/extensions/ublocklite/rulesets/scripting/procedural/annoyances-overlays.js +3 -3
  217. package/extensions/ublocklite/rulesets/scripting/procedural/chn-0.js +2 -2
  218. package/extensions/ublocklite/rulesets/scripting/procedural/deu-0.js +3 -3
  219. package/extensions/ublocklite/rulesets/scripting/procedural/easylist.js +3 -3
  220. package/extensions/ublocklite/rulesets/scripting/procedural/fin-0.js +3 -3
  221. package/extensions/ublocklite/rulesets/scripting/procedural/fra-0.js +3 -3
  222. package/extensions/ublocklite/rulesets/scripting/procedural/jpn-1.js +3 -3
  223. package/extensions/ublocklite/rulesets/scripting/procedural/kor-1.js +3 -3
  224. package/extensions/ublocklite/rulesets/scripting/procedural/nor-0.js +3 -3
  225. package/extensions/ublocklite/rulesets/scripting/procedural/rou-1.js +3 -3
  226. package/extensions/ublocklite/rulesets/scripting/procedural/rus-0.js +3 -3
  227. package/extensions/ublocklite/rulesets/scripting/procedural/rus-1.js +1 -1
  228. package/extensions/ublocklite/rulesets/scripting/procedural/spa-0.js +3 -3
  229. package/extensions/ublocklite/rulesets/scripting/procedural/spa-1.js +3 -3
  230. package/extensions/ublocklite/rulesets/scripting/procedural/swe-1.js +3 -3
  231. package/extensions/ublocklite/rulesets/scripting/procedural/ublock-filters.js +3 -3
  232. package/extensions/ublocklite/rulesets/scripting/procedural/ukr-0.js +3 -3
  233. package/extensions/ublocklite/rulesets/scripting/scriptlet/adguard-mobile.abort-current-script.js +2 -2
  234. package/extensions/ublocklite/rulesets/scripting/scriptlet/adguard-mobile.set-cookie-reload.js +11 -2
  235. package/extensions/ublocklite/rulesets/scripting/scriptlet/adguard-mobile.set-cookie.js +10 -1
  236. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.set-cookie.js +12 -3
  237. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.set-local-storage-item.js +2 -2
  238. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-click-element.js +2 -2
  239. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-cookie-reload.js +10 -1
  240. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-cookie.js +12 -3
  241. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-cookies.trusted-set-local-storage-item.js +2 -2
  242. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-others.remove-cookie.js +17 -7
  243. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-others.set-cookie.js +10 -1
  244. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-current-script.js +1 -1
  245. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.abort-on-property-read.js +1 -1
  246. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.addEventListener-defuser.js +2 -2
  247. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.remove-attr.js +2 -2
  248. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.remove-class.js +1 -1
  249. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.remove-cookie.js +17 -7
  250. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.remove-node-text.js +2 -2
  251. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.set-constant.js +1 -1
  252. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.set-cookie.js +12 -3
  253. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.set-local-storage-item.js +2 -2
  254. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.trusted-set-cookie.js +10 -1
  255. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-overlays.trusted-set-local-storage-item.js +2 -2
  256. package/extensions/ublocklite/rulesets/scripting/scriptlet/annoyances-social.set-cookie.js +10 -1
  257. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.abort-current-script.js +2 -2
  258. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.abort-on-property-read.js +2 -2
  259. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.evaldata-prune.js +1 -1
  260. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.json-prune.js +3 -3
  261. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.prevent-setTimeout.js +1 -1
  262. package/extensions/ublocklite/rulesets/scripting/scriptlet/chn-0.set-constant.js +1 -1
  263. package/extensions/ublocklite/rulesets/scripting/scriptlet/cze-0.json-prune-xhr-response.js +597 -0
  264. package/extensions/ublocklite/rulesets/scripting/scriptlet/cze-0.remove-cookie.js +17 -7
  265. package/extensions/ublocklite/rulesets/scripting/scriptlet/easyprivacy.set-cookie.js +10 -1
  266. package/extensions/ublocklite/rulesets/scripting/scriptlet/fin-0.set-cookie.js +10 -1
  267. package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.abort-on-property-read.js +2 -2
  268. package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.adjust-setTimeout.js +2 -2
  269. package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.prevent-fetch.js +2 -2
  270. package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.set-constant.js +1 -1
  271. package/extensions/ublocklite/rulesets/scripting/scriptlet/fra-0.set-cookie.js +10 -1
  272. package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.prevent-fetch.js +2 -2
  273. package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.remove-cookie.js +17 -7
  274. package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.set-constant.js +1 -1
  275. package/extensions/ublocklite/rulesets/scripting/scriptlet/hun-0.set-cookie.js +10 -1
  276. package/extensions/ublocklite/rulesets/scripting/scriptlet/irn-0.remove-cookie.js +17 -7
  277. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.abort-current-script.js +2 -2
  278. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.addEventListener-defuser.js +1 -1
  279. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.adjust-setTimeout.js +1 -1
  280. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.prevent-fetch.js +1 -1
  281. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.prevent-setTimeout.js +2 -2
  282. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.prevent-window-open.js +1 -1
  283. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.remove-node-text.js +1 -1
  284. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.set-constant.js +2 -2
  285. package/extensions/ublocklite/rulesets/scripting/scriptlet/jpn-1.set-cookie-reload.js +10 -1
  286. package/extensions/ublocklite/rulesets/scripting/scriptlet/kor-1.prevent-setTimeout.js +2 -2
  287. package/extensions/ublocklite/rulesets/scripting/scriptlet/kor-1.set-constant.js +2 -2
  288. package/extensions/ublocklite/rulesets/scripting/scriptlet/kor-1.set-cookie.js +10 -1
  289. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.abort-on-stack-trace.js +1 -1
  290. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.addEventListener-defuser.js +1 -1
  291. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.href-sanitizer.js +1 -1
  292. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.prevent-setTimeout.js +1 -1
  293. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.prevent-xhr.js +1 -1
  294. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.remove-cookie.js +19 -9
  295. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.remove-node-text.js +1 -1
  296. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.set-constant.js +3 -3
  297. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.set-cookie-reload.js +11 -2
  298. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-0.set-cookie.js +10 -1
  299. package/extensions/ublocklite/rulesets/scripting/scriptlet/rus-1.remove-cookie.js +17 -7
  300. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.abort-current-script.js +2 -2
  301. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.abort-on-property-read.js +2 -2
  302. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.abort-on-stack-trace.js +1 -1
  303. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.addEventListener-defuser.js +2 -2
  304. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.adjust-setInterval.js +2 -2
  305. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.adjust-setTimeout.js +2 -2
  306. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.prevent-fetch.js +2 -2
  307. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.prevent-setTimeout.js +1 -1
  308. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.prevent-window-open.js +2 -2
  309. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.prevent-xhr.js +1 -1
  310. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.remove-attr.js +2 -2
  311. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.remove-class.js +2 -2
  312. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.set-constant.js +2 -2
  313. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.set-cookie-reload.js +10 -1
  314. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.set-cookie.js +12 -3
  315. package/extensions/ublocklite/rulesets/scripting/scriptlet/spa-1.set-local-storage-item.js +1 -1
  316. package/extensions/ublocklite/rulesets/scripting/scriptlet/swe-1.remove-cookie.js +17 -7
  317. package/extensions/ublocklite/rulesets/scripting/scriptlet/swe-1.set-cookie.js +10 -1
  318. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.abort-current-script.js +2 -2
  319. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.abort-on-property-read.js +2 -2
  320. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.addEventListener-defuser.js +1 -1
  321. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.adjust-setInterval.js +2 -2
  322. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.prevent-setTimeout.js +2 -2
  323. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.prevent-window-open.js +1 -1
  324. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.remove-attr.js +2 -2
  325. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.set-constant.js +2 -2
  326. package/extensions/ublocklite/rulesets/scripting/scriptlet/tur-0.set-cookie.js +10 -1
  327. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-badware.abort-current-script.js +2 -2
  328. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.abort-current-script.js +3 -3
  329. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.abort-on-property-read.js +2 -2
  330. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.abort-on-property-write.js +1 -1
  331. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.abort-on-stack-trace.js +2 -2
  332. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.addEventListener-defuser.js +3 -3
  333. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.adjust-setInterval.js +3 -3
  334. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.adjust-setTimeout.js +2 -2
  335. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.json-edit.js +30 -7
  336. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.json-prune-xhr-response.js +3 -3
  337. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.json-prune.js +3 -3
  338. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.jsonl-edit-xhr-response.js +19 -2
  339. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.noeval-if.js +3 -3
  340. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.prevent-fetch.js +1 -1
  341. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.prevent-refresh.js +1 -1
  342. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.prevent-setTimeout.js +2 -2
  343. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.prevent-window-open.js +2 -2
  344. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.prevent-xhr.js +3 -3
  345. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.remove-attr.js +2 -2
  346. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.remove-cookie.js +19 -9
  347. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.remove-node-text.js +3 -3
  348. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.set-constant.js +3 -3
  349. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.set-cookie.js +12 -3
  350. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.set-local-storage-item.js +2 -2
  351. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-replace-argument.js +2 -2
  352. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-replace-node-text.js +3 -3
  353. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-replace-outbound-text.js +2 -2
  354. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-set-constant.js +2 -2
  355. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-set-cookie-reload.js +10 -1
  356. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-set-cookie.js +13 -4
  357. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-set-local-storage-item.js +399 -0
  358. package/extensions/ublocklite/rulesets/scripting/scriptlet/ublock-filters.trusted-suppress-native-method.js +2 -2
  359. package/extensions/ublocklite/rulesets/scripting/scriptlet/ubol-tests.jsonl-edit-fetch-response.js +19 -2
  360. package/extensions/ublocklite/rulesets/scripting/scriptlet/ubol-tests.jsonl-edit-xhr-response.js +19 -2
  361. package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.abort-current-script.js +2 -2
  362. package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.abort-on-property-read.js +1 -1
  363. package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.abort-on-property-write.js +1 -1
  364. package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.remove-class.js +1 -1
  365. package/extensions/ublocklite/rulesets/scripting/scriptlet/ukr-0.set-constant.js +2 -2
  366. package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-current-script.js +1 -1
  367. package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.abort-on-property-read.js +2 -2
  368. package/extensions/ublocklite/rulesets/scripting/scriptlet/vie-1.set-constant.js +2 -2
  369. package/extensions/ublocklite/rulesets/scripting/specific/adguard-mobile.js +3 -3
  370. package/extensions/ublocklite/rulesets/scripting/specific/annoyances-cookies.js +3 -3
  371. package/extensions/ublocklite/rulesets/scripting/specific/annoyances-others.js +3 -3
  372. package/extensions/ublocklite/rulesets/scripting/specific/annoyances-overlays.js +3 -3
  373. package/extensions/ublocklite/rulesets/scripting/specific/annoyances-social.js +3 -3
  374. package/extensions/ublocklite/rulesets/scripting/specific/chn-0.js +3 -3
  375. package/extensions/ublocklite/rulesets/scripting/specific/deu-0.js +3 -3
  376. package/extensions/ublocklite/rulesets/scripting/specific/easylist.js +3 -3
  377. package/extensions/ublocklite/rulesets/scripting/specific/fin-0.js +3 -3
  378. package/extensions/ublocklite/rulesets/scripting/specific/fra-0.js +3 -3
  379. package/extensions/ublocklite/rulesets/scripting/specific/grc-0.js +3 -3
  380. package/extensions/ublocklite/rulesets/scripting/specific/hun-0.js +3 -3
  381. package/extensions/ublocklite/rulesets/scripting/specific/idn-0.js +3 -3
  382. package/extensions/ublocklite/rulesets/scripting/specific/ind-0.js +3 -3
  383. package/extensions/ublocklite/rulesets/scripting/specific/isr-0.js +1 -1
  384. package/extensions/ublocklite/rulesets/scripting/specific/ita-0.js +3 -3
  385. package/extensions/ublocklite/rulesets/scripting/specific/jpn-1.js +3 -3
  386. package/extensions/ublocklite/rulesets/scripting/specific/kor-1.js +3 -3
  387. package/extensions/ublocklite/rulesets/scripting/specific/ltu-0.js +3 -3
  388. package/extensions/ublocklite/rulesets/scripting/specific/nld-0.js +3 -3
  389. package/extensions/ublocklite/rulesets/scripting/specific/nor-0.js +3 -3
  390. package/extensions/ublocklite/rulesets/scripting/specific/rou-1.js +3 -3
  391. package/extensions/ublocklite/rulesets/scripting/specific/rus-0.js +3 -3
  392. package/extensions/ublocklite/rulesets/scripting/specific/spa-0.js +3 -3
  393. package/extensions/ublocklite/rulesets/scripting/specific/spa-1.js +3 -3
  394. package/extensions/ublocklite/rulesets/scripting/specific/swe-1.js +3 -3
  395. package/extensions/ublocklite/rulesets/scripting/specific/tur-0.js +3 -3
  396. package/extensions/ublocklite/rulesets/scripting/specific/ublock-badware.js +3 -3
  397. package/extensions/ublocklite/rulesets/scripting/specific/ublock-filters.js +3 -3
  398. package/extensions/ublocklite/rulesets/scripting/specific/ukr-0.js +3 -3
  399. package/extensions/ublocklite/rulesets/scripting/specific/vie-1.js +3 -3
  400. package/extensions/ublocklite/rulesets/scriptlet-details.json +157 -153
  401. package/extensions/ublocklite/rulesets/strictblock/adguard-mobile.json +1 -34
  402. package/extensions/ublocklite/rulesets/strictblock/chn-0.json +198 -248
  403. package/extensions/ublocklite/rulesets/strictblock/dpollock-0.json +2 -0
  404. package/extensions/ublocklite/rulesets/strictblock/easylist.json +3 -2
  405. package/extensions/ublocklite/rulesets/strictblock/easyprivacy.json +37 -1
  406. package/extensions/ublocklite/rulesets/strictblock/fra-0.json +304 -62
  407. package/extensions/ublocklite/rulesets/strictblock/grc-0.json +1 -7
  408. package/extensions/ublocklite/rulesets/strictblock/idn-0.json +1 -0
  409. package/extensions/ublocklite/rulesets/strictblock/ita-0.json +1 -0
  410. package/extensions/ublocklite/rulesets/strictblock/jpn-1.json +159 -155
  411. package/extensions/ublocklite/rulesets/strictblock/kor-1.json +1 -0
  412. package/extensions/ublocklite/rulesets/strictblock/nor-0.json +1 -1
  413. package/extensions/ublocklite/rulesets/strictblock/pgl.json +10 -7
  414. package/extensions/ublocklite/rulesets/strictblock/spa-1.json +0 -11
  415. package/extensions/ublocklite/rulesets/strictblock/stevenblack-hosts.json +7223 -999
  416. package/extensions/ublocklite/rulesets/strictblock/tur-0.json +0 -13
  417. package/extensions/ublocklite/rulesets/strictblock/ublock-badware.json +569 -570
  418. package/extensions/ublocklite/rulesets/strictblock/ublock-filters.json +1 -1
  419. package/extensions/ublocklite/rulesets/strictblock/ukr-0.json +0 -75
  420. package/extensions/ublocklite/rulesets/strictblock/urlhaus-full.json +339 -766
  421. package/extensions/ublocklite/rulesets/strictblock/vie-1.json +3 -2
  422. package/extensions/ublocklite/rulesets/urlskip/ublock-filters.json +13 -0
  423. package/extensions/ublocklite/ublock.zip +0 -0
  424. package/package.json +24 -19
  425. package/src/routes/management/tests/management.spec.ts +25 -0
  426. package/src/server.ts +4 -5
  427. package/src/shared/utils/enjoi-resolver.ts +565 -0
  428. package/static/docs/swagger.json +9 -9
  429. package/static/docs/swagger.min.json +9 -9
  430. package/static/function/client.js +86 -39
  431. package/static/function/index.html +86 -39
  432. /package/extensions/ublocklite/lib/codemirror/{LICENSE → codemirror-quickstart.LICENSE} +0 -0
@@ -0,0 +1,95 @@
1
+ /*******************************************************************************
2
+
3
+ uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
4
+ Copyright (C) 2014-present Raymond Hill
5
+
6
+ This program is free software: you can redistribute it and/or modify
7
+ it under the terms of the GNU General Public License as published by
8
+ the Free Software Foundation, either version 3 of the License, or
9
+ (at your option) any later version.
10
+
11
+ This program is distributed in the hope that it will be useful,
12
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ GNU General Public License for more details.
15
+
16
+ You should have received a copy of the GNU General Public License
17
+ along with this program. If not, see {http://www.gnu.org/licenses/}.
18
+
19
+ Home: https://github.com/gorhill/uBlock
20
+ */
21
+
22
+ import { DNREditor } from './dnr-editor.js';
23
+ import { i18n$ } from './i18n.js';
24
+ import { sendMessage } from './ext.js';
25
+ import { textFromRules } from './dnr-parser.js';
26
+
27
+ /******************************************************************************/
28
+
29
+ export class ReadOnlyDNREditor extends DNREditor {
30
+ async getText(hint) {
31
+ if ( hint === 'dnr.ro.dynamic' ) {
32
+ const rules = await sendMessage({ what: 'getEffectiveDynamicRules' });
33
+ if ( Array.isArray(rules) === false ) { return; }
34
+ this.id = 'dynamic';
35
+ this.count = rules.length;
36
+ return textFromRules(rules, { keepId: true });
37
+ }
38
+ if ( hint === 'dnr.ro.session' ) {
39
+ const rules = await sendMessage({ what: 'getEffectiveSessionRules' });
40
+ if ( Array.isArray(rules) === false ) { return; }
41
+ this.id = 'session';
42
+ this.count = rules.length;
43
+ return textFromRules(rules, { keepId: true });
44
+ }
45
+ const match = /^dnr\.ro\.(.+)$/.exec(hint);
46
+ if ( match === null ) { return; }
47
+ this.id = match[1];
48
+ const allRulesetDetails = await sendMessage({ what: 'getRulesetDetails' });
49
+ const rulesetDetails = allRulesetDetails.find(a => a.id === this.id);
50
+ if ( rulesetDetails === undefined ) { return; }
51
+ const realms = {
52
+ plain: 'main',
53
+ regex: 'regex',
54
+ redirect: 'redirect',
55
+ modifyHeaders: 'modify-headers',
56
+ removeparam: 'removeparam',
57
+ };
58
+ const promises = [];
59
+ for ( const [ realm, dir ] of Object.entries(realms) ) {
60
+ if ( Boolean(rulesetDetails.rules?.[realm]) === false ) { continue; }
61
+ promises.push(
62
+ fetch(`./rulesets/${dir}/${this.id}.json`).then(response => response.json())
63
+ );
64
+ }
65
+ const parts = await Promise.all(promises);
66
+ const allRules = [];
67
+ for ( const rules of parts ) {
68
+ for ( const rule of rules ) {
69
+ allRules.push(rule);
70
+ }
71
+ }
72
+ this.count = allRules.length;
73
+ return textFromRules(allRules, { keepId: true });
74
+ }
75
+
76
+ on(editor) {
77
+ if ( typeof this.count !== 'number' ) {
78
+ return editor.updateSummaryPanel(null);
79
+ }
80
+ const template = document.querySelector('template.ro-summary-panel');
81
+ const fragment = template.content.cloneNode(true);
82
+ const root = fragment.querySelector('.summary-panel');
83
+ root.textContent = i18n$('dnrRulesCountInfo')
84
+ .replace('{count}', (this.count || 0).toLocaleString())
85
+ editor.updateSummaryPanel(root);
86
+ }
87
+
88
+ off(editor) {
89
+ editor.updateSummaryPanel(null);
90
+ }
91
+
92
+ exportToFile(text) {
93
+ return super.exportToFile(text, `${this.id}-dnr-ruleset.json`);
94
+ }
95
+ };
@@ -306,19 +306,30 @@ async function updateDynamicRules() {
306
306
  if ( dynamicRegexCount !== 0 ) {
307
307
  ubolLog(`Using ${dynamicRegexCount}/${dnr.MAX_NUMBER_OF_REGEX_RULES} dynamic regex-based DNR rules`);
308
308
  }
309
- return Promise.all([
310
- dnr.updateDynamicRules({ addRules, removeRuleIds }).then(( ) => {
311
- if ( removeRuleIds.length !== 0 ) {
312
- ubolLog(`Remove ${removeRuleIds.length} dynamic DNR rules`);
313
- }
314
- if ( addRules.length !== 0 ) {
315
- ubolLog(`Add ${addRules.length} dynamic DNR rules`);
316
- }
317
- }).catch(reason => {
318
- console.error(`updateDynamicRules() / ${reason}`);
319
- }),
320
- updateSessionRules(),
321
- ]);
309
+ try {
310
+ await dnr.updateDynamicRules({ addRules, removeRuleIds });
311
+ if ( removeRuleIds.length !== 0 ) {
312
+ ubolLog(`Remove ${removeRuleIds.length} dynamic DNR rules`);
313
+ }
314
+ if ( addRules.length !== 0 ) {
315
+ ubolLog(`Add ${addRules.length} dynamic DNR rules`);
316
+ }
317
+ } catch(reason) {
318
+ console.error(`updateDynamicRules() / ${reason}`);
319
+ }
320
+ await updateSessionRules();
321
+ }
322
+
323
+ /******************************************************************************/
324
+
325
+ async function getEffectiveDynamicRules() {
326
+ const allRules = await dnr.getDynamicRules();
327
+ const dynamicRules = [];
328
+ for ( const rule of allRules ) {
329
+ if ( rule.id >= USER_RULES_BASE_RULE_ID ) { continue; }
330
+ dynamicRules.push(rule);
331
+ }
332
+ return dynamicRules;
322
333
  }
323
334
 
324
335
  /******************************************************************************/
@@ -441,16 +452,29 @@ async function updateSessionRules() {
441
452
  if ( sessionRegexCount !== 0 ) {
442
453
  ubolLog(`Using ${sessionRegexCount}/${dnr.MAX_NUMBER_OF_REGEX_RULES} session regex-based DNR rules`);
443
454
  }
444
- return dnr.updateSessionRules({ addRules, removeRuleIds }).then(( ) => {
455
+ try {
456
+ await dnr.updateSessionRules({ addRules, removeRuleIds });
445
457
  if ( removeRuleIds.length !== 0 ) {
446
458
  ubolLog(`Remove ${removeRuleIds.length} session DNR rules`);
447
459
  }
448
460
  if ( addRules.length !== 0 ) {
449
461
  ubolLog(`Add ${addRules.length} session DNR rules`);
450
462
  }
451
- }).catch(reason => {
463
+ } catch(reason) {
452
464
  console.error(`updateSessionRules() / ${reason}`);
453
- });
465
+ }
466
+ }
467
+
468
+ /******************************************************************************/
469
+
470
+ async function getEffectiveSessionRules() {
471
+ const allRules = await dnr.getSessionRules();
472
+ const sessionRules = [];
473
+ for ( const rule of allRules ) {
474
+ if ( rule.id >= USER_RULES_BASE_RULE_ID ) { continue; }
475
+ sessionRules.push(rule);
476
+ }
477
+ return sessionRules;
454
478
  }
455
479
 
456
480
  /******************************************************************************/
@@ -751,6 +775,8 @@ export {
751
775
  enableRulesets,
752
776
  excludeFromStrictBlock,
753
777
  filteringModesToDNR,
778
+ getEffectiveDynamicRules,
779
+ getEffectiveSessionRules,
754
780
  getEffectiveUserRules,
755
781
  getEnabledRulesetsDetails,
756
782
  getRulesetDetails,
@@ -0,0 +1,391 @@
1
+ /*******************************************************************************
2
+
3
+ uBlock Origin Lite - a comprehensive, MV3-compliant content blocker
4
+ Copyright (C) 2014-present Raymond Hill
5
+
6
+ This program is free software: you can redistribute it and/or modify
7
+ it under the terms of the GNU General Public License as published by
8
+ the Free Software Foundation, either version 3 of the License, or
9
+ (at your option) any later version.
10
+
11
+ This program is distributed in the hope that it will be useful,
12
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
+ GNU General Public License for more details.
15
+
16
+ You should have received a copy of the GNU General Public License
17
+ along with this program. If not, see {http://www.gnu.org/licenses/}.
18
+
19
+ Home: https://github.com/gorhill/uBlock
20
+ */
21
+
22
+ import {
23
+ browser,
24
+ localRead,
25
+ localRemove,
26
+ localWrite,
27
+ sendMessage,
28
+ } from './ext.js';
29
+ import { dom, qs$ } from './dom.js';
30
+ import { i18n, i18n$ } from './i18n.js';
31
+ import { DNREditor } from './dnr-editor.js';
32
+ import { textFromRules } from './dnr-parser.js';
33
+
34
+ /******************************************************************************/
35
+
36
+ export class ReadWriteDNREditor extends DNREditor {
37
+ constructor(editor) {
38
+ super();
39
+ this.feedbackPanel = self.cm6.createViewPanel();
40
+ editor.panels.push(this.feedbackPanel);
41
+ }
42
+
43
+ async getText() {
44
+ return localRead('userDnrRules');
45
+ }
46
+
47
+ on(editor) {
48
+ localRead('userDnrRuleCount').then(userDnrRuleCount => {
49
+ this.updateSummaryPanel(editor, { userDnrRuleCount })
50
+ });
51
+ browser.storage.onChanged.addListener((changes, area) => {
52
+ if ( area !== 'local' ) { return; }
53
+ const { userDnrRuleCount } = changes;
54
+ if ( userDnrRuleCount instanceof Object === false ) { return; }
55
+ const { newValue } = changes.userDnrRuleCount;
56
+ this.updateSummaryPanel(editor, { userDnrRuleCount: newValue });
57
+ });
58
+ }
59
+
60
+ off(editor) {
61
+ this.updateSummaryPanel(editor, null);
62
+ this.updateFeedbackPanel(editor, null);
63
+ }
64
+
65
+ rulesFromJSON(json) {
66
+ let content = json.trim();
67
+ if ( /^[[{]/.test(content) === false ) {
68
+ const match = /^[^[{]+/.exec(content);
69
+ if ( match === null ) { return; }
70
+ content = content.slice(match[0].length);
71
+ }
72
+ const firstChar = content.charAt(0);
73
+ const expectedLastChar = firstChar === '[' ? ']' : '}';
74
+ if ( content.at(-1) !== expectedLastChar ) {
75
+ const re = new RegExp(`\\${expectedLastChar}[^\\${expectedLastChar}]+$`);
76
+ const match = re.exec(content);
77
+ if ( match === null ) { return; }
78
+ content = content.slice(0, match.index+1);
79
+ }
80
+ if ( content.startsWith('{') && content.endsWith('}') ) {
81
+ content = `[${content}]`;
82
+ }
83
+ try {
84
+ const rules = JSON.parse(content);
85
+ if ( Array.isArray(rules) ) { return rules; }
86
+ }
87
+ catch {
88
+ }
89
+ }
90
+
91
+ getAutocompleteCandidates(editor, from) {
92
+ const { scope } = editor.getScopeAt(from);
93
+ switch ( scope ) {
94
+ case '':
95
+ return {
96
+ before: /^$/,
97
+ candidates: [
98
+ { token: 'action:', after: '\n' },
99
+ { token: 'condition:', after: '\n ' },
100
+ { token: 'priority:', after: ' ' },
101
+ { token: '---', after: '\n' },
102
+ ]
103
+ };
104
+ case 'action:':
105
+ return {
106
+ before: /^ {2}$/,
107
+ candidates: [
108
+ { token: 'type:', after: ' ' },
109
+ { token: 'redirect:', after: '\n ' },
110
+ { token: 'requestHeaders:', after: '\n - header: ' },
111
+ { token: 'responseHeaders:', after: '\n - header: ' },
112
+ ],
113
+ };
114
+ case 'action:type:':
115
+ return {
116
+ before: /: $/,
117
+ candidates: [
118
+ { token: 'block', after: '\n ' },
119
+ { token: 'redirect', after: '\n ' },
120
+ { token: 'allow', after: '\n ' },
121
+ { token: 'modifyHeaders', after: '\n ' },
122
+ { token: 'upgradeScheme', after: '\n ' },
123
+ { token: 'allowAllRequest', after: '\n ' },
124
+ ],
125
+ };
126
+ case 'action:redirect:':
127
+ return {
128
+ before: /^ {4}$/,
129
+ candidates: [
130
+ { token: 'extensionPath:', after: ' ' },
131
+ { token: 'regexSubstitution:', after: ' ' },
132
+ { token: 'transform:', after: '\n ' },
133
+ { token: 'url:', after: ' ' },
134
+ ],
135
+ };
136
+ case 'action:redirect:transform:':
137
+ return {
138
+ before: /^ {6}$/,
139
+ candidates: [
140
+ { token: 'fragment:', after: ' ' },
141
+ { token: 'host:', after: ' ' },
142
+ { token: 'path:', after: ' ' },
143
+ { token: 'port:', after: ' ' },
144
+ { token: 'query:', after: ' ' },
145
+ { token: 'scheme:', after: ' ' },
146
+ { token: 'queryTransform:', after: '\n ' },
147
+ ],
148
+ };
149
+ case 'action:redirect:transform:queryTransform:':
150
+ return {
151
+ before: /^ {8}$/,
152
+ candidates: [
153
+ { token: 'addOrReplaceParams:', after: '\n - ' },
154
+ { token: 'removeParams:', after: '\n - ' },
155
+ ],
156
+ };
157
+ case 'action:responseHeaders:':
158
+ case 'action:requestHeaders:':
159
+ return {
160
+ before: /^ {4}- $/,
161
+ candidates: [
162
+ { token: 'header:', after: ' ' },
163
+ ],
164
+ };
165
+ case 'action:responseHeaders:header:':
166
+ case 'action:requestHeaders:header:':
167
+ return {
168
+ before: /^ {6}$/,
169
+ candidates: [
170
+ { token: 'operation:', after: ' ' },
171
+ { token: 'value:', after: ' ' },
172
+ ],
173
+ };
174
+ case 'action:responseHeaders:header:operation:':
175
+ case 'action:requestHeaders:header:operation:':
176
+ return {
177
+ before: /: $/,
178
+ candidates: [
179
+ { token: 'append', after: '\n value: ' },
180
+ { token: 'set', after: '\n value: ' },
181
+ { token: 'remove', after: '\n ' },
182
+ ],
183
+ };
184
+ case 'condition:':
185
+ return {
186
+ before: /^ {2}$/,
187
+ candidates: [
188
+ { token: 'domainType:', after: ' ' },
189
+ { token: 'isUrlFilterCaseSensitive:', after: ' ' },
190
+ { token: 'regexFilter:', after: ' ' },
191
+ { token: 'urlFilter:', after: ' ' },
192
+ { token: 'initiatorDomains:', after: '\n - ' },
193
+ { token: 'excludedInitiatorDomains:', after: '\n - ' },
194
+ { token: 'requestDomains:', after: '\n - ' },
195
+ { token: 'excludedRequestDomains:', after: '\n - ' },
196
+ { token: 'resourceTypes:', after: '\n - ' },
197
+ { token: 'excludedResourceTypes:', after: '\n - ' },
198
+ { token: 'requestMethods:', after: '\n - ' },
199
+ { token: 'excludedRequestMethods:', after: '\n - ' },
200
+ { token: 'responseHeaders:', after: '\n - ' },
201
+ { token: 'excludedResponseHeaders:', after: '\n - ' },
202
+ ],
203
+ };
204
+ case 'condition:domainType:':
205
+ return {
206
+ before: /: $/,
207
+ candidates: [
208
+ { token: 'firstParty', after: '\n ' },
209
+ { token: 'thirdParty', after: '\n ' },
210
+ ],
211
+ };
212
+ case 'condition:isUrlFilterCaseSensitive:':
213
+ return {
214
+ before: /: $/,
215
+ candidates: [
216
+ { token: 'true', after: '\n ' },
217
+ { token: 'false', after: '\n ' },
218
+ ],
219
+ };
220
+ case 'condition:requestMethods:':
221
+ case 'condition:excludedRequestMethods:':
222
+ return {
223
+ before: /^ {4}- $/,
224
+ candidates: [
225
+ { token: 'connect', after: '\n - ' },
226
+ { token: 'delete', after: '\n - ' },
227
+ { token: 'get', after: '\n - ' },
228
+ { token: 'head', after: '\n - ' },
229
+ { token: 'options', after: '\n - ' },
230
+ { token: 'patch', after: '\n - ' },
231
+ { token: 'post', after: '\n - ' },
232
+ { token: 'put', after: '\n - ' },
233
+ { token: 'other', after: '\n ' },
234
+ ],
235
+ };
236
+ case 'condition:resourceTypes:':
237
+ case 'condition:excludedResourceTypes:':
238
+ return {
239
+ before: /^ {4}- $/,
240
+ candidates: [
241
+ { token: 'main_frame', after: '\n - ' },
242
+ { token: 'sub_frame', after: '\n - ' },
243
+ { token: 'stylesheet', after: '\n - ' },
244
+ { token: 'script', after: '\n - ' },
245
+ { token: 'image', after: '\n - ' },
246
+ { token: 'font', after: '\n - ' },
247
+ { token: 'object', after: '\n - ' },
248
+ { token: 'xmlhttprequest', after: '\n - ' },
249
+ { token: 'ping', after: '\n - ' },
250
+ { token: 'csp_report', after: '\n - ' },
251
+ { token: 'media', after: '\n - ' },
252
+ { token: 'websocket', after: '\n - ' },
253
+ { token: 'webtransport', after: '\n - ' },
254
+ { token: 'webbundle', after: '\n - ' },
255
+ { token: 'other', after: '\n ' },
256
+ ],
257
+ };
258
+ }
259
+ }
260
+
261
+ autoComplete(editor, context) {
262
+ const match = context.matchBefore(/[\w-]*/);
263
+ if ( match === undefined ) { return null; }
264
+ const result = this.getAutocompleteCandidates(editor, match.from);
265
+ if ( result === undefined ) { return null; }
266
+ if ( result.before !== undefined ) {
267
+ const { doc } = context.state;
268
+ const line = doc.lineAt(context.pos);
269
+ const before = doc.sliceString(line.from, match.from);
270
+ if ( result.before.test(before) === false ) { return null; }
271
+ }
272
+ const filtered = result.candidates.filter(e =>
273
+ e.token !== match.text || e.after !== '\n'
274
+ );
275
+ return {
276
+ from: match.from,
277
+ options: filtered.map(e => ({ label: e.token, apply: `${e.token}${e.after}` })),
278
+ validFor: /\w*/,
279
+ };
280
+ }
281
+
282
+ async saveEditorText(editor) {
283
+ const text = editor.getEditorText().trim();
284
+ await (text.length !== 0
285
+ ? localWrite('userDnrRules', text)
286
+ : localRemove('userDnrRules')
287
+ );
288
+ const response = await sendMessage({ what: 'updateUserDnrRules' })
289
+ if ( response instanceof Object ) {
290
+ this.updateFeedbackPanel(editor, response);
291
+ }
292
+ return true;
293
+ }
294
+
295
+ updateSummaryPanel(editor, details) {
296
+ if ( details instanceof Object === false ) {
297
+ return editor.updateSummaryPanel(null);
298
+ }
299
+ const template = document.querySelector('template.summary-panel');
300
+ const fragment = template.content.cloneNode(true);
301
+ const root = fragment.querySelector('.summary-panel');
302
+ i18n.render(root);
303
+ const info = root.querySelector('.info');
304
+ info.textContent = i18n$('dnrRulesCountInfo')
305
+ .replace('{count}', (details.userDnrRuleCount || 0).toLocaleString())
306
+ editor.updateSummaryPanel(root);
307
+ }
308
+
309
+ updateFeedbackPanel(editor, details) {
310
+ if ( details instanceof Object === false ) {
311
+ return this.feedbackPanel.render(editor.view, null);
312
+ }
313
+ const errors = [];
314
+ if ( Array.isArray(details.errors) ) {
315
+ details.errors.forEach(e => errors.push(e));
316
+ }
317
+ const text = errors.join('\n');
318
+ const config = (( ) => {
319
+ if ( text === '' ) { return null; }
320
+ const template = document.querySelector('template.feedback-panel');
321
+ const fragment = template.content.cloneNode(true);
322
+ const root = fragment.querySelector('.feedback-panel');
323
+ const info = root.querySelector('.info');
324
+ info.textContent = text;
325
+ const closeFn = this.updateFeedbackPanel.bind(this, editor, null);
326
+ return {
327
+ dom: root,
328
+ mount() {
329
+ dom.on(qs$('.feedback-panel .close'), 'click', closeFn);
330
+ }
331
+ };
332
+ })();
333
+ this.feedbackPanel.render(editor.view, config);
334
+ }
335
+
336
+ importFromFile(editor, json) {
337
+ const rules = this.rulesFromJSON(json);
338
+ if ( rules === undefined ) { return; }
339
+ const text = textFromRules(rules);
340
+ if ( text === undefined ) { return; }
341
+ const { doc } = editor.view.state;
342
+ const lastChars = doc.toString().trimEnd().slice(-4);
343
+ const lastLine = doc.line(doc.lines);
344
+ let from = lastLine.to;
345
+ let prepend = '';
346
+ if ( lastLine.text !== '' ) {
347
+ prepend = '\n';
348
+ } else {
349
+ from = lastLine.from;
350
+ }
351
+ if ( /(?:^|\n)---$/.test(lastChars) === false ) {
352
+ prepend = `${prepend}---\n`;
353
+ }
354
+ editor.view.dispatch({ changes: { from, insert: `${prepend}${text}` } });
355
+ self.cm6.foldAll(editor.view);
356
+ editor.view.focus();
357
+ }
358
+
359
+ exportToFile(text) {
360
+ return super.exportToFile(text, 'my-ubol-dnr-rules.json');
361
+ }
362
+
363
+ importFromPaste(editor, transaction) {
364
+ const { from, to } = editor.rangeFromTransaction(transaction);
365
+ if ( from === undefined || to === undefined ) { return; }
366
+ // Paste position must match start of a line
367
+ const { newDoc } = transaction;
368
+ const lineFrom = newDoc.lineAt(from);
369
+ if ( lineFrom.from !== from ) { return; }
370
+ // Paste position must match a rule boundary
371
+ if ( lineFrom.number !== 1 ) {
372
+ const lineBefore = newDoc.line(lineFrom.number-1);
373
+ if ( /^---\s*$/.test(lineBefore.text) === false ) { return; }
374
+ }
375
+ const pastedText = newDoc.sliceString(from, to);
376
+ const rules = this.rulesFromJSON(pastedText);
377
+ if ( rules === undefined ) { return; }
378
+ const yamlText = textFromRules(rules);
379
+ if ( yamlText === undefined ) { return; }
380
+ editor.view.dispatch({ changes: { from, to, insert: yamlText } });
381
+ self.cm6.foldAll(editor.view);
382
+ return true;
383
+ }
384
+
385
+ newlineAssistant = {
386
+ 'action:': ' type: ',
387
+ 'action:responseHeaders:header:': ' operation: ',
388
+ };
389
+
390
+ ioAccept = '.json,application/json';
391
+ };
@@ -22,23 +22,10 @@
22
22
  import { browser, sendMessage } from './ext.js';
23
23
  import { dom, qs$ } from './dom.js';
24
24
  import { hashFromIterable } from './dashboard.js';
25
- import { i18n$ } from './i18n.js';
26
- import punycode from './punycode.js';
27
25
  import { renderFilterLists } from './filter-lists.js';
28
26
 
29
27
  /******************************************************************************/
30
28
 
31
- const cm6 = self.cm6;
32
-
33
- const cmTrustedSites = (( ) => {
34
- const options = {};
35
- if ( dom.cl.has(':root', 'dark') ) {
36
- options.oneDark = true;
37
- }
38
- options.placeholder = i18n$('noFilteringModePlaceholder');
39
- return cm6.createEditorView(options, qs$('#trustedSites'));
40
- })();
41
-
42
29
  let cachedRulesetData = {};
43
30
 
44
31
  /******************************************************************************/
@@ -60,7 +47,6 @@ function renderWidgets() {
60
47
  }
61
48
 
62
49
  renderDefaultMode();
63
- renderTrustedSites();
64
50
 
65
51
  qs$('#autoReload input[type="checkbox"]').checked = cachedRulesetData.autoReload;
66
52
 
@@ -175,48 +161,6 @@ dom.on('#developerMode input[type="checkbox"]', 'change', ev => {
175
161
 
176
162
  /******************************************************************************/
177
163
 
178
- function renderTrustedSites() {
179
- const hostnames = cachedRulesetData.trustedSites || [];
180
- let text = hostnames.map(hn => punycode.toUnicode(hn)).join('\n');
181
- if ( text !== '' ) { text += '\n'; }
182
- cmTrustedSites.dispatch({
183
- changes: {
184
- from: 0, to: cmTrustedSites.state.doc.length,
185
- insert: text
186
- },
187
- });
188
- }
189
-
190
- function changeTrustedSites() {
191
- const hostnames = getStagedTrustedSites();
192
- const hash = hashFromIterable(cachedRulesetData.trustedSites || []);
193
- if ( hashFromIterable(hostnames) === hash ) { return; }
194
- sendMessage({
195
- what: 'setTrustedSites',
196
- hostnames,
197
- });
198
- }
199
-
200
- function getStagedTrustedSites() {
201
- const text = cmTrustedSites.state.doc.toString();
202
- return text.split(/\s/).map(hn => {
203
- if ( hn === '' ) { return ''; }
204
- try {
205
- return punycode.toASCII(
206
- (new URL(`https://${hn}/`)).hostname
207
- );
208
- } catch {
209
- }
210
- return '';
211
- }).filter(hn => hn !== '');
212
- }
213
-
214
- dom.on(cmTrustedSites.contentDOM, 'blur', changeTrustedSites);
215
-
216
- self.addEventListener('beforeunload', changeTrustedSites);
217
-
218
- /******************************************************************************/
219
-
220
164
  function listen() {
221
165
  const bc = new self.BroadcastChannel('uBOL');
222
166
  bc.onmessage = listen.onmessage;
@@ -228,21 +172,6 @@ listen.onmessage = ev => {
228
172
  const local = cachedRulesetData;
229
173
  let render = false;
230
174
 
231
- // Keep added sites which have not yet been committed
232
- if ( message.trustedSites !== undefined ) {
233
- if ( hashFromIterable(message.trustedSites) !== hashFromIterable(local.trustedSites) ) {
234
- const current = new Set(local.trustedSites);
235
- const staged = new Set(getStagedTrustedSites());
236
- for ( const hn of staged ) {
237
- if ( current.has(hn) === false ) { continue; }
238
- staged.delete(hn);
239
- }
240
- const combined = Array.from(new Set([ ...message.trustedSites, ...staged ]));
241
- local.trustedSites = combined;
242
- render = true;
243
- }
244
- }
245
-
246
175
  if ( message.hasOmnipotence !== undefined ) {
247
176
  if ( message.hasOmnipotence !== local.hasOmnipotence ) {
248
177
  local.hasOmnipotence = message.hasOmnipotence;
@@ -278,6 +207,13 @@ listen.onmessage = ev => {
278
207
  }
279
208
  }
280
209
 
210
+ if ( message.developerMode !== undefined ) {
211
+ if ( message.developerMode !== local.developerMode ) {
212
+ local.developerMode = message.developerMode;
213
+ render = true;
214
+ }
215
+ }
216
+
281
217
  if ( message.adminRulesets !== undefined ) {
282
218
  if ( hashFromIterable(message.adminRulesets) !== hashFromIterable(local.adminRulesets) ) {
283
219
  local.adminRulesets = message.adminRulesets;