@browserless.io/browserless 2.29.0-beta-4 → 2.29.0-beta-6
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.
- package/build/browserless.js +11 -12
- package/build/routes/chrome/http/content.post.body.json +8 -8
- package/build/routes/chrome/http/pdf.post.body.json +8 -8
- package/build/routes/chrome/http/scrape.post.body.json +8 -8
- package/build/routes/chrome/http/screenshot.post.body.json +8 -8
- package/build/routes/chromium/http/content.post.body.json +8 -8
- package/build/routes/chromium/http/pdf.post.body.json +8 -8
- package/build/routes/chromium/http/scrape.post.body.json +8 -8
- package/build/routes/chromium/http/screenshot.post.body.json +8 -8
- package/build/routes/edge/http/content.post.body.json +8 -8
- package/build/routes/edge/http/pdf.post.body.json +8 -8
- package/build/routes/edge/http/scrape.post.body.json +8 -8
- package/build/routes/edge/http/screenshot.post.body.json +8 -8
- package/package.json +1 -1
- package/src/browserless.ts +26 -24
- package/static/docs/swagger.json +9 -9
- package/static/docs/swagger.min.json +9 -9
package/build/browserless.js
CHANGED
|
@@ -51,12 +51,14 @@ export class Browserless extends EventEmitter {
|
|
|
51
51
|
// Filter out routes that are not able to work on the arm64 architecture
|
|
52
52
|
// and log a message as to why that is (can't run Chrome on non-apple arm64)
|
|
53
53
|
filterRoutes(route) {
|
|
54
|
+
const unsupportedArmBrowsers = ['chrome', 'edge'];
|
|
55
|
+
const browserName = ('browser' in route && route.browser?.name?.toLowerCase()) || '';
|
|
54
56
|
if (isArm64 &&
|
|
55
57
|
!isMacOS &&
|
|
56
58
|
'browser' in route &&
|
|
57
59
|
route.browser &&
|
|
58
|
-
|
|
59
|
-
this.logger.warn(`Ignoring route "${route.path}" because it is not supported on arm64 platforms (route requires browser
|
|
60
|
+
unsupportedArmBrowsers.some((n) => n.includes(browserName))) {
|
|
61
|
+
this.logger.warn(`Ignoring route "${route.path}" because it is not supported on arm64 platforms (route requires browser ${route.browser.name}).`);
|
|
60
62
|
return false;
|
|
61
63
|
}
|
|
62
64
|
return true;
|
|
@@ -210,9 +212,9 @@ export class Browserless extends EventEmitter {
|
|
|
210
212
|
}
|
|
211
213
|
}
|
|
212
214
|
}
|
|
213
|
-
const
|
|
214
|
-
|
|
215
|
-
allRoutes.
|
|
215
|
+
const filteredHTTPRoutes = httpRoutes.filter((r) => this.filterRoutes(r));
|
|
216
|
+
const filteredWSRoutes = wsRoutes.filter((r) => this.filterRoutes(r));
|
|
217
|
+
const allRoutes = [...filteredHTTPRoutes, ...filteredWSRoutes].map((route) => {
|
|
216
218
|
if ('browser' in route &&
|
|
217
219
|
route.browser &&
|
|
218
220
|
internalBrowsers.includes(route.browser) &&
|
|
@@ -220,19 +222,16 @@ export class Browserless extends EventEmitter {
|
|
|
220
222
|
throw new Error(dedent(`Couldn't load route "${route.path}" due to missing browser binary for "${route.browser?.name}".
|
|
221
223
|
Installed Browsers: ${installedBrowsers.map((b) => b.name).join(', ')}`));
|
|
222
224
|
}
|
|
225
|
+
return route;
|
|
223
226
|
});
|
|
224
227
|
const duplicateNamedRoutes = allRoutes
|
|
225
228
|
.filter((e, i, a) => a.findIndex((r) => r.name === e.name) !== i)
|
|
226
229
|
.map((r) => r.name);
|
|
227
230
|
if (duplicateNamedRoutes.length) {
|
|
228
|
-
this.logger.warn(`Found duplicate routing names. Route names must be unique:`, duplicateNamedRoutes);
|
|
231
|
+
this.logger.warn(`Found duplicate routing names. Route names must be unique in order to prevent collisions:`, duplicateNamedRoutes);
|
|
229
232
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
.forEach((r) => this.router.registerHTTPRoute(r));
|
|
233
|
-
wsRoutes
|
|
234
|
-
.filter((r) => this.filterRoutes(r))
|
|
235
|
-
.forEach((r) => this.router.registerWebSocketRoute(r));
|
|
233
|
+
filteredHTTPRoutes.forEach((r) => this.router.registerHTTPRoute(r));
|
|
234
|
+
filteredWSRoutes.forEach((r) => this.router.registerWebSocketRoute(r));
|
|
236
235
|
this.logger.info(`Imported and validated all route files, starting up server.`);
|
|
237
236
|
this.server = new HTTPServer(this.config, this.metrics, this.token, this.router, this.hooks, this.Logger);
|
|
238
237
|
await this.loadPwVersions();
|
|
@@ -463,14 +463,14 @@
|
|
|
463
463
|
"length": {
|
|
464
464
|
"type": "number"
|
|
465
465
|
},
|
|
466
|
-
"__@toStringTag@
|
|
466
|
+
"__@toStringTag@59177": {
|
|
467
467
|
"type": "string",
|
|
468
468
|
"const": "Uint8Array"
|
|
469
469
|
}
|
|
470
470
|
},
|
|
471
471
|
"required": [
|
|
472
472
|
"BYTES_PER_ELEMENT",
|
|
473
|
-
"__@toStringTag@
|
|
473
|
+
"__@toStringTag@59177",
|
|
474
474
|
"buffer",
|
|
475
475
|
"byteLength",
|
|
476
476
|
"byteOffset",
|
|
@@ -505,13 +505,13 @@
|
|
|
505
505
|
"byteLength": {
|
|
506
506
|
"type": "number"
|
|
507
507
|
},
|
|
508
|
-
"__@toStringTag@
|
|
508
|
+
"__@toStringTag@59177": {
|
|
509
509
|
"type": "string"
|
|
510
510
|
}
|
|
511
511
|
},
|
|
512
512
|
"additionalProperties": false,
|
|
513
513
|
"required": [
|
|
514
|
-
"__@toStringTag@
|
|
514
|
+
"__@toStringTag@59177",
|
|
515
515
|
"byteLength"
|
|
516
516
|
]
|
|
517
517
|
},
|
|
@@ -521,18 +521,18 @@
|
|
|
521
521
|
"byteLength": {
|
|
522
522
|
"type": "number"
|
|
523
523
|
},
|
|
524
|
-
"__@species@
|
|
524
|
+
"__@species@59215": {
|
|
525
525
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
526
526
|
},
|
|
527
|
-
"__@toStringTag@
|
|
527
|
+
"__@toStringTag@59177": {
|
|
528
528
|
"type": "string",
|
|
529
529
|
"const": "SharedArrayBuffer"
|
|
530
530
|
}
|
|
531
531
|
},
|
|
532
532
|
"additionalProperties": false,
|
|
533
533
|
"required": [
|
|
534
|
-
"__@species@
|
|
535
|
-
"__@toStringTag@
|
|
534
|
+
"__@species@59215",
|
|
535
|
+
"__@toStringTag@59177",
|
|
536
536
|
"byteLength"
|
|
537
537
|
]
|
|
538
538
|
},
|
|
@@ -608,14 +608,14 @@
|
|
|
608
608
|
"length": {
|
|
609
609
|
"type": "number"
|
|
610
610
|
},
|
|
611
|
-
"__@toStringTag@
|
|
611
|
+
"__@toStringTag@74181": {
|
|
612
612
|
"type": "string",
|
|
613
613
|
"const": "Uint8Array"
|
|
614
614
|
}
|
|
615
615
|
},
|
|
616
616
|
"required": [
|
|
617
617
|
"BYTES_PER_ELEMENT",
|
|
618
|
-
"__@toStringTag@
|
|
618
|
+
"__@toStringTag@74181",
|
|
619
619
|
"buffer",
|
|
620
620
|
"byteLength",
|
|
621
621
|
"byteOffset",
|
|
@@ -650,13 +650,13 @@
|
|
|
650
650
|
"byteLength": {
|
|
651
651
|
"type": "number"
|
|
652
652
|
},
|
|
653
|
-
"__@toStringTag@
|
|
653
|
+
"__@toStringTag@74181": {
|
|
654
654
|
"type": "string"
|
|
655
655
|
}
|
|
656
656
|
},
|
|
657
657
|
"additionalProperties": false,
|
|
658
658
|
"required": [
|
|
659
|
-
"__@toStringTag@
|
|
659
|
+
"__@toStringTag@74181",
|
|
660
660
|
"byteLength"
|
|
661
661
|
]
|
|
662
662
|
},
|
|
@@ -666,18 +666,18 @@
|
|
|
666
666
|
"byteLength": {
|
|
667
667
|
"type": "number"
|
|
668
668
|
},
|
|
669
|
-
"__@species@
|
|
669
|
+
"__@species@74219": {
|
|
670
670
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
671
671
|
},
|
|
672
|
-
"__@toStringTag@
|
|
672
|
+
"__@toStringTag@74181": {
|
|
673
673
|
"type": "string",
|
|
674
674
|
"const": "SharedArrayBuffer"
|
|
675
675
|
}
|
|
676
676
|
},
|
|
677
677
|
"additionalProperties": false,
|
|
678
678
|
"required": [
|
|
679
|
-
"__@species@
|
|
680
|
-
"__@toStringTag@
|
|
679
|
+
"__@species@74219",
|
|
680
|
+
"__@toStringTag@74181",
|
|
681
681
|
"byteLength"
|
|
682
682
|
]
|
|
683
683
|
},
|
|
@@ -510,14 +510,14 @@
|
|
|
510
510
|
"length": {
|
|
511
511
|
"type": "number"
|
|
512
512
|
},
|
|
513
|
-
"__@toStringTag@
|
|
513
|
+
"__@toStringTag@148209": {
|
|
514
514
|
"type": "string",
|
|
515
515
|
"const": "Uint8Array"
|
|
516
516
|
}
|
|
517
517
|
},
|
|
518
518
|
"required": [
|
|
519
519
|
"BYTES_PER_ELEMENT",
|
|
520
|
-
"__@toStringTag@
|
|
520
|
+
"__@toStringTag@148209",
|
|
521
521
|
"buffer",
|
|
522
522
|
"byteLength",
|
|
523
523
|
"byteOffset",
|
|
@@ -552,13 +552,13 @@
|
|
|
552
552
|
"byteLength": {
|
|
553
553
|
"type": "number"
|
|
554
554
|
},
|
|
555
|
-
"__@toStringTag@
|
|
555
|
+
"__@toStringTag@148209": {
|
|
556
556
|
"type": "string"
|
|
557
557
|
}
|
|
558
558
|
},
|
|
559
559
|
"additionalProperties": false,
|
|
560
560
|
"required": [
|
|
561
|
-
"__@toStringTag@
|
|
561
|
+
"__@toStringTag@148209",
|
|
562
562
|
"byteLength"
|
|
563
563
|
]
|
|
564
564
|
},
|
|
@@ -568,18 +568,18 @@
|
|
|
568
568
|
"byteLength": {
|
|
569
569
|
"type": "number"
|
|
570
570
|
},
|
|
571
|
-
"__@species@
|
|
571
|
+
"__@species@148247": {
|
|
572
572
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
573
573
|
},
|
|
574
|
-
"__@toStringTag@
|
|
574
|
+
"__@toStringTag@148209": {
|
|
575
575
|
"type": "string",
|
|
576
576
|
"const": "SharedArrayBuffer"
|
|
577
577
|
}
|
|
578
578
|
},
|
|
579
579
|
"additionalProperties": false,
|
|
580
580
|
"required": [
|
|
581
|
-
"__@species@
|
|
582
|
-
"__@toStringTag@
|
|
581
|
+
"__@species@148247",
|
|
582
|
+
"__@toStringTag@148209",
|
|
583
583
|
"byteLength"
|
|
584
584
|
]
|
|
585
585
|
},
|
|
@@ -553,14 +553,14 @@
|
|
|
553
553
|
"length": {
|
|
554
554
|
"type": "number"
|
|
555
555
|
},
|
|
556
|
-
"__@toStringTag@
|
|
556
|
+
"__@toStringTag@163260": {
|
|
557
557
|
"type": "string",
|
|
558
558
|
"const": "Uint8Array"
|
|
559
559
|
}
|
|
560
560
|
},
|
|
561
561
|
"required": [
|
|
562
562
|
"BYTES_PER_ELEMENT",
|
|
563
|
-
"__@toStringTag@
|
|
563
|
+
"__@toStringTag@163260",
|
|
564
564
|
"buffer",
|
|
565
565
|
"byteLength",
|
|
566
566
|
"byteOffset",
|
|
@@ -595,13 +595,13 @@
|
|
|
595
595
|
"byteLength": {
|
|
596
596
|
"type": "number"
|
|
597
597
|
},
|
|
598
|
-
"__@toStringTag@
|
|
598
|
+
"__@toStringTag@163260": {
|
|
599
599
|
"type": "string"
|
|
600
600
|
}
|
|
601
601
|
},
|
|
602
602
|
"additionalProperties": false,
|
|
603
603
|
"required": [
|
|
604
|
-
"__@toStringTag@
|
|
604
|
+
"__@toStringTag@163260",
|
|
605
605
|
"byteLength"
|
|
606
606
|
]
|
|
607
607
|
},
|
|
@@ -611,18 +611,18 @@
|
|
|
611
611
|
"byteLength": {
|
|
612
612
|
"type": "number"
|
|
613
613
|
},
|
|
614
|
-
"__@species@
|
|
614
|
+
"__@species@163298": {
|
|
615
615
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
616
616
|
},
|
|
617
|
-
"__@toStringTag@
|
|
617
|
+
"__@toStringTag@163260": {
|
|
618
618
|
"type": "string",
|
|
619
619
|
"const": "SharedArrayBuffer"
|
|
620
620
|
}
|
|
621
621
|
},
|
|
622
622
|
"additionalProperties": false,
|
|
623
623
|
"required": [
|
|
624
|
-
"__@species@
|
|
625
|
-
"__@toStringTag@
|
|
624
|
+
"__@species@163298",
|
|
625
|
+
"__@toStringTag@163260",
|
|
626
626
|
"byteLength"
|
|
627
627
|
]
|
|
628
628
|
},
|
|
@@ -463,14 +463,14 @@
|
|
|
463
463
|
"length": {
|
|
464
464
|
"type": "number"
|
|
465
465
|
},
|
|
466
|
-
"__@toStringTag@
|
|
466
|
+
"__@toStringTag@178221": {
|
|
467
467
|
"type": "string",
|
|
468
468
|
"const": "Uint8Array"
|
|
469
469
|
}
|
|
470
470
|
},
|
|
471
471
|
"required": [
|
|
472
472
|
"BYTES_PER_ELEMENT",
|
|
473
|
-
"__@toStringTag@
|
|
473
|
+
"__@toStringTag@178221",
|
|
474
474
|
"buffer",
|
|
475
475
|
"byteLength",
|
|
476
476
|
"byteOffset",
|
|
@@ -505,13 +505,13 @@
|
|
|
505
505
|
"byteLength": {
|
|
506
506
|
"type": "number"
|
|
507
507
|
},
|
|
508
|
-
"__@toStringTag@
|
|
508
|
+
"__@toStringTag@178221": {
|
|
509
509
|
"type": "string"
|
|
510
510
|
}
|
|
511
511
|
},
|
|
512
512
|
"additionalProperties": false,
|
|
513
513
|
"required": [
|
|
514
|
-
"__@toStringTag@
|
|
514
|
+
"__@toStringTag@178221",
|
|
515
515
|
"byteLength"
|
|
516
516
|
]
|
|
517
517
|
},
|
|
@@ -521,18 +521,18 @@
|
|
|
521
521
|
"byteLength": {
|
|
522
522
|
"type": "number"
|
|
523
523
|
},
|
|
524
|
-
"__@species@
|
|
524
|
+
"__@species@178259": {
|
|
525
525
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
526
526
|
},
|
|
527
|
-
"__@toStringTag@
|
|
527
|
+
"__@toStringTag@178221": {
|
|
528
528
|
"type": "string",
|
|
529
529
|
"const": "SharedArrayBuffer"
|
|
530
530
|
}
|
|
531
531
|
},
|
|
532
532
|
"additionalProperties": false,
|
|
533
533
|
"required": [
|
|
534
|
-
"__@species@
|
|
535
|
-
"__@toStringTag@
|
|
534
|
+
"__@species@178259",
|
|
535
|
+
"__@toStringTag@178221",
|
|
536
536
|
"byteLength"
|
|
537
537
|
]
|
|
538
538
|
},
|
|
@@ -608,14 +608,14 @@
|
|
|
608
608
|
"length": {
|
|
609
609
|
"type": "number"
|
|
610
610
|
},
|
|
611
|
-
"__@toStringTag@
|
|
611
|
+
"__@toStringTag@281781": {
|
|
612
612
|
"type": "string",
|
|
613
613
|
"const": "Uint8Array"
|
|
614
614
|
}
|
|
615
615
|
},
|
|
616
616
|
"required": [
|
|
617
617
|
"BYTES_PER_ELEMENT",
|
|
618
|
-
"__@toStringTag@
|
|
618
|
+
"__@toStringTag@281781",
|
|
619
619
|
"buffer",
|
|
620
620
|
"byteLength",
|
|
621
621
|
"byteOffset",
|
|
@@ -650,13 +650,13 @@
|
|
|
650
650
|
"byteLength": {
|
|
651
651
|
"type": "number"
|
|
652
652
|
},
|
|
653
|
-
"__@toStringTag@
|
|
653
|
+
"__@toStringTag@281781": {
|
|
654
654
|
"type": "string"
|
|
655
655
|
}
|
|
656
656
|
},
|
|
657
657
|
"additionalProperties": false,
|
|
658
658
|
"required": [
|
|
659
|
-
"__@toStringTag@
|
|
659
|
+
"__@toStringTag@281781",
|
|
660
660
|
"byteLength"
|
|
661
661
|
]
|
|
662
662
|
},
|
|
@@ -666,18 +666,18 @@
|
|
|
666
666
|
"byteLength": {
|
|
667
667
|
"type": "number"
|
|
668
668
|
},
|
|
669
|
-
"__@species@
|
|
669
|
+
"__@species@281819": {
|
|
670
670
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
671
671
|
},
|
|
672
|
-
"__@toStringTag@
|
|
672
|
+
"__@toStringTag@281781": {
|
|
673
673
|
"type": "string",
|
|
674
674
|
"const": "SharedArrayBuffer"
|
|
675
675
|
}
|
|
676
676
|
},
|
|
677
677
|
"additionalProperties": false,
|
|
678
678
|
"required": [
|
|
679
|
-
"__@species@
|
|
680
|
-
"__@toStringTag@
|
|
679
|
+
"__@species@281819",
|
|
680
|
+
"__@toStringTag@281781",
|
|
681
681
|
"byteLength"
|
|
682
682
|
]
|
|
683
683
|
},
|
|
@@ -510,14 +510,14 @@
|
|
|
510
510
|
"length": {
|
|
511
511
|
"type": "number"
|
|
512
512
|
},
|
|
513
|
-
"__@toStringTag@
|
|
513
|
+
"__@toStringTag@311521": {
|
|
514
514
|
"type": "string",
|
|
515
515
|
"const": "Uint8Array"
|
|
516
516
|
}
|
|
517
517
|
},
|
|
518
518
|
"required": [
|
|
519
519
|
"BYTES_PER_ELEMENT",
|
|
520
|
-
"__@toStringTag@
|
|
520
|
+
"__@toStringTag@311521",
|
|
521
521
|
"buffer",
|
|
522
522
|
"byteLength",
|
|
523
523
|
"byteOffset",
|
|
@@ -552,13 +552,13 @@
|
|
|
552
552
|
"byteLength": {
|
|
553
553
|
"type": "number"
|
|
554
554
|
},
|
|
555
|
-
"__@toStringTag@
|
|
555
|
+
"__@toStringTag@311521": {
|
|
556
556
|
"type": "string"
|
|
557
557
|
}
|
|
558
558
|
},
|
|
559
559
|
"additionalProperties": false,
|
|
560
560
|
"required": [
|
|
561
|
-
"__@toStringTag@
|
|
561
|
+
"__@toStringTag@311521",
|
|
562
562
|
"byteLength"
|
|
563
563
|
]
|
|
564
564
|
},
|
|
@@ -568,18 +568,18 @@
|
|
|
568
568
|
"byteLength": {
|
|
569
569
|
"type": "number"
|
|
570
570
|
},
|
|
571
|
-
"__@species@
|
|
571
|
+
"__@species@311559": {
|
|
572
572
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
573
573
|
},
|
|
574
|
-
"__@toStringTag@
|
|
574
|
+
"__@toStringTag@311521": {
|
|
575
575
|
"type": "string",
|
|
576
576
|
"const": "SharedArrayBuffer"
|
|
577
577
|
}
|
|
578
578
|
},
|
|
579
579
|
"additionalProperties": false,
|
|
580
580
|
"required": [
|
|
581
|
-
"__@species@
|
|
582
|
-
"__@toStringTag@
|
|
581
|
+
"__@species@311559",
|
|
582
|
+
"__@toStringTag@311521",
|
|
583
583
|
"byteLength"
|
|
584
584
|
]
|
|
585
585
|
},
|
|
@@ -553,14 +553,14 @@
|
|
|
553
553
|
"length": {
|
|
554
554
|
"type": "number"
|
|
555
555
|
},
|
|
556
|
-
"__@toStringTag@
|
|
556
|
+
"__@toStringTag@326569": {
|
|
557
557
|
"type": "string",
|
|
558
558
|
"const": "Uint8Array"
|
|
559
559
|
}
|
|
560
560
|
},
|
|
561
561
|
"required": [
|
|
562
562
|
"BYTES_PER_ELEMENT",
|
|
563
|
-
"__@toStringTag@
|
|
563
|
+
"__@toStringTag@326569",
|
|
564
564
|
"buffer",
|
|
565
565
|
"byteLength",
|
|
566
566
|
"byteOffset",
|
|
@@ -595,13 +595,13 @@
|
|
|
595
595
|
"byteLength": {
|
|
596
596
|
"type": "number"
|
|
597
597
|
},
|
|
598
|
-
"__@toStringTag@
|
|
598
|
+
"__@toStringTag@326569": {
|
|
599
599
|
"type": "string"
|
|
600
600
|
}
|
|
601
601
|
},
|
|
602
602
|
"additionalProperties": false,
|
|
603
603
|
"required": [
|
|
604
|
-
"__@toStringTag@
|
|
604
|
+
"__@toStringTag@326569",
|
|
605
605
|
"byteLength"
|
|
606
606
|
]
|
|
607
607
|
},
|
|
@@ -611,18 +611,18 @@
|
|
|
611
611
|
"byteLength": {
|
|
612
612
|
"type": "number"
|
|
613
613
|
},
|
|
614
|
-
"__@species@
|
|
614
|
+
"__@species@326607": {
|
|
615
615
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
616
616
|
},
|
|
617
|
-
"__@toStringTag@
|
|
617
|
+
"__@toStringTag@326569": {
|
|
618
618
|
"type": "string",
|
|
619
619
|
"const": "SharedArrayBuffer"
|
|
620
620
|
}
|
|
621
621
|
},
|
|
622
622
|
"additionalProperties": false,
|
|
623
623
|
"required": [
|
|
624
|
-
"__@species@
|
|
625
|
-
"__@toStringTag@
|
|
624
|
+
"__@species@326607",
|
|
625
|
+
"__@toStringTag@326569",
|
|
626
626
|
"byteLength"
|
|
627
627
|
]
|
|
628
628
|
},
|
|
@@ -463,14 +463,14 @@
|
|
|
463
463
|
"length": {
|
|
464
464
|
"type": "number"
|
|
465
465
|
},
|
|
466
|
-
"__@toStringTag@
|
|
466
|
+
"__@toStringTag@341533": {
|
|
467
467
|
"type": "string",
|
|
468
468
|
"const": "Uint8Array"
|
|
469
469
|
}
|
|
470
470
|
},
|
|
471
471
|
"required": [
|
|
472
472
|
"BYTES_PER_ELEMENT",
|
|
473
|
-
"__@toStringTag@
|
|
473
|
+
"__@toStringTag@341533",
|
|
474
474
|
"buffer",
|
|
475
475
|
"byteLength",
|
|
476
476
|
"byteOffset",
|
|
@@ -505,13 +505,13 @@
|
|
|
505
505
|
"byteLength": {
|
|
506
506
|
"type": "number"
|
|
507
507
|
},
|
|
508
|
-
"__@toStringTag@
|
|
508
|
+
"__@toStringTag@341533": {
|
|
509
509
|
"type": "string"
|
|
510
510
|
}
|
|
511
511
|
},
|
|
512
512
|
"additionalProperties": false,
|
|
513
513
|
"required": [
|
|
514
|
-
"__@toStringTag@
|
|
514
|
+
"__@toStringTag@341533",
|
|
515
515
|
"byteLength"
|
|
516
516
|
]
|
|
517
517
|
},
|
|
@@ -521,18 +521,18 @@
|
|
|
521
521
|
"byteLength": {
|
|
522
522
|
"type": "number"
|
|
523
523
|
},
|
|
524
|
-
"__@species@
|
|
524
|
+
"__@species@341571": {
|
|
525
525
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
526
526
|
},
|
|
527
|
-
"__@toStringTag@
|
|
527
|
+
"__@toStringTag@341533": {
|
|
528
528
|
"type": "string",
|
|
529
529
|
"const": "SharedArrayBuffer"
|
|
530
530
|
}
|
|
531
531
|
},
|
|
532
532
|
"additionalProperties": false,
|
|
533
533
|
"required": [
|
|
534
|
-
"__@species@
|
|
535
|
-
"__@toStringTag@
|
|
534
|
+
"__@species@341571",
|
|
535
|
+
"__@toStringTag@341533",
|
|
536
536
|
"byteLength"
|
|
537
537
|
]
|
|
538
538
|
},
|
|
@@ -608,14 +608,14 @@
|
|
|
608
608
|
"length": {
|
|
609
609
|
"type": "number"
|
|
610
610
|
},
|
|
611
|
-
"__@toStringTag@
|
|
611
|
+
"__@toStringTag@475138": {
|
|
612
612
|
"type": "string",
|
|
613
613
|
"const": "Uint8Array"
|
|
614
614
|
}
|
|
615
615
|
},
|
|
616
616
|
"required": [
|
|
617
617
|
"BYTES_PER_ELEMENT",
|
|
618
|
-
"__@toStringTag@
|
|
618
|
+
"__@toStringTag@475138",
|
|
619
619
|
"buffer",
|
|
620
620
|
"byteLength",
|
|
621
621
|
"byteOffset",
|
|
@@ -650,13 +650,13 @@
|
|
|
650
650
|
"byteLength": {
|
|
651
651
|
"type": "number"
|
|
652
652
|
},
|
|
653
|
-
"__@toStringTag@
|
|
653
|
+
"__@toStringTag@475138": {
|
|
654
654
|
"type": "string"
|
|
655
655
|
}
|
|
656
656
|
},
|
|
657
657
|
"additionalProperties": false,
|
|
658
658
|
"required": [
|
|
659
|
-
"__@toStringTag@
|
|
659
|
+
"__@toStringTag@475138",
|
|
660
660
|
"byteLength"
|
|
661
661
|
]
|
|
662
662
|
},
|
|
@@ -666,18 +666,18 @@
|
|
|
666
666
|
"byteLength": {
|
|
667
667
|
"type": "number"
|
|
668
668
|
},
|
|
669
|
-
"__@species@
|
|
669
|
+
"__@species@475176": {
|
|
670
670
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
671
671
|
},
|
|
672
|
-
"__@toStringTag@
|
|
672
|
+
"__@toStringTag@475138": {
|
|
673
673
|
"type": "string",
|
|
674
674
|
"const": "SharedArrayBuffer"
|
|
675
675
|
}
|
|
676
676
|
},
|
|
677
677
|
"additionalProperties": false,
|
|
678
678
|
"required": [
|
|
679
|
-
"__@species@
|
|
680
|
-
"__@toStringTag@
|
|
679
|
+
"__@species@475176",
|
|
680
|
+
"__@toStringTag@475138",
|
|
681
681
|
"byteLength"
|
|
682
682
|
]
|
|
683
683
|
},
|
|
@@ -510,14 +510,14 @@
|
|
|
510
510
|
"length": {
|
|
511
511
|
"type": "number"
|
|
512
512
|
},
|
|
513
|
-
"__@toStringTag@
|
|
513
|
+
"__@toStringTag@445285": {
|
|
514
514
|
"type": "string",
|
|
515
515
|
"const": "Uint8Array"
|
|
516
516
|
}
|
|
517
517
|
},
|
|
518
518
|
"required": [
|
|
519
519
|
"BYTES_PER_ELEMENT",
|
|
520
|
-
"__@toStringTag@
|
|
520
|
+
"__@toStringTag@445285",
|
|
521
521
|
"buffer",
|
|
522
522
|
"byteLength",
|
|
523
523
|
"byteOffset",
|
|
@@ -552,13 +552,13 @@
|
|
|
552
552
|
"byteLength": {
|
|
553
553
|
"type": "number"
|
|
554
554
|
},
|
|
555
|
-
"__@toStringTag@
|
|
555
|
+
"__@toStringTag@445285": {
|
|
556
556
|
"type": "string"
|
|
557
557
|
}
|
|
558
558
|
},
|
|
559
559
|
"additionalProperties": false,
|
|
560
560
|
"required": [
|
|
561
|
-
"__@toStringTag@
|
|
561
|
+
"__@toStringTag@445285",
|
|
562
562
|
"byteLength"
|
|
563
563
|
]
|
|
564
564
|
},
|
|
@@ -568,18 +568,18 @@
|
|
|
568
568
|
"byteLength": {
|
|
569
569
|
"type": "number"
|
|
570
570
|
},
|
|
571
|
-
"__@species@
|
|
571
|
+
"__@species@445323": {
|
|
572
572
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
573
573
|
},
|
|
574
|
-
"__@toStringTag@
|
|
574
|
+
"__@toStringTag@445285": {
|
|
575
575
|
"type": "string",
|
|
576
576
|
"const": "SharedArrayBuffer"
|
|
577
577
|
}
|
|
578
578
|
},
|
|
579
579
|
"additionalProperties": false,
|
|
580
580
|
"required": [
|
|
581
|
-
"__@species@
|
|
582
|
-
"__@toStringTag@
|
|
581
|
+
"__@species@445323",
|
|
582
|
+
"__@toStringTag@445285",
|
|
583
583
|
"byteLength"
|
|
584
584
|
]
|
|
585
585
|
},
|
|
@@ -553,14 +553,14 @@
|
|
|
553
553
|
"length": {
|
|
554
554
|
"type": "number"
|
|
555
555
|
},
|
|
556
|
-
"__@toStringTag@
|
|
556
|
+
"__@toStringTag@430311": {
|
|
557
557
|
"type": "string",
|
|
558
558
|
"const": "Uint8Array"
|
|
559
559
|
}
|
|
560
560
|
},
|
|
561
561
|
"required": [
|
|
562
562
|
"BYTES_PER_ELEMENT",
|
|
563
|
-
"__@toStringTag@
|
|
563
|
+
"__@toStringTag@430311",
|
|
564
564
|
"buffer",
|
|
565
565
|
"byteLength",
|
|
566
566
|
"byteOffset",
|
|
@@ -595,13 +595,13 @@
|
|
|
595
595
|
"byteLength": {
|
|
596
596
|
"type": "number"
|
|
597
597
|
},
|
|
598
|
-
"__@toStringTag@
|
|
598
|
+
"__@toStringTag@430311": {
|
|
599
599
|
"type": "string"
|
|
600
600
|
}
|
|
601
601
|
},
|
|
602
602
|
"additionalProperties": false,
|
|
603
603
|
"required": [
|
|
604
|
-
"__@toStringTag@
|
|
604
|
+
"__@toStringTag@430311",
|
|
605
605
|
"byteLength"
|
|
606
606
|
]
|
|
607
607
|
},
|
|
@@ -611,18 +611,18 @@
|
|
|
611
611
|
"byteLength": {
|
|
612
612
|
"type": "number"
|
|
613
613
|
},
|
|
614
|
-
"__@species@
|
|
614
|
+
"__@species@430349": {
|
|
615
615
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
616
616
|
},
|
|
617
|
-
"__@toStringTag@
|
|
617
|
+
"__@toStringTag@430311": {
|
|
618
618
|
"type": "string",
|
|
619
619
|
"const": "SharedArrayBuffer"
|
|
620
620
|
}
|
|
621
621
|
},
|
|
622
622
|
"additionalProperties": false,
|
|
623
623
|
"required": [
|
|
624
|
-
"__@species@
|
|
625
|
-
"__@toStringTag@
|
|
624
|
+
"__@species@430349",
|
|
625
|
+
"__@toStringTag@430311",
|
|
626
626
|
"byteLength"
|
|
627
627
|
]
|
|
628
628
|
},
|
package/package.json
CHANGED
package/src/browserless.ts
CHANGED
|
@@ -136,15 +136,18 @@ export class Browserless extends EventEmitter {
|
|
|
136
136
|
| WebSocketRoute
|
|
137
137
|
| BrowserWebsocketRoute,
|
|
138
138
|
) {
|
|
139
|
+
const unsupportedArmBrowsers = ['chrome', 'edge'];
|
|
140
|
+
const browserName =
|
|
141
|
+
('browser' in route && route.browser?.name?.toLowerCase()) || '';
|
|
139
142
|
if (
|
|
140
143
|
isArm64 &&
|
|
141
144
|
!isMacOS &&
|
|
142
145
|
'browser' in route &&
|
|
143
146
|
route.browser &&
|
|
144
|
-
|
|
147
|
+
unsupportedArmBrowsers.some((n) => n.includes(browserName))
|
|
145
148
|
) {
|
|
146
149
|
this.logger.warn(
|
|
147
|
-
`Ignoring route "${route.path}" because it is not supported on arm64 platforms (route requires browser
|
|
150
|
+
`Ignoring route "${route.path}" because it is not supported on arm64 platforms (route requires browser ${route.browser.name}).`,
|
|
148
151
|
);
|
|
149
152
|
return false;
|
|
150
153
|
}
|
|
@@ -379,21 +382,25 @@ export class Browserless extends EventEmitter {
|
|
|
379
382
|
}
|
|
380
383
|
}
|
|
381
384
|
|
|
382
|
-
const
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
385
|
+
const filteredHTTPRoutes = httpRoutes.filter((r) => this.filterRoutes(r));
|
|
386
|
+
const filteredWSRoutes = wsRoutes.filter((r) => this.filterRoutes(r));
|
|
387
|
+
|
|
388
|
+
const allRoutes = [...filteredHTTPRoutes, ...filteredWSRoutes].map(
|
|
389
|
+
(route) => {
|
|
390
|
+
if (
|
|
391
|
+
'browser' in route &&
|
|
392
|
+
route.browser &&
|
|
393
|
+
internalBrowsers.includes(route.browser) &&
|
|
394
|
+
!installedBrowsers.some((b) => b.name === route.browser?.name)
|
|
395
|
+
) {
|
|
396
|
+
throw new Error(
|
|
397
|
+
dedent(`Couldn't load route "${route.path}" due to missing browser binary for "${route.browser?.name}".
|
|
393
398
|
Installed Browsers: ${installedBrowsers.map((b) => b.name).join(', ')}`),
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
399
|
+
);
|
|
400
|
+
}
|
|
401
|
+
return route;
|
|
402
|
+
},
|
|
403
|
+
);
|
|
397
404
|
|
|
398
405
|
const duplicateNamedRoutes = allRoutes
|
|
399
406
|
.filter((e, i, a) => a.findIndex((r) => r.name === e.name) !== i)
|
|
@@ -401,18 +408,13 @@ export class Browserless extends EventEmitter {
|
|
|
401
408
|
|
|
402
409
|
if (duplicateNamedRoutes.length) {
|
|
403
410
|
this.logger.warn(
|
|
404
|
-
`Found duplicate routing names. Route names must be unique:`,
|
|
411
|
+
`Found duplicate routing names. Route names must be unique in order to prevent collisions:`,
|
|
405
412
|
duplicateNamedRoutes,
|
|
406
413
|
);
|
|
407
414
|
}
|
|
408
415
|
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
.forEach((r) => this.router.registerHTTPRoute(r));
|
|
412
|
-
|
|
413
|
-
wsRoutes
|
|
414
|
-
.filter((r) => this.filterRoutes(r))
|
|
415
|
-
.forEach((r) => this.router.registerWebSocketRoute(r));
|
|
416
|
+
filteredHTTPRoutes.forEach((r) => this.router.registerHTTPRoute(r));
|
|
417
|
+
filteredWSRoutes.forEach((r) => this.router.registerWebSocketRoute(r));
|
|
416
418
|
|
|
417
419
|
this.logger.info(
|
|
418
420
|
`Imported and validated all route files, starting up server.`,
|
package/static/docs/swagger.json
CHANGED
|
@@ -280,14 +280,14 @@
|
|
|
280
280
|
"length": {
|
|
281
281
|
"type": "number"
|
|
282
282
|
},
|
|
283
|
-
"__@toStringTag@
|
|
283
|
+
"__@toStringTag@59177": {
|
|
284
284
|
"type": "string",
|
|
285
285
|
"const": "Uint8Array"
|
|
286
286
|
}
|
|
287
287
|
},
|
|
288
288
|
"required": [
|
|
289
289
|
"BYTES_PER_ELEMENT",
|
|
290
|
-
"__@toStringTag@
|
|
290
|
+
"__@toStringTag@59177",
|
|
291
291
|
"buffer",
|
|
292
292
|
"byteLength",
|
|
293
293
|
"byteOffset",
|
|
@@ -322,13 +322,13 @@
|
|
|
322
322
|
"byteLength": {
|
|
323
323
|
"type": "number"
|
|
324
324
|
},
|
|
325
|
-
"__@toStringTag@
|
|
325
|
+
"__@toStringTag@59177": {
|
|
326
326
|
"type": "string"
|
|
327
327
|
}
|
|
328
328
|
},
|
|
329
329
|
"additionalProperties": false,
|
|
330
330
|
"required": [
|
|
331
|
-
"__@toStringTag@
|
|
331
|
+
"__@toStringTag@59177",
|
|
332
332
|
"byteLength"
|
|
333
333
|
]
|
|
334
334
|
},
|
|
@@ -338,18 +338,18 @@
|
|
|
338
338
|
"byteLength": {
|
|
339
339
|
"type": "number"
|
|
340
340
|
},
|
|
341
|
-
"__@species@
|
|
341
|
+
"__@species@59215": {
|
|
342
342
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
343
343
|
},
|
|
344
|
-
"__@toStringTag@
|
|
344
|
+
"__@toStringTag@59177": {
|
|
345
345
|
"type": "string",
|
|
346
346
|
"const": "SharedArrayBuffer"
|
|
347
347
|
}
|
|
348
348
|
},
|
|
349
349
|
"additionalProperties": false,
|
|
350
350
|
"required": [
|
|
351
|
-
"__@species@
|
|
352
|
-
"__@toStringTag@
|
|
351
|
+
"__@species@59215",
|
|
352
|
+
"__@toStringTag@59177",
|
|
353
353
|
"byteLength"
|
|
354
354
|
]
|
|
355
355
|
},
|
|
@@ -1001,7 +1001,7 @@
|
|
|
1001
1001
|
},
|
|
1002
1002
|
"info": {
|
|
1003
1003
|
"title": "Browserless",
|
|
1004
|
-
"version": "2.29.0-beta-
|
|
1004
|
+
"version": "2.29.0-beta-6",
|
|
1005
1005
|
"x-logo": {
|
|
1006
1006
|
"altText": "browserless logo",
|
|
1007
1007
|
"url": "./docs/browserless-logo-inline.svg"
|
|
@@ -280,14 +280,14 @@
|
|
|
280
280
|
"length": {
|
|
281
281
|
"type": "number"
|
|
282
282
|
},
|
|
283
|
-
"__@toStringTag@
|
|
283
|
+
"__@toStringTag@59177": {
|
|
284
284
|
"type": "string",
|
|
285
285
|
"const": "Uint8Array"
|
|
286
286
|
}
|
|
287
287
|
},
|
|
288
288
|
"required": [
|
|
289
289
|
"BYTES_PER_ELEMENT",
|
|
290
|
-
"__@toStringTag@
|
|
290
|
+
"__@toStringTag@59177",
|
|
291
291
|
"buffer",
|
|
292
292
|
"byteLength",
|
|
293
293
|
"byteOffset",
|
|
@@ -322,13 +322,13 @@
|
|
|
322
322
|
"byteLength": {
|
|
323
323
|
"type": "number"
|
|
324
324
|
},
|
|
325
|
-
"__@toStringTag@
|
|
325
|
+
"__@toStringTag@59177": {
|
|
326
326
|
"type": "string"
|
|
327
327
|
}
|
|
328
328
|
},
|
|
329
329
|
"additionalProperties": false,
|
|
330
330
|
"required": [
|
|
331
|
-
"__@toStringTag@
|
|
331
|
+
"__@toStringTag@59177",
|
|
332
332
|
"byteLength"
|
|
333
333
|
]
|
|
334
334
|
},
|
|
@@ -338,18 +338,18 @@
|
|
|
338
338
|
"byteLength": {
|
|
339
339
|
"type": "number"
|
|
340
340
|
},
|
|
341
|
-
"__@species@
|
|
341
|
+
"__@species@59215": {
|
|
342
342
|
"$ref": "#/definitions/SharedArrayBuffer"
|
|
343
343
|
},
|
|
344
|
-
"__@toStringTag@
|
|
344
|
+
"__@toStringTag@59177": {
|
|
345
345
|
"type": "string",
|
|
346
346
|
"const": "SharedArrayBuffer"
|
|
347
347
|
}
|
|
348
348
|
},
|
|
349
349
|
"additionalProperties": false,
|
|
350
350
|
"required": [
|
|
351
|
-
"__@species@
|
|
352
|
-
"__@toStringTag@
|
|
351
|
+
"__@species@59215",
|
|
352
|
+
"__@toStringTag@59177",
|
|
353
353
|
"byteLength"
|
|
354
354
|
]
|
|
355
355
|
},
|
|
@@ -1001,7 +1001,7 @@
|
|
|
1001
1001
|
},
|
|
1002
1002
|
"info": {
|
|
1003
1003
|
"title": "Browserless",
|
|
1004
|
-
"version": "2.29.0-beta-
|
|
1004
|
+
"version": "2.29.0-beta-6",
|
|
1005
1005
|
"x-logo": {
|
|
1006
1006
|
"altText": "browserless logo",
|
|
1007
1007
|
"url": "./docs/browserless-logo-inline.svg"
|