From 17850691d510cd5e1750ffe43d5a1e12f4abbc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Thu, 23 May 2024 14:28:56 +0200 Subject: [PATCH 01/27] Chore/bump base image (#155) * chore: bump node to 20.13.1 * chore: version bump * ci: add dependabot.yml --- .dev/Dockerfile.debug | 2 +- .github/dependabot.yml | 61 ++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 4 +++ Dockerfile | 4 +-- package-lock.json | 4 +-- package.json | 2 +- 6 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.dev/Dockerfile.debug b/.dev/Dockerfile.debug index e7ea0880..7ce22c0c 100644 --- a/.dev/Dockerfile.debug +++ b/.dev/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM node:20.11.0 +FROM node:20.13.1 WORKDIR /usr/app # Webserver, Debugger diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..f9e9390c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,61 @@ +version: 2 +updates: + ##### GitHub Actions ##### + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + groups: + update-github-actions-dependencies: + patterns: + - "*" + reviewers: + - "jkoenig134" + - "sebbi08" + labels: + - "dependencies" + + ##### npm ##### + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + groups: + update-npm-dependencies: + patterns: + - "*" + reviewers: + - "jkoenig134" + - "sebbi08" + labels: + - "dependencies" + + ##### Docker ##### + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + groups: + update-docker-dependencies: + patterns: + - "*" + reviewers: + - "jkoenig134" + - "sebbi08" + labels: + - "dependencies" + + ##### Docker ##### + - package-ecosystem: "docker" + directory: "/.dev" + schedule: + interval: "weekly" + groups: + update-docker-dependencies: + patterns: + - "*" + reviewers: + - "jkoenig134" + - "sebbi08" + labels: + - "dependencies" diff --git a/CHANGELOG.md b/CHANGELOG.md index a228bd4e..7a3da0d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.11.1 + +- upgrade nodejs to 20.13.1 + ## 3.11.0 -> SDK 4.3.0 diff --git a/Dockerfile b/Dockerfile index 421b0aac..d709861b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.11.0 as builder +FROM node:20.13.1 as builder ARG COMMIT_HASH ARG BUILD_NUMBER ARG PACKAGE_VERSION @@ -13,7 +13,7 @@ COPY src src RUN npm run build RUN .ci/writeBuildInformation.sh -FROM node:20.11.0-alpine +FROM node:20.13.1-alpine ENV NODE_CONFIG_ENV=prod RUN apk add --no-cache tini RUN apk add libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/node && apk del libcap diff --git a/package-lock.json b/package-lock.json index c0d7e7b9..cbe9e29b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nmshd/connector", - "version": "3.11.0", + "version": "3.11.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nmshd/connector", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "workspaces": [ ".", diff --git a/package.json b/package.json index 8a28bee7..efe521bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/connector", - "version": "3.11.0", + "version": "3.11.1", "private": true, "description": "The Enmeshed Connector", "homepage": "https://enmeshed.eu/integrate", From 81416371ef0ed87d5c1bae5f3358ef5725537290 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 15:57:45 +0200 Subject: [PATCH 02/27] Chore(deps): bump the update-npm-dependencies group across 1 directory with 6 updates (#159) Bumps the update-npm-dependencies group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@google-cloud/pubsub](https://github.com/googleapis/nodejs-pubsub) | `4.3.3` | `4.4.0` | | [@js-soft/docdb-access-mongo](https://github.com/js-soft/ts-documentdb-access/tree/HEAD/packages/mongo) | `1.1.7` | `1.1.8` | | [@nmshd/runtime](https://github.com/nmshd/runtime/tree/HEAD/packages/runtime) | `4.7.1` | `4.8.0` | | [mqtt](https://github.com/mqttjs/MQTT.js) | `5.6.1` | `5.6.2` | | [@js-soft/eslint-config-ts](https://github.com/js-soft/ts-linting) | `1.6.7` | `1.6.8` | | [ts-json-schema-generator](https://github.com/vega/ts-json-schema-generator) | `1.5.1` | `2.1.1` | Updates `@google-cloud/pubsub` from 4.3.3 to 4.4.0 - [Release notes](https://github.com/googleapis/nodejs-pubsub/releases) - [Changelog](https://github.com/googleapis/nodejs-pubsub/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/nodejs-pubsub/compare/v4.3.3...v4.4.0) Updates `@js-soft/docdb-access-mongo` from 1.1.7 to 1.1.8 - [Commits](https://github.com/js-soft/ts-documentdb-access/commits/HEAD/packages/mongo) Updates `@nmshd/runtime` from 4.7.1 to 4.8.0 - [Commits](https://github.com/nmshd/runtime/commits/HEAD/packages/runtime) Updates `mqtt` from 5.6.1 to 5.6.2 - [Release notes](https://github.com/mqttjs/MQTT.js/releases) - [Changelog](https://github.com/mqttjs/MQTT.js/blob/main/CHANGELOG.md) - [Commits](https://github.com/mqttjs/MQTT.js/compare/v5.6.1...v5.6.2) Updates `@js-soft/eslint-config-ts` from 1.6.7 to 1.6.8 - [Commits](https://github.com/js-soft/ts-linting/commits) Updates `ts-json-schema-generator` from 1.5.1 to 2.1.1 - [Release notes](https://github.com/vega/ts-json-schema-generator/releases) - [Changelog](https://github.com/vega/ts-json-schema-generator/blob/v2.1.1/CHANGELOG.md) - [Commits](https://github.com/vega/ts-json-schema-generator/compare/v1.5.1...v2.1.1) --- updated-dependencies: - dependency-name: "@google-cloud/pubsub" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: update-npm-dependencies - dependency-name: "@js-soft/docdb-access-mongo" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: update-npm-dependencies - dependency-name: "@nmshd/runtime" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: update-npm-dependencies - dependency-name: mqtt dependency-type: direct:production update-type: version-update:semver-patch dependency-group: update-npm-dependencies - dependency-name: "@js-soft/eslint-config-ts" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: update-npm-dependencies - dependency-name: ts-json-schema-generator dependency-type: direct:development update-type: version-update:semver-major dependency-group: update-npm-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 183 +++++++++----------------------------- package.json | 10 +-- packages/sdk/package.json | 2 +- 3 files changed, 46 insertions(+), 149 deletions(-) diff --git a/package-lock.json b/package-lock.json index cbe9e29b..62e4e734 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,13 +13,13 @@ "packages/sdk" ], "dependencies": { - "@google-cloud/pubsub": "4.3.3", + "@google-cloud/pubsub": "4.4.0", "@js-soft/docdb-access-loki": "^1.0.6", - "@js-soft/docdb-access-mongo": "1.1.7", + "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.7.1", + "@nmshd/runtime": "4.8.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.3", "axios": "^1.6.8", @@ -30,7 +30,7 @@ "https-proxy-agent": "^7.0.4", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.5.0", + "mqtt": "^5.6.2", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -45,7 +45,7 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "^10.1.0", - "@js-soft/eslint-config-ts": "1.6.7", + "@js-soft/eslint-config-ts": "1.6.8", "@js-soft/license-check": "1.0.9", "@nmshd/connector-sdk": "*", "@types/amqplib": "^0.10.5", @@ -940,9 +940,9 @@ } }, "node_modules/@google-cloud/pubsub": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.3.3.tgz", - "integrity": "sha512-vJKh9L4dHf1XGSDKS1SB0IpqP/sUajQh4/QwhYasuq/NjzfHSxqSt+CuhrFGb5/gioTWE4gce0sn7h1SW7qESg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.4.0.tgz", + "integrity": "sha512-1eiiAZUFhxcOqKPVwZarc3ghXuhoc3S7z5BgNrxqdirJ/MYr3IjQVTA7Lq2dAAsDuWms1LBN897rbnEGW9PpfA==", "dependencies": { "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^4.0.0", @@ -950,8 +950,6 @@ "@google-cloud/promisify": "^4.0.0", "@opentelemetry/api": "^1.6.0", "@opentelemetry/semantic-conventions": "~1.21.0", - "@types/duplexify": "^3.6.0", - "@types/long": "^4.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", @@ -1572,28 +1570,23 @@ } }, "node_modules/@js-soft/docdb-access-mongo": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@js-soft/docdb-access-mongo/-/docdb-access-mongo-1.1.7.tgz", - "integrity": "sha512-15lsjTAf6S2gxPgshtMiY8g+49KTYxDFPQWsivewM2U9Y6xoBLxTL1y7b195JicVUMr1vS541NGB1+kwSkslXA==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/@js-soft/docdb-access-mongo/-/docdb-access-mongo-1.1.8.tgz", + "integrity": "sha512-GPiK/xZDaX1gQWvwGH+YWYCw1snG+09kb8EL1GshbExDM//cEmCogrMBaPl64KIOfVk6h5i4urtKKazPFF1wFg==", "dependencies": { - "@js-soft/docdb-access-abstractions": "1.0.3", - "mongodb": "6.3.0" + "@js-soft/docdb-access-abstractions": "1.0.4", + "mongodb": "6.5.0" } }, - "node_modules/@js-soft/docdb-access-mongo/node_modules/@js-soft/docdb-access-abstractions": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@js-soft/docdb-access-abstractions/-/docdb-access-abstractions-1.0.3.tgz", - "integrity": "sha512-a4vPGMSDa4P4l3QSp7yXYpW8ab2vUEQpO9KSZxcipA/zZ46wXEvbzxZxnNrCpNDN8hPeafid4ICGIlY+SJE89w==" - }, "node_modules/@js-soft/docdb-querytranslator": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@js-soft/docdb-querytranslator/-/docdb-querytranslator-1.1.4.tgz", "integrity": "sha512-Wn/saaEN42T3tNIcnJd6Tp/htD8dtRImqPNu4aGQLbCPHLT8sT1VyyKwmRnZjK1z0u9pOo2svKaJmeE83rZhCg==" }, "node_modules/@js-soft/eslint-config-ts": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/@js-soft/eslint-config-ts/-/eslint-config-ts-1.6.7.tgz", - "integrity": "sha512-5rJ2JrUe/ImxzfoTqJK4CS0LJDIDjExVQ+Yd9+Wf+Kfo7CQ1OSTtIUb2obPT0e/QIslqhyUI5NAYVsaVWzXmKw==", + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@js-soft/eslint-config-ts/-/eslint-config-ts-1.6.8.tgz", + "integrity": "sha512-uwAMTu7AOlQYWCu/VWCiyPOhod5XWk0s/pN6kcFdFBc9O8OGDwCiUUZ6w9U93nK6stUZOKsw04QWbSAmvFxfRA==", "dev": true, "dependencies": { "@typescript-eslint/eslint-plugin": "^7.1.1", @@ -1745,9 +1738,9 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.7.1.tgz", - "integrity": "sha512-Ck85GKv2u+txtoPQZVNmfqtiK1BnUG9JN2MEtk55xM/7kcK4Q/1+BZNQcxaRBfpVcryAMjDT+cCA3wvu+GYY1Q==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.8.0.tgz", + "integrity": "sha512-AFQOy1Whq5dv6rwfKwrb1zidRIBnD225PQaensY7s8EWZ46Ea8VmqPu2q1zGUtnlDdHVtyZPGxu+EVF1g1TyeQ==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", @@ -1756,7 +1749,7 @@ "@nmshd/consumption": "3.10.0", "@nmshd/content": "2.9.0", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.6.0", + "@nmshd/transport": "2.7.0", "ajv": "^8.13.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", @@ -1770,15 +1763,15 @@ } }, "node_modules/@nmshd/transport": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.6.0.tgz", - "integrity": "sha512-D+sc2bgy58re7Eo5rVU6TUDybZcZf8LQCe6MqKeNqxh6dqlNcVCGObAhlnOE8lw7FEiyyfjLwN3d7glXKF9RsQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.7.0.tgz", + "integrity": "sha512-nsMcQO24PG+r/7cHzoNsQ4G1okMFRG36PD4sbEcGHocbOT395YgZVtNtuXD6WW+OaGKm/YGAY1iAvLfpuK3qzA==", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.4", "@js-soft/logging-abstractions": "^1.0.1", "@js-soft/simple-logger": "1.0.4", "@js-soft/ts-utils": "^2.3.3", - "axios": "^1.6.8", + "axios": "^1.7.1", "fast-json-patch": "^3.1.1", "form-data": "^4.0.0", "json-stringify-safe": "^5.0.1", @@ -2570,14 +2563,6 @@ "@types/node": "*" } }, - "node_modules/@types/duplexify": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.4.tgz", - "integrity": "sha512-2eahVPsd+dy3CL6FugAzJcxoraWhUghZGEQJns1kTKfCXWKJ5iG/VkaB05wRVrDKHfOFKqb0X0kXh91eE99RZg==", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/express": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", @@ -5980,63 +5965,6 @@ "node": ">=14" } }, - "node_modules/gcp-metadata": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", - "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", - "optional": true, - "peer": true, - "dependencies": { - "gaxios": "^5.0.0", - "json-bigint": "^1.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/gcp-metadata/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==", - "optional": true, - "peer": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/gcp-metadata/node_modules/gaxios": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", - "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", - "optional": true, - "peer": true, - "dependencies": { - "extend": "^3.0.2", - "https-proxy-agent": "^5.0.0", - "is-stream": "^2.0.0", - "node-fetch": "^2.6.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/gcp-metadata/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==", - "optional": true, - "peer": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/generic-pool": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", @@ -8459,12 +8387,12 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz", - "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.5.0.tgz", + "integrity": "sha512-Fozq68InT+JKABGLqctgtb8P56pRrJFkbhW0ux+x1mdHeyinor8oNzJqwLjV/t5X5nJGfTlluxfyMnOXNggIUA==", "dependencies": { - "@mongodb-js/saslprep": "^1.1.0", - "bson": "^6.2.0", + "@mongodb-js/saslprep": "^1.1.5", + "bson": "^6.4.0", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -8513,9 +8441,9 @@ } }, "node_modules/mqtt": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.6.1.tgz", - "integrity": "sha512-0av+NmA7flOg5YZLZnh2Ytg56nvtiiAQJ70ziTUOCt4om5zodzYPbAeXIWtLXSJctmeuplxRB7mDdNwTr6CKhg==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.6.2.tgz", + "integrity": "sha512-bbmR8b4luc4UedbteHJ5Idc5zngJglVyogrJcE2buu+5Iipk5e3du3doBr+HCqKJt/OfuLQ9v0SfVgs6zOGZlg==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -11965,55 +11893,24 @@ } }, "node_modules/ts-json-schema-generator": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-1.5.1.tgz", - "integrity": "sha512-apX5qG2+NA66j7b4AJm8q/DpdTeOsjfh7A3LpKsUiil0FepkNwtN28zYgjrsiiya2/OPhsr/PSjX5FUYg79rCg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.1.1.tgz", + "integrity": "sha512-ha5/w3A2APOOn9ET2CfunEXdVOnKmjISTGcxhCkDszmrsRWFfG5F+re5U5onLXo665sZ4BuE2g5jZAjC+CUcgA==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.15", "commander": "^12.0.0", - "glob": "^8.0.3", + "glob": "^10.3.12", "json5": "^2.2.3", "normalize-path": "^3.0.0", "safe-stable-stringify": "^2.4.3", - "typescript": "~5.4.2" + "typescript": "^5.4.5" }, "bin": { - "ts-json-schema-generator": "bin/ts-json-schema-generator" + "ts-json-schema-generator": "bin/ts-json-schema-generator.js" }, "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/ts-json-schema-generator/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/ts-json-schema-generator/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" + "node": ">=18.0.0" } }, "node_modules/ts-mixer": { @@ -13032,7 +12929,7 @@ "devDependencies": { "@types/form-data": "^2.5.0", "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^1.5.0" + "ts-json-schema-generator": "^2.1.1" } } } diff --git a/package.json b/package.json index efe521bb..8b37c8a0 100644 --- a/package.json +++ b/package.json @@ -65,13 +65,13 @@ } }, "dependencies": { - "@google-cloud/pubsub": "4.3.3", + "@google-cloud/pubsub": "4.4.0", "@js-soft/docdb-access-loki": "^1.0.6", - "@js-soft/docdb-access-mongo": "1.1.7", + "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.7.1", + "@nmshd/runtime": "4.8.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.3", "axios": "^1.6.8", @@ -82,7 +82,7 @@ "https-proxy-agent": "^7.0.4", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.5.0", + "mqtt": "^5.6.2", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -97,7 +97,7 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "^10.1.0", - "@js-soft/eslint-config-ts": "1.6.7", + "@js-soft/eslint-config-ts": "1.6.8", "@js-soft/license-check": "1.0.9", "@nmshd/connector-sdk": "*", "@types/amqplib": "^0.10.5", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0c02d8a4..8fa15f22 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@types/form-data": "^2.5.0", "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^1.5.0" + "ts-json-schema-generator": "^2.1.1" }, "publishConfig": { "access": "public", From 2d0ecc7fbb5ca42d89a732bf2bb546086b845f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Thu, 23 May 2024 17:14:49 +0200 Subject: [PATCH 03/27] Ci/stay on docker node lts (#160) * ci: combine docker updates * ci: ignore non-lts for now --- .github/dependabot.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f9e9390c..9e1affe2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -32,28 +32,19 @@ updates: ##### Docker ##### - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "weekly" - groups: - update-docker-dependencies: - patterns: - - "*" - reviewers: - - "jkoenig134" - - "sebbi08" - labels: - - "dependencies" - - ##### Docker ##### - - package-ecosystem: "docker" - directory: "/.dev" + directories: + - "/" + - "/.dev" schedule: interval: "weekly" groups: update-docker-dependencies: patterns: - "*" + ignore: + - dependency-name: "node" + versions: + - ">20" reviewers: - "jkoenig134" - "sebbi08" From aa95133f299fbfce4c281c83b938a7df2e8498cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 08:20:04 +0200 Subject: [PATCH 04/27] Chore(deps-dev): bump ts-json-schema-generator (#161) Bumps the update-npm-dependencies group with 1 update: [ts-json-schema-generator](https://github.com/vega/ts-json-schema-generator). Updates `ts-json-schema-generator` from 2.1.1 to 2.2.0 - [Release notes](https://github.com/vega/ts-json-schema-generator/releases) - [Changelog](https://github.com/vega/ts-json-schema-generator/blob/v2.2.0/CHANGELOG.md) - [Commits](https://github.com/vega/ts-json-schema-generator/compare/v2.1.1...v2.2.0) --- updated-dependencies: - dependency-name: ts-json-schema-generator dependency-type: direct:development update-type: version-update:semver-minor dependency-group: update-npm-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 9 +++++---- packages/sdk/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62e4e734..33069f4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11893,9 +11893,9 @@ } }, "node_modules/ts-json-schema-generator": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.1.1.tgz", - "integrity": "sha512-ha5/w3A2APOOn9ET2CfunEXdVOnKmjISTGcxhCkDszmrsRWFfG5F+re5U5onLXo665sZ4BuE2g5jZAjC+CUcgA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.2.0.tgz", + "integrity": "sha512-Fo9pcSb6PIvCSapoJR4VJlcCFC67d7yBWqbctNU6ShfXSMHItkjiLl3e9KGA1bu2S3jVYOFjUdPfWtfRdnMorA==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.15", @@ -11904,6 +11904,7 @@ "json5": "^2.2.3", "normalize-path": "^3.0.0", "safe-stable-stringify": "^2.4.3", + "tslib": "^2.6.2", "typescript": "^5.4.5" }, "bin": { @@ -12929,7 +12930,7 @@ "devDependencies": { "@types/form-data": "^2.5.0", "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^2.1.1" + "ts-json-schema-generator": "^2.2.0" } } } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8fa15f22..55ff92c0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@types/form-data": "^2.5.0", "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^2.1.1" + "ts-json-schema-generator": "^2.2.0" }, "publishConfig": { "access": "public", From fe0c21f38d748b321f392b79a03a918969943057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Fri, 24 May 2024 08:24:13 +0200 Subject: [PATCH 05/27] Ci/use current (#162) * chore: use current * chore: use current in pipelines * chore: version bump --- .dev/Dockerfile.debug | 2 +- .github/dependabot.yml | 4 ---- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 4 ++-- CHANGELOG.md | 4 ++++ Dockerfile | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.dev/Dockerfile.debug b/.dev/Dockerfile.debug index 7ce22c0c..cf1f9584 100644 --- a/.dev/Dockerfile.debug +++ b/.dev/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM node:20.13.1 +FROM node:22.2.0 WORKDIR /usr/app # Webserver, Debugger diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9e1affe2..b29956fc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -41,10 +41,6 @@ updates: update-docker-dependencies: patterns: - "*" - ignore: - - dependency-name: "node" - versions: - - ">20" reviewers: - "jkoenig134" - "sebbi08" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ceeaa5f6..d8372503 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: current registry-url: https://registry.npmjs.org/ - run: npm ci - run: npm run build:ci --workspaces --if-present diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ceb30c2e..dd1238ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: run: npm run start:backbone - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: current - run: npm ci - run: npm run build:ci --workspaces --if-present - name: Start MongoDB @@ -38,7 +38,7 @@ jobs: run: npm run start:backbone - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: current - run: npm ci - run: npm run build:ci --workspaces --if-present - uses: js-soft/ferretdb-github-action@1.1.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a3da0d2..9bb72e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.11.2 + +- upgrade nodejs to 22.2.0 + ## 3.11.1 - upgrade nodejs to 20.13.1 diff --git a/Dockerfile b/Dockerfile index d709861b..e9b5b0cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.13.1 as builder +FROM node:22.2.0 as builder ARG COMMIT_HASH ARG BUILD_NUMBER ARG PACKAGE_VERSION @@ -13,7 +13,7 @@ COPY src src RUN npm run build RUN .ci/writeBuildInformation.sh -FROM node:20.13.1-alpine +FROM node:22.2.0-alpine ENV NODE_CONFIG_ENV=prod RUN apk add --no-cache tini RUN apk add libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/node && apk del libcap diff --git a/package-lock.json b/package-lock.json index 33069f4f..3993bc86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nmshd/connector", - "version": "3.11.1", + "version": "3.11.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nmshd/connector", - "version": "3.11.1", + "version": "3.11.2", "license": "MIT", "workspaces": [ ".", diff --git a/package.json b/package.json index 8b37c8a0..cf42dc53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/connector", - "version": "3.11.1", + "version": "3.11.2", "private": true, "description": "The Enmeshed Connector", "homepage": "https://enmeshed.eu/integrate", From d03387f3f55ba9bd8ddf4b3e909a4505b844977e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 09:34:17 +0200 Subject: [PATCH 06/27] Chore(deps): bump @nmshd/runtime in the update-npm-dependencies group (#163) Bumps the update-npm-dependencies group with 1 update: [@nmshd/runtime](https://github.com/nmshd/runtime/tree/HEAD/packages/runtime). Updates `@nmshd/runtime` from 4.8.0 to 4.8.1 - [Commits](https://github.com/nmshd/runtime/commits/HEAD/packages/runtime) --- updated-dependencies: - dependency-name: "@nmshd/runtime" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: update-npm-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3993bc86..bc9e35ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.8.0", + "@nmshd/runtime": "4.8.1", "agentkeepalive": "4.5.0", "amqplib": "^0.10.3", "axios": "^1.6.8", @@ -1738,9 +1738,9 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.8.0.tgz", - "integrity": "sha512-AFQOy1Whq5dv6rwfKwrb1zidRIBnD225PQaensY7s8EWZ46Ea8VmqPu2q1zGUtnlDdHVtyZPGxu+EVF1g1TyeQ==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.8.1.tgz", + "integrity": "sha512-Ws20jJVbHg5zEOpECAODqrELBFEEtS/7aADbB15QcXD/Uxr2j6Kz40Uccgs4a18P6K5/MNkzDHwrN/9HHfFEPg==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", diff --git a/package.json b/package.json index cf42dc53..6dff5675 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.8.0", + "@nmshd/runtime": "4.8.1", "agentkeepalive": "4.5.0", "amqplib": "^0.10.3", "axios": "^1.6.8", From d84b1200b52ba16d58c184817d43a0424859ff39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Mon, 3 Jun 2024 18:39:17 +0200 Subject: [PATCH 07/27] Chore/update runtime (#167) * chore: bump libs * chore: version bump * chore: remove obsolete version * chore: add same config defaults as runtime lib * chore: bump runtime * chore: bump runtime (again) * fix: accept HTTP_PROXY and rewrite to http_proxy * fix: https instead of http * chore: bump runtime * chore: remove workaround --- .dev/compose.yml | 1 - CHANGELOG.md | 4 ++ package-lock.json | 110 ++++++++++++++++++++-------------------- package.json | 31 ++++++----- src/ConnectorRuntime.ts | 6 --- 5 files changed, 74 insertions(+), 78 deletions(-) diff --git a/.dev/compose.yml b/.dev/compose.yml index 1197619d..7cb8718d 100644 --- a/.dev/compose.yml +++ b/.dev/compose.yml @@ -1,4 +1,3 @@ -version: "3.7" services: connector-1: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bb72e7c..ceaaf70a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.11.3 + +- upgrade the runtime version to 4.10.6 + ## 3.11.2 - upgrade nodejs to 22.2.0 diff --git a/package-lock.json b/package-lock.json index bc9e35ba..75e18737 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,43 +1,42 @@ { "name": "@nmshd/connector", - "version": "3.11.2", + "version": "3.11.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nmshd/connector", - "version": "3.11.2", + "version": "3.11.3", "license": "MIT", "workspaces": [ ".", "packages/sdk" ], "dependencies": { - "@google-cloud/pubsub": "4.4.0", - "@js-soft/docdb-access-loki": "^1.0.6", + "@google-cloud/pubsub": "4.4.1", + "@js-soft/docdb-access-loki": "^1.1.0", "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.8.1", + "@nmshd/runtime": "4.10.6", "agentkeepalive": "4.5.0", - "amqplib": "^0.10.3", - "axios": "^1.6.8", + "amqplib": "^0.10.4", + "axios": "^1.7.2", "compression": "1.7.4", "cors": "2.8.5", "express": "4.19.2", "helmet": "7.1.0", - "https-proxy-agent": "^7.0.4", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.6.2", + "mqtt": "^5.7.0", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", "rapidoc": "9.3.4", - "redis": "^4.6.13", + "redis": "^4.6.14", "reflect-metadata": "0.2.2", - "swagger-ui-express": "5.0.0", + "swagger-ui-express": "5.0.1", "typescript-ioc": "3.2.2", "typescript-rest": "3.0.4", "typescript-rest-ioc": "1.0.1", @@ -55,10 +54,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.0", + "@types/lodash": "^4.17.4", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.11.28", + "@types/node": "^20.14.0", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -68,12 +67,12 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.0", + "nodemon": "^3.1.2", "npm-run-all": "^4.1.5", - "prettier": "^3.2.5", - "ts-jest": "^29.1.2", + "prettier": "^3.3.0", + "ts-jest": "^29.1.4", "ts-node": "^10.9.2", - "typescript": "^5.4.2", + "typescript": "^5.4.5", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" } }, @@ -940,9 +939,9 @@ } }, "node_modules/@google-cloud/pubsub": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.4.0.tgz", - "integrity": "sha512-1eiiAZUFhxcOqKPVwZarc3ghXuhoc3S7z5BgNrxqdirJ/MYr3IjQVTA7Lq2dAAsDuWms1LBN897rbnEGW9PpfA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.4.1.tgz", + "integrity": "sha512-OsNsadtM+/EhHijc8pIgf+GaqWIZIaizhq6p2mzK+lB7BRziV66ByMDO6EEtyqcdmqYh6MbQ39RZMEQocZsxPQ==", "dependencies": { "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^4.0.0", @@ -953,7 +952,7 @@ "arrify": "^2.0.0", "extend": "^3.0.2", "google-auth-library": "^9.3.0", - "google-gax": "^4.3.1", + "google-gax": "^4.3.3", "heap-js": "^2.2.0", "is-stream-ended": "^0.1.4", "lodash.snakecase": "^4.1.1", @@ -1704,9 +1703,9 @@ "link": true }, "node_modules/@nmshd/consumption": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.10.0.tgz", - "integrity": "sha512-GUg1fChKV5gVTEDvVNksza1IkVoD3orJrgb1FMf2qSNSNZ5kHUZQ97IrBNqq0SFXk9sJE8JaBrbHf5QHVaxD5w==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.11.0.tgz", + "integrity": "sha512-P2yyhbw45u2L7kENdvSiexBzsIyIbnI/p64SLXf9wU0LQqA6qi8tGdZJND/W/EPWsMyuJQ5JIErHxGs/ZE2niA==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@nmshd/iql": "^1.0.2", @@ -1714,9 +1713,9 @@ } }, "node_modules/@nmshd/content": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/@nmshd/content/-/content-2.9.0.tgz", - "integrity": "sha512-3AAr5JdOSDt2qfk8eFzh/AagnNbsPRiae+ZVzx/bPGrGmINsViE+5zG8B/IL3Mdkhi7Imlns+i4qhgKITVrF4w==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/@nmshd/content/-/content-2.10.1.tgz", + "integrity": "sha512-gguNMOD8tACwWTpb852J3JZQi+d9Wv/7Cj+IFqO0w1nafmIr6ikRaneT4rwoeLZ1fzHnbfknDrpS5DSO2yBfLQ==", "dependencies": { "@js-soft/logging-abstractions": "^1.0.1", "@nmshd/iql": "^1.0.2", @@ -1738,18 +1737,18 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.8.1.tgz", - "integrity": "sha512-Ws20jJVbHg5zEOpECAODqrELBFEEtS/7aADbB15QcXD/Uxr2j6Kz40Uccgs4a18P6K5/MNkzDHwrN/9HHfFEPg==", + "version": "4.10.6", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.10.6.tgz", + "integrity": "sha512-hnEeUIdGoQjiYTsiElY+AUM+ao6F5z/e7C/2Tf6VrYIxEmrGYOj8GNJhxxbXmwHLbEuvAOiQeKLgp0m8l7PxvA==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", "@js-soft/ts-serval": "2.0.10", "@js-soft/ts-utils": "^2.3.3", - "@nmshd/consumption": "3.10.0", - "@nmshd/content": "2.9.0", + "@nmshd/consumption": "3.11.0", + "@nmshd/content": "2.10.1", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.7.0", + "@nmshd/transport": "2.7.5", "ajv": "^8.13.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", @@ -1763,17 +1762,18 @@ } }, "node_modules/@nmshd/transport": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.7.0.tgz", - "integrity": "sha512-nsMcQO24PG+r/7cHzoNsQ4G1okMFRG36PD4sbEcGHocbOT395YgZVtNtuXD6WW+OaGKm/YGAY1iAvLfpuK3qzA==", + "version": "2.7.5", + "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.7.5.tgz", + "integrity": "sha512-xzp8rtyOtelvuvW2LRWd9Nkk0JomYFHcGLW/C/9xn3gjMmOyO3iYS/m9FL+2MifDpwKmmWzmkop+9V9EqpKSMQ==", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.4", "@js-soft/logging-abstractions": "^1.0.1", "@js-soft/simple-logger": "1.0.4", "@js-soft/ts-utils": "^2.3.3", - "axios": "^1.7.1", + "axios": "^1.7.2", "fast-json-patch": "^3.1.1", "form-data": "^4.0.0", + "https-proxy-agent": "^7.0.4", "json-stringify-safe": "^5.0.1", "lodash": "^4.17.21", "luxon": "^3.4.4", @@ -2729,9 +2729,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", - "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "version": "20.14.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz", + "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==", "dependencies": { "undici-types": "~5.26.4" } @@ -8441,9 +8441,9 @@ } }, "node_modules/mqtt": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.6.2.tgz", - "integrity": "sha512-bbmR8b4luc4UedbteHJ5Idc5zngJglVyogrJcE2buu+5Iipk5e3du3doBr+HCqKJt/OfuLQ9v0SfVgs6zOGZlg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz", + "integrity": "sha512-/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -8833,9 +8833,9 @@ "dev": true }, "node_modules/nodemon": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.0.tgz", - "integrity": "sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.2.tgz", + "integrity": "sha512-/Ib/kloefDy+N0iRTxIUzyGcdW9lzlnca2Jsa5w73bs3npXjg+WInmiX6VY13mIb6SykkthYX/U5t0ukryGqBw==", "dev": true, "dependencies": { "chokidar": "^3.5.2", @@ -9748,9 +9748,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", + "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -11482,9 +11482,9 @@ "integrity": "sha512-gHzs6CYQjgm0rpnFJGsjvWLua6znq+nipi89RDcu0a8R8JPXuVQrybVRBoOFmZ8mVTo9uPJDWgEYqnJRl4dHCQ==" }, "node_modules/swagger-ui-express": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-5.0.0.tgz", - "integrity": "sha512-tsU9tODVvhyfkNSvf03E6FAk+z+5cU3lXAzMy6Pv4av2Gt2xA0++fogwC4qo19XuFf6hdxevPuVCSKFuMHJhFA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-5.0.1.tgz", + "integrity": "sha512-SrNU3RiBGTLLmFU8GIJdOdanJTl4TOmT27tt3bWWHppqYmAZ6IDuEuBvMU6nZq0zLEe6b/1rACXCgLZqO6ZfrA==", "dependencies": { "swagger-ui-dist": ">=5.0.0" }, @@ -11846,9 +11846,9 @@ } }, "node_modules/ts-jest": { - "version": "29.1.3", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.3.tgz", - "integrity": "sha512-6L9qz3ginTd1NKhOxmkP0qU3FyKjj5CPoY+anszfVn6Pmv/RIKzhiMCsH7Yb7UvJR9I2A64rm4zQl531s2F1iw==", + "version": "29.1.4", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.4.tgz", + "integrity": "sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==", "dev": true, "dependencies": { "bs-logger": "0.x", diff --git a/package.json b/package.json index 6dff5675..56b1a92f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/connector", - "version": "3.11.2", + "version": "3.11.3", "private": true, "description": "The Enmeshed Connector", "homepage": "https://enmeshed.eu/integrate", @@ -65,31 +65,30 @@ } }, "dependencies": { - "@google-cloud/pubsub": "4.4.0", - "@js-soft/docdb-access-loki": "^1.0.6", + "@google-cloud/pubsub": "4.4.1", + "@js-soft/docdb-access-loki": "^1.1.0", "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.8.1", + "@nmshd/runtime": "4.10.6", "agentkeepalive": "4.5.0", - "amqplib": "^0.10.3", - "axios": "^1.6.8", + "amqplib": "^0.10.4", + "axios": "^1.7.2", "compression": "1.7.4", "cors": "2.8.5", "express": "4.19.2", "helmet": "7.1.0", - "https-proxy-agent": "^7.0.4", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.6.2", + "mqtt": "^5.7.0", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", "rapidoc": "9.3.4", - "redis": "^4.6.13", + "redis": "^4.6.14", "reflect-metadata": "0.2.2", - "swagger-ui-express": "5.0.0", + "swagger-ui-express": "5.0.1", "typescript-ioc": "3.2.2", "typescript-rest": "3.0.4", "typescript-rest-ioc": "1.0.1", @@ -107,10 +106,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.0", + "@types/lodash": "^4.17.4", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.11.28", + "@types/node": "^20.14.0", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -120,12 +119,12 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.0", + "nodemon": "^3.1.2", "npm-run-all": "^4.1.5", - "prettier": "^3.2.5", - "ts-jest": "^29.1.2", + "prettier": "^3.3.0", + "ts-jest": "^29.1.4", "ts-node": "^10.9.2", - "typescript": "^5.4.2", + "typescript": "^5.4.5", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" }, "overrides": { diff --git a/src/ConnectorRuntime.ts b/src/ConnectorRuntime.ts index a314e55f..873971fb 100644 --- a/src/ConnectorRuntime.ts +++ b/src/ConnectorRuntime.ts @@ -9,7 +9,6 @@ import { ConsumptionServices, DataViewExpander, GetIdentityInfoResponse, ModuleC import { AccountController, CoreErrors as TransportCoreErrors } from "@nmshd/transport"; import axios from "axios"; import fs from "fs"; -import { HttpsProxyAgent } from "https-proxy-agent"; import { validate as validateSchema } from "jsonschema"; import path from "path"; import { ConnectorMode } from "./ConnectorMode"; @@ -86,11 +85,6 @@ export class ConnectorRuntime extends Runtime { const loggerFactory = new NodeLoggerFactory(connectorConfig.logging); ConnectorLoggerFactory.init(loggerFactory); - if (process.env.https_proxy) { - const httpsProxy = process.env.https_proxy; - connectorConfig.transportLibrary.httpsAgent = new HttpsProxyAgent(httpsProxy); - } - const runtime = new ConnectorRuntime(connectorConfig, loggerFactory); await runtime.init(); From 6fa7a5ef63019db011fc7434cfb2f357c6c5e2fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 21:18:05 +0000 Subject: [PATCH 08/27] Chore(deps-dev): bump nodemon in the update-npm-dependencies group (#168) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75e18737..b7f92a99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.2", + "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", "prettier": "^3.3.0", "ts-jest": "^29.1.4", @@ -8833,9 +8833,9 @@ "dev": true }, "node_modules/nodemon": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.2.tgz", - "integrity": "sha512-/Ib/kloefDy+N0iRTxIUzyGcdW9lzlnca2Jsa5w73bs3npXjg+WInmiX6VY13mIb6SykkthYX/U5t0ukryGqBw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz", + "integrity": "sha512-m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w==", "dev": true, "dependencies": { "chokidar": "^3.5.2", diff --git a/package.json b/package.json index 56b1a92f..bf20fc65 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.2", + "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", "prettier": "^3.3.0", "ts-jest": "^29.1.4", From d3d0408e9028f3281d7d02675b75e66565b53a53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:58:24 +0200 Subject: [PATCH 09/27] Fix/use https_proxy for health checks (#169) * fix: use the http proxy for health checks * chore: version bump --- CHANGELOG.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- src/ConnectorRuntime.ts | 8 +++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceaaf70a..f5f4f068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.11.4 + +- health checks now use `https_proxy` if set + ## 3.11.3 - upgrade the runtime version to 4.10.6 diff --git a/package-lock.json b/package-lock.json index b7f92a99..004fce1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nmshd/connector", - "version": "3.11.3", + "version": "3.11.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nmshd/connector", - "version": "3.11.3", + "version": "3.11.4", "license": "MIT", "workspaces": [ ".", diff --git a/package.json b/package.json index bf20fc65..f5a68691 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/connector", - "version": "3.11.3", + "version": "3.11.4", "private": true, "description": "The Enmeshed Connector", "homepage": "https://enmeshed.eu/integrate", diff --git a/src/ConnectorRuntime.ts b/src/ConnectorRuntime.ts index 873971fb..510d6f85 100644 --- a/src/ConnectorRuntime.ts +++ b/src/ConnectorRuntime.ts @@ -9,6 +9,7 @@ import { ConsumptionServices, DataViewExpander, GetIdentityInfoResponse, ModuleC import { AccountController, CoreErrors as TransportCoreErrors } from "@nmshd/transport"; import axios from "axios"; import fs from "fs"; +import { HttpsProxyAgent } from "https-proxy-agent"; import { validate as validateSchema } from "jsonschema"; import path from "path"; import { ConnectorMode } from "./ConnectorMode"; @@ -156,6 +157,7 @@ export class ConnectorRuntime extends Runtime { dataViewExpander: this._dataViewExpander } = await this.login(this.accountController, consumptionController)); + const httpsProxy = process.env.https_proxy ?? process.env.HTTPS_PROXY; this.healthChecker = HealthChecker.create( this.runtimeConfig.database.driver === "lokijs" ? undefined @@ -166,7 +168,11 @@ export class ConnectorRuntime extends Runtime { waitQueueTimeoutMS: 1000, serverSelectionTimeoutMS: 1000 }), - axios.create({ baseURL: this.transport.config.baseUrl }), + axios.create({ + baseURL: this.transport.config.baseUrl, + proxy: false, + httpsAgent: httpsProxy ? new HttpsProxyAgent(httpsProxy) : undefined + }), this.accountController.authenticator, this.loggerFactory.getLogger("HealthChecker") ); From 074abcfe1388d30a0683a4d55ad720327630e919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:47:34 +0200 Subject: [PATCH 10/27] Release using GitHub releases (#170) * ci: add special dependabot config for the runtime * feat: make sure the PR is labeled * chore: add gh configs * chore: remove versions from package jsons * ci: set versions during build * chore: add nvmrc * chore: discontinue CHANGELOG.md * chore: remove the version check * ci: check for versions * fix: update packages / make build working again * chore: propagate change to lockfile * chore: remove workaround --- .ci/buildAndPush.sh | 17 +++--- .ci/publishHelmChart.sh | 9 ++- .ci/publishNpm.sh | 6 ++ .ci/testBuildingProductiveDockerImage.sh | 4 +- .ci/writeBuildInformation.sh | 8 +-- .github/PULL_REQUEST_TEMPLATE.md | 5 ++ .github/dependabot.yml | 16 ++++++ .github/release.yml | 21 +++++++ .github/workflows/check-pr.yml | 17 ++++++ .github/workflows/publish.yml | 6 +- .github/workflows/version-check.yml | 39 ------------- .nvmrc | 1 + CHANGELOG.md | 4 ++ Dockerfile | 2 +- package-lock.json | 72 ++++++++++++------------ package.json | 7 +-- packages/sdk/package.json | 9 ++- 17 files changed, 140 insertions(+), 103 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/release.yml create mode 100644 .github/workflows/check-pr.yml delete mode 100644 .github/workflows/version-check.yml create mode 100644 .nvmrc diff --git a/.ci/buildAndPush.sh b/.ci/buildAndPush.sh index e28c15e1..0cb79870 100755 --- a/.ci/buildAndPush.sh +++ b/.ci/buildAndPush.sh @@ -6,9 +6,12 @@ if [ -z "$(which jq)" ]; then exit 1 fi -PACKAGE_VERSION=$(jq .version -r package.json) +if [ -z "$VERSION" ]; then + echo "The environment variable 'VERSION' must be set." + exit 1 +fi -case "$PACKAGE_VERSION" in +case "$VERSION" in *-alpha*) BASE_TAG=alpha ;; *-beta*) BASE_TAG=beta ;; *-rc*) BASE_TAG=rc ;; @@ -21,13 +24,13 @@ REPO="ghcr.io/nmshd/connector" TAGS="-t $REPO:$BUILD_NUMBER -t $REPO:$COMMIT_HASH" -OUTPUT="$(DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $REPO:${PACKAGE_VERSION} 2>&1)" || true +OUTPUT="$(DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $REPO:${VERSION} 2>&1)" || true if [[ $OUTPUT =~ (no such manifest: ghcr.io/nmshd/connector:) ]] || [[ $OUTPUT == "manifest unknown" ]]; then # manifest not found -> push - echo "pushing tag '${BASE_TAG}' and '${PACKAGE_VERSION}'" + echo "pushing tag '${BASE_TAG}' and '${VERSION}'" - TAGS="$TAGS -t $REPO:$BASE_TAG -t $REPO:$PACKAGE_VERSION" + TAGS="$TAGS -t $REPO:$BASE_TAG -t $REPO:$VERSION" elif [[ $OUTPUT =~ (\{) ]]; then # manifest found -> ignore - echo "image '$PACKAGE_VERSION' already exists" + echo "image '$VERSION' already exists" else # other error echo $OUTPUT fi @@ -37,4 +40,4 @@ docker buildx build --push --provenance=true --sbom=true \ $TAGS \ --build-arg COMMIT_HASH=$COMMIT_HASH \ --build-arg BUILD_NUMBER=$BUILD_NUMBER \ - --build-arg PACKAGE_VERSION=$PACKAGE_VERSION . + --build-arg VERSION=$VERSION . diff --git a/.ci/publishHelmChart.sh b/.ci/publishHelmChart.sh index 12e331d6..83074308 100644 --- a/.ci/publishHelmChart.sh +++ b/.ci/publishHelmChart.sh @@ -1,8 +1,11 @@ -PACKAGE_VERSION=$(jq .version -r package.json) +if [ -z "$VERSION" ]; then + echo "The environment variable 'VERSION' must be set." + exit 1 +fi -helm package --app-version $PACKAGE_VERSION --version $PACKAGE_VERSION ./helmChart +helm package --app-version $VERSION --version $VERSION ./helmChart -HELM_PATH="./connector-helm-chart-$PACKAGE_VERSION.tgz" +HELM_PATH="./connector-helm-chart-$VERSION.tgz" REGISTRY="oci://ghcr.io/nmshd" echo "deploying '$HELM_PATH' to oci REGISTRY '$REGISTRY'" diff --git a/.ci/publishNpm.sh b/.ci/publishNpm.sh index 321b3b00..da9285ac 100755 --- a/.ci/publishNpm.sh +++ b/.ci/publishNpm.sh @@ -1,5 +1,11 @@ set -e set -x +if [ -z "$VERSION" ]; then + echo "The environment variable 'VERSION' must be set." + exit 1 +fi + cd packages/sdk +npm version $VERSION npx enhanced-publish --if-possible --use-preid-as-tag diff --git a/.ci/testBuildingProductiveDockerImage.sh b/.ci/testBuildingProductiveDockerImage.sh index c0a05728..f5a65b1b 100755 --- a/.ci/testBuildingProductiveDockerImage.sh +++ b/.ci/testBuildingProductiveDockerImage.sh @@ -1,9 +1,9 @@ COMMIT_HASH=c BUILD_NUMBER=b -PACKAGE_VERSION=p +VERSION=v docker build --no-cache --progress=plain \ --tag ghcr.io/nmshd/connector:prod \ --build-arg COMMIT_HASH=$COMMIT_HASH \ --build-arg BUILD_NUMBER=$BUILD_NUMBER \ - --build-arg PACKAGE_VERSION=$PACKAGE_VERSION . + --build-arg VERSION=$VERSION . diff --git a/.ci/writeBuildInformation.sh b/.ci/writeBuildInformation.sh index 667aa4b4..a7aaeab1 100755 --- a/.ci/writeBuildInformation.sh +++ b/.ci/writeBuildInformation.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -e -if [ -z "$PACKAGE_VERSION" ]; then - echo "The environment variable 'PACKAGE_VERSION' must be set." +if [ -z "$VERSION" ]; then + echo "The environment variable 'VERSION' must be set." exit 1 fi @@ -21,12 +21,12 @@ DATE=$(date -u --iso-8601=seconds) TARGET_FILE="./dist/buildInformation.js" echo "Writing the following properties into $TARGET_FILE" -echo " - VERSION: $PACKAGE_VERSION" +echo " - VERSION: $VERSION" echo " - BUILD_NUMBER: $BUILD_NUMBER" echo " - COMMIT_HASH: $COMMIT_HASH" echo " - DATE: $DATE" -sed -i "s/{{version}}/$PACKAGE_VERSION/" $TARGET_FILE +sed -i "s/{{version}}/$VERSION/" $TARGET_FILE sed -i "s/{{build}}/$BUILD_NUMBER/" $TARGET_FILE sed -i "s/{{commit}}/$COMMIT_HASH/" $TARGET_FILE sed -i "s/{{date}}/$DATE/" $TARGET_FILE diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..3c3d0625 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +# Readiness checklist + +- [ ] I added/updated tests. +- [ ] I ensured that the PR title is good enough for the changelog. +- [ ] I labeled the PR. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b29956fc..4e263c13 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,12 +24,28 @@ updates: update-npm-dependencies: patterns: - "*" + exclude-patterns: + - "@nmshd/runtime" reviewers: - "jkoenig134" - "sebbi08" labels: - "dependencies" + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" + groups: + update-npm-dependencies: + patterns: + - "@nmshd/runtime" + reviewers: + - "jkoenig134" + - "sebbi08" + labels: + - "runtime-upgrade" + ##### Docker ##### - package-ecosystem: "docker" directories: diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..716bb75d --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,21 @@ +changelog: + exclude: + labels: + - ci + - chore + - dependencies + - refactor + - test + categories: + - title: Breaking Changes + labels: + - breaking-change + - title: New Features + labels: + - enhancement + - title: Bug Fixes + labels: + - bug + - title: Other Changes + labels: + - "*" diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml new file mode 100644 index 00000000..b37aa7de --- /dev/null +++ b/.github/workflows/check-pr.yml @@ -0,0 +1,17 @@ +name: Check Pull Request + +on: + pull_request: + types: [opened, labeled, unlabeled, synchronize] + +jobs: + validate-pr-label: + name: Validate the Pull Request's labels + runs-on: ubuntu-latest + steps: + - name: PR must be labeled + uses: jesusvasquez333/verify-pr-label-action@v1.4.0 + with: + disable-reviews: true + github-token: "${{ secrets.GITHUB_TOKEN }}" + valid-labels: "breaking-change, bug, chore, ci, dependencies, documentation, enhancement, refactoring, test" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d8372503..208bb9b9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish on: push: - branches: [main, release/**] + tags: "*" jobs: run-checks: @@ -27,6 +27,7 @@ jobs: - run: bash .ci/publishNpm.sh env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + VERSION: ${{ github.ref_name }} needs: ["run-checks"] publish-docker: @@ -50,6 +51,7 @@ jobs: env: BUILD_NUMBER: ${{ github.run_number }} COMMIT_HASH: ${{ github.sha }} + VERSION: ${{ github.ref_name }} needs: ["run-checks"] publish-helm: @@ -65,4 +67,6 @@ jobs: USER: ${{ github.actor }} PASSWORD: ${{ secrets.GITHUB_TOKEN }} - run: bash .ci/publishHelmChart.sh + env: + VERSION: ${{ github.ref_name }} needs: ["publish-docker"] diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml deleted file mode 100644 index 846b2faf..00000000 --- a/.github/workflows/version-check.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Version Check - -on: - pull_request: - branches: [main, release/**] - types: [synchronize, opened, reopened, edited] - -jobs: - version_check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: sudo apt-get update && sudo apt-get install jq -y - - name: Ensure valid package version - run: | - BASE_REF=${{ github.base_ref }} - - if [[ $BASE_REF =~ ^release/.*$ ]]; then - echo "Skipping version check when merging into a release/** branch" - exit 0 - fi - - HEAD_REF=${{ github.head_ref }} - - # allow the merging from release branches - # the version in package.json is updated after merging into main; therefore we need to be able to merge a -alpha/-beta/-rc version in that specific case - if [[ $HEAD_REF =~ ^release/.*$ ]]; then - echo "Skipping version check for release branch" - exit 0 - fi - - VERSION=$(jq .version package.json -cr) - - case "$VERSION" in - *-alpha*) echo "The package.json defines an alpha-version ($VERSION) for this package. You cannot merge alpha-versions from this branch." && exit 1 ;; - *-beta*) echo "The package.json defines an beta-version ($VERSION) for this package. You cannot merge beta-versions from this branch." && exit 1 ;; - *-rc*) echo "The package.json defines an rc-version ($VERSION) for this package. You cannot merge rc-versions from this branch." && exit 1 ;; - *) exit 0 ;; - esac diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..64f5a0a6 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +node diff --git a/CHANGELOG.md b/CHANGELOG.md index f5f4f068..0a377b6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Discontinued + +This changelog is discontinued in favor of the [GitHub Releases](https://github.com/nmshd/connector/releases) + ## 3.11.4 - health checks now use `https_proxy` if set diff --git a/Dockerfile b/Dockerfile index e9b5b0cd..00d88028 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:22.2.0 as builder ARG COMMIT_HASH ARG BUILD_NUMBER -ARG PACKAGE_VERSION +ARG VERSION WORKDIR /usr/app COPY package.json package-lock.json tsconfig.json ./ diff --git a/package-lock.json b/package-lock.json index 004fce1d..2617c48b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,6 @@ "packages": { "": { "name": "@nmshd/connector", - "version": "3.11.4", "license": "MIT", "workspaces": [ ".", @@ -57,7 +56,7 @@ "@types/lodash": "^4.17.4", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.0", + "@types/node": "^20.14.2", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -69,11 +68,11 @@ "lodash": "^4.17.21", "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", - "prettier": "^3.3.0", + "prettier": "^3.3.1", "ts-jest": "^29.1.4", "ts-node": "^10.9.2", "typescript": "^5.4.5", - "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" + "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" } }, "node_modules/@acuminous/bitsyntax": { @@ -2729,9 +2728,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz", - "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==", + "version": "20.14.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", + "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", "dependencies": { "undici-types": "~5.26.4" } @@ -9748,9 +9747,9 @@ } }, "node_modules/prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", - "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", + "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -11892,28 +11891,6 @@ } } }, - "node_modules/ts-json-schema-generator": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.2.0.tgz", - "integrity": "sha512-Fo9pcSb6PIvCSapoJR4VJlcCFC67d7yBWqbctNU6ShfXSMHItkjiLl3e9KGA1bu2S3jVYOFjUdPfWtfRdnMorA==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.15", - "commander": "^12.0.0", - "glob": "^10.3.12", - "json5": "^2.2.3", - "normalize-path": "^3.0.0", - "safe-stable-stringify": "^2.4.3", - "tslib": "^2.6.2", - "typescript": "^5.4.5" - }, - "bin": { - "ts-json-schema-generator": "bin/ts-json-schema-generator.js" - }, - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/ts-mixer": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz", @@ -12920,17 +12897,38 @@ }, "packages/sdk": { "name": "@nmshd/connector-sdk", - "version": "4.3.0", "license": "MIT", "dependencies": { - "axios": "^1.6.7", + "axios": "^1.7.2", "form-data": "^4.0.0", - "qs": "^6.11.2" + "qs": "^6.12.1" }, "devDependencies": { "@types/form-data": "^2.5.0", - "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^2.2.0" + "@types/qs": "^6.9.15", + "ts-json-schema-generator": "^2.3.0" + } + }, + "packages/sdk/node_modules/ts-json-schema-generator": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.3.0.tgz", + "integrity": "sha512-t4lBQAwZc0sOJq9LJt3NgbznIcslVnm0JeEMFq8qIRklpMRY8jlYD0YmnRWbqBKANxkby91P1XanSSlSOFpUmg==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.15", + "commander": "^12.0.0", + "glob": "^10.3.12", + "json5": "^2.2.3", + "normalize-path": "^3.0.0", + "safe-stable-stringify": "^2.4.3", + "tslib": "^2.6.2", + "typescript": "^5.4.5" + }, + "bin": { + "ts-json-schema-generator": "bin/ts-json-schema-generator.js" + }, + "engines": { + "node": ">=18.0.0" } } } diff --git a/package.json b/package.json index f5a68691..0e7af52d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "@nmshd/connector", - "version": "3.11.4", "private": true, "description": "The Enmeshed Connector", "homepage": "https://enmeshed.eu/integrate", @@ -109,7 +108,7 @@ "@types/lodash": "^4.17.4", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.0", + "@types/node": "^20.14.2", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -121,11 +120,11 @@ "lodash": "^4.17.21", "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", - "prettier": "^3.3.0", + "prettier": "^3.3.1", "ts-jest": "^29.1.4", "ts-node": "^10.9.2", "typescript": "^5.4.5", - "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" + "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" }, "overrides": { "typescript-rest": { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 55ff92c0..ff9c4110 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,5 @@ { "name": "@nmshd/connector-sdk", - "version": "4.3.0", "description": "the enmeshed connector sdk", "keywords": [ "enmeshed", @@ -31,14 +30,14 @@ "build:schemas:watch": "npx nodemon -e ts -w 'src/types' --exec 'npm run build:schemas'" }, "dependencies": { - "axios": "^1.6.7", + "axios": "^1.7.2", "form-data": "^4.0.0", - "qs": "^6.11.2" + "qs": "^6.12.1" }, "devDependencies": { "@types/form-data": "^2.5.0", - "@types/qs": "^6.9.11", - "ts-json-schema-generator": "^2.2.0" + "@types/qs": "^6.9.15", + "ts-json-schema-generator": "^2.3.0" }, "publishConfig": { "access": "public", From 6dd9f857fd8034b74bb12ed45ef1f371e4c4598b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:00:53 +0200 Subject: [PATCH 11/27] Update dependabot.yml (#171) --- .github/dependabot.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4e263c13..62c85cfe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,7 +17,9 @@ updates: ##### npm ##### - package-ecosystem: "npm" - directory: "/" + directories: + - "/" + - "/packages/sdk" schedule: interval: "weekly" groups: From 2ba5526b7f0139d5fca3b170ffaf06f3667b18c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Wed, 5 Jun 2024 16:30:23 +0200 Subject: [PATCH 12/27] update dependabot.yml (#172) --- .github/dependabot.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 62c85cfe..87ef95cb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,20 +34,6 @@ updates: labels: - "dependencies" - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "weekly" - groups: - update-npm-dependencies: - patterns: - - "@nmshd/runtime" - reviewers: - - "jkoenig134" - - "sebbi08" - labels: - - "runtime-upgrade" - ##### Docker ##### - package-ecosystem: "docker" directories: From 528d7eee5f0cf2442f36879dc2badd590cf6e653 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:34:39 +0000 Subject: [PATCH 13/27] Chore(deps): bump @nmshd/runtime from 4.10.6 to 4.11.0 (#178) --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2617c48b..40c45667 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.10.6", + "@nmshd/runtime": "4.11.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", "axios": "^1.7.2", @@ -1736,9 +1736,9 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.10.6", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.10.6.tgz", - "integrity": "sha512-hnEeUIdGoQjiYTsiElY+AUM+ao6F5z/e7C/2Tf6VrYIxEmrGYOj8GNJhxxbXmwHLbEuvAOiQeKLgp0m8l7PxvA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.11.0.tgz", + "integrity": "sha512-y7EMOuh16kZewF6dlIAEARHNKjlaJ25LRIuilJ5hxrZd+Ta3FO8qWThZduWBQqoa5uI23NlXdhkvWKmGGKe5oA==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", @@ -1747,8 +1747,8 @@ "@nmshd/consumption": "3.11.0", "@nmshd/content": "2.10.1", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.7.5", - "ajv": "^8.13.0", + "@nmshd/transport": "2.8.0", + "ajv": "^8.16.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", "json-stringify-safe": "^5.0.1", @@ -1761,9 +1761,9 @@ } }, "node_modules/@nmshd/transport": { - "version": "2.7.5", - "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.7.5.tgz", - "integrity": "sha512-xzp8rtyOtelvuvW2LRWd9Nkk0JomYFHcGLW/C/9xn3gjMmOyO3iYS/m9FL+2MifDpwKmmWzmkop+9V9EqpKSMQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.8.0.tgz", + "integrity": "sha512-wLA56y8yQZEEI+4bbo9oAS61zl3LOLTfBBqDRAm3Asq48zNmWWQXIoI9mnaVrkwW/VZIIvqoThQVI9XFWgVMTQ==", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.4", "@js-soft/logging-abstractions": "^1.0.1", @@ -3169,9 +3169,9 @@ } }, "node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", + "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", "dependencies": { "fast-deep-equal": "^3.1.3", "json-schema-traverse": "^1.0.0", diff --git a/package.json b/package.json index 0e7af52d..3c61128e 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.10.6", + "@nmshd/runtime": "4.11.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", "axios": "^1.7.2", From 11ddd70ac7e2711fb300c3bdc949080c36933298 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 22:20:32 +0000 Subject: [PATCH 14/27] Chore(deps): bump @grpc/grpc-js (#179) --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40c45667..7f462753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -962,9 +962,9 @@ } }, "node_modules/@grpc/grpc-js": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.8.tgz", - "integrity": "sha512-vYVqYzHicDqyKB+NQhAc54I1QWCBLCrYG6unqOIcBTHx+7x8C9lcoLj3KVJXs2VB4lUbpWY+Kk9NipcbXYWmvg==", + "version": "1.10.9", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.9.tgz", + "integrity": "sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==", "dependencies": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" From 9ced27872bc3e0e440b9aa201892b81d3409c911 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 07:46:20 +0200 Subject: [PATCH 15/27] Chore(deps)/ bump ws in the npm_and_yarn group across 1 directory (#187) Bumps the npm_and_yarn group with 1 update in the / directory: [ws](https://github.com/websockets/ws). Updates `ws` from 8.17.0 to 8.17.1 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.17.0...8.17.1) --- updated-dependencies: - dependency-name: ws dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f462753..666c2c36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12721,9 +12721,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", - "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, From fb01fb12c0cb6f1c92f6fb2d1c399a891ed70ffe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 07:51:19 +0200 Subject: [PATCH 16/27] Chore(deps): bump the update-docker-dependencies group across 2 directories with 1 update (#186) Bumps the update-docker-dependencies group with 1 update in the / directory: node. Bumps the update-docker-dependencies group with 1 update in the /.dev directory: node. Updates `node` from 22.2.0-alpine to 22.3.0-alpine Updates `node` from 22.2.0 to 22.3.0 --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-minor dependency-group: update-docker-dependencies - dependency-name: node dependency-type: direct:production update-type: version-update:semver-minor dependency-group: update-docker-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .dev/Dockerfile.debug | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev/Dockerfile.debug b/.dev/Dockerfile.debug index cf1f9584..ce119c99 100644 --- a/.dev/Dockerfile.debug +++ b/.dev/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM node:22.2.0 +FROM node:22.3.0 WORKDIR /usr/app # Webserver, Debugger diff --git a/Dockerfile b/Dockerfile index 00d88028..9e8e3078 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.2.0 as builder +FROM node:22.3.0 as builder ARG COMMIT_HASH ARG BUILD_NUMBER ARG VERSION @@ -13,7 +13,7 @@ COPY src src RUN npm run build RUN .ci/writeBuildInformation.sh -FROM node:22.2.0-alpine +FROM node:22.3.0-alpine ENV NODE_CONFIG_ENV=prod RUN apk add --no-cache tini RUN apk add libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/node && apk del libcap From b922ac7ca7c0877efcfd287cf0fc96b8ec1e9c92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 09:23:35 +0000 Subject: [PATCH 17/27] Chore(deps): bump the update-npm-dependencies group across 1 directory with 6 updates (#190) --- package-lock.json | 50 +++++++++++++++++++++++------------------------ package.json | 12 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 666c2c36..fccb25d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "packages/sdk" ], "dependencies": { - "@google-cloud/pubsub": "4.4.1", + "@google-cloud/pubsub": "4.5.0", "@js-soft/docdb-access-loki": "^1.1.0", "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", @@ -28,7 +28,7 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.0", + "mqtt": "^5.7.1", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -53,10 +53,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.4", + "@types/lodash": "^4.17.5", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.2", + "@types/node": "^20.14.5", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -68,8 +68,8 @@ "lodash": "^4.17.21", "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", - "prettier": "^3.3.1", - "ts-jest": "^29.1.4", + "prettier": "^3.3.2", + "ts-jest": "^29.1.5", "ts-node": "^10.9.2", "typescript": "^5.4.5", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" @@ -938,15 +938,15 @@ } }, "node_modules/@google-cloud/pubsub": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.4.1.tgz", - "integrity": "sha512-OsNsadtM+/EhHijc8pIgf+GaqWIZIaizhq6p2mzK+lB7BRziV66ByMDO6EEtyqcdmqYh6MbQ39RZMEQocZsxPQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-4.5.0.tgz", + "integrity": "sha512-ptRLLDrAp1rStD1n3ZrG8FdAfpccqI6M5rCaceF6PL7DU3hqJbvQ2Y91G8MKG7c7zK+jiWv655Qf5r2IvjTzwA==", "dependencies": { "@google-cloud/paginator": "^5.0.0", "@google-cloud/precise-date": "^4.0.0", "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", - "@opentelemetry/api": "^1.6.0", + "@opentelemetry/api": "~1.8.0", "@opentelemetry/semantic-conventions": "~1.21.0", "arrify": "^2.0.0", "extend": "^3.0.2", @@ -2687,9 +2687,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", "dev": true }, "node_modules/@types/lokijs": { @@ -2728,9 +2728,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", - "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", + "version": "20.14.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.5.tgz", + "integrity": "sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==", "dependencies": { "undici-types": "~5.26.4" } @@ -8440,9 +8440,9 @@ } }, "node_modules/mqtt": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz", - "integrity": "sha512-/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.1.tgz", + "integrity": "sha512-6Gf5NH9/WxwGKkkXTyTI1lsM7S3s3zqSJe61Qp5w3B45BAOkOjM8p1GwNvgLE28+WO4d9OwrJzV8DWOMtWfy6w==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -9747,9 +9747,9 @@ } }, "node_modules/prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", - "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -11845,9 +11845,9 @@ } }, "node_modules/ts-jest": { - "version": "29.1.4", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.4.tgz", - "integrity": "sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==", + "version": "29.1.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.5.tgz", + "integrity": "sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==", "dev": true, "dependencies": { "bs-logger": "0.x", diff --git a/package.json b/package.json index 3c61128e..8b235a9c 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ } }, "dependencies": { - "@google-cloud/pubsub": "4.4.1", + "@google-cloud/pubsub": "4.5.0", "@js-soft/docdb-access-loki": "^1.1.0", "@js-soft/docdb-access-mongo": "1.1.8", "@js-soft/node-logger": "1.1.1", @@ -80,7 +80,7 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.0", + "mqtt": "^5.7.1", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -105,10 +105,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.4", + "@types/lodash": "^4.17.5", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.2", + "@types/node": "^20.14.5", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -120,8 +120,8 @@ "lodash": "^4.17.21", "nodemon": "^3.1.3", "npm-run-all": "^4.1.5", - "prettier": "^3.3.1", - "ts-jest": "^29.1.4", + "prettier": "^3.3.2", + "ts-jest": "^29.1.5", "ts-node": "^10.9.2", "typescript": "^5.4.5", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" From f248a39ea6954991761583f171e6fda4bf3a6add Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Thu, 20 Jun 2024 12:31:51 +0200 Subject: [PATCH 18/27] Fix/network errors were treated as application errors (#192) --- .gitignore | 3 ++ .../middlewares/genericErrorHandler.ts | 36 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 39ed1c8b..31d1e5f9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ local.config.json .gitmodules packages/runtime !packages/runtime/* +.env +.local +test/manualTest.ts diff --git a/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts b/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts index a276acd7..9210b1a0 100644 --- a/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts +++ b/src/infrastructure/httpServer/middlewares/genericErrorHandler.ts @@ -54,24 +54,6 @@ export function genericErrorHandler(connectorMode: ConnectorMode) { return; } - if (error instanceof ApplicationError) { - logger.debug(`Handling ${ApplicationError.name}...`); - - const payload = Envelope.error(new HttpError(error.code, error.message, error.stack?.split("\n")), connectorMode); - - let statusCode; - if (error.equals(RuntimeErrors.general.recordNotFound()) || error.equals(TransportCoreErrors.general.recordNotFound("", ""))) { - statusCode = 404; - } else if (error.code.startsWith("error.platform.")) { - statusCode = 500; - } else { - statusCode = 400; - } - - res.status(statusCode).json(payload); - return; - } - const stacktrace = stackTraceFromError(error); let details: string; @@ -95,6 +77,24 @@ export function genericErrorHandler(connectorMode: ConnectorMode) { return; } + if (error instanceof ApplicationError) { + logger.debug(`Handling ${ApplicationError.name}...`); + + const payload = Envelope.error(new HttpError(error.code, error.message, error.stack?.split("\n")), connectorMode); + + let statusCode; + if (error.equals(RuntimeErrors.general.recordNotFound()) || error.equals(TransportCoreErrors.general.recordNotFound("", ""))) { + statusCode = 404; + } else if (error.code.startsWith("error.platform.")) { + statusCode = 500; + } else { + statusCode = 400; + } + + res.status(statusCode).json(payload); + return; + } + // Unknown => 500 const httpError = new HttpError("error.connector.unexpected", "An unexpected error occurred.", stacktrace, details); From 746dc3d6fa7dddf224053a8da0fef5a3248474da Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Fri, 21 Jun 2024 11:50:36 +0200 Subject: [PATCH 19/27] Chore/Fix vurnability (#193) * chore: fix vurnability * chore: fix dependency * chore: fix unwanted change --- package-lock.json | 1084 ++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 588 insertions(+), 498 deletions(-) diff --git a/package-lock.json b/package-lock.json index fccb25d5..1e03d7ac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,5 @@ { "name": "@nmshd/connector", - "version": "3.11.4", "lockfileVersion": 3, "requires": true, "packages": { @@ -71,8 +70,8 @@ "prettier": "^3.3.2", "ts-jest": "^29.1.5", "ts-node": "^10.9.2", - "typescript": "^5.4.5", - "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" + "typescript": "5.4.5", + "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" } }, "node_modules/@acuminous/bitsyntax": { @@ -154,12 +153,12 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" }, "engines": { @@ -167,30 +166,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", - "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.5.tgz", - "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.24.5", - "@babel/helpers": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -215,12 +214,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.5.tgz", - "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", "dev": true, "dependencies": { - "@babel/types": "^7.24.5", + "@babel/types": "^7.24.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -230,13 +229,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-validator-option": "^7.23.5", + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -255,62 +254,66 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", "dev": true, "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", - "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dev": true, "dependencies": { - "@babel/types": "^7.24.0" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz", - "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.24.3", - "@babel/helper-simple-access": "^7.24.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/helper-validator-identifier": "^7.24.5" + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -320,86 +323,86 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz", - "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", + "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz", - "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dev": true, "dependencies": { - "@babel/types": "^7.24.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", "dev": true, "dependencies": { - "@babel/types": "^7.24.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", - "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.5.tgz", - "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", "dev": true, "dependencies": { - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.5.tgz", - "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -480,9 +483,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.5.tgz", - "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -552,12 +555,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", - "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", + "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -654,12 +657,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz", - "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz", + "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -669,9 +672,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.5.tgz", - "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz", + "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -680,9 +683,9 @@ } }, "node_modules/@babel/runtime-corejs3": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.24.5.tgz", - "integrity": "sha512-GWO0mgzNMLWaSYM4z4NVIuY0Cd1fl8cPnuetuddu5w/qGuvt5Y7oUi/kvvQGK9xgOkFJDQX2heIvTRn/OQ1XTg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.24.7.tgz", + "integrity": "sha512-eytSX6JLBY6PVAeQa2bFlDx/7Mmln/gaEpsit5a3WEvjGfiIytEsgAwuIXCPM0xvw0v0cJn3ilq0/TvXrW0kgA==", "dependencies": { "core-js-pure": "^3.30.2", "regenerator-runtime": "^0.14.0" @@ -692,33 +695,33 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.5.tgz", - "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/types": "^7.24.5", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -736,13 +739,13 @@ } }, "node_modules/@babel/types": { - "version": "7.24.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.5.tgz", - "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.24.1", - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -793,9 +796,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz", + "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -902,9 +905,9 @@ "dev": true }, "node_modules/@google-cloud/paginator": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.0.tgz", - "integrity": "sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz", + "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==", "dependencies": { "arrify": "^2.0.0", "extend": "^3.0.2" @@ -994,6 +997,7 @@ "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "deprecated": "Use @eslint/config-array instead", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", @@ -1043,6 +1047,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", "dev": true }, "node_modules/@isaacs/cliui": { @@ -1368,6 +1373,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -1977,12 +1983,12 @@ } }, "node_modules/@swagger-api/apidom-ast": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-alpha.3.tgz", - "integrity": "sha512-C2gPpPlfHXoOyFndgKWGrfUbtyv9fUIuRuUiWJ3X5JIt0cN7/6I+DqGKrolQrA4W3JwPxbtl5N0LixTEwFJRsg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-alpha.5.tgz", + "integrity": "sha512-ZH3xryzmwd8OvUdOJH4ujNAyQMXN6NCrRT0HGR8z9TnA0nFPFoOAswq7317mCn77VJmViu/tpCuvmRS0a9BROg==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -1990,13 +1996,13 @@ } }, "node_modules/@swagger-api/apidom-core": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-1.0.0-alpha.3.tgz", - "integrity": "sha512-kvACv+NXgMKp5oNdq5RVo7+1b2GVUSnOKRU+SafjnfUHqHgeQw5Fyf+W6iELIdmx0ZzTlQvPRyOLKC15e+rTBg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-core/-/apidom-core-1.0.0-alpha.5.tgz", + "integrity": "sha512-iArtPxwcQ/EpQU/VqwBDrD+F0lngyUyLVCa8zR4gT+7mP6fpiU7jcerizw0hDpFmvieXddx5UdfO28Pxuq204g==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", + "@swagger-api/apidom-ast": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "minim": "~0.23.8", "ramda": "~0.30.0", @@ -2006,36 +2012,36 @@ } }, "node_modules/@swagger-api/apidom-error": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-1.0.0-alpha.1.tgz", - "integrity": "sha512-AyaQQjpjBHPMQeVT1n5R92NRNEbTbbUGZYf1nEzPk9KEQm2y9K6HBbxg3htSrI3sgUj8LzxQocx8umEkDmj4FA==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-error/-/apidom-error-1.0.0-alpha.5.tgz", + "integrity": "sha512-5UEgSZuQPdkqKSKDtRXQ0cm7x1o4EPyusLBVsCG4l8QtJvAhG1OOpEzJbTZ48/nRt7VkbK7MTj/up+oEILzVvw==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7" } }, "node_modules/@swagger-api/apidom-json-pointer": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.0.0-alpha.3.tgz", - "integrity": "sha512-hqNVqjzxY2ZDdIvbffgmjgtOJOijEVy5zyMh5mU8Aq+p5NH4WO3W9oCTCTjIoMWQC/Sg9s1S14UddDU0owCLzQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-1.0.0-alpha.5.tgz", + "integrity": "sha512-eDAz7/UaGpGCvB0y1GoRjFwxFWseCsF/0ZYIQvvq9PS025inc/I6M+XX8dWMmkpNpbbf+KfD7WlwfqnUZLv/MQ==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-ns-api-design-systems": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.0.0-alpha.3.tgz", - "integrity": "sha512-tDCmIwyLByn99sjhI8l9A2OMrN7M+W51E5gyvHmd1QORziol5Cp5bOUe6eh6VKVaXuKTWqxJc8H49+Kqq7+o5A==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-api-design-systems/-/apidom-ns-api-design-systems-1.0.0-alpha.5.tgz", + "integrity": "sha512-aq9Ix2Wo2TMfYW3HmheTO3qVd2MYrdinjLFHn9uozzC2x+CSzALhvKkwOc29HiGOn4QQ6QHHPRojNgD86WkwUg==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2043,14 +2049,14 @@ } }, "node_modules/@swagger-api/apidom-ns-asyncapi-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-H2biAFpzibnl0meeQIItTqnRW9R6icnkjrzdKzqtnHFMxZ5dLAAbwUTB3Ps5au0SnGvVb1/8Vf4UFJQh5Dhe/A==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-asyncapi-2/-/apidom-ns-asyncapi-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-JFtQBhCOkYuyNVcYGMFd9+U0UO6lEj9kO5qCgUjPOTgkOpZOZQslVEtg3TDmRlBATwVdmRv39xy3ZLK8O/JdmQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-json-schema-draft-7": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-json-schema-draft-7": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2058,13 +2064,13 @@ } }, "node_modules/@swagger-api/apidom-ns-json-schema-draft-4": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.0.0-alpha.3.tgz", - "integrity": "sha512-kt0xVFf7FZP0tzxqS9wciwzDNj1veIUVZH1reop8XjSnmnL3osL9UReQm7C/D9NHmU4rcqWnL4Oc4m+AbXOs5A==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-4/-/apidom-ns-json-schema-draft-4-1.0.0-alpha.5.tgz", + "integrity": "sha512-aDmcpGikL5JZmDTg7J6EJfLFjtUmX/MfduS4hQeopFCkw91dZsqxO10j7KEiRVVuJBuGStbYoHI5aIsQTlebzA==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^1.0.0-alpha.3", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", + "@swagger-api/apidom-ast": "^1.0.0-alpha.5", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2072,15 +2078,15 @@ } }, "node_modules/@swagger-api/apidom-ns-json-schema-draft-6": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.0.0-alpha.3.tgz", - "integrity": "sha512-aiaw91NCSxzAq0wZqe7z5PILK4dTei7YU6W8Xxu9g95yZ/jyLc9AEaNMPEYXUMxzn/fjbGdfHaOH0um7cLcdRw==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-6/-/apidom-ns-json-schema-draft-6-1.0.0-alpha.5.tgz", + "integrity": "sha512-ylh96E59aaV1VDv9sDrNwpTmjVT6vmOSncpmytlc0ynb374dwZkLZ63Hd30rcMFAhKmg5aYOG+i5O1QXKFYz8A==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2088,15 +2094,15 @@ } }, "node_modules/@swagger-api/apidom-ns-json-schema-draft-7": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.0.0-alpha.3.tgz", - "integrity": "sha512-ioq/fTnjGwouGiDs3luav2O0jAWRqDyf5RJbQNYqLfO4sBkDCRCDnWWzBMOmWV1cjwxqxSw+Eh8JsM3G0duNMA==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-json-schema-draft-7/-/apidom-ns-json-schema-draft-7-1.0.0-alpha.5.tgz", + "integrity": "sha512-Mks9gabJvz4atkjzLDwjWbo12xirul7a9ifHYZQJc/jfVKfVNy1e3QgFG1+EbSWWG5Yfbr3WKyxUDJLgr75qKg==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-ns-json-schema-draft-6": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-json-schema-draft-6": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2104,15 +2110,15 @@ } }, "node_modules/@swagger-api/apidom-ns-openapi-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-SKXglSEFQESs4QAR1+39GSFzCz5Mt8Bw0on0oEFt8ltOsaLeHlZZaX0eKbJXr8c63Y0zbd5KgONadYBBLsuwJg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-2/-/apidom-ns-openapi-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-uY+1G4oRf9UT/6sGuatvWKstmlRnEiN9XqaVvV8euXESxI4jtwcPbRwoEX31vEYXoTqq2ZScFy8UQJ2CJ2ZADw==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2120,14 +2126,14 @@ } }, "node_modules/@swagger-api/apidom-ns-openapi-3-0": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.0.0-alpha.3.tgz", - "integrity": "sha512-Km9FlwayXGAn0402D4YAeJWFO1kAhP/eCs9TgfhAL4Ak1NiQLSDIs+DfI3EAOgROBoUEE2v2Ki/P6yQAFuIgDg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-0/-/apidom-ns-openapi-3-0-1.0.0-alpha.5.tgz", + "integrity": "sha512-UAOGZaGMDVRQ10l8OgXCAfxS9PxGoCW66o/vFmhPfrK8NwU1GEo6sYHYoo1mflNMHCN2eVYyM5LxA+qYm0SJgQ==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-json-schema-draft-4": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2135,14 +2141,15 @@ } }, "node_modules/@swagger-api/apidom-ns-openapi-3-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-Cl0t+z+ylCPdqGpe8uJslh/DUj3d0oTwlZ0nxUQn1Gocaa5OodZqwyL5NiQj83PLec7MsfHnpfhSwaZIDd+3sA==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-8VkdZ2MfxXIdmzQZrV0qGk18MG7XNJKIL3GT9lad9NyXyiKSvBVFJDmS4S43qcQTL0rjHXF6ds25yErDSTprjg==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^1.0.0-alpha.3", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.3", + "@swagger-api/apidom-ast": "^1.0.0-alpha.5", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-json-pointer": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2150,14 +2157,14 @@ } }, "node_modules/@swagger-api/apidom-ns-workflows-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-workflows-1/-/apidom-ns-workflows-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-wdImblzbHOwjuchg15XdZXHhXxoOxWgxwf0NV0qgPEyvhuxvHwpL0tuAYvxiRllPFHPP48dI8aszbFjNOXk1kg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ns-workflows-1/-/apidom-ns-workflows-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-6cMv37y4kftJySoMAeubz5yhHaRKnSK0YglvCv8v7rE2OBduR/yEITDOej2/KFAnt29LxkhotSbNsmHx0weICQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2165,75 +2172,75 @@ } }, "node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-json": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.0.0-alpha.3.tgz", - "integrity": "sha512-E7uQ+g+TxhE6/IM4sv/zD+341HwnWUNk/jqqDNJtPzjfNAUXw9kBOIrU08cJIIAH8wSr/jNwOFLySt2CsqE1eQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-json/-/apidom-parser-adapter-api-design-systems-json-1.0.0-alpha.5.tgz", + "integrity": "sha512-QVWS2sPKA1sG52UIJut/St6+j7zO8QxzPlL5akR/8QPX2FWKqmw808Ewvjq9WLtqlPhVY2G33tv90d4/FJUNwQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-api-design-systems": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-api-design-systems": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-api-design-systems-yaml": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.0.0-alpha.3.tgz", - "integrity": "sha512-Im83uYqh6vIa4xl7BCcgWlRphIyzo4UFU/BX7jE0XKCNeDPemgkRhxjjyx/vOi6ySZI81bAO1UuGb/joE3uA2w==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-api-design-systems-yaml/-/apidom-parser-adapter-api-design-systems-yaml-1.0.0-alpha.5.tgz", + "integrity": "sha512-T7UD/SWd5u2zlPyswDdtfAStm6Qt5hQWAWvCmQKxy37qJA9QGXcQKNavaSMPGvN660hufNaJEBxgJ/B0Zd5iaw==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-api-design-systems": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-api-design-systems": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-asyncapi-json-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-tR8nILhc6n8gGyYXr88EaaQXs0gnOD2/2acQg1XS+WKWP4CX+/qsp7mUSC4DEkHrkbpWbbgBSvrK/Stfuzi6AQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-json-2/-/apidom-parser-adapter-asyncapi-json-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-UfCS9DFIURTUfaHfmEn8omHaevIV2i24Ncp46M/Pnk6JwZHjAEMxmPxsgMl4TTGbzqvySUQsJka8Qz1ziYZ1og==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-6ffIwxLJTE24/6xhVR7F0DRPfrJOIIcXDa8Qfj3iGLE4sbI97WmXBaSwY0k55lwgndVjr1V2Iu4BTuGJpu74Ag==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-asyncapi-yaml-2/-/apidom-parser-adapter-asyncapi-yaml-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-X5avFyLnlu6Zjyul35f8Ff0DRE70aNc+Bk7il+eV8g+FR/qgrmuNziQEBOhCrIUnYB1kFbTty6BZRsNLdjW9XQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-json": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.0.0-alpha.3.tgz", - "integrity": "sha512-GMGHsJzCI0x+40CMh9wQh+zft3T17CDts/ijYWpllPMZDqZ+1rejSvtwZ2/5vUoDATXue/lWBNnNR0DtxgC0EQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-json/-/apidom-parser-adapter-json-1.0.0-alpha.5.tgz", + "integrity": "sha512-NdVjlRrtr1EvrBsk6DHSkjI8zdnSve/bjeGgo0NR2IRmA/8BRcY6rffM1BR76Ku+CjxhCB2mfQxotilD71dL+g==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^1.0.0-alpha.3", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", + "@swagger-api/apidom-ast": "^1.0.0-alpha.5", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2243,135 +2250,135 @@ } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-RphzjaKtb9JwQPJjg014lreEyBNxEOddhTD7nsgPoloYFXglFk+zSoidMCh9J1v1WsirRksuvk0BNhnDupma5A==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-2/-/apidom-parser-adapter-openapi-json-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-qOwQl2WezfdDVmtf9ZlOiqT1hcDS52j7ZbBdH9MqMGJ+/mo6sv0qEY2ZXS104lWeRamgi4o/4o4jGqjZS1YrMg==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-0": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.0.0-alpha.3.tgz", - "integrity": "sha512-zRLQr0XO99HiVzEEJvB1xYqYl6CaNv5O5y5scDg+I1Vlge3gpQOBaCOZdxkGibmHGSkDxV/pCyjN+YptUlnq3Q==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-0/-/apidom-parser-adapter-openapi-json-3-0-1.0.0-alpha.5.tgz", + "integrity": "sha512-t5oj7XteTu2Yh8uNkzXAcKU81CQky+q6Qt/ImQ/S6MGxpXJnWwgVfm/j/dH2wnHFKghNS3vgm6IewpojSbUw4w==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-json-3-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-paky+VbtVg+tSWfH0Sa+ej0nOkBX/MmuI48i33hIBDP9opbh05e6Rn0rHRdVCx53XdBQNKGjzGYY50Q6cpwC9g==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-json-3-1/-/apidom-parser-adapter-openapi-json-3-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-w0G53HXYdzcespfa3atN90jVLDRoH9FU7XEWG4DvFWM90WGwuNscojcaB28r8pZMhSQAKMPxggh6PnmvK3gdEQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-2EkWW33Kv6xxsQTa6trSAtnrQHEkdLOrP4IapARXmcdzS02+NSUjE8wT2wfPsDxGAcv856cCmTvEg6Ea/sZWpQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-2/-/apidom-parser-adapter-openapi-yaml-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-nfeYRL0o6QwtKsyF30d2JmtW7fzoI/EYKSFgzaDm7IFlrQWMpB6BidpZKdk5MtYN4zvmfAM+lOhrqR7a5BvHMg==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.0.0-alpha.3.tgz", - "integrity": "sha512-YKYEImUrp5/ta6X70qUj1NX0DY0Bx7dOqGIY/q/9FZHq3OCsfTHznlF8H4E8B6BAo+u4xyyekvuvql3shQp1hQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-0/-/apidom-parser-adapter-openapi-yaml-3-0-1.0.0-alpha.5.tgz", + "integrity": "sha512-HRziGD/YUcO21hmDIYNzwYivp/faeZRxcq8Gex7RLLhJZ60fGTJJ1k1yhWFPNSe9DEJUNBN949SDxMdZnGT9PQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-X0uotMmUkYWRBPxzpNNZ1288yt3Xt8uXgMrwm/hXAHlUxnRtrWgplPRtlaYzSu2LnRQIluJWYzj8wTmZtGGjBQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-openapi-yaml-3-1/-/apidom-parser-adapter-openapi-yaml-3-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-aul2wSOvkdp9jQjSv1pvEGllVaDUnTKmRbCy7M/dFQyIhJQBvwW+/Cu//PprzAODtFNraOBjIXiJ5tVdv6NuIQ==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-workflows-json-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-workflows-json-1/-/apidom-parser-adapter-workflows-json-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-7zzCK9V0qf7Jd/wUPXSzqENInhbaCbtV+JDB+j6YvqGAN6BR8OjJnGxNQ/du+BUOtaQPEPjBwWXf7gMqmurtEQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-workflows-json-1/-/apidom-parser-adapter-workflows-json-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-R1LVe/gx7fRSCuDmmN3qScWonz6Xlaw11J+NAfiJzrNXBy1Qa1mCxgGs47w0slQN+FjYkVj5Y/q29jJgpUbLHA==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-workflows-yaml-1": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-workflows-yaml-1/-/apidom-parser-adapter-workflows-yaml-1-1.0.0-alpha.3.tgz", - "integrity": "sha512-5pIZ4sDFDaMC6LtdQgw0g2quS2dNY5A4M7XJHRpFg+7EmBBiljFsUlfNBfCY1ektdVEIkxp4smDHF9lfS1p7mg==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-workflows-yaml-1/-/apidom-parser-adapter-workflows-yaml-1-1.0.0-alpha.5.tgz", + "integrity": "sha512-W5wD+TdGNdW4aP9uqkxFbVmjWvLOXyV02VvyStyTlzxdUaPzKY3FGaxjxk8TGVRqwe2yEQVUc2zfGalrScA/Sg==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.3", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.5", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0" } }, "node_modules/@swagger-api/apidom-parser-adapter-yaml-1-2": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.0.0-alpha.3.tgz", - "integrity": "sha512-h5qFWSa3HPZxUBDYU8eFnTB+1fGF70kwqkHfhOkx7LDeFXIdip0j44mkQPSTDIy9i6F7Nn91AaXHTJJMeEEIZQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-parser-adapter-yaml-1-2/-/apidom-parser-adapter-yaml-1-2-1.0.0-alpha.5.tgz", + "integrity": "sha512-21TIQPkB+Z4ekNj5dh1uN0dhOBBCPeK572YpooA/pBTFLeH6Wtildx7ZZYfpJEejHaQKaqoRx3hp0G42GDOb7g==", "optional": true, "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-ast": "^1.0.0-alpha.3", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", - "@swagger-api/apidom-error": "^1.0.0-alpha.1", + "@swagger-api/apidom-ast": "^1.0.0-alpha.5", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", + "@swagger-api/apidom-error": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "ramda": "~0.30.0", "ramda-adjunct": "^5.0.0", @@ -2381,12 +2388,12 @@ } }, "node_modules/@swagger-api/apidom-reference": { - "version": "1.0.0-alpha.3", - "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-1.0.0-alpha.3.tgz", - "integrity": "sha512-ir3QbAE8j7+9e0he381O0l3g4DkGDSKQELu6mKPC+W/w0SkG0gJQBqBq9KCltoAURwMpi94MoUWTFq1UfxgyIQ==", + "version": "1.0.0-alpha.5", + "resolved": "https://registry.npmjs.org/@swagger-api/apidom-reference/-/apidom-reference-1.0.0-alpha.5.tgz", + "integrity": "sha512-zPMTScWI8oVUAT//RdAhl9GJuwtQLibP8iCrqFQDGjBzKQS5Uxz4hSXr/jqKPdkCJXbEoP94yYjvQjtI5yrv1A==", "dependencies": { "@babel/runtime-corejs3": "^7.20.7", - "@swagger-api/apidom-core": "^1.0.0-alpha.3", + "@swagger-api/apidom-core": "^1.0.0-alpha.5", "@types/ramda": "~0.30.0", "axios": "^1.4.0", "minimatch": "^7.4.3", @@ -2396,26 +2403,26 @@ }, "optionalDependencies": { "@swagger-api/apidom-error": "^1.0.0-alpha.1", - "@swagger-api/apidom-json-pointer": "^1.0.0-alpha.0", - "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.0", - "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-json-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-workflows-json-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-workflows-yaml-1": "^1.0.0-alpha.0", - "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.0" + "@swagger-api/apidom-json-pointer": "^1.0.0-alpha.1", + "@swagger-api/apidom-ns-asyncapi-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-ns-openapi-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-ns-openapi-3-0": "^1.0.0-alpha.1", + "@swagger-api/apidom-ns-openapi-3-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-ns-workflows-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-json": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-json": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-json-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-openapi-yaml-3-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-workflows-json-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-workflows-yaml-1": "^1.0.0-alpha.1", + "@swagger-api/apidom-parser-adapter-yaml-1-2": "^1.0.0-alpha.1" } }, "node_modules/@swagger-api/apidom-reference/node_modules/minimatch": { @@ -2574,9 +2581,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.1.tgz", - "integrity": "sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==", + "version": "4.19.5", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", + "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -2728,9 +2735,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.5.tgz", - "integrity": "sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==", + "version": "20.14.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.7.tgz", + "integrity": "sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==", "dependencies": { "undici-types": "~5.26.4" } @@ -2897,16 +2904,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz", - "integrity": "sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.1.tgz", + "integrity": "sha512-kZqi+WZQaZfPKnsflLJQCz6Ze9FFSMfXrrIOcyargekQxG37ES7DJNpJUE9Q/X5n3yTIP/WPutVNzgknQ7biLg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/type-utils": "7.10.0", - "@typescript-eslint/utils": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/scope-manager": "7.13.1", + "@typescript-eslint/type-utils": "7.13.1", + "@typescript-eslint/utils": "7.13.1", + "@typescript-eslint/visitor-keys": "7.13.1", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2930,15 +2937,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.10.0.tgz", - "integrity": "sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.1.tgz", + "integrity": "sha512-1ELDPlnLvDQ5ybTSrMhRTFDfOQEOXNM+eP+3HT/Yq7ruWpciQw+Avi73pdEbA4SooCawEWo3dtYbF68gN7Ed1A==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/typescript-estree": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/scope-manager": "7.13.1", + "@typescript-eslint/types": "7.13.1", + "@typescript-eslint/typescript-estree": "7.13.1", + "@typescript-eslint/visitor-keys": "7.13.1", "debug": "^4.3.4" }, "engines": { @@ -2958,13 +2965,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz", - "integrity": "sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.1.tgz", + "integrity": "sha512-adbXNVEs6GmbzaCpymHQ0MB6E4TqoiVbC0iqG3uijR8ZYfpAXMGttouQzF4Oat3P2GxDVIrg7bMI/P65LiQZdg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0" + "@typescript-eslint/types": "7.13.1", + "@typescript-eslint/visitor-keys": "7.13.1" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -2975,13 +2982,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz", - "integrity": "sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.1.tgz", + "integrity": "sha512-aWDbLu1s9bmgPGXSzNCxELu+0+HQOapV/y+60gPXafR8e2g1Bifxzevaa+4L2ytCWm+CHqpELq4CSoN9ELiwCg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.10.0", - "@typescript-eslint/utils": "7.10.0", + "@typescript-eslint/typescript-estree": "7.13.1", + "@typescript-eslint/utils": "7.13.1", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3002,9 +3009,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.10.0.tgz", - "integrity": "sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.1.tgz", + "integrity": "sha512-7K7HMcSQIAND6RBL4kDl24sG/xKM13cA85dc7JnmQXw2cBDngg7c19B++JzvJHRG3zG36n9j1i451GBzRuHchw==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3015,13 +3022,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz", - "integrity": "sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.1.tgz", + "integrity": "sha512-uxNr51CMV7npU1BxZzYjoVz9iyjckBduFBP0S5sLlh1tXYzHzgZ3BR9SVsNed+LmwKrmnqN3Kdl5t7eZ5TS1Yw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/types": "7.13.1", + "@typescript-eslint/visitor-keys": "7.13.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3043,15 +3050,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.10.0.tgz", - "integrity": "sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.1.tgz", + "integrity": "sha512-h5MzFBD5a/Gh/fvNdp9pTfqJAbuQC4sCN2WzuXme71lqFJsZtLbjxfSk4r3p02WIArOF9N94pdsLiGutpDbrXQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/typescript-estree": "7.10.0" + "@typescript-eslint/scope-manager": "7.13.1", + "@typescript-eslint/types": "7.13.1", + "@typescript-eslint/typescript-estree": "7.13.1" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3065,12 +3072,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz", - "integrity": "sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==", + "version": "7.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.1.tgz", + "integrity": "sha512-k/Bfne7lrP7hcb7m9zSsgcBmo+8eicqqfNAJ7uUY+jkTFpKeH2FSkWpFRtimBxgkyvqfu9jTPRbYOvud6isdXA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/types": "7.13.1", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3117,9 +3124,9 @@ } }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -3138,10 +3145,13 @@ } }, "node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, "engines": { "node": ">=0.4.0" } @@ -3599,9 +3609,9 @@ } }, "node_modules/bl": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.12.tgz", - "integrity": "sha512-EnEYHilP93oaOa2MnmNEjAcovPS3JlQZOyzGXi3EyEpPhm9qWvdDp7BmAVEVusGzp8LlwQK56Av+OkDoRjzE0w==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.13.tgz", + "integrity": "sha512-tMncAcpsyjZgAVbVFupVIaB2xud13xxT59fdHkuszY2jdZkqIWfpQdmII1fOe3kOGAz0mNLTIHEm+KxpYsQKKg==", "dependencies": { "@types/readable-stream": "^4.0.0", "buffer": "^6.0.3", @@ -3735,9 +3745,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "version": "4.23.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", "dev": true, "funding": [ { @@ -3754,10 +3764,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "update-browserslist-db": "^1.0.16" }, "bin": { "browserslist": "cli.js" @@ -3893,9 +3903,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001621", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001621.tgz", - "integrity": "sha512-+NLXZiviFFKX0fk8Piwv3PfLPGtRqJeq2TiNoUff/qB5KJgwecJTvCXDpmlyP/eCI/GUEmp/h/y5j0yckiiZrA==", + "version": "1.0.30001636", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", + "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "dev": true, "funding": [ { @@ -4465,9 +4475,9 @@ } }, "node_modules/debounce": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.0.0.tgz", - "integrity": "sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.1.0.tgz", + "integrity": "sha512-OkL3+0pPWCqoBc/nhO9u6TIQNTK44fnBnzuVtJAbp13Naxw9R6u21x+8tVTka87AhDZ3htqZ2pSSsZl9fqL2Wg==", "dev": true, "engines": { "node": ">=18" @@ -4477,9 +4487,9 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", "dependencies": { "ms": "2.1.2" }, @@ -4771,9 +4781,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.777", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.777.tgz", - "integrity": "sha512-n02NCwLJ3wexLfK/yQeqfywCblZqLcXphzmid5e8yVPdtEcida7li0A5WQKghHNG0FeOMCzeFOzEbtAh5riXFw==", + "version": "1.4.807", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.807.tgz", + "integrity": "sha512-kSmJl2ZwhNf/bcIuCH/imtNOKlpkLDn2jqT5FJ+/0CXjhnFaOa9cOe9gHKKy71eM49izwuQjZhKk+lWQ1JxB7A==", "dev": true }, "node_modules/emittery": { @@ -5033,15 +5043,15 @@ } }, "node_modules/eslint-plugin-chai-expect": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.0.0.tgz", - "integrity": "sha512-NS0YBcToJl+BRKBSMCwRs/oHJIX67fG5Gvb4tGked+9Wnd1/PzKijd82B2QVKcSSOwRe+pp4RAJ2AULeck4eQw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-chai-expect/-/eslint-plugin-chai-expect-3.1.0.tgz", + "integrity": "sha512-a9F8b38hhJsR7fgDEfyMxppZXCnCW6OOHj7cQfygsm9guXqdSzfpwrHX5FT93gSExDqD71HQglF1lLkGBwhJ+g==", "dev": true, "engines": { - "node": "10.* || 12.* || >= 14.*" + "node": "10.* || 12.* || || 14.* || 16.* || >= 18.*" }, "peerDependencies": { - "eslint": ">=2.0.0 <= 8.x" + "eslint": ">=2.0.0 <= 9.x" } }, "node_modules/eslint-plugin-chai-friendly": { @@ -5799,9 +5809,9 @@ } }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dev": true, "dependencies": { "cross-spawn": "^7.0.0", @@ -5964,6 +5974,63 @@ "node": ">=14" } }, + "node_modules/gcp-metadata": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", + "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", + "optional": true, + "peer": true, + "dependencies": { + "gaxios": "^5.0.0", + "json-bigint": "^1.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/gcp-metadata/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==", + "optional": true, + "peer": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/gcp-metadata/node_modules/gaxios": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", + "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", + "optional": true, + "peer": true, + "dependencies": { + "extend": "^3.0.2", + "https-proxy-agent": "^5.0.0", + "is-stream": "^2.0.0", + "node-fetch": "^2.6.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/gcp-metadata/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==", + "optional": true, + "peer": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/generic-pool": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz", @@ -6052,16 +6119,17 @@ "optional": true }, "node_modules/glob": { - "version": "10.3.16", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.16.tgz", - "integrity": "sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==", + "version": "10.4.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -6147,9 +6215,9 @@ } }, "node_modules/google-auth-library": { - "version": "9.10.0", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.10.0.tgz", - "integrity": "sha512-ol+oSa5NbcGdDqA+gZ3G3mev59OHBZksBTxY/tYwjtcp1H/scAFwJfSQU9/1RALoyZ7FslNbke8j4i3ipwlyuQ==", + "version": "9.11.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.11.0.tgz", + "integrity": "sha512-epX3ww/mNnhl6tL45EQ/oixsY8JLEgUFoT4A5E/5iAR4esld9Kqv6IJGk7EmGuOgDvaarwF95hU2+v7Irql9lw==", "dependencies": { "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", @@ -6175,20 +6243,20 @@ } }, "node_modules/google-gax": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.3.3.tgz", - "integrity": "sha512-f4F2Y9X4+mqsrJuLZsuTljYuQpcBnQsCt9ScvZpdM8jGjqrcxyJi5JUiqtq0jtpdHVPzyit0N7f5t07e+kH5EA==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.3.7.tgz", + "integrity": "sha512-3bnD8RASQyaxOYTdWLgwpQco/aytTxFavoI/UN5QN5txDLp8QRrBHNtCUJ5+Ago+551GD92jG8jJduwvmaneUw==", "dependencies": { - "@grpc/grpc-js": "~1.10.3", - "@grpc/proto-loader": "^0.7.0", + "@grpc/grpc-js": "^1.10.9", + "@grpc/proto-loader": "^0.7.13", "@types/long": "^4.0.0", "abort-controller": "^3.0.0", "duplexify": "^4.0.0", "google-auth-library": "^9.3.0", "node-fetch": "^2.6.1", "object-hash": "^3.0.0", - "proto3-json-serializer": "^2.0.0", - "protobufjs": "7.2.6", + "proto3-json-serializer": "^2.0.2", + "protobufjs": "^7.3.2", "retry-request": "^7.0.0", "uuid": "^9.0.1" }, @@ -6506,6 +6574,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -6621,12 +6690,15 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", + "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", "dev": true, "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6742,14 +6814,6 @@ "node": ">=8" } }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-regex": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", @@ -6932,9 +6996,9 @@ } }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -7112,6 +7176,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -7552,6 +7617,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -8360,9 +8426,9 @@ } }, "node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, "engines": { "node": ">=16 || 14 >=14.17" @@ -8440,9 +8506,9 @@ } }, "node_modules/mqtt": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.1.tgz", - "integrity": "sha512-6Gf5NH9/WxwGKkkXTyTI1lsM7S3s3zqSJe61Qp5w3B45BAOkOjM8p1GwNvgLE28+WO4d9OwrJzV8DWOMtWfy6w==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.2.tgz", + "integrity": "sha512-b5xIA9J/K1LTubSWKaNYYLxYIusQdip6o9/8bRWad2TelRr8xLifjQt+SnamDAwMp3O6NdvR9E8ae7VMuN02kg==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -8460,7 +8526,7 @@ "rfdc": "^1.3.0", "split2": "^4.2.0", "worker-timers": "^7.1.4", - "ws": "^8.14.2" + "ws": "^8.17.1" }, "bin": { "mqtt": "build/bin/mqtt.js", @@ -8595,9 +8661,9 @@ } }, "node_modules/nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", "optional": true }, "node_modules/napi-build-utils": { @@ -8710,9 +8776,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.62.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz", - "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==", + "version": "3.65.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz", + "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -8832,9 +8898,9 @@ "dev": true }, "node_modules/nodemon": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz", - "integrity": "sha512-m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.4.tgz", + "integrity": "sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==", "dev": true, "dependencies": { "chokidar": "^3.5.2", @@ -9321,9 +9387,20 @@ } }, "node_modules/openapi-path-templating": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/openapi-path-templating/-/openapi-path-templating-1.5.1.tgz", - "integrity": "sha512-kgRHToVP571U1YzUnaZnWaUIygon2itg5g96kwaFIi8bnpsw4oXYOk7k59Ivn+ley1iQnMENe/1HSovpPVZuXA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/openapi-path-templating/-/openapi-path-templating-1.6.0.tgz", + "integrity": "sha512-1atBNwOUrZXthTvlvvX8k8ovFEF3iA8mDidYMkdOtvVdndBhTrspbwGXNOzEUaJhm9iUl4Tf5uQaeTLAJvwPig==", + "dependencies": { + "apg-lite": "^1.0.3" + }, + "engines": { + "node": ">=12.20.0" + } + }, + "node_modules/openapi-server-url-templating": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/openapi-server-url-templating/-/openapi-server-url-templating-1.1.0.tgz", + "integrity": "sha512-dtyTFKx2xVcO0W8JKaluXIHC9l/MLjHeflBaWjiWNMCHp/TBs9dEjQDbj/VFlHR4omFOKjjmqm1pW1aCAhmPBg==", "dependencies": { "apg-lite": "^1.0.3" }, @@ -9442,6 +9519,12 @@ "node": ">=6" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "dev": true + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -9822,9 +9905,9 @@ } }, "node_modules/proto3-json-serializer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz", - "integrity": "sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz", + "integrity": "sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==", "dependencies": { "protobufjs": "^7.2.5" }, @@ -9833,9 +9916,9 @@ } }, "node_modules/protobufjs": { - "version": "7.2.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz", - "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", + "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -10101,18 +10184,18 @@ "dev": true }, "node_modules/ramda": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.30.0.tgz", - "integrity": "sha512-13Y0iMhIQuAm/wNGBL/9HEqIfRGmNmjKnTPlKWfA9f7dnDkr8d45wQ+S7+ZLh/Pq9PdcGxkqKUEA7ySu1QSd9Q==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.30.1.tgz", + "integrity": "sha512-tEF5I22zJnuclswcZMc8bDIrwRHRzf+NqVEmqg50ShAZMP7MWeR/RGDthfM/p+BlqvF2fXAzpn8i+SJcYD3alw==", "funding": { "type": "opencollective", "url": "https://opencollective.com/ramda" } }, "node_modules/ramda-adjunct": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ramda-adjunct/-/ramda-adjunct-5.0.0.tgz", - "integrity": "sha512-iEehjqp/ZGjYZybZByDaDu27c+79SE7rKDcySLdmjAwKWkz6jNhvGgZwzUGaMsij8Llp9+1N1Gy0drpAq8ZSyA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ramda-adjunct/-/ramda-adjunct-5.0.1.tgz", + "integrity": "sha512-UTQCcWnoiuYH+ua+jGg3GTktcmCSD2W7OO2++tmv8p2Ze+N9VgVACERg4g36rRfIXklVMtqazyBLBWXfoPKgRQ==", "engines": { "node": ">=0.10.3" }, @@ -10261,6 +10344,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -10355,6 +10439,9 @@ "version": "4.6.14", "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.14.tgz", "integrity": "sha512-GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw==", + "workspaces": [ + "./packages/*" + ], "dependencies": { "@redis/bloom": "1.2.0", "@redis/client": "1.5.16", @@ -10543,14 +10630,15 @@ } }, "node_modules/rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==" }, "node_modules/rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -10576,6 +10664,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -11066,9 +11155,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", - "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", + "version": "3.0.18", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz", + "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==", "dev": true }, "node_modules/spdx-ranges": { @@ -11436,24 +11525,24 @@ } }, "node_modules/swagger-client": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.28.1.tgz", - "integrity": "sha512-tt3/54GTImgOLrjzl83FZ+koJ7Kq6uuyBNS7mTpZeUQsBi2a/4IvqPcfY2qKhf7CFrbv6lzPm+MmSudrxU8J5g==", + "version": "3.28.2", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.28.2.tgz", + "integrity": "sha512-g30KCdSVyZlMulWOJnheNo7Ea+L06OZebl0oRU6zHd5Zf5AZKHTqurKRdNOLsMWA3l3bWJiEh7s3JlzFJHRmoQ==", "dependencies": { "@babel/runtime-corejs3": "^7.22.15", - "@swagger-api/apidom-core": ">=1.0.0-alpha.3 <1.0.0-beta.0", - "@swagger-api/apidom-error": ">=1.0.0-alpha.1 <1.0.0-beta.0", - "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.3 <1.0.0-beta.0", - "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.3 <1.0.0-beta.0", - "@swagger-api/apidom-reference": ">=1.0.0-alpha.3 <1.0.0-beta.0", + "@swagger-api/apidom-core": ">=1.0.0-alpha.5 <1.0.0-beta.0", + "@swagger-api/apidom-error": ">=1.0.0-alpha.5 <1.0.0-beta.0", + "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.5 <1.0.0-beta.0", + "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.5 <1.0.0-beta.0", + "@swagger-api/apidom-reference": ">=1.0.0-alpha.5 <1.0.0-beta.0", "cookie": "~0.6.0", "deepmerge": "~4.3.0", "fast-json-patch": "^3.0.0-1", - "is-plain-object": "^5.0.0", "js-yaml": "^4.1.0", "node-abort-controller": "^3.1.1", "node-fetch-commonjs": "^3.3.2", "openapi-path-templating": "^1.5.1", + "openapi-server-url-templating": "^1.0.0", "qs": "^6.10.2", "ramda-adjunct": "^5.0.0", "traverse": "=0.6.8" @@ -11476,9 +11565,9 @@ } }, "node_modules/swagger-ui-dist": { - "version": "5.17.12", - "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.17.12.tgz", - "integrity": "sha512-gHzs6CYQjgm0rpnFJGsjvWLua6znq+nipi89RDcu0a8R8JPXuVQrybVRBoOFmZ8mVTo9uPJDWgEYqnJRl4dHCQ==" + "version": "5.17.14", + "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.17.14.tgz", + "integrity": "sha512-CVbSfaLpstV65OnSjbXfVd6Sta3q3F7Cj/yYuvHMp1P90LztOLs6PfUnKEVAeiIVQt9u2SaPwv0LiH/OyMjHRw==" }, "node_modules/swagger-ui-express": { "version": "5.0.1", @@ -11693,6 +11782,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -11891,6 +11981,28 @@ } } }, + "node_modules/ts-json-schema-generator": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.3.0.tgz", + "integrity": "sha512-t4lBQAwZc0sOJq9LJt3NgbznIcslVnm0JeEMFq8qIRklpMRY8jlYD0YmnRWbqBKANxkby91P1XanSSlSOFpUmg==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.15", + "commander": "^12.0.0", + "glob": "^10.3.12", + "json5": "^2.2.3", + "normalize-path": "^3.0.0", + "safe-stable-stringify": "^2.4.3", + "tslib": "^2.6.2", + "typescript": "^5.4.5" + }, + "bin": { + "ts-json-schema-generator": "bin/ts-json-schema-generator.js" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/ts-mixer": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz", @@ -11950,9 +12062,9 @@ "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==" }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -12203,7 +12315,6 @@ "version": "1.2.1", "resolved": "git+ssh://git@github.com/nmshd/typescript-rest-swagger.git#3d3fe6e846bb84c7a8fea2f734b813631f1fa94c", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1", "debug": "^4.3.4", @@ -12805,6 +12916,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -12908,28 +13020,6 @@ "@types/qs": "^6.9.15", "ts-json-schema-generator": "^2.3.0" } - }, - "packages/sdk/node_modules/ts-json-schema-generator": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-2.3.0.tgz", - "integrity": "sha512-t4lBQAwZc0sOJq9LJt3NgbznIcslVnm0JeEMFq8qIRklpMRY8jlYD0YmnRWbqBKANxkby91P1XanSSlSOFpUmg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.15", - "commander": "^12.0.0", - "glob": "^10.3.12", - "json5": "^2.2.3", - "normalize-path": "^3.0.0", - "safe-stable-stringify": "^2.4.3", - "tslib": "^2.6.2", - "typescript": "^5.4.5" - }, - "bin": { - "ts-json-schema-generator": "bin/ts-json-schema-generator.js" - }, - "engines": { - "node": ">=18.0.0" - } } } } diff --git a/package.json b/package.json index 8b235a9c..0d416591 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "ts-jest": "^29.1.5", "ts-node": "^10.9.2", "typescript": "^5.4.5", - "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.3.3" + "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" }, "overrides": { "typescript-rest": { From a3b9b6b599a07a9ac2d1a08dfcb72fe90485310e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:48:08 +0200 Subject: [PATCH 20/27] Allow skipping the tls check for webhooks (#197) * fix: throw if configuration is undefined * feat: add skipTlsCheck option to Webhooks Module --- .../connectors/MessageBrokerConnector.ts | 4 +++- src/modules/webhooks/ConfigModel.ts | 5 ++++- src/modules/webhooks/ConfigParser.ts | 2 +- src/modules/webhooks/WebhooksModule.ts | 6 +++--- src/modules/webhooks/WebhooksModuleConfiguration.ts | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/modules/messageBrokerPublisher/connectors/MessageBrokerConnector.ts b/src/modules/messageBrokerPublisher/connectors/MessageBrokerConnector.ts index 2f3d3f08..22a0d0a7 100644 --- a/src/modules/messageBrokerPublisher/connectors/MessageBrokerConnector.ts +++ b/src/modules/messageBrokerPublisher/connectors/MessageBrokerConnector.ts @@ -4,7 +4,9 @@ export abstract class MessageBrokerConnector { public constructor( protected readonly configuration: TConfiguration, protected readonly logger: ILogger - ) {} + ) { + if (!this.configuration) throw new Error("Cannot start the broker, the 'configuration' is not defined."); + } public abstract init(): void | Promise; public abstract publish(namespace: string, data: Buffer): void | Promise; diff --git a/src/modules/webhooks/ConfigModel.ts b/src/modules/webhooks/ConfigModel.ts index 0cc0d695..20d070e3 100644 --- a/src/modules/webhooks/ConfigModel.ts +++ b/src/modules/webhooks/ConfigModel.ts @@ -2,7 +2,10 @@ import { Result } from "@js-soft/ts-utils"; import { WebhooksModuleApplicationErrors } from "./WebhooksModuleApplicationErrors"; export class ConfigModel { - public constructor(public readonly webhooks: Webhook[]) {} + public constructor( + public readonly webhooks: Webhook[], + public readonly skipTlsCheck: boolean + ) {} } export class Webhook { diff --git a/src/modules/webhooks/ConfigParser.ts b/src/modules/webhooks/ConfigParser.ts index 7e4d3647..1d2f88ca 100644 --- a/src/modules/webhooks/ConfigParser.ts +++ b/src/modules/webhooks/ConfigParser.ts @@ -14,7 +14,7 @@ export class ConfigParser { return Result.fail(webhooks.error); } - const configModel = new ConfigModel(webhooks.value); + const configModel = new ConfigModel(webhooks.value, configJson.skipTlsCheck ?? false); return Result.ok(configModel); } diff --git a/src/modules/webhooks/WebhooksModule.ts b/src/modules/webhooks/WebhooksModule.ts index ec9c42d7..f56bb9a9 100644 --- a/src/modules/webhooks/WebhooksModule.ts +++ b/src/modules/webhooks/WebhooksModule.ts @@ -12,14 +12,14 @@ export default class WebhooksModule extends ConnectorRuntimeModule true, maxRedirects: 0 }); - - this.configModel = ConfigParser.parse(this.configuration).value; } public start(): void { diff --git a/src/modules/webhooks/WebhooksModuleConfiguration.ts b/src/modules/webhooks/WebhooksModuleConfiguration.ts index 7bb70dfd..2d9ebab3 100644 --- a/src/modules/webhooks/WebhooksModuleConfiguration.ts +++ b/src/modules/webhooks/WebhooksModuleConfiguration.ts @@ -3,6 +3,7 @@ import { ConnectorRuntimeModuleConfiguration } from "../../ConnectorRuntimeModul export interface WebhooksModuleConfiguration extends ConnectorRuntimeModuleConfiguration { targets?: Record; webhooks?: WebhooksModuleConfigurationWebhook[]; + skipTlsCheck?: boolean; } export interface WebhooksModuleConfigurationTarget { From 983406c22e0fefc4e43d5d03aceeddf9cc1522df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:53:07 +0200 Subject: [PATCH 21/27] Upgrade local backbone version (#199) * chore: bump backbone * chore: bump appsettings --- .dev/appsettings.override.json | 13 ++++++++++++- .dev/compose.backbone.env | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.dev/appsettings.override.json b/.dev/appsettings.override.json index 24ea68af..6f4e0822 100644 --- a/.dev/appsettings.override.json +++ b/.dev/appsettings.override.json @@ -1,4 +1,11 @@ { + "Authentication": { + "JwtSigningCertificate": "MIIJ/wIBAzCCCbUGCSqGSIb3DQEHAaCCCaYEggmiMIIJnjCCBAoGCSqGSIb3DQEHBqCCA/swggP3AgEAMIID8AYJKoZIhvcNAQcBMF8GCSqGSIb3DQEFDTBSMDEGCSqGSIb3DQEFDDAkBBCPqAJskE1tYnX41O3DfagGAgIIADAMBggqhkiG9w0CCQUAMB0GCWCGSAFlAwQBKgQQV2BFkuXPtSrajdHwKU1KKoCCA4DMA/JkSD9Iph3Aiq8qxM1mCzZKab63aseb8hJvBUdnZCIobWCiGJOlV/QcwS9RoZOVOR8fiB60tsFz4HMS9QVl0kVkautmg+trSii0riXucVl5zyabLBiABmIdfo6UV7pcd9POewMrpJ2vPKTyHcBeENIqQMp9Il4sAQRgKIvqb/Z61VD9+qCbZYzBV3brHK0jdOir4Ye54zgmRMX3K4i4uPgO+QWt3Ot8P3dItdndNvB4rKJmjb7l/dBAJQv8Q/+wgZE7SzQSPT6iWmmQ2auoF0hIAK6dxKFsJ0LjbHS1364fKFX2SDJ8w3UgsfrWBXm/IsaKgbjDTfF180+ZcsesQf4IVyhEEYnWwuVIPHz6uQkYLtWRwGRnukpoxiR6X3qOSeP33O7HKvHuMTxUYvIKzHOCjPACibH0lR7zsXh8QNvhxfZ9fmDKXZwcv+vNlWQA+EN3q9g1Vm57Tnz1nxTuYbm574SrsiKVgpP03ZqvBQZQDxoNkIGfZO6Qwi2I/UNC/MSFp9t34X0jo6q55+GxsxAd6up0NE5zHRanMtN7d7RYrZgC0nySHdnvWYDWq9xzTjpIlZg4FkFJAiqpS9nXqBdx1tAe2SqxwAVwDw1a4rLSsC+dMwuusNkqGl/ZiwpBCE55Coeqj8+Yi1/mrNM/yicAfzN26zkfYn9sT7bcbEt3Ubyx9MQGoEnCowzI1ZfboL22kUOq0hEeA6UmOp2qUOFw/2P0b6HyLBIQ+6eFH4brU6AHftlRboPpPC3bMbCbdPnoIRN+4GouMDejZQuopSECFLHDmJTKvKgipUEO7JIOHHvKxpsUXzrWFq1B2P4DvKDCV5iQz3ItSqOAzU0LcLU0a1yWKUmj0ZbqhLJaidGMYb9CDFhlg+904i8La3qF9/GCeeGcm3LGROmHM/Mh+HyOrzd9E355DQ2Ux6WufEMYEbcT5z2rGE1V3I/3m5NU5zWYvmyTt8gBmDxfIQD2D0E8NdWSZTnDKTcTNHDqeWWylCVBopXv91EslyD3mVnUw5Wd+OnV8lyT2U28R0zi7SaMqx8+Xy7iRHnQ+LRtk5Rujp4+oT4bsQ1XK3OcoOEfTccFETCmNZGuNZKqa+l7tHK9w420kwH0m62uTTZeUcbqD+34Tt1QZLdqwj7r9io1PghXgOl30pQbVKdnjceHWLWAP0witDsH+gVSFyYF7zCCBYwGCSqGSIb3DQEHAaCCBX0EggV5MIIFdTCCBXEGCyqGSIb3DQEMCgECoIIFOTCCBTUwXwYJKoZIhvcNAQUNMFIwMQYJKoZIhvcNAQUMMCQEEJ4Z6WgEnoha9ZdujF6S8wwCAggAMAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDPrJbP/0P2G/aZMWoDohKkBIIE0HBTjLQOiCIEzOQU1lpM8HzkfW5a9li+ski1O3CPyM2bvbn2yHJfEZT1pDuDWHF+cReVgOl9ZX/9t+/RZnqHtwDMxMZJA1d/T6IwLailqmJjRIxwnItfx7V/lpbGpLWu3jfNxDJkxoMCDaOk//rwmkEUS4cgy0MZN07+E2eZCPbH1VR4BkQZfW/dtiRcZAI20xTfHaW29oDiwmBx/6Q+rFWpTJo+soPEaP2KYjtu0yKyVXVnDHRZOBm4tunEE6HDXd1QO18pxH59IkI0a5nofJNdmtURaqNf56knO9hLOOw0ul17A0JVCWErGs8WeUbyVKYyPfh0mz9bbFwvgspSyKYNfCQnic9zOYpzafmR8bFyWkbGBypo2qOvcePJzEdjkNllCdlo4OZmTXPD3Z83DnwLCzczkX4nftkoNytpUet31aJeZjElsrR2fzT/wiznBcEfhqTeh4CWQViOY/vSSsdCyo3GnUHMJcu5BsSxL2JBaVCmUl1cRehyql6Jxh6YmxNJ2qPIhX5StFTyi0tAc9lMLS5FrJbbjvo3ZkfkSD30LijTbydvC9Q/faF8TYshz9zdYBTvcU99nXDDHv0dQ7T9OxICdD8m9zj/BcSL0lg1EjCxHhc6vFo9ba/iSHXOXExam3BANkVjhe4HaEbHPhRdUWs8rpYvMLBWOTvPkN+Pi7t37PO3kBSoBHV7lZKBLaw8Mr9OCKGSYKCJLv7uiN4pfE9SmwUa/O5prh9z/Y3j8msXm/509gK4ttJmbbPvM/ncE92F2xAx59KaR8LLkF54yTdZRMIUac/5+V/geWVtWmvY18kl8/N+L4II34vimEdKeJVg1DvAJKssC9TMoqdpcK6whXPAP7ULl6nLgjyCOWTBhzBMj7PJ0FL52i9Fs1ZOKpjxpDUOqJx0AUZtLlCYZHjve769UGXeFedAbmJTy+9ZKOl8wTl6Pc7VCggvQ3h+evKzvOcFoltJgJBWC57dNyxNbI9efflYUPRPUQQXZY7vXW0nPZwyOWDtWMFWbA+LKaL4KnTAHSdsQo8p26fbAonJ08Utqwk0yWDI62ma6DWvq5bR9FEXNejWsa1Pt11RxlRPZR5mvIyoi2Q+X/AQlHRLe3Ft8AK702Q4dyfojx4MBAhmNdRSstqEXoQj2beRUQ5RxpjqTOo9S0/q1+PnM5j01AMcsLDIDwmJUzGrko4V6jTfaZgNSJY4yRnqBSFYZcjYhZBKFOGs2ZlqOQq9R3f+vSCitVSvfXJB/c+knuEaJRqjxt6B7pZ8T1MFcorahYh1kGyTu/JaklSq3ZgrrrAFxIG7v2247KaN1upg4FJaJiO3WZay8yVk1xRZLZkscR/MFY5LFPRhMrxfP5lyz8RgQKjPgSBW5xdfnBw55L72Ogorfo5I3/sGdnvxxoDh759hdiyyomsGxtKa/Vy7iTlJoy2gY/IatE/U5Jvb+y4WJhjZlzzNbyoTVHThaOxSmkf0qve/hb3/Emjn31i4E/UeRtgkPWQ9hNfGdZgwXyZmHft5TjuHavPUNKunOd7Up2si+lpEGOPesO0/eAb60FLZ/TEuEavEoVZW1WE2MKxdrdXvlyVauhcZ4MmpJvgEjK0BpTuxvNe9UQMGlltYq7zSB43e34zgyEfjEiHiMSUwIwYJKoZIhvcNAQkVMRYEFI9W3hOOq15cKT/TSo/TvKsXNL+GMEEwMTANBglghkgBZQMEAgEFAAQgTDQoVupf9X13ECnEqaEryflDawino/d9Xtc2JdR9dyEECJvTJ/AbI65mAgIIAA==" + }, + "Cors": { + "allowedOrigins": "nmshd://prod;http://localhost:3090;localhost:3090;nmshd://", + "exposedHeaders": "X-Request-Time;X-Response-Time;X-Response-Duration-ms;X-Trace-Id" + }, "Infrastructure": { "EventBus": { "Vendor": "RabbitMQ", @@ -36,7 +43,11 @@ "ConnectionString": "User ID=devices;Password=Passw0rd;Server=postgres;Port=5432;Database=enmeshed;" }, "PushNotifications": { - "Provider": "Dummy" + "Providers": { + "Dummy": { + "Enabled": true + } + } } } }, diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env index 625afee7..775d5b6c 100644 --- a/.dev/compose.backbone.env +++ b/.dev/compose.backbone.env @@ -1 +1 @@ -BACKBONE_VERSION=5.4.0 +BACKBONE_VERSION=5.9.1 From 96bbcbd7451e090e318aef6c247a117d5616bf21 Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Wed, 3 Jul 2024 11:04:06 +0200 Subject: [PATCH 22/27] Chore/Enable host-gateway dns on linux docker (#201) --- .dev/compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.dev/compose.yml b/.dev/compose.yml index 7cb8718d..e6825ee0 100644 --- a/.dev/compose.yml +++ b/.dev/compose.yml @@ -4,6 +4,8 @@ services: context: . dockerfile: ./Dockerfile.debug container_name: connector-1 + extra_hosts: + - "host.docker.internal:host-gateway" ports: - "3000:80" # Webserver - "9229:9229" # Debugger @@ -28,6 +30,8 @@ services: context: . dockerfile: ./Dockerfile.debug container_name: connector-2 + extra_hosts: + - "host.docker.internal:host-gateway" ports: - "3001:80" # Webserver - "9231:9229" # Debugger From f3a219d13eaae672f3d188db81809f7413bcbd9d Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Wed, 3 Jul 2024 12:15:10 +0200 Subject: [PATCH 23/27] Upgrade dependencies (#203) --- package-lock.json | 369 +++++++++++++--------------------------- package.json | 16 +- test/attributes.test.ts | 2 + test/spec.test.ts | 57 ++++--- 4 files changed, 156 insertions(+), 288 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e03d7ac..ea7dbb4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.11.0", + "@nmshd/runtime": "4.14.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", "axios": "^1.7.2", @@ -27,12 +27,12 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.1", + "mqtt": "^5.7.3", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", "rapidoc": "9.3.4", - "redis": "^4.6.14", + "redis": "^4.6.15", "reflect-metadata": "0.2.2", "swagger-ui-express": "5.0.1", "typescript-ioc": "3.2.2", @@ -42,7 +42,7 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "^10.1.0", - "@js-soft/eslint-config-ts": "1.6.8", + "@js-soft/eslint-config-ts": "1.6.9", "@js-soft/license-check": "1.0.9", "@nmshd/connector-sdk": "*", "@types/amqplib": "^0.10.5", @@ -52,10 +52,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.5", + "@types/lodash": "^4.17.6", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.5", + "@types/node": "^20.14.9", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -65,12 +65,12 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.3", + "nodemon": "^3.1.4", "npm-run-all": "^4.1.5", "prettier": "^3.3.2", "ts-jest": "^29.1.5", "ts-node": "^10.9.2", - "typescript": "5.4.5", + "typescript": "^5.5.3", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" } }, @@ -1588,17 +1588,17 @@ "integrity": "sha512-Wn/saaEN42T3tNIcnJd6Tp/htD8dtRImqPNu4aGQLbCPHLT8sT1VyyKwmRnZjK1z0u9pOo2svKaJmeE83rZhCg==" }, "node_modules/@js-soft/eslint-config-ts": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/@js-soft/eslint-config-ts/-/eslint-config-ts-1.6.8.tgz", - "integrity": "sha512-uwAMTu7AOlQYWCu/VWCiyPOhod5XWk0s/pN6kcFdFBc9O8OGDwCiUUZ6w9U93nK6stUZOKsw04QWbSAmvFxfRA==", + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/@js-soft/eslint-config-ts/-/eslint-config-ts-1.6.9.tgz", + "integrity": "sha512-PRseBdHg9o/bIs1VHUrYkfo7sg6v1t8qqepM9kHQd86bBO5EfEgHWQE5CrAvG/R3KMN+yGQfbELrWYxzUPXlgQ==", "dev": true, "dependencies": { - "@typescript-eslint/eslint-plugin": "^7.1.1", - "@typescript-eslint/parser": "^7.1.1", - "eslint-plugin-chai-expect": "^3.0.0", - "eslint-plugin-chai-friendly": "^0.7.4", - "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-mocha": "^10.4.1" + "@typescript-eslint/eslint-plugin": "^7.14.1", + "@typescript-eslint/parser": "^7.14.1", + "eslint-plugin-chai-expect": "^3.1.0", + "eslint-plugin-chai-friendly": "^1.0.0", + "eslint-plugin-jest": "^28.6.0", + "eslint-plugin-mocha": "^10.4.3" }, "peerDependencies": { "eslint": ">=8" @@ -1708,9 +1708,9 @@ "link": true }, "node_modules/@nmshd/consumption": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.11.0.tgz", - "integrity": "sha512-P2yyhbw45u2L7kENdvSiexBzsIyIbnI/p64SLXf9wU0LQqA6qi8tGdZJND/W/EPWsMyuJQ5JIErHxGs/ZE2niA==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/@nmshd/consumption/-/consumption-3.12.1.tgz", + "integrity": "sha512-wDjWGzoxJF51GZQI3lRXwASEAOgRlkwMcyY3cDtuTv0QvW9I3Wywq04yu4ZRTzFK4QmB0rvfaWnweL6SR9nctg==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@nmshd/iql": "^1.0.2", @@ -1718,9 +1718,9 @@ } }, "node_modules/@nmshd/content": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/@nmshd/content/-/content-2.10.1.tgz", - "integrity": "sha512-gguNMOD8tACwWTpb852J3JZQi+d9Wv/7Cj+IFqO0w1nafmIr6ikRaneT4rwoeLZ1fzHnbfknDrpS5DSO2yBfLQ==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/@nmshd/content/-/content-2.11.0.tgz", + "integrity": "sha512-KpUoyXmb9NwEAs/DFt3495cDF5UzL7IUxMCfkzZ+LF0KWdTA97ecAT1K0X8ulyJa9k3J02XGfWnQq0lHjeHPkw==", "dependencies": { "@js-soft/logging-abstractions": "^1.0.1", "@nmshd/iql": "^1.0.2", @@ -1742,18 +1742,18 @@ "integrity": "sha512-fRUIDoZeAKDJ99/yjbjlKryMv1poNaiRDTC8eNltZJSPSkQgchlt0yrWHBDl+CZEPF2Ae0hDj7vpo2n0c6R6JA==" }, "node_modules/@nmshd/runtime": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.11.0.tgz", - "integrity": "sha512-y7EMOuh16kZewF6dlIAEARHNKjlaJ25LRIuilJ5hxrZd+Ta3FO8qWThZduWBQqoa5uI23NlXdhkvWKmGGKe5oA==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/@nmshd/runtime/-/runtime-4.14.0.tgz", + "integrity": "sha512-N0GWDEZ99GZBK2f28TAH134s2GZSZVauoikV7ZxcxerSpJN9xMj+HPmzU/XC2wDOhIoaSwNn/lbEFyQBGVlMIw==", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", "@js-soft/logging-abstractions": "^1.0.1", "@js-soft/ts-serval": "2.0.10", "@js-soft/ts-utils": "^2.3.3", - "@nmshd/consumption": "3.11.0", - "@nmshd/content": "2.10.1", + "@nmshd/consumption": "3.12.1", + "@nmshd/content": "2.11.0", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.8.0", + "@nmshd/transport": "2.8.2", "ajv": "^8.16.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", @@ -1767,9 +1767,9 @@ } }, "node_modules/@nmshd/transport": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.8.0.tgz", - "integrity": "sha512-wLA56y8yQZEEI+4bbo9oAS61zl3LOLTfBBqDRAm3Asq48zNmWWQXIoI9mnaVrkwW/VZIIvqoThQVI9XFWgVMTQ==", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/@nmshd/transport/-/transport-2.8.2.tgz", + "integrity": "sha512-vgzaShkRzebqbQiR0kYzA82yJQ0L3xlrRBbGRmnWiamc1PGkjTpnRl+BSoZhjMD20jF2kwKXwbLRHL5b+kAW5g==", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.4", "@js-soft/logging-abstractions": "^1.0.1", @@ -1785,7 +1785,19 @@ "qs": "^6.12.1", "reflect-metadata": "^0.2.2", "ts-simple-nameof": "^1.3.1", - "uuid": "^9.0.1" + "uuid": "^10.0.0" + } + }, + "node_modules/@nmshd/transport/node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" } }, "node_modules/@nodelib/fs.scandir": { @@ -1909,9 +1921,9 @@ } }, "node_modules/@redis/client": { - "version": "1.5.16", - "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.16.tgz", - "integrity": "sha512-X1a3xQ5kEMvTib5fBrHKh6Y+pXbeKXqziYuxOUo1ojQNECg4M5Etd1qqyhMap+lFUOAh8S7UYevgJHOm4A+NOg==", + "version": "1.5.17", + "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.17.tgz", + "integrity": "sha512-IPvU9A31qRCZ7lds/x+ksuK/UMndd0EASveAvCvEtFFKIZjZ+m/a4a0L7S28KEWoR5ka8526hlSghDo4Hrc2Hg==", "dependencies": { "cluster-key-slot": "1.1.2", "generic-pool": "3.9.0", @@ -2694,9 +2706,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz", + "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==", "dev": true }, "node_modules/@types/lokijs": { @@ -2735,9 +2747,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.7.tgz", - "integrity": "sha512-uTr2m2IbJJucF3KUxgnGOZvYbN0QgkGyWxG6973HCpMYFy2KfcgYuIwkJQMQkt1VbBMlvWRbpshFTLxnxCZjKQ==", + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", "dependencies": { "undici-types": "~5.26.4" } @@ -2810,12 +2822,6 @@ "node": ">= 0.12" } }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true - }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -2904,16 +2910,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.1.tgz", - "integrity": "sha512-kZqi+WZQaZfPKnsflLJQCz6Ze9FFSMfXrrIOcyargekQxG37ES7DJNpJUE9Q/X5n3yTIP/WPutVNzgknQ7biLg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz", + "integrity": "sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.13.1", - "@typescript-eslint/type-utils": "7.13.1", - "@typescript-eslint/utils": "7.13.1", - "@typescript-eslint/visitor-keys": "7.13.1", + "@typescript-eslint/scope-manager": "7.15.0", + "@typescript-eslint/type-utils": "7.15.0", + "@typescript-eslint/utils": "7.15.0", + "@typescript-eslint/visitor-keys": "7.15.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2937,15 +2943,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.1.tgz", - "integrity": "sha512-1ELDPlnLvDQ5ybTSrMhRTFDfOQEOXNM+eP+3HT/Yq7ruWpciQw+Avi73pdEbA4SooCawEWo3dtYbF68gN7Ed1A==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.13.1", - "@typescript-eslint/types": "7.13.1", - "@typescript-eslint/typescript-estree": "7.13.1", - "@typescript-eslint/visitor-keys": "7.13.1", + "@typescript-eslint/scope-manager": "7.15.0", + "@typescript-eslint/types": "7.15.0", + "@typescript-eslint/typescript-estree": "7.15.0", + "@typescript-eslint/visitor-keys": "7.15.0", "debug": "^4.3.4" }, "engines": { @@ -2965,13 +2971,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.1.tgz", - "integrity": "sha512-adbXNVEs6GmbzaCpymHQ0MB6E4TqoiVbC0iqG3uijR8ZYfpAXMGttouQzF4Oat3P2GxDVIrg7bMI/P65LiQZdg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz", + "integrity": "sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.13.1", - "@typescript-eslint/visitor-keys": "7.13.1" + "@typescript-eslint/types": "7.15.0", + "@typescript-eslint/visitor-keys": "7.15.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -2982,13 +2988,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.1.tgz", - "integrity": "sha512-aWDbLu1s9bmgPGXSzNCxELu+0+HQOapV/y+60gPXafR8e2g1Bifxzevaa+4L2ytCWm+CHqpELq4CSoN9ELiwCg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz", + "integrity": "sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.13.1", - "@typescript-eslint/utils": "7.13.1", + "@typescript-eslint/typescript-estree": "7.15.0", + "@typescript-eslint/utils": "7.15.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3009,9 +3015,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.1.tgz", - "integrity": "sha512-7K7HMcSQIAND6RBL4kDl24sG/xKM13cA85dc7JnmQXw2cBDngg7c19B++JzvJHRG3zG36n9j1i451GBzRuHchw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz", + "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3022,13 +3028,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.1.tgz", - "integrity": "sha512-uxNr51CMV7npU1BxZzYjoVz9iyjckBduFBP0S5sLlh1tXYzHzgZ3BR9SVsNed+LmwKrmnqN3Kdl5t7eZ5TS1Yw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz", + "integrity": "sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.13.1", - "@typescript-eslint/visitor-keys": "7.13.1", + "@typescript-eslint/types": "7.15.0", + "@typescript-eslint/visitor-keys": "7.15.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3050,15 +3056,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.1.tgz", - "integrity": "sha512-h5MzFBD5a/Gh/fvNdp9pTfqJAbuQC4sCN2WzuXme71lqFJsZtLbjxfSk4r3p02WIArOF9N94pdsLiGutpDbrXQ==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.15.0.tgz", + "integrity": "sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.13.1", - "@typescript-eslint/types": "7.13.1", - "@typescript-eslint/typescript-estree": "7.13.1" + "@typescript-eslint/scope-manager": "7.15.0", + "@typescript-eslint/types": "7.15.0", + "@typescript-eslint/typescript-estree": "7.15.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3072,12 +3078,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.1.tgz", - "integrity": "sha512-k/Bfne7lrP7hcb7m9zSsgcBmo+8eicqqfNAJ7uUY+jkTFpKeH2FSkWpFRtimBxgkyvqfu9jTPRbYOvud6isdXA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz", + "integrity": "sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.13.1", + "@typescript-eslint/types": "7.15.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -5055,9 +5061,9 @@ } }, "node_modules/eslint-plugin-chai-friendly": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.7.4.tgz", - "integrity": "sha512-PGPjJ8diYgX1mjLxGJqRop2rrGwZRKImoEOwUOgoIhg0p80MkTaqvmFLe5TF7/iagZHggasvIfQlUyHIhK/PYg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-1.0.0.tgz", + "integrity": "sha512-M7pDQ/H5IiMz1LsfNi7Js4LvKx7cx0VMJHT/u1d35GOXxkQdJ2vAeaLC5q6GW126KVOnUMJ8WvBMWWLxtfdcog==", "dev": true, "engines": { "node": ">=0.10.0" @@ -5067,19 +5073,19 @@ } }, "node_modules/eslint-plugin-jest": { - "version": "27.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz", - "integrity": "sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==", + "version": "28.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.6.0.tgz", + "integrity": "sha512-YG28E1/MIKwnz+e2H7VwYPzHUYU4aMa19w0yGcwXnnmJH6EfgHahTJ2un3IyraUxNfnz/KUhJAFXNNwWPo12tg==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "^5.10.0" + "@typescript-eslint/utils": "^6.0.0 || ^7.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^16.10.0 || ^18.12.0 || >=20.0.0" }, "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0 || ^7.0.0", - "eslint": "^7.0.0 || ^8.0.0", + "@typescript-eslint/eslint-plugin": "^6.0.0 || ^7.0.0", + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0", "jest": "*" }, "peerDependenciesMeta": { @@ -5091,128 +5097,6 @@ } } }, - "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-jest/node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-plugin-jest/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/eslint-plugin-mocha": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.4.3.tgz", @@ -8506,9 +8390,9 @@ } }, "node_modules/mqtt": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.2.tgz", - "integrity": "sha512-b5xIA9J/K1LTubSWKaNYYLxYIusQdip6o9/8bRWad2TelRr8xLifjQt+SnamDAwMp3O6NdvR9E8ae7VMuN02kg==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.3.tgz", + "integrity": "sha512-v+5la6Q6zjl0AWsI7ICDA/K3hclkNj7CMa0khMugCC+LKPLrQF+sSQb/9ckezZLMvcBC1tXhRzqmcagQoDl9fQ==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -10436,15 +10320,15 @@ } }, "node_modules/redis": { - "version": "4.6.14", - "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.14.tgz", - "integrity": "sha512-GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw==", + "version": "4.6.15", + "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.15.tgz", + "integrity": "sha512-2NtuOpMW3tnYzBw6S8mbXSX7RPzvVFCA2wFJq9oErushO2UeBkxObk+uvo7gv7n0rhWeOj/IzrHO8TjcFlRSOg==", "workspaces": [ "./packages/*" ], "dependencies": { "@redis/bloom": "1.2.0", - "@redis/client": "1.5.16", + "@redis/client": "1.5.17", "@redis/graph": "1.1.1", "@redis/json": "1.0.6", "@redis/search": "1.1.6", @@ -12066,27 +11950,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -12231,9 +12094,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 0d416591..9d0966ad 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@js-soft/node-logger": "1.1.1", "@js-soft/ts-utils": "^2.3.3", "@nmshd/iql": "^1.0.2", - "@nmshd/runtime": "4.11.0", + "@nmshd/runtime": "4.14.0", "agentkeepalive": "4.5.0", "amqplib": "^0.10.4", "axios": "^1.7.2", @@ -80,12 +80,12 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.1", + "mqtt": "^5.7.3", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", "rapidoc": "9.3.4", - "redis": "^4.6.14", + "redis": "^4.6.15", "reflect-metadata": "0.2.2", "swagger-ui-express": "5.0.1", "typescript-ioc": "3.2.2", @@ -95,7 +95,7 @@ }, "devDependencies": { "@apidevtools/swagger-parser": "^10.1.0", - "@js-soft/eslint-config-ts": "1.6.8", + "@js-soft/eslint-config-ts": "1.6.9", "@js-soft/license-check": "1.0.9", "@nmshd/connector-sdk": "*", "@types/amqplib": "^0.10.5", @@ -105,10 +105,10 @@ "@types/jest": "^29.5.12", "@types/jest-json-schema": "^6.1.4", "@types/json-stringify-safe": "^5.0.3", - "@types/lodash": "^4.17.5", + "@types/lodash": "^4.17.6", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.5", + "@types/node": "^20.14.9", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -118,12 +118,12 @@ "jest-expect-message": "^1.1.3", "jest-json-schema": "^6.1.0", "lodash": "^4.17.21", - "nodemon": "^3.1.3", + "nodemon": "^3.1.4", "npm-run-all": "^4.1.5", "prettier": "^3.3.2", "ts-jest": "^29.1.5", "ts-node": "^10.9.2", - "typescript": "^5.4.5", + "typescript": "^5.5.3", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" }, "overrides": { diff --git a/test/attributes.test.ts b/test/attributes.test.ts index 6737cea7..ec340712 100644 --- a/test/attributes.test.ts +++ b/test/attributes.test.ts @@ -604,6 +604,7 @@ describe("Delete attributes", () => { await syncUntilHasMessageWithRequest(client2, outgoingRequests.result.id); await client2._eventBus?.waitForEvent("consumption.incomingRequestStatusChanged", (event) => { + // eslint-disable-next-line jest/no-conditional-in-test return event.data.request.id.toString() === outgoingRequests.result.id && event.data.newStatus === "ManualDecisionRequired"; }); @@ -618,6 +619,7 @@ describe("Delete attributes", () => { const message = await syncUntilHasMessageWithResponse(client3, outgoingRequests.result.id); await client3._eventBus?.waitForEvent("consumption.outgoingRequestStatusChanged", (event) => { + // eslint-disable-next-line jest/no-conditional-in-test return event.data.request.id.toString() === outgoingRequests.result.id && event.data.newStatus === "Completed"; }); diff --git a/test/spec.test.ts b/test/spec.test.ts index 27f1b108..c6e51517 100644 --- a/test/spec.test.ts +++ b/test/spec.test.ts @@ -44,13 +44,11 @@ describe("test openapi spec against routes", () => { expect(manualPaths).toContain(path); }); - manualPaths.forEach((path) => { - if (ignorePaths.includes(path)) { - return; - } - - expect(generatedPaths).toContain(path); - }); + manualPaths + .filter((path) => ignorePaths.includes(path)) + .forEach((path) => { + expect(generatedPaths).toContain(path); + }); }); test("all routes should have the same HTTP methods", () => { const manualPaths = getPaths(manualOpenApiSpec); @@ -64,27 +62,29 @@ describe("test openapi spec against routes", () => { }; /* eslint-enable @typescript-eslint/naming-convention */ - manualPaths.forEach((path) => { - if (ignorePaths.includes(path)) { - return; - } - const generatedMethods = Object.keys(generatedOpenApiSpec.paths[path]) - .map((method) => method.toLocaleLowerCase()) - .sort(); - const manualMethods = Object.keys(manualOpenApiSpec.paths[path]) - .map((method) => method.toLocaleLowerCase()) - .sort(); - - expect(generatedMethods, `Path ${path} do not have the same methods`).toStrictEqual(manualMethods); - - Object.keys(manualOpenApiSpec.paths[path]).forEach((method) => { - const key = method as "get" | "put" | "post" | "delete" | "options" | "head" | "patch"; - const manualResponses = Object.keys(manualOpenApiSpec.paths[path][key]?.responses ?? {}); - let expectedResponseCode = key === "post" ? "201" : "200"; - expectedResponseCode = returnCodeOverwrite[path] ?? expectedResponseCode; - expect(manualResponses, `Path ${path} and method ${method} does not contain response code ${expectedResponseCode}`).toContainEqual(expectedResponseCode); + manualPaths + .filter((path) => ignorePaths.includes(path)) + .forEach((path) => { + const generatedMethods = Object.keys(generatedOpenApiSpec.paths[path]) + .map((method) => method.toLocaleLowerCase()) + .sort(); + const manualMethods = Object.keys(manualOpenApiSpec.paths[path]) + .map((method) => method.toLocaleLowerCase()) + .sort(); + + expect(generatedMethods, `Path ${path} do not have the same methods`).toStrictEqual(manualMethods); + + Object.keys(manualOpenApiSpec.paths[path]).forEach((method) => { + const key = method as "get" | "put" | "post" | "delete" | "options" | "head" | "patch"; + // eslint-disable-next-line jest/no-conditional-in-test + const manualResponses = Object.keys(manualOpenApiSpec.paths[path][key]?.responses ?? {}); + // eslint-disable-next-line jest/no-conditional-in-test + let expectedResponseCode = key === "post" ? "201" : "200"; + // eslint-disable-next-line jest/no-conditional-in-test + expectedResponseCode = returnCodeOverwrite[path] ?? expectedResponseCode; + expect(manualResponses, `Path ${path} and method ${method} does not contain response code ${expectedResponseCode}`).toContainEqual(expectedResponseCode); + }); }); - }); }); test("all generated params should be in the manual spec", () => { @@ -102,16 +102,19 @@ describe("test openapi spec against routes", () => { .sort() as (keyof Swagger.Path)[]; generatedMethods.forEach((method: keyof Swagger.Path) => { const generatedOperation = generatedOpenApiSpec.paths[path][method]; + // eslint-disable-next-line jest/no-conditional-in-test if (!isOperation(generatedOperation) || !generatedOperation.parameters) { return; } const manualOperation = manualOpenApiSpec.paths[path][method]; + // eslint-disable-next-line jest/no-conditional-in-test if (!isOperation(manualOperation) || !manualOperation.parameters) { throw new Error(`${path} ${method} does not contain parameters but generated do`); } // DBQuery are used via context.query and not by injection as QueryParameter so they will not be generated and the length will be different + // eslint-disable-next-line jest/no-conditional-in-test if (!pathsWithDBQueries.some((p) => p.path === path && p.method.toLowerCase() === method.toLowerCase())) { // eslint-disable-next-line jest/no-conditional-expect expect(generatedOperation.parameters, `Parameter length for ${method.toUpperCase()} ${path} is wrong`).toHaveLength(manualOperation.parameters.length); From d29559acd1e9aa1b0d8388c5cfcd495ccb8284aa Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Wed, 3 Jul 2024 15:08:53 +0200 Subject: [PATCH 24/27] [SDK] network error leads to unwanted behavior (#202) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: sdk error message on network error was showing not all details * Update packages/sdk/src/endpoints/Endpoint.ts Co-authored-by: Julian König <33655937+jkoenig134@users.noreply.github.com> * fix: add error message on all places and only show path --------- Co-authored-by: Julian König <33655937+jkoenig134@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- packages/sdk/src/endpoints/Endpoint.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/sdk/src/endpoints/Endpoint.ts b/packages/sdk/src/endpoints/Endpoint.ts index d639d49f..4e5876bb 100644 --- a/packages/sdk/src/endpoints/Endpoint.ts +++ b/packages/sdk/src/endpoints/Endpoint.ts @@ -47,7 +47,11 @@ export abstract class Endpoint { if (httpResponse.status !== expectedStatus) { const errorPayload = httpResponse.data.error; - + if (!errorPayload) { + throw new Error( + `The http request to connector route '${httpResponse.request.path}' failed with status '${httpResponse.status}': ${httpResponse.statusText} ${httpResponse.data}` + ); + } return ConnectorResponse.error({ id: errorPayload.id, docs: errorPayload.docs, @@ -69,6 +73,12 @@ export abstract class Endpoint { // Manually parse data because responseType is "arrayBuffer" const errorPayload = JSON.parse(httpResponse.data).error; + if (!errorPayload) { + throw new Error( + `The http request to connector route '${httpResponse.request.path}' failed with status '${httpResponse.status}': ${httpResponse.statusText} ${httpResponse.data}` + ); + } + return ConnectorResponse.error({ id: errorPayload.id, docs: errorPayload.docs, @@ -104,6 +114,12 @@ export abstract class Endpoint { if (httpResponse.status !== expectedStatus) { const errorPayload = httpResponse.data.error; + if (!errorPayload) { + throw new Error( + `The http request to connector route '${httpResponse.request.path}' failed with status '${httpResponse.status}': ${httpResponse.statusText} ${httpResponse.data}` + ); + } + return ConnectorResponse.error({ id: errorPayload.id, docs: errorPayload.docs, From 044cd12df49e9a5298b82effb2008f7cc438fd3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 05:42:24 +0000 Subject: [PATCH 25/27] Chore(deps): bump the update-npm-dependencies group across 1 directory with 4 updates (#209) --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 6 +++--- packages/sdk/package.json | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index ea7dbb4f..be407859 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.3", + "mqtt": "^5.8.0", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -55,7 +55,7 @@ "@types/lodash": "^4.17.6", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -68,7 +68,7 @@ "nodemon": "^3.1.4", "npm-run-all": "^4.1.5", "prettier": "^3.3.2", - "ts-jest": "^29.1.5", + "ts-jest": "^29.2.0", "ts-node": "^10.9.2", "typescript": "^5.5.3", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" @@ -2747,9 +2747,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "dependencies": { "undici-types": "~5.26.4" } @@ -8390,9 +8390,9 @@ } }, "node_modules/mqtt": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.7.3.tgz", - "integrity": "sha512-v+5la6Q6zjl0AWsI7ICDA/K3hclkNj7CMa0khMugCC+LKPLrQF+sSQb/9ckezZLMvcBC1tXhRzqmcagQoDl9fQ==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.8.0.tgz", + "integrity": "sha512-/+H04mv6goy6K5gHMNH3uS0icBzXapS+4uUf4yZyQWXi72APPZNb81bQhvkm99poEQettXVT8XETB0mPxl5Wjg==", "dependencies": { "@types/readable-stream": "^4.0.5", "@types/ws": "^8.5.9", @@ -10024,9 +10024,9 @@ } }, "node_modules/qs": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", - "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.2.tgz", + "integrity": "sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==", "dependencies": { "side-channel": "^1.0.6" }, @@ -11819,9 +11819,9 @@ } }, "node_modules/ts-jest": { - "version": "29.1.5", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.5.tgz", - "integrity": "sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==", + "version": "29.2.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.0.tgz", + "integrity": "sha512-eFmkE9MG0+oT6nqSOcUwL+2UUmK2IvhhUV8hFDsCHnc++v2WCCbQQZh5vvjsa8sgOY/g9T0325hmkEmi6rninA==", "dev": true, "dependencies": { "bs-logger": "0.x", @@ -12876,7 +12876,7 @@ "dependencies": { "axios": "^1.7.2", "form-data": "^4.0.0", - "qs": "^6.12.1" + "qs": "^6.12.2" }, "devDependencies": { "@types/form-data": "^2.5.0", diff --git a/package.json b/package.json index 9d0966ad..9cb6ad8d 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "helmet": "7.1.0", "json-stringify-safe": "5.0.1", "jsonschema": "1.4.1", - "mqtt": "^5.7.3", + "mqtt": "^5.8.0", "multer": "^1.4.5-lts.1", "nconf": "0.12.1", "on-headers": "1.0.2", @@ -108,7 +108,7 @@ "@types/lodash": "^4.17.6", "@types/luxon": "^3.4.2", "@types/nconf": "^0.10.6", - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "@types/on-headers": "^1.0.3", "@types/swagger-ui-express": "^4.1.6", "@types/yamljs": "^0.2.34", @@ -121,7 +121,7 @@ "nodemon": "^3.1.4", "npm-run-all": "^4.1.5", "prettier": "^3.3.2", - "ts-jest": "^29.1.5", + "ts-jest": "^29.2.0", "ts-node": "^10.9.2", "typescript": "^5.5.3", "typescript-rest-swagger": "github:nmshd/typescript-rest-swagger#1.2.1" diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ff9c4110..1c5f2d06 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -32,7 +32,7 @@ "dependencies": { "axios": "^1.7.2", "form-data": "^4.0.0", - "qs": "^6.12.1" + "qs": "^6.12.2" }, "devDependencies": { "@types/form-data": "^2.5.0", From 5ed4e024b38b86c44e3c319c71f8f69b26556434 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 05:53:51 +0000 Subject: [PATCH 26/27] Chore(deps): bump the update-docker-dependencies group across 2 directories with 1 update (#208) --- .dev/Dockerfile.debug | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev/Dockerfile.debug b/.dev/Dockerfile.debug index ce119c99..197a0635 100644 --- a/.dev/Dockerfile.debug +++ b/.dev/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM node:22.3.0 +FROM node:22.4.0 WORKDIR /usr/app # Webserver, Debugger diff --git a/Dockerfile b/Dockerfile index 9e8e3078..8f6273f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.3.0 as builder +FROM node:22.4.0 as builder ARG COMMIT_HASH ARG BUILD_NUMBER ARG VERSION @@ -13,7 +13,7 @@ COPY src src RUN npm run build RUN .ci/writeBuildInformation.sh -FROM node:22.3.0-alpine +FROM node:22.4.0-alpine ENV NODE_CONFIG_ENV=prod RUN apk add --no-cache tini RUN apk add libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/node && apk del libcap From 477b6dfe9a6a322d28778845c872d2a311f5ceec Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 9 Jul 2024 08:26:35 +0200 Subject: [PATCH 27/27] Fix missing wait for event (#210) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: fix missing wait for event * Update test/attributes.test.ts Co-authored-by: Julian König <33655937+jkoenig134@users.noreply.github.com> --------- Co-authored-by: Julian König <33655937+jkoenig134@users.noreply.github.com> --- test/attributes.test.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/attributes.test.ts b/test/attributes.test.ts index ec340712..a462e274 100644 --- a/test/attributes.test.ts +++ b/test/attributes.test.ts @@ -173,6 +173,10 @@ describe("Attributes", () => { expect(successionResponse.isSuccess).toBe(true); await syncUntilHasMessages(client2); + await client2._eventBus!.waitForEvent>( + "consumption.peerSharedAttributeSucceeded", + (event) => event.data.successor.id === successionResponse.result.successor.id + ); const client2SuccessorResponse = await client2.attributes.getAttribute(successionResponse.result.successor.id);