From e87b92a7b0de501b9d15c30a35c6168cbfc5305d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 01:07:42 -0800 Subject: [PATCH 1/5] deps(dev): Bump spark-evaluate from `434d278` to `045ff21` (#11) Bumps [spark-evaluate](https://github.com/filecoin-station/spark-evaluate) from `434d278` to `045ff21`. - [Commits](https://github.com/filecoin-station/spark-evaluate/compare/434d278420631a35c610d557daf424618dd9c999...045ff211ae0c9b64bab09daa47cb5fbbcc5cf519) --- updated-dependencies: - dependency-name: spark-evaluate dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 204c8f8..095ab0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5404,8 +5404,8 @@ } }, "node_modules/spark-evaluate": { - "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#434d278420631a35c610d557daf424618dd9c999", - "integrity": "sha512-org5adnjndBTCfgl9L+Ptn/QL7FsAae6Zt3wWVdhEpfPsr1tSpXUoMTMevnphdA0f+eO/U5Phd/VhOPvZDD2sQ==", + "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#045ff211ae0c9b64bab09daa47cb5fbbcc5cf519", + "integrity": "sha512-fonQJ2N1ULdWheG3RdO92SF/a/SavOeUizLma3qwdo+EMbi7z2hhpQ5CK08y0/9BmJWQBg4HT1+TYjtn78izXg==", "dev": true, "dependencies": { "@glif/filecoin-address": "^3.0.0", From 60ffd9884171cdd466a3f751a4b74a4ab6dc2a55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 08:49:13 +0000 Subject: [PATCH 2/5] deps: Bump @sentry/node from 7.93.0 to 7.94.1 (#13) Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 7.93.0 to 7.94.1. - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/7.93.0...7.94.1) --- updated-dependencies: - dependency-name: "@sentry/node" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 76 ++++++++++++++++------------------------------- package.json | 2 +- 2 files changed, 27 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index 095ab0c..6da7ba3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@sentry/node": "^7.93.0", + "@sentry/node": "^7.94.1", "debug": "^4.3.4", "http-assert": "^1.5.0", "http-responders": "^2.0.2", @@ -1264,59 +1264,58 @@ "dev": true }, "node_modules/@sentry-internal/tracing": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.93.0.tgz", - "integrity": "sha512-DjuhmQNywPp+8fxC9dvhGrqgsUb6wI/HQp25lS2Re7VxL1swCasvpkg8EOYP4iBniVQ86QK0uITkOIRc5tdY1w==", + "version": "7.94.1", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.94.1.tgz", + "integrity": "sha512-znxCdrz7tPXm9Bwoe46PW72Zr0Iv7bXT6+b2LNg5fxWiCQVBbQFrMuVvtXEmHxeRRJVEgTh/4TdulB7wrtQIUQ==", "dependencies": { - "@sentry/core": "7.93.0", - "@sentry/types": "7.93.0", - "@sentry/utils": "7.93.0" + "@sentry/core": "7.94.1", + "@sentry/types": "7.94.1", + "@sentry/utils": "7.94.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.93.0.tgz", - "integrity": "sha512-vZQSUiDn73n+yu2fEcH+Wpm4GbRmtxmnXnYCPgM6IjnXqkVm3awWAkzrheADblx3kmxrRiOlTXYHw9NTWs56fg==", + "version": "7.94.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.94.1.tgz", + "integrity": "sha512-4sjiMnkbGpv9O98YHVZe7fHNwwdYl+zLoCOoEOadtrJ1EYYvnK/MSixN2HJF7g/0s22xd4xY958QyNIRVR+Iiw==", "dependencies": { - "@sentry/types": "7.93.0", - "@sentry/utils": "7.93.0" + "@sentry/types": "7.94.1", + "@sentry/utils": "7.94.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.93.0.tgz", - "integrity": "sha512-nUXPCZQm5Y9Ipv7iWXLNp5dbuyi1VvbJ3RtlwD7utgsNkRYB4ixtKE9w2QU8DZZAjaEF6w2X94OkYH6C932FWw==", + "version": "7.94.1", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.94.1.tgz", + "integrity": "sha512-30nyrfVbY1vNoWg5ptGW+soykU532VvKLuXiKty3SKEXjp5bv23JrCcVtuwp9KrW4josHOJbxZUqeNni85YplQ==", "dependencies": { - "@sentry-internal/tracing": "7.93.0", - "@sentry/core": "7.93.0", - "@sentry/types": "7.93.0", - "@sentry/utils": "7.93.0", - "https-proxy-agent": "^5.0.0" + "@sentry-internal/tracing": "7.94.1", + "@sentry/core": "7.94.1", + "@sentry/types": "7.94.1", + "@sentry/utils": "7.94.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.93.0.tgz", - "integrity": "sha512-UnzUccNakhFRA/esWBWP+0v7cjNg+RilFBQC03Mv9OEMaZaS29zSbcOGtRzuFOXXLBdbr44BWADqpz3VW0XaNw==", + "version": "7.94.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.94.1.tgz", + "integrity": "sha512-A7CdEXFSgGyWv2BT2p9cAvJfb+dypvOtsY8ZvZvdPLUa7kqCV7ndhURUqKjvMBzsL2GParHn3ehDTl2eVc7pvA==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.93.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.93.0.tgz", - "integrity": "sha512-Iovj7tUnbgSkh/WrAaMrd5UuYjW7AzyzZlFDIUrwidsyIdUficjCG2OIxYzh76H6nYIx9SxewW0R54Q6XoB4uA==", + "version": "7.94.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.94.1.tgz", + "integrity": "sha512-gQ2EaMpUU1gGH3S+iqpog9gkXbCo8tlhGYA9a5FUtEtER3D3OAlp8dGFwClwzWDAwzjdLT1+X55zmEptU1cP/A==", "dependencies": { - "@sentry/types": "7.93.0" + "@sentry/types": "7.94.1" }, "engines": { "node": ">=8" @@ -1410,17 +1409,6 @@ "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", "dev": true }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -3363,18 +3351,6 @@ "resolved": "https://registry.npmjs.org/http-responders/-/http-responders-2.0.2.tgz", "integrity": "sha512-3Q0cXn81VLyjVOcKmw5RhZHTl7gioVcv54T9lNc/UFx2uraI+chNX/JLRUhBNgE29o3tqfTtAqo306zNq4F2Lw==" }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", diff --git a/package.json b/package.json index 4416a43..05167b3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "standard": "^17.1.0" }, "dependencies": { - "@sentry/node": "^7.93.0", + "@sentry/node": "^7.94.1", "debug": "^4.3.4", "http-assert": "^1.5.0", "http-responders": "^2.0.2", From f40ac5391e99e4f75b776d4994fe2bb27fcb4ab7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 01:35:17 -0800 Subject: [PATCH 3/5] deps(dev): Bump spark-evaluate from `045ff21` to `abee7a3` (#12) Bumps [spark-evaluate](https://github.com/filecoin-station/spark-evaluate) from `045ff21` to `abee7a3`. - [Commits](https://github.com/filecoin-station/spark-evaluate/compare/045ff211ae0c9b64bab09daa47cb5fbbcc5cf519...abee7a3c1cdab33aca36c5b29c0b5bcf76a0c209) --- updated-dependencies: - dependency-name: spark-evaluate dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6da7ba3..b59b6ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5380,14 +5380,14 @@ } }, "node_modules/spark-evaluate": { - "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#045ff211ae0c9b64bab09daa47cb5fbbcc5cf519", - "integrity": "sha512-fonQJ2N1ULdWheG3RdO92SF/a/SavOeUizLma3qwdo+EMbi7z2hhpQ5CK08y0/9BmJWQBg4HT1+TYjtn78izXg==", + "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#abee7a3c1cdab33aca36c5b29c0b5bcf76a0c209", + "integrity": "sha512-Yx8D1QzXZ1YSjkIbuDM6n78lJJI8SumKemmxZ86b1+NyjawQQ8HorveNSaAHj5v5VmXv6+P0C5EYAlJpCYlEoA==", "dev": true, "dependencies": { "@glif/filecoin-address": "^3.0.0", "@influxdata/influxdb-client": "^1.33.2", "@ipld/car": "^5.2.6", - "@sentry/node": "^7.93.0", + "@sentry/node": "^7.94.1", "@web3-storage/car-block-validator": "^1.2.0", "debug": "^4.3.4", "ethers": "^6.10.0", From 2838f5e7448cc9022633ffac342f46c74d596225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 22 Jan 2024 15:57:25 +0100 Subject: [PATCH 4/5] refactor: simplify handling of '//' in req.url (#8) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- lib/handler.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/handler.js b/lib/handler.js index 50dd462..90c2ac9 100644 --- a/lib/handler.js +++ b/lib/handler.js @@ -32,9 +32,8 @@ export const createHandler = ({ * @param {import('pg').Pool} pgPool */ const handler = async (req, res, pgPool) => { - // Fix the edge case: new URL('//foo', 'http://127.0.0.1') produces href "http://foo/" - const reqUrl = req.url.replace(/^\/+/, '/') - const { pathname, searchParams } = new URL(reqUrl, 'http://127.0.0.1') + // Caveat! `new URL('//foo', 'http://127.0.0.1')` would produce "http://foo/" - not what we want! + const { pathname, searchParams } = new URL(`http://127.0.0.1${req.url}`) const segs = pathname.split('/').filter(Boolean) if (req.method === 'GET' && segs[0] === 'retrieval-success-rate' && segs.length === 1) { await getStatsWithFilterAndCaching( From 9a7bcb4befad988a4fbd7ecafd824f808ee90c12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:46:24 +0100 Subject: [PATCH 5/5] deps(dev): Bump spark-evaluate from `abee7a3` to `581303c` (#14) Bumps [spark-evaluate](https://github.com/filecoin-station/spark-evaluate) from `abee7a3` to `581303c`. - [Commits](https://github.com/filecoin-station/spark-evaluate/compare/abee7a3c1cdab33aca36c5b29c0b5bcf76a0c209...581303c50e84a3ae5640fc0bf2516cb606b591d4) --- updated-dependencies: - dependency-name: spark-evaluate dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 73 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index b59b6ca..17dc7ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1342,6 +1342,12 @@ "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==", "dev": true }, + "node_modules/@types/retry": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz", + "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==", + "dev": true + }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", @@ -3502,9 +3508,9 @@ } }, "node_modules/ipfs-unixfs-exporter": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.3.0.tgz", - "integrity": "sha512-KqQ04DTGfd/z7kaZcVmq8JhEv4DS+8VHu/3nUJqZB8TJ4+hIzSaBzrfUdstqjVpcFpkqcDhypv6WMq4P7uH61g==", + "version": "13.4.0", + "resolved": "https://registry.npmjs.org/ipfs-unixfs-exporter/-/ipfs-unixfs-exporter-13.4.0.tgz", + "integrity": "sha512-6KkGnh9KxWPQQ26k/mAG3jLzvvT85cz4tmKJK/DlDxXHmSmMAu9IkAvu2RfVy/BHPtT1+zF7Fw1Y5CNiZzHuLg==", "dev": true, "dependencies": { "@ipld/dag-cbor": "^9.0.0", @@ -3523,12 +3529,7 @@ "it-pushable": "^3.1.0", "multiformats": "^13.0.0", "p-queue": "^8.0.1", - "progress-events": "^1.0.0", - "uint8arrays": "^5.0.0" - }, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" + "progress-events": "^1.0.0" } }, "node_modules/ipfs-unixfs-exporter/node_modules/@multiformats/murmur3": { @@ -3545,15 +3546,6 @@ "npm": ">=7.0.0" } }, - "node_modules/ipfs-unixfs-exporter/node_modules/uint8arrays": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-5.0.1.tgz", - "integrity": "sha512-ND5RpJAnPgHmZT7hWD/2T4BwRp04j8NLKvMKC/7bhiEwEjUMkQ4kvBKiH6hOqbljd6qJ2xS8reL3vl1e33grOQ==", - "dev": true, - "dependencies": { - "multiformats": "^13.0.0" - } - }, "node_modules/is-array-buffer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", @@ -3746,6 +3738,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-network-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.1.tgz", + "integrity": "sha512-OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -4586,6 +4590,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-retry": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz", + "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==", + "dev": true, + "dependencies": { + "@types/retry": "0.12.2", + "is-network-error": "^1.0.0", + "retry": "^0.13.1" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-timeout": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.2.tgz", @@ -5170,6 +5191,15 @@ "node": ">=4" } }, + "node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -5380,8 +5410,8 @@ } }, "node_modules/spark-evaluate": { - "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#abee7a3c1cdab33aca36c5b29c0b5bcf76a0c209", - "integrity": "sha512-Yx8D1QzXZ1YSjkIbuDM6n78lJJI8SumKemmxZ86b1+NyjawQQ8HorveNSaAHj5v5VmXv6+P0C5EYAlJpCYlEoA==", + "resolved": "git+ssh://git@github.com/filecoin-station/spark-evaluate.git#581303c50e84a3ae5640fc0bf2516cb606b591d4", + "integrity": "sha512-0AYxMP1KJrP54fDt3e6ifWN7bZrYpYerUn/Y5/mxUrFgWA6vlmG2fXC8W8UjxJRaPajB3DjbnqirA+gELnT6sA==", "dev": true, "dependencies": { "@glif/filecoin-address": "^3.0.0", @@ -5392,8 +5422,9 @@ "debug": "^4.3.4", "ethers": "^6.10.0", "ipfs-car": "^1.1.0", - "ipfs-unixfs-exporter": "^13.2.5", + "ipfs-unixfs-exporter": "^13.4.0", "just-percentile": "^4.2.0", + "p-retry": "^6.2.0", "pg": "^8.11.3", "postgrator": "^7.2.0" }