🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
r2 stream
Edward Cuid80904db7aa8
diff --git a/server/package-lock.json b/server/package-lock.jsonindex 620a47528..b9119041c 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -1,14 +1,15 @@{- "name": "analytics-backend",- "version": "1.0.0",+ "name": "rybbit-backend",+ "version": "1.5.0","lockfileVersion": 3,"requires": true,"packages": {"": {- "name": "analytics-backend",- "version": "1.0.0",+ "name": "rybbit-backend",+ "version": "1.5.0","dependencies": {"@aws-sdk/client-s3": "^3.842.0",+ "@aws-sdk/lib-storage": "^3.850.0","@clickhouse/client": "1.11.1","@fast-csv/parse": "^5.0.2","@fastify/cors": "11.0.1",@@ -288,64 +289,64 @@}},"node_modules/@aws-sdk/client-s3": {- "version": "3.842.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.842.0.tgz",- "integrity": "sha512-T5Rh72Rcq1xIaM8KkTr1Wpr7/WPCYO++KrM+/Em0rq2jxpjMMhj77ITpgH7eEmNxWmwIndTwqpgfmbpNfk7Gbw==",+ "version": "3.850.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.850.0.tgz",+ "integrity": "sha512-tX5bUfqiLOh6jtAlaiAuOUKFYh8KDG9k9zFLUdgGplC5TP47AYTreUEg+deCTHo4DD3YCvrLuyZ8tIDgKu7neQ==","license": "Apache-2.0","dependencies": {"@aws-crypto/sha1-browser": "5.2.0","@aws-crypto/sha256-browser": "5.2.0","@aws-crypto/sha256-js": "5.2.0",- "@aws-sdk/core": "3.840.0",- "@aws-sdk/credential-provider-node": "3.840.0",+ "@aws-sdk/core": "3.846.0",+ "@aws-sdk/credential-provider-node": "3.848.0","@aws-sdk/middleware-bucket-endpoint": "3.840.0","@aws-sdk/middleware-expect-continue": "3.840.0",- "@aws-sdk/middleware-flexible-checksums": "3.840.0",+ "@aws-sdk/middleware-flexible-checksums": "3.846.0","@aws-sdk/middleware-host-header": "3.840.0","@aws-sdk/middleware-location-constraint": "3.840.0","@aws-sdk/middleware-logger": "3.840.0","@aws-sdk/middleware-recursion-detection": "3.840.0",- "@aws-sdk/middleware-sdk-s3": "3.840.0",+ "@aws-sdk/middleware-sdk-s3": "3.846.0","@aws-sdk/middleware-ssec": "3.840.0",- "@aws-sdk/middleware-user-agent": "3.840.0",+ "@aws-sdk/middleware-user-agent": "3.848.0","@aws-sdk/region-config-resolver": "3.840.0",- "@aws-sdk/signature-v4-multi-region": "3.840.0",+ "@aws-sdk/signature-v4-multi-region": "3.846.0","@aws-sdk/types": "3.840.0",- "@aws-sdk/util-endpoints": "3.840.0",+ "@aws-sdk/util-endpoints": "3.848.0","@aws-sdk/util-user-agent-browser": "3.840.0",- "@aws-sdk/util-user-agent-node": "3.840.0",+ "@aws-sdk/util-user-agent-node": "3.848.0","@aws-sdk/xml-builder": "3.821.0","@smithy/config-resolver": "^4.1.4",- "@smithy/core": "^3.6.0",+ "@smithy/core": "^3.7.0","@smithy/eventstream-serde-browser": "^4.0.4","@smithy/eventstream-serde-config-resolver": "^4.1.2","@smithy/eventstream-serde-node": "^4.0.4",- "@smithy/fetch-http-handler": "^5.0.4",+ "@smithy/fetch-http-handler": "^5.1.0","@smithy/hash-blob-browser": "^4.0.4","@smithy/hash-node": "^4.0.4","@smithy/hash-stream-node": "^4.0.4","@smithy/invalid-dependency": "^4.0.4","@smithy/md5-js": "^4.0.4","@smithy/middleware-content-length": "^4.0.4",- "@smithy/middleware-endpoint": "^4.1.13",- "@smithy/middleware-retry": "^4.1.14",+ "@smithy/middleware-endpoint": "^4.1.15",+ "@smithy/middleware-retry": "^4.1.16","@smithy/middleware-serde": "^4.0.8","@smithy/middleware-stack": "^4.0.4","@smithy/node-config-provider": "^4.1.3",- "@smithy/node-http-handler": "^4.0.6",+ "@smithy/node-http-handler": "^4.1.0","@smithy/protocol-http": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1","@smithy/url-parser": "^4.0.4","@smithy/util-base64": "^4.0.0","@smithy/util-body-length-browser": "^4.0.0","@smithy/util-body-length-node": "^4.0.0",- "@smithy/util-defaults-mode-browser": "^4.0.21",- "@smithy/util-defaults-mode-node": "^4.0.21",+ "@smithy/util-defaults-mode-browser": "^4.0.23",+ "@smithy/util-defaults-mode-node": "^4.0.23","@smithy/util-endpoints": "^3.0.6","@smithy/util-middleware": "^4.0.4","@smithy/util-retry": "^4.0.6",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","@smithy/util-utf8": "^4.0.0","@smithy/util-waiter": "^4.0.6","@types/uuid": "^9.0.1",@@ -357,44 +358,44 @@}},"node_modules/@aws-sdk/client-sso": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.840.0.tgz",- "integrity": "sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz",+ "integrity": "sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw==","license": "Apache-2.0","dependencies": {"@aws-crypto/sha256-browser": "5.2.0","@aws-crypto/sha256-js": "5.2.0",- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/middleware-host-header": "3.840.0","@aws-sdk/middleware-logger": "3.840.0","@aws-sdk/middleware-recursion-detection": "3.840.0",- "@aws-sdk/middleware-user-agent": "3.840.0",+ "@aws-sdk/middleware-user-agent": "3.848.0","@aws-sdk/region-config-resolver": "3.840.0","@aws-sdk/types": "3.840.0",- "@aws-sdk/util-endpoints": "3.840.0",+ "@aws-sdk/util-endpoints": "3.848.0","@aws-sdk/util-user-agent-browser": "3.840.0",- "@aws-sdk/util-user-agent-node": "3.840.0",+ "@aws-sdk/util-user-agent-node": "3.848.0","@smithy/config-resolver": "^4.1.4",- "@smithy/core": "^3.6.0",- "@smithy/fetch-http-handler": "^5.0.4",+ "@smithy/core": "^3.7.0",+ "@smithy/fetch-http-handler": "^5.1.0","@smithy/hash-node": "^4.0.4","@smithy/invalid-dependency": "^4.0.4","@smithy/middleware-content-length": "^4.0.4",- "@smithy/middleware-endpoint": "^4.1.13",- "@smithy/middleware-retry": "^4.1.14",+ "@smithy/middleware-endpoint": "^4.1.15",+ "@smithy/middleware-retry": "^4.1.16","@smithy/middleware-serde": "^4.0.8","@smithy/middleware-stack": "^4.0.4","@smithy/node-config-provider": "^4.1.3",- "@smithy/node-http-handler": "^4.0.6",+ "@smithy/node-http-handler": "^4.1.0","@smithy/protocol-http": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1","@smithy/url-parser": "^4.0.4","@smithy/util-base64": "^4.0.0","@smithy/util-body-length-browser": "^4.0.0","@smithy/util-body-length-node": "^4.0.0",- "@smithy/util-defaults-mode-browser": "^4.0.21",- "@smithy/util-defaults-mode-node": "^4.0.21",+ "@smithy/util-defaults-mode-browser": "^4.0.23",+ "@smithy/util-defaults-mode-node": "^4.0.23","@smithy/util-endpoints": "^3.0.6","@smithy/util-middleware": "^4.0.4","@smithy/util-retry": "^4.0.6",@@ -406,25 +407,25 @@}},"node_modules/@aws-sdk/core": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.840.0.tgz",- "integrity": "sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.846.0.tgz",+ "integrity": "sha512-7CX0pM906r4WSS68fCTNMTtBCSkTtf3Wggssmx13gD40gcWEZXsU00KzPp1bYheNRyPlAq3rE22xt4wLPXbuxA==","license": "Apache-2.0","dependencies": {"@aws-sdk/types": "3.840.0","@aws-sdk/xml-builder": "3.821.0",- "@smithy/core": "^3.6.0",+ "@smithy/core": "^3.7.0","@smithy/node-config-provider": "^4.1.3","@smithy/property-provider": "^4.0.4","@smithy/protocol-http": "^5.1.2","@smithy/signature-v4": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1","@smithy/util-base64": "^4.0.0","@smithy/util-body-length-browser": "^4.0.0","@smithy/util-middleware": "^4.0.4","@smithy/util-utf8": "^4.0.0",- "fast-xml-parser": "4.4.1",+ "fast-xml-parser": "5.2.5","tslib": "^2.6.2"},"engines": {@@ -432,12 +433,12 @@}},"node_modules/@aws-sdk/credential-provider-env": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.840.0.tgz",- "integrity": "sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.846.0.tgz",+ "integrity": "sha512-QuCQZET9enja7AWVISY+mpFrEIeHzvkx/JEEbHYzHhUkxcnC2Kq2c0bB7hDihGD0AZd3Xsm653hk1O97qu69zg==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0","@smithy/property-provider": "^4.0.4","@smithy/types": "^4.3.1",@@ -448,20 +449,20 @@}},"node_modules/@aws-sdk/credential-provider-http": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.840.0.tgz",- "integrity": "sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.846.0.tgz",+ "integrity": "sha512-Jh1iKUuepdmtreMYozV2ePsPcOF5W9p3U4tWhi3v6nDvz0GsBjzjAROW+BW8XMz9vAD3I9R+8VC3/aq63p5nlw==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0",- "@smithy/fetch-http-handler": "^5.0.4",- "@smithy/node-http-handler": "^4.0.6",+ "@smithy/fetch-http-handler": "^5.1.0",+ "@smithy/node-http-handler": "^4.1.0","@smithy/property-provider": "^4.0.4","@smithy/protocol-http": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","tslib": "^2.6.2"},"engines": {@@ -469,18 +470,18 @@}},"node_modules/@aws-sdk/credential-provider-ini": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.840.0.tgz",- "integrity": "sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz",+ "integrity": "sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",- "@aws-sdk/credential-provider-env": "3.840.0",- "@aws-sdk/credential-provider-http": "3.840.0",- "@aws-sdk/credential-provider-process": "3.840.0",- "@aws-sdk/credential-provider-sso": "3.840.0",- "@aws-sdk/credential-provider-web-identity": "3.840.0",- "@aws-sdk/nested-clients": "3.840.0",+ "@aws-sdk/core": "3.846.0",+ "@aws-sdk/credential-provider-env": "3.846.0",+ "@aws-sdk/credential-provider-http": "3.846.0",+ "@aws-sdk/credential-provider-process": "3.846.0",+ "@aws-sdk/credential-provider-sso": "3.848.0",+ "@aws-sdk/credential-provider-web-identity": "3.848.0",+ "@aws-sdk/nested-clients": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/credential-provider-imds": "^4.0.6","@smithy/property-provider": "^4.0.4",@@ -493,17 +494,17 @@}},"node_modules/@aws-sdk/credential-provider-node": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.840.0.tgz",- "integrity": "sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz",+ "integrity": "sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g==","license": "Apache-2.0","dependencies": {- "@aws-sdk/credential-provider-env": "3.840.0",- "@aws-sdk/credential-provider-http": "3.840.0",- "@aws-sdk/credential-provider-ini": "3.840.0",- "@aws-sdk/credential-provider-process": "3.840.0",- "@aws-sdk/credential-provider-sso": "3.840.0",- "@aws-sdk/credential-provider-web-identity": "3.840.0",+ "@aws-sdk/credential-provider-env": "3.846.0",+ "@aws-sdk/credential-provider-http": "3.846.0",+ "@aws-sdk/credential-provider-ini": "3.848.0",+ "@aws-sdk/credential-provider-process": "3.846.0",+ "@aws-sdk/credential-provider-sso": "3.848.0",+ "@aws-sdk/credential-provider-web-identity": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/credential-provider-imds": "^4.0.6","@smithy/property-provider": "^4.0.4",@@ -516,12 +517,12 @@}},"node_modules/@aws-sdk/credential-provider-process": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.840.0.tgz",- "integrity": "sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.846.0.tgz",+ "integrity": "sha512-mEpwDYarJSH+CIXnnHN0QOe0MXI+HuPStD6gsv3z/7Q6ESl8KRWon3weFZCDnqpiJMUVavlDR0PPlAFg2MQoPg==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0","@smithy/property-provider": "^4.0.4","@smithy/shared-ini-file-loader": "^4.0.4",@@ -533,14 +534,14 @@}},"node_modules/@aws-sdk/credential-provider-sso": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.840.0.tgz",- "integrity": "sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz",+ "integrity": "sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg==","license": "Apache-2.0","dependencies": {- "@aws-sdk/client-sso": "3.840.0",- "@aws-sdk/core": "3.840.0",- "@aws-sdk/token-providers": "3.840.0",+ "@aws-sdk/client-sso": "3.848.0",+ "@aws-sdk/core": "3.846.0",+ "@aws-sdk/token-providers": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/property-provider": "^4.0.4","@smithy/shared-ini-file-loader": "^4.0.4",@@ -552,13 +553,13 @@}},"node_modules/@aws-sdk/credential-provider-web-identity": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.840.0.tgz",- "integrity": "sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz",+ "integrity": "sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",- "@aws-sdk/nested-clients": "3.840.0",+ "@aws-sdk/core": "3.846.0",+ "@aws-sdk/nested-clients": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/property-provider": "^4.0.4","@smithy/types": "^4.3.1",@@ -568,6 +569,37 @@"node": ">=18.0.0"}},+ "node_modules/@aws-sdk/lib-storage": {+ "version": "3.850.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.850.0.tgz",+ "integrity": "sha512-DKG8mKeUMLRboyqwhKiV9QOiKXN00OYLnGsT21mhlaF1Uc7OZ6Vm+Olw4YrbYSBuDup0rMWtVaWudJ49I+ZCHA==",+ "license": "Apache-2.0",+ "dependencies": {+ "@smithy/abort-controller": "^4.0.4",+ "@smithy/middleware-endpoint": "^4.1.15",+ "@smithy/smithy-client": "^4.4.7",+ "buffer": "5.6.0",+ "events": "3.3.0",+ "stream-browserify": "3.0.0",+ "tslib": "^2.6.2"+ },+ "engines": {+ "node": ">=18.0.0"+ },+ "peerDependencies": {+ "@aws-sdk/client-s3": "^3.850.0"+ }+ },+ "node_modules/@aws-sdk/lib-storage/node_modules/buffer": {+ "version": "5.6.0",+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",+ "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",+ "license": "MIT",+ "dependencies": {+ "base64-js": "^1.0.2",+ "ieee754": "^1.1.4"+ }+ },"node_modules/@aws-sdk/middleware-bucket-endpoint": {"version": "3.840.0","resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.840.0.tgz",@@ -602,22 +634,22 @@}},"node_modules/@aws-sdk/middleware-flexible-checksums": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.840.0.tgz",- "integrity": "sha512-Kg/o2G6o72sdoRH0J+avdcf668gM1bp6O4VeEXpXwUj/urQnV5qiB2q1EYT110INHUKWOLXPND3sQAqh6sTqHw==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.846.0.tgz",+ "integrity": "sha512-CdkeVfkwt3+bDLhmOwBxvkUf6oY9iUhvosaUnqkoPsOqIiUEN54yTGOnO8A0wLz6mMsZ6aBlfFrQhFnxt3c+yw==","license": "Apache-2.0","dependencies": {"@aws-crypto/crc32": "5.2.0","@aws-crypto/crc32c": "5.2.0","@aws-crypto/util": "5.2.0",- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0","@smithy/is-array-buffer": "^4.0.0","@smithy/node-config-provider": "^4.1.3","@smithy/protocol-http": "^5.1.2","@smithy/types": "^4.3.1","@smithy/util-middleware": "^4.0.4",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","@smithy/util-utf8": "^4.0.0","tslib": "^2.6.2"},@@ -684,23 +716,23 @@}},"node_modules/@aws-sdk/middleware-sdk-s3": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.840.0.tgz",- "integrity": "sha512-rOUji7CayWN3O09zvvgLzDVQe0HiJdZkxoTS6vzOS3WbbdT7joGdVtAJHtn+x776QT3hHzbKU5gnfhel0o6gQA==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.846.0.tgz",+ "integrity": "sha512-jP9x+2Q87J5l8FOP+jlAd7vGLn0cC6G9QGmf386e5OslBPqxXKcl3RjqGLIOKKos2mVItY3ApP5xdXQx7jGTVA==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0","@aws-sdk/util-arn-parser": "3.804.0",- "@smithy/core": "^3.6.0",+ "@smithy/core": "^3.7.0","@smithy/node-config-provider": "^4.1.3","@smithy/protocol-http": "^5.1.2","@smithy/signature-v4": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1","@smithy/util-config-provider": "^4.0.0","@smithy/util-middleware": "^4.0.4",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","@smithy/util-utf8": "^4.0.0","tslib": "^2.6.2"},@@ -723,15 +755,15 @@}},"node_modules/@aws-sdk/middleware-user-agent": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.840.0.tgz",- "integrity": "sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz",+ "integrity": "sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/types": "3.840.0",- "@aws-sdk/util-endpoints": "3.840.0",- "@smithy/core": "^3.6.0",+ "@aws-sdk/util-endpoints": "3.848.0",+ "@smithy/core": "^3.7.0","@smithy/protocol-http": "^5.1.2","@smithy/types": "^4.3.1","tslib": "^2.6.2"@@ -741,44 +773,44 @@}},"node_modules/@aws-sdk/nested-clients": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.840.0.tgz",- "integrity": "sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz",+ "integrity": "sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg==","license": "Apache-2.0","dependencies": {"@aws-crypto/sha256-browser": "5.2.0","@aws-crypto/sha256-js": "5.2.0",- "@aws-sdk/core": "3.840.0",+ "@aws-sdk/core": "3.846.0","@aws-sdk/middleware-host-header": "3.840.0","@aws-sdk/middleware-logger": "3.840.0","@aws-sdk/middleware-recursion-detection": "3.840.0",- "@aws-sdk/middleware-user-agent": "3.840.0",+ "@aws-sdk/middleware-user-agent": "3.848.0","@aws-sdk/region-config-resolver": "3.840.0","@aws-sdk/types": "3.840.0",- "@aws-sdk/util-endpoints": "3.840.0",+ "@aws-sdk/util-endpoints": "3.848.0","@aws-sdk/util-user-agent-browser": "3.840.0",- "@aws-sdk/util-user-agent-node": "3.840.0",+ "@aws-sdk/util-user-agent-node": "3.848.0","@smithy/config-resolver": "^4.1.4",- "@smithy/core": "^3.6.0",- "@smithy/fetch-http-handler": "^5.0.4",+ "@smithy/core": "^3.7.0",+ "@smithy/fetch-http-handler": "^5.1.0","@smithy/hash-node": "^4.0.4","@smithy/invalid-dependency": "^4.0.4","@smithy/middleware-content-length": "^4.0.4",- "@smithy/middleware-endpoint": "^4.1.13",- "@smithy/middleware-retry": "^4.1.14",+ "@smithy/middleware-endpoint": "^4.1.15",+ "@smithy/middleware-retry": "^4.1.16","@smithy/middleware-serde": "^4.0.8","@smithy/middleware-stack": "^4.0.4","@smithy/node-config-provider": "^4.1.3",- "@smithy/node-http-handler": "^4.0.6",+ "@smithy/node-http-handler": "^4.1.0","@smithy/protocol-http": "^5.1.2",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.7","@smithy/types": "^4.3.1","@smithy/url-parser": "^4.0.4","@smithy/util-base64": "^4.0.0","@smithy/util-body-length-browser": "^4.0.0","@smithy/util-body-length-node": "^4.0.0",- "@smithy/util-defaults-mode-browser": "^4.0.21",- "@smithy/util-defaults-mode-node": "^4.0.21",+ "@smithy/util-defaults-mode-browser": "^4.0.23",+ "@smithy/util-defaults-mode-node": "^4.0.23","@smithy/util-endpoints": "^3.0.6","@smithy/util-middleware": "^4.0.4","@smithy/util-retry": "^4.0.6",@@ -807,12 +839,12 @@}},"node_modules/@aws-sdk/signature-v4-multi-region": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.840.0.tgz",- "integrity": "sha512-8AoVgHrkSfhvGPtwx23hIUO4MmMnux2pjnso1lrLZGqxfElM6jm2w4jTNLlNXk8uKHGyX89HaAIuT0lL6dJj9g==",+ "version": "3.846.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.846.0.tgz",+ "integrity": "sha512-ZMfIMxUljqZzPJGOcraC6erwq/z1puNMU35cO1a/WdhB+LdYknMn1lr7SJuH754QwNzzIlZbEgg4hoHw50+DpQ==","license": "Apache-2.0","dependencies": {- "@aws-sdk/middleware-sdk-s3": "3.840.0",+ "@aws-sdk/middleware-sdk-s3": "3.846.0","@aws-sdk/types": "3.840.0","@smithy/protocol-http": "^5.1.2","@smithy/signature-v4": "^5.1.2",@@ -824,13 +856,13 @@}},"node_modules/@aws-sdk/token-providers": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.840.0.tgz",- "integrity": "sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz",+ "integrity": "sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg==","license": "Apache-2.0","dependencies": {- "@aws-sdk/core": "3.840.0",- "@aws-sdk/nested-clients": "3.840.0",+ "@aws-sdk/core": "3.846.0",+ "@aws-sdk/nested-clients": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/property-provider": "^4.0.4","@smithy/shared-ini-file-loader": "^4.0.4",@@ -867,13 +899,14 @@}},"node_modules/@aws-sdk/util-endpoints": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.840.0.tgz",- "integrity": "sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz",+ "integrity": "sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==","license": "Apache-2.0","dependencies": {"@aws-sdk/types": "3.840.0","@smithy/types": "^4.3.1",+ "@smithy/url-parser": "^4.0.4","@smithy/util-endpoints": "^3.0.6","tslib": "^2.6.2"},@@ -906,12 +939,12 @@}},"node_modules/@aws-sdk/util-user-agent-node": {- "version": "3.840.0",- "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.840.0.tgz",- "integrity": "sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==",+ "version": "3.848.0",+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz",+ "integrity": "sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw==","license": "Apache-2.0","dependencies": {- "@aws-sdk/middleware-user-agent": "3.840.0",+ "@aws-sdk/middleware-user-agent": "3.848.0","@aws-sdk/types": "3.840.0","@smithy/node-config-provider": "^4.1.3","@smithy/types": "^4.3.1",@@ -3059,9 +3092,9 @@}},"node_modules/@smithy/core": {- "version": "3.6.0",- "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.6.0.tgz",- "integrity": "sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==",+ "version": "3.7.2",+ "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.7.2.tgz",+ "integrity": "sha512-JoLw59sT5Bm8SAjFCYZyuCGxK8y3vovmoVbZWLDPTH5XpPEIwpFd9m90jjVMwoypDuB/SdVgje5Y4T7w50lJaw==","license": "Apache-2.0","dependencies": {"@smithy/middleware-serde": "^4.0.8",@@ -3070,7 +3103,7 @@"@smithy/util-base64": "^4.0.0","@smithy/util-body-length-browser": "^4.0.0","@smithy/util-middleware": "^4.0.4",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","@smithy/util-utf8": "^4.0.0","tslib": "^2.6.2"},@@ -3165,9 +3198,9 @@}},"node_modules/@smithy/fetch-http-handler": {- "version": "5.0.4",- "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz",- "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==",+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz",+ "integrity": "sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==","license": "Apache-2.0","dependencies": {"@smithy/protocol-http": "^5.1.2",@@ -3278,12 +3311,12 @@}},"node_modules/@smithy/middleware-endpoint": {- "version": "4.1.13",- "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.13.tgz",- "integrity": "sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ==",+ "version": "4.1.17",+ "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.17.tgz",+ "integrity": "sha512-S3hSGLKmHG1m35p/MObQCBCdRsrpbPU8B129BVzRqRfDvQqPMQ14iO4LyRw+7LNizYc605COYAcjqgawqi+6jA==","license": "Apache-2.0","dependencies": {- "@smithy/core": "^3.6.0",+ "@smithy/core": "^3.7.2","@smithy/middleware-serde": "^4.0.8","@smithy/node-config-provider": "^4.1.3","@smithy/shared-ini-file-loader": "^4.0.4",@@ -3297,15 +3330,15 @@}},"node_modules/@smithy/middleware-retry": {- "version": "4.1.14",- "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.14.tgz",- "integrity": "sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw==",+ "version": "4.1.18",+ "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.18.tgz",+ "integrity": "sha512-bYLZ4DkoxSsPxpdmeapvAKy7rM5+25gR7PGxq2iMiecmbrRGBHj9s75N74Ylg+aBiw9i5jIowC/cLU2NR0qH8w==","license": "Apache-2.0","dependencies": {"@smithy/node-config-provider": "^4.1.3","@smithy/protocol-http": "^5.1.2","@smithy/service-error-classification": "^4.0.6",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.9","@smithy/types": "^4.3.1","@smithy/util-middleware": "^4.0.4","@smithy/util-retry": "^4.0.6",@@ -3359,9 +3392,9 @@}},"node_modules/@smithy/node-http-handler": {- "version": "4.0.6",- "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz",- "integrity": "sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==",+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz",+ "integrity": "sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==","license": "Apache-2.0","dependencies": {"@smithy/abort-controller": "^4.0.4",@@ -3472,17 +3505,17 @@}},"node_modules/@smithy/smithy-client": {- "version": "4.4.5",- "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.5.tgz",- "integrity": "sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg==",+ "version": "4.4.9",+ "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.9.tgz",+ "integrity": "sha512-mbMg8mIUAWwMmb74LoYiArP04zWElPzDoA1jVOp3or0cjlDMgoS6WTC3QXK0Vxoc9I4zdrX0tq6qsOmaIoTWEQ==","license": "Apache-2.0","dependencies": {- "@smithy/core": "^3.6.0",- "@smithy/middleware-endpoint": "^4.1.13",+ "@smithy/core": "^3.7.2",+ "@smithy/middleware-endpoint": "^4.1.17","@smithy/middleware-stack": "^4.0.4","@smithy/protocol-http": "^5.1.2","@smithy/types": "^4.3.1",- "@smithy/util-stream": "^4.2.2",+ "@smithy/util-stream": "^4.2.3","tslib": "^2.6.2"},"engines": {@@ -3579,13 +3612,13 @@}},"node_modules/@smithy/util-defaults-mode-browser": {- "version": "4.0.21",- "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.21.tgz",- "integrity": "sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA==",+ "version": "4.0.25",+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.25.tgz",+ "integrity": "sha512-pxEWsxIsOPLfKNXvpgFHBGFC3pKYKUFhrud1kyooO9CJai6aaKDHfT10Mi5iiipPXN/JhKAu3qX9o75+X85OdQ==","license": "Apache-2.0","dependencies": {"@smithy/property-provider": "^4.0.4",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.9","@smithy/types": "^4.3.1","bowser": "^2.11.0","tslib": "^2.6.2"@@ -3595,16 +3628,16 @@}},"node_modules/@smithy/util-defaults-mode-node": {- "version": "4.0.21",- "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.21.tgz",- "integrity": "sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA==",+ "version": "4.0.25",+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.25.tgz",+ "integrity": "sha512-+w4n4hKFayeCyELZLfsSQG5mCC3TwSkmRHv4+el5CzFU8ToQpYGhpV7mrRzqlwKkntlPilT1HJy1TVeEvEjWOQ==","license": "Apache-2.0","dependencies": {"@smithy/config-resolver": "^4.1.4","@smithy/credential-provider-imds": "^4.0.6","@smithy/node-config-provider": "^4.1.3","@smithy/property-provider": "^4.0.4",- "@smithy/smithy-client": "^4.4.5",+ "@smithy/smithy-client": "^4.4.9","@smithy/types": "^4.3.1","tslib": "^2.6.2"},@@ -3666,13 +3699,13 @@}},"node_modules/@smithy/util-stream": {- "version": "4.2.2",- "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.2.tgz",- "integrity": "sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==",+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.3.tgz",+ "integrity": "sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==","license": "Apache-2.0","dependencies": {- "@smithy/fetch-http-handler": "^5.0.4",- "@smithy/node-http-handler": "^4.0.6",+ "@smithy/fetch-http-handler": "^5.1.0",+ "@smithy/node-http-handler": "^4.1.0","@smithy/types": "^4.3.1","@smithy/util-base64": "^4.0.0","@smithy/util-buffer-from": "^4.0.0",@@ -4948,6 +4981,15 @@"@types/estree": "^1.0.0"}},+ "node_modules/events": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",+ "license": "MIT",+ "engines": {+ "node": ">=0.8.x"+ }+ },"node_modules/expand-template": {"version": "2.0.3","resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",@@ -5065,22 +5107,18 @@"license": "BSD-3-Clause"},"node_modules/fast-xml-parser": {- "version": "4.4.1",- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",- "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",+ "version": "5.2.5",+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",+ "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==","funding": [{"type": "github","url": "https://github.com/sponsors/NaturalIntelligence"- },- {- "type": "paypal",- "url": "https://paypal.me/naturalintelligence"}],"license": "MIT","dependencies": {- "strnum": "^1.0.5"+ "strnum": "^2.1.0"},"bin": {"fxparser": "src/cli/cli.js"@@ -7521,6 +7559,16 @@"integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==","dev": true},+ "node_modules/stream-browserify": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",+ "integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",+ "license": "MIT",+ "dependencies": {+ "inherits": "~2.0.4",+ "readable-stream": "^3.5.0"+ }+ },"node_modules/string_decoder": {"version": "1.3.0","resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",@@ -7659,9 +7707,9 @@}},"node_modules/strnum": {- "version": "1.1.2",- "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",- "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",+ "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==","funding": [{"type": "github",diff --git a/server/package.json b/server/package.jsonindex 5874f9bc8..ec2aaf2da 100644--- a/server/package.json+++ b/server/package.json@@ -22,6 +22,7 @@},"dependencies": {"@aws-sdk/client-s3": "^3.842.0",+ "@aws-sdk/lib-storage": "^3.850.0","@clickhouse/client": "1.11.1","@fast-csv/parse": "^5.0.2","@fastify/cors": "11.0.1",diff --git a/server/src/services/storage/r2StorageService.ts b/server/src/services/storage/r2StorageService.tsindex 7f7f546d4..1426c279e 100644--- a/server/src/services/storage/r2StorageService.ts+++ b/server/src/services/storage/r2StorageService.ts@@ -1,4 +1,5 @@import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";+import { Upload } from "@aws-sdk/lib-storage";import { Readable } from "stream";import { gunzipSync } from "zlib";import { compress as zstdCompress, decompress as zstdDecompress } from "@mongodb-js/zstd";@@ -145,28 +146,32 @@ export class R2StorageService {}/**- * Store an import CSV file in R2- * Used for temporary storage during import processing+ * Store an import CSV file in R2 using streaming upload*/- async storeImportFile(key: string, fileBuffer: Buffer): Promise<void> {+ async storeImportFile(key: string, fileStream: Readable): Promise<void> {if (!this.enabled || !this.client) {throw new Error("R2 storage is not enabled");}try {- await this.client.send(- new PutObjectCommand({+ const upload = new Upload({+ client: this.client,+ params: {Bucket: this.bucketName,Key: key,- Body: fileBuffer,+ Body: fileStream,ContentType: "text/csv",Metadata: {type: "import-file",uploadTime: Date.now().toString(),},- }),- );+ },+ queueSize: 4,+ partSize: 64 * 1024 * 1024,+ leavePartsOnError: false,+ });+ await upload.done();console.log(`[R2Storage] Successfully stored import file: ${key}`);} catch (error) {console.error("[R2Storage] Failed to store import file:", error);@@ -175,10 +180,9 @@ export class R2StorageService {}/**- * Retrieve an import CSV file from R2- * Returns the file buffer+ * Retrieve an import CSV file from R2 as a stream*/- async getImportFile(key: string): Promise<Buffer> {+ async getImportFileStream(key: string): Promise<Readable> {if (!this.enabled || !this.client) {throw new Error("R2 storage is not enabled");}@@ -195,19 +199,10 @@ export class R2StorageService {throw new Error("Empty response body");}- // Convert stream to buffer- const chunks: Uint8Array[] = [];- const stream = response.Body as Readable;-- for await (const chunk of stream) {- chunks.push(chunk);- }-- const buffer = Buffer.concat(chunks);- console.log(`[R2Storage] Successfully retrieved import file: ${key}`);- return buffer;+ console.log(`[R2Storage] Successfully retrieved import file stream: ${key}`);+ return response.Body as Readable;} catch (error) {- console.error("[R2Storage] Failed to retrieve import file:", error);+ console.error("[R2Storage] Failed to retrieve import file stream:", error);throw error;}}