diff --git a/package.json b/package.json index 19207225..ecf9bf3e 100644 --- a/package.json +++ b/package.json @@ -87,11 +87,10 @@ "evergreen-ui": "^6.13.1", "fast-xml-parser": "^4.4.1", "framer-motion": "^9.0.3", - "got": "^14.4.2", "i18next-parser": "^9.0.1", "icon-gen": "^4.0.0", "immer": "^10.0.2", - "ky": "^0.33.1", + "ky": "^1.7.2", "leaflet": "^1.9.4", "lodash": "^4.17.19", "luxon": "^3.5.0", diff --git a/script/e2e.mts b/script/e2e.mts index 7f26f468..b9724f3c 100644 --- a/script/e2e.mts +++ b/script/e2e.mts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ import assert from 'node:assert'; import { execa } from 'execa'; -import got from 'got'; +import ky from 'ky'; import os from 'node:os'; import timers from 'node:timers/promises'; @@ -22,7 +22,7 @@ console.log('Started', losslessCutExePath); // eslint-disable-next-line unicorn/prefer-top-level-await ps.catch((err) => console.error(err)); -const client = got.extend({ prefixUrl: `http://127.0.0.1:${port}`, timeout: { request: 5000 } }); +const client = ky.extend({ prefixUrl: `http://127.0.0.1:${port}` }); async function captureScreenshot(outPath: string) { // https://trac.ffmpeg.org/wiki/Capture/Desktop#Windows @@ -30,7 +30,7 @@ async function captureScreenshot(outPath: string) { const platform = os.platform(); if (platform === 'darwin') { - const { stderr } = await execa('ffmpeg', ['-f', 'avfoundation', '-list_devices', 'true', '-i', '', '-hide_banner'], { reject: false }); + const { stderr } = await execa('ffmpeg', ['-f', 'avfoundation', '-list_devices', 'true', '-i', '', '-hide_banner'], { reject: false, timeout: 30000 }); console.log(stderr); } @@ -47,6 +47,7 @@ async function captureScreenshot(outPath: string) { try { const resp = await client('', { + timeout: 5000, retry: { backoffLimit: 5000, limit: 10 }, hooks: { beforeRequest: [() => { console.log('attempt'); }] }, }).text(); diff --git a/yarn.lock b/yarn.lock index dfe2b541..54fba445 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1797,13 +1797,6 @@ __metadata: languageName: node linkType: hard -"@sindresorhus/is@npm:^7.0.0": - version: 7.0.0 - resolution: "@sindresorhus/is@npm:7.0.0" - checksum: 10/768f9155dba0dda0277353693babcdf81bbbbec91db2a86a1533696e8cf857e6cf66e517b2ec8922cb25a906bf2e8576c3cf556cd9148ba96451751eb4047536 - languageName: node - linkType: hard - "@sindresorhus/merge-streams@npm:^4.0.0": version: 4.0.0 resolution: "@sindresorhus/merge-streams@npm:4.0.0" @@ -1820,15 +1813,6 @@ __metadata: languageName: node linkType: hard -"@szmarczak/http-timer@npm:^5.0.1": - version: 5.0.1 - resolution: "@szmarczak/http-timer@npm:5.0.1" - dependencies: - defer-to-connect: "npm:^2.0.1" - checksum: 10/fc9cb993e808806692e4a3337c90ece0ec00c89f4b67e3652a356b89730da98bc824273a6d67ca84d5f33cd85f317dcd5ce39d8cc0a2f060145a608a7cb8ce92 - languageName: node - linkType: hard - "@tokenizer/token@npm:^0.3.0": version: 0.3.0 resolution: "@tokenizer/token@npm:0.3.0" @@ -2050,7 +2034,7 @@ __metadata: languageName: node linkType: hard -"@types/http-cache-semantics@npm:*, @types/http-cache-semantics@npm:^4.0.4": +"@types/http-cache-semantics@npm:*": version: 4.0.4 resolution: "@types/http-cache-semantics@npm:4.0.4" checksum: 10/a59566cff646025a5de396d6b3f44a39ab6a74f2ed8150692e0f31cc52f3661a68b04afe3166ebe0d566bd3259cb18522f46e949576d5204781cd6452b7fe0c5 @@ -3384,28 +3368,6 @@ __metadata: languageName: node linkType: hard -"cacheable-lookup@npm:^7.0.0": - version: 7.0.0 - resolution: "cacheable-lookup@npm:7.0.0" - checksum: 10/69ea78cd9f16ad38120372e71ba98b64acecd95bbcbcdad811f857dc192bad81ace021f8def012ce19178583db8d46afd1a00b3e8c88527e978e049edbc23252 - languageName: node - linkType: hard - -"cacheable-request@npm:^12.0.1": - version: 12.0.1 - resolution: "cacheable-request@npm:12.0.1" - dependencies: - "@types/http-cache-semantics": "npm:^4.0.4" - get-stream: "npm:^9.0.1" - http-cache-semantics: "npm:^4.1.1" - keyv: "npm:^4.5.4" - mimic-response: "npm:^4.0.0" - normalize-url: "npm:^8.0.1" - responselike: "npm:^3.0.0" - checksum: 10/91ca6f3cdcbec3309032b96ba8e94e9d3978ab2e9ee048d75b32acf8a0f06c4cd4739317a39ce621469130f838b06713c1333d35b212e87633c4812d7f18b17f - languageName: node - linkType: hard - "cacheable-request@npm:^7.0.2": version: 7.0.2 resolution: "cacheable-request@npm:7.0.2" @@ -4165,7 +4127,7 @@ __metadata: languageName: node linkType: hard -"defer-to-connect@npm:^2.0.0, defer-to-connect@npm:^2.0.1": +"defer-to-connect@npm:^2.0.0": version: 2.0.1 resolution: "defer-to-connect@npm:2.0.1" checksum: 10/8a9b50d2f25446c0bfefb55a48e90afd58f85b21bcf78e9207cd7b804354f6409032a1705c2491686e202e64fc05f147aa5aa45f9aa82627563f045937f5791b @@ -5804,13 +5766,6 @@ __metadata: languageName: node linkType: hard -"form-data-encoder@npm:^4.0.2": - version: 4.0.2 - resolution: "form-data-encoder@npm:4.0.2" - checksum: 10/71a00a1e954267f8b87d4301936dda7177cfe18714a92930c87ebc132acb8b19ed12e9b9f8ad47af52c1cc582fd45c1771f66f850a6d319147731160f6b9b3fa - languageName: node - linkType: hard - "form-data@npm:^4.0.0": version: 4.0.0 resolution: "form-data@npm:4.0.0" @@ -6290,25 +6245,6 @@ __metadata: languageName: node linkType: hard -"got@npm:^14.4.2": - version: 14.4.2 - resolution: "got@npm:14.4.2" - dependencies: - "@sindresorhus/is": "npm:^7.0.0" - "@szmarczak/http-timer": "npm:^5.0.1" - cacheable-lookup: "npm:^7.0.0" - cacheable-request: "npm:^12.0.1" - decompress-response: "npm:^6.0.0" - form-data-encoder: "npm:^4.0.2" - http2-wrapper: "npm:^2.2.1" - lowercase-keys: "npm:^3.0.0" - p-cancelable: "npm:^4.0.1" - responselike: "npm:^3.0.0" - type-fest: "npm:^4.19.0" - checksum: 10/4f3b37594cce3d08ce26e917637eae28a96637cd1bd6569dd6fd61f1224b597dca470aa59597431d1b2b5dbb4a98fa246766dcb7085bb8cbde22f1e762036d03 - languageName: node - linkType: hard - "graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.8": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" @@ -6491,7 +6427,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1": +"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f @@ -6532,16 +6468,6 @@ __metadata: languageName: node linkType: hard -"http2-wrapper@npm:^2.2.1": - version: 2.2.1 - resolution: "http2-wrapper@npm:2.2.1" - dependencies: - quick-lru: "npm:^5.1.1" - resolve-alpn: "npm:^1.2.0" - checksum: 10/e7a5ac6548318e83fc0399cd832cdff6bbf902b165d211cad47a56ee732922e0aa1107246dd884b12532a1c4649d27c4d44f2480911c65202e93c90bde8fa29d - languageName: node - linkType: hard - "https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" @@ -7456,7 +7382,7 @@ __metadata: languageName: node linkType: hard -"keyv@npm:^4.0.0, keyv@npm:^4.5.3, keyv@npm:^4.5.4": +"keyv@npm:^4.0.0, keyv@npm:^4.5.3": version: 4.5.4 resolution: "keyv@npm:4.5.4" dependencies: @@ -7472,10 +7398,10 @@ __metadata: languageName: node linkType: hard -"ky@npm:^0.33.1": - version: 0.33.1 - resolution: "ky@npm:0.33.1" - checksum: 10/119f59fd050a83a1d9954184c9722472ca97782391add7eb7551f01e21d66bf95e4ffae03149712e3a3e185eab76fbe2e7d95611deb6645c4a7fe41ba8e9bd29 +"ky@npm:^1.7.2": + version: 1.7.2 + resolution: "ky@npm:1.7.2" + checksum: 10/d1102fe05e5d2263c5b484bc00b387a5310667aaeec4ebc4f4c3f9369b1d2e62cc19409d50aa21b45127e3ddb8be42d76fb54239799b0aebc9806c7ecb35c696 languageName: node linkType: hard @@ -7712,14 +7638,13 @@ __metadata: file-type: "patch:file-type@npm%3A19.4.1#~/.yarn/patches/file-type-npm-19.4.1-d18086444c.patch" framer-motion: "npm:^9.0.3" fs-extra: "npm:^8.1.0" - got: "npm:^14.4.2" i18next: "npm:^23.12.2" i18next-fs-backend: "npm:^2.3.2" i18next-parser: "npm:^9.0.1" icon-gen: "npm:^4.0.0" immer: "npm:^10.0.2" json5: "npm:^2.2.2" - ky: "npm:^0.33.1" + ky: "npm:^1.7.2" leaflet: "npm:^1.9.4" lodash: "npm:^4.17.19" lodash.debounce: "npm:^4.0.8" @@ -7790,13 +7715,6 @@ __metadata: languageName: node linkType: hard -"lowercase-keys@npm:^3.0.0": - version: 3.0.0 - resolution: "lowercase-keys@npm:3.0.0" - checksum: 10/67a3f81409af969bc0c4ca0e76cd7d16adb1e25aa1c197229587eaf8671275c8c067cd421795dbca4c81be0098e4c426a086a05e30de8a9c587b7a13c0c7ccc5 - languageName: node - linkType: hard - "lowlight@npm:^1.17.0": version: 1.20.0 resolution: "lowlight@npm:1.20.0" @@ -8021,13 +7939,6 @@ __metadata: languageName: node linkType: hard -"mimic-response@npm:^4.0.0": - version: 4.0.0 - resolution: "mimic-response@npm:4.0.0" - checksum: 10/33b804cc961efe206efdb1fca6a22540decdcfce6c14eb5c0c50e5ae9022267ab22ce8f5568b1f7247ba67500fe20d523d81e0e9f009b321ccd9d472e78d1850 - languageName: node - linkType: hard - "min-indent@npm:^1.0.0": version: 1.0.1 resolution: "min-indent@npm:1.0.1" @@ -8387,13 +8298,6 @@ __metadata: languageName: node linkType: hard -"normalize-url@npm:^8.0.1": - version: 8.0.1 - resolution: "normalize-url@npm:8.0.1" - checksum: 10/ae392037584fc5935b663ae4af475351930a1fc39e107956cfac44f42d5127eec2d77d9b7b12ded4696ca78103bafac5b6206a0ea8673c7bffecbe13544fcc5a - languageName: node - linkType: hard - "now-and-later@npm:^3.0.0": version: 3.0.0 resolution: "now-and-later@npm:3.0.0" @@ -8614,13 +8518,6 @@ __metadata: languageName: node linkType: hard -"p-cancelable@npm:^4.0.1": - version: 4.0.1 - resolution: "p-cancelable@npm:4.0.1" - checksum: 10/64de7b0be4c8bacc006488e0e90aa66fbcceb4da4f6fb84584573145f015f9650fe6ac26470897b3e82a3b528f6c60ea276b84cc315e35c45e9f12dec062a295 - languageName: node - linkType: hard - "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -9535,7 +9432,7 @@ __metadata: languageName: node linkType: hard -"resolve-alpn@npm:^1.0.0, resolve-alpn@npm:^1.2.0": +"resolve-alpn@npm:^1.0.0": version: 1.2.1 resolution: "resolve-alpn@npm:1.2.1" checksum: 10/744e87888f0b6fa0b256ab454ca0b9c0b80808715e2ef1f3672773665c92a941f6181194e30ccae4a8cd0adbe0d955d3f133102636d2ee0cca0119fec0bc9aec @@ -9626,15 +9523,6 @@ __metadata: languageName: node linkType: hard -"responselike@npm:^3.0.0": - version: 3.0.0 - resolution: "responselike@npm:3.0.0" - dependencies: - lowercase-keys: "npm:^3.0.0" - checksum: 10/e0cc9be30df4f415d6d83cdede3c5c887cd4a73e7cc1708bcaab1d50a28d15acb68460ac5b02bcc55a42f3d493729c8856427dcf6e57e6e128ad05cba4cfb95e - languageName: node - linkType: hard - "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -11075,7 +10963,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^4.10.3, type-fest@npm:^4.19.0, type-fest@npm:^4.23.0": +"type-fest@npm:^4.10.3, type-fest@npm:^4.23.0": version: 4.26.0 resolution: "type-fest@npm:4.26.0" checksum: 10/f5fe86d2c3db693f7154c8ab0d228a89394e4c446f2ed30ea3b61afaea9757c87c4e79475ef8d6f5fafbd7a4efd302e3b0237d9657dd425228f20a27feee3aef