@browserless.io/browserless 2.25.0-beta-2 → 2.25.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 (224) hide show
  1. package/CHANGELOG.md +43 -3
  2. package/README.md +4 -5
  3. package/build/browserless.js +3 -1
  4. package/build/browsers/browsers.cdp.d.ts +3 -0
  5. package/build/browsers/browsers.cdp.js +4 -1
  6. package/build/browsers/browsers.playwright.d.ts +4 -0
  7. package/build/browsers/browsers.playwright.js +11 -2
  8. package/build/browsers/index.js +4 -3
  9. package/build/http.d.ts +9 -0
  10. package/build/http.js +9 -0
  11. package/build/routes/chrome/http/content.post.body.json +8 -8
  12. package/build/routes/chrome/http/pdf.post.body.json +8 -8
  13. package/build/routes/chrome/http/scrape.post.body.json +8 -8
  14. package/build/routes/chrome/http/screenshot.post.body.json +8 -8
  15. package/build/routes/chrome/tests/kill-sessions.spec.js +1 -1
  16. package/build/routes/chromium/http/content.post.body.json +8 -8
  17. package/build/routes/chromium/http/pdf.post.body.json +8 -8
  18. package/build/routes/chromium/http/scrape.post.body.json +8 -8
  19. package/build/routes/chromium/http/screenshot.post.body.json +8 -8
  20. package/build/routes/chromium/tests/kill-sessions.spec.js +1 -1
  21. package/build/routes/edge/http/content.post.body.json +579 -0
  22. package/build/routes/edge/http/content.post.d.ts +8 -0
  23. package/build/routes/edge/http/content.post.js +7 -0
  24. package/build/routes/edge/http/content.post.query.json +183 -0
  25. package/build/routes/edge/http/content.post.response.json +5 -0
  26. package/build/routes/edge/http/download.post.body.json +32 -0
  27. package/build/routes/edge/http/download.post.d.ts +8 -0
  28. package/build/routes/edge/http/download.post.js +7 -0
  29. package/build/routes/edge/http/download.post.query.json +120 -0
  30. package/build/routes/edge/http/download.post.response.json +4 -0
  31. package/build/routes/edge/http/function.post.body.json +32 -0
  32. package/build/routes/edge/http/function.post.d.ts +8 -0
  33. package/build/routes/edge/http/function.post.js +7 -0
  34. package/build/routes/edge/http/function.post.query.json +120 -0
  35. package/build/routes/edge/http/function.post.response.json +4 -0
  36. package/build/routes/edge/http/json-list.get.d.ts +5 -0
  37. package/build/routes/edge/http/json-list.get.js +5 -0
  38. package/build/routes/edge/http/json-list.get.response.json +52 -0
  39. package/build/routes/edge/http/json-new.put.d.ts +5 -0
  40. package/build/routes/edge/http/json-new.put.js +5 -0
  41. package/build/routes/edge/http/json-new.put.response.json +44 -0
  42. package/build/routes/edge/http/json-protocol.get.d.ts +5 -0
  43. package/build/routes/edge/http/json-protocol.get.js +5 -0
  44. package/build/routes/edge/http/json-protocol.get.response.json +6 -0
  45. package/build/routes/edge/http/json-version.get.d.ts +5 -0
  46. package/build/routes/edge/http/json-version.get.js +5 -0
  47. package/build/routes/edge/http/json-version.get.response.json +44 -0
  48. package/build/routes/edge/http/pdf.post.body.json +724 -0
  49. package/build/routes/edge/http/pdf.post.d.ts +8 -0
  50. package/build/routes/edge/http/pdf.post.js +7 -0
  51. package/build/routes/edge/http/pdf.post.query.json +120 -0
  52. package/build/routes/edge/http/pdf.post.response.json +5 -0
  53. package/build/routes/edge/http/performance.post.body.json +26 -0
  54. package/build/routes/edge/http/performance.post.d.ts +8 -0
  55. package/build/routes/edge/http/performance.post.js +7 -0
  56. package/build/routes/edge/http/performance.post.query.json +120 -0
  57. package/build/routes/edge/http/performance.post.response.json +7 -0
  58. package/build/routes/edge/http/scrape.post.body.json +626 -0
  59. package/build/routes/edge/http/scrape.post.d.ts +8 -0
  60. package/build/routes/edge/http/scrape.post.js +7 -0
  61. package/build/routes/edge/http/scrape.post.query.json +183 -0
  62. package/build/routes/edge/http/scrape.post.response.json +334 -0
  63. package/build/routes/edge/http/screenshot.post.body.json +669 -0
  64. package/build/routes/edge/http/screenshot.post.d.ts +8 -0
  65. package/build/routes/edge/http/screenshot.post.js +7 -0
  66. package/build/routes/edge/http/screenshot.post.query.json +120 -0
  67. package/build/routes/edge/http/screenshot.post.response.json +5 -0
  68. package/build/routes/edge/tests/content.spec.d.ts +1 -0
  69. package/build/routes/edge/tests/content.spec.js +312 -0
  70. package/build/routes/edge/tests/download.spec.d.ts +1 -0
  71. package/build/routes/edge/tests/download.spec.js +67 -0
  72. package/build/routes/edge/tests/function.spec.d.ts +1 -0
  73. package/build/routes/edge/tests/function.spec.js +277 -0
  74. package/build/routes/edge/tests/json-version.spec.d.ts +1 -0
  75. package/build/routes/edge/tests/json-version.spec.js +37 -0
  76. package/build/routes/edge/tests/kill-sessions.spec.d.ts +1 -0
  77. package/build/routes/edge/tests/kill-sessions.spec.js +80 -0
  78. package/build/routes/edge/tests/page-websocket.spec.d.ts +1 -0
  79. package/build/routes/edge/tests/page-websocket.spec.js +97 -0
  80. package/build/routes/edge/tests/pdf.spec.d.ts +1 -0
  81. package/build/routes/edge/tests/pdf.spec.js +345 -0
  82. package/build/routes/edge/tests/performance.spec.d.ts +1 -0
  83. package/build/routes/edge/tests/performance.spec.js +124 -0
  84. package/build/routes/edge/tests/scrape.spec.d.ts +1 -0
  85. package/build/routes/edge/tests/scrape.spec.js +354 -0
  86. package/build/routes/edge/tests/screenshot.spec.d.ts +1 -0
  87. package/build/routes/edge/tests/screenshot.spec.js +339 -0
  88. package/build/routes/edge/tests/websocket.spec.d.ts +1 -0
  89. package/build/routes/edge/tests/websocket.spec.js +384 -0
  90. package/build/routes/edge/ws/browser.d.ts +7 -0
  91. package/build/routes/edge/ws/browser.js +6 -0
  92. package/build/routes/edge/ws/browser.query.json +120 -0
  93. package/build/routes/edge/ws/cdp.d.ts +8 -0
  94. package/build/routes/edge/ws/cdp.js +7 -0
  95. package/build/routes/edge/ws/cdp.query.json +120 -0
  96. package/build/routes/edge/ws/page.d.ts +8 -0
  97. package/build/routes/edge/ws/page.js +7 -0
  98. package/build/routes/edge/ws/page.query.json +120 -0
  99. package/build/routes/edge/ws/playwright.d.ts +8 -0
  100. package/build/routes/edge/ws/playwright.js +7 -0
  101. package/build/routes/edge/ws/playwright.query.json +100 -0
  102. package/build/routes/firefox/tests/kill-sessions.spec.js +1 -1
  103. package/build/routes/management/http/meta.get.js +3 -1
  104. package/build/routes/webkit/tests/kill-sessions.spec.js +1 -1
  105. package/build/sdk-utils.js +1 -1
  106. package/build/shared/scrape.http.js +2 -2
  107. package/build/types.d.ts +32 -0
  108. package/build/types.js +18 -0
  109. package/build/utils.d.ts +1 -0
  110. package/build/utils.js +16 -2
  111. package/docker/chrome/Dockerfile +14 -14
  112. package/docker/chromium/Dockerfile +14 -14
  113. package/docker/edge/.dockerignore +16 -0
  114. package/docker/edge/Dockerfile +43 -0
  115. package/docker/firefox/Dockerfile +14 -14
  116. package/docker/multi/Dockerfile +18 -18
  117. package/docker/sdk/Dockerfile +10 -0
  118. package/extensions/ublock/_locales/ar/messages.json +3 -3
  119. package/extensions/ublock/_locales/bg/messages.json +1 -1
  120. package/extensions/ublock/_locales/br_FR/messages.json +2 -2
  121. package/extensions/ublock/_locales/cy/messages.json +11 -11
  122. package/extensions/ublock/_locales/el/messages.json +2 -2
  123. package/extensions/ublock/_locales/hu/messages.json +1 -1
  124. package/extensions/ublock/_locales/id/messages.json +1 -1
  125. package/extensions/ublock/_locales/lv/messages.json +4 -4
  126. package/extensions/ublock/_locales/mk/messages.json +130 -130
  127. package/extensions/ublock/_locales/oc/messages.json +1 -1
  128. package/extensions/ublock/_locales/pt_BR/messages.json +1 -1
  129. package/extensions/ublock/_locales/pt_PT/messages.json +2 -2
  130. package/extensions/ublock/_locales/si/messages.json +100 -100
  131. package/extensions/ublock/_locales/sr/messages.json +4 -4
  132. package/extensions/ublock/_locales/vi/messages.json +19 -19
  133. package/extensions/ublock/_locales/zh_TW/messages.json +28 -28
  134. package/extensions/ublock/assets/assets.json +33 -29
  135. package/extensions/ublock/assets/thirdparties/easylist/easylist.txt +2984 -3287
  136. package/extensions/ublock/assets/thirdparties/easylist/easyprivacy.txt +150 -171
  137. package/extensions/ublock/assets/thirdparties/pgl.yoyo.org/as/serverlist +37 -27
  138. package/extensions/ublock/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat +802 -888
  139. package/extensions/ublock/assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt +2355 -2071
  140. package/extensions/ublock/assets/ublock/badlists.txt +9 -1
  141. package/extensions/ublock/assets/ublock/badware.min.txt +354 -243
  142. package/extensions/ublock/assets/ublock/filters.min.txt +5837 -5737
  143. package/extensions/ublock/assets/ublock/privacy.min.txt +151 -38
  144. package/extensions/ublock/assets/ublock/quick-fixes.min.txt +83 -127
  145. package/extensions/ublock/assets/ublock/unbreak.min.txt +66 -50
  146. package/extensions/ublock/css/codemirror.css +4 -0
  147. package/extensions/ublock/document-blocked.html +3 -1
  148. package/extensions/ublock/js/arglist-parser.js +116 -0
  149. package/extensions/ublock/js/background.js +1 -1
  150. package/extensions/ublock/js/logger-ui.js +1 -1
  151. package/extensions/ublock/js/messaging.js +9 -2
  152. package/extensions/ublock/js/pagestore.js +3 -1
  153. package/extensions/ublock/js/redirect-engine.js +3 -1
  154. package/extensions/ublock/{assets/resources/set-attr.js → js/resources/attribute.js} +115 -11
  155. package/extensions/ublock/js/resources/base.js +38 -0
  156. package/extensions/ublock/js/resources/cookie.js +419 -0
  157. package/extensions/ublock/js/resources/href-sanitizer.js +188 -0
  158. package/extensions/ublock/js/resources/localstorage.js +235 -0
  159. package/extensions/ublock/js/resources/parse-replace.js +54 -0
  160. package/extensions/ublock/js/resources/prevent-settimeout.js +236 -0
  161. package/extensions/ublock/js/resources/proxy-apply.js +109 -0
  162. package/extensions/ublock/js/resources/replace-argument.js +120 -0
  163. package/extensions/ublock/{assets → js}/resources/run-at.js +20 -4
  164. package/extensions/ublock/{assets → js}/resources/safe-self.js +5 -4
  165. package/extensions/ublock/{assets → js}/resources/scriptlets.js +90 -1589
  166. package/extensions/ublock/js/resources/set-constant.js +287 -0
  167. package/extensions/ublock/js/resources/shared.js +44 -0
  168. package/extensions/ublock/js/resources/spoof-css.js +163 -0
  169. package/extensions/ublock/js/s14e-serializer.js +2 -1
  170. package/extensions/ublock/js/scriptlet-filtering-core.js +1 -1
  171. package/extensions/ublock/js/scriptlet-filtering.js +1 -31
  172. package/extensions/ublock/js/static-dnr-filtering.js +143 -129
  173. package/extensions/ublock/js/static-filtering-parser.js +27 -117
  174. package/extensions/ublock/js/static-net-filtering.js +53 -141
  175. package/extensions/ublock/js/traffic.js +1 -1
  176. package/extensions/ublock/js/urlskip.js +166 -0
  177. package/extensions/ublock/js/vapi-background-ext.js +38 -14
  178. package/extensions/ublock/manifest.json +1 -1
  179. package/package.json +22 -22
  180. package/src/browserless.ts +4 -0
  181. package/src/browsers/browsers.cdp.ts +5 -0
  182. package/src/browsers/browsers.playwright.ts +14 -1
  183. package/src/browsers/index.ts +5 -2
  184. package/src/http.ts +9 -0
  185. package/src/routes/chrome/tests/kill-sessions.spec.ts +1 -1
  186. package/src/routes/chromium/tests/kill-sessions.spec.ts +1 -1
  187. package/src/routes/edge/http/content.post.ts +20 -0
  188. package/src/routes/edge/http/download.post.ts +20 -0
  189. package/src/routes/edge/http/function.post.ts +20 -0
  190. package/src/routes/edge/http/json-list.get.ts +7 -0
  191. package/src/routes/edge/http/json-new.put.ts +7 -0
  192. package/src/routes/edge/http/json-protocol.get.ts +7 -0
  193. package/src/routes/edge/http/json-version.get.ts +7 -0
  194. package/src/routes/edge/http/pdf.post.ts +20 -0
  195. package/src/routes/edge/http/performance.post.ts +20 -0
  196. package/src/routes/edge/http/scrape.post.ts +20 -0
  197. package/src/routes/edge/http/screenshot.post.ts +20 -0
  198. package/src/routes/edge/tests/content.spec.ts +376 -0
  199. package/src/routes/edge/tests/download.spec.ts +77 -0
  200. package/src/routes/edge/tests/function.spec.ts +317 -0
  201. package/src/routes/edge/tests/json-version.spec.ts +52 -0
  202. package/src/routes/edge/tests/kill-sessions.spec.ts +99 -0
  203. package/src/routes/edge/tests/page-websocket.spec.ts +129 -0
  204. package/src/routes/edge/tests/pdf.spec.ts +389 -0
  205. package/src/routes/edge/tests/performance.spec.ts +155 -0
  206. package/src/routes/edge/tests/scrape.spec.ts +417 -0
  207. package/src/routes/edge/tests/screenshot.spec.ts +387 -0
  208. package/src/routes/edge/tests/websocket.spec.ts +510 -0
  209. package/src/routes/edge/ws/browser.ts +10 -0
  210. package/src/routes/edge/ws/cdp.ts +17 -0
  211. package/src/routes/edge/ws/page.ts +10 -0
  212. package/src/routes/edge/ws/playwright.ts +17 -0
  213. package/src/routes/firefox/tests/kill-sessions.spec.ts +1 -1
  214. package/src/routes/management/http/meta.get.ts +6 -1
  215. package/src/routes/management/http/static.get.ts +1 -1
  216. package/src/routes/webkit/tests/kill-sessions.spec.ts +1 -1
  217. package/src/sdk-utils.ts +1 -1
  218. package/src/shared/scrape.http.ts +2 -2
  219. package/src/types.ts +19 -0
  220. package/src/utils.ts +38 -16
  221. package/static/docs/swagger.json +2097 -10
  222. package/static/docs/swagger.min.json +2096 -9
  223. package/static/function/client.js +141 -253
  224. package/static/function/index.html +141 -253
