testplane 8.22.4 → 8.23.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.
- package/build/package.json +6 -2
- package/build/src/browser/client-scripts/bundle.compat.js +1 -1
- package/build/src/browser/client-scripts/bundle.native.js +1 -1
- package/build/src/browser/client-scripts/index.js +25 -1
- package/build/src/browser/new-browser.js +33 -3
- package/build/src/browser/new-browser.js.map +1 -1
- package/build/src/browser-installer/chrome/browser.d.ts +3 -1
- package/build/src/browser-installer/chrome/browser.js +18 -5
- package/build/src/browser-installer/chrome/browser.js.map +1 -1
- package/build/src/browser-installer/chrome/driver.js +7 -4
- package/build/src/browser-installer/chrome/driver.js.map +1 -1
- package/build/src/browser-installer/chrome/index.js +10 -4
- package/build/src/browser-installer/chrome/index.js.map +1 -1
- package/build/src/browser-installer/chromium/browser.js +7 -4
- package/build/src/browser-installer/chromium/browser.js.map +1 -1
- package/build/src/browser-installer/chromium/driver.js +2 -2
- package/build/src/browser-installer/chromium/driver.js.map +1 -1
- package/build/src/browser-installer/chromium/revisions/autogenerated/linux.json +41 -0
- package/build/src/browser-installer/chromium/revisions/autogenerated/mac.json +41 -0
- package/build/src/browser-installer/chromium/revisions/autogenerated/mac_arm.json +22 -0
- package/build/src/browser-installer/chromium/revisions/autogenerated/win32.json +41 -0
- package/build/src/browser-installer/chromium/revisions/autogenerated/win64.json +41 -0
- package/build/src/browser-installer/chromium/utils.js +2 -24
- package/build/src/browser-installer/chromium/utils.js.map +1 -1
- package/build/src/browser-installer/constants.d.ts +4 -2
- package/build/src/browser-installer/constants.js +5 -3
- package/build/src/browser-installer/constants.js.map +1 -1
- package/build/src/browser-installer/edge/driver.js +7 -4
- package/build/src/browser-installer/edge/driver.js.map +1 -1
- package/build/src/browser-installer/edge/index.js +1 -2
- package/build/src/browser-installer/edge/index.js.map +1 -1
- package/build/src/browser-installer/firefox/browser.d.ts +3 -1
- package/build/src/browser-installer/firefox/browser.js +18 -5
- package/build/src/browser-installer/firefox/browser.js.map +1 -1
- package/build/src/browser-installer/firefox/driver.js +7 -4
- package/build/src/browser-installer/firefox/driver.js.map +1 -1
- package/build/src/browser-installer/firefox/index.js +7 -3
- package/build/src/browser-installer/firefox/index.js.map +1 -1
- package/build/src/browser-installer/index.d.ts +1 -1
- package/build/src/browser-installer/index.js +2 -2
- package/build/src/browser-installer/index.js.map +1 -1
- package/build/src/browser-installer/install.d.ts +5 -3
- package/build/src/browser-installer/install.js +39 -37
- package/build/src/browser-installer/install.js.map +1 -1
- package/build/src/browser-installer/registry/cli-progress-bar.d.ts +1 -0
- package/build/src/browser-installer/registry/cli-progress-bar.js +11 -8
- package/build/src/browser-installer/registry/cli-progress-bar.js.map +1 -1
- package/build/src/browser-installer/registry/index.d.ts +31 -5
- package/build/src/browser-installer/registry/index.js +174 -111
- package/build/src/browser-installer/registry/index.js.map +1 -1
- package/build/src/browser-installer/run.d.ts +2 -2
- package/build/src/browser-installer/run.js +12 -8
- package/build/src/browser-installer/run.js.map +1 -1
- package/build/src/browser-installer/ubuntu-packages/apt.d.ts +4 -0
- package/build/src/browser-installer/ubuntu-packages/apt.js +132 -0
- package/build/src/browser-installer/ubuntu-packages/apt.js.map +1 -0
- package/build/src/browser-installer/ubuntu-packages/autogenerated/ubuntu-20-dependencies.json +42 -0
- package/build/src/browser-installer/ubuntu-packages/autogenerated/ubuntu-22-dependencies.json +42 -0
- package/build/src/browser-installer/ubuntu-packages/autogenerated/ubuntu-24-dependencies.json +42 -0
- package/build/src/browser-installer/ubuntu-packages/index.d.ts +4 -0
- package/build/src/browser-installer/ubuntu-packages/index.js +85 -0
- package/build/src/browser-installer/ubuntu-packages/index.js.map +1 -0
- package/build/src/browser-installer/ubuntu-packages/utils.d.ts +4 -0
- package/build/src/browser-installer/ubuntu-packages/utils.js +59 -0
- package/build/src/browser-installer/ubuntu-packages/utils.js.map +1 -0
- package/build/src/browser-installer/utils.d.ts +3 -2
- package/build/src/browser-installer/utils.js +18 -13
- package/build/src/browser-installer/utils.js.map +1 -1
- package/build/src/browser-pool/webdriver-pool.d.ts +1 -2
- package/build/src/browser-pool/webdriver-pool.js +15 -15
- package/build/src/browser-pool/webdriver-pool.js.map +1 -1
- package/package.json +6 -2
- package/build/src/browser-installer/chromium/revisions/linux.d.ts +0 -2
- package/build/src/browser-installer/chromium/revisions/linux.js +0 -45
- package/build/src/browser-installer/chromium/revisions/linux.js.map +0 -1
- package/build/src/browser-installer/chromium/revisions/mac.d.ts +0 -2
- package/build/src/browser-installer/chromium/revisions/mac.js +0 -45
- package/build/src/browser-installer/chromium/revisions/mac.js.map +0 -1
- package/build/src/browser-installer/chromium/revisions/mac_arm.d.ts +0 -2
- package/build/src/browser-installer/chromium/revisions/mac_arm.js +0 -25
- package/build/src/browser-installer/chromium/revisions/mac_arm.js.map +0 -1
- package/build/src/browser-installer/chromium/revisions/win32.d.ts +0 -2
- package/build/src/browser-installer/chromium/revisions/win32.js +0 -45
- package/build/src/browser-installer/chromium/revisions/win32.js.map +0 -1
- package/build/src/browser-installer/chromium/revisions/win64.d.ts +0 -2
- package/build/src/browser-installer/chromium/revisions/win64.js +0 -45
- package/build/src/browser-installer/chromium/revisions/win64.js.map +0 -1
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "testplane",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.23.0",
|
|
4
4
|
"description": "Tests framework based on mocha and wdio",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"files": [
|
|
@@ -9,10 +9,11 @@
|
|
|
9
9
|
],
|
|
10
10
|
"scripts": {
|
|
11
11
|
"build": "tsc --build && npm run copy-static && npm run build-bundles",
|
|
12
|
-
"copy-static": "copyfiles 'src/browser/client-scripts/*' build",
|
|
12
|
+
"copy-static": "copyfiles 'src/browser/client-scripts/*' 'src/**/[!cache]*/autogenerated/**/*.json' build",
|
|
13
13
|
"build-node-bundle": "esbuild ./src/bundle/cjs/index.ts --outdir=./build/src/bundle/cjs --bundle --format=cjs --platform=node --target=ES2021",
|
|
14
14
|
"build-browser-bundle": "node ./src/browser/client-scripts/build.js",
|
|
15
15
|
"build-bundles": "concurrently -c 'auto' 'npm:build-browser-bundle' 'npm:build-node-bundle --minify'",
|
|
16
|
+
"resolve-ubuntu-dependencies": "ts-node ./src/browser-installer/ubuntu-packages/collect-dependencies",
|
|
16
17
|
"check-types": "tsc --project tsconfig.spec.json",
|
|
17
18
|
"clean": "rimraf build/ *.tsbuildinfo",
|
|
18
19
|
"lint": "eslint --cache . && prettier --check .",
|
|
@@ -122,6 +123,7 @@
|
|
|
122
123
|
"@types/debug": "4.1.12",
|
|
123
124
|
"@types/escape-string-regexp": "2.0.1",
|
|
124
125
|
"@types/fs-extra": "11.0.4",
|
|
126
|
+
"@types/js-levenshtein": "1.1.3",
|
|
125
127
|
"@types/lodash": "4.14.191",
|
|
126
128
|
"@types/micromatch": "4.0.9",
|
|
127
129
|
"@types/mocha": "10.0.1",
|
|
@@ -150,7 +152,9 @@
|
|
|
150
152
|
"eslint-config-gemini-testing": "2.8.0",
|
|
151
153
|
"eslint-config-prettier": "8.7.0",
|
|
152
154
|
"glob-extra": "5.0.2",
|
|
155
|
+
"execa": "5.1.1",
|
|
153
156
|
"husky": "0.11.4",
|
|
157
|
+
"js-levenshtein": "1.1.6",
|
|
154
158
|
"jsdom": "^24.0.0",
|
|
155
159
|
"jsdom-global": "3.0.2",
|
|
156
160
|
"onchange": "7.1.0",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"use strict";var lib=require("./lib.compat.js");module.exports=function(r){return lib.queryAll(r)};
|
|
5
5
|
},{"./lib.compat.js":4}],3:[function(require,module,exports){
|
|
6
6
|
(function (global){(function (){
|
|
7
|
-
"use strict";function prepareScreenshotUnsafe(e,t){var r=t.allowViewportOverflow,i=t.captureElementFromTop,o=t.disableAnimation,n=window;if(t.selectorToScroll&&!(n=document.querySelector(t.selectorToScroll)))return{error:"NOTFOUND",message:'Could not find element with css selector specified in "selectorToScroll" option: '+t.selectorToScroll,selector:t.selectorToScroll};var a,l=util.getMainDocumentElem(),c=l.clientWidth,s=l.clientHeight,u=l.scrollWidth,
|
|
7
|
+
"use strict";function prepareScreenshotUnsafe(e,t){var r=t.allowViewportOverflow,i=t.captureElementFromTop,o=t.disableAnimation,n=window;if(t.selectorToScroll&&!(n=document.querySelector(t.selectorToScroll)))return{error:"NOTFOUND",message:'Could not find element with css selector specified in "selectorToScroll" option: '+t.selectorToScroll,selector:t.selectorToScroll};var a,l=util.getMainDocumentElem(),c=l.clientWidth,s=l.clientHeight,u=l.scrollWidth,d=l.scrollHeight,p=new Rect({left:util.getScrollLeft(n),top:util.getScrollTop(n),width:c,height:s}),f=configurePixelRatio(t.usePixelRatio),m=[];if(e.forEach(function(e){Rect.isRect(e)?a=a?a.merge(new Rect(e)):new Rect(e):m.push(e)}),a=getCaptureRect(m,{initialRect:a,allowViewportOverflow:r,scrollElem:n,viewportWidth:c,documentHeight:d}),a.error)return a;if(i&&!p.rectInside(a))util.isSafariMobile()?scrollToCaptureAreaInSafari(p,a,n):n.scrollTo(a.left,a.top);else if(r&&p.rectIntersects(a))a.overflowsTopBound(p)&&a.recalculateHeight(p),a.overflowsLeftBound(p)&&a.recalculateWidth(p);else if(!i&&!r&&!p.rectIntersects(a))return{error:"OUTSIDE_OF_VIEWPORT",message:'Can not capture element, because it is outside of viewport. Try to set "captureElementFromTop=true" to scroll to it before capture or to set "allowViewportOverflow=true" to ignore viewport overflow error.'};return o&&disableFrameAnimationsUnsafe(),{captureArea:a.scale(f).serialize(),ignoreAreas:findIgnoreAreas(t.ignoreSelectors,{scrollElem:n,pixelRatio:f,viewportWidth:c,documentHeight:d}),viewport:new Rect({left:util.getScrollLeft(n),top:util.getScrollTop(n),width:c,height:s}).scale(f).serialize(),documentHeight:Math.ceil(d*f),documentWidth:Math.ceil(u*f),canHaveCaret:isEditable(document.activeElement),pixelRatio:f}}function disableFrameAnimationsUnsafe(){function e(e){var t=document.createElement("style");t.innerHTML=r+["{"," animation-delay: 0ms !important;"," animation-duration: 0ms !important;"," animation-timing-function: step-start !important;"," transition-timing-function: step-start !important;"," scroll-behavior: auto !important;"," transition: none !important;","}"].join("\n"),e.appendChild(t),i.push(t)}function t(){window.trustedTypes&&window.trustedTypes.createPolicy&&window.trustedTypes.createPolicy("default",{createHTML:function(e){return e}})}var r=["","::before","::after"].map(function(e){return"*:not(#testplane-q.testplane-w.testplane-e.testplane-r.testplane-t.testplane-y)"+e}).join(", "),i=[];util.forEachRoot(function(r){try{e(r)}catch(i){if(!(i&&i.message&&i.message.includes("This document requires 'TrustedHTML' assignment")))throw i;t(),e(r)}}),window.__cleanupAnimation=function(){for(var e=0;e<i.length;e++)i[e].parentNode.removeChild(i[e]);delete window.__cleanupAnimation}}function getCaptureRect(e,t){for(var r,i,o=t.initialRect,n=0;n<e.length;n++){if(!(r=lib.queryFirst(e[n])))return{error:"NOTFOUND",message:"Could not find element with css selector specified in setCaptureElements: "+e[n],selector:e[n]};i=getElementCaptureRect(r,t),i&&(o=o?o.merge(i):i)}return o?o.round():{error:"HIDDEN",message:"Area with css selector : "+e+" is hidden",selector:e}}function configurePixelRatio(e){return!1===e?1:window.devicePixelRatio?window.devicePixelRatio:window.screen.deviceXDPI/window.screen.logicalXDPI||1}function findIgnoreAreas(e,t){var r=[];return util.each(e,function(e){var i=queryIgnoreAreas(e);util.each(i,function(e){return addIgnoreArea.call(r,e,t)})}),r}function addIgnoreArea(e,t){var r=e&&getElementCaptureRect(e,t);if(r){var i=r.round().scale(t.pixelRatio).serialize();this.push(i)}}function isHidden(e,t){return"none"===e.display||"hidden"===e.visibility||e.opacity<1e-4||t.width<1e-4||t.height<1e-4}function getElementCaptureRect(e,t){var r=[":before",":after"],i=lib.getComputedStyle(e),o=rect.getAbsoluteClientRect(e,t);if(isHidden(i,o))return null;var n=getExtRect(i,o,t.allowViewportOverflow);return util.each(r,function(r){i=lib.getComputedStyle(e,r),n=n.merge(getExtRect(i,o,t.allowViewportOverflow))}),n}function getExtRect(e,t,r){var i=parseBoxShadow(e.boxShadow),o=parseInt(e.outlineWidth,10);return isNaN(o)&&(o=0),adjustRect(t,i,o,r)}function parseBoxShadow(e){e=e||"";var t,r=/[-+]?\d*\.?\d+px/g,i=e.split(","),o=[];return util.each(i,function(e){(t=e.match(r))&&o.push({offsetX:parseFloat(t[0]),offsetY:parseFloat(t[1])||0,blurRadius:parseFloat(t[2])||0,spreadRadius:parseFloat(t[3])||0,inset:-1!==e.indexOf("inset")})}),o}function adjustRect(e,t,r,i){var o=calculateShadowRect(e,t,i),n=calculateOutlineRect(e,r,i);return o.merge(n)}function calculateOutlineRect(e,t,r){var i=e.top-t,o=e.left-t;return new Rect({top:r?i:Math.max(0,i),left:r?o:Math.max(0,o),bottom:e.bottom+t,right:e.right+t})}function calculateShadowRect(e,t,r){var i=calculateShadowExtent(t),o=e.left+i.left,n=e.top+i.top;return new Rect({left:r?o:Math.max(0,o),top:r?n:Math.max(0,n),width:e.width-i.left+i.right,height:e.height-i.top+i.bottom})}function calculateShadowExtent(e){var t={top:0,left:0,right:0,bottom:0};return util.each(e,function(e){if(!e.inset){var r=e.spreadRadius+e.blurRadius;t.left=Math.min(e.offsetX-r,t.left),t.right=Math.max(e.offsetX+r,t.right),t.top=Math.min(e.offsetY-r,t.top),t.bottom=Math.max(e.offsetY+r,t.bottom)}}),t}function isEditable(e){return!!e&&(/^(input|textarea)$/i.test(e.tagName)||e.isContentEditable)}function scrollToCaptureAreaInSafari(e,t,r){var i=util.getMainDocumentElem(),o=Math.round(i.scrollHeight),n=Math.round(i.clientHeight),a=o-n;r.scrollTo(e.left,Math.min(t.top,a))}var util=require("./util"),rect=require("./rect"),lib=require("./lib.compat.js"),queryIgnoreAreas=require("./ignore-areas"),Rect=rect.Rect;"undefined"==typeof window?global.__geminiCore=exports:window.__geminiCore=exports,exports.queryFirst=lib.queryFirst,exports.prepareScreenshot=function(e,t){t=t||{};try{return prepareScreenshotUnsafe(e,t)}catch(r){return{error:"JS",message:r.stack||r.message}}},exports.disableFrameAnimations=function(){try{return disableFrameAnimationsUnsafe()}catch(e){return{error:"JS",message:e.stack||e.message}}},exports.cleanupFrameAnimations=function(){window.__cleanupAnimation&&window.__cleanupAnimation()},exports.resetZoom=function(){var e=lib.queryFirst('meta[name="viewport"]');if(!e){e=document.createElement("meta"),e.name="viewport";var t=lib.queryFirst("head");t&&t.appendChild(e)}e.content="width=device-width,initial-scale=1.0,user-scalable=no"};
|
|
8
8
|
}).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
|
|
9
9
|
},{"./ignore-areas":2,"./lib.compat.js":4,"./rect":7,"./util":8}],4:[function(require,module,exports){
|
|
10
10
|
"use strict";var Sizzle=require("sizzle"),xpath=require("./xpath");exports.queryFirst=function(e){if(xpath.isXpathSelector(e))return xpath.queryFirst(e);var t=Sizzle(exports.trim(e)+":first");return t.length>0?t[0]:null},exports.queryAll=function(e){return xpath.isXpathSelector(e)?xpath.queryAll(e):Sizzle(e)},exports.trim=function(e){return e.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")},exports.getComputedStyle=require("./polyfills/getComputedStyle").getComputedStyle,exports.matchMedia=require("./polyfills/matchMedia").matchMedia;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"use strict";var lib=require("./lib.native.js");module.exports=function(e){return lib.queryAll(e)};
|
|
3
3
|
},{"./lib.native.js":3}],2:[function(require,module,exports){
|
|
4
4
|
(function (global){(function (){
|
|
5
|
-
"use strict";function prepareScreenshotUnsafe(e,t){var r=t.allowViewportOverflow,i=t.captureElementFromTop,o=t.disableAnimation,n=window;if(t.selectorToScroll&&!(n=document.querySelector(t.selectorToScroll)))return{error:"NOTFOUND",message:'Could not find element with css selector specified in "selectorToScroll" option: '+t.selectorToScroll,selector:t.selectorToScroll};var a,l=util.getMainDocumentElem(),c=l.clientWidth,s=l.clientHeight,u=l.scrollWidth,
|
|
5
|
+
"use strict";function prepareScreenshotUnsafe(e,t){var r=t.allowViewportOverflow,i=t.captureElementFromTop,o=t.disableAnimation,n=window;if(t.selectorToScroll&&!(n=document.querySelector(t.selectorToScroll)))return{error:"NOTFOUND",message:'Could not find element with css selector specified in "selectorToScroll" option: '+t.selectorToScroll,selector:t.selectorToScroll};var a,l=util.getMainDocumentElem(),c=l.clientWidth,s=l.clientHeight,u=l.scrollWidth,d=l.scrollHeight,f=new Rect({left:util.getScrollLeft(n),top:util.getScrollTop(n),width:c,height:s}),p=configurePixelRatio(t.usePixelRatio),m=[];if(e.forEach(function(e){Rect.isRect(e)?a=a?a.merge(new Rect(e)):new Rect(e):m.push(e)}),a=getCaptureRect(m,{initialRect:a,allowViewportOverflow:r,scrollElem:n,viewportWidth:c,documentHeight:d}),a.error)return a;if(i&&!f.rectInside(a))util.isSafariMobile()?scrollToCaptureAreaInSafari(f,a,n):n.scrollTo(a.left,a.top);else if(r&&f.rectIntersects(a))a.overflowsTopBound(f)&&a.recalculateHeight(f),a.overflowsLeftBound(f)&&a.recalculateWidth(f);else if(!i&&!r&&!f.rectIntersects(a))return{error:"OUTSIDE_OF_VIEWPORT",message:'Can not capture element, because it is outside of viewport. Try to set "captureElementFromTop=true" to scroll to it before capture or to set "allowViewportOverflow=true" to ignore viewport overflow error.'};return o&&disableFrameAnimationsUnsafe(),{captureArea:a.scale(p).serialize(),ignoreAreas:findIgnoreAreas(t.ignoreSelectors,{scrollElem:n,pixelRatio:p,viewportWidth:c,documentHeight:d}),viewport:new Rect({left:util.getScrollLeft(n),top:util.getScrollTop(n),width:c,height:s}).scale(p).serialize(),documentHeight:Math.ceil(d*p),documentWidth:Math.ceil(u*p),canHaveCaret:isEditable(document.activeElement),pixelRatio:p}}function disableFrameAnimationsUnsafe(){function e(e){var t=document.createElement("style");t.innerHTML=r+["{"," animation-delay: 0ms !important;"," animation-duration: 0ms !important;"," animation-timing-function: step-start !important;"," transition-timing-function: step-start !important;"," scroll-behavior: auto !important;"," transition: none !important;","}"].join("\n"),e.appendChild(t),i.push(t)}function t(){window.trustedTypes&&window.trustedTypes.createPolicy&&window.trustedTypes.createPolicy("default",{createHTML:function(e){return e}})}var r=["","::before","::after"].map(function(e){return"*:not(#testplane-q.testplane-w.testplane-e.testplane-r.testplane-t.testplane-y)"+e}).join(", "),i=[];util.forEachRoot(function(r){try{e(r)}catch(i){if(!(i&&i.message&&i.message.includes("This document requires 'TrustedHTML' assignment")))throw i;t(),e(r)}}),window.__cleanupAnimation=function(){for(var e=0;e<i.length;e++)i[e].parentNode.removeChild(i[e]);delete window.__cleanupAnimation}}function getCaptureRect(e,t){for(var r,i,o=t.initialRect,n=0;n<e.length;n++){if(!(r=lib.queryFirst(e[n])))return{error:"NOTFOUND",message:"Could not find element with css selector specified in setCaptureElements: "+e[n],selector:e[n]};i=getElementCaptureRect(r,t),i&&(o=o?o.merge(i):i)}return o?o.round():{error:"HIDDEN",message:"Area with css selector : "+e+" is hidden",selector:e}}function configurePixelRatio(e){return!1===e?1:window.devicePixelRatio?window.devicePixelRatio:window.screen.deviceXDPI/window.screen.logicalXDPI||1}function findIgnoreAreas(e,t){var r=[];return util.each(e,function(e){var i=queryIgnoreAreas(e);util.each(i,function(e){return addIgnoreArea.call(r,e,t)})}),r}function addIgnoreArea(e,t){var r=e&&getElementCaptureRect(e,t);if(r){var i=r.round().scale(t.pixelRatio).serialize();this.push(i)}}function isHidden(e,t){return"none"===e.display||"hidden"===e.visibility||e.opacity<1e-4||t.width<1e-4||t.height<1e-4}function getElementCaptureRect(e,t){var r=[":before",":after"],i=lib.getComputedStyle(e),o=rect.getAbsoluteClientRect(e,t);if(isHidden(i,o))return null;var n=getExtRect(i,o,t.allowViewportOverflow);return util.each(r,function(r){i=lib.getComputedStyle(e,r),n=n.merge(getExtRect(i,o,t.allowViewportOverflow))}),n}function getExtRect(e,t,r){var i=parseBoxShadow(e.boxShadow),o=parseInt(e.outlineWidth,10);return isNaN(o)&&(o=0),adjustRect(t,i,o,r)}function parseBoxShadow(e){e=e||"";var t,r=/[-+]?\d*\.?\d+px/g,i=e.split(","),o=[];return util.each(i,function(e){(t=e.match(r))&&o.push({offsetX:parseFloat(t[0]),offsetY:parseFloat(t[1])||0,blurRadius:parseFloat(t[2])||0,spreadRadius:parseFloat(t[3])||0,inset:-1!==e.indexOf("inset")})}),o}function adjustRect(e,t,r,i){var o=calculateShadowRect(e,t,i),n=calculateOutlineRect(e,r,i);return o.merge(n)}function calculateOutlineRect(e,t,r){var i=e.top-t,o=e.left-t;return new Rect({top:r?i:Math.max(0,i),left:r?o:Math.max(0,o),bottom:e.bottom+t,right:e.right+t})}function calculateShadowRect(e,t,r){var i=calculateShadowExtent(t),o=e.left+i.left,n=e.top+i.top;return new Rect({left:r?o:Math.max(0,o),top:r?n:Math.max(0,n),width:e.width-i.left+i.right,height:e.height-i.top+i.bottom})}function calculateShadowExtent(e){var t={top:0,left:0,right:0,bottom:0};return util.each(e,function(e){if(!e.inset){var r=e.spreadRadius+e.blurRadius;t.left=Math.min(e.offsetX-r,t.left),t.right=Math.max(e.offsetX+r,t.right),t.top=Math.min(e.offsetY-r,t.top),t.bottom=Math.max(e.offsetY+r,t.bottom)}}),t}function isEditable(e){return!!e&&(/^(input|textarea)$/i.test(e.tagName)||e.isContentEditable)}function scrollToCaptureAreaInSafari(e,t,r){var i=util.getMainDocumentElem(),o=Math.round(i.scrollHeight),n=Math.round(i.clientHeight),a=o-n;r.scrollTo(e.left,Math.min(t.top,a))}var util=require("./util"),rect=require("./rect"),lib=require("./lib.native.js"),queryIgnoreAreas=require("./ignore-areas"),Rect=rect.Rect;"undefined"==typeof window?global.__geminiCore=exports:window.__geminiCore=exports,exports.queryFirst=lib.queryFirst,exports.prepareScreenshot=function(e,t){t=t||{};try{return prepareScreenshotUnsafe(e,t)}catch(r){return{error:"JS",message:r.stack||r.message}}},exports.disableFrameAnimations=function(){try{return disableFrameAnimationsUnsafe()}catch(e){return{error:"JS",message:e.stack||e.message}}},exports.cleanupFrameAnimations=function(){window.__cleanupAnimation&&window.__cleanupAnimation()},exports.resetZoom=function(){var e=lib.queryFirst('meta[name="viewport"]');if(!e){e=document.createElement("meta"),e.name="viewport";var t=lib.queryFirst("head");t&&t.appendChild(e)}e.content="width=device-width,initial-scale=1.0,user-scalable=no"};
|
|
6
6
|
}).call(this)}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
|
|
7
7
|
},{"./ignore-areas":1,"./lib.native.js":3,"./rect":4,"./util":5}],3:[function(require,module,exports){
|
|
8
8
|
"use strict";var xpath=require("./xpath");exports.queryFirst=function(t){return xpath.isXpathSelector(t)?xpath.queryFirst(t):document.querySelector(t)},exports.queryAll=function(t){return xpath.isXpathSelector(t)?xpath.queryAll(t):document.querySelectorAll(t)},exports.getComputedStyle=function(t,e){return getComputedStyle(t,e)},exports.matchMedia=function(t){return matchMedia(t)},exports.trim=function(t){return t.trim()};
|
|
@@ -159,7 +159,7 @@ function disableFrameAnimationsUnsafe() {
|
|
|
159
159
|
|
|
160
160
|
var styleElements = [];
|
|
161
161
|
|
|
162
|
-
|
|
162
|
+
function appendDisableAnimationStyleElement(root) {
|
|
163
163
|
var styleElement = document.createElement("style");
|
|
164
164
|
styleElement.innerHTML =
|
|
165
165
|
everythingSelector +
|
|
@@ -176,6 +176,30 @@ function disableFrameAnimationsUnsafe() {
|
|
|
176
176
|
|
|
177
177
|
root.appendChild(styleElement);
|
|
178
178
|
styleElements.push(styleElement);
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
function createDefaultTrustedTypesPolicy() {
|
|
182
|
+
if (window.trustedTypes && window.trustedTypes.createPolicy) {
|
|
183
|
+
window.trustedTypes.createPolicy("default", {
|
|
184
|
+
createHTML: function (string) {
|
|
185
|
+
return string;
|
|
186
|
+
}
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
util.forEachRoot(function (root) {
|
|
192
|
+
try {
|
|
193
|
+
appendDisableAnimationStyleElement(root);
|
|
194
|
+
} catch (err) {
|
|
195
|
+
if (err && err.message && err.message.includes("This document requires 'TrustedHTML' assignment")) {
|
|
196
|
+
createDefaultTrustedTypesPolicy();
|
|
197
|
+
|
|
198
|
+
appendDisableAnimationStyleElement(root);
|
|
199
|
+
} else {
|
|
200
|
+
throw err;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
179
203
|
});
|
|
180
204
|
|
|
181
205
|
window.__cleanupAnimation = function () {
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -15,7 +38,6 @@ const logger_1 = require("../utils/logger");
|
|
|
15
38
|
const runtime_config_1 = require("../config/runtime-config");
|
|
16
39
|
const config_1 = require("../constants/config");
|
|
17
40
|
const defaults_1 = require("../config/defaults");
|
|
18
|
-
const browser_installer_1 = require("../browser-installer");
|
|
19
41
|
const DEFAULT_PORT = 4444;
|
|
20
42
|
const headlessBrowserOptions = {
|
|
21
43
|
chrome: {
|
|
@@ -176,9 +198,17 @@ class NewBrowser extends browser_1.Browser {
|
|
|
176
198
|
return this._wdProcess.gridUrl;
|
|
177
199
|
}
|
|
178
200
|
async _addExecutablePath(config, capabilities) {
|
|
179
|
-
const
|
|
180
|
-
const
|
|
201
|
+
const { getNormalizedBrowserName, installBrowser } = await Promise.resolve().then(() => __importStar(require("../browser-installer")));
|
|
202
|
+
const normalizedBrowserName = getNormalizedBrowserName(this._config.desiredCapabilities?.browserName);
|
|
203
|
+
if (!normalizedBrowserName) {
|
|
204
|
+
throw new Error([
|
|
205
|
+
`Running auto local "${this._config.desiredCapabilities?.browserName}" is unsupported`,
|
|
206
|
+
`Supported browsers: "chrome", "firefox", "safari", "edge"`,
|
|
207
|
+
].join("\n"));
|
|
208
|
+
}
|
|
209
|
+
const executablePath = await installBrowser(normalizedBrowserName, this._config.desiredCapabilities?.browserVersion, { shouldInstallWebDriver: false, shouldInstallUbuntuPackages: true });
|
|
181
210
|
if (executablePath) {
|
|
211
|
+
const browserNameLowerCase = config.desiredCapabilities?.browserName?.toLowerCase();
|
|
182
212
|
const { capabilityName } = headlessBrowserOptions[browserNameLowerCase];
|
|
183
213
|
capabilities[capabilityName] ||= {};
|
|
184
214
|
capabilities[capabilityName].binary ||= executablePath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"new-browser.js","sourceRoot":"","sources":["../../../src/browser/new-browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
-
export declare const installChrome: (version: string, { force }?: {
|
|
1
|
+
export declare const installChrome: (version: string, { force, needWebDriver, needUbuntuPackages }?: {
|
|
2
2
|
force?: boolean | undefined;
|
|
3
|
+
needWebDriver?: boolean | undefined;
|
|
4
|
+
needUbuntuPackages?: boolean | undefined;
|
|
3
5
|
}) => Promise<string>;
|
|
@@ -22,14 +22,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.installChrome = void 0;
|
|
27
30
|
const browsers_1 = require("@puppeteer/browsers");
|
|
28
31
|
const constants_1 = require("../constants");
|
|
29
32
|
const utils_1 = require("../utils");
|
|
30
|
-
const registry_1 = require("../registry");
|
|
33
|
+
const registry_1 = __importDefault(require("../registry"));
|
|
31
34
|
const utils_2 = require("../utils");
|
|
32
|
-
const
|
|
35
|
+
const ubuntu_packages_1 = require("../ubuntu-packages");
|
|
36
|
+
const driver_1 = require("./driver");
|
|
37
|
+
const installChromeBrowser = async (version, { force = false } = {}) => {
|
|
33
38
|
const milestone = (0, utils_1.getMilestone)(version);
|
|
34
39
|
if (Number(milestone) < constants_1.MIN_CHROME_FOR_TESTING_VERSION) {
|
|
35
40
|
(0, utils_1.browserInstallerDebug)(`couldn't install chrome@${version}, installing chromium instead`);
|
|
@@ -37,10 +42,10 @@ const installChrome = async (version, { force = false } = {}) => {
|
|
|
37
42
|
return installChromium(version, { force });
|
|
38
43
|
}
|
|
39
44
|
const platform = (0, utils_1.getBrowserPlatform)();
|
|
40
|
-
const existingLocallyBrowserVersion =
|
|
45
|
+
const existingLocallyBrowserVersion = registry_1.default.getMatchedBrowserVersion(utils_1.Browser.CHROME, platform, version);
|
|
41
46
|
if (existingLocallyBrowserVersion && !force) {
|
|
42
47
|
(0, utils_1.browserInstallerDebug)(`A locally installed chrome@${version} browser was found. Skipping the installation`);
|
|
43
|
-
return
|
|
48
|
+
return registry_1.default.getBinaryPath(utils_1.Browser.CHROME, platform, existingLocallyBrowserVersion);
|
|
44
49
|
}
|
|
45
50
|
const normalizedVersion = (0, utils_2.normalizeChromeVersion)(version);
|
|
46
51
|
const buildId = await (0, browsers_1.resolveBuildId)(utils_1.Browser.CHROME, platform, normalizedVersion);
|
|
@@ -61,7 +66,15 @@ const installChrome = async (version, { force = false } = {}) => {
|
|
|
61
66
|
browser: utils_1.Browser.CHROME,
|
|
62
67
|
unpack: true,
|
|
63
68
|
}).then(result => result.executablePath);
|
|
64
|
-
return
|
|
69
|
+
return registry_1.default.installBinary(utils_1.Browser.CHROME, platform, buildId, installFn);
|
|
70
|
+
};
|
|
71
|
+
const installChrome = async (version, { force = false, needWebDriver = false, needUbuntuPackages = false } = {}) => {
|
|
72
|
+
const [browserPath] = await Promise.all([
|
|
73
|
+
installChromeBrowser(version, { force }),
|
|
74
|
+
needWebDriver && (0, driver_1.installChromeDriver)(version, { force }),
|
|
75
|
+
needUbuntuPackages && (0, ubuntu_packages_1.installUbuntuPackageDependencies)(),
|
|
76
|
+
]);
|
|
77
|
+
return browserPath;
|
|
65
78
|
};
|
|
66
79
|
exports.installChrome = installChrome;
|
|
67
80
|
//# sourceMappingURL=browser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,18 +22,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.installChromeDriver = void 0;
|
|
27
30
|
const browsers_1 = require("@puppeteer/browsers");
|
|
28
31
|
const constants_1 = require("../constants");
|
|
29
32
|
const utils_1 = require("../utils");
|
|
30
|
-
const registry_1 = require("../registry");
|
|
33
|
+
const registry_1 = __importDefault(require("../registry"));
|
|
31
34
|
const installChromeDriver = async (chromeVersion, { force = false } = {}) => {
|
|
32
35
|
const platform = (0, utils_1.getBrowserPlatform)();
|
|
33
|
-
const existingLocallyDriverVersion =
|
|
36
|
+
const existingLocallyDriverVersion = registry_1.default.getMatchedDriverVersion(utils_1.Driver.CHROMEDRIVER, platform, chromeVersion);
|
|
34
37
|
if (existingLocallyDriverVersion && !force) {
|
|
35
38
|
(0, utils_1.browserInstallerDebug)(`A locally installed chromedriver for chrome@${chromeVersion} was found. Skipping the installation`);
|
|
36
|
-
return
|
|
39
|
+
return registry_1.default.getBinaryPath(utils_1.Driver.CHROMEDRIVER, platform, existingLocallyDriverVersion);
|
|
37
40
|
}
|
|
38
41
|
const milestone = (0, utils_1.getMilestone)(chromeVersion);
|
|
39
42
|
if (Number(milestone) < constants_1.MIN_CHROMEDRIVER_FOR_TESTING_VERSION) {
|
|
@@ -59,7 +62,7 @@ const installChromeDriver = async (chromeVersion, { force = false } = {}) => {
|
|
|
59
62
|
unpack: true,
|
|
60
63
|
downloadProgressCallback,
|
|
61
64
|
}).then(result => result.executablePath);
|
|
62
|
-
return
|
|
65
|
+
return registry_1.default.installBinary(utils_1.Driver.CHROMEDRIVER, platform, buildId, installFn);
|
|
63
66
|
};
|
|
64
67
|
exports.installChromeDriver = installChromeDriver;
|
|
65
68
|
//# sourceMappingURL=driver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/driver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/driver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA+F;AAC/F,4CAAoE;AACpE,oCAOkB;AAClB,2DAAmC;AAE5B,MAAM,mBAAmB,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAAmB,EAAE;IACxG,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACtC,MAAM,4BAA4B,GAAG,kBAAQ,CAAC,uBAAuB,CAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAEpH,IAAI,4BAA4B,IAAI,CAAC,KAAK,EAAE,CAAC;QACzC,IAAA,6BAAqB,EACjB,+CAA+C,aAAa,uCAAuC,CACtG,CAAC;QAEF,OAAO,kBAAQ,CAAC,aAAa,CAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;IAC/F,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAC;IAE9C,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,gDAAoC,EAAE,CAAC;QAC3D,IAAA,6BAAqB,EACjB,sCAAsC,aAAa,oDAAoD,CAC1G,CAAC;QAEF,MAAM,EAAE,2BAA2B,EAAE,GAAG,wDAAa,aAAa,GAAC,CAAC;QAEpE,OAAO,2BAA2B,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAc,EAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE/E,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACtC,MAAM,cAAc,GAAG,MAAM,IAAA,sBAAW,EAAC,EAAE,OAAO,EAAE,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAExG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACX;YACI,gBAAgB,OAAO,sBAAsB;YAC7C,uCAAuC,SAAS,cAAc;YAC9D,+CAA+C;SAClD,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,wBAAkD,EAAmB,EAAE,CACtF,IAAA,kBAAgB,EAAC;QACb,QAAQ;QACR,OAAO;QACP,QAAQ,EAAE,IAAA,0BAAkB,GAAE;QAC9B,OAAO,EAAE,cAAM,CAAC,YAAY;QAC5B,MAAM,EAAE,IAAI;QACZ,wBAAwB;KAC3B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE7C,OAAO,kBAAQ,CAAC,aAAa,CAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AACrF,CAAC,CAAC;AAlDW,QAAA,mBAAmB,uBAkD9B"}
|
|
@@ -14,16 +14,22 @@ const browser_1 = require("./browser");
|
|
|
14
14
|
Object.defineProperty(exports, "installChrome", { enumerable: true, get: function () { return browser_1.installChrome; } });
|
|
15
15
|
const driver_1 = require("./driver");
|
|
16
16
|
Object.defineProperty(exports, "installChromeDriver", { enumerable: true, get: function () { return driver_1.installChromeDriver; } });
|
|
17
|
+
const ubuntu_packages_1 = require("../ubuntu-packages");
|
|
17
18
|
const runChromeDriver = async (chromeVersion, { debug = false } = {}) => {
|
|
18
|
-
const [chromeDriverPath] = await Promise.all([
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const [chromeDriverPath, randomPort, chromeDriverEnv] = await Promise.all([
|
|
20
|
+
(0, driver_1.installChromeDriver)(chromeVersion),
|
|
21
|
+
(0, get_port_1.default)(),
|
|
22
|
+
(0, ubuntu_packages_1.isUbuntu)()
|
|
23
|
+
.then(isUbuntu => (isUbuntu ? (0, ubuntu_packages_1.getUbuntuLinkerEnv)() : null))
|
|
24
|
+
.then(extraEnv => (extraEnv ? { ...process.env, ...extraEnv } : process.env)),
|
|
25
|
+
]);
|
|
21
26
|
const chromeDriver = (0, child_process_1.spawn)(chromeDriverPath, [`--port=${randomPort}`, debug ? `--verbose` : "--silent"], {
|
|
22
27
|
windowsHide: true,
|
|
23
28
|
detached: false,
|
|
29
|
+
env: chromeDriverEnv,
|
|
24
30
|
});
|
|
25
31
|
if (debug) {
|
|
26
|
-
(0, utils_1.pipeLogsWithPrefix)(chromeDriver, `[chromedriver@${
|
|
32
|
+
(0, utils_1.pipeLogsWithPrefix)(chromeDriver, `[chromedriver@${(0, utils_2.getMilestone)(chromeVersion)}] `);
|
|
27
33
|
}
|
|
28
34
|
const gridUrl = `http://127.0.0.1:${randomPort}`;
|
|
29
35
|
process.once("exit", () => chromeDriver.kill());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAmD;AACnD,oCAAwC;AACxC,uCAA0C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/browser-installer/chrome/index.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyD;AACzD,wDAA+B;AAC/B,0DAAiC;AACjC,kDAA4D;AAC5D,4CAAmD;AACnD,oCAAwC;AACxC,uCAA0C;AAIjC,8FAJA,uBAAa,OAIA;AAHtB,qCAA+C;AAGvB,oGAHf,4BAAmB,OAGe;AAF3C,wDAAkE;AAI3D,MAAM,eAAe,GAAG,KAAK,EAChC,aAAqB,EACrB,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAC2C,EAAE;IACnE,MAAM,CAAC,gBAAgB,EAAE,UAAU,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtE,IAAA,4BAAmB,EAAC,aAAa,CAAC;QAClC,IAAA,kBAAO,GAAE;QACT,IAAA,0BAAQ,GAAE;aACL,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,oCAAkB,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAC1D,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KACpF,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAA,qBAAK,EAAC,gBAAgB,EAAE,CAAC,UAAU,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE;QACrG,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;QACf,GAAG,EAAE,eAAe;KACvB,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACR,IAAA,0BAAkB,EAAC,YAAY,EAAE,iBAAiB,IAAA,oBAAY,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,OAAO,GAAG,oBAAoB,UAAU,EAAE,CAAC;IAEjD,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhD,MAAM,IAAA,mBAAQ,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,+BAAmB,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAChE,CAAC,CAAC;AA7BW,QAAA,eAAe,mBA6B1B"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.installChromium = void 0;
|
|
4
7
|
const browsers_1 = require("@puppeteer/browsers");
|
|
5
|
-
const registry_1 = require("../registry");
|
|
8
|
+
const registry_1 = __importDefault(require("../registry"));
|
|
6
9
|
const utils_1 = require("../utils");
|
|
7
10
|
const utils_2 = require("./utils");
|
|
8
11
|
const utils_3 = require("../utils");
|
|
@@ -16,10 +19,10 @@ const installChromium = async (version, { force = false } = {}) => {
|
|
|
16
19
|
].join("\n"));
|
|
17
20
|
}
|
|
18
21
|
const platform = (0, utils_3.getChromePlatform)(version);
|
|
19
|
-
const existingLocallyBrowserVersion =
|
|
22
|
+
const existingLocallyBrowserVersion = registry_1.default.getMatchedBrowserVersion(utils_1.Browser.CHROMIUM, platform, version);
|
|
20
23
|
if (existingLocallyBrowserVersion && !force) {
|
|
21
24
|
(0, utils_1.browserInstallerDebug)(`A locally installed chromium@${version} browser was found. Skipping the installation`);
|
|
22
|
-
return
|
|
25
|
+
return registry_1.default.getBinaryPath(utils_1.Browser.CHROMIUM, platform, existingLocallyBrowserVersion);
|
|
23
26
|
}
|
|
24
27
|
const buildId = await (0, utils_2.getChromiumBuildId)(platform, milestone);
|
|
25
28
|
const cacheDir = (0, utils_1.getBrowsersDir)();
|
|
@@ -40,7 +43,7 @@ const installChromium = async (version, { force = false } = {}) => {
|
|
|
40
43
|
browser: utils_1.Browser.CHROMIUM,
|
|
41
44
|
unpack: true,
|
|
42
45
|
}).then(result => result.executablePath);
|
|
43
|
-
return
|
|
46
|
+
return registry_1.default.installBinary(utils_1.Browser.CHROMIUM, platform, milestone, installFn);
|
|
44
47
|
};
|
|
45
48
|
exports.installChromium = installChromium;
|
|
46
49
|
//# sourceMappingURL=browser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/browser.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+E;AAC/E,2DAAmC;AACnC,oCAAuH;AACvH,mCAA6C;AAC7C,oCAA6C;AAC7C,4CAAoD;AAE7C,MAAM,eAAe,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,EAAmB,EAAE;IAC9F,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAExC,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,gCAAoB,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACX;YACI,UAAU,OAAO,sBAAsB;YACvC,uEAAuE,gCAAoB,EAAE;SAChG,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,6BAA6B,GAAG,kBAAQ,CAAC,wBAAwB,CAAC,eAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7G,IAAI,6BAA6B,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAA,6BAAqB,EAAC,gCAAgC,OAAO,+CAA+C,CAAC,CAAC;QAE9G,OAAO,kBAAQ,CAAC,aAAa,CAAC,eAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAkB,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAA,sBAAc,GAAE,CAAC;IAClC,MAAM,cAAc,GAAG,MAAM,IAAA,sBAAW,EAAC,EAAE,OAAO,EAAE,eAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAErG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACX;YACI,UAAU,OAAO,sBAAsB;YACvC,yBAAyB,OAAO,2CAA2C;YAC3E,gCAAgC;SACnC,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,IAAA,6BAAqB,EAAC,uBAAuB,OAAO,KAAK,SAAS,SAAS,QAAQ,EAAE,CAAC,CAAC;IAEvF,MAAM,SAAS,GAAG,CAAC,wBAAkD,EAAmB,EAAE,CACtF,IAAA,kBAAgB,EAAC;QACb,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,wBAAwB;QACxB,OAAO,EAAE,eAAO,CAAC,QAAQ;QACzB,MAAM,EAAE,IAAI;KACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE7C,OAAO,kBAAQ,CAAC,aAAa,CAAC,eAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AACpF,CAAC,CAAC;AAhDW,QAAA,eAAe,mBAgD1B"}
|
|
@@ -8,7 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const lodash_1 = require("lodash");
|
|
10
10
|
const constants_1 = require("../constants");
|
|
11
|
-
const registry_1 = require("../registry");
|
|
11
|
+
const registry_1 = __importDefault(require("../registry"));
|
|
12
12
|
const utils_1 = require("../utils");
|
|
13
13
|
const utils_2 = require("./utils");
|
|
14
14
|
const getChromeDriverVersionByChromiumVersion = async (chromiumVersion) => {
|
|
@@ -35,7 +35,7 @@ const installChromeDriverManually = async (milestone) => {
|
|
|
35
35
|
fs_extra_1.default.remove(archivePath).then(lodash_1.noop, lodash_1.noop);
|
|
36
36
|
return chromeDriverPath;
|
|
37
37
|
};
|
|
38
|
-
return
|
|
38
|
+
return registry_1.default.installBinary(utils_1.Driver.CHROMEDRIVER, platform, driverVersion, installFn);
|
|
39
39
|
};
|
|
40
40
|
exports.installChromeDriverManually = installChromeDriverManually;
|
|
41
41
|
//# sourceMappingURL=driver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/driver.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,mCAA8B;AAC9B,4CAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../../../src/browser-installer/chromium/driver.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,mCAA8B;AAC9B,4CAA8E;AAC9E,2DAAmC;AACnC,oCAQkB;AAClB,mCAAmF;AAEnF,MAAM,uCAAuC,GAAG,KAAK,EAAE,eAAgC,EAAmB,EAAE;IACxG,MAAM,MAAM,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,8BAAsB,EAAC,eAAe,CAAC,CAAC;IAE/G,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAU,EAAC,GAAG,oCAAwB,mBAAmB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAEhH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEK,MAAM,2BAA2B,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;IACpF,MAAM,QAAQ,GAAG,IAAA,0BAAkB,GAAE,CAAC;IAEtC,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,gCAAoB,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CACX;YACI,gBAAgB,SAAS,sBAAsB;YAC/C,sEAAsE,gCAAoB,EAAE;SAC/F,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;IACN,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,uCAAuC,CAAC,SAAS,CAAC,CAAC;IAE/E,MAAM,SAAS,GAAG,KAAK,IAAqB,EAAE;QAC1C,MAAM,UAAU,GAAG,IAAA,iCAAyB,EAAC,aAAa,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,IAAA,qCAA6B,EAAC,aAAa,CAAC,CAAC;QACjE,MAAM,mBAAmB,GAAG,IAAA,4BAAoB,EAAC,aAAa,CAAC,CAAC;QAChE,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAExE,MAAM,IAAA,oBAAY,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5C,MAAM,IAAA,iBAAS,EAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;QAElD,kBAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,aAAI,EAAE,aAAI,CAAC,CAAC;QAExC,OAAO,gBAAgB,CAAC;IAC5B,CAAC,CAAC;IAEF,OAAO,kBAAQ,CAAC,aAAa,CAAC,cAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAC3F,CAAC,CAAC;AA7BW,QAAA,2BAA2B,+BA6BtC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
{
|
|
2
|
+
"73": 625983,
|
|
3
|
+
"74": 638903,
|
|
4
|
+
"75": 652459,
|
|
5
|
+
"76": 665032,
|
|
6
|
+
"77": 681154,
|
|
7
|
+
"78": 694594,
|
|
8
|
+
"79": 707231,
|
|
9
|
+
"80": 722374,
|
|
10
|
+
"81": 737198,
|
|
11
|
+
"83": 756143,
|
|
12
|
+
"84": 769125,
|
|
13
|
+
"85": 782822,
|
|
14
|
+
"86": 800433,
|
|
15
|
+
"87": 813060,
|
|
16
|
+
"88": 827143,
|
|
17
|
+
"89": 843934,
|
|
18
|
+
"90": 858016,
|
|
19
|
+
"91": 870827,
|
|
20
|
+
"92": 885357,
|
|
21
|
+
"93": 902296,
|
|
22
|
+
"94": 911605,
|
|
23
|
+
"95": 920070,
|
|
24
|
+
"96": 929514,
|
|
25
|
+
"97": 938637,
|
|
26
|
+
"98": 950416,
|
|
27
|
+
"99": 961779,
|
|
28
|
+
"100": 972803,
|
|
29
|
+
"101": 982577,
|
|
30
|
+
"102": 992824,
|
|
31
|
+
"103": 1002974,
|
|
32
|
+
"104": 1012822,
|
|
33
|
+
"105": 1027072,
|
|
34
|
+
"106": 1036920,
|
|
35
|
+
"107": 1047812,
|
|
36
|
+
"108": 1059082,
|
|
37
|
+
"109": 1070158,
|
|
38
|
+
"110": 1084167,
|
|
39
|
+
"111": 1097778,
|
|
40
|
+
"112": 1107206
|
|
41
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
{
|
|
2
|
+
"73": 625980,
|
|
3
|
+
"74": 638898,
|
|
4
|
+
"75": 652451,
|
|
5
|
+
"76": 665035,
|
|
6
|
+
"77": 681144,
|
|
7
|
+
"78": 694594,
|
|
8
|
+
"79": 707225,
|
|
9
|
+
"80": 722372,
|
|
10
|
+
"81": 737194,
|
|
11
|
+
"83": 756141,
|
|
12
|
+
"84": 769122,
|
|
13
|
+
"85": 782819,
|
|
14
|
+
"86": 800433,
|
|
15
|
+
"87": 813052,
|
|
16
|
+
"88": 827138,
|
|
17
|
+
"89": 843934,
|
|
18
|
+
"90": 858007,
|
|
19
|
+
"91": 870831,
|
|
20
|
+
"92": 885361,
|
|
21
|
+
"93": 902294,
|
|
22
|
+
"94": 911610,
|
|
23
|
+
"95": 920094,
|
|
24
|
+
"96": 929514,
|
|
25
|
+
"97": 938636,
|
|
26
|
+
"98": 950414,
|
|
27
|
+
"99": 961780,
|
|
28
|
+
"100": 972801,
|
|
29
|
+
"101": 982575,
|
|
30
|
+
"102": 992180,
|
|
31
|
+
"103": 1002972,
|
|
32
|
+
"104": 1012821,
|
|
33
|
+
"105": 1027082,
|
|
34
|
+
"106": 1036918,
|
|
35
|
+
"107": 1047818,
|
|
36
|
+
"108": 1059080,
|
|
37
|
+
"109": 1070155,
|
|
38
|
+
"110": 1084167,
|
|
39
|
+
"111": 1097778,
|
|
40
|
+
"112": 1107206
|
|
41
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
{
|
|
2
|
+
"93": 902292,
|
|
3
|
+
"94": 911612,
|
|
4
|
+
"95": 920092,
|
|
5
|
+
"96": 929514,
|
|
6
|
+
"97": 938625,
|
|
7
|
+
"98": 950409,
|
|
8
|
+
"99": 961774,
|
|
9
|
+
"100": 972803,
|
|
10
|
+
"101": 982572,
|
|
11
|
+
"102": 992815,
|
|
12
|
+
"103": 1002973,
|
|
13
|
+
"104": 1012821,
|
|
14
|
+
"105": 1027072,
|
|
15
|
+
"106": 1036918,
|
|
16
|
+
"107": 1047805,
|
|
17
|
+
"108": 1059080,
|
|
18
|
+
"109": 1070155,
|
|
19
|
+
"110": 1084160,
|
|
20
|
+
"111": 1097774,
|
|
21
|
+
"112": 1107206
|
|
22
|
+
}
|