From 9bc5083bf04af1efd7cb39c10a25bc15cf7821f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Mar 2023 14:57:50 +0000 Subject: [PATCH 1/4] build(deps-dev): bump puppeteer from 19.6.3 to 19.8.2 Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 19.6.3 to 19.8.2. - [Release notes](https://github.com/puppeteer/puppeteer/releases) - [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json) - [Commits](https://github.com/puppeteer/puppeteer/compare/puppeteer-v19.6.3...puppeteer-v19.8.2) --- updated-dependencies: - dependency-name: puppeteer dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 109 +++++++++++++++++++++++++++++++++++----------- package.json | 2 +- 2 files changed, 84 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5ff483f055c..c7f1a2f0955 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,7 +55,7 @@ "openpgp": "^5.7.0", "pdfjs-dist": "3.4.120", "prettier": "^2.8.4", - "puppeteer": "19.6.3", + "puppeteer": "19.8.2", "stylelint": "15.2.0", "stylelint-config-standard": "30.0.1", "typescript": "4.9.5", @@ -532,6 +532,36 @@ "node": ">=12" } }, + "node_modules/@puppeteer/browsers": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.3.1.tgz", + "integrity": "sha512-WTFVqWY7ipI+CsJRb6vEddYJ/lMl2bHYP5BjFDBM9JMKPjJNT4psXz6DLuJpi3EkG80Q0ef5Azzv3gKu9MvMUg==", + "dev": true, + "dependencies": { + "debug": "4.3.4", + "extract-zip": "2.0.1", + "https-proxy-agent": "5.0.1", + "progress": "2.0.3", + "proxy-from-env": "1.1.0", + "tar-fs": "2.1.1", + "unbzip2-stream": "1.4.3", + "yargs": "17.7.1" + }, + "bin": { + "browsers": "lib/cjs/main-cli.js" + }, + "engines": { + "node": ">=14.1.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/@selderee/plugin-htmlparser2": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.10.0.tgz", @@ -2763,6 +2793,18 @@ "node": ">=6.0" } }, + "node_modules/chromium-bidi": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.6.tgz", + "integrity": "sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw==", + "dev": true, + "dependencies": { + "mitt": "3.0.0" + }, + "peerDependencies": { + "devtools-protocol": "*" + } + }, "node_modules/chunkd": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/chunkd/-/chunkd-2.0.1.tgz", @@ -3248,9 +3290,9 @@ "dev": true }, "node_modules/cosmiconfig": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", - "integrity": "sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz", + "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==", "dev": true, "dependencies": { "import-fresh": "^3.2.1", @@ -3260,6 +3302,9 @@ }, "engines": { "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" } }, "node_modules/cross-fetch": { @@ -3671,9 +3716,9 @@ } }, "node_modules/devtools-protocol": { - "version": "0.0.1082910", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz", - "integrity": "sha512-RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww==", + "version": "0.0.1107588", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz", + "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==", "dev": true }, "node_modules/dir-glob": { @@ -7892,6 +7937,12 @@ "node": ">=8" } }, + "node_modules/mitt": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz", + "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==", + "dev": true + }, "node_modules/mkdirp": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.4.tgz", @@ -9379,41 +9430,47 @@ } }, "node_modules/puppeteer": { - "version": "19.6.3", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.3.tgz", - "integrity": "sha512-K03xTtGDwS6cBXX/EoqoZxglCUKcX2SLIl92fMnGMRjYpPGXoAV2yKEh3QXmXzKqfZXd8TxjjFww+tEttWv8kw==", + "version": "19.8.2", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.8.2.tgz", + "integrity": "sha512-LPdNVYMR6ddp4YS3GK1bqKsasCJj1aZjt9dNOKcnzKezuMoishlHY6bCnFLjTc34iqnGzIrJp07TQ9M+aML2+g==", "dev": true, "hasInstallScript": true, "dependencies": { - "cosmiconfig": "8.0.0", + "@puppeteer/browsers": "0.3.1", + "cosmiconfig": "8.1.3", "https-proxy-agent": "5.0.1", "progress": "2.0.3", "proxy-from-env": "1.1.0", - "puppeteer-core": "19.6.3" - }, - "engines": { - "node": ">=14.1.0" + "puppeteer-core": "19.8.1" } }, "node_modules/puppeteer-core": { - "version": "19.6.3", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.3.tgz", - "integrity": "sha512-8MbhioSlkDaHkmolpQf9Z7ui7jplFfOFTnN8d5kPsCazRRTNIH6/bVxPskn0v5Gh9oqOBlknw0eHH0/OBQAxpQ==", + "version": "19.8.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.8.1.tgz", + "integrity": "sha512-7yPMzusYRvJ/laLaMFIQ01E9WakKkJJXLsMAymH6y5EKqYe5hhn68/SbvF+1YJMb843GftU7gT86Fw8y5jkn3w==", "dev": true, "dependencies": { + "chromium-bidi": "0.4.6", "cross-fetch": "3.1.5", "debug": "4.3.4", - "devtools-protocol": "0.0.1082910", + "devtools-protocol": "0.0.1107588", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.1", "proxy-from-env": "1.1.0", - "rimraf": "3.0.2", "tar-fs": "2.1.1", "unbzip2-stream": "1.4.3", - "ws": "8.11.0" + "ws": "8.13.0" }, "engines": { - "node": ">=14.1.0" + "node": ">=14.14.0" + }, + "peerDependencies": { + "typescript": ">= 4.7.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/qs": { @@ -12406,16 +12463,16 @@ } }, "node_modules/ws": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", - "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", "dev": true, "engines": { "node": ">=10.0.0" }, "peerDependencies": { "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "utf-8-validate": ">=5.0.2" }, "peerDependenciesMeta": { "bufferutil": { diff --git a/package.json b/package.json index b5b2c026e96..0cdc6cba169 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "openpgp": "^5.7.0", "pdfjs-dist": "3.4.120", "prettier": "^2.8.4", - "puppeteer": "19.6.3", + "puppeteer": "19.8.2", "stylelint": "15.2.0", "stylelint-config-standard": "30.0.1", "typescript": "4.9.5", From 9a6d119c691cf1f70f9a3dd4491b6630bf2515d3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 30 Mar 2023 17:15:09 +0100 Subject: [PATCH 2/4] slower throttled download --- test/source/browser/browser-pool.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/browser/browser-pool.ts b/test/source/browser/browser-pool.ts index c6eb743616a..5ab805ea661 100644 --- a/test/source/browser/browser-pool.ts +++ b/test/source/browser/browser-pool.ts @@ -44,7 +44,7 @@ export class BrowserPool { args, ignoreHTTPSErrors: this.isMock, headless: false, - devtools: false, + devtools: true, slowMo, }); const handle = new BrowserHandle(browser, this.semaphore, this.height, this.width); From 6f53414e1f0edd2cfcd348e4780a4fb33847a15e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 30 Mar 2023 17:16:59 +0100 Subject: [PATCH 3/4] Increased execution_time_limit for mock UI tests --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 68e4b918485..8b7586353ef 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -12,7 +12,7 @@ blocks: - name: Mock UI Tests dependencies: [] execution_time_limit: - minutes: 25 + minutes: 30 task: secrets: - name: flowcrypt-browser-ci-secrets From e6f63515b8f21b63f1d68fa0a4db60616592c6e7 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 30 Mar 2023 17:18:49 +0100 Subject: [PATCH 4/4] fix --- test/source/browser/browser-pool.ts | 2 +- test/source/mock/all-apis-mock.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/source/browser/browser-pool.ts b/test/source/browser/browser-pool.ts index 5ab805ea661..c6eb743616a 100644 --- a/test/source/browser/browser-pool.ts +++ b/test/source/browser/browser-pool.ts @@ -44,7 +44,7 @@ export class BrowserPool { args, ignoreHTTPSErrors: this.isMock, headless: false, - devtools: true, + devtools: false, slowMo, }); const handle = new BrowserHandle(browser, this.semaphore, this.height, this.width); diff --git a/test/source/mock/all-apis-mock.ts b/test/source/mock/all-apis-mock.ts index ef0b26bd803..ffc59b0328a 100644 --- a/test/source/mock/all-apis-mock.ts +++ b/test/source/mock/all-apis-mock.ts @@ -19,7 +19,7 @@ export type HandlersDefinition = Handlers<{ query: { [k: string]: string }; body export const startAllApisMock = async (logger: (line: string) => void) => { class LoggedApi extends Api { protected throttleChunkMsUpload = 15; - protected throttleChunkMsDownload = 50; + protected throttleChunkMsDownload = 200; protected log = (ms: number, req: http.IncomingMessage, res: http.ServerResponse, errRes?: Buffer) => { if (req.url !== '/favicon.ico') { logger(`${ms}ms | ${res.statusCode} ${req.method} ${req.url} | ${errRes ? errRes : ''}`);