@@ -0,0 +1,384 @@
1
+ import { Browserless, Config, Metrics, exists, fetchJson, sleep, } from '@browserless.io/browserless';
2
+ import { chromium } from 'playwright-core';
3
+ import { deleteAsync } from 'del';
4
+ import { expect } from 'chai';
5
+ import puppeteer from 'puppeteer-core';
6
+ describe('Edge WebSocket API', function () {
7
+ let browserless;
8
+ const start = ({ config = new Config(), metrics = new Metrics(), } = {}) => {
9
+ browserless = new Browserless({ config, metrics });
10
+ return browserless.start();
11
+ };
12
+ afterEach(async () => {
13
+ await browserless.stop();
14
+ });
15
+ it('runs edge websocket requests', async () => {
16
+ const config = new Config();
17
+ config.setToken('browserless');
18
+ const metrics = new Metrics();
19
+ await start({ config, metrics });
20
+ const browser = await puppeteer.connect({
21
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
22
+ });
23
+ await browser.close();
24
+ });
25
+ it('runs edge Playwright-CDP requests', async () => {
26
+ const config = new Config();
27
+ config.setToken('browserless');
28
+ const metrics = new Metrics();
29
+ await start({ config, metrics });
30
+ const browser = await chromium.connectOverCDP(`ws://localhost:3000/edge?token=browserless`);
31
+ await browser.close();
32
+ });
33
+ it('runs multiple websocket requests', async () => {
34
+ const config = new Config();
35
+ config.setToken('browserless');
36
+ const metrics = new Metrics();
37
+ await start({ config, metrics });
38
+ const browser = await puppeteer.connect({
39
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
40
+ });
41
+ const browserTwo = await puppeteer.connect({
42
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
43
+ });
44
+ await Promise.all([browser.close(), browserTwo.close()]);
45
+ });
46
+ it('does not close browsers when multiple clients are connected', async () => {
47
+ const config = new Config();
48
+ config.setToken('browserless');
49
+ const metrics = new Metrics();
50
+ await start({ config, metrics });
51
+ // Single session
52
+ const browser = await puppeteer.connect({
53
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
54
+ });
55
+ await sleep(100);
56
+ const [session] = (await fetchJson('http://localhost:3000/sessions?token=browserless'));
57
+ expect(session.numbConnected).to.equal(1);
58
+ // Two sessions
59
+ const browserTwo = await puppeteer.connect({
60
+ browserWSEndpoint: `ws://localhost:3000/devtools/browser/${session.browserId}?token=browserless`,
61
+ });
62
+ await sleep(100);
63
+ const [twoSessions] = (await fetchJson('http://localhost:3000/sessions?token=browserless'));
64
+ expect(twoSessions.numbConnected).to.equal(2);
65
+ // Back to a single session
66
+ await browser.disconnect();
67
+ await sleep(100);
68
+ const [oneSession] = (await fetchJson('http://localhost:3000/sessions?token=browserless'));
69
+ expect(oneSession.numbConnected).to.equal(1);
70
+ // No sessions connected
71
+ await browserTwo.disconnect();
72
+ await sleep(100);
73
+ const sessionsFinal = (await fetchJson('http://localhost:3000/sessions?token=browserless'));
74
+ expect(sessionsFinal).to.have.length(0);
75
+ });
76
+ it('disconnects all clients when the timeout is reached', async () => {
77
+ const config = new Config();
78
+ config.setToken('browserless');
79
+ config.setTimeout(1000);
80
+ config.setConcurrent(2);
81
+ const metrics = new Metrics();
82
+ await start({ config, metrics });
83
+ const browser = await puppeteer.connect({
84
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
85
+ });
86
+ const [session] = (await fetchJson('http://localhost:3000/sessions?token=browserless'));
87
+ const browserTwo = await puppeteer.connect({
88
+ browserWSEndpoint: `ws://localhost:3000/devtools/browser/${session.browserId}?token=browserless`,
89
+ });
90
+ await sleep(3000);
91
+ expect(metrics.get().successful).to.equal(0);
92
+ expect(metrics.get().timedout).to.equal(2);
93
+ expect(browser.connected).to.be.false;
94
+ expect(browserTwo.connected).to.be.false;
95
+ });
96
+ it('rejects websocket requests', async () => {
97
+ const config = new Config();
98
+ config.setToken('browserless');
99
+ const metrics = new Metrics();
100
+ await start({ config, metrics });
101
+ const didError = await puppeteer
102
+ .connect({
103
+ browserWSEndpoint: `ws://localhost:3000/edge?token=bad`,
104
+ })
105
+ .then(() => false)
106
+ .catch(() => true);
107
+ expect(didError).to.be.true;
108
+ });
109
+ it('rejects file protocol requests', async () => {
110
+ const config = new Config();
111
+ config.setToken('browserless');
112
+ const metrics = new Metrics();
113
+ await start({ config, metrics });
114
+ const didError = await puppeteer
115
+ .connect({
116
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
117
+ })
118
+ .then(async (b) => {
119
+ const page = await b.newPage();
120
+ await page.goto('file:///etc/passwd');
121
+ await page.content();
122
+ await b.disconnect();
123
+ return false;
124
+ })
125
+ .catch(() => true);
126
+ expect(didError).to.be.true;
127
+ });
128
+ it.skip('runs with ignored arguments', async () => {
129
+ const config = new Config();
130
+ config.setToken('browserless');
131
+ const metrics = new Metrics();
132
+ await start({ config, metrics });
133
+ const args = {
134
+ ignoreDefaultArgs: true,
135
+ };
136
+ const success = await puppeteer
137
+ .connect({
138
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless&launch=${JSON.stringify(args)}`,
139
+ })
140
+ .then(async (b) => {
141
+ const page = await b.newPage();
142
+ await page.close();
143
+ b.close();
144
+ return true;
145
+ })
146
+ .catch(() => false);
147
+ expect(success).to.be.true;
148
+ });
149
+ it('deletes user-data-dirs when not specified', async () => {
150
+ const config = new Config();
151
+ config.setToken('browserless');
152
+ const metrics = new Metrics();
153
+ await start({ config, metrics });
154
+ const browser = await puppeteer.connect({
155
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
156
+ });
157
+ const [{ userDataDir }] = await fetch('http://localhost:3000/sessions?token=browserless').then((r) => r.json());
158
+ expect(await exists(userDataDir)).to.be.true;
159
+ await browser.disconnect();
160
+ await sleep(1000);
161
+ expect(await exists(userDataDir)).to.be.false;
162
+ });
163
+ it('allows specified user-data-dirs', async () => {
164
+ const dataDir = '/tmp/data-dir';
165
+ const config = new Config();
166
+ config.setToken('browserless');
167
+ const metrics = new Metrics();
168
+ await start({ config, metrics });
169
+ const launch = JSON.stringify({
170
+ args: [`--user-data-dir=${dataDir}`],
171
+ });
172
+ const browser = await puppeteer.connect({
173
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless&launch=${launch}`,
174
+ });
175
+ const [{ userDataDir }] = await fetch('http://localhost:3000/sessions?token=browserless').then((r) => r.json());
176
+ expect(await exists(userDataDir)).to.be.true;
177
+ expect(userDataDir).to.equal(dataDir);
178
+ await browser.disconnect();
179
+ await sleep(1000);
180
+ expect(await exists(userDataDir)).to.be.true;
181
+ });
182
+ it('creates user-data-dirs with userDataDir options', async () => {
183
+ const dataDirLocation = '/tmp/browserless-test-dir';
184
+ const launch = JSON.stringify({
185
+ userDataDir: dataDirLocation,
186
+ });
187
+ const config = new Config();
188
+ config.setToken('browserless');
189
+ const metrics = new Metrics();
190
+ await start({ config, metrics });
191
+ const browser = await puppeteer.connect({
192
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless&launch=${launch}`,
193
+ });
194
+ const [{ userDataDir }] = await fetch('http://localhost:3000/sessions?token=browserless').then((r) => r.json());
195
+ expect(userDataDir === dataDirLocation).to.be.true;
196
+ expect(await exists(userDataDir)).to.be.true;
197
+ await browser.disconnect();
198
+ await sleep(500);
199
+ expect(await exists(userDataDir)).to.be.true;
200
+ await deleteAsync(userDataDir, { force: true });
201
+ });
202
+ it('creates user-data-dirs with CLI flags', async () => {
203
+ const dataDirLocation = '/tmp/browserless-test-dir';
204
+ const launch = JSON.stringify({
205
+ args: [`--user-data-dir=${dataDirLocation}`],
206
+ });
207
+ const config = new Config();
208
+ config.setToken('browserless');
209
+ const metrics = new Metrics();
210
+ await start({ config, metrics });
211
+ const browser = await puppeteer.connect({
212
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless&launch=${launch}`,
213
+ });
214
+ const [{ userDataDir }] = await fetch('http://localhost:3000/sessions?token=browserless').then((r) => r.json());
215
+ expect(userDataDir === dataDirLocation).to.be.true;
216
+ expect(await exists(userDataDir)).to.be.true;
217
+ await browser.disconnect();
218
+ await sleep(500);
219
+ expect(await exists(userDataDir)).to.be.true;
220
+ await deleteAsync(userDataDir, { force: true });
221
+ });
222
+ it('runs with job-based timeouts', async () => {
223
+ const config = new Config();
224
+ config.setToken('browserless');
225
+ config.setTimeout(-1); // No timeout
226
+ const metrics = new Metrics();
227
+ await start({ config, metrics });
228
+ const browser = await puppeteer.connect({
229
+ browserWSEndpoint: `ws://localhost:3000/edge?timeout=1000&token=browserless`,
230
+ });
231
+ expect(browser.connected).to.be.true;
232
+ await sleep(1200);
233
+ expect(metrics.get().timedout).to.equal(1);
234
+ expect(metrics.get().successful).to.equal(0);
235
+ expect(browser.connected).to.be.false;
236
+ });
237
+ it('allows the file-chooser', async () => new Promise(async (done) => {
238
+ const config = new Config();
239
+ config.setToken('browserless');
240
+ const metrics = new Metrics();
241
+ await start({ config, metrics });
242
+ const job = async () => {
243
+ const browser = await puppeteer.connect({
244
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
245
+ });
246
+ const page = await browser.newPage();
247
+ await page.setContent(`<div class="output" style="height: 62%;"><label for="avatar">Choose a profile picture:</label>
248
+ <input type="file" id="avatar" name="avatar" accept="image/png, image/jpeg">
249
+ </div>`);
250
+ if (page.waitForFileChooser) {
251
+ const [fileChooser] = await Promise.all([
252
+ page.waitForFileChooser(),
253
+ page.click('#avatar'),
254
+ ]);
255
+ expect(fileChooser).to.not.be.undefined;
256
+ expect(fileChooser).to.not.be.null;
257
+ }
258
+ browser.disconnect();
259
+ done();
260
+ };
261
+ job();
262
+ }));
263
+ it('queues requests', async () => {
264
+ const config = new Config();
265
+ config.setToken('browserless');
266
+ config.setConcurrent(1);
267
+ const metrics = new Metrics();
268
+ await start({ config, metrics });
269
+ const job = async () => {
270
+ const browser = await puppeteer.connect({
271
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
272
+ });
273
+ await sleep(100);
274
+ return browser.disconnect();
275
+ };
276
+ await Promise.all([job(), job()]);
277
+ await sleep(100);
278
+ const results = metrics.get();
279
+ expect(results.successful).to.equal(2);
280
+ expect(results.rejected).to.equal(0);
281
+ expect(results.queued).to.equal(1);
282
+ });
283
+ it('fails requests', async () => {
284
+ const config = new Config();
285
+ config.setToken('browserless');
286
+ config.setConcurrent(0);
287
+ config.setQueued(0);
288
+ const metrics = new Metrics();
289
+ await start({ config, metrics });
290
+ return puppeteer
291
+ .connect({
292
+ browserWSEndpoint: `ws://localhost:3000/edge?token=browserless`,
293
+ })
294
+ .catch((error) => {
295
+ const results = metrics.get();
296
+ expect(results.successful).to.equal(0);
297
+ expect(results.rejected).to.equal(1);
298
+ expect(results.queued).to.equal(0);
299
+ expect(error.message).to.contain.oneOf([`400`, `429`]);
300
+ });
301
+ });
302
+ it('fails requests without tokens', async () => {
303
+ const config = new Config();
304
+ config.setToken('browserless');
305
+ const metrics = new Metrics();
306
+ await start({ config, metrics });
307
+ return puppeteer
308
+ .connect({ browserWSEndpoint: `ws://localhost:3000/edge` })
309
+ .catch((error) => {
310
+ const results = metrics.get();
311
+ expect(results.successful).to.equal(0);
312
+ expect(results.rejected).to.equal(0);
313
+ expect(results.queued).to.equal(0);
314
+ expect(error.message).to.contain(`401`);
315
+ });
316
+ });
317
+ it('runs playwright', async () => {
318
+ const config = new Config();
319
+ config.setToken('browserless');
320
+ const metrics = new Metrics();
321
+ await start({ config, metrics });
322
+ const browser = await chromium.connect(`ws://localhost:3000/edge/playwright?token=browserless`);
323
+ await browser.close();
324
+ await sleep(100);
325
+ const results = metrics.get();
326
+ expect(results.timedout).to.equal(0);
327
+ expect(results.successful).to.equal(1);
328
+ expect(results.rejected).to.equal(0);
329
+ expect(results.queued).to.equal(0);
330
+ });
331
+ it('runs playwright over CDP', async () => {
332
+ const config = new Config();
333
+ config.setToken('browserless');
334
+ const metrics = new Metrics();
335
+ await start({ config, metrics });
336
+ const browser = await chromium.connectOverCDP(`ws://localhost:3000/edge?token=browserless`);
337
+ await browser.close();
338
+ await sleep(100);
339
+ const results = metrics.get();
340
+ expect(results.timedout).to.equal(0);
341
+ expect(results.successful).to.equal(1);
342
+ expect(results.rejected).to.equal(0);
343
+ expect(results.queued).to.equal(0);
344
+ });
345
+ it('runs multiple versions of playwright', async () => {
346
+ const config = new Config();
347
+ config.setToken('browserless');
348
+ const metrics = new Metrics();
349
+ await start({ config, metrics });
350
+ const pwVersions = Object.keys(config.getPwVersions());
351
+ for (const version of pwVersions) {
352
+ const pw = await import(config.getPwVersions()[version]);
353
+ const browser = await pw.chromium.connect(`ws://localhost:3000/edge/playwright?token=browserless`);
354
+ await browser.close();
355
+ await sleep(100);
356
+ }
357
+ const results = metrics.get();
358
+ expect(results.timedout).to.equal(0);
359
+ expect(results.successful).to.equal(pwVersions.length);
360
+ expect(results.rejected).to.equal(0);
361
+ expect(results.queued).to.equal(0);
362
+ });
363
+ it('rejects playwright without tokens', async () => {
364
+ const config = new Config();
365
+ config.setToken('browserless');
366
+ const metrics = new Metrics();
367
+ await start({ config, metrics });
368
+ await chromium.connect(`ws://localhost:3000/edge/playwright`).catch((e) => {
369
+ const results = metrics.get();
370
+ expect(e.message).to.include('Bad or missing authentication');
371
+ expect(results.timedout).to.equal(0);
372
+ expect(results.successful).to.equal(0);
373
+ expect(results.unauthorized).to.equal(1);
374
+ expect(results.queued).to.equal(0);
375
+ });
376
+ });
377
+ it('allows requests without token when auth token is not set', async () => {
378
+ await start();
379
+ const browser = await puppeteer.connect({
380
+ browserWSEndpoint: `ws://localhost:3000/edge`,
381
+ });
382
+ await browser.disconnect();
383
+ });
384
+ });
@@ -0,0 +1,7 @@
1
+ import { EdgeCDP } from '@browserless.io/browserless';
2
+ import { default as Browser, QuerySchema } from '../../../shared/browser.ws.js';
3
+ export default class EdgeBrowserWebSocketRoute extends Browser {
4
+ name: string;
5
+ browser: typeof EdgeCDP;
6
+ }
7
+ export { QuerySchema };
@@ -0,0 +1,6 @@
1
+ import { BrowserlessRoutes, EdgeCDP } from '@browserless.io/browserless';
2
+ import { default as Browser } from '../../../shared/browser.ws.js';
3
+ export default class EdgeBrowserWebSocketRoute extends Browser {
4
+ name = BrowserlessRoutes.EdgeBrowserWebSocketRoute;
5
+ browser = EdgeCDP;
6
+ }
@@ -0,0 +1,120 @@
1
+ {
2
+ "type": "object",
3
+ "properties": {
4
+ "launch": {
5
+ "description": "Launch options, which can be either an object\nof puppeteer.launch options or playwright.launchServer\noptions, depending on the API. Must be either JSON\nobject, or a base64-encoded JSON object.",
6
+ "anyOf": [
7
+ {
8
+ "$ref": "#/definitions/CDPLaunchOptions"
9
+ },
10
+ {
11
+ "type": "string"
12
+ }
13
+ ]
14
+ },
15
+ "blockAds": {
16
+ "description": "Whether or nor to load ad-blocking extensions for the session.\nThis currently uses uBlock Origin and may cause certain sites\nto not load properly.",
17
+ "type": "boolean"
18
+ },
19
+ "timeout": {
20
+ "description": "Override the system-level timeout for this request.\nAccepts a value in milliseconds.",
21
+ "type": "number"
22
+ },
23
+ "token": {
24
+ "description": "The authorization token",
25
+ "type": "string"
26
+ },
27
+ "trackingId": {
28
+ "description": "Custom session identifier",
29
+ "type": "string"
30
+ }
31
+ },
32
+ "additionalProperties": false,
33
+ "definitions": {
34
+ "CDPLaunchOptions": {
35
+ "type": "object",
36
+ "properties": {
37
+ "args": {
38
+ "type": "array",
39
+ "items": {
40
+ "type": "string"
41
+ }
42
+ },
43
+ "defaultViewport": {
44
+ "type": "object",
45
+ "properties": {
46
+ "deviceScaleFactor": {
47
+ "type": "number"
48
+ },
49
+ "hasTouch": {
50
+ "type": "boolean"
51
+ },
52
+ "height": {
53
+ "type": "number"
54
+ },
55
+ "isLandscape": {
56
+ "type": "boolean"
57
+ },
58
+ "isMobile": {
59
+ "type": "boolean"
60
+ },
61
+ "width": {
62
+ "type": "number"
63
+ }
64
+ },
65
+ "additionalProperties": false,
66
+ "required": [
67
+ "height",
68
+ "width"
69
+ ]
70
+ },
71
+ "devtools": {
72
+ "type": "boolean"
73
+ },
74
+ "dumpio": {
75
+ "type": "boolean"
76
+ },
77
+ "headless": {
78
+ "enum": [
79
+ false,
80
+ "shell",
81
+ true
82
+ ]
83
+ },
84
+ "ignoreDefaultArgs": {
85
+ "anyOf": [
86
+ {
87
+ "type": "array",
88
+ "items": {
89
+ "type": "string"
90
+ }
91
+ },
92
+ {
93
+ "type": "boolean"
94
+ }
95
+ ]
96
+ },
97
+ "ignoreHTTPSErrors": {
98
+ "type": "boolean"
99
+ },
100
+ "slowMo": {
101
+ "type": "number"
102
+ },
103
+ "stealth": {
104
+ "type": "boolean"
105
+ },
106
+ "timeout": {
107
+ "type": "number"
108
+ },
109
+ "userDataDir": {
110
+ "type": "string"
111
+ },
112
+ "waitForInitialPage": {
113
+ "type": "boolean"
114
+ }
115
+ },
116
+ "additionalProperties": false
117
+ }
118
+ },
119
+ "$schema": "http://json-schema.org/draft-07/schema#"
120
+ }
@@ -0,0 +1,8 @@
1
+ import { EdgeCDP, WebsocketRoutes } from '@browserless.io/browserless';
2
+ import { default as ChromiumWebSocketRoute, QuerySchema } from '../../../shared/chromium.ws.js';
3
+ export default class EdgeCDPWebSocketRoute extends ChromiumWebSocketRoute {
4
+ name: string;
5
+ browser: typeof EdgeCDP;
6
+ path: WebsocketRoutes[];
7
+ }
8
+ export { QuerySchema };
@@ -0,0 +1,7 @@
1
+ import { BrowserlessRoutes, EdgeCDP, WebsocketRoutes, } from '@browserless.io/browserless';
2
+ import { default as ChromiumWebSocketRoute, } from '../../../shared/chromium.ws.js';
3
+ export default class EdgeCDPWebSocketRoute extends ChromiumWebSocketRoute {
4
+ name = BrowserlessRoutes.EdgeCDPWebSocketRoute;
5
+ browser = EdgeCDP;
6
+ path = [WebsocketRoutes.edge];
7
+ }
@@ -0,0 +1,120 @@
1
+ {
2
+ "type": "object",
3
+ "properties": {
4
+ "launch": {
5
+ "description": "Launch options, which can be either an object\nof puppeteer.launch options or playwright.launchServer\noptions, depending on the API. Must be either JSON\nobject, or a base64-encoded JSON object.",
6
+ "anyOf": [
7
+ {
8
+ "$ref": "#/definitions/CDPLaunchOptions"
9
+ },
10
+ {
11
+ "type": "string"
12
+ }
13
+ ]
14
+ },
15
+ "blockAds": {
16
+ "description": "Whether or nor to load ad-blocking extensions for the session.\nThis currently uses uBlock Origin and may cause certain sites\nto not load properly.",
17
+ "type": "boolean"
18
+ },
19
+ "timeout": {
20
+ "description": "Override the system-level timeout for this request.\nAccepts a value in milliseconds.",
21
+ "type": "number"
22
+ },
23
+ "token": {
24
+ "description": "The authorization token",
25
+ "type": "string"
26
+ },
27
+ "trackingId": {
28
+ "description": "Custom session identifier",
29
+ "type": "string"
30
+ }
31
+ },
32
+ "additionalProperties": false,
33
+ "definitions": {
34
+ "CDPLaunchOptions": {
35
+ "type": "object",
36
+ "properties": {
37
+ "args": {
38
+ "type": "array",
39
+ "items": {
40
+ "type": "string"
41
+ }
42
+ },
43
+ "defaultViewport": {
44
+ "type": "object",
45
+ "properties": {
46
+ "deviceScaleFactor": {
47
+ "type": "number"
48
+ },
49
+ "hasTouch": {
50
+ "type": "boolean"
51
+ },
52
+ "height": {
53
+ "type": "number"
54
+ },
55
+ "isLandscape": {
56
+ "type": "boolean"
57
+ },
58
+ "isMobile": {
59
+ "type": "boolean"
60
+ },
61
+ "width": {
62
+ "type": "number"
63
+ }
64
+ },
65
+ "additionalProperties": false,
66
+ "required": [
67
+ "height",
68
+ "width"
69
+ ]
70
+ },
71
+ "devtools": {
72
+ "type": "boolean"
73
+ },
74
+ "dumpio": {
75
+ "type": "boolean"
76
+ },
77
+ "headless": {
78
+ "enum": [
79
+ false,
80
+ "shell",
81
+ true
82
+ ]
83
+ },
84
+ "ignoreDefaultArgs": {
85
+ "anyOf": [
86
+ {
87
+ "type": "array",
88
+ "items": {
89
+ "type": "string"
90
+ }
91
+ },
92
+ {
93
+ "type": "boolean"
94
+ }
95
+ ]
96
+ },
97
+ "ignoreHTTPSErrors": {
98
+ "type": "boolean"
99
+ },
100
+ "slowMo": {
101
+ "type": "number"
102
+ },
103
+ "stealth": {
104
+ "type": "boolean"
105
+ },
106
+ "timeout": {
107
+ "type": "number"
108
+ },
109
+ "userDataDir": {
110
+ "type": "string"
111
+ },
112
+ "waitForInitialPage": {
113
+ "type": "boolean"
114
+ }
115
+ },
116
+ "additionalProperties": false
117
+ }
118
+ },
119
+ "$schema": "http://json-schema.org/draft-07/schema#"
120
+ }
@@ -0,0 +1,8 @@
1
+ import { EdgeCDP } from '@browserless.io/browserless';
2
+ import { default as Page, QuerySchema } from '../../../shared/page.ws.js';
3
+ export default class EdgePageWebSocketRoute extends Page {
4
+ name: string;
5
+ browser: typeof EdgeCDP;
6
+ auth: boolean;
7
+ }
8
+ export { QuerySchema };
@@ -0,0 +1,7 @@
1
+ import { BrowserlessRoutes, EdgeCDP } from '@browserless.io/browserless';
2
+ import { default as Page } from '../../../shared/page.ws.js';
3
+ export default class EdgePageWebSocketRoute extends Page {
4
+ name = BrowserlessRoutes.EdgePageWebSocketRoute;
5
+ browser = EdgeCDP;
6
+ auth = false;
7
+ }