@browserless.io/browserless 2.0.0-beta-7 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/README.md +10 -6
  2. package/bin/browserless.js +4 -4
  3. package/bin/scaffold/README.md +7 -7
  4. package/bin/scaffold/tsconfig.json +1 -1
  5. package/browser.json +3 -3
  6. package/build/browsers/cdp-chromium.js +1 -2
  7. package/build/browsers/index.d.ts +9 -0
  8. package/build/browsers/index.js +24 -0
  9. package/build/browsers/playwright-chromium.js +1 -2
  10. package/build/browsers/playwright-firefox.js +1 -2
  11. package/build/browsers/playwright-webkit.js +1 -2
  12. package/build/config.d.ts +9 -0
  13. package/build/config.js +15 -0
  14. package/build/data/selectors.json +1 -1
  15. package/build/file-system.spec.js +1 -1
  16. package/build/http.d.ts +1 -0
  17. package/build/http.js +1 -0
  18. package/build/routes/chromium/http/content-post.body.json +8 -8
  19. package/build/routes/chromium/http/json-version-get.d.ts +15 -0
  20. package/build/routes/chromium/http/json-version-get.js +30 -0
  21. package/build/routes/chromium/http/json-version-get.response.json +37 -0
  22. package/build/routes/chromium/http/pdf-post.body.json +8 -8
  23. package/build/routes/chromium/http/scrape-post.body.json +8 -8
  24. package/build/routes/chromium/http/screenshot-post.body.json +8 -8
  25. package/build/routes/chromium/tests/json-version.spec.d.ts +1 -0
  26. package/build/routes/chromium/tests/json-version.spec.js +37 -0
  27. package/build/utils.js +1 -1
  28. package/package.json +10 -11
  29. package/src/browsers/cdp-chromium.ts +2 -3
  30. package/src/browsers/index.ts +40 -2
  31. package/src/browsers/playwright-chromium.ts +2 -3
  32. package/src/browsers/playwright-firefox.ts +2 -3
  33. package/src/browsers/playwright-webkit.ts +2 -3
  34. package/src/config.ts +17 -0
  35. package/src/file-system.spec.ts +1 -1
  36. package/src/http.ts +1 -0
  37. package/src/routes/chromium/http/json-version-get.ts +55 -0
  38. package/src/routes/chromium/tests/json-version.spec.ts +52 -0
  39. package/src/utils.ts +1 -1
  40. package/static/docs/swagger.json +99 -10
@@ -0,0 +1,55 @@
1
+ import {
2
+ APITags,
3
+ BrowserManager,
4
+ HTTPRoutes,
5
+ HTTPRoute,
6
+ Methods,
7
+ Request,
8
+ Response,
9
+ UnwrapPromise,
10
+ contentTypes,
11
+ jsonResponse,
12
+ writeResponse,
13
+ } from '@browserless.io/browserless';
14
+
15
+ export type ResponseSchema = UnwrapPromise<
16
+ ReturnType<BrowserManager['getVersionJSON']>
17
+ >;
18
+
19
+ export default class GetJSONVersion extends HTTPRoute {
20
+ accepts = [contentTypes.any];
21
+ auth = true;
22
+ browser = null;
23
+ concurrency = false;
24
+ contentTypes = [contentTypes.json];
25
+ description = `Returns a JSON payload that acts as a pass-through to the DevTools /json/version protocol in Chrome.`;
26
+ method = Methods.get;
27
+ path = HTTPRoutes.jsonVersion;
28
+ tags = [APITags.browserAPI];
29
+
30
+ private cachedJSON: ResponseSchema | undefined;
31
+
32
+ handler = async (req: Request, res: Response): Promise<void> => {
33
+ const baseUrl = req.parsed.host;
34
+ const protocol = req.parsed.protocol.includes('s') ? 'wss' : 'ws';
35
+ const browserManager = this.browserManager();
36
+
37
+ try {
38
+ if (!this.cachedJSON) {
39
+ this.cachedJSON = {
40
+ ...(await browserManager.getVersionJSON()),
41
+ webSocketDebuggerUrl: `${protocol}://${baseUrl}`,
42
+ };
43
+ }
44
+
45
+ return jsonResponse(res, 200, this.cachedJSON);
46
+ } catch (err) {
47
+ return writeResponse(
48
+ res,
49
+ 500,
50
+ 'There was an error handling your request',
51
+ contentTypes.text,
52
+ );
53
+ }
54
+ };
55
+ }
@@ -0,0 +1,52 @@
1
+ import { Browserless, Config, Metrics } from '@browserless.io/browserless';
2
+ import { expect } from 'chai';
3
+
4
+ describe('/json/version API', function () {
5
+ let browserless: Browserless;
6
+
7
+ const start = ({
8
+ config = new Config(),
9
+ metrics = new Metrics(),
10
+ }: { config?: Config; metrics?: Metrics } = {}) => {
11
+ browserless = new Browserless({ config, metrics });
12
+ return browserless.start();
13
+ };
14
+
15
+ afterEach(async () => {
16
+ await browserless.stop();
17
+ });
18
+
19
+ it('allows requests to /json/version', async () => {
20
+ const config = new Config();
21
+ config.setToken('browserless');
22
+ const metrics = new Metrics();
23
+ await start({ config, metrics });
24
+
25
+ const res = await fetch(
26
+ 'http://localhost:3000/json/version?token=browserless',
27
+ );
28
+ const resJSON = await res.json();
29
+
30
+ [
31
+ 'Browser',
32
+ 'Protocol-Version',
33
+ 'User-Agent',
34
+ 'V8-Version',
35
+ 'WebKit-Version',
36
+ 'webSocketDebuggerUrl',
37
+ 'Debugger-Version',
38
+ ].forEach((k) => expect(resJSON).to.haveOwnProperty(k));
39
+ });
40
+
41
+ it('rejects unauthorized requests to /json/version', async () => {
42
+ const config = new Config();
43
+ config.setToken('browserless');
44
+ const metrics = new Metrics();
45
+ await start({ config, metrics });
46
+
47
+ const res = await fetch(
48
+ 'http://localhost:3000/json/version?token=imabadboi',
49
+ );
50
+ expect(res.status).to.equal(401);
51
+ });
52
+ });
package/src/utils.ts CHANGED
@@ -53,7 +53,7 @@ export const jsExtension = '.js';
53
53
  export const id = (): string => crypto.randomUUID();
54
54
 
55
55
  export const createLogger = (domain: string): debug.Debugger => {
56
- return debug(`browserless:${domain}`);
56
+ return debug(`browserless.io:${domain}`);
57
57
  };
58
58
 
59
59
  const errorLog = createLogger('error');