@browserless.io/browserless 2.6.1-beta-1 → 2.6.1-beta-3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/build/browsers/chromium.cdp.js +5 -6
  2. package/build/browsers/chromium.playwright.js +6 -6
  3. package/build/browsers/firefox.playwright.js +6 -6
  4. package/build/browsers/webkit.playwright.js +6 -6
  5. package/build/routes/chrome/http/pdf.post.body.json +8 -8
  6. package/build/routes/chromium/http/content.post.body.json +8 -8
  7. package/build/routes/chromium/http/pdf.post.body.json +8 -8
  8. package/build/routes/chromium/http/scrape.post.body.json +8 -8
  9. package/build/routes/chromium/http/screenshot.post.body.json +8 -8
  10. package/package.json +1 -1
  11. package/src/browsers/chromium.cdp.ts +6 -6
  12. package/src/browsers/chromium.playwright.ts +7 -6
  13. package/src/browsers/firefox.playwright.ts +7 -6
  14. package/src/browsers/webkit.playwright.ts +7 -6
  15. package/static/docs/swagger.json +1 -1
  16. package/static/docs/swagger.min.json +1 -1
package/build/browsers/chromium.cdp.js CHANGED
@@ -121,14 +121,13 @@ export class ChromiumCDP extends EventEmitter {
121
121
  if (!this.browserWSEndpoint) {
122
122
  return null;
123
123
  }
124
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
125
- const wsURL = new URL(this.browserWSEndpoint);
126
- wsURL.host = serverURL.host;
127
- wsURL.port = serverURL.port;
124
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
125
+ const { pathname } = new URL(this.browserWSEndpoint);
126
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
128
127
  if (token) {
129
- wsURL.searchParams.set('token', token);
128
+ externalURL.searchParams.set('token', token);
130
129
  }
131
- return wsURL.href;
130
+ return externalURL.href;
132
131
  };
