diff --git a/.gitignore b/.gitignore index 1cffda7..b07674c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,3 @@ .build*.log noarch/ x86_64/ -sgx-pccs*-build/ -pccs-*-nodejs-licenses.txt diff --git a/0001-service-sanitize-paths-to-all-resources.patch b/0001-service-sanitize-paths-to-all-resources.patch index edd9bd6..401a5e3 100644 --- a/0001-service-sanitize-paths-to-all-resources.patch +++ b/0001-service-sanitize-paths-to-all-resources.patch @@ -1,7 +1,7 @@ -From fd190a621180553670d309f46f5bc1464d813ee0 Mon Sep 17 00:00:00 2001 +From 1b63d4762f60e779c1d0ed628c0c610483b4e835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 27 Jan 2026 11:45:01 +0000 -Subject: [PATCH 1/4] service: sanitize paths to all resources +Subject: [PATCH 1/5] service: sanitize paths to all resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,57 +18,57 @@ Signed-off-by: Daniel P. Berrangé 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/service/pccs_server.js b/service/pccs_server.js -index ddc2aa5..ac4d909 100644 +index f97ddb7..6fee4fa 100644 --- a/service/pccs_server.js +++ b/service/pccs_server.js @@ -130,8 +130,8 @@ function startHttpsServer() { - let privateKey; - let certificate; - try { -- privateKey = fs.readFileSync('./ssl_key/private.pem', 'utf8'); -- certificate = fs.readFileSync('./ssl_key/file.crt', 'utf8'); -+ privateKey = fs.readFileSync('/etc/pccs/ssl/server-key.pem', 'utf8'); -+ certificate = fs.readFileSync('/etc/pccs/ssl/server-cert.pem', 'utf8'); - } catch { - logger.error('The private key or certificate for HTTPS server is missing.'); - logger.endAndExitProcess(); + let privateKey; + let certificate; + try { +- privateKey = fs.readFileSync('./ssl_key/private.pem', 'utf8'); +- certificate = fs.readFileSync('./ssl_key/file.crt', 'utf8'); ++ privateKey = fs.readFileSync('/etc/pccs/ssl/server-key.pem', 'utf8'); ++ certificate = fs.readFileSync('/etc/pccs/ssl/server-cert.pem', 'utf8'); + } catch (err) { + logger.error('The private key or certificate for HTTPS server is missing.'); + logger.endAndExitProcess(); diff --git a/service/utils/Logger.js b/service/utils/Logger.js -index e08e749..fe832c8 100644 +index b956508..e0325c6 100644 --- a/service/utils/Logger.js +++ b/service/utils/Logger.js -@@ -51,7 +51,7 @@ export function formatLogMessage(tokens, req, res) { +@@ -51,7 +51,7 @@ export function formatLogMessage (tokens, req, res) { const options = { - file: { - level: Config.has('LogLevel') ? Config.get('LogLevel') : 'info', -- filename: path.join(scriptDirname, '../logs/pccs_server.log'), -+ filename: '/var/log/pccs/pccs_server.log', - handleExceptions: true, - json: false, - colorize: true, + file: { + level: Config.has('LogLevel') ? Config.get('LogLevel') : 'info', +- filename: __dirname + `/../logs/pccs_server.log`, ++ filename: `/var/log/pccs/pccs_server.log`, + handleExceptions: true, + json: false, + colorize: true, diff --git a/service/utils/apputil.js b/service/utils/apputil.js -index dd07e97..5cd2f45 100644 +index 069c542..d2f5cdb 100644 --- a/service/utils/apputil.js +++ b/service/utils/apputil.js -@@ -84,8 +84,8 @@ async function testDbStatus() { +@@ -84,8 +84,8 @@ async function test_db_status() { } - async function dbMigration() { -- const migrations = fs.readdirSync('./migrations').map(name => { -- const path = `./migrations/${name}`; -+ const migrations = fs.readdirSync('/usr/lib/node_modules/pccs/migrations').map(name => { -+ const path = `/usr/lib/node_modules/pccs/migrations/${name}`; + async function db_migration() { +- const migrations = fs.readdirSync('./migrations').map(name => { +- const path = `./migrations/${name}`; ++ const migrations = fs.readdirSync('/usr/lib/node_modules/pccs/migrations').map(name => { ++ const path = `/usr/lib/node_modules/pccs/migrations/${name}`; - return { - name, -@@ -127,7 +127,7 @@ async function dbMigration() { - - const umzug = new Umzug({ - migrations: { -- glob: './migrations/*.{js,up.sql}', -+ glob: '/usr/lib/node_modules/pccs/migrations/*.{js,up.sql}', - resolve: ({ name }) => { - const migration = migrations.find(migration => migration.name === name); - logger.debug(`Resolving migration: ${name}, found: ${migration ? migration.name : 'none'}`); + return { + name, +@@ -126,7 +126,7 @@ async function db_migration() { + + const umzug = new Umzug({ + migrations: { +- glob: './migrations/*.{js,up.sql}', ++ glob: '/usr/lib/node_modules/pccs/migrations/*.{js,up.sql}', + resolve: ({ name }) => { + const migration = migrations.find(migration => migration.name === name); + logger.debug(`Resolving migration: ${name}, found: ${migration ? migration.name : 'none'}`); -- -2.55.0 +2.53.0 diff --git a/0002-pccsadmin-remove-leftover-debugging-print-args-state.patch b/0002-pccsadmin-remove-leftover-debugging-print-args-state.patch new file mode 100644 index 0000000..7d7a3cc --- /dev/null +++ b/0002-pccsadmin-remove-leftover-debugging-print-args-state.patch @@ -0,0 +1,33 @@ +From 560d804f39f5e9752b51e9e75ec51ad87a4d8baf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 27 Jan 2026 11:47:46 +0000 +Subject: [PATCH 2/5] pccsadmin: remove leftover debugging 'print(args)' + statement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Dumping the python "Namespace" object to stdout after parsing argv +serves no user purpose. Remove what is presumably a leftover +debugging statement. + +Signed-off-by: Daniel P. Berrangé +--- + PccsAdminTool/pccsadmin.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/PccsAdminTool/pccsadmin.py b/PccsAdminTool/pccsadmin.py +index a41c1a3..df40757 100755 +--- a/PccsAdminTool/pccsadmin.py ++++ b/PccsAdminTool/pccsadmin.py +@@ -85,7 +85,6 @@ def main(): + parser.print_help() + parser.exit() + +- print(args) + # Check mandatory arguments for appraisalpolicy + if args.command == 'put' and args.url and args.url.endswith("/appraisalpolicy"): + if not args.fmspc or not args.input_file: +-- +2.53.0 + diff --git a/0002-pccsadmin-make-keyring-module-optional.patch b/0003-pccsadmin-make-keyring-module-optional.patch similarity index 95% rename from 0002-pccsadmin-make-keyring-module-optional.patch rename to 0003-pccsadmin-make-keyring-module-optional.patch index 3ddd5cf..40ee49a 100644 --- a/0002-pccsadmin-make-keyring-module-optional.patch +++ b/0003-pccsadmin-make-keyring-module-optional.patch @@ -1,7 +1,7 @@ -From f4e72cf21596474902177f3743254e750e90fb93 Mon Sep 17 00:00:00 2001 +From 616f69d67d141c80aa6e2f23c6d48dea7ce90c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 27 Jan 2026 11:49:50 +0000 -Subject: [PATCH 2/4] pccsadmin: make 'keyring' module optional +Subject: [PATCH 3/5] pccsadmin: make 'keyring' module optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -68,5 +68,5 @@ index 39bd1fc..e8baa31 100644 + return False return True -- -2.55.0 +2.53.0 diff --git a/0003-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch b/0004-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch similarity index 96% rename from 0003-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch rename to 0004-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch index 52bb690..779afad 100644 --- a/0003-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch +++ b/0004-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch @@ -1,7 +1,7 @@ -From e613239c0bda62fd8027ae54746aab0cad1f1801 Mon Sep 17 00:00:00 2001 +From 9f2394fdc469f6cf3a164476f7deec3b4f9679e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 27 Jan 2026 11:51:25 +0000 -Subject: [PATCH 3/4] pccsadmin: ignore errors trying to clear the keyring +Subject: [PATCH 4/5] pccsadmin: ignore errors trying to clear the keyring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -81,5 +81,5 @@ index df40757..85b1654 100755 else: self._handle_error(response) -- -2.55.0 +2.53.0 diff --git a/0004-service-update-sqlite3-to-6.0.0-series-override-seri.patch b/0005-service-update-sqlite3-to-6.0.0-series-override-seri.patch similarity index 66% rename from 0004-service-update-sqlite3-to-6.0.0-series-override-seri.patch rename to 0005-service-update-sqlite3-to-6.0.0-series-override-seri.patch index a228081..5dd471c 100644 --- a/0004-service-update-sqlite3-to-6.0.0-series-override-seri.patch +++ b/0005-service-update-sqlite3-to-6.0.0-series-override-seri.patch @@ -1,7 +1,7 @@ -From fef218e8dcbe93a2164928cff649fe7bf377bba9 Mon Sep 17 00:00:00 2001 +From 620755bfce543bf9eddd388e6fc878a2114c992a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 27 Jan 2026 17:29:22 +0000 -Subject: [PATCH 4/4] service: update sqlite3 to 6.0.0 series & override +Subject: [PATCH 5/5] service: update sqlite3 to 6.0.0 series & override serialize-javascript MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -15,29 +15,26 @@ pulls in multiple fixed deps. The 'npm audit fix' command was run to update package-lock.json with all fixed deps. -The 'uuid' module is still shown as vulnerable, however, the -sequelize module only uses uuid v1/v4 APIs, so is not affected. - Signed-off-by: Daniel P. Berrangé --- - service/package-lock.json | 1407 ++++++------------------------------- + service/package-lock.json | 1163 +++++++++++-------------------------- service/package.json | 5 +- - 2 files changed, 211 insertions(+), 1201 deletions(-) + 2 files changed, 354 insertions(+), 814 deletions(-) diff --git a/service/package-lock.json b/service/package-lock.json -index 58d87b7..81b5041 100644 +index 4748d5c..bc9fd69 100644 --- a/service/package-lock.json +++ b/service/package-lock.json @@ -22,7 +22,7 @@ "mysql2": "^3.15.3", "node-schedule": "^2.1.1", - "sequelize": "^6.37.8", + "sequelize": "^6.37.7", - "sqlite3": "^5.1.7", + "sqlite3": "^6.0.1", "umzug": "^3.8.2", "winston": "^3.18.3" }, -@@ -298,13 +298,6 @@ +@@ -77,12 +77,18 @@ "node": ">= 8" } }, @@ -45,76 +42,115 @@ index 58d87b7..81b5041 100644 - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", -- "license": "MIT", ++ "node_modules/@gar/promise-retry": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.2.tgz", ++ "integrity": "sha512-Lm/ZLhDZcBECta3TmCQSngiQykFdfw+QtI1/GYMsZd4l3nG+P8WLB16XuS7WaBGLQ+9E+cOcWQsth9cayuGt8g==", + "license": "MIT", - "optional": true -- }, - "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", -@@ -422,45 +415,6 @@ ++ "optional": true, ++ "dependencies": { ++ "retry": "^0.13.1" ++ }, ++ "engines": { ++ "node": "^20.17.0 || >=22.9.0" ++ } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", +@@ -149,15 +155,44 @@ "node": ">= 8" } }, -- "node_modules/@npmcli/fs": { ++ "node_modules/@npmcli/agent": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", ++ "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", ++ "license": "ISC", ++ "optional": true, ++ "dependencies": { ++ "agent-base": "^7.1.0", ++ "http-proxy-agent": "^7.0.0", ++ "https-proxy-agent": "^7.0.1", ++ "lru-cache": "^11.2.1", ++ "socks-proxy-agent": "^8.0.3" ++ }, ++ "engines": { ++ "node": "^20.17.0 || >=22.9.0" ++ } ++ }, ++ "node_modules/@npmcli/agent/node_modules/lru-cache": { ++ "version": "11.2.7", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz", ++ "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==", ++ "license": "BlueOak-1.0.0", ++ "optional": true, ++ "engines": { ++ "node": "20 || >=22" ++ } ++ }, + "node_modules/@npmcli/fs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", - "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", ++ "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==", + "license": "ISC", + "optional": true, + "dependencies": { - "@gar/promisify": "^1.0.1", -- "semver": "^7.3.5" -- } -- }, -- "node_modules/@npmcli/fs/node_modules/semver": { -- "version": "7.7.4", -- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -- "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", -- "license": "ISC", -- "optional": true, -- "bin": { -- "semver": "bin/semver.js" -- }, -- "engines": { -- "node": ">=10" -- } -- }, + "semver": "^7.3.5" ++ }, ++ "engines": { ++ "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@npmcli/fs/node_modules/semver": { +@@ -173,19 +208,14 @@ + "node": ">=10" + } + }, - "node_modules/@npmcli/move-file": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", - "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", - "deprecated": "This functionality has been moved to @npmcli/fs", - "license": "MIT", -- "optional": true, ++ "node_modules/@npmcli/redact": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-4.0.0.tgz", ++ "integrity": "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==", ++ "license": "ISC", + "optional": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, -- "engines": { + "engines": { - "node": ">=10" -- } -- }, ++ "node": "^20.17.0 || >=22.9.0" + } + }, "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", -@@ -669,16 +623,6 @@ +@@ -381,16 +411,6 @@ "node": ">=10" } }, - "node_modules/@tootallnate/once": { -- "version": "3.0.1", -- "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.1.tgz", -- "integrity": "sha512-VyMVKRrpHTT8PnotUeV8L/mDaMwD5DaAKCFLP73zAqAtvF0FCqky+Ki7BYbFCYQmqFyTe9316Ed5zS70QUR9eg==", +- "version": "1.1.2", +- "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", +- "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "license": "MIT", - "optional": true, - "engines": { -- "node": ">= 10" +- "node": ">= 6" - } - }, "node_modules/@types/argparse": { "version": "1.0.38", "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", -@@ -772,11 +716,14 @@ +@@ -470,11 +490,14 @@ "license": "MIT" }, "node_modules/abbrev": { @@ -133,20 +169,22 @@ index 58d87b7..81b5041 100644 }, "node_modules/accepts": { "version": "1.3.8", -@@ -814,71 +761,6 @@ - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" +@@ -490,68 +513,13 @@ } }, -- "node_modules/agent-base": { + "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==", -- "license": "MIT", -- "optional": true, ++ "version": "7.1.4", ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", ++ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "license": "MIT", + "optional": true, - "dependencies": { - "debug": "4" - }, -- "engines": { + "engines": { - "node": ">= 6.0.0" - } - }, @@ -200,12 +238,11 @@ index 58d87b7..81b5041 100644 - }, - "engines": { - "node": ">=8" -- } -- }, ++ "node": ">= 14" + } + }, "node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", -@@ -955,28 +837,6 @@ +@@ -630,28 +598,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, @@ -234,70 +271,45 @@ index 58d87b7..81b5041 100644 "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", -@@ -1021,7 +881,7 @@ +@@ -696,8 +642,8 @@ "version": "4.0.4", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", - "devOptional": true, -+ "dev": true, "license": "MIT", ++ "optional": true, "engines": { "node": "18 || 20 || >=22" -@@ -1086,9 +946,9 @@ } - }, - "node_modules/body-parser": { -- "version": "1.20.4", -- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", -- "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", -+ "version": "1.20.6", -+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", -+ "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", -@@ -1099,7 +959,7 @@ - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "on-finished": "~2.4.1", -- "qs": "~6.14.0", -+ "qs": "~6.15.1", - "raw-body": "~2.5.3", - "type-is": "~1.6.18", - "unpipe": "~1.0.0" -@@ -1110,16 +970,16 @@ +@@ -785,11 +731,11 @@ } }, "node_modules/brace-expansion": { -- "version": "5.0.5", -- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", -- "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", +- "version": "5.0.3", +- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", +- "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", - "devOptional": true, -+ "version": "5.0.8", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz", -+ "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==", -+ "dev": true, ++ "version": "5.0.4", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz", ++ "integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==", "license": "MIT", ++ "optional": true, "dependencies": { "balanced-match": "^4.0.2" }, - "engines": { -- "node": "18 || 20 || >=22" -+ "node": "20 || >=22" +@@ -850,81 +796,71 @@ } }, - "node_modules/braces": { -@@ -1174,84 +1034,6 @@ - "node": ">= 0.8" - } - }, -- "node_modules/cacache": { + "node_modules/cacache": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", - "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "20.0.3", ++ "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.3.tgz", ++ "integrity": "sha512-3pUp4e8hv07k1QlijZu6Kn7c9+ZpWWk4j3F8N3xPuCExULobqJydKYOTj1FTq58srkJsXvO7LbGAH4C0ZU3WGw==", + "license": "ISC", + "optional": true, + "dependencies": { - "@npmcli/fs": "^1.0.0", - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", @@ -307,7 +319,13 @@ index 58d87b7..81b5041 100644 - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", -- "minipass-flush": "^1.0.5", ++ "@npmcli/fs": "^5.0.0", ++ "fs-minipass": "^3.0.0", ++ "glob": "^13.0.0", ++ "lru-cache": "^11.1.0", ++ "minipass": "^7.0.3", ++ "minipass-collect": "^2.0.1", + "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", @@ -316,63 +334,90 @@ index 58d87b7..81b5041 100644 - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" -- }, -- "engines": { ++ "minipass-pipeline": "^1.2.4", ++ "p-map": "^7.0.2", ++ "ssri": "^13.0.0", ++ "unique-filename": "^5.0.0" + }, + "engines": { - "node": ">= 10" -- } -- }, -- "node_modules/cacache/node_modules/glob": { ++ "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/cacache/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "13.0.6", ++ "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz", ++ "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==", ++ "license": "BlueOak-1.0.0", + "optional": true, + "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" -- }, -- "engines": { ++ "minimatch": "^10.2.2", ++ "minipass": "^7.1.3", ++ "path-scurry": "^2.0.2" + }, + "engines": { - "node": "*" -- }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" -- } -- }, -- "node_modules/cacache/node_modules/lru-cache": { ++ "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "license": "ISC", -- "optional": true, ++ "version": "11.2.7", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz", ++ "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==", ++ "license": "BlueOak-1.0.0", + "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, -- "engines": { + "engines": { - "node": ">=10" -- } -- }, ++ "node": "20 || >=22" + } + }, - "node_modules/cacache/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", -- "optional": true, -- "dependencies": { ++ "node_modules/cacache/node_modules/path-scurry": { ++ "version": "2.0.2", ++ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz", ++ "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==", ++ "license": "BlueOak-1.0.0", + "optional": true, + "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "lru-cache": "^11.0.0", ++ "minipass": "^7.1.2" + }, + "engines": { - "node": ">=8" -- } -- }, ++ "node": "18 || 20 || >=22" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", -@@ -1390,23 +1172,12 @@ +@@ -1068,23 +1004,12 @@ } }, "node_modules/chownr": { @@ -401,7 +446,7 @@ index 58d87b7..81b5041 100644 } }, "node_modules/cliui": { -@@ -1567,16 +1338,6 @@ +@@ -1245,16 +1170,6 @@ "node": ">=12.20" } }, @@ -418,7 +463,7 @@ index 58d87b7..81b5041 100644 "node_modules/color/node_modules/color-convert": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz", -@@ -1620,13 +1381,6 @@ +@@ -1298,13 +1213,6 @@ "proto-list": "~1.2.1" } }, @@ -432,7 +477,7 @@ index 58d87b7..81b5041 100644 "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", -@@ -1781,13 +1535,6 @@ +@@ -1452,13 +1360,6 @@ "node": ">=10" } }, @@ -446,7 +491,7 @@ index 58d87b7..81b5041 100644 "node_modules/denque": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", -@@ -1912,29 +1659,6 @@ +@@ -1582,29 +1483,6 @@ "node": ">= 0.8" } }, @@ -476,7 +521,7 @@ index 58d87b7..81b5041 100644 "node_modules/end-of-stream": { "version": "1.4.5", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", -@@ -1968,13 +1692,6 @@ +@@ -1624,13 +1502,6 @@ "node": ">=6" } }, @@ -490,20 +535,7 @@ index 58d87b7..81b5041 100644 "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", -@@ -1994,9 +1711,9 @@ - } - }, - "node_modules/es-object-atoms": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", -- "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", -+ "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" -@@ -2372,15 +2089,22 @@ +@@ -1708,6 +1579,13 @@ "node": ">=6" } }, @@ -515,73 +547,12 @@ index 58d87b7..81b5041 100644 + "optional": true + }, "node_modules/express": { -- "version": "4.22.1", -- "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", -- "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", -+ "version": "4.22.2", -+ "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", -+ "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", - "license": "MIT", - "dependencies": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", -- "body-parser": "~1.20.3", -+ "body-parser": "~1.20.5", - "content-disposition": "~0.5.4", - "content-type": "~1.0.4", - "cookie": "~0.7.1", -@@ -2399,7 +2123,7 @@ - "parseurl": "~1.3.3", - "path-to-regexp": "~0.1.12", - "proxy-addr": "~2.0.7", -- "qs": "~6.14.0", -+ "qs": "~6.15.1", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "~0.19.0", -@@ -2467,9 +2191,9 @@ - "license": "MIT" - }, - "node_modules/fast-uri": { -- "version": "3.1.0", -- "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", -- "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", -+ "version": "3.1.4", -+ "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", -+ "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", - "funding": [ - { - "type": "github", -@@ -2491,6 +2215,24 @@ - "reusify": "^1.0.4" + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", +@@ -1932,38 +1810,18 @@ } }, -+ "node_modules/fdir": { -+ "version": "6.5.0", -+ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", -+ "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", -+ "license": "MIT", -+ "optional": true, -+ "engines": { -+ "node": ">=12.0.0" -+ }, -+ "peerDependencies": { -+ "picomatch": "^3 || ^4" -+ }, -+ "peerDependenciesMeta": { -+ "picomatch": { -+ "optional": true -+ } -+ } -+ }, - "node_modules/fecha": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", -@@ -2655,39 +2397,6 @@ - "node": ">=14.14" - } - }, -- "node_modules/fs-minipass": { + "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", @@ -598,15 +569,20 @@ index 58d87b7..81b5041 100644 - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "3.0.3", ++ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", ++ "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "license": "ISC", + "optional": true, + "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "minipass": "^7.0.3" + }, + "engines": { - "node": ">=8" -- } -- }, ++ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -617,7 +593,7 @@ index 58d87b7..81b5041 100644 "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", -@@ -2697,86 +2406,13 @@ +@@ -1973,79 +1831,6 @@ "url": "https://github.com/sponsors/ljharb" } }, @@ -628,12 +604,7 @@ index 58d87b7..81b5041 100644 - "deprecated": "This package is no longer supported.", - "license": "ISC", - "optional": true, -+ "node_modules/generate-function": { -+ "version": "2.3.1", -+ "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", -+ "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", -+ "license": "MIT", - "dependencies": { +- "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", @@ -699,18 +670,10 @@ index 58d87b7..81b5041 100644 - "node": ">=8" - } - }, -- "node_modules/generate-function": { -- "version": "2.3.1", -- "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", -- "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==", -- "license": "MIT", -- "dependencies": { -- "is-property": "^1.0.2" -+ "is-property": "^1.0.2" - } - }, - "node_modules/get-caller-file": { -@@ -3012,13 +2648,6 @@ + "node_modules/generate-function": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", +@@ -2254,13 +2039,6 @@ "node": "*" } }, @@ -724,96 +687,58 @@ index 58d87b7..81b5041 100644 "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", -@@ -3067,46 +2696,6 @@ - "url": "https://opencollective.com/express" +@@ -2310,18 +2088,17 @@ } }, -- "node_modules/http-proxy-agent": { + "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", -- "license": "MIT", -- "optional": true, -- "dependencies": { ++ "version": "7.0.2", ++ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", ++ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", + "optional": true, + "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" -- }, -- "engines": { ++ "agent-base": "^7.1.0", ++ "debug": "^4.3.4" + }, + "engines": { - "node": ">= 6" -- } -- }, -- "node_modules/http-proxy-agent/node_modules/debug": { -- "version": "4.4.3", -- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", -- "license": "MIT", -- "optional": true, -- "dependencies": { -- "ms": "^2.1.3" -- }, -- "engines": { -- "node": ">=6.0" -- }, -- "peerDependenciesMeta": { -- "supports-color": { -- "optional": true -- } -- } -- }, -- "node_modules/http-proxy-agent/node_modules/ms": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -- "license": "MIT", -- "optional": true -- }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", -@@ -3120,55 +2709,6 @@ - "node": ">=10.19.0" ++ "node": ">= 14" } }, -- "node_modules/https-proxy-agent": { + "node_modules/http-proxy-agent/node_modules/debug": { +@@ -2363,17 +2140,17 @@ + } + }, + "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==", -- "license": "MIT", -- "optional": true, -- "dependencies": { ++ "version": "7.0.6", ++ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", ++ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", + "optional": true, + "dependencies": { - "agent-base": "6", -- "debug": "4" -- }, -- "engines": { ++ "agent-base": "^7.1.2", + "debug": "4" + }, + "engines": { - "node": ">= 6" -- } -- }, -- "node_modules/https-proxy-agent/node_modules/debug": { -- "version": "4.4.3", -- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", -- "license": "MIT", -- "optional": true, -- "dependencies": { -- "ms": "^2.1.3" -- }, -- "engines": { -- "node": ">=6.0" -- }, -- "peerDependenciesMeta": { -- "supports-color": { -- "optional": true -- } -- } -- }, -- "node_modules/https-proxy-agent/node_modules/ms": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -- "license": "MIT", -- "optional": true -- }, ++ "node": ">= 14" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { +@@ -2401,16 +2178,6 @@ + "license": "MIT", + "optional": true + }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -827,14 +752,7 @@ index 58d87b7..81b5041 100644 "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", -@@ -3241,29 +2781,12 @@ - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", -- "devOptional": true, -+ "dev": true, - "license": "MIT", - "engines": { +@@ -2462,23 +2229,6 @@ "node": ">=0.8.19" } }, @@ -858,7 +776,7 @@ index 58d87b7..81b5041 100644 "node_modules/inflection": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz", -@@ -3273,18 +2796,6 @@ +@@ -2488,18 +2238,6 @@ ], "license": "MIT" }, @@ -877,24 +795,7 @@ index 58d87b7..81b5041 100644 "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -@@ -3297,16 +2808,6 @@ - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "license": "ISC" - }, -- "node_modules/ip-address": { -- "version": "10.1.0", -- "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", -- "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", -- "license": "MIT", -- "optional": true, -- "engines": { -- "node": ">= 12" -- } -- }, - "node_modules/ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", -@@ -3344,7 +2845,7 @@ +@@ -2559,7 +2297,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", @@ -903,7 +804,7 @@ index 58d87b7..81b5041 100644 "license": "MIT", "engines": { "node": ">=8" -@@ -3362,13 +2863,6 @@ +@@ -2577,13 +2315,6 @@ "node": ">=0.10.0" } }, @@ -917,41 +818,19 @@ index 58d87b7..81b5041 100644 "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", -@@ -3480,10 +2974,20 @@ - "license": "MIT" - }, - "node_modules/js-yaml": { -- "version": "4.1.1", -- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", -- "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", -+ "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", - "dev": true, -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/puzrin" -+ }, -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/nodeca" -+ } -+ ], - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" -@@ -3685,60 +3189,6 @@ - "node": ">=12" +@@ -2873,57 +2604,37 @@ } }, -- "node_modules/make-fetch-happen": { + "node_modules/make-fetch-happen": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", - "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "15.0.5", ++ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz", ++ "integrity": "sha512-uCbIa8jWWmQZt4dSnEStkVC6gdakiinAm4PiGsywIkguF0eWMdcjDz0ECYhUolFU3pFLOev9VNPCEygydXnddg==", + "license": "ISC", + "optional": true, + "dependencies": { - "agentkeepalive": "^4.1.3", - "cacache": "^15.2.0", - "http-cache-semantics": "^4.1.0", @@ -962,8 +841,15 @@ index 58d87b7..81b5041 100644 - "minipass": "^3.1.3", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^1.3.2", -- "minipass-flush": "^1.0.5", -- "minipass-pipeline": "^1.2.4", ++ "@gar/promise-retry": "^1.0.0", ++ "@npmcli/agent": "^4.0.0", ++ "@npmcli/redact": "^4.0.0", ++ "cacache": "^20.0.1", ++ "http-cache-semantics": "^4.1.1", ++ "minipass": "^7.0.2", ++ "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.2", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^6.0.0", @@ -981,41 +867,49 @@ index 58d87b7..81b5041 100644 - "optional": true, - "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "negotiator": "^1.0.0", ++ "proc-log": "^6.0.0", ++ "ssri": "^13.0.0" + }, + "engines": { - "node": ">=10" -- } -- }, ++ "node": "^20.17.0 || >=22.9.0" + } + }, - "node_modules/make-fetch-happen/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", -- "optional": true, ++ "node_modules/make-fetch-happen/node_modules/negotiator": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", ++ "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", ++ "license": "MIT", + "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, -- "engines": { + "engines": { - "node": ">=8" -- } -- }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", -@@ -3855,7 +3305,7 @@ - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", -- "devOptional": true, -+ "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "brace-expansion": "^5.0.5" -@@ -3885,179 +3335,16 @@ - "node": ">=16 || 14 >=14.17" ++ "node": ">= 0.6" } }, -- "node_modules/minipass-collect": { + "node_modules/math-intrinsics": { +@@ -3030,8 +2741,8 @@ + "version": "10.2.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz", + "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==", +- "devOptional": true, + "license": "BlueOak-1.0.0", ++ "optional": true, + "dependencies": { + "brace-expansion": "^5.0.2" + }, +@@ -3061,102 +2772,67 @@ + } + }, + "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", @@ -1032,51 +926,75 @@ index 58d87b7..81b5041 100644 - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", ++ "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "license": "ISC", + "optional": true, + "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "minipass": "^7.0.3" + }, + "engines": { - "node": ">=8" -- } -- }, -- "node_modules/minipass-fetch": { ++ "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minipass-fetch": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", - "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", -- "license": "MIT", -- "optional": true, -- "dependencies": { ++ "version": "5.0.2", ++ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.2.tgz", ++ "integrity": "sha512-2d0q2a8eCi2IRg/IGubCNRJoYbA1+YPXAzQVRFmB45gdGZafyivnZ5YSEfo3JikbjGxOdntGFvBQGqaSMXlAFQ==", + "license": "MIT", + "optional": true, + "dependencies": { - "minipass": "^3.1.0", - "minipass-sized": "^1.0.3", - "minizlib": "^2.0.0" -- }, -- "engines": { ++ "minipass": "^7.0.3", ++ "minipass-sized": "^2.0.0", ++ "minizlib": "^3.0.1" + }, + "engines": { - "node": ">=8" -- }, -- "optionalDependencies": { ++ "node": "^20.17.0 || >=22.9.0" + }, + "optionalDependencies": { - "encoding": "^0.1.12" -- } -- }, ++ "iconv-lite": "^0.7.2" + } + }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", -- "optional": true, -- "dependencies": { ++ "node_modules/minipass-fetch/node_modules/iconv-lite": { ++ "version": "0.7.2", ++ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", ++ "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", ++ "license": "MIT", + "optional": true, + "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { - "node": ">=8" -- } -- }, -- "node_modules/minipass-flush": { -- "version": "1.0.7", -- "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz", -- "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==", -- "license": "BlueOak-1.0.0", ++ "node": ">=0.10.0" ++ }, ++ "funding": { ++ "type": "opencollective", ++ "url": "https://opencollective.com/express" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", +- "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", +- "license": "ISC", - "optional": true, - "dependencies": { - "minipass": "^3.0.0" @@ -1102,62 +1020,55 @@ index 58d87b7..81b5041 100644 - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "minipass": "^3.0.0" -- }, -- "engines": { ++ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { - "node": ">=8" -- } -- }, ++ "node": ">= 8" + } + }, - "node_modules/minipass-pipeline/node_modules/minipass": { -- "version": "3.3.6", -- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -- "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "yallist": "^4.0.0" -- }, -- "engines": { -- "node": ">=8" -- } -- }, ++ "node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", +@@ -3169,10 +2845,10 @@ + "node": ">=8" + } + }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "minipass": "^3.0.0" -- }, -- "engines": { -- "node": ">=8" -- } -- }, ++ "node_modules/minipass-pipeline": { ++ "version": "1.2.4", ++ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", ++ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "license": "ISC", + "optional": true, + "dependencies": { +@@ -3182,7 +2858,7 @@ + "node": ">=8" + } + }, - "node_modules/minipass-sized/node_modules/minipass": { -- "version": "3.3.6", -- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -- "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "yallist": "^4.0.0" -- }, -- "engines": { -- "node": ">=8" -- } -- }, - "node_modules/minizlib": { ++ "node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", +@@ -3195,44 +2871,29 @@ + "node": ">=8" + } + }, +- "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", -+ "version": "3.1.0", -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", -+ "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", - "license": "MIT", +- "license": "MIT", - "optional": true, - "dependencies": { - "minipass": "^3.0.0", @@ -1171,23 +1082,33 @@ index 58d87b7..81b5041 100644 - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, ++ "node_modules/minipass-sized": { ++ "version": "2.0.0", ++ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-2.0.0.tgz", ++ "integrity": "sha512-zSsHhto5BcUVM2m1LurnXY6M//cGhVaegT71OfOXoprxT6o780GZd792ea6FfrQkuU4usHZIUczAQMRUE2plzA==", + "license": "ISC", + "optional": true, "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { -- "node": ">=8" -- } -- }, ++ "minipass": "^7.1.2" + }, + "engines": { + "node": ">=8" + } + }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -- "license": "MIT", ++ "node_modules/minizlib": { ++ "version": "3.1.0", ++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", ++ "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", + "license": "MIT", - "optional": true, - "bin": { - "mkdirp": "bin/cmd.js" ++ "dependencies": { + "minipass": "^7.1.2" }, "engines": { @@ -1196,59 +1117,7 @@ index 58d87b7..81b5041 100644 } }, "node_modules/mkdirp-classic": { -@@ -4067,9 +3354,9 @@ - "license": "MIT" - }, - "node_modules/mocha": { -- "version": "11.7.5", -- "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", -- "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", -+ "version": "11.7.6", -+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.6.tgz", -+ "integrity": "sha512-nS9xOGbw2I3cjCpxwZAEJ9xK9lmJ08vEkQvLtz4du9ZrF9UrjRpeJGiIgl2Z+Qs++pmB4ecDe48Fwsh+j+j7xA==", - "dev": true, - "license": "MIT", - "dependencies": { -@@ -4166,31 +3453,23 @@ - } - }, - "node_modules/morgan": { -- "version": "1.10.1", -- "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", -- "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==", -+ "version": "1.11.0", -+ "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.11.0.tgz", -+ "integrity": "sha512-zSkVu3t18r39pw4ixfBKvfZi3y2UOqr7d4WYwcj3m8nXpEQK4rPO6GLzs/CExoRgmX3y9EjmmcXqv6jq0SK46g==", - "license": "MIT", - "dependencies": { - "basic-auth": "~2.0.1", - "debug": "2.6.9", - "depd": "~2.0.0", -- "on-finished": "~2.3.0", -+ "on-finished": "~2.4.1", - "on-headers": "~1.1.0" - }, - "engines": { - "node": ">= 0.8.0" -- } -- }, -- "node_modules/morgan/node_modules/on-finished": { -- "version": "2.3.0", -- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", -- "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", -- "license": "MIT", -- "dependencies": { -- "ee-first": "1.1.1" - }, -- "engines": { -- "node": ">= 0.8" -+ "funding": { -+ "type": "opencollective", -+ "url": "https://opencollective.com/express" - } - }, - "node_modules/ms": { -@@ -4296,62 +3575,53 @@ +@@ -3448,56 +3109,47 @@ } }, "node_modules/node-addon-api": { @@ -1256,9 +1125,9 @@ index 58d87b7..81b5041 100644 - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "license": "MIT" -+ "version": "8.9.0", -+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.9.0.tgz", -+ "integrity": "sha512-ekZMeaaIzSQTSpr7X2X3iJM7lTzgnx8ahAG9pJfT/7+14mlEM8ZYQ9cgCDvSSRbReFK0oHli3WrZdCiRsgAT9Q==", ++ "version": "8.6.0", ++ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.6.0.tgz", ++ "integrity": "sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" @@ -1268,9 +1137,9 @@ index 58d87b7..81b5041 100644 - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", - "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", -+ "version": "12.4.0", -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", -+ "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", ++ "version": "12.2.0", ++ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.2.0.tgz", ++ "integrity": "sha512-q23WdzrQv48KozXlr0U1v9dwO/k59NHeSzn6loGcasyf0UnSrtzs8kRxM+mfwJSf0DkX0s43hcqgnSO4/VNthQ==", "license": "MIT", "optional": true, "dependencies": { @@ -1282,6 +1151,7 @@ index 58d87b7..81b5041 100644 - "nopt": "^5.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", ++ "make-fetch-happen": "^15.0.0", + "nopt": "^9.0.0", + "proc-log": "^6.0.0", "semver": "^7.3.5", @@ -1289,7 +1159,6 @@ index 58d87b7..81b5041 100644 - "which": "^2.0.2" + "tar": "^7.5.4", + "tinyglobby": "^0.2.12", -+ "undici": "^6.25.0", + "which": "^6.0.0" }, "bin": { @@ -1306,7 +1175,12 @@ index 58d87b7..81b5041 100644 - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "license": "ISC", -- "optional": true, ++ "node_modules/node-gyp/node_modules/isexe": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", ++ "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", ++ "license": "BlueOak-1.0.0", + "optional": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", @@ -1315,32 +1189,16 @@ index 58d87b7..81b5041 100644 - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, -- "engines": { + "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -+ "node_modules/node-gyp/node_modules/isexe": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-4.0.0.tgz", -+ "integrity": "sha512-FFUtZMpoZ8RqHS3XeXEmHWLA4thH+ZxCv2lOiPIn1Xc7CxrqhWzNSDzD+/chS/zbYezmiwWLdQC09JdQKmthOw==", -+ "license": "BlueOak-1.0.0", -+ "optional": true, -+ "engines": { + "node": ">=20" } }, "node_modules/node-gyp/node_modules/semver": { -- "version": "7.7.4", -- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -- "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", -+ "version": "7.8.5", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", -+ "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", - "license": "ISC", - "optional": true, - "bin": { -@@ -4361,6 +3631,22 @@ +@@ -3513,6 +3165,22 @@ "node": ">=10" } }, @@ -1363,7 +1221,7 @@ index 58d87b7..81b5041 100644 "node_modules/node-schedule": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz", -@@ -4376,19 +3662,19 @@ +@@ -3528,19 +3196,19 @@ } }, "node_modules/nopt": { @@ -1388,7 +1246,7 @@ index 58d87b7..81b5041 100644 } }, "node_modules/normalize-url": { -@@ -4416,23 +3702,6 @@ +@@ -3568,23 +3236,6 @@ "node": ">=4" } }, @@ -1412,30 +1270,28 @@ index 58d87b7..81b5041 100644 "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", -@@ -4543,22 +3812,6 @@ - "url": "https://github.com/sponsors/sindresorhus" +@@ -3678,16 +3329,13 @@ } }, -- "node_modules/p-map": { + "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", -- "license": "MIT", -- "optional": true, ++ "version": "7.0.4", ++ "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", ++ "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "license": "MIT", + "optional": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, -- "engines": { + "engines": { - "node": ">=10" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -- } -- }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", -@@ -4598,16 +3851,6 @@ ++ "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +@@ -3719,16 +3367,6 @@ "node": ">=8" } }, @@ -1452,17 +1308,8 @@ index 58d87b7..81b5041 100644 "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -@@ -4663,7 +3906,7 @@ - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", -- "dev": true, -+ "devOptional": true, - "license": "MIT", - "engines": { - "node": ">=12" -@@ -4727,25 +3970,14 @@ - "node": ">= 0.8.0" +@@ -3837,25 +3475,14 @@ + "node": ">=10" } }, - "node_modules/promise-inflight": { @@ -1492,25 +1339,7 @@ index 58d87b7..81b5041 100644 } }, "node_modules/proto-list": { -@@ -4788,12 +4020,13 @@ - } - }, - "node_modules/qs": { -- "version": "6.14.2", -- "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", -- "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", -+ "version": "6.15.3", -+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", -+ "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", - "license": "BSD-3-Clause", - "dependencies": { -- "side-channel": "^1.1.0" -+ "es-define-property": "^1.0.1", -+ "side-channel": "^1.1.1" - }, - "engines": { - "node": ">=0.6" -@@ -4834,16 +4067,6 @@ +@@ -3934,16 +3561,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, @@ -1527,24 +1356,20 @@ index 58d87b7..81b5041 100644 "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -@@ -4998,16 +4221,6 @@ - "url": "https://github.com/sponsors/sindresorhus" +@@ -4078,9 +3695,9 @@ } }, -- "node_modules/retry": { + "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", -- "license": "MIT", -- "optional": true, -- "engines": { -- "node": ">= 4" -- } -- }, - "node_modules/retry-as-promised": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.1.1.tgz", -@@ -5024,45 +4237,6 @@ ++ "version": "0.13.1", ++ "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", ++ "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "license": "MIT", + "optional": true, + "engines": { +@@ -4103,45 +3720,6 @@ "node": ">=0.10.0" } }, @@ -1590,16 +1415,29 @@ index 58d87b7..81b5041 100644 "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", -@@ -5267,13 +4441,13 @@ +@@ -4240,9 +3818,9 @@ + "license": "MIT" + }, + "node_modules/sequelize": { +- "version": "6.37.7", +- "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.7.tgz", +- "integrity": "sha512-mCnh83zuz7kQxxJirtFD7q6Huy6liPanI67BSlbzSYgVNl5eXVdE2CN1FuAeZwG1SNpGsNRCV+bJAVVnykZAFA==", ++ "version": "6.37.8", ++ "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.8.tgz", ++ "integrity": "sha512-HJ0IQFqcTsTiqbEgiuioYFMSD00TP6Cz7zoTti+zVVBwVe9fEhev9cH6WnM3XU31+ABS356durAb99ZuOthnKw==", + "funding": [ + { + "type": "opencollective", +@@ -4346,13 +3924,13 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", -+ "version": "7.0.7", -+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.7.tgz", -+ "integrity": "sha512-YAy8Od6KV+uuwUuU50np8fGB/Aues6Y0nAhA9y/hId74PlKUcme4pXcBD46NWKr1Q4osN/iseZ17YqO1XfmI8g==", ++ "version": "7.0.4", ++ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz", ++ "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==", "dev": true, "license": "BSD-3-Clause", - "dependencies": { @@ -1609,7 +1447,7 @@ index 58d87b7..81b5041 100644 } }, "node_modules/serve-static": { -@@ -5291,13 +4465,6 @@ +@@ -4370,13 +3948,6 @@ "node": ">= 0.8.0" } }, @@ -1623,100 +1461,33 @@ index 58d87b7..81b5041 100644 "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -@@ -5332,14 +4499,14 @@ - "license": "BSD-2-Clause" - }, - "node_modules/side-channel": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", -- "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", -+ "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", -- "object-inspect": "^1.13.3", -- "side-channel-list": "^1.0.0", -+ "object-inspect": "^1.13.4", -+ "side-channel-list": "^1.0.1", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, -@@ -5478,72 +4645,6 @@ - "url": "https://opencollective.com/sinon" +@@ -4598,18 +4169,18 @@ } }, -- "node_modules/smart-buffer": { -- "version": "4.2.0", -- "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -- "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", -- "license": "MIT", -- "optional": true, -- "engines": { -- "node": ">= 6.0.0", -- "npm": ">= 3.0.0" -- } -- }, -- "node_modules/socks": { -- "version": "2.8.7", -- "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", -- "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", -- "license": "MIT", -- "optional": true, -- "dependencies": { -- "ip-address": "^10.0.1", -- "smart-buffer": "^4.2.0" -- }, -- "engines": { -- "node": ">= 10.0.0", -- "npm": ">= 3.0.0" -- } -- }, -- "node_modules/socks-proxy-agent": { + "node_modules/socks-proxy-agent": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", - "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", -- "license": "MIT", -- "optional": true, -- "dependencies": { ++ "version": "8.0.5", ++ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", ++ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "license": "MIT", + "optional": true, + "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" -- }, -- "engines": { ++ "agent-base": "^7.1.2", ++ "debug": "^4.3.4", ++ "socks": "^2.8.3" + }, + "engines": { - "node": ">= 10" -- } -- }, -- "node_modules/socks-proxy-agent/node_modules/debug": { -- "version": "4.4.3", -- "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -- "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", -- "license": "MIT", -- "optional": true, -- "dependencies": { -- "ms": "^2.1.3" -- }, -- "engines": { -- "node": ">=6.0" -- }, -- "peerDependenciesMeta": { -- "supports-color": { -- "optional": true -- } -- } -- }, -- "node_modules/socks-proxy-agent/node_modules/ms": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -- "license": "MIT", -- "optional": true -- }, - "node_modules/sorted-array-functions": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz", -@@ -5572,22 +4673,25 @@ ++ "node": ">= 14" + } + }, + "node_modules/socks-proxy-agent/node_modules/debug": { +@@ -4665,22 +4236,25 @@ } }, "node_modules/sqlite3": { @@ -1750,11 +1521,10 @@ index 58d87b7..81b5041 100644 }, "peerDependenciesMeta": { "node-gyp": { -@@ -5595,32 +4699,6 @@ - } +@@ -4689,29 +4263,16 @@ } }, -- "node_modules/ssri": { + "node_modules/ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", @@ -1771,32 +1541,35 @@ index 58d87b7..81b5041 100644 - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "13.0.1", ++ "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.1.tgz", ++ "integrity": "sha512-QUiRf1+u9wPTL/76GTYlKttDEBWV1ga9ZXW8BG6kfdeyyM8LGPix9gROyg9V2+P0xNyF3X2Go526xKFdMZrHSQ==", + "license": "ISC", + "optional": true, + "dependencies": { - "yallist": "^4.0.0" -- }, -- "engines": { ++ "minipass": "^7.0.3" + }, + "engines": { - "node": ">=8" -- } -- }, ++ "node": "^20.17.0 || >=22.9.0" + } + }, "node_modules/stack-chain": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/stack-chain/-/stack-chain-1.3.7.tgz", -@@ -5820,9 +4898,9 @@ +@@ -4901,9 +4462,9 @@ } }, "node_modules/tar": { -- "version": "7.5.13", -- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz", -- "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==", -+ "version": "7.5.21", -+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.21.tgz", -+ "integrity": "sha512-XdhtCvlMywwxpCW8YEq3lOXBJpUPTR2OHHcwLPO3HwsJqOHa2Ok/oJ7ruGzp+JrKoRPVCzJwAdEjqLW/vNRPHA==", +- "version": "7.5.9", +- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", +- "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", ++ "version": "7.5.11", ++ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", ++ "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", -@@ -5869,27 +4947,6 @@ +@@ -4950,27 +4511,6 @@ "node": ">=6" } }, @@ -1824,19 +1597,19 @@ index 58d87b7..81b5041 100644 "node_modules/tar/node_modules/yallist": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", -@@ -5905,6 +4962,23 @@ +@@ -4986,6 +4526,54 @@ "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", "license": "MIT" }, + "node_modules/tinyglobby": { -+ "version": "0.2.17", -+ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", -+ "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", ++ "version": "0.2.15", ++ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", ++ "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "fdir": "^6.5.0", -+ "picomatch": "^4.0.4" ++ "picomatch": "^4.0.3" + }, + "engines": { + "node": ">=12.0.0" @@ -1845,53 +1618,78 @@ index 58d87b7..81b5041 100644 + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", -@@ -6061,32 +5135,22 @@ - "node": ">=12" - } - }, -+ "node_modules/undici": { -+ "version": "6.27.0", -+ "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", -+ "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", ++ "node_modules/tinyglobby/node_modules/fdir": { ++ "version": "6.5.0", ++ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", ++ "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "license": "MIT", + "optional": true, + "engines": { -+ "node": ">=18.17" ++ "node": ">=12.0.0" ++ }, ++ "peerDependencies": { ++ "picomatch": "^3 || ^4" ++ }, ++ "peerDependenciesMeta": { ++ "picomatch": { ++ "optional": true ++ } + } + }, - "node_modules/undici-types": { - "version": "7.19.2", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz", - "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==", ++ "node_modules/tinyglobby/node_modules/picomatch": { ++ "version": "4.0.3", ++ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", ++ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=12" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/jonschlinkert" ++ } ++ }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", +@@ -5098,23 +4686,29 @@ "license": "MIT" }, -- "node_modules/unique-filename": { + "node_modules/unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", -- "license": "ISC", -- "optional": true, -- "dependencies": { ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-5.0.0.tgz", ++ "integrity": "sha512-2RaJTAvAb4owyjllTfXzFClJ7WsGxlykkPvCr9pA//LD9goVq+m4PPAeBgNodGZ7nSrntT/auWpJ6Y5IFXcfjg==", + "license": "ISC", + "optional": true, + "dependencies": { - "unique-slug": "^2.0.0" -- } -- }, -- "node_modules/unique-slug": { ++ "unique-slug": "^6.0.0" ++ }, ++ "engines": { ++ "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", -- "license": "ISC", -- "optional": true, -- "dependencies": { -- "imurmurhash": "^0.1.4" -- } -- }, ++ "version": "6.0.0", ++ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-6.0.0.tgz", ++ "integrity": "sha512-4Lup7Ezn8W3d52/xBhZBVdx323ckxa7DEvd9kPQHppTkLoJXw6ltrBCyj5pnrxj0qKDxYMJ56CoxNuFCscdTiw==", + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4" ++ }, ++ "engines": { ++ "node": "^20.17.0 || >=22.9.0" + } + }, "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", -@@ -6181,61 +5245,6 @@ +@@ -5201,61 +4795,6 @@ "node": ">= 8" } }, @@ -1954,28 +1752,28 @@ index 58d87b7..81b5041 100644 "version": "3.19.0", "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz", diff --git a/service/package.json b/service/package.json -index 30905a7..496c67b 100644 +index c656c51..ae2e89d 100644 --- a/service/package.json +++ b/service/package.json @@ -18,7 +18,7 @@ "mysql2": "^3.15.3", "node-schedule": "^2.1.1", - "sequelize": "^6.37.8", + "sequelize": "^6.37.7", - "sqlite3": "^5.1.7", + "sqlite3": "^6.0.1", "umzug": "^3.8.2", "winston": "^3.18.3" }, -@@ -41,7 +41,8 @@ - }, - "minimatch": "^10.2.4", - "@tootallnate/once": "^3.0.1", -- "lodash": "^4.18.1" -+ "lodash": "^4.18.1", +@@ -34,7 +34,8 @@ + "tar": "^7.5.9", + "diff": "^8.0.3", + "ajv": "^8.18.0", +- "minimatch": "^10.2.4" ++ "minimatch": "^10.2.4", + "serialize-javascript": "^7.0.4" }, "scripts": { "start": "cross-env NODE_ENV=production node pccs_server.js", -- -2.55.0 +2.53.0 diff --git a/sgx-pccs.spec b/sgx-pccs.spec index c07a459..6e47c2f 100644 --- a/sgx-pccs.spec +++ b/sgx-pccs.spec @@ -1,6 +1,6 @@ # Change after running pccs-nodejs-bundler -%global node_modules_date 20260723 +%global node_modules_date 20260318 %global with_sysusers_scripts 0 %if 0%{?rhel} == 9 @@ -9,7 +9,7 @@ Name: sgx-pccs -Version: 1.26 +Version: 1.25 Release: %autorelease # The PCCS service was previously bundled in linux-sgx RPMs, # whose versioning follows the SGX versions. @@ -75,34 +75,27 @@ Source4: pccs-%{version}-%{node_modules_date}-node-modules.tar.xz # Maintained in https://github.com/berrange/confidential-computing.tee.dcap.pccs/tree/dist-git- # Patch: 0001-service-sanitize-paths-to-all-resources.patch -Patch: 0002-pccsadmin-make-keyring-module-optional.patch -Patch: 0003-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch -Patch: 0004-service-update-sqlite3-to-6.0.0-series-override-seri.patch +Patch: 0002-pccsadmin-remove-leftover-debugging-print-args-state.patch +Patch: 0003-pccsadmin-make-keyring-module-optional.patch +Patch: 0004-pccsadmin-ignore-errors-trying-to-clear-the-keyring.patch +Patch: 0005-service-update-sqlite3-to-6.0.0-series-override-seri.patch -%if 0%{?fedora} >= 45 || 0%{?rhel} >= 11 -Requires: nodejs26 -%else -%if 0%{?fedora} == 44 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 Requires: nodejs24 %else Requires: nodejs %endif -%endif # XXX nodejs-packaging needs fixing to auto-add 'Requires: nodejs(abi) == XX' # then this can be reduced to only 'BuildRequires: nodejs, /usr/bin/node' # See also https://src.fedoraproject.org/rpms/linux-sgx/pull-request/6 # Match this version with later 'Requires: nodejsXX' against sgx-pccs -%if 0%{?fedora} >= 45 || 0%{?rhel} >= 11 -BuildRequires: nodejs26-devel, /usr/bin/node, /usr/bin/npm -%else -%if 0%{?fedora} == 44 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 BuildRequires: nodejs24-devel, /usr/bin/node, /usr/bin/npm %else # npm in RHEL 9, nodejs-npm in RHEL 10 and F<44 -BuildRequires: nodejs-devel, /usr/bin/node, /usr/bin/npm -%endif +BuildRequires: nodejs22-devel, /usr/bin/node, /usr/bin/npm %endif BuildRequires: nodejs-packaging BuildRequires: python3-rpm-macros diff --git a/sources b/sources index 9551f58..ef2722f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pccs-1.26-20260723-node-modules.tar.xz) = 182df7e57b14c5bd2a075cc94c1204c4cabeb0ecb0ccc732331935c881cad423809b7ddfeedd9cce3a1fbcf561e7e9c7933c38b02de07858ae6153b9aa82d142 -SHA512 (pccs-1.26.tar.gz) = d9fe74109b29fb1abd122bb5b62ce9ad5e49cca69406c44c45516a5b8e69f2cde62bd32ecbc66288c6719210c6c8a9bc260be1b65b8ec18d1999bf50e8f70860 +SHA512 (pccs-1.25.tar.gz) = b5491065aa08c6783c181af40557eae9d7f5ed376c9c6a65f773fb3f90af98610d559c1ed965857536ee8595c5105efedd8466edfe93d09e37d83aaf5b11b828 +SHA512 (pccs-1.25-20260318-node-modules.tar.xz) = 4bbfd3c01ac3908923fc48349c3633058508887a0fe6498819210f639590cbed694d611910b6ff4d1bca34eda4514dcffa5cfcd14ea0545f357928814d48f102