From 4065bf99e4510c775755b27aea7d7c5521419f12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 17:06:45 +0300 Subject: [PATCH 1/4] build(deps): bump the dependencies group with 8 updates (#2829) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the dependencies group with 8 updates: | Package | From | To | | --- | --- | --- | | [@manypkg/cli](https://github.com/Thinkmill/manypkg/tree/HEAD/packages/cli) | `0.21.4` | `0.22.0` | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `18.19.55` | `18.19.57` | | [@aws-sdk/client-route-53](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-route-53) | `3.670.0` | `3.675.0` | | [@types/lodash](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash) | `4.17.10` | `4.17.12` | | [@lit-protocol/uint8arrays](https://github.com/LIT-Protocol/js-sdk) | `6.10.0` | `6.11.0` | | [pino](https://github.com/pinojs/pino) | `9.4.0` | `9.5.0` | | [pino-pretty](https://github.com/pinojs/pino-pretty) | `11.2.2` | `11.3.0` | | [secp256k1](https://github.com/cryptocoinjs/secp256k1-node) | `5.0.0` | `5.0.1` | Updates `@manypkg/cli` from 0.21.4 to 0.22.0
Release notes

Sourced from @​manypkg/cli's releases.

@​manypkg/cli@​0.22.0

Minor Changes

Changelog

Sourced from @​manypkg/cli's changelog.

0.22.0

Minor Changes

Commits

Updates `@types/node` from 18.19.55 to 18.19.57
Commits

Updates `@aws-sdk/client-route-53` from 3.670.0 to 3.675.0
Release notes

Sourced from @​aws-sdk/client-route-53's releases.

v3.675.0

3.675.0(2024-10-18)

New Features
Bug Fixes

For list of updated packages, view updated-packages.md in assets-3.675.0.zip

v3.674.0

3.674.0(2024-10-17)

Chores
Documentation Changes
New Features

For list of updated packages, view updated-packages.md in assets-3.674.0.zip

v3.673.0

3.673.0(2024-10-16)

... (truncated)

Changelog

Sourced from @​aws-sdk/client-route-53's changelog.

3.675.0 (2024-10-18)

Note: Version bump only for package @​aws-sdk/client-route-53

Commits

Updates `@types/lodash` from 4.17.10 to 4.17.12
Commits

Updates `@lit-protocol/uint8arrays` from 6.10.0 to 6.11.0
Release notes

Sourced from @​lit-protocol/uint8arrays's releases.

Serrano

SDK version compatible with Serrano network

Commits

Updates `pino` from 9.4.0 to 9.5.0
Release notes

Sourced from pino's releases.

v9.5.0

What's Changed

New Contributors

Full Changelog: https://github.com/pinojs/pino/compare/v9.4.0...v9.5.0

Commits

Updates `pino-pretty` from 11.2.2 to 11.3.0
Release notes

Sourced from pino-pretty's releases.

v11.3.0

What's Changed

New Contributors

Full Changelog: https://github.com/pinojs/pino-pretty/compare/v11.2.2...v11.3.0

Commits

Updates `secp256k1` from 5.0.0 to 5.0.1
Commits

Most Recent Ignore Conditions Applied to This Pull Request | Dependency Name | Ignore Conditions | | --- | --- | | @types/node | [>= 20.a, < 21] | | @types/node | [>= 22.a, < 23] |
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 589 ++++++--------------- package.json | 4 +- packages/autocertifier-server/package.json | 2 +- packages/cli-tools/package.json | 2 +- packages/dht/package.json | 2 +- packages/node/package.json | 2 +- packages/proto-rpc/package.json | 2 +- packages/sdk/package.json | 4 +- packages/trackerless-network/package.json | 2 +- packages/utils/package.json | 8 +- 10 files changed, 175 insertions(+), 442 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97aafcee0c..9946455fa2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,12 +21,12 @@ "packages/cli-tools" ], "dependencies": { - "@manypkg/cli": "^0.21.2", + "@manypkg/cli": "^0.22.0", "@protobuf-ts/plugin": "^2.9.3", "@stylistic/eslint-plugin": "^2.9.0", "@tsconfig/node18": "^18.2.4", "@types/jest": "^29.5.13", - "@types/node": "^18.19.55", + "@types/node": "^18.19.57", "@typescript-eslint/eslint-plugin": "8.7.0", "@typescript-eslint/parser": "^8.7.0", "cli-table": "^0.3.6", @@ -178,16 +178,16 @@ } }, "node_modules/@aws-sdk/client-route-53": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-route-53/-/client-route-53-3.670.0.tgz", - "integrity": "sha512-amMZQ0X4OSp92yDaegJWi0pwnDIjQD0JV1eaglBSahh/tGIysJwknRlEv0BVkAyjnTycOqpcRd+AH0oGx1/mhw==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-route-53/-/client-route-53-3.675.0.tgz", + "integrity": "sha512-yrkpuLYHjG6glAHSgjqa03iUDJkgwdnYsggp2mb+pNkXvNSjxvomk1Ho9FoAGii70NCu4JHekZtrPbDwXgg26g==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.670.0", - "@aws-sdk/client-sts": "3.670.0", + "@aws-sdk/client-sso-oidc": "3.675.0", + "@aws-sdk/client-sts": "3.675.0", "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/credential-provider-node": "3.675.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", @@ -196,7 +196,7 @@ "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-browser": "3.675.0", "@aws-sdk/util-user-agent-node": "3.669.0", "@aws-sdk/xml-builder": "3.662.0", "@smithy/config-resolver": "^3.0.9", @@ -232,9 +232,9 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.670.0.tgz", - "integrity": "sha512-J+oz6uSsDvk4pimMDnKJb1wsV216zTrejvMTIL4RhUD1QPIVVOpteTdUShcjZUIZnkcJZGI+cym/SFK0kuzTpg==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.675.0.tgz", + "integrity": "sha512-2goBCEr4acZJ1YJ69eWPTsIfZUbO7enog+lBA5kZShDiwovqzwYSHSlf6OGz4ETs2xT1n7n+QfKY0p+TluTfEw==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", @@ -246,7 +246,7 @@ "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-browser": "3.675.0", "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", @@ -280,14 +280,14 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.670.0.tgz", - "integrity": "sha512-4qDK2L36Q4J1lfemaHHd9ZxqKRaos3STp44qPAHf/8QyX6Uk5sXgZNVO2yWM7SIEtVKwwBh/fZAsdBkGPBfZcw==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.675.0.tgz", + "integrity": "sha512-4kEcaa2P/BFz+xy5tagbtzM08gbjHXyYqW+n6SJuUFK7N6bZNnA4cu1hVgHcqOqk8Dbwv7fiseGT0x3Hhqjwqg==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/credential-provider-node": "3.675.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", @@ -295,7 +295,7 @@ "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-browser": "3.675.0", "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", @@ -328,19 +328,19 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.670.0" + "@aws-sdk/client-sts": "^3.675.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.670.0.tgz", - "integrity": "sha512-bExrNo8ZVWorS3cjMZKQnA2HWqDmAzcZoSN/cPVoPFNkHwdl1lzPxvcLzmhpIr48JHgKfybBjrbluDZfIYeEog==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.675.0.tgz", + "integrity": "sha512-zgjyR4GyuONeDGJBKNt9lFJ8HfDX7rpxZZVR7LSXr9lUkjf6vUGgD2k/K4UAoOTWCKKCor6TA562ezGlA8su6Q==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.670.0", + "@aws-sdk/client-sso-oidc": "3.675.0", "@aws-sdk/core": "3.667.0", - "@aws-sdk/credential-provider-node": "3.670.0", + "@aws-sdk/credential-provider-node": "3.675.0", "@aws-sdk/middleware-host-header": "3.667.0", "@aws-sdk/middleware-logger": "3.667.0", "@aws-sdk/middleware-recursion-detection": "3.667.0", @@ -348,7 +348,7 @@ "@aws-sdk/region-config-resolver": "3.667.0", "@aws-sdk/types": "3.667.0", "@aws-sdk/util-endpoints": "3.667.0", - "@aws-sdk/util-user-agent-browser": "3.670.0", + "@aws-sdk/util-user-agent-browser": "3.675.0", "@aws-sdk/util-user-agent-node": "3.669.0", "@smithy/config-resolver": "^3.0.9", "@smithy/core": "^2.4.8", @@ -438,15 +438,15 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.670.0.tgz", - "integrity": "sha512-TB1gacUj75leaTt2JsCTzygDSIk4ksv9uZoR7VenlgFPRktyOeT+fapwIVBeB2Qg7b9uxAY2K5XkKstDZyBEEw==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.675.0.tgz", + "integrity": "sha512-kCBlC6grpbpCvgowk9T4JHZxJ88VfN0r77bDZClcadFRAKQ8UHyO02zhgFCfUdnU1lNv1mr3ngEcGN7XzJlYWA==", "dependencies": { "@aws-sdk/core": "3.667.0", "@aws-sdk/credential-provider-env": "3.667.0", "@aws-sdk/credential-provider-http": "3.667.0", "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.670.0", + "@aws-sdk/credential-provider-sso": "3.675.0", "@aws-sdk/credential-provider-web-identity": "3.667.0", "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", @@ -459,19 +459,19 @@ "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.670.0" + "@aws-sdk/client-sts": "^3.675.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.670.0.tgz", - "integrity": "sha512-zwNrRYzubk4CaZ7zebeDhxsm8QtNWkbGKopZPOaZSnd5uqUGRcmx4ccVRngWUK68XDP44aEUWC8iU5Pc7btpHQ==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.675.0.tgz", + "integrity": "sha512-VO1WVZCDmAYu4sY/6qIBzdm5vJTxLhWKJWvL5kVFfSe8WiNNoHlTqYYUK9vAm/JYpIgFLTefPbIc5W4MK7o6Pg==", "dependencies": { "@aws-sdk/credential-provider-env": "3.667.0", "@aws-sdk/credential-provider-http": "3.667.0", - "@aws-sdk/credential-provider-ini": "3.670.0", + "@aws-sdk/credential-provider-ini": "3.675.0", "@aws-sdk/credential-provider-process": "3.667.0", - "@aws-sdk/credential-provider-sso": "3.670.0", + "@aws-sdk/credential-provider-sso": "3.675.0", "@aws-sdk/credential-provider-web-identity": "3.667.0", "@aws-sdk/types": "3.667.0", "@smithy/credential-provider-imds": "^3.2.4", @@ -501,11 +501,11 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.670.0.tgz", - "integrity": "sha512-5PkA8BOy4q57Vhe9AESoHKZ7vjRbElNPKjXA4qC01xY+DitClRFz4O3B9sMzFp0PHlz9nDVSXXKgq0yzF/nAag==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.675.0.tgz", + "integrity": "sha512-p/EE2c0ebSgRhg1Fe1OH2+xNl7j1P4DTc7kZy1mX1NJ72fkqnGgBuf1vk5J9RmiRpbauPNMlm+xohjkGS7iodA==", "dependencies": { - "@aws-sdk/client-sso": "3.670.0", + "@aws-sdk/client-sso": "3.675.0", "@aws-sdk/core": "3.667.0", "@aws-sdk/token-providers": "3.667.0", "@aws-sdk/types": "3.667.0", @@ -679,9 +679,9 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.670.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.670.0.tgz", - "integrity": "sha512-iRynWWazqEcCKwGMcQcywKTDLdLvqts1Yx474U64I9OKQXXwhOwhXbF5CAPSRta86lkVNAVYJa/0Bsv45pNn1A==", + "version": "3.675.0", + "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.675.0.tgz", + "integrity": "sha512-HW4vGfRiX54RLcsYjLuAhcBBJ6lRVEZd7njfGpAwBB9s7BH8t48vrpYbyA5XbbqbTvXfYBnugQCUw9HWjEa1ww==", "dependencies": { "@aws-sdk/types": "3.667.0", "@smithy/types": "^3.5.0", @@ -5671,14 +5671,6 @@ "node": ">= 10.0.0" } }, - "node_modules/@lerna/create/node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/@lerna/create/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -5792,6 +5784,14 @@ "@ethersproject/wordlists": "5.7.0" } }, + "node_modules/@lit-protocol/accs-schemas": { + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/@lit-protocol/accs-schemas/-/accs-schemas-0.0.15.tgz", + "integrity": "sha512-GYF8BolqrU2H/uXr3D39TUbgFN/3u2d68oHHNfwg926iEsCEHwGmUOPvi4EMprV5lJR3EVn9IQODY/4eokJ6Rg==", + "dependencies": { + "ajv": "^8.12.0" + } + }, "node_modules/@lit-protocol/auth-helpers": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@lit-protocol/auth-helpers/-/auth-helpers-2.2.5.tgz", @@ -6070,11 +6070,12 @@ } }, "node_modules/@lit-protocol/uint8arrays": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@lit-protocol/uint8arrays/-/uint8arrays-6.10.0.tgz", - "integrity": "sha512-sk4INYrunRe9wNgQvmy9n+liltA5tjSA5rZ1HH6jA4GZ0j6DiZ9kJKuPnImnZS7Wl1O+tRIffa/oxsK6CTXGPA==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@lit-protocol/uint8arrays/-/uint8arrays-6.11.0.tgz", + "integrity": "sha512-0MJwBXmDTpiU8ScsCXShSsajs7P5Fw4xRwj6BbHbRjP7vaGtT1R08XUV95GQJVLFjkFMvJOGeqclSVzEA0ZK4Q==", "dependencies": { "@ethersproject/abstract-provider": "5.7.0", + "@lit-protocol/accs-schemas": "^0.0.15", "@lit-protocol/contracts": "^0.0.63", "ethers": "^5.7.1", "jszip": "^3.10.1", @@ -6157,37 +6158,27 @@ } }, "node_modules/@manypkg/cli": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@manypkg/cli/-/cli-0.21.4.tgz", - "integrity": "sha512-EACxxb+c/t6G0l1FrlyewZeBnyR5V1cLkXjnBfsay5TN1UgbilFpG6POglzn+lVJet9NqnEKe3RLHABzkIDZ0Q==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/@manypkg/cli/-/cli-0.22.0.tgz", + "integrity": "sha512-HwONx0Pr9ucehlrMvFMSuztLiKfwPYkjRDc0ymL5RiGYBk1slX8k3RWy+F01f1T+JLbImthSGMwY04Ojt20nTA==", "dependencies": { "@manypkg/get-packages": "^2.2.1", - "chalk": "^2.4.2", "detect-indent": "^6.0.0", - "find-up": "^4.1.0", - "fs-extra": "^8.1.0", "normalize-path": "^3.0.0", "p-limit": "^2.2.1", - "package-json": "^8.1.0", + "package-json": "^10.0.1", "parse-github-url": "^1.0.2", - "sembear": "^0.5.0", - "semver": "^6.3.0", - "spawndamnit": "^2.0.0", - "validate-npm-package-name": "^3.0.0" + "picocolors": "^1.1.0", + "sembear": "^0.7.0", + "semver": "^7.6.3", + "tinyexec": "^0.3.1", + "validate-npm-package-name": "^5.0.1" }, "bin": { "manypkg": "bin.js" }, "engines": { - "node": ">=14.18.0" - } - }, - "node_modules/@manypkg/cli/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" + "node": ">=18.0.0" } }, "node_modules/@manypkg/find-root": { @@ -7283,9 +7274,9 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" }, "node_modules/@pnpm/npm-conf": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", - "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", + "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", "dependencies": { "@pnpm/config.env-replace": "^1.1.0", "@pnpm/network.ca-file": "^1.0.1", @@ -7449,17 +7440,6 @@ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==" }, - "node_modules/@sindresorhus/is": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", - "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", @@ -8278,17 +8258,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", - "dependencies": { - "defer-to-connect": "^2.0.1" - }, - "engines": { - "node": ">=14.16" - } - }, "node_modules/@testim/chrome-version": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz", @@ -8543,7 +8512,8 @@ "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" + "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", + "dev": true }, "node_modules/@types/http-errors": { "version": "2.0.4", @@ -8620,9 +8590,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==", + "version": "4.17.12", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.12.tgz", + "integrity": "sha512-sviUmCE8AYdaF/KIHLDJBQgeYzPBI0vf/17NaYehBJfYD1j6/L95Slh07NlyK2iNyBNaEkb3En2jRt+a8y3xZQ==", "dev": true }, "node_modules/@types/long": { @@ -8672,9 +8642,9 @@ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==" }, "node_modules/@types/node": { - "version": "18.19.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.55.tgz", - "integrity": "sha512-zzw5Vw52205Zr/nmErSEkN5FLqXPuKX/k5d1D7RKHATGqU7y6YfX9QxZraUzUrFGqH6XzOzG196BC35ltJC4Cw==", + "version": "18.19.57", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.57.tgz", + "integrity": "sha512-I2ioBd/IPrYDMv9UNR5NlPElOZ68QB7yY5V2EsLtSrTO0LM0PnCEFF9biLWHf5k+sIy4ohueCV9t4gk1AEdlVA==", "dependencies": { "undici-types": "~5.26.4" } @@ -8782,11 +8752,6 @@ "@types/ws": "*" } }, - "node_modules/@types/semver": { - "version": "6.2.7", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.2.7.tgz", - "integrity": "sha512-blctEWbzUFzQx799RZjzzIdBJOXmE37YYEyDtKkx5Dg+V7o/zyyAxLPiI98A2jdTtDgxZleMdfV+7p8WbRJ1OQ==" - }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -11018,11 +10983,6 @@ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", "dev": true }, - "node_modules/builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==" - }, "node_modules/byte-size": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.1.1.tgz", @@ -11150,42 +11110,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request": { - "version": "10.2.14", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", - "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", - "dependencies": { - "@types/http-cache-semantics": "^4.0.2", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.3", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - } - }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/call-bind": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", @@ -12760,6 +12684,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true, "engines": { "node": ">=10" } @@ -14748,14 +14673,6 @@ "node": ">= 6" } }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "engines": { - "node": ">= 14.17" - } - }, "node_modules/formidable": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz", @@ -15390,41 +15307,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", - "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/got/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -15798,29 +15680,6 @@ "npm": ">=1.3.7" } }, - "node_modules/http2-wrapper": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", - "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/http2-wrapper/node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -16059,14 +15918,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/init-package-json/node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/inline-source-map": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.3.tgz", @@ -19192,6 +19043,17 @@ "node": ">=6" } }, + "node_modules/ky": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/ky/-/ky-1.7.2.tgz", + "integrity": "sha512-OzIvbHKKDpi60TnF9t7UUVAF1B4mcqc02z5PIvrm08Wyb+yOcz63GRvEuVxNT18a9E1SrNouhB4W2NNLeD7Ykg==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sindresorhus/ky?sponsor=1" + } + }, "node_modules/lazystream": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", @@ -19657,14 +19519,6 @@ "node": ">= 10.0.0" } }, - "node_modules/lerna/node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/lerna/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -20038,17 +19892,6 @@ "get-func-name": "^2.0.1" } }, - "node_modules/lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/lru-cache": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz", @@ -20436,17 +20279,6 @@ "node": ">=6" } }, - "node_modules/mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -21808,17 +21640,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-url": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", - "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/npm-bundled": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", @@ -21863,14 +21684,6 @@ "node": "^16.14.0 || >=18.0.0" } }, - "node_modules/npm-package-arg/node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/npm-packlist": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", @@ -22594,14 +22407,6 @@ "node": ">=0.10.0" } }, - "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "engines": { - "node": ">=12.20" - } - }, "node_modules/p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", @@ -22796,17 +22601,17 @@ } }, "node_modules/package-json": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", - "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz", + "integrity": "sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==", "dependencies": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" + "ky": "^1.2.0", + "registry-auth-token": "^5.0.2", + "registry-url": "^6.0.1", + "semver": "^7.6.0" }, "engines": { - "node": ">=14.16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -23157,9 +22962,9 @@ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -23184,14 +22989,14 @@ } }, "node_modules/pino": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/pino/-/pino-9.4.0.tgz", - "integrity": "sha512-nbkQb5+9YPhQRz/BeQmrWpEknAaqjpAqRK8NwJpmrX/JHu7JuZC5G1CeAwJDJfGes4h+YihC6in3Q2nGb+Y09w==", + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/pino/-/pino-9.5.0.tgz", + "integrity": "sha512-xSEmD4pLnV54t0NOUN16yCl7RIB1c5UUOse5HSyEXtBp+FgFQyPeDutc+Q2ZO7/22vImV7VfEjH/1zV2QuqvYw==", "dependencies": { "atomic-sleep": "^1.0.0", "fast-redact": "^3.1.1", "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "^1.2.0", + "pino-abstract-transport": "^2.0.0", "pino-std-serializers": "^7.0.0", "process-warning": "^4.0.0", "quick-format-unescaped": "^4.0.3", @@ -23205,11 +23010,10 @@ } }, "node_modules/pino-abstract-transport": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz", - "integrity": "sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz", + "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==", "dependencies": { - "readable-stream": "^4.0.0", "split2": "^4.0.0" } }, @@ -23222,9 +23026,9 @@ } }, "node_modules/pino-pretty": { - "version": "11.2.2", - "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-11.2.2.tgz", - "integrity": "sha512-2FnyGir8nAJAqD3srROdrF1J5BIcMT4nwj7hHSc60El6Uxlym00UbCCd8pYIterstVBFlMyF1yFV8XdGIPbj4A==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-11.3.0.tgz", + "integrity": "sha512-oXwn7ICywaZPHmu3epHGU2oJX4nPmKvHvB/bwrJHlGcbEWaVcotkpyVHMKLKmiVryWYByNp0jpgAcXpFJDXJzA==", "dependencies": { "colorette": "^2.0.7", "dateformat": "^4.6.3", @@ -23234,7 +23038,7 @@ "joycon": "^3.1.1", "minimist": "^1.2.6", "on-exit-leak-free": "^2.1.0", - "pino-abstract-transport": "^1.0.0", + "pino-abstract-transport": "^2.0.0", "pump": "^3.0.0", "readable-stream": "^4.0.0", "secure-json-parse": "^2.4.0", @@ -23594,11 +23398,6 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" - }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -24412,7 +24211,8 @@ "node_modules/resolve-alpn": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" + "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", + "dev": true }, "node_modules/resolve-cwd": { "version": "3.0.0", @@ -24449,20 +24249,6 @@ "node": ">=10" } }, - "node_modules/responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dependencies": { - "lowercase-keys": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -24716,17 +24502,36 @@ "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==" }, "node_modules/secp256k1": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-5.0.0.tgz", - "integrity": "sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-5.0.1.tgz", + "integrity": "sha512-lDFs9AAIaWP9UCdtWrotXWWF9t8PWgQDcxqgAnpM9rMqxb3Oaq2J0thzPVSxBwdJgyQtkU/sYtFtbM1RSt/iYA==", "hasInstallScript": true, "dependencies": { - "elliptic": "^6.5.4", + "elliptic": "^6.5.7", "node-addon-api": "^5.0.0", "node-gyp-build": "^4.2.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=18.0.0" + } + }, + "node_modules/secp256k1/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" + }, + "node_modules/secp256k1/node_modules/elliptic": { + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" } }, "node_modules/secp256k1/node_modules/node-addon-api": { @@ -24764,20 +24569,11 @@ } }, "node_modules/sembear": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/sembear/-/sembear-0.5.2.tgz", - "integrity": "sha512-Ij1vCAdFgWABd7zTg50Xw1/p0JgESNxuLlneEAsmBrKishA06ulTTL/SHGmNy2Zud7+rKrHTKNI6moJsn1ppAQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/sembear/-/sembear-0.7.0.tgz", + "integrity": "sha512-XyLTEich2D02FODCkfdto3mB9DetWPLuTzr4tvoofe9SvyM27h4nQSbV3+iVcYQz94AFyKtqBv5pcZbj3k2hdA==", "dependencies": { - "@types/semver": "^6.0.1", - "semver": "^6.3.0" - } - }, - "node_modules/sembear/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" + "semver": "^7.3.5" } }, "node_modules/semver": { @@ -25303,74 +25099,6 @@ "source-map": "^0.6.0" } }, - "node_modules/spawndamnit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spawndamnit/-/spawndamnit-2.0.0.tgz", - "integrity": "sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==", - "dependencies": { - "cross-spawn": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "node_modules/spawndamnit/node_modules/cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==", - "dependencies": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "node_modules/spawndamnit/node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/spawndamnit/node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", - "dependencies": { - "shebang-regex": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/spawndamnit/node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/spawndamnit/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/spawndamnit/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/spawndamnit/node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" - }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", @@ -26686,6 +26414,11 @@ "node": ">=0.6.0" } }, + "node_modules/tinyexec": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.1.tgz", + "integrity": "sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -27552,11 +27285,11 @@ } }, "node_modules/validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==", - "dependencies": { - "builtins": "^1.0.3" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", + "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/vary": { @@ -28663,7 +28396,7 @@ "version": "102.0.0-beta.0", "license": "STREAMR NETWORK OPEN SOURCE LICENSE", "dependencies": { - "@aws-sdk/client-route-53": "^3.670.0", + "@aws-sdk/client-route-53": "^3.675.0", "@streamr/autocertifier-client": "102.0.0-beta.0", "@streamr/dht": "102.0.0-beta.0", "@streamr/proto-rpc": "102.0.0-beta.0", @@ -28818,7 +28551,7 @@ "devDependencies": { "@streamr/test-utils": "102.0.0-beta.0", "@types/event-stream": "^4.0.5", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/merge2": "^1.4.4", "merge2": "^1.4.1" } @@ -28962,7 +28695,7 @@ "@streamr/test-utils": "102.0.0-beta.0", "@types/heap": "^0.2.34", "@types/k-bucket": "^5.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0", "@types/websocket": "^1.0.10", "@types/ws": "^8.5.12", @@ -29039,7 +28772,7 @@ "@types/cors": "^2.8.17", "@types/express": "^4.17.21", "@types/heap": "^0.2.34", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/merge2": "^1.4.4", "@types/node-fetch": "^2.6.4", "@types/qs": "^6.9.16", @@ -29145,7 +28878,7 @@ "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", "@streamr/test-utils": "102.0.0-beta.0", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0" }, "optionalDependencies": { @@ -29173,7 +28906,7 @@ "@babel/runtime": "^7.25.7", "@babel/runtime-corejs3": "^7.25.7", "@lit-protocol/core": "2.2.5", - "@lit-protocol/uint8arrays": "^6.10.0", + "@lit-protocol/uint8arrays": "^6.11.0", "@protobuf-ts/runtime": "^2.8.2", "@protobuf-ts/runtime-rpc": "^2.8.2", "@streamr/config": "^5.4.0", @@ -29213,7 +28946,7 @@ "@jest/globals": "^29.7.0", "@streamr/test-utils": "102.0.0-beta.0", "@types/heap": "^0.2.34", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/node-fetch": "^2.6.4", "@types/uuid": "^10.0.0", "ajv": "^8.17.1", @@ -29298,7 +29031,7 @@ }, "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0", "@types/yallist": "^4.0.1", "expect": "^29.6.2", @@ -29313,14 +29046,14 @@ "dependencies": { "eventemitter3": "^5.0.0", "lodash": "^4.17.21", - "pino": "^9.4.0", - "pino-pretty": "^11.2.2", - "secp256k1": "^5.0.0", + "pino": "^9.5.0", + "pino-pretty": "^11.3.0", + "secp256k1": "^5.0.1", "sha3": "^2.1.4" }, "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/node-fetch": "^2.6.4", "@types/secp256k1": "^4.0.6", "node-fetch": "^2.7.0" diff --git a/package.json b/package.json index c292bbc3e7..8ec11b1e65 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ "packages/cli-tools" ], "dependencies": { - "@manypkg/cli": "^0.21.2", + "@manypkg/cli": "^0.22.0", "@protobuf-ts/plugin": "^2.9.3", "@stylistic/eslint-plugin": "^2.9.0", "@tsconfig/node18": "^18.2.4", "@types/jest": "^29.5.13", - "@types/node": "^18.19.55", + "@types/node": "^18.19.57", "@typescript-eslint/eslint-plugin": "8.7.0", "@typescript-eslint/parser": "^8.7.0", "cli-table": "^0.3.6", diff --git a/packages/autocertifier-server/package.json b/packages/autocertifier-server/package.json index a41c2b1d23..0438c67350 100644 --- a/packages/autocertifier-server/package.json +++ b/packages/autocertifier-server/package.json @@ -25,7 +25,7 @@ "test-integration": "jest test/integration" }, "dependencies": { - "@aws-sdk/client-route-53": "^3.670.0", + "@aws-sdk/client-route-53": "^3.675.0", "@streamr/autocertifier-client": "102.0.0-beta.0", "@streamr/dht": "102.0.0-beta.0", "@streamr/proto-rpc": "102.0.0-beta.0", diff --git a/packages/cli-tools/package.json b/packages/cli-tools/package.json index 36422f46a5..d6fce7e15e 100644 --- a/packages/cli-tools/package.json +++ b/packages/cli-tools/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@streamr/test-utils": "102.0.0-beta.0", "@types/event-stream": "^4.0.5", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/merge2": "^1.4.4", "merge2": "^1.4.1" } diff --git a/packages/dht/package.json b/packages/dht/package.json index 95a1c63346..f87748035f 100644 --- a/packages/dht/package.json +++ b/packages/dht/package.json @@ -51,7 +51,7 @@ "@streamr/test-utils": "102.0.0-beta.0", "@types/heap": "^0.2.34", "@types/k-bucket": "^5.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0", "@types/websocket": "^1.0.10", "@types/ws": "^8.5.12", diff --git a/packages/node/package.json b/packages/node/package.json index 2265082ed8..047d361323 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -63,7 +63,7 @@ "@types/cors": "^2.8.17", "@types/express": "^4.17.21", "@types/heap": "^0.2.34", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/merge2": "^1.4.4", "@types/node-fetch": "^2.6.4", "@types/qs": "^6.9.16", diff --git a/packages/proto-rpc/package.json b/packages/proto-rpc/package.json index cdc7fe7676..c0b5eb0ac2 100644 --- a/packages/proto-rpc/package.json +++ b/packages/proto-rpc/package.json @@ -34,7 +34,7 @@ "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", "@streamr/test-utils": "102.0.0-beta.0", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0" }, "optionalDependencies": { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b835a21df6..e6dd06fdd9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -52,7 +52,7 @@ "@jest/globals": "^29.7.0", "@streamr/test-utils": "102.0.0-beta.0", "@types/heap": "^0.2.34", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/node-fetch": "^2.6.4", "@types/uuid": "^10.0.0", "ajv": "^8.17.1", @@ -86,7 +86,7 @@ "@babel/runtime": "^7.25.7", "@babel/runtime-corejs3": "^7.25.7", "@lit-protocol/core": "2.2.5", - "@lit-protocol/uint8arrays": "^6.10.0", + "@lit-protocol/uint8arrays": "^6.11.0", "@protobuf-ts/runtime": "^2.8.2", "@protobuf-ts/runtime-rpc": "^2.8.2", "@streamr/config": "^5.4.0", diff --git a/packages/trackerless-network/package.json b/packages/trackerless-network/package.json index bc0a6fa81f..6bb476a89d 100644 --- a/packages/trackerless-network/package.json +++ b/packages/trackerless-network/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/uuid": "^10.0.0", "@types/yallist": "^4.0.1", "expect": "^29.6.2", diff --git a/packages/utils/package.json b/packages/utils/package.json index 26e1a4b7ed..b213d7836e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -22,14 +22,14 @@ "dependencies": { "eventemitter3": "^5.0.0", "lodash": "^4.17.21", - "pino": "^9.4.0", - "pino-pretty": "^11.2.2", - "secp256k1": "^5.0.0", + "pino": "^9.5.0", + "pino-pretty": "^11.3.0", + "secp256k1": "^5.0.1", "sha3": "^2.1.4" }, "devDependencies": { "@streamr/browser-test-runner": "^0.0.1", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/node-fetch": "^2.6.4", "@types/secp256k1": "^4.0.6", "node-fetch": "^2.7.0" From b0475d0a0280765b17961f00ebb2c50f31cbb31d Mon Sep 17 00:00:00 2001 From: Santeri Juslenius Date: Tue, 22 Oct 2024 12:56:03 +0300 Subject: [PATCH 2/4] refactor(network): remove use of private fields in `integration/Handshakes.test.ts` (#2824) ## Summary No longer use private fields on integration/Handshakes.test.ts. Also removed duplicate test case `Two nodes can handshake` --- .../test/integration/Handshakes.test.ts | 63 +++++-------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/packages/trackerless-network/test/integration/Handshakes.test.ts b/packages/trackerless-network/test/integration/Handshakes.test.ts index c74b7cb803..89c94041fa 100644 --- a/packages/trackerless-network/test/integration/Handshakes.test.ts +++ b/packages/trackerless-network/test/integration/Handshakes.test.ts @@ -8,12 +8,10 @@ import { } from '@streamr/dht' import { StreamPartIDUtils } from '@streamr/utils' import { NodeList } from '../../src/logic/NodeList' -import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote' import { Handshaker } from '../../src/logic/neighbor-discovery/Handshaker' import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../generated/packages/trackerless-network/protos/NetworkRpc' -import { - HandshakeRpcClient -} from '../../generated/packages/trackerless-network/protos/NetworkRpc.client' +import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client' +import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote' describe('Handshakes', () => { @@ -86,6 +84,12 @@ describe('Handshakes', () => { leftNodeView = new NodeList(handshakerNodeId, 10) rightNodeView = new NodeList(handshakerNodeId, 10) nodeView = new NodeList(handshakerNodeId, 10) + nodeView.add(new ContentDeliveryRpcRemote( + peerDescriptor2, + peerDescriptor1, + rpcCommunicator2, + ContentDeliveryRpcClient + )) neighbors = new NodeList(handshakerNodeId, 4) handshaker = new Handshaker({ localPeerDescriptor: peerDescriptor2, @@ -112,64 +116,25 @@ describe('Handshakes', () => { simulator.stop() }) - it('Two nodes can handshake', async () => { - rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake) - // @ts-expect-error private - const res = await handshaker.handshakeWithTarget( - new HandshakeRpcRemote( - peerDescriptor2, - peerDescriptor1, - rpcCommunicator2, - HandshakeRpcClient - ) - ) - expect(res).toEqual(true) - expect(neighbors.has(toNodeId(peerDescriptor1))).toEqual(true) - }) - it('Handshake accepted', async () => { rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake) - // @ts-expect-error private - const res = await handshaker.handshakeWithTarget( - new HandshakeRpcRemote( - peerDescriptor2, - peerDescriptor1, - rpcCommunicator2, - HandshakeRpcClient - ) - ) - expect(res).toEqual(true) + const res = await handshaker.attemptHandshakesOnContacts([]) + expect(res).toHaveLength(0) expect(neighbors.has(toNodeId(peerDescriptor1))).toEqual(true) }) it('Handshake rejected', async () => { rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', rejectHandshake) - // @ts-expect-error private - const res = await handshaker.handshakeWithTarget( - new HandshakeRpcRemote( - peerDescriptor2, - peerDescriptor1, - rpcCommunicator2, - HandshakeRpcClient - ) - ) - expect(res).toEqual(false) + const res = await handshaker.attemptHandshakesOnContacts([]) + expect(res[0]).toEqual(toNodeId(peerDescriptor1)) expect(neighbors.has(toNodeId(peerDescriptor1))).toEqual(false) }) it('Handshake with Interleaving', async () => { rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', interleavingHandshake) rpcCommunicator3.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake) - // @ts-expect-error private - const res = await handshaker.handshakeWithTarget( - new HandshakeRpcRemote( - peerDescriptor2, - peerDescriptor1, - rpcCommunicator2, - HandshakeRpcClient - ) - ) - expect(res).toEqual(true) + const res = await handshaker.attemptHandshakesOnContacts([]) + expect(res).toHaveLength(0) expect(neighbors.has(toNodeId(peerDescriptor1))).toEqual(true) expect(neighbors.has(toNodeId(peerDescriptor3))).toEqual(true) }) From 5c80899b1eded163fe60e6886a9de9bba686f176 Mon Sep 17 00:00:00 2001 From: Santeri Juslenius Date: Tue, 22 Oct 2024 12:56:25 +0300 Subject: [PATCH 3/4] test(trackerless-network): NET-1195 remove setStreamPartEntryPoints calls from e2e tests (#2827) ## Summary Remove `setStreamPartEntryPoints` calls from E2E tests to test the production setup --- .../test/end-to-end/proxy-connections.test.ts | 2 -- .../test/end-to-end/proxy-key-exchange.test.ts | 1 - .../test/end-to-end/webrtc-full-node-network.test.ts | 2 -- .../test/end-to-end/websocket-full-node-network.test.ts | 2 -- 4 files changed, 7 deletions(-) diff --git a/packages/trackerless-network/test/end-to-end/proxy-connections.test.ts b/packages/trackerless-network/test/end-to-end/proxy-connections.test.ts index eec7076c14..3ebdd12eda 100644 --- a/packages/trackerless-network/test/end-to-end/proxy-connections.test.ts +++ b/packages/trackerless-network/test/end-to-end/proxy-connections.test.ts @@ -79,7 +79,6 @@ describe('Proxy connections', () => { } }) await proxyNode1.start() - proxyNode1.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1]) proxyNode1.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID) proxyNode2 = createNetworkNode({ layer0: { @@ -92,7 +91,6 @@ describe('Proxy connections', () => { } }) await proxyNode2.start() - proxyNode2.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1]) proxyNode2.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID) proxiedNode = createNetworkNode({ layer0: { diff --git a/packages/trackerless-network/test/end-to-end/proxy-key-exchange.test.ts b/packages/trackerless-network/test/end-to-end/proxy-key-exchange.test.ts index 37edb22626..933cf273d2 100644 --- a/packages/trackerless-network/test/end-to-end/proxy-key-exchange.test.ts +++ b/packages/trackerless-network/test/end-to-end/proxy-key-exchange.test.ts @@ -36,7 +36,6 @@ describe('proxy group key exchange', () => { } }) await proxyNode.start() - proxyNode.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor]) proxyNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID) publisher = createNetworkNode({ layer0: { diff --git a/packages/trackerless-network/test/end-to-end/webrtc-full-node-network.test.ts b/packages/trackerless-network/test/end-to-end/webrtc-full-node-network.test.ts index 48298cf8d5..f3a2e32474 100644 --- a/packages/trackerless-network/test/end-to-end/webrtc-full-node-network.test.ts +++ b/packages/trackerless-network/test/end-to-end/webrtc-full-node-network.test.ts @@ -32,7 +32,6 @@ describe('Full node network with WebRTC connections', () => { } }) await entryPoint.start() - entryPoint.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor]) entryPoint.getContentDeliveryManager().joinStreamPart(streamPartId) await Promise.all(range(NUM_OF_NODES).map(async () => { @@ -45,7 +44,6 @@ describe('Full node network with WebRTC connections', () => { }) nodes.push(node) await node.start() - node.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor]) node.getContentDeliveryManager().joinStreamPart(streamPartId) })) diff --git a/packages/trackerless-network/test/end-to-end/websocket-full-node-network.test.ts b/packages/trackerless-network/test/end-to-end/websocket-full-node-network.test.ts index a3ab5632d0..5f8af92040 100644 --- a/packages/trackerless-network/test/end-to-end/websocket-full-node-network.test.ts +++ b/packages/trackerless-network/test/end-to-end/websocket-full-node-network.test.ts @@ -29,7 +29,6 @@ describe('Full node network with WebSocket connections only', () => { } }) await entryPoint.start() - entryPoint.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor]) entryPoint.getContentDeliveryManager().joinStreamPart(streamPartId) await Promise.all(range(NUM_OF_NODES).map(async (i) => { @@ -43,7 +42,6 @@ describe('Full node network with WebSocket connections only', () => { }) nodes.push(node) await node.start() - node.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor]) node.getContentDeliveryManager().joinStreamPart(streamPartId) })) From cc99d39c6c825429c0f3a26a1ef0dc824a46c3c8 Mon Sep 17 00:00:00 2001 From: Santeri Juslenius Date: Tue, 22 Oct 2024 12:56:44 +0300 Subject: [PATCH 4/4] refactor(autocertifier-client): NET-873 move protobuf generated files to generated/ (#2828) ## Summary Moved generated protobuf files from src/proto to generated/. Also regenerated the files with the current version --- packages/autocertifier-client/.eslintignore | 3 ++- .../autocertifier-client/protos/AutoCertifier.client.ts | 2 +- .../autocertifier-client/protos/AutoCertifier.server.ts | 2 +- .../packages/autocertifier-client/protos/AutoCertifier.ts | 2 +- packages/autocertifier-client/proto.sh | 4 ++-- packages/autocertifier-client/src/AutoCertifierClient.ts | 4 ++-- packages/autocertifier-client/src/exports.ts | 4 ++-- packages/autocertifier-client/tsconfig.browser.json | 1 + packages/autocertifier-client/tsconfig.jest.json | 1 + packages/autocertifier-client/tsconfig.node.json | 3 ++- 10 files changed, 15 insertions(+), 11 deletions(-) rename packages/autocertifier-client/{src/proto => generated}/packages/autocertifier-client/protos/AutoCertifier.client.ts (96%) rename packages/autocertifier-client/{src/proto => generated}/packages/autocertifier-client/protos/AutoCertifier.server.ts (91%) rename packages/autocertifier-client/{src/proto => generated}/packages/autocertifier-client/protos/AutoCertifier.ts (96%) diff --git a/packages/autocertifier-client/.eslintignore b/packages/autocertifier-client/.eslintignore index 107c879a87..556ac39107 100644 --- a/packages/autocertifier-client/.eslintignore +++ b/packages/autocertifier-client/.eslintignore @@ -1,4 +1,5 @@ node_modules/** dist/** .idea/** -src/proto/** +generated/** + diff --git a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.client.ts b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.client.ts similarity index 96% rename from packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.client.ts rename to packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.client.ts index 28fdc5a4c3..3ae40257f0 100644 --- a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.client.ts +++ b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.client.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number +// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number // @generated from protobuf file "packages/autocertifier-client/protos/AutoCertifier.proto" (syntax proto3) // tslint:disable import type { RpcTransport } from "@protobuf-ts/runtime-rpc"; diff --git a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.server.ts b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.server.ts similarity index 91% rename from packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.server.ts rename to packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.server.ts index 94f143baaa..12c6ee3873 100644 --- a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.server.ts +++ b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.server.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number +// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number // @generated from protobuf file "packages/autocertifier-client/protos/AutoCertifier.proto" (syntax proto3) // tslint:disable import { HasSessionResponse } from "./AutoCertifier"; diff --git a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.ts b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.ts similarity index 96% rename from packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.ts rename to packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.ts index f28c83e2ed..bb3e05bd6a 100644 --- a/packages/autocertifier-client/src/proto/packages/autocertifier-client/protos/AutoCertifier.ts +++ b/packages/autocertifier-client/generated/packages/autocertifier-client/protos/AutoCertifier.ts @@ -1,4 +1,4 @@ -// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number +// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number // @generated from protobuf file "packages/autocertifier-client/protos/AutoCertifier.proto" (syntax proto3) // tslint:disable import { ServiceType } from "@protobuf-ts/runtime-rpc"; diff --git a/packages/autocertifier-client/proto.sh b/packages/autocertifier-client/proto.sh index c64f9671f1..1a83a12162 100755 --- a/packages/autocertifier-client/proto.sh +++ b/packages/autocertifier-client/proto.sh @@ -1,2 +1,2 @@ -mkdir -p ./src/proto -npx protoc --ts_out ./src/proto --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/autocertifier-client/protos/AutoCertifier.proto +mkdir -p ./generated +npx protoc --ts_out ./generated --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/autocertifier-client/protos/AutoCertifier.proto diff --git a/packages/autocertifier-client/src/AutoCertifierClient.ts b/packages/autocertifier-client/src/AutoCertifierClient.ts index 78c657ba24..c7858c10d3 100644 --- a/packages/autocertifier-client/src/AutoCertifierClient.ts +++ b/packages/autocertifier-client/src/AutoCertifierClient.ts @@ -1,6 +1,6 @@ import { EventEmitter } from 'eventemitter3' -import { IAutoCertifierRpc } from './proto/packages/autocertifier-client/protos/AutoCertifier.server' -import { HasSessionRequest, HasSessionResponse } from './proto/packages/autocertifier-client/protos/AutoCertifier' +import { IAutoCertifierRpc } from '../generated/packages/autocertifier-client/protos/AutoCertifier.server' +import { HasSessionRequest, HasSessionResponse } from '../generated/packages/autocertifier-client/protos/AutoCertifier' import { ServerCallContext } from '@protobuf-ts/runtime-rpc' import { filePathToNodeFormat, Logger } from '@streamr/utils' import { RestClient } from './RestClient' diff --git a/packages/autocertifier-client/src/exports.ts b/packages/autocertifier-client/src/exports.ts index c74e5ae7bd..51a8deca12 100644 --- a/packages/autocertifier-client/src/exports.ts +++ b/packages/autocertifier-client/src/exports.ts @@ -15,6 +15,6 @@ export { InvalidSubdomainOrToken } from './errors' export { FailedToConnectToStreamrWebSocket } from './errors' export { ErrorCode } from './errors' export { Err } from './errors' -export { HasSessionRequest, HasSessionResponse } from './proto/packages/autocertifier-client/protos/AutoCertifier' -export { AutoCertifierRpcClient } from './proto/packages/autocertifier-client/protos/AutoCertifier.client' +export { HasSessionRequest, HasSessionResponse } from '../generated/packages/autocertifier-client/protos/AutoCertifier' +export { AutoCertifierRpcClient } from '../generated/packages/autocertifier-client/protos/AutoCertifier.client' export { createSelfSignedCertificate } from './createSelfSignedCertificate' diff --git a/packages/autocertifier-client/tsconfig.browser.json b/packages/autocertifier-client/tsconfig.browser.json index 87cf542577..b7266e11f5 100644 --- a/packages/autocertifier-client/tsconfig.browser.json +++ b/packages/autocertifier-client/tsconfig.browser.json @@ -7,6 +7,7 @@ }, "include": [ "src/**/*", + "generated/**/*", "test/**/*" ], } diff --git a/packages/autocertifier-client/tsconfig.jest.json b/packages/autocertifier-client/tsconfig.jest.json index 6845793580..71aafe6ad1 100644 --- a/packages/autocertifier-client/tsconfig.jest.json +++ b/packages/autocertifier-client/tsconfig.jest.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.jest.json", "include": [ "src/**/*", + "generated/**/*", "test/**/*" ], "references": [ diff --git a/packages/autocertifier-client/tsconfig.node.json b/packages/autocertifier-client/tsconfig.node.json index b9dc73b389..42207a9c98 100644 --- a/packages/autocertifier-client/tsconfig.node.json +++ b/packages/autocertifier-client/tsconfig.node.json @@ -5,7 +5,8 @@ "noImplicitOverride": false }, "include": [ - "src/**/*" + "src/**/*", + "generated/**/*" ], "references": [ { "path": "../utils/tsconfig.node.json" },