133
132
  proxyPageWebSocket = async (req, socket, head) => new Promise(async (resolve, reject) => {
134
133
  if (!this.browserWSEndpoint || !this.browser) {
package/build/browsers/chromium.playwright.js CHANGED
@@ -2,6 +2,7 @@ import { ServerError, createLogger, } from '@browserless.io/browserless';
2
2
  import playwright from 'playwright-core';
3
3
  import { EventEmitter } from 'events';
4
4
  import httpProxy from 'http-proxy';
5
+ import path from 'path';
5
6
  export class ChromiumPlaywright extends EventEmitter {
6
7
  config;
7
8
  userDataDir;
@@ -68,14 +69,13 @@ export class ChromiumPlaywright extends EventEmitter {
68
69
  if (!this.browserWSEndpoint) {
69
70
  return null;
70
71
  }
71
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
72
- const wsURL = new URL(this.browserWSEndpoint);
73
- wsURL.host = serverURL.host;
74
- wsURL.port = serverURL.port;
72
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
73
+ const { pathname } = new URL(this.browserWSEndpoint);
74
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
75
75
  if (token) {
76
- wsURL.searchParams.set('token', token);
76
+ externalURL.searchParams.set('token', token);
77
77
  }
78
- return wsURL.href;
78
+ return externalURL.href;
79
79
  };
80
80
  proxyPageWebSocket = async () => {
81
81
  console.warn(`Not yet implemented`);
package/build/browsers/firefox.playwright.js CHANGED
@@ -2,6 +2,7 @@ import { ServerError, createLogger, } from '@browserless.io/browserless';
2
2
  import playwright from 'playwright-core';
3
3
  import { EventEmitter } from 'events';
4
4
  import httpProxy from 'http-proxy';
5
+ import path from 'path';
5
6
  export class FirefoxPlaywright extends EventEmitter {
6
7
  config;
7
8
  userDataDir;
@@ -62,14 +63,13 @@ export class FirefoxPlaywright extends EventEmitter {
62
63
  if (!this.browserWSEndpoint) {
63
64
  return null;
64
65
  }
65
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
66
- const wsURL = new URL(this.browserWSEndpoint);
67
- wsURL.host = serverURL.host;
68
- wsURL.port = serverURL.port;
66
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
67
+ const { pathname } = new URL(this.browserWSEndpoint);
68
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
69
69
  if (token) {
70
- wsURL.searchParams.set('token', token);
70
+ externalURL.searchParams.set('token', token);
71
71
  }
72
- return wsURL.href;
72
+ return externalURL.href;
73
73
  };
74
74
  proxyPageWebSocket = async () => {
75
75
  console.warn(`Not yet implemented`);
package/build/browsers/webkit.playwright.js CHANGED
@@ -2,6 +2,7 @@ import { ServerError, createLogger, } from '@browserless.io/browserless';
2
2
  import playwright from 'playwright-core';
3
3
  import { EventEmitter } from 'events';
4
4
  import httpProxy from 'http-proxy';
5
+ import path from 'path';
5
6
  export class WebkitPlaywright extends EventEmitter {
6
7
  config;
7
8
  userDataDir;
@@ -62,14 +63,13 @@ export class WebkitPlaywright extends EventEmitter {
62
63
  if (!this.browserWSEndpoint) {
63
64
  return null;
64
65
  }
65
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
66
- const wsURL = new URL(this.browserWSEndpoint);
67
- wsURL.host = serverURL.host;
68
- wsURL.port = serverURL.port;
66
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
67
+ const { pathname } = new URL(this.browserWSEndpoint);
68
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
69
69
  if (token) {
70
- wsURL.searchParams.set('token', token);
70
+ externalURL.searchParams.set('token', token);
71
71
  }
72
- return wsURL.href;
72
+ return externalURL.href;
73
73
  };
74
74
  proxyPageWebSocket = async () => {
75
75
  console.warn(`Not yet implemented`);
package/build/routes/chrome/http/pdf.post.body.json CHANGED
@@ -535,14 +535,14 @@
535
535
  "length": {
536
536
  "type": "number"
537
537
  },
538
- "__@toStringTag@86962": {
538
+ "__@toStringTag@76117": {
539
539
  "type": "string",
540
540
  "const": "Uint8Array"
541
541
  }
542
542
  },
543
543
  "required": [
544
544
  "BYTES_PER_ELEMENT",
545
- "__@toStringTag@86962",
545
+ "__@toStringTag@76117",
546
546
  "buffer",
547
547
  "byteLength",
548
548
  "byteOffset",
@@ -577,13 +577,13 @@
577
577
  "byteLength": {
578
578
  "type": "number"
579
579
  },
580
- "__@toStringTag@86962": {
580
+ "__@toStringTag@76117": {
581
581
  "type": "string"
582
582
  }
583
583
  },
584
584
  "additionalProperties": false,
585
585
  "required": [
586
- "__@toStringTag@86962",
586
+ "__@toStringTag@76117",
587
587
  "byteLength"
588
588
  ]
589
589
  },
@@ -593,18 +593,18 @@
593
593
  "byteLength": {
594
594
  "type": "number"
595
595
  },
596
- "__@species@87063": {
596
+ "__@species@76218": {
597
597
  "$ref": "#/definitions/SharedArrayBuffer"
598
598
  },
599
- "__@toStringTag@86962": {
599
+ "__@toStringTag@76117": {
600
600
  "type": "string",
601
601
  "const": "SharedArrayBuffer"
602
602
  }
603
603
  },
604
604
  "additionalProperties": false,
605
605
  "required": [
606
- "__@species@87063",
607
- "__@toStringTag@86962",
606
+ "__@species@76218",
607
+ "__@toStringTag@76117",
608
608
  "byteLength"
609
609
  ]
610
610
  },
package/build/routes/chromium/http/content.post.body.json CHANGED
@@ -394,14 +394,14 @@
394
394
  "length": {
395
395
  "type": "number"
396
396
  },
397
- "__@toStringTag@131136": {
397
+ "__@toStringTag@141962": {
398
398
  "type": "string",
399
399
  "const": "Uint8Array"
400
400
  }
401
401
  },
402
402
  "required": [
403
403
  "BYTES_PER_ELEMENT",
404
- "__@toStringTag@131136",
404
+ "__@toStringTag@141962",
405
405
  "buffer",
406
406
  "byteLength",
407
407
  "byteOffset",
@@ -436,13 +436,13 @@
436
436
  "byteLength": {
437
437
  "type": "number"
438
438
  },
439
- "__@toStringTag@131136": {
439
+ "__@toStringTag@141962": {
440
440
  "type": "string"
441
441
  }
442
442
  },
443
443
  "additionalProperties": false,
444
444
  "required": [
445
- "__@toStringTag@131136",
445
+ "__@toStringTag@141962",
446
446
  "byteLength"
447
447
  ]
448
448
  },
@@ -452,18 +452,18 @@
452
452
  "byteLength": {
453
453
  "type": "number"
454
454
  },
455
- "__@species@131237": {
455
+ "__@species@142063": {
456
456
  "$ref": "#/definitions/SharedArrayBuffer"
457
457
  },
458
- "__@toStringTag@131136": {
458
+ "__@toStringTag@141962": {
459
459
  "type": "string",
460
460
  "const": "SharedArrayBuffer"
461
461
  }
462
462
  },
463
463
  "additionalProperties": false,
464
464
  "required": [
465
- "__@species@131237",
466
- "__@toStringTag@131136",
465
+ "__@species@142063",
466
+ "__@toStringTag@141962",
467
467
  "byteLength"
468
468
  ]
469
469
  },
package/build/routes/chromium/http/pdf.post.body.json CHANGED
@@ -535,14 +535,14 @@
535
535
  "length": {
536
536
  "type": "number"
537
537
  },
538
- "__@toStringTag@196314": {
538
+ "__@toStringTag@218297": {
539
539
  "type": "string",
540
540
  "const": "Uint8Array"
541
541
  }
542
542
  },
543
543
  "required": [
544
544
  "BYTES_PER_ELEMENT",
545
- "__@toStringTag@196314",
545
+ "__@toStringTag@218297",
546
546
  "buffer",
547
547
  "byteLength",
548
548
  "byteOffset",
@@ -577,13 +577,13 @@
577
577
  "byteLength": {
578
578
  "type": "number"
579
579
  },
580
- "__@toStringTag@196314": {
580
+ "__@toStringTag@218297": {
581
581
  "type": "string"
582
582
  }
583
583
  },
584
584
  "additionalProperties": false,
585
585
  "required": [
586
- "__@toStringTag@196314",
586
+ "__@toStringTag@218297",
587
587
  "byteLength"
588
588
  ]
589
589
  },
@@ -593,18 +593,18 @@
593
593
  "byteLength": {
594
594
  "type": "number"
595
595
  },
596
- "__@species@196415": {
596
+ "__@species@218398": {
597
597
  "$ref": "#/definitions/SharedArrayBuffer"
598
598
  },
599
- "__@toStringTag@196314": {
599
+ "__@toStringTag@218297": {
600
600
  "type": "string",
601
601
  "const": "SharedArrayBuffer"
602
602
  }
603
603
  },
604
604
  "additionalProperties": false,
605
605
  "required": [
606
- "__@species@196415",
607
- "__@toStringTag@196314",
606
+ "__@species@218398",
607
+ "__@toStringTag@218297",
608
608
  "byteLength"
609
609
  ]
610
610
  },
package/build/routes/chromium/http/scrape.post.body.json CHANGED
@@ -441,14 +441,14 @@
441
441
  "length": {
442
442
  "type": "number"
443
443
  },
444
- "__@toStringTag@250948": {
444
+ "__@toStringTag@207128": {
445
445
  "type": "string",
446
446
  "const": "Uint8Array"
447
447
  }
448
448
  },
449
449
  "required": [
450
450
  "BYTES_PER_ELEMENT",
451
- "__@toStringTag@250948",
451
+ "__@toStringTag@207128",
452
452
  "buffer",
453
453
  "byteLength",
454
454
  "byteOffset",
@@ -483,13 +483,13 @@
483
483
  "byteLength": {
484
484
  "type": "number"
485
485
  },
486
- "__@toStringTag@250948": {
486
+ "__@toStringTag@207128": {
487
487
  "type": "string"
488
488
  }
489
489
  },
490
490
  "additionalProperties": false,
491
491
  "required": [
492
- "__@toStringTag@250948",
492
+ "__@toStringTag@207128",
493
493
  "byteLength"
494
494
  ]
495
495
  },
@@ -499,18 +499,18 @@
499
499
  "byteLength": {
500
500
  "type": "number"
501
501
  },
502
- "__@species@251049": {
502
+ "__@species@207229": {
503
503
  "$ref": "#/definitions/SharedArrayBuffer"
504
504
  },
505
- "__@toStringTag@250948": {
505
+ "__@toStringTag@207128": {
506
506
  "type": "string",
507
507
  "const": "SharedArrayBuffer"
508
508
  }
509
509
  },
510
510
  "additionalProperties": false,
511
511
  "required": [
512
- "__@species@251049",
513
- "__@toStringTag@250948",
512
+ "__@species@207229",
513
+ "__@toStringTag@207128",
514
514
  "byteLength"
515
515
  ]
516
516
  },
package/build/routes/chromium/http/screenshot.post.body.json CHANGED
@@ -484,14 +484,14 @@
484
484
  "length": {
485
485
  "type": "number"
486
486
  },
487
- "__@toStringTag@218241": {
487
+ "__@toStringTag@229399": {
488
488
  "type": "string",
489
489
  "const": "Uint8Array"
490
490
  }
491
491
  },
492
492
  "required": [
493
493
  "BYTES_PER_ELEMENT",
494
- "__@toStringTag@218241",
494
+ "__@toStringTag@229399",
495
495
  "buffer",
496
496
  "byteLength",
497
497
  "byteOffset",
@@ -526,13 +526,13 @@
526
526
  "byteLength": {
527
527
  "type": "number"
528
528
  },
529
- "__@toStringTag@218241": {
529
+ "__@toStringTag@229399": {
530
530
  "type": "string"
531
531
  }
532
532
  },
533
533
  "additionalProperties": false,
534
534
  "required": [
535
- "__@toStringTag@218241",
535
+ "__@toStringTag@229399",
536
536
  "byteLength"
537
537
  ]
538
538
  },
@@ -542,18 +542,18 @@
542
542
  "byteLength": {
543
543
  "type": "number"
544
544
  },
545
- "__@species@218342": {
545
+ "__@species@229500": {
546
546
  "$ref": "#/definitions/SharedArrayBuffer"
547
547
  },
548
- "__@toStringTag@218241": {
548
+ "__@toStringTag@229399": {
549
549
  "type": "string",
550
550
  "const": "SharedArrayBuffer"
551
551
  }
552
552
  },
553
553
  "additionalProperties": false,
554
554
  "required": [
555
- "__@species@218342",
556
- "__@toStringTag@218241",
555
+ "__@species@229500",
556
+ "__@toStringTag@229399",
557
557
  "byteLength"
558
558
  ]
559
559
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@browserless.io/browserless",
3
- "version": "2.6.1-beta-1",
3
+ "version": "2.6.1-beta-3",
4
4
  "license": "SSPL",
5
5
  "description": "The browserless platform",
6
6
  "author": "browserless.io",
package/src/browsers/chromium.cdp.ts CHANGED
@@ -175,16 +175,16 @@ export class ChromiumCDP extends EventEmitter {
175
175
  return null;
176
176
  }
177
177
 
178
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
179
- const wsURL = new URL(this.browserWSEndpoint);
180
- wsURL.host = serverURL.host;
181
- wsURL.port = serverURL.port;
178
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
179
+ const { pathname } = new URL(this.browserWSEndpoint);
180
+
181
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
182
182
 
183
183
  if (token) {
184
- wsURL.searchParams.set('token', token);
184
+ externalURL.searchParams.set('token', token);
185
185
  }
186
186
 
187
- return wsURL.href;
187
+ return externalURL.href;
188
188
  };
189
189
 
190
190
  public proxyPageWebSocket = async (
package/src/browsers/chromium.playwright.ts CHANGED
@@ -9,6 +9,7 @@ import playwright, { Page } from 'playwright-core';
9
9
  import { Duplex } from 'stream';
10
10
  import { EventEmitter } from 'events';
11
11
  import httpProxy from 'http-proxy';
12
+ import path from 'path';
12
13
 
13
14
  export class ChromiumPlaywright extends EventEmitter {
14
15
  protected config: Config;
@@ -104,16 +105,16 @@ export class ChromiumPlaywright extends EventEmitter {
104
105
  return null;
105
106
  }
106
107
 
107
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
108
- const wsURL = new URL(this.browserWSEndpoint);
109
- wsURL.host = serverURL.host;
110
- wsURL.port = serverURL.port;
108
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
109
+ const { pathname } = new URL(this.browserWSEndpoint);
110
+
111
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
111
112
 
112
113
  if (token) {
113
- wsURL.searchParams.set('token', token);
114
+ externalURL.searchParams.set('token', token);
114
115
  }
115
116
 
116
- return wsURL.href;
117
+ return externalURL.href;
117
118
  };
118
119
 
119
120
  public proxyPageWebSocket = async () => {
package/src/browsers/firefox.playwright.ts CHANGED
@@ -9,6 +9,7 @@ import playwright, { Page } from 'playwright-core';
9
9
  import { Duplex } from 'stream';
10
10
  import { EventEmitter } from 'events';
11
11
  import httpProxy from 'http-proxy';
12
+ import path from 'path';
12
13
 
13
14
  export class FirefoxPlaywright extends EventEmitter {
14
15
  protected config: Config;
@@ -96,16 +97,16 @@ export class FirefoxPlaywright extends EventEmitter {
96
97
  return null;
97
98
  }
98
99
 
99
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
100
- const wsURL = new URL(this.browserWSEndpoint);
101
- wsURL.host = serverURL.host;
102
- wsURL.port = serverURL.port;
100
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
101
+ const { pathname } = new URL(this.browserWSEndpoint);
102
+
103
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
103
104
 
104
105
  if (token) {
105
- wsURL.searchParams.set('token', token);
106
+ externalURL.searchParams.set('token', token);
106
107
  }
107
108
 
108
- return wsURL.href;
109
+ return externalURL.href;
109
110
  };
110
111
 
111
112
  public proxyPageWebSocket = async () => {
package/src/browsers/webkit.playwright.ts CHANGED
@@ -9,6 +9,7 @@ import playwright, { Page } from 'playwright-core';
9
9
  import { Duplex } from 'stream';
10
10
  import { EventEmitter } from 'events';
11
11
  import httpProxy from 'http-proxy';
12
+ import path from 'path';
12
13
 
13
14
  export class WebkitPlaywright extends EventEmitter {
14
15
  protected config: Config;
@@ -96,16 +97,16 @@ export class WebkitPlaywright extends EventEmitter {
96
97
  return null;
97
98
  }
98
99
 
99
- const serverURL = new URL(this.config.getExternalWebSocketAddress());
100
- const wsURL = new URL(this.browserWSEndpoint);
101
- wsURL.host = serverURL.host;
102
- wsURL.port = serverURL.port;
100
+ const externalURL = new URL(this.config.getExternalWebSocketAddress());
101
+ const { pathname } = new URL(this.browserWSEndpoint);
102
+
103
+ externalURL.pathname = path.join(externalURL.pathname, pathname);
103
104
 
104
105
  if (token) {
105
- wsURL.searchParams.set('token', token);
106
+ externalURL.searchParams.set('token', token);
106
107
  }
107
108
 
108
- return wsURL.href;
109
+ return externalURL.href;
109
110
  };
110
111
 
111
112
  public proxyPageWebSocket = async () => {
package/static/docs/swagger.json CHANGED
@@ -1098,7 +1098,7 @@
1098
1098
  },
1099
1099
  "info": {
1100
1100
  "title": "Browserless",
1101
- "version": "2.6.1-beta-1",
1101
+ "version": "2.6.1-beta-3",
1102
1102
  "x-logo": {
1103
1103
  "altText": "browserless logo",
1104
1104
  "url": "./docs/browserless-logo-inline.svg"
package/static/docs/swagger.min.json CHANGED
@@ -1098,7 +1098,7 @@
1098
1098
  },
1099
1099
  "info": {
1100
1100
  "title": "Browserless",
1101
- "version": "2.6.1-beta-1",
1101
+ "version": "2.6.1-beta-3",
1102
1102
  "x-logo": {
1103
1103
  "altText": "browserless logo",
1104
1104
  "url": "./docs/browserless-logo-inline.svg"