diff --git a/.env.dev b/.env.dev index 3a226e2..6ddb73f 100644 --- a/.env.dev +++ b/.env.dev @@ -1 +1,2 @@ LOG_PRETTY=true +HTTP_SHUTDOWN_DELAY=0 diff --git a/.env.test b/.env.test index bcf0dac..c4a7bba 100644 --- a/.env.test +++ b/.env.test @@ -1,3 +1,5 @@ LOG_LEVEL=mute LOG_PRETTY=false HTTP_SHUTDOWN_DELAY=0 + +STATS_UPDATER_ENABLED=false diff --git a/package-lock.json b/package-lock.json index a10180e..db6bc3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@nodescript/cli": "^1.9.0", - "@nodescript/eslint-config": "^2.0.1", + "@nodescript/eslint-config": "^2.1.0", "@types/mocha": "^8.2.3", "@types/node": "^18.19.23", "dotenv": "^16.4.5", @@ -45,10 +45,27 @@ "typescript": "^5.5.3" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", + "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/android-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz", - "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz", + "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==", "cpu": [ "arm" ], @@ -59,13 +76,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz", - "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz", + "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==", "cpu": [ "arm64" ], @@ -76,13 +93,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz", - "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz", + "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==", "cpu": [ "x64" ], @@ -93,13 +110,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz", - "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz", + "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==", "cpu": [ "arm64" ], @@ -110,13 +127,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz", - "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz", + "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==", "cpu": [ "x64" ], @@ -127,13 +144,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz", - "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz", + "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==", "cpu": [ "arm64" ], @@ -144,13 +161,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz", - "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz", + "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==", "cpu": [ "x64" ], @@ -161,13 +178,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz", - "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz", + "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==", "cpu": [ "arm" ], @@ -178,13 +195,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz", - "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz", + "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==", "cpu": [ "arm64" ], @@ -195,13 +212,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz", - "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz", + "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==", "cpu": [ "ia32" ], @@ -212,13 +229,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz", - "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz", + "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==", "cpu": [ "loong64" ], @@ -229,13 +246,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz", - "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz", + "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==", "cpu": [ "mips64el" ], @@ -246,13 +263,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz", - "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz", + "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==", "cpu": [ "ppc64" ], @@ -263,13 +280,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz", - "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz", + "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==", "cpu": [ "riscv64" ], @@ -280,13 +297,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz", - "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz", + "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==", "cpu": [ "s390x" ], @@ -297,13 +314,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz", - "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz", + "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==", "cpu": [ "x64" ], @@ -314,13 +331,30 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz", + "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz", - "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz", + "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==", "cpu": [ "x64" ], @@ -331,13 +365,30 @@ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz", + "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz", - "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz", + "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==", "cpu": [ "x64" ], @@ -348,13 +399,13 @@ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz", - "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz", + "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==", "cpu": [ "x64" ], @@ -365,13 +416,13 @@ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz", - "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz", + "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==", "cpu": [ "arm64" ], @@ -382,13 +433,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz", - "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz", + "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==", "cpu": [ "ia32" ], @@ -399,13 +450,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz", - "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz", + "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==", "cpu": [ "x64" ], @@ -416,7 +467,7 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint-community/eslint-utils": { @@ -657,13 +708,13 @@ } }, "node_modules/@nodescript/bundler": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@nodescript/bundler/-/bundler-1.3.0.tgz", - "integrity": "sha512-6L8fYDoZLMRoBfOZXPgL0lpcXNnQq3p0bxqsOtP5/2esb24ldcd/mvREa3+OMXOuJEKTtMmZBNpCa3QX9DZ1qQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@nodescript/bundler/-/bundler-1.4.0.tgz", + "integrity": "sha512-xJ1bj7xuPJMq8iA8X3AJvKdRQqMZZ8xqN9KF2nQlX5Gsvk8diGwso/oszh5APFxBcykYr+XqQTw6WixbMyBSkg==", "dev": true, "license": "ISC", "dependencies": { - "esbuild": "^0.17.6" + "esbuild": "^0.25.0" } }, "node_modules/@nodescript/cache-protocol": { @@ -784,9 +835,9 @@ "license": "ISC" }, "node_modules/@nodescript/eslint-config": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@nodescript/eslint-config/-/eslint-config-2.0.1.tgz", - "integrity": "sha512-C5jiqmGeM8ANhbi63OmDSCVQWZcVc0UmTkAre0xIpIySHgouQQ/eFuBEaGbLR4zCVglWuxcTzoPGmNCC/sDiIQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@nodescript/eslint-config/-/eslint-config-2.1.0.tgz", + "integrity": "sha512-8momcwksFWKrrICMdruLAwwTZ77IEJEY4OkjBuQgzK/b4P9C+lkemDy+wTBI9J+HyGami5nATqt4WEY+MS49FA==", "dev": true, "license": "ISC", "dependencies": { @@ -796,7 +847,8 @@ "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-unused-imports": "^4.1.4", "eslint-plugin-vue": "^9.29.1", - "typescript-eslint": "^8.11.0" + "typescript-eslint": "^8.11.0", + "vue-eslint-parser": "^9.4.3" }, "peerDependencies": { "eslint": ">= 9" @@ -1483,6 +1535,13 @@ "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", "license": "BSD-3-Clause" }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -1642,6 +1701,29 @@ "dev": true, "license": "MIT" }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "engines": [ + "node >= 0.8" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true, + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -1985,9 +2067,9 @@ } }, "node_modules/esbuild": { - "version": "0.17.19", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz", - "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==", + "version": "0.25.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz", + "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1995,31 +2077,34 @@ "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/android-arm": "0.17.19", - "@esbuild/android-arm64": "0.17.19", - "@esbuild/android-x64": "0.17.19", - "@esbuild/darwin-arm64": "0.17.19", - "@esbuild/darwin-x64": "0.17.19", - "@esbuild/freebsd-arm64": "0.17.19", - "@esbuild/freebsd-x64": "0.17.19", - "@esbuild/linux-arm": "0.17.19", - "@esbuild/linux-arm64": "0.17.19", - "@esbuild/linux-ia32": "0.17.19", - "@esbuild/linux-loong64": "0.17.19", - "@esbuild/linux-mips64el": "0.17.19", - "@esbuild/linux-ppc64": "0.17.19", - "@esbuild/linux-riscv64": "0.17.19", - "@esbuild/linux-s390x": "0.17.19", - "@esbuild/linux-x64": "0.17.19", - "@esbuild/netbsd-x64": "0.17.19", - "@esbuild/openbsd-x64": "0.17.19", - "@esbuild/sunos-x64": "0.17.19", - "@esbuild/win32-arm64": "0.17.19", - "@esbuild/win32-ia32": "0.17.19", - "@esbuild/win32-x64": "0.17.19" + "@esbuild/aix-ppc64": "0.25.2", + "@esbuild/android-arm": "0.25.2", + "@esbuild/android-arm64": "0.25.2", + "@esbuild/android-x64": "0.25.2", + "@esbuild/darwin-arm64": "0.25.2", + "@esbuild/darwin-x64": "0.25.2", + "@esbuild/freebsd-arm64": "0.25.2", + "@esbuild/freebsd-x64": "0.25.2", + "@esbuild/linux-arm": "0.25.2", + "@esbuild/linux-arm64": "0.25.2", + "@esbuild/linux-ia32": "0.25.2", + "@esbuild/linux-loong64": "0.25.2", + "@esbuild/linux-mips64el": "0.25.2", + "@esbuild/linux-ppc64": "0.25.2", + "@esbuild/linux-riscv64": "0.25.2", + "@esbuild/linux-s390x": "0.25.2", + "@esbuild/linux-x64": "0.25.2", + "@esbuild/netbsd-arm64": "0.25.2", + "@esbuild/netbsd-x64": "0.25.2", + "@esbuild/openbsd-arm64": "0.25.2", + "@esbuild/openbsd-x64": "0.25.2", + "@esbuild/sunos-x64": "0.25.2", + "@esbuild/win32-arm64": "0.25.2", + "@esbuild/win32-ia32": "0.25.2", + "@esbuild/win32-x64": "0.25.2" } }, "node_modules/escalade": { @@ -3699,9 +3784,9 @@ "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "funding": [ { "type": "github", @@ -4023,6 +4108,15 @@ "node": ">= 0.8.0" } }, + "node_modules/os-shim": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz", + "integrity": "sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A==", + "dev": true, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -4214,14 +4308,75 @@ } }, "node_modules/pre-commit": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pre-commit/-/pre-commit-1.0.10.tgz", - "integrity": "sha512-lpS8vLmOuAHSH8v+9GLSyYMplk9oZYLr3caRbsx9BVJzXb+/bI1l45JXAa0x/io732ZwgW2nhV8EeKjqVm7y4Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/pre-commit/-/pre-commit-1.2.2.tgz", + "integrity": "sha512-qokTiqxD6GjODy5ETAIgzsRgnBWWQHQH2ghy86PU7mIn/wuWeTwF3otyNQZxWBwVn8XNr8Tdzj/QfUXpH+gRZA==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { - "shelljs": "0.5.x" + "cross-spawn": "^5.0.1", + "spawn-sync": "^1.0.15", + "which": "1.2.x" + } + }, + "node_modules/pre-commit/node_modules/cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "node_modules/pre-commit/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "license": "ISC", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/pre-commit/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pre-commit/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pre-commit/node_modules/which": { + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "integrity": "sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" } }, "node_modules/prelude-ls": { @@ -4234,6 +4389,20 @@ "node": ">= 0.8.0" } }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "dev": true, + "license": "ISC" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4302,6 +4471,36 @@ "node": ">=4" } }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/readable-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -4580,19 +4779,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/shelljs": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz", - "integrity": "sha512-C2FisSSW8S6TIYHHiMHN0NqzdjWfTekdMpA2FJTbRWnQMLO1RRIXEB9eVZYOlofYmjZA7fY3ChoFu09MeI3wlQ==", - "dev": true, - "license": "BSD*", - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -4621,6 +4807,18 @@ "memory-pager": "^1.0.2" } }, + "node_modules/spawn-sync": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz", + "integrity": "sha512-9DWBgrgYZzNghseho0JOuh+5fg9u6QWhAWa51QC7+U5rCheZ/j1DrEZnyE0RBBRqZ9uEXGPgSSM0nky6burpVw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "concat-stream": "^1.4.7", + "os-shim": "^0.1.2" + } + }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", @@ -4663,6 +4861,23 @@ "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", "license": "MIT" }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -4959,6 +5174,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true, + "license": "MIT" + }, "node_modules/typescript": { "version": "5.6.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", @@ -5014,9 +5236,9 @@ } }, "node_modules/undici": { - "version": "6.20.1", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz", - "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==", + "version": "6.21.2", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.2.tgz", + "integrity": "sha512-uROZWze0R0itiAKVPsYhFov9LxrPMHLMEQFszeI2gCN6bnIIZ8twzBCJcN2LJrBBLfrP0t1FW0g+JmKVl8Vk1g==", "license": "MIT", "engines": { "node": ">=18.17" @@ -5236,6 +5458,13 @@ "node": ">=10" } }, + "node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "dev": true, + "license": "ISC" + }, "node_modules/yaml": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", diff --git a/package.json b/package.json index cf6ed53..3ebb1a5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "license": "ISC", "devDependencies": { "@nodescript/cli": "^1.9.0", - "@nodescript/eslint-config": "^2.0.1", + "@nodescript/eslint-config": "^2.1.0", "@types/mocha": "^8.2.3", "@types/node": "^18.19.23", "dotenv": "^16.4.5", diff --git a/src/main/app.ts b/src/main/app.ts index a7d610e..3a57a6a 100644 --- a/src/main/app.ts +++ b/src/main/app.ts @@ -1,12 +1,15 @@ import { AuxHttpServer, BaseApp, JwtService } from '@nodescript/microframework'; import { dep, Mesh } from 'mesh-ioc'; +import { CacheStatsStorage } from './global/CacheStatsStorage.js'; +import { MongoCacheStatsStorage } from './global/CacheStatsStorage.mongo.js'; import { CacheStorage } from './global/CacheStorage.js'; import { MongoCacheStorage } from './global/CacheStorage.mongo.js'; import { MainHttpServer } from './global/MainHttpServer.js'; import { Metrics } from './global/Metrics.js'; import { MongoDb } from './global/MongoDb.js'; import { RedisManager } from './global/RedisManager.js'; +import { StatsUpdater } from './global/StatsUpdater.js'; export class App extends BaseApp { @@ -15,31 +18,43 @@ export class App extends BaseApp { @dep() private mainHttpServer!: MainHttpServer; @dep() private auxHttpServer!: AuxHttpServer; @dep() private cacheStorage!: CacheStorage; + @dep() private cacheStatsStorage!: CacheStatsStorage; + @dep() private statsUpdater!: StatsUpdater; constructor() { super(new Mesh('App')); this.mesh.service(AuxHttpServer); this.mesh.service(CacheStorage, MongoCacheStorage); + this.mesh.service(CacheStatsStorage, MongoCacheStatsStorage); this.mesh.service(JwtService); this.mesh.service(MainHttpServer); this.mesh.service(Metrics); this.mesh.service(MongoDb); this.mesh.service(RedisManager); + this.mesh.service(StatsUpdater); } override async start() { await super.start(); + await this.mongodb.start(); await this.redis.start(); + await this.cacheStorage.setup(); + await this.cacheStatsStorage.setup(); + await this.mainHttpServer.start(); await this.auxHttpServer.start(); + await this.statsUpdater.start(); } override async stop() { await super.stop(); + + await this.statsUpdater.stop(); await this.mainHttpServer.stop(); await this.auxHttpServer.stop(); + await this.mongodb.stop(); await this.redis.stop(); } diff --git a/src/main/global/CacheStatsStorage.mongo.ts b/src/main/global/CacheStatsStorage.mongo.ts new file mode 100644 index 0000000..cccbe3b --- /dev/null +++ b/src/main/global/CacheStatsStorage.mongo.ts @@ -0,0 +1,84 @@ +import { Logger } from '@nodescript/logger'; +import { dep } from 'mesh-ioc'; + +import { CacheStats, CacheStatsStorage } from './CacheStatsStorage.js'; +import { MongoDb } from './MongoDb.js'; + +interface MongoCacheStats { + workspaceId: string; + count: number; + size: number; + lastUpdatedAt?: Date; +} + +export class MongoCacheStatsStorage extends CacheStatsStorage { + + @dep() private logger!: Logger; + @dep() private mongodb!: MongoDb; + + private get collection() { + return this.mongodb.db.collection('cachestats'); + } + + async setup(): Promise { + await this.collection.createIndex({ + workspaceId: 1, + }, { unique: true }); + this.logger.info('Created indexes on cachestats'); + } + + async *getAllStats(): AsyncIterable { + const cursor = this.collection.find(); + for await (const doc of cursor) { + yield this.deserialize(doc); + } + } + + async getStats(workspaceId: string): Promise { + const doc = await this.collection.findOne({ workspaceId }); + if (!doc) { + return { + workspaceId, + count: 0, + size: 0, + lastUpdatedAt: 0, + }; + } + return this.deserialize(doc); + } + + async incrUsage(workspaceId: string, count: number, size: number): Promise { + await this.collection.updateOne({ + workspaceId + }, { + $inc: { count, size }, + $set: { lastUpdatedAt: new Date() }, + }, { + upsert: true, + }); + } + + async updateUsage(workspaceId: string, count: number, size: number): Promise { + await this.collection.updateOne({ + workspaceId, + }, { + $set: { + count, + size, + lastUpdatedAt: new Date(), + }, + }, { + upsert: true, + }); + } + + private deserialize(doc: MongoCacheStats): CacheStats { + return { + workspaceId: doc.workspaceId, + count: doc.count, + size: doc.size, + lastUpdatedAt: doc.lastUpdatedAt?.valueOf(), + }; + } + +} diff --git a/src/main/global/CacheStatsStorage.ts b/src/main/global/CacheStatsStorage.ts new file mode 100644 index 0000000..b83a857 --- /dev/null +++ b/src/main/global/CacheStatsStorage.ts @@ -0,0 +1,30 @@ +export interface CacheStats { + workspaceId: string; + count: number; + size: number; + lastUpdatedAt?: number; +} + +export abstract class CacheStatsStorage { + + abstract setup(): Promise; + + abstract getAllStats(): AsyncIterable; + + abstract getStats( + workspaceId: string, + ): Promise; + + abstract incrUsage( + workspaceId: string, + count: number, + size: number, + ): Promise; + + abstract updateUsage( + workspaceId: string, + count: number, + size: number, + ): Promise; + +} diff --git a/src/main/global/CacheStorage.mongo.ts b/src/main/global/CacheStorage.mongo.ts index 20c2469..2eae442 100644 --- a/src/main/global/CacheStorage.mongo.ts +++ b/src/main/global/CacheStorage.mongo.ts @@ -50,12 +50,11 @@ export class MongoCacheStorage extends CacheStorage { return expired ? null : this.deserialize(doc); } - async checkCacheUsage(workspaceId: string, key: string): Promise { + async calcUsage(workspaceId: string): Promise { const res = await this.collection.aggregate([ { $match: { workspaceId, - key: { $ne: key }, }, }, { diff --git a/src/main/global/CacheStorage.ts b/src/main/global/CacheStorage.ts index b7c7627..823b85a 100644 --- a/src/main/global/CacheStorage.ts +++ b/src/main/global/CacheStorage.ts @@ -14,9 +14,8 @@ export abstract class CacheStorage { key: string, ): Promise; - abstract checkCacheUsage( + abstract calcUsage( workspaceId: string, - key: string, ): Promise; abstract upsertData( diff --git a/src/main/global/StatsUpdater.ts b/src/main/global/StatsUpdater.ts new file mode 100644 index 0000000..adbcc7f --- /dev/null +++ b/src/main/global/StatsUpdater.ts @@ -0,0 +1,59 @@ +import { Logger } from '@nodescript/logger'; +import { config } from 'mesh-config'; +import { dep } from 'mesh-ioc'; + +import { CacheStatsStorage } from './CacheStatsStorage.js'; +import { CacheStorage } from './CacheStorage.js'; + +export class StatsUpdater { + + @config({ default: 60_000 }) + private STATS_UPDATER_INTERVAL_MS!: number; + + @config({ default: true }) + private STATS_UPDATER_ENABLED!: boolean; + + @dep() private logger!: Logger; + @dep() private cacheStatsStorage!: CacheStatsStorage; + @dep() private cacheStorage!: CacheStorage; + + private running = false; + private runPromise: Promise | null = null; + + async start() { + if (!this.STATS_UPDATER_ENABLED) { + return; + } + if (this.running) { + return; + } + this.running = true; + this.runPromise = this.run(); + } + + async stop() { + this.running = false; + await this.runPromise; + } + + private async run() { + while (this.running) { + await this.updateStats(); + await new Promise(resolve => setTimeout(resolve, this.STATS_UPDATER_INTERVAL_MS)); + } + } + + private async updateStats() { + try { + this.logger.info('Updating stats'); + for await (const stat of this.cacheStatsStorage.getAllStats()) { + const actualUsage = await this.cacheStorage.calcUsage(stat.workspaceId); + await this.cacheStatsStorage.updateUsage(stat.workspaceId, actualUsage.count, actualUsage.size); + } + this.logger.info('Stats updated'); + } catch (error) { + this.logger.error('Error updating stats', { error }); + } + } + +} diff --git a/src/main/scoped/CacheDomainImpl.ts b/src/main/scoped/CacheDomainImpl.ts index f58c03d..7a5c7ac 100644 --- a/src/main/scoped/CacheDomainImpl.ts +++ b/src/main/scoped/CacheDomainImpl.ts @@ -4,6 +4,7 @@ import { AccessDeniedError } from '@nodescript/errors'; import { config } from 'mesh-config'; import { dep } from 'mesh-ioc'; +import { CacheStatsStorage } from '../global/CacheStatsStorage.js'; import { CacheStorage } from '../global/CacheStorage.js'; import { RedisManager } from '../global/RedisManager.js'; import { AuthContext } from './AuthContext.js'; @@ -34,6 +35,7 @@ export class CacheDomainImpl implements CacheDomain { @dep() private authContext!: AuthContext; @dep() private cacheStorage!: CacheStorage; + @dep() private cacheStatsStorage!: CacheStatsStorage; @dep() private nsApi!: NodeScriptApi; @dep() private redis!: RedisManager; @@ -59,18 +61,32 @@ export class CacheDomainImpl implements CacheDomain { const maxKeys = Number(workspace.metadata.cacheMaxKeys) || this.CACHE_MAX_KEYS; const maxSize = Number(workspace.metadata.cacheMaxSize) || this.CACHE_MAX_SIZE; const maxEntrySize = Number(workspace.metadata.cacheMaxEntrySize) || this.CACHE_MAX_ENTRY_SIZE; - const usage = await this.cacheStorage.checkCacheUsage(token.workspaceId, req.key); - const expiresAt = this.evalExpirationTime(req.expiresAt); - if ((usage.count + 1) > maxKeys) { + // Note: since we store aggregated stats, we need to also fetch data to understand how to update the stats + const data = await this.cacheStorage.getData(token.workspaceId, req.key); + const isNew = data == null; + const stats = await this.cacheStatsStorage.getStats(token.workspaceId); + // Max keys check + if (isNew && (stats.count + 1) > maxKeys) { throw new AccessDeniedError('Maximum number of keys in cache reached'); } + // Max size check const buffer = Buffer.from(JSON.stringify(req.data), 'utf-8'); - if ((usage.size + buffer.byteLength) > maxSize) { - throw new AccessDeniedError('Maximum size of data in cache reached'); - } - if (buffer.byteLength > maxEntrySize) { + const oldSize = isNew ? 0 : data.size; + const newSize = buffer.byteLength; + if (newSize > maxEntrySize) { throw new AccessDeniedError(`Entry cannot exceed ${maxEntrySize} bytes`); } + const sizeDelta = newSize - oldSize; + if ((stats.size + sizeDelta) > maxSize) { + throw new AccessDeniedError('Maximum size of data in cache reached'); + } + // Update stats + // Note: we're not super accurate here (esp. around race conditions), + // we just need to have some rough limits to prevent abuse. + // The exact stats are re-calculated periodically to remove accumulated inaccuracies. + await this.cacheStatsStorage.incrUsage(token.workspaceId, isNew ? 1 : 0, sizeDelta); + // Write data + const expiresAt = this.evalExpirationTime(req.expiresAt); await this.cacheStorage.upsertData(token.workspaceId, req.key, buffer, expiresAt); return {}; } @@ -82,7 +98,11 @@ export class CacheDomainImpl implements CacheDomain { } await this.checkRateLimit(token.workspaceId); this.authContext.requirePermissions([Permission.WORKSPACE_CACHE_WRITE]); - this.cacheStorage.deleteData(token.workspaceId, req.key); + const data = await this.cacheStorage.getData(token.workspaceId, req.key); + await this.cacheStorage.deleteData(token.workspaceId, req.key); + if (data) { + await this.cacheStatsStorage.incrUsage(token.workspaceId, -1, -data.size); + } return {}; } diff --git a/src/main/scoped/NodeScriptApi.ts b/src/main/scoped/NodeScriptApi.ts index 92f06cb..89dfafd 100644 --- a/src/main/scoped/NodeScriptApi.ts +++ b/src/main/scoped/NodeScriptApi.ts @@ -13,7 +13,7 @@ export class NodeScriptApi { @config({ default: 100_000 }) WORKSPACE_CACHE_MAX_COUNT!: number; - @config({ default: 5_000 }) + @config({ default: 60_000 }) WORKSPACE_CACHE_TTL!: number; @dep() private ctx!: HttpContext; diff --git a/src/test/Cache.set.test.ts b/src/test/Cache.set.test.ts index 3ac20f0..35c9137 100644 --- a/src/test/Cache.set.test.ts +++ b/src/test/Cache.set.test.ts @@ -72,7 +72,10 @@ describe('Cache.set', () => { beforeEach(async () => { for (let i = 0; i < 10; i++) { - await runtime.cacheStorage.upsertData('a-team', `foo${i}`, '123', Date.now() + 60_000); + await runtime.api.Cache.set({ + data: '123', + key: `foo${i}`, + }); } }); @@ -93,12 +96,12 @@ describe('Cache.set', () => { context('size limit reached', () => { beforeEach(async () => { - await runtime.cacheStorage.upsertData( - 'a-team', - 'test1', - generatePayload(10_000), - Date.now() + 60_000 - ); + for (let i = 0; i < 2; i++) { + await runtime.api.Cache.set({ + key: `test${i}`, + data: generatePayload(4998), + }); + } }); it('throws AccessDeniedError', async () => { @@ -121,7 +124,7 @@ describe('Cache.set', () => { try { await runtime.api.Cache.set({ key: 'foo', - data: generatePayload(5000), // See .env.test + data: generatePayload(5000), }); throw new Error('UnexpectedSuccess'); } catch (error: any) { @@ -153,5 +156,5 @@ describe('Cache.set', () => { }); function generatePayload(size: number) { - return [...Array(size).keys()]; + return Buffer.alloc(size, 'x').toString('utf-8'